e-commerce-addons

Merge lp:~camptocamp/e-commerce-addons/oerp6.1-stable-fix-1080690 into lp:~extra-addons-commiter/e-commerce-addons/oerp6.1-stable

  1. oerp6.1-stable-fix-1080690
  2. Merge into oerp6.1-stable
Proposed by Alexandre Fayolle - camptocamp
Status: Merged
Merged at revision: 272
Proposed branch: lp:~camptocamp/e-commerce-addons/oerp6.1-stable-fix-1080690
Merge into: lp:~extra-addons-commiter/e-commerce-addons/oerp6.1-stable
Diff against target: 20 lines (+2/-1)
1 file modified
base_sale_multichannels/sale.py (+2/-1)
To merge this branch: bzr merge lp:~camptocamp/e-commerce-addons/oerp6.1-stable-fix-1080690
Reviewer Review Type Date Requested Status
Raphaël Valyi - http://www.akretion.com Approve
Guewen Baconnier @ Camptocamp Approve
Review via email: mp+134901@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Alexandre Fayolle - camptocamp (alexandre-fayolle-c2c) wrote :

fixes lp:1080690 by using only outgoing stock.pickings when checking if a sale order shipping state should be exported to Magento

Revision history for this message
Guewen Baconnier @ Camptocamp (gbaconnier-c2c) wrote :

Sounds correct to me, we have to consider only the outgoing pickings.

review: Approve
Revision history for this message
Raphaël Valyi - http://www.akretion.com (rvalyi) wrote :

Same as Guewen

review: Approve
lp:~camptocamp/e-commerce-addons/oerp6.1-stable-fix-1080690 updated
272. By Sébastien BEAU - http://www.akretion.com

[MERGE] merge fix from Alexandre Fayolle C2C, thanks

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'base_sale_multichannels/sale.py'
2--- base_sale_multichannels/sale.py 2012-08-21 07:38:58 +0000
3+++ base_sale_multichannels/sale.py 2012-11-19 13:26:26 +0000
4@@ -368,7 +368,7 @@
5 LEFT JOIN sale_order
6 ON sale_order.id = stock_picking.sale_id
7 LEFT JOIN stock_picking as pickings
8- ON sale_order.id = pickings.sale_id
9+ ON (sale_order.id = pickings.sale_id AND pickings.type='out')
10 LEFT JOIN ir_model_data
11 ON stock_picking.id = ir_model_data.res_id
12 AND ir_model_data.model = 'stock.picking'
13@@ -377,6 +377,7 @@
14 WHERE sale_order.shop_id = %(shop_id)s
15 AND ir_model_data.res_id ISNULL
16 AND stock_picking.state = 'done'
17+ AND stock_picking.type = 'out'
18 AND NOT stock_picking.do_not_export
19 AND (NOT delivery_carrier.export_needs_tracking
20 OR stock_picking.carrier_tracking_ref IS NOT NULL)

Subscribers

People subscribed via source and target branches