Merge lp:~yann-papouin/ocb-addons/6.1-bug-1091268-purchase-merge-no-origin-duplicates into lp:ocb-addons/6.1

[Yann Papouin]

[Pedro Manuel Baeza (pedro.baeza)]

Why do you need the second part of the if (and not order_infos['origin'] in porder.origin)? Please put an example.

Again, I insist in the convenience of porting also this kind of patches to OCB 7.0, because the patch will arrive on trunk, not on v7.

Regards.

review: Needs Information

[Yann Papouin (yann-papouin)]

The merge will occurs in one side or another, since a merged purchase order can be merged again and again.
>>> originA = 'AAA'
>>> originB = 'AAA BBB CCC'
>>> originA in originB
True
>>> originB in originA
False

About the OCB 7.0, I currently concentrate my effort on pushing on OCB all 6.1 bugs fixes I currently use in production. About this I would be interested in a script that could auto replay a merge proposal from 6.1 to 7.0.

[Pedro Manuel Baeza (pedro.baeza)]

OK, now I get it.

About the script, it's difficult to make it automatic, but maybe bzr-replay must serve. I made all manually for the moment. It's only a little effort, but community will appreciate it if you do it! ;)

Regards.

review: Approve (code review)

[Holger Brunn (Therp) (hbrunn)]

review: Approve (code review)

[Yannick Vaucher @ Camptocamp (yvaucher-c2c)]

review: Approve (code review, no tests)

=== modified file 'purchase/purchase.py'
--- purchase/purchase.py	2013-11-20 01:17:39 +0000
+++ purchase/purchase.py	2014-02-06 14:46:55 +0000
@@ -592,7 +592,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', 'notes', 'product_id', 'move_dest_id', 'account_analytic_id'))