From a87573108a2341c597bfb7aff4fcb2c49cae7f0e Mon Sep 17 00:00:00 2001 From: "Randhir Mayatra (OpenERP)" Date: Fri, 23 Nov 2012 15:45:45 +0530 Subject: [PATCH 1/6] [IMP] make changes into purchase bzr revid: rma@tinyerp.com-20121123101545-mkn024hrfw0pte62 --- addons/purchase/purchase.py | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/addons/purchase/purchase.py b/addons/purchase/purchase.py index ad7563140b2..9216e1171bd 100644 --- a/addons/purchase/purchase.py +++ b/addons/purchase/purchase.py @@ -393,14 +393,9 @@ class purchase_order(osv.osv): compose_form_id = ir_model_data.get_object_reference(cr, uid, 'mail', 'email_compose_message_wizard_form')[1] except ValueError: compose_form_id = False - ctx = dict(context) - ctx.update({ - 'default_model': 'purchase.order', - 'default_res_id': ids[0], - 'default_use_template': bool(template_id), - 'default_template_id': template_id, - 'default_composition_mode': 'comment', - }) + ctx = dict(context, active_model='purchase.order', active_id=ids[0]) + ctx.update({'mail.compose.template_id': template_id}) + wf_service = netsvc.LocalService("workflow") return { 'type': 'ir.actions.act_window', 'view_type': 'form', @@ -971,7 +966,6 @@ class purchase_order_line(osv.osv): res['warning'] = {'title': _('Warning!'), 'message': _('The selected supplier only sells this product by %s') % supplierinfo.product_uom.name } min_qty = product_uom._compute_qty(cr, uid, supplierinfo.product_uom.id, supplierinfo.min_qty, to_uom_id=uom_id) if qty < min_qty: # If the supplier quantity is greater than entered from user, set minimal. - res['warning'] = {'title': _('Warning!'), 'message': _('The selected supplier has a minimal quantity set to %s %s, you should not purchase less.') % (supplierinfo.min_qty, supplierinfo.product_uom.name)} qty = min_qty dt = self._get_date_planned(cr, uid, supplierinfo, date_order, context=context).strftime(DEFAULT_SERVER_DATETIME_FORMAT) From 71b035a4b0188988d5c04aa677930878a5be7c25 Mon Sep 17 00:00:00 2001 From: "Randhir Mayatra (OpenERP)" Date: Mon, 26 Nov 2012 16:29:27 +0530 Subject: [PATCH 2/6] [IMP] improve the code bzr revid: rma@tinyerp.com-20121126105927-a7br219gcmswj8jz --- addons/purchase/purchase.py | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/addons/purchase/purchase.py b/addons/purchase/purchase.py index 9216e1171bd..f89af703b2a 100644 --- a/addons/purchase/purchase.py +++ b/addons/purchase/purchase.py @@ -393,8 +393,13 @@ class purchase_order(osv.osv): compose_form_id = ir_model_data.get_object_reference(cr, uid, 'mail', 'email_compose_message_wizard_form')[1] except ValueError: compose_form_id = False - ctx = dict(context, active_model='purchase.order', active_id=ids[0]) - ctx.update({'mail.compose.template_id': template_id}) + ctx = dict(context) + ctx.update({ + 'default_model': 'purchase.order', + 'default_res_id': ids[0], + 'default_use_template': True, + 'default_template_id': template_id, + }) wf_service = netsvc.LocalService("workflow") return { 'type': 'ir.actions.act_window', From ced0105429cf42c20b512ef92fdf8996c555784d Mon Sep 17 00:00:00 2001 From: "Randhir Mayatra (OpenERP)" Date: Mon, 26 Nov 2012 16:38:54 +0530 Subject: [PATCH 3/6] [IMP] improve the code bzr revid: rma@tinyerp.com-20121126110854-j1t4yhh3glbr6g0g --- addons/purchase/purchase.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/purchase/purchase.py b/addons/purchase/purchase.py index f89af703b2a..493b20395a9 100644 --- a/addons/purchase/purchase.py +++ b/addons/purchase/purchase.py @@ -399,7 +399,7 @@ class purchase_order(osv.osv): 'default_res_id': ids[0], 'default_use_template': True, 'default_template_id': template_id, - }) + }) wf_service = netsvc.LocalService("workflow") return { 'type': 'ir.actions.act_window', From e504c5b3984459a37902cbc67e6c48e15182ed86 Mon Sep 17 00:00:00 2001 From: "Randhir Mayatra (OpenERP)" Date: Mon, 26 Nov 2012 16:49:54 +0530 Subject: [PATCH 4/6] [IMP] improve the code bzr revid: rma@tinyerp.com-20121126111954-j31pq21h08w8qp4h --- addons/purchase/purchase.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/addons/purchase/purchase.py b/addons/purchase/purchase.py index 493b20395a9..755d02929eb 100644 --- a/addons/purchase/purchase.py +++ b/addons/purchase/purchase.py @@ -393,12 +393,14 @@ class purchase_order(osv.osv): compose_form_id = ir_model_data.get_object_reference(cr, uid, 'mail', 'email_compose_message_wizard_form')[1] except ValueError: compose_form_id = False + ctx = dict(context) ctx.update({ 'default_model': 'purchase.order', 'default_res_id': ids[0], - 'default_use_template': True, + 'default_use_template': bool(template_id), 'default_template_id': template_id, + 'default_composition_mode': 'comment', }) wf_service = netsvc.LocalService("workflow") return { From e6aa825a0e3317eafdfafe264690cb18e1483be2 Mon Sep 17 00:00:00 2001 From: "Randhir Mayatra (OpenERP)" Date: Mon, 26 Nov 2012 17:03:27 +0530 Subject: [PATCH 5/6] [IMP] remove extra line in code bzr revid: rma@tinyerp.com-20121126113327-vtcbxoqxyyj26ku9 --- addons/purchase/purchase.py | 1 - 1 file changed, 1 deletion(-) diff --git a/addons/purchase/purchase.py b/addons/purchase/purchase.py index 755d02929eb..c00e79a06fd 100644 --- a/addons/purchase/purchase.py +++ b/addons/purchase/purchase.py @@ -393,7 +393,6 @@ class purchase_order(osv.osv): compose_form_id = ir_model_data.get_object_reference(cr, uid, 'mail', 'email_compose_message_wizard_form')[1] except ValueError: compose_form_id = False - ctx = dict(context) ctx.update({ 'default_model': 'purchase.order', From bbf39667dec88c4e7c8dea06d844908acaa4e0b0 Mon Sep 17 00:00:00 2001 From: "Randhir Mayatra (OpenERP)" Date: Mon, 26 Nov 2012 17:21:37 +0530 Subject: [PATCH 6/6] [IMP] remove extra code bzr revid: rma@tinyerp.com-20121126115137-0nrsd61ye9uq73w9 --- addons/purchase/purchase.py | 1 - 1 file changed, 1 deletion(-) diff --git a/addons/purchase/purchase.py b/addons/purchase/purchase.py index c00e79a06fd..b3513ccdc63 100644 --- a/addons/purchase/purchase.py +++ b/addons/purchase/purchase.py @@ -401,7 +401,6 @@ class purchase_order(osv.osv): 'default_template_id': template_id, 'default_composition_mode': 'comment', }) - wf_service = netsvc.LocalService("workflow") return { 'type': 'ir.actions.act_window', 'view_type': 'form',