[MRG] purchase: don't duplicate origin when merging purchase orders

https://launchpad.net/bugs/1091268
OCA · Jul 2, 2014 · 75fc0f8 · 75fc0f8
1 parent c3bc1f8
commit 75fc0f8
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/addons/purchase/purchase.py b/addons/purchase/purchase.py
@@ -797,7 +797,8 @@ def make_key(br, fields):
                 if porder.notes:
                     order_infos['notes'] = (order_infos['notes'] or '') + ('\n%s' % (porder.notes,))
                 if porder.origin:
-                    order_infos['origin'] = (order_infos['origin'] or '') + ' ' + porder.origin
+                    if not porder.origin in order_infos['origin'] and not order_infos['origin'] in porder.origin:
+                        order_infos['origin'] = (order_infos['origin'] or '') + ' ' + porder.origin
 
             for order_line in porder.order_line:
                 line_key = make_key(order_line, ('name', 'date_planned', 'taxes_id', 'price_unit', 'product_id', 'move_dest_id', 'account_analytic_id'))