Yann Papouin has proposed merging
lp:~yann-papouin/ocb-addons/6.1-bug-1091268-purchase-merge-no-origin-duplicates
into lp:ocb-addons/6.1.
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/6.1-bug-1091268-purchase-merge-no-origin-duplicates/+merge/205175
--
https://code.launchpad.net/~yann-papouin/ocb-addons/6.1-bug-1091268-purchase-merge-no-origin-duplicates/+merge/205175
Your team OpenERP Community Backports Team is requested to review the proposed
merge of
lp:~yann-papouin/ocb-addons/6.1-bug-1091268-purchase-merge-no-origin-duplicates
into lp:ocb-addons/6.1.
=== 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'))
--
Mailing list: https://launchpad.net/~openerp-community-reviewer
Post to : openerp-community-reviewer@lists.launchpad.net
Unsubscribe : https://launchpad.net/~openerp-community-reviewer
More help : https://help.launchpad.net/ListHelp
