From 26a39a6d0c269921544ce4bd58914dcc7fbcd35b Mon Sep 17 00:00:00 2001 From: "Ankita Patel (OpenERP)" Date: Tue, 19 Jun 2012 17:40:16 +0530 Subject: [PATCH 1/2] [FIX]sale_crm: update context bzr revid: pat@tinyerp.com-20120619121016-quk5kem1eud7ddro --- addons/edi/models/edi.py | 3 ++- addons/sale/sale.py | 3 +++ addons/sale_crm/wizard/crm_make_sale.py | 1 - 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/addons/edi/models/edi.py b/addons/edi/models/edi.py index 589922ff178..54963fe6f0f 100644 --- a/addons/edi/models/edi.py +++ b/addons/edi/models/edi.py @@ -520,7 +520,8 @@ class EDIMixin(object): 'datas': result, 'datas_fname': file_name, 'res_model': self._name, - 'res_id': record.id}, + 'res_id': record.id, + 'type': 'binary'}, context=context) def _edi_import_attachments(self, cr, uid, record_id, edi_document, context=None): diff --git a/addons/sale/sale.py b/addons/sale/sale.py index dbdfcbc4fbd..c3b787ff85b 100644 --- a/addons/sale/sale.py +++ b/addons/sale/sale.py @@ -763,14 +763,17 @@ class sale_order(osv.osv): ''' This function opens a window to compose an email, with the edi sale template message loaded by default ''' + print "\n =--===== context -==>", context assert len(ids) == 1, 'This option should only be used for a single id at a time' mod_obj = self.pool.get('ir.model.data') template = mod_obj.get_object_reference(cr, uid, 'sale', 'email_template_edi_sale') + print "\n\ntemplate.......", template, "\n" template_id = template and template[1] or False res = mod_obj.get_object_reference(cr, uid, 'mail', 'email_compose_message_wizard_form') res_id = res and res[1] or False ctx = dict(context, active_model='sale.order', active_id=ids[0]) ctx.update({'mail.compose.template_id': template_id}) + print "\n =--===== cont -==>", ctx return { 'view_type': 'form', 'view_mode': 'form', diff --git a/addons/sale_crm/wizard/crm_make_sale.py b/addons/sale_crm/wizard/crm_make_sale.py index 9484b87652e..823d8d6ab07 100644 --- a/addons/sale_crm/wizard/crm_make_sale.py +++ b/addons/sale_crm/wizard/crm_make_sale.py @@ -107,7 +107,6 @@ class crm_make_sale(osv.osv_memory): new_ids.append(new_id) message = _("Opportunity has been converted to the quotation %s.") % (sale_order.name) case.message_append_note(body=message) - if make.close: case_obj.case_close(cr, uid, data) if not new_ids: From e2f3a725ae47efcf247737d384719ff3668c687a Mon Sep 17 00:00:00 2001 From: "Ankita Patel (OpenERP)" Date: Tue, 19 Jun 2012 18:48:34 +0530 Subject: [PATCH 2/2] [FIX]sale_crm: remove print statement bzr revid: pat@tinyerp.com-20120619131834-iluwzicq2q1x765h --- addons/sale/sale.py | 3 --- 1 file changed, 3 deletions(-) diff --git a/addons/sale/sale.py b/addons/sale/sale.py index c3b787ff85b..dbdfcbc4fbd 100644 --- a/addons/sale/sale.py +++ b/addons/sale/sale.py @@ -763,17 +763,14 @@ class sale_order(osv.osv): ''' This function opens a window to compose an email, with the edi sale template message loaded by default ''' - print "\n =--===== context -==>", context assert len(ids) == 1, 'This option should only be used for a single id at a time' mod_obj = self.pool.get('ir.model.data') template = mod_obj.get_object_reference(cr, uid, 'sale', 'email_template_edi_sale') - print "\n\ntemplate.......", template, "\n" template_id = template and template[1] or False res = mod_obj.get_object_reference(cr, uid, 'mail', 'email_compose_message_wizard_form') res_id = res and res[1] or False ctx = dict(context, active_model='sale.order', active_id=ids[0]) ctx.update({'mail.compose.template_id': template_id}) - print "\n =--===== cont -==>", ctx return { 'view_type': 'form', 'view_mode': 'form',