From 0c7876ac291b720b787f97834ded983b21c30025 Mon Sep 17 00:00:00 2001 From: "Yogesh (OpenERP)" Date: Mon, 7 Feb 2011 11:21:57 +0530 Subject: [IMP] replace mailgate.message to email.message in addons module. bzr revid: ysa@tinyerp.com-20110207055157-yr9co24w84kv0yvy --- addons/project_issue/project_issue.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'addons/project_issue/project_issue.py') diff --git a/addons/project_issue/project_issue.py b/addons/project_issue/project_issue.py index aaaff37305e..9e82eb01556 100644 --- a/addons/project_issue/project_issue.py +++ b/addons/project_issue/project_issue.py @@ -144,7 +144,7 @@ class project_issue(crm.crm_case, osv.osv): issues = [] issue_pool = self.pool.get('project.issue') for task in self.pool.get('project.task').browse(cr, uid, ids, context=context): - issues += issue_pool.search(cr, uid, [('task_id','=',task.id)]) + issues += issue_pool.search(cr, uid, [('task_id','=',task.id)]) return issues def _get_issue_work(self, cr, uid, ids, context=None): @@ -162,8 +162,8 @@ class project_issue(crm.crm_case, osv.osv): progress = 0.0 if issue.task_id: progress = task_pool._hours_get(cr, uid, [issue.task_id.id], field_names, args, context=context)[issue.task_id.id]['progress'] - res[issue.id] = {'progress' : progress} - return res + res[issue.id] = {'progress' : progress} + return res _columns = { 'id': fields.integer('ID'), @@ -213,7 +213,7 @@ class project_issue(crm.crm_case, osv.osv): method=True, multi='working_days_open', type="float", store=True), 'working_hours_close': fields.function(_compute_day, string='Working Hours to Close the Issue', \ method=True, multi='working_days_close', type="float", store=True), - 'message_ids': fields.one2many('mailgate.message', 'res_id', 'Messages', domain=[('model','=',_name)]), + 'message_ids': fields.one2many('email.message', 'res_id', 'Messages', domain=[('model','=',_name)]), 'date_action_last': fields.datetime('Last Action', readonly=1), 'date_action_next': fields.datetime('Next Action', readonly=1), 'progress': fields.function(_hours_get, method=True, string='Progress (%)', multi='hours', group_operator="avg", help="Computed as: Time Spent / Total Time.", @@ -370,7 +370,7 @@ class project_issue(crm.crm_case, osv.osv): @param cr: the current row, from the database cursor, @param uid: the current user’s ID for security checks """ - if context is None: + if context is None: context = {} mailgate_pool = self.pool.get('email.server.tools') -- cgit v1.2.3 From b086aadd1ea4a6163d927cb51ba51ef95ebc4aab Mon Sep 17 00:00:00 2001 From: "Yogesh (OpenERP)" Date: Fri, 18 Feb 2011 17:26:56 +0530 Subject: [IMP] project_issue :- call email.message.send.wizard in oprtunity instead of crm.send.mail wizard. bzr revid: ysa@tinyerp.com-20110218115656-off7dhkdo0n5sh71 --- addons/project_issue/project_issue.py | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) (limited to 'addons/project_issue/project_issue.py') diff --git a/addons/project_issue/project_issue.py b/addons/project_issue/project_issue.py index 9e82eb01556..227ba4f617d 100644 --- a/addons/project_issue/project_issue.py +++ b/addons/project_issue/project_issue.py @@ -243,6 +243,38 @@ class project_issue(crm.crm_case, osv.osv): 'project_id':_get_project, } + def action_send_email(self, cr, uid, ids, context=None): + """ + Open Send email wizard. + """ + if context is None: + context = {} + for data in self.browse(cr, uid ,ids, context): + context.update({ + 'mail':'new', + 'default_name': data.name, + 'default_email_to': data.email_from, + 'default_email_from': data.user_id and data.user_id.address_id and data.user_id.address_id.email, + 'default_description': '\n' + (tools.ustr(data.user_id.signature or '')), + 'default_model': context.get('model',''), + 'default_email_cc': tools.ustr(data.email_cc or ''), + 'default_res_id': context.get('rec_id',0) + }) + if hasattr(data, 'section_id'): + context.update({'default_reply_to': data.section_id and data.section_id.reply_to or False}) + + result = { + 'view_type': 'form', + 'view_mode': 'form', + 'res_model': 'email.message.wizard_send', + 'view_id': False, + 'context': context, + 'type': 'ir.actions.act_window', + 'target': 'new', + 'nodestroy': True + } + return result + def convert_issue_task(self, cr, uid, ids, context=None): case_obj = self.pool.get('project.issue') data_obj = self.pool.get('ir.model.data') -- cgit v1.2.3 From d1dcd5a16f5b716b6fe7f014cf028ec6b8c86c94 Mon Sep 17 00:00:00 2001 From: "Yogesh (OpenERP)" Date: Fri, 18 Feb 2011 18:15:09 +0530 Subject: [IMP] remove duplicate code in crm, crm_claim. crm_helpdesk, event, hr_recruitment, project_issu relate to send mail wizard.and improve email.message.send wizard. bzr revid: ysa@tinyerp.com-20110218124509-srcrk6lz4p4f3wlw --- addons/project_issue/project_issue.py | 32 -------------------------------- 1 file changed, 32 deletions(-) (limited to 'addons/project_issue/project_issue.py') diff --git a/addons/project_issue/project_issue.py b/addons/project_issue/project_issue.py index 227ba4f617d..9e82eb01556 100644 --- a/addons/project_issue/project_issue.py +++ b/addons/project_issue/project_issue.py @@ -243,38 +243,6 @@ class project_issue(crm.crm_case, osv.osv): 'project_id':_get_project, } - def action_send_email(self, cr, uid, ids, context=None): - """ - Open Send email wizard. - """ - if context is None: - context = {} - for data in self.browse(cr, uid ,ids, context): - context.update({ - 'mail':'new', - 'default_name': data.name, - 'default_email_to': data.email_from, - 'default_email_from': data.user_id and data.user_id.address_id and data.user_id.address_id.email, - 'default_description': '\n' + (tools.ustr(data.user_id.signature or '')), - 'default_model': context.get('model',''), - 'default_email_cc': tools.ustr(data.email_cc or ''), - 'default_res_id': context.get('rec_id',0) - }) - if hasattr(data, 'section_id'): - context.update({'default_reply_to': data.section_id and data.section_id.reply_to or False}) - - result = { - 'view_type': 'form', - 'view_mode': 'form', - 'res_model': 'email.message.wizard_send', - 'view_id': False, - 'context': context, - 'type': 'ir.actions.act_window', - 'target': 'new', - 'nodestroy': True - } - return result - def convert_issue_task(self, cr, uid, ids, context=None): case_obj = self.pool.get('project.issue') data_obj = self.pool.get('ir.model.data') -- cgit v1.2.3 From ffe734015973d9c08943c947ab23d94815b144c0 Mon Sep 17 00:00:00 2001 From: "Yogesh (OpenERP)" Date: Fri, 18 Feb 2011 18:18:46 +0530 Subject: [IMP] remove unused import statement. bzr revid: ysa@tinyerp.com-20110218124846-uas68so40m2bvi4n --- addons/project_issue/project_issue.py | 1 - 1 file changed, 1 deletion(-) (limited to 'addons/project_issue/project_issue.py') diff --git a/addons/project_issue/project_issue.py b/addons/project_issue/project_issue.py index 9e82eb01556..dce28737bfd 100644 --- a/addons/project_issue/project_issue.py +++ b/addons/project_issue/project_issue.py @@ -27,7 +27,6 @@ import binascii import time import tools - class project_issue_version(osv.osv): _name = "project.issue.version" _order = "name desc" -- cgit v1.2.3 From ece864e5320043ac91f35853d8ae78b797ba16c4 Mon Sep 17 00:00:00 2001 From: "Yogesh (OpenERP)" Date: Thu, 24 Feb 2011 15:43:05 +0530 Subject: [IMP] email.compose.message :- add the email_model=model name pass in context in xml file and change the active_model to email_model in default_get method. Global list define of email_model in crm and module are install then add the model name in this list. bzr revid: ysa@tinyerp.com-20110224101305-iagvga1j6o6h4k0k --- addons/project_issue/project_issue.py | 3 +++ 1 file changed, 3 insertions(+) (limited to 'addons/project_issue/project_issue.py') diff --git a/addons/project_issue/project_issue.py b/addons/project_issue/project_issue.py index dce28737bfd..1c8bc327d6d 100644 --- a/addons/project_issue/project_issue.py +++ b/addons/project_issue/project_issue.py @@ -26,6 +26,9 @@ from tools.translate import _ import binascii import time import tools +from crm import wizard + +wizard.email_compose_message.email_model.append('project.issue') class project_issue_version(osv.osv): _name = "project.issue.version" -- cgit v1.2.3 From 455fb2d6b349df99449e1b8655349be8ce2869db Mon Sep 17 00:00:00 2001 From: "Rifakat Haradwala (Open ERP)" Date: Fri, 18 Mar 2011 19:14:19 +0530 Subject: [IMP] email: email cleanup bzr revid: rha@tinyerp.com-20110318134419-78qmipdipsryqgnz --- addons/project_issue/project_issue.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'addons/project_issue/project_issue.py') diff --git a/addons/project_issue/project_issue.py b/addons/project_issue/project_issue.py index 1c8bc327d6d..e4f9a379358 100644 --- a/addons/project_issue/project_issue.py +++ b/addons/project_issue/project_issue.py @@ -46,7 +46,7 @@ class project_issue(crm.crm_case, osv.osv): _name = "project.issue" _description = "Project Issue" _order = "priority, id desc" - _inherit = ['mailgate.thread'] + _inherit = ['email.thread'] def case_open(self, cr, uid, ids, *args): """ @@ -374,7 +374,7 @@ class project_issue(crm.crm_case, osv.osv): """ if context is None: context = {} - mailgate_pool = self.pool.get('email.server.tools') + thread_pool = self.pool.get('email.thread') subject = msg.get('subject') or _('No Title') body = msg.get('body') @@ -391,7 +391,7 @@ class project_issue(crm.crm_case, osv.osv): if msg.get('priority', False): vals['priority'] = priority - res = mailgate_pool.get_partner(cr, uid, msg.get('from')) + res = thread_pool.get_partner(cr, uid, msg.get('from')) if res: vals.update(res) context.update({'state_to' : 'draft'}) -- cgit v1.2.3 From 2fe7c51e361ade79eef9af67f11a96a5fc24b035 Mon Sep 17 00:00:00 2001 From: "Rifakat Haradwala (Open ERP)" Date: Mon, 21 Mar 2011 19:01:56 +0530 Subject: [REM] email.smtp_server: removed email.smtp_server and did changes in email module bzr revid: rha@tinyerp.com-20110321133156-y57yw6sekshnw9ns --- addons/project_issue/project_issue.py | 12 ------------ 1 file changed, 12 deletions(-) (limited to 'addons/project_issue/project_issue.py') diff --git a/addons/project_issue/project_issue.py b/addons/project_issue/project_issue.py index e4f9a379358..3349334041f 100644 --- a/addons/project_issue/project_issue.py +++ b/addons/project_issue/project_issue.py @@ -455,18 +455,6 @@ class project_issue(crm.crm_case, osv.osv): res = self.write(cr, uid, ids, vals) return res - def msg_send(self, cr, uid, id, *args, **argv): - - """ Send The Message - @param self: The object pointer - @param cr: the current row, from the database cursor, - @param uid: the current user’s ID for security checks, - @param ids: List of email’s IDs - @param *args: Return Tuple Value - @param **args: Return Dictionary of Keyword Value - """ - return True - def copy(self, cr, uid, id, default=None, context=None): issue = self.read(cr, uid, id, ['name'], context=context) if not default: -- cgit v1.2.3 From 5bebe7d2f18062b2bf455db1092aeb3bfc76e576 Mon Sep 17 00:00:00 2001 From: "Rifakat Haradwala (Open ERP)" Date: Wed, 6 Apr 2011 13:17:01 +0530 Subject: [IMP] crm, email_thread.py: changes in message_new() arguments and improvements bzr revid: rha@tinyerp.com-20110406074701-70vye5ey1sgg3b2v --- addons/project_issue/project_issue.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'addons/project_issue/project_issue.py') diff --git a/addons/project_issue/project_issue.py b/addons/project_issue/project_issue.py index 3349334041f..bfb359ceeef 100644 --- a/addons/project_issue/project_issue.py +++ b/addons/project_issue/project_issue.py @@ -412,7 +412,7 @@ class project_issue(crm.crm_case, osv.osv): return res - def message_update(self, cr, uid, ids, vals=None, msg="", default_act='pending', context=None): + def message_update(self, cr, uid, ids, msg, vals=None, default_act='pending', context=None): """ @param self: The object pointer @param cr: the current row, from the database cursor, -- cgit v1.2.3 From 4fe15ff183e883ad6f8f8dfe83213f3f34bfc67b Mon Sep 17 00:00:00 2001 From: "Rifakat Haradwala (Open ERP)" Date: Wed, 6 Apr 2011 16:46:47 +0530 Subject: [FIX] crm, crm_claim, crm_helpdesk, hr_recruitent, project_issue, project_mailgate: fix double attachment creation error as removing attachment from message_new() bzr revid: rha@tinyerp.com-20110406111647-8xcyc2ershxj6q1a --- addons/project_issue/project_issue.py | 13 ------------- 1 file changed, 13 deletions(-) (limited to 'addons/project_issue/project_issue.py') diff --git a/addons/project_issue/project_issue.py b/addons/project_issue/project_issue.py index bfb359ceeef..11e76f142a1 100644 --- a/addons/project_issue/project_issue.py +++ b/addons/project_issue/project_issue.py @@ -397,19 +397,6 @@ class project_issue(crm.crm_case, osv.osv): context.update({'state_to' : 'draft'}) res = self.create(cr, uid, vals, context=context) self.convert_to_bug(cr, uid, [res], context=context) - - attachents = msg.get('attachments', []) - for attactment in attachents or []: - data_attach = { - 'name': attactment, - 'datas': binascii.b2a_base64(str(attachents.get(attactment))), - 'datas_fname': attactment, - 'description': 'Mail attachment', - 'res_model': self._name, - 'res_id': res, - } - self.pool.get('ir.attachment').create(cr, uid, data_attach) - return res def message_update(self, cr, uid, ids, msg, vals=None, default_act='pending', context=None): -- cgit v1.2.3 From 0db9b58ef9522f098e177aff63b3af8b260c6f47 Mon Sep 17 00:00:00 2001 From: "Rifakat Haradwala (Open ERP)" Date: Fri, 8 Apr 2011 16:40:01 +0530 Subject: [IMP] crm_helpdesk, project_issue, hr_recruitment, event, project_planning: inherited email.compose.message in these modules bzr revid: rha@tinyerp.com-20110408111001-9om0nhd9c9irtwkc --- addons/project_issue/project_issue.py | 2 -- 1 file changed, 2 deletions(-) (limited to 'addons/project_issue/project_issue.py') diff --git a/addons/project_issue/project_issue.py b/addons/project_issue/project_issue.py index 11e76f142a1..1d30cfbd74b 100644 --- a/addons/project_issue/project_issue.py +++ b/addons/project_issue/project_issue.py @@ -28,8 +28,6 @@ import time import tools from crm import wizard -wizard.email_compose_message.email_model.append('project.issue') - class project_issue_version(osv.osv): _name = "project.issue.version" _order = "name desc" -- cgit v1.2.3 From 7ed0659f6e25f387f041f4d6f91cfb76459462cf Mon Sep 17 00:00:00 2001 From: "Rifakat Haradwala (Open ERP)" Date: Wed, 20 Apr 2011 11:36:05 +0530 Subject: [IMP] mail: improvement for message_new() and related modules bzr revid: rha@tinyerp.com-20110420060605-7q1z5917g1b7wapw --- addons/project_issue/project_issue.py | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) (limited to 'addons/project_issue/project_issue.py') diff --git a/addons/project_issue/project_issue.py b/addons/project_issue/project_issue.py index 11e76f142a1..7d58bd77d36 100644 --- a/addons/project_issue/project_issue.py +++ b/addons/project_issue/project_issue.py @@ -395,9 +395,23 @@ class project_issue(crm.crm_case, osv.osv): if res: vals.update(res) context.update({'state_to' : 'draft'}) - res = self.create(cr, uid, vals, context=context) - self.convert_to_bug(cr, uid, [res], context=context) - return res + + res_id = self.create(cr, uid, vals, context) + + attachments = msg.get('attachments', []) + self.history(cr, uid, [res_id], _('receive'), history=True, + subject = msg.get('subject'), + email = msg.get('to'), + details = msg.get('body'), + email_from = msg.get('from'), + email_cc = msg.get('cc'), + message_id = msg.get('message-id'), + references = msg.get('references', False) or msg.get('in-reply-to', False), + attach = attachments, + email_date = msg.get('date'), + context = context) + self.convert_to_bug(cr, uid, [res_id], context=context) + return res_id def message_update(self, cr, uid, ids, msg, vals=None, default_act='pending', context=None): """ -- cgit v1.2.3 From 280e446ceffeae725249a2687db203e9f97d8abe Mon Sep 17 00:00:00 2001 From: "Rifakat Haradwala (Open ERP)" Date: Wed, 20 Apr 2011 11:56:46 +0530 Subject: [FIX]: attachment type as dictionary bzr revid: rha@tinyerp.com-20110420062646-ngijwvt2395cihuw --- addons/project_issue/project_issue.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'addons/project_issue/project_issue.py') diff --git a/addons/project_issue/project_issue.py b/addons/project_issue/project_issue.py index 7d58bd77d36..c8b55067fc5 100644 --- a/addons/project_issue/project_issue.py +++ b/addons/project_issue/project_issue.py @@ -398,7 +398,7 @@ class project_issue(crm.crm_case, osv.osv): res_id = self.create(cr, uid, vals, context) - attachments = msg.get('attachments', []) + attachments = msg.get('attachments', {}) self.history(cr, uid, [res_id], _('receive'), history=True, subject = msg.get('subject'), email = msg.get('to'), -- cgit v1.2.3 From 190148f759d9134a2ecae103342cdba19cec5dec Mon Sep 17 00:00:00 2001 From: "Rifakat Haradwala (Open ERP)" Date: Wed, 20 Apr 2011 13:41:41 +0530 Subject: [FIX]: changes in message_update() bzr revid: rha@tinyerp.com-20110420081141-4w1wi70e290m2a69 --- addons/project_issue/project_issue.py | 13 +++++++++++++ 1 file changed, 13 insertions(+) (limited to 'addons/project_issue/project_issue.py') diff --git a/addons/project_issue/project_issue.py b/addons/project_issue/project_issue.py index c8b55067fc5..e9e5521d94b 100644 --- a/addons/project_issue/project_issue.py +++ b/addons/project_issue/project_issue.py @@ -454,6 +454,19 @@ class project_issue(crm.crm_case, osv.osv): vals.update(vls) res = self.write(cr, uid, ids, vals) + + attachments = msg.get('attachments', {}) + self.history(cr, uid, ids, _('receive'), history=True, + subject = msg.get('subject'), + email = msg.get('to'), + details = msg.get('body'), + email_from = msg.get('from'), + email_cc = msg.get('cc'), + message_id = msg.get('message-id'), + references = msg.get('references', False) or msg.get('in-reply-to', False), + attach = attachments, + email_date = msg.get('date'), + context = context) return res def copy(self, cr, uid, id, default=None, context=None): -- cgit v1.2.3 From 4b2f93cb343874fb828a62694a09a858f7cc45c0 Mon Sep 17 00:00:00 2001 From: "Rifakat Haradwala (Open ERP)" Date: Thu, 21 Apr 2011 14:49:15 +0530 Subject: [FIX]: removed method _history() and called history() instead bzr revid: rha@tinyerp.com-20110421091915-fw1sr549av69mm4b --- addons/project_issue/project_issue.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'addons/project_issue/project_issue.py') diff --git a/addons/project_issue/project_issue.py b/addons/project_issue/project_issue.py index e9e5521d94b..a88ee17496e 100644 --- a/addons/project_issue/project_issue.py +++ b/addons/project_issue/project_issue.py @@ -361,7 +361,7 @@ class project_issue(crm.crm_case, osv.osv): else: raise osv.except_osv(_('Warning !'), _('You cannot escalate this issue.\nThe relevant Project has not configured the Escalation Project!')) self.write(cr, uid, [case.id], data) - self._history(cr, uid, cases, _('Escalate')) + self.history(cr, uid, cases, _('Escalate')) return True def message_new(self, cr, uid, msg, context=None): -- cgit v1.2.3 From 96a33521da4a5a01440a31b95ec34aba3394999b Mon Sep 17 00:00:00 2001 From: "Rifakat Haradwala (Open ERP)" Date: Mon, 2 May 2011 12:28:49 +0530 Subject: [IMP] crm,crm_claim,crm_helpdesk,hr_recruitment,project_issue,project_mailgate: improvement in message_new() bzr revid: rha@tinyerp.com-20110502065849-19nilmvniw28n8ts --- addons/project_issue/project_issue.py | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'addons/project_issue/project_issue.py') diff --git a/addons/project_issue/project_issue.py b/addons/project_issue/project_issue.py index 5bbd94c5a34..39c15bf85ca 100644 --- a/addons/project_issue/project_issue.py +++ b/addons/project_issue/project_issue.py @@ -420,6 +420,10 @@ class project_issue(crm.crm_case, osv.osv): references = msg.get('references', False) or msg.get('in-reply-to', False), attach = attachments, email_date = msg.get('date'), + body_html= msg.get('body_html'), + sub_type = msg.get('sub_type'), + headers = msg.get('headers'), + priority = msg.get('priority', False), context = context) self.convert_to_bug(cr, uid, [res_id], context=context) return res_id -- cgit v1.2.3 From 3a904e407b6b1a7122bac98470e3b9330926ffab Mon Sep 17 00:00:00 2001 From: "Rifakat Haradwala (Open ERP)" Date: Tue, 3 May 2011 12:08:44 +0530 Subject: [IMP] mail: able to retrive priority of an email message and related changes in message_new() and message_update() bzr revid: rha@tinyerp.com-20110503063844-yhlhlnpvciveh219 --- addons/project_issue/project_issue.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'addons/project_issue/project_issue.py') diff --git a/addons/project_issue/project_issue.py b/addons/project_issue/project_issue.py index 39c15bf85ca..def289ecc0f 100644 --- a/addons/project_issue/project_issue.py +++ b/addons/project_issue/project_issue.py @@ -423,7 +423,7 @@ class project_issue(crm.crm_case, osv.osv): body_html= msg.get('body_html'), sub_type = msg.get('sub_type'), headers = msg.get('headers'), - priority = msg.get('priority', False), + priority = msg.get('priority'), context = context) self.convert_to_bug(cr, uid, [res_id], context=context) return res_id @@ -481,6 +481,10 @@ class project_issue(crm.crm_case, osv.osv): references = msg.get('references', False) or msg.get('in-reply-to', False), attach = attachments, email_date = msg.get('date'), + body_html= msg.get('body_html'), + sub_type = msg.get('sub_type'), + headers = msg.get('headers'), + priority = msg.get('priority'), context = context) return res -- cgit v1.2.3 From 06fb14130a4bb88399c38979d1d07f37fbacf658 Mon Sep 17 00:00:00 2001 From: Olivier Dony Date: Sat, 2 Jul 2011 01:41:24 +0200 Subject: [IMP] removed method=True params from all fields.function Server revision 3495 odo@openerp.com-20110701232328-flgxulxva70vnyxr removed the need for passing method=True to function fields, so this is the equivalent addons fix, removing it everywhere. Please be careful from now on, and do not pass it anymore! bzr revid: odo@openerp.com-20110701234124-a61zl0idvdfz3hyb --- addons/project_issue/project_issue.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'addons/project_issue/project_issue.py') diff --git a/addons/project_issue/project_issue.py b/addons/project_issue/project_issue.py index a8a32847243..abb9b7e92ff 100644 --- a/addons/project_issue/project_issue.py +++ b/addons/project_issue/project_issue.py @@ -216,7 +216,7 @@ class project_issue(crm.crm_case, osv.osv): 'message_ids': fields.one2many('mailgate.message', 'res_id', 'Messages', domain=[('model','=',_name)]), 'date_action_last': fields.datetime('Last Action', readonly=1), 'date_action_next': fields.datetime('Next Action', readonly=1), - 'progress': fields.function(_hours_get, method=True, string='Progress (%)', multi='hours', group_operator="avg", help="Computed as: Time Spent / Total Time.", + 'progress': fields.function(_hours_get, string='Progress (%)', multi='hours', group_operator="avg", help="Computed as: Time Spent / Total Time.", store = { 'project.issue': (lambda self, cr, uid, ids, c={}: ids, ['task_id'], 10), 'project.task': (_get_issue_task, ['progress'], 10), -- cgit v1.2.3 From f36e724804ba112e63c702950b573d355168b13d Mon Sep 17 00:00:00 2001 From: Olivier Dony Date: Tue, 5 Jul 2011 14:28:57 +0200 Subject: [IMP] removed remaining method=True params from fields.function Server revision 3495 odo@openerp.com-20110701232328-flgxulxva70vnyxr removed the need for passing method=True to function fields. bzr revid: odo@openerp.com-20110705122857-zvzpamu0n24zst1q --- addons/project_issue/project_issue.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'addons/project_issue/project_issue.py') diff --git a/addons/project_issue/project_issue.py b/addons/project_issue/project_issue.py index abb9b7e92ff..b6032241a8e 100644 --- a/addons/project_issue/project_issue.py +++ b/addons/project_issue/project_issue.py @@ -205,14 +205,14 @@ class project_issue(crm.crm_case, osv.osv): 'duration': fields.float('Duration'), 'task_id': fields.many2one('project.task', 'Task', domain="[('project_id','=',project_id)]"), 'day_open': fields.function(_compute_day, string='Days to Open', \ - method=True, multi='compute_day', type="float", store=True), + multi='compute_day', type="float", store=True), 'day_close': fields.function(_compute_day, string='Days to Close', \ - method=True, multi='compute_day', type="float", store=True), + multi='compute_day', type="float", store=True), 'assigned_to': fields.many2one('res.users', 'Assigned to', required=False, select=1), 'working_hours_open': fields.function(_compute_day, string='Working Hours to Open the Issue', \ - method=True, multi='compute_day', type="float", store=True), + multi='compute_day', type="float", store=True), 'working_hours_close': fields.function(_compute_day, string='Working Hours to Close the Issue', \ - method=True, multi='compute_day', type="float", store=True), + multi='compute_day', type="float", store=True), 'message_ids': fields.one2many('mailgate.message', 'res_id', 'Messages', domain=[('model','=',_name)]), 'date_action_last': fields.datetime('Last Action', readonly=1), 'date_action_next': fields.datetime('Next Action', readonly=1), -- cgit v1.2.3 From 324e4a4fad3418cb4fa867633bc657f97dc28cd6 Mon Sep 17 00:00:00 2001 From: "Rucha (Open ERP)" Date: Tue, 9 Aug 2011 15:53:04 +0530 Subject: [ADD]: project_issue: Added new field inactivity days, which is the difference between the last_action_date and today bzr revid: rpa@tinyerp.com-20110809102304-qhyv4xmwlrbpfumu --- addons/project_issue/project_issue.py | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'addons/project_issue/project_issue.py') diff --git a/addons/project_issue/project_issue.py b/addons/project_issue/project_issue.py index b6032241a8e..209fc7f03de 100644 --- a/addons/project_issue/project_issue.py +++ b/addons/project_issue/project_issue.py @@ -116,6 +116,11 @@ class project_issue(crm.crm_case, osv.osv): hours = cal_obj.interval_hours_get(cr, uid, issue.project_id.resource_calendar_id.id, datetime.strptime(issue.create_date, '%Y-%m-%d %H:%M:%S'), datetime.strptime(issue.date_closed, '%Y-%m-%d %H:%M:%S')) + elif field in ['inactivity_days']: + if issue.date_action_last: + inactive_days = datetime.today() - datetime.strptime(issue.date_action_last, '%Y-%m-%d %H:%M:%S') + res[issue.id][field] = inactive_days.days + break if ans: resource_id = False if issue.user_id: @@ -213,6 +218,8 @@ class project_issue(crm.crm_case, osv.osv): multi='compute_day', type="float", store=True), 'working_hours_close': fields.function(_compute_day, string='Working Hours to Close the Issue', \ multi='compute_day', type="float", store=True), + 'inactivity_days': fields.function(_compute_day, string='Days since last action', \ + multi='compute_day', type="integer", help="Difference in days between last action and current date"), 'message_ids': fields.one2many('mailgate.message', 'res_id', 'Messages', domain=[('model','=',_name)]), 'date_action_last': fields.datetime('Last Action', readonly=1), 'date_action_next': fields.datetime('Next Action', readonly=1), -- cgit v1.2.3 From 5b4f60bcd046aa7da54195c614665b171b570f5b Mon Sep 17 00:00:00 2001 From: "ron@tinyerp.com" <> Date: Fri, 12 Aug 2011 18:36:24 +0530 Subject: [IMP]project_issue: Add new field(days_since_creation) as a diffrence between create_date and today() bzr revid: ron@tinyerp.com-20110812130624-34exduud974omfhn --- addons/project_issue/project_issue.py | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'addons/project_issue/project_issue.py') diff --git a/addons/project_issue/project_issue.py b/addons/project_issue/project_issue.py index 628ae886b50..794ee59e2ad 100644 --- a/addons/project_issue/project_issue.py +++ b/addons/project_issue/project_issue.py @@ -116,6 +116,12 @@ class project_issue(crm.crm_case, osv.osv): hours = cal_obj.interval_hours_get(cr, uid, issue.project_id.resource_calendar_id.id, datetime.strptime(issue.create_date, '%Y-%m-%d %H:%M:%S'), datetime.strptime(issue.date_closed, '%Y-%m-%d %H:%M:%S')) + elif field in ['days_since_creation']: + if issue.create_date: + days_since_creation = datetime.today() - datetime.strptime(issue.create_date, "%Y-%m-%d %H:%M:%S") + res[issue.id][field] = days_since_creation.days + continue + elif field in ['inactivity_days']: res[issue.id][field] = 0 if issue.date_action_last: @@ -177,6 +183,8 @@ class project_issue(crm.crm_case, osv.osv): 'active': fields.boolean('Active', required=False), 'create_date': fields.datetime('Creation Date', readonly=True,select=True), 'write_date': fields.datetime('Update Date', readonly=True), + 'days_since_creation': fields.function(_compute_day, string='Days since create date', \ + multi='compute_day', type="float", help="Difference in days between create date and current date"), 'date_deadline': fields.date('Deadline'), 'section_id': fields.many2one('crm.case.section', 'Sales Team', \ select=True, help='Sales team to which Case belongs to.\ -- cgit v1.2.3 From 672a71be9384755f9e29d43eaaf316c85d200467 Mon Sep 17 00:00:00 2001 From: "ron@tinyerp.com" <> Date: Fri, 12 Aug 2011 18:59:33 +0530 Subject: [IMP]project_issue: Improved in fields bzr revid: ron@tinyerp.com-20110812132933-cqdqnise609ubesr --- addons/project_issue/project_issue.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'addons/project_issue/project_issue.py') diff --git a/addons/project_issue/project_issue.py b/addons/project_issue/project_issue.py index 794ee59e2ad..12bfa85b283 100644 --- a/addons/project_issue/project_issue.py +++ b/addons/project_issue/project_issue.py @@ -183,8 +183,8 @@ class project_issue(crm.crm_case, osv.osv): 'active': fields.boolean('Active', required=False), 'create_date': fields.datetime('Creation Date', readonly=True,select=True), 'write_date': fields.datetime('Update Date', readonly=True), - 'days_since_creation': fields.function(_compute_day, string='Days since create date', \ - multi='compute_day', type="float", help="Difference in days between create date and current date"), + 'days_since_creation': fields.function(_compute_day, string='Days since creation date', \ + multi='compute_day', type="integer", help="Difference in days between creation date and current date"), 'date_deadline': fields.date('Deadline'), 'section_id': fields.many2one('crm.case.section', 'Sales Team', \ select=True, help='Sales team to which Case belongs to.\ -- cgit v1.2.3 From 32624d285743f09f65fac502b568223e569d0b6d Mon Sep 17 00:00:00 2001 From: fp Date: Thu, 18 Aug 2011 21:30:44 +0200 Subject: [IMP] Misc useability improvement bzr revid: fp@fp-laptop-20110818193044-dwv8je39jv65dbta --- addons/project_issue/project_issue.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'addons/project_issue/project_issue.py') diff --git a/addons/project_issue/project_issue.py b/addons/project_issue/project_issue.py index 12bfa85b283..2217bade5fa 100644 --- a/addons/project_issue/project_issue.py +++ b/addons/project_issue/project_issue.py @@ -190,17 +190,17 @@ class project_issue(crm.crm_case, osv.osv): select=True, help='Sales team to which Case belongs to.\ Define Responsible user and Email account for mail gateway.'), 'user_id': fields.related('project_id', 'user_id', type='many2one', relation='res.users', store=True, select=1, string='Responsible'), - 'partner_id': fields.many2one('res.partner', 'Partner'), + 'partner_id': fields.many2one('res.partner', 'Partner', select=1), 'partner_address_id': fields.many2one('res.partner.address', 'Partner Contact', \ domain="[('partner_id','=',partner_id)]"), 'company_id': fields.many2one('res.company', 'Company'), 'description': fields.text('Description'), - 'state': fields.selection([('draft', 'Draft'), ('open', 'To Do'), ('cancel', 'Cancelled'), ('done', 'Closed'),('pending', 'Pending'), ], 'State', size=16, readonly=True, + 'state': fields.selection([('draft', 'New'), ('open', 'To Do'), ('cancel', 'Cancelled'), ('done', 'Closed'),('pending', 'Pending'), ], 'State', size=16, readonly=True, help='The state is set to \'Draft\', when a case is created.\ \nIf the case is in progress the state is set to \'Open\'.\ \nWhen the case is over, the state is set to \'Done\'.\ \nIf the case needs to be reviewed then the state is set to \'Pending\'.'), - 'email_from': fields.char('Email', size=128, help="These people will receive email."), + 'email_from': fields.char('Email', size=128, help="These people will receive email.", select=1), 'email_cc': fields.char('Watchers Emails', size=256, help="These email addresses will be added to the CC field of all inbound and outbound emails for this record before being sent. Separate multiple email addresses with a comma"), 'date_open': fields.datetime('Opened', readonly=True,select=True), # Project Issue fields @@ -211,7 +211,7 @@ class project_issue(crm.crm_case, osv.osv): 'categ_id': fields.many2one('crm.case.categ', 'Category', domain="[('object_id.model', '=', 'crm.project.bug')]"), 'priority': fields.selection(crm.AVAILABLE_PRIORITIES, 'Priority'), 'version_id': fields.many2one('project.issue.version', 'Version'), - 'partner_name': fields.char("Employee's Name", size=64), + 'partner_name': fields.char("Partner Name", size=64), 'partner_mobile': fields.char('Mobile', size=32), 'partner_phone': fields.char('Phone', size=32), 'type_id': fields.many2one ('project.task.type', 'Resolution', domain="[('project_ids', '=', project_id)]"), -- cgit v1.2.3 From 8f9f45ea948d1ffecb79601e860d522fc6686c2d Mon Sep 17 00:00:00 2001 From: Olivier Dony Date: Mon, 22 Aug 2011 19:16:59 +0200 Subject: [IMP] all: next pass of review/renaming for new mail API bzr revid: odo@openerp.com-20110822171659-zxho36a6n628i10q --- addons/project_issue/project_issue.py | 67 +++++++---------------------------- 1 file changed, 13 insertions(+), 54 deletions(-) (limited to 'addons/project_issue/project_issue.py') diff --git a/addons/project_issue/project_issue.py b/addons/project_issue/project_issue.py index 484802f8638..d799d60d5db 100644 --- a/addons/project_issue/project_issue.py +++ b/addons/project_issue/project_issue.py @@ -44,7 +44,7 @@ class project_issue(crm.crm_case, osv.osv): _name = "project.issue" _description = "Project Issue" _order = "priority, create_date desc" - _inherit = ['email.thread'] + _inherit = ['mail.thread'] def case_open(self, cr, uid, ids, *args): """ @@ -383,20 +383,14 @@ class project_issue(crm.crm_case, osv.osv): self.history(cr, uid, cases, _('Escalate')) return True - def message_new(self, cr, uid, msg, context=None): - """ - Automatically calls when new email message arrives - - @param self: The object pointer - @param cr: the current row, from the database cursor, - @param uid: the current user’s ID for security checks - """ + def message_new(self, cr, uid, msg, custom_values=None, context=None): + """Automatically called when new email message arrives""" if context is None: context = {} - thread_pool = self.pool.get('email.thread') + thread_pool = self.pool.get('mail.thread') subject = msg.get('subject') or _('No Title') - body = msg.get('body') + body = msg.get('body_text') msg_from = msg.get('from') priority = msg.get('priority') @@ -407,7 +401,7 @@ class project_issue(crm.crm_case, osv.osv): 'description': body, 'user_id': False, } - if msg.get('priority', False): + if priority: vals['priority'] = priority res = thread_pool.get_partner(cr, uid, msg.get('from')) @@ -415,34 +409,15 @@ class project_issue(crm.crm_case, osv.osv): vals.update(res) context.update({'state_to' : 'draft'}) - res_id = self.create(cr, uid, vals, context) + if custom_values and isinstance(custom_values, dict): + vals.update(custom_values) - attachments = msg.get('attachments', {}) - self.history(cr, uid, [res_id], _('receive'), history=True, - subject = msg.get('subject'), - email = msg.get('to'), - details = msg.get('body'), - email_from = msg.get('from'), - email_cc = msg.get('cc'), - message_id = msg.get('message-id'), - references = msg.get('references', False) or msg.get('in-reply-to', False), - attach = attachments, - email_date = msg.get('date'), - body_html= msg.get('body_html'), - sub_type = msg.get('sub_type'), - headers = msg.get('headers'), - priority = msg.get('priority'), - context = context) + res_id = self.create(cr, uid, vals, context) + self.append_mail(cr, uid, [res_id], msg, context=context) self.convert_to_bug(cr, uid, [res_id], context=context) return res_id def message_update(self, cr, uid, ids, msg, vals=None, default_act='pending', context=None): - """ - @param self: The object pointer - @param cr: the current row, from the database cursor, - @param uid: the current user’s ID for security checks, - @param ids: List of update mail’s IDs - """ if vals is None: vals = {} @@ -451,7 +426,7 @@ class project_issue(crm.crm_case, osv.osv): ids = [ids] vals.update({ - 'description': msg['body'] + 'description': msg['body_text'] }) if msg.get('priority', False): vals['priority'] = msg.get('priority') @@ -468,7 +443,7 @@ class project_issue(crm.crm_case, osv.osv): record.write({'state' : 'open'}) vls = { } - for line in msg['body'].split('\n'): + for line in msg['body_text'].split('\n'): line = line.strip() res = tools.misc.command_re.match(line) if res and maps.get(res.group(1).lower(), False): @@ -477,23 +452,7 @@ class project_issue(crm.crm_case, osv.osv): vals.update(vls) res = self.write(cr, uid, ids, vals) - - attachments = msg.get('attachments', {}) - self.history(cr, uid, ids, _('receive'), history=True, - subject = msg.get('subject'), - email = msg.get('to'), - details = msg.get('body'), - email_from = msg.get('from'), - email_cc = msg.get('cc'), - message_id = msg.get('message-id'), - references = msg.get('references', False) or msg.get('in-reply-to', False), - attach = attachments, - email_date = msg.get('date'), - body_html= msg.get('body_html'), - sub_type = msg.get('sub_type'), - headers = msg.get('headers'), - priority = msg.get('priority'), - context = context) + self.append_mail(cr, uid, [res_id], msg, context=context) return res def copy(self, cr, uid, id, default=None, context=None): -- cgit v1.2.3 From 2f543db06e952991577ca659f6b9b4dfc57cf828 Mon Sep 17 00:00:00 2001 From: Olivier Dony Date: Thu, 25 Aug 2011 14:27:57 +0200 Subject: [IMP] mail: cleanup/rename API + adapt dependencies (wip) bzr revid: odo@openerp.com-20110825122757-0mqr0gbol25t0n41 --- addons/project_issue/project_issue.py | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) (limited to 'addons/project_issue/project_issue.py') diff --git a/addons/project_issue/project_issue.py b/addons/project_issue/project_issue.py index 4d4633a4c79..1524a14e880 100644 --- a/addons/project_issue/project_issue.py +++ b/addons/project_issue/project_issue.py @@ -388,20 +388,17 @@ class project_issue(crm.crm_case, osv.osv): else: raise osv.except_osv(_('Warning !'), _('You cannot escalate this issue.\nThe relevant Project has not configured the Escalation Project!')) self.write(cr, uid, [case.id], data) - self.history(cr, uid, cases, _('Escalate')) + self.message_append(cr, uid, cases, _('Escalate')) return True def message_new(self, cr, uid, msg, custom_values=None, context=None): """Automatically called when new email message arrives""" if context is None: context = {} - thread_pool = self.pool.get('mail.thread') - subject = msg.get('subject') or _('No Title') body = msg.get('body_text') msg_from = msg.get('from') priority = msg.get('priority') - vals = { 'name': subject, 'email_from': msg_from, @@ -411,17 +408,14 @@ class project_issue(crm.crm_case, osv.osv): } if priority: vals['priority'] = priority - - res = thread_pool.get_partner(cr, uid, msg.get('from')) - if res: - vals.update(res) + vals.update(self.message_partner_by_email(cr, uid, msg.get('from', False))) context.update({'state_to' : 'draft'}) if custom_values and isinstance(custom_values, dict): vals.update(custom_values) res_id = self.create(cr, uid, vals, context) - self.append_mail(cr, uid, [res_id], msg, context=context) + self.message_append_dict(cr, uid, [res_id], msg, context=context) self.convert_to_bug(cr, uid, [res_id], context=context) return res_id @@ -460,7 +454,7 @@ class project_issue(crm.crm_case, osv.osv): vals.update(vls) res = self.write(cr, uid, ids, vals) - self.append_mail(cr, uid, [res_id], msg, context=context) + self.message_append_dict(cr, uid, [res_id], msg, context=context) return res def copy(self, cr, uid, id, default=None, context=None): -- cgit v1.2.3 From e83ea8f54c27b816010195f54c1d33962cbfcaee Mon Sep 17 00:00:00 2001 From: Antony Lesuisse Date: Sun, 28 Aug 2011 01:31:30 +0200 Subject: [IMP] res.partner.canal into crm.case.channel bzr revid: al@openerp.com-20110827233130-end57de3i484r0kb --- addons/project_issue/project_issue.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'addons/project_issue/project_issue.py') diff --git a/addons/project_issue/project_issue.py b/addons/project_issue/project_issue.py index 2217bade5fa..ea974eea7d4 100644 --- a/addons/project_issue/project_issue.py +++ b/addons/project_issue/project_issue.py @@ -206,8 +206,7 @@ class project_issue(crm.crm_case, osv.osv): # Project Issue fields 'date_closed': fields.datetime('Closed', readonly=True,select=True), 'date': fields.datetime('Date'), - 'canal_id': fields.many2one('res.partner.canal', 'Channel', help="The channels represent the different communication modes available with the customer." \ - " With each commercial opportunity, you can indicate the canall which is this opportunity source."), + 'channel_id': fields.many2one('crm.case.channel', 'Channel', help="Communication channel."), 'categ_id': fields.many2one('crm.case.categ', 'Category', domain="[('object_id.model', '=', 'crm.project.bug')]"), 'priority': fields.selection(crm.AVAILABLE_PRIORITIES, 'Priority'), 'version_id': fields.many2one('project.issue.version', 'Version'), -- cgit v1.2.3 From f1c98c8160ad1f3f0740e3c0a24e29d408fd2392 Mon Sep 17 00:00:00 2001 From: Antony Lesuisse Date: Sun, 28 Aug 2011 04:22:24 +0200 Subject: [FIX] project_issue removed unused fields bzr revid: al@openerp.com-20110828022224-q3x2ogkdozmjao3b --- addons/project_issue/project_issue.py | 3 --- 1 file changed, 3 deletions(-) (limited to 'addons/project_issue/project_issue.py') diff --git a/addons/project_issue/project_issue.py b/addons/project_issue/project_issue.py index ea974eea7d4..61a45f01753 100644 --- a/addons/project_issue/project_issue.py +++ b/addons/project_issue/project_issue.py @@ -210,9 +210,6 @@ class project_issue(crm.crm_case, osv.osv): 'categ_id': fields.many2one('crm.case.categ', 'Category', domain="[('object_id.model', '=', 'crm.project.bug')]"), 'priority': fields.selection(crm.AVAILABLE_PRIORITIES, 'Priority'), 'version_id': fields.many2one('project.issue.version', 'Version'), - 'partner_name': fields.char("Partner Name", size=64), - 'partner_mobile': fields.char('Mobile', size=32), - 'partner_phone': fields.char('Phone', size=32), 'type_id': fields.many2one ('project.task.type', 'Resolution', domain="[('project_ids', '=', project_id)]"), 'project_id':fields.many2one('project.project', 'Project'), 'duration': fields.float('Duration'), -- cgit v1.2.3 From cfffadc509baa237a913f92b35500979026f3391 Mon Sep 17 00:00:00 2001 From: "Tejas (OpenERP)" Date: Tue, 30 Aug 2011 14:15:10 +0530 Subject: [Usability project_isses, renamed the field and changed the core relavend to it, assigned_to to user_id] bzr revid: tta@openerp.com-20110830084510-0zqh6akkptue5zet --- addons/project_issue/project_issue.py | 22 +++++----------------- 1 file changed, 5 insertions(+), 17 deletions(-) (limited to 'addons/project_issue/project_issue.py') diff --git a/addons/project_issue/project_issue.py b/addons/project_issue/project_issue.py index b6032241a8e..733e2035f19 100644 --- a/addons/project_issue/project_issue.py +++ b/addons/project_issue/project_issue.py @@ -56,7 +56,7 @@ class project_issue(crm.crm_case, osv.osv): """ res = super(project_issue, self).case_open(cr, uid, ids, *args) - self.write(cr, uid, ids, {'date_open': time.strftime('%Y-%m-%d %H:%M:%S'), 'assigned_to' : uid}) + self.write(cr, uid, ids, {'date_open': time.strftime('%Y-%m-%d %H:%M:%S'), 'user_id' : uid}) for (id, name) in self.name_get(cr, uid, ids): message = _("Issue '%s' has been opened.") % name self.log(cr, uid, id, message) @@ -174,8 +174,7 @@ class project_issue(crm.crm_case, osv.osv): 'date_deadline': fields.date('Deadline'), 'section_id': fields.many2one('crm.case.section', 'Sales Team', \ select=True, help='Sales team to which Case belongs to.\ - Define Responsible user and Email account for mail gateway.'), - 'user_id': fields.related('project_id', 'user_id', type='many2one', relation='res.users', store=True, select=1, string='Responsible'), + Define Responsible user and Email account for mail gateway.'), 'partner_id': fields.many2one('res.partner', 'Partner'), 'partner_address_id': fields.many2one('res.partner.address', 'Partner Contact', \ domain="[('partner_id','=',partner_id)]"), @@ -208,7 +207,7 @@ class project_issue(crm.crm_case, osv.osv): multi='compute_day', type="float", store=True), 'day_close': fields.function(_compute_day, string='Days to Close', \ multi='compute_day', type="float", store=True), - 'assigned_to': fields.many2one('res.users', 'Assigned to', required=False, select=1), + 'user_id': fields.many2one('res.users', 'Assigned to', required=False, select=1), 'working_hours_open': fields.function(_compute_day, string='Working Hours to Open the Issue', \ multi='compute_day', type="float", store=True), 'working_hours_close': fields.function(_compute_day, string='Working Hours to Close the Issue', \ @@ -230,17 +229,6 @@ class project_issue(crm.crm_case, osv.osv): return user.context_project_id.id return False - def on_change_project(self, cr, uid, ids, project_id, context=None): - result = {} - - if project_id: - project = self.pool.get('project.project').browse(cr, uid, project_id, context=context) - if project.user_id: - result['value'] = {'user_id' : project.user_id.id} - - return result - - _defaults = { 'active': 1, #'user_id': crm.crm_case._get_default_user, @@ -282,7 +270,7 @@ class project_issue(crm.crm_case, osv.osv): 'date': bug.date, 'project_id': bug.project_id.id, 'priority': bug.priority, - 'user_id': bug.assigned_to.id, + 'user_id': bug.user_id.id, 'planned_hours': 0.0, }) @@ -350,7 +338,7 @@ class project_issue(crm.crm_case, osv.osv): if not task_id: return {'value':{}} task = self.pool.get('project.task').browse(cr, uid, task_id, context=context) - return {'value':{'assigned_to': task.user_id.id,}} + return {'value':{'user_id': task.user_id.id,}} def case_escalate(self, cr, uid, ids, *args): """Escalates case to top level -- cgit v1.2.3 From b12caae3a086bed30ad2691a1a6b38d7f6685d4a Mon Sep 17 00:00:00 2001 From: Raphael Collet Date: Fri, 2 Sep 2011 14:29:24 +0200 Subject: [FIX] restore on_change_project on project_issue, to make it work in project_issue_sheet bzr revid: rco@openerp.com-20110902122924-nm75xvs60o1m3i4k --- addons/project_issue/project_issue.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'addons/project_issue/project_issue.py') diff --git a/addons/project_issue/project_issue.py b/addons/project_issue/project_issue.py index 733e2035f19..f008e383462 100644 --- a/addons/project_issue/project_issue.py +++ b/addons/project_issue/project_issue.py @@ -174,7 +174,7 @@ class project_issue(crm.crm_case, osv.osv): 'date_deadline': fields.date('Deadline'), 'section_id': fields.many2one('crm.case.section', 'Sales Team', \ select=True, help='Sales team to which Case belongs to.\ - Define Responsible user and Email account for mail gateway.'), + Define Responsible user and Email account for mail gateway.'), 'partner_id': fields.many2one('res.partner', 'Partner'), 'partner_address_id': fields.many2one('res.partner.address', 'Partner Contact', \ domain="[('partner_id','=',partner_id)]"), @@ -229,6 +229,10 @@ class project_issue(crm.crm_case, osv.osv): return user.context_project_id.id return False + def on_change_project(self, cr, uid, ids, project_id, context=None): + return {} + + _defaults = { 'active': 1, #'user_id': crm.crm_case._get_default_user, -- cgit v1.2.3 From 958002eadb22f385762a6a67337e349bb9849b14 Mon Sep 17 00:00:00 2001 From: Raphael Collet Date: Fri, 2 Sep 2011 15:09:08 +0200 Subject: [IMP] remove obsolete commented code bzr revid: rco@openerp.com-20110902130908-ep9chm1uvaeg7itc --- addons/project_issue/project_issue.py | 2 -- 1 file changed, 2 deletions(-) (limited to 'addons/project_issue/project_issue.py') diff --git a/addons/project_issue/project_issue.py b/addons/project_issue/project_issue.py index f008e383462..edef832a0c3 100644 --- a/addons/project_issue/project_issue.py +++ b/addons/project_issue/project_issue.py @@ -235,7 +235,6 @@ class project_issue(crm.crm_case, osv.osv): _defaults = { 'active': 1, - #'user_id': crm.crm_case._get_default_user, 'partner_id': crm.crm_case._get_default_partner, 'partner_address_id': crm.crm_case._get_default_partner_address, 'email_from': crm.crm_case._get_default_email, @@ -245,7 +244,6 @@ class project_issue(crm.crm_case, osv.osv): 'priority': crm.AVAILABLE_PRIORITIES[2][0], 'project_id':_get_project, 'categ_id' : lambda *a: False, - #'assigned_to' : lambda obj, cr, uid, context: uid, } def convert_issue_task(self, cr, uid, ids, context=None): -- cgit v1.2.3 From fbbbe76d00961944f629f45be235bc535d1cf0d6 Mon Sep 17 00:00:00 2001 From: Olivier Dony Date: Wed, 7 Sep 2011 23:15:47 +0200 Subject: [IMP] project.issue: simplified mail composition wizard bzr revid: odo@openerp.com-20110907211547-nzcjbqpkw7kmx1zc --- addons/project_issue/project_issue.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'addons/project_issue/project_issue.py') diff --git a/addons/project_issue/project_issue.py b/addons/project_issue/project_issue.py index b8585ab4f01..bbbead95c19 100644 --- a/addons/project_issue/project_issue.py +++ b/addons/project_issue/project_issue.py @@ -28,6 +28,8 @@ import time import tools from crm import wizard +wizard.mail_compose_message.SUPPORTED_MODELS.append('project.issue') + class project_issue_version(osv.osv): _name = "project.issue.version" _order = "name desc" @@ -404,7 +406,7 @@ class project_issue(crm.crm_case, osv.osv): } if priority: vals['priority'] = priority - vals.update(self.message_partner_by_email(cr, uid, msg.get('from', False))) + vals.update(self.message_partner_by_email(cr, uid, msg_from)) context.update({'state_to' : 'draft'}) if custom_values and isinstance(custom_values, dict): -- cgit v1.2.3 From 898108de880227ad006b4c097444aa026f4e2f4d Mon Sep 17 00:00:00 2001 From: Olivier Dony Date: Thu, 8 Sep 2011 03:06:17 +0200 Subject: [FIX] project.issue: typo bzr revid: odo@openerp.com-20110908010617-sjy3xnkw2o8uqgjm --- addons/project_issue/project_issue.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'addons/project_issue/project_issue.py') diff --git a/addons/project_issue/project_issue.py b/addons/project_issue/project_issue.py index bbbead95c19..8237159af7a 100644 --- a/addons/project_issue/project_issue.py +++ b/addons/project_issue/project_issue.py @@ -452,7 +452,7 @@ class project_issue(crm.crm_case, osv.osv): vals.update(vls) res = self.write(cr, uid, ids, vals) - self.message_append_dict(cr, uid, [res_id], msg, context=context) + self.message_append_dict(cr, uid, ids, msg, context=context) return res def copy(self, cr, uid, id, default=None, context=None): -- cgit v1.2.3