openerp-community-reviewer team mailing list archive

[Yann Papouin <yann.papouin@xxxxxxxxx>]

Yann Papouin has proposed merging lp:~yann-papouin/ocb-addons/7.0-bug-1091268-purchase-merge-no-origin-duplicates into lp:ocb-addons.

Requested reviews:
  OpenERP Community Backports Team (ocb)
Related bugs:
  Bug #1091268 in OpenERP Community Backports (Addons): "Useless duplicates origin when merging purchase orders"
  https://bugs.launchpad.net/ocb-addons/+bug/1091268

For more details, see:
https://code.launchpad.net/~yann-papouin/ocb-addons/7.0-bug-1091268-purchase-merge-no-origin-duplicates/+merge/210169

Automatically derived from https://code.launchpad.net/~yann-papouin/openobject-addons/7.0-bug-1091268-purchase-merge-no-origin-duplicates for https://code.launchpad.net/~openerp/openobject-addons/7.0.
-- 
https://code.launchpad.net/~yann-papouin/ocb-addons/7.0-bug-1091268-purchase-merge-no-origin-duplicates/+merge/210169
Your team OpenERP Community Backports Team is requested to review the proposed merge of lp:~yann-papouin/ocb-addons/7.0-bug-1091268-purchase-merge-no-origin-duplicates into lp:ocb-addons.

=== modified file 'purchase/purchase.py'
--- purchase/purchase.py	2014-01-29 16:32:38 +0000
+++ purchase/purchase.py	2014-03-10 10:12:42 +0000
@@ -797,7 +797,8 @@
                 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'))