Alexandre Fayolle @ camptocamp has proposed merging
lp:~c2c/e-commerce-addons/oerp6.1-stable-fix-1080690 into
lp:e-commerce-addons/oerp6.1-stable.
Requested reviews:
extra-addons-commiter (extra-addons-commiter)
Related bugs:
Bug #1080690 in e-commerce-addons: "[6.1-stable / 6.1-trunk]
base_sale_multichannel: when exporting shipping, only non-canceled outgoing
moves must be considered"
https://bugs.launchpad.net/e-commerce-addons/+bug/1080690
For more details, see:
https://code.launchpad.net/~c2c/e-commerce-addons/oerp6.1-stable-fix-1080690/+merge/137503
do not count cancelled moves when finding shipped SO.
--
https://code.launchpad.net/~c2c/e-commerce-addons/oerp6.1-stable-fix-1080690/+merge/137503
Your team extra-addons-commiter is requested to review the proposed merge of
lp:~c2c/e-commerce-addons/oerp6.1-stable-fix-1080690 into
lp:e-commerce-addons/oerp6.1-stable.
=== modified file 'base_sale_multichannels/sale.py'
--- base_sale_multichannels/sale.py 2012-11-19 13:22:31 +0000
+++ base_sale_multichannels/sale.py 2012-12-03 08:34:19 +0000
@@ -368,7 +368,9 @@
LEFT JOIN sale_order
ON sale_order.id = stock_picking.sale_id
LEFT JOIN stock_picking as pickings
- ON (sale_order.id = pickings.sale_id AND pickings.type='out')
+ ON (sale_order.id = pickings.sale_id
+ AND pickings.type='out'
+ AND pickings.state!='cancel')
LEFT JOIN ir_model_data
ON stock_picking.id = ir_model_data.res_id
AND ir_model_data.model = 'stock.picking'
--
Mailing list: https://launchpad.net/~savoirfairelinux-openerp
Post to : [email protected]
Unsubscribe : https://launchpad.net/~savoirfairelinux-openerp
More help : https://help.launchpad.net/ListHelp
