← Back to team overview

openerp-community-reviewer team mailing list archive

[Merge] lp:~yann-papouin/ocb-addons/7.0-bug-1260778-sale-date-confirm into lp:ocb-addons

 

Yann Papouin has proposed merging lp:~yann-papouin/ocb-addons/7.0-bug-1260778-sale-date-confirm into lp:ocb-addons.

Requested reviews:
  OpenERP Community Backports Team (ocb)
Related bugs:
  Bug #1260778 in OpenERP Community Backports (Addons): "[6.1][7.0][trunk] Delivery order should take the confirmation date of the sale order"
  https://bugs.launchpad.net/ocb-addons/+bug/1260778

For more details, see:
https://code.launchpad.net/~yann-papouin/ocb-addons/7.0-bug-1260778-sale-date-confirm/+merge/210164

Automatically derived from https://code.launchpad.net/~yann-papouin/openobject-addons/7.0-bug-1260778-sale-date-confirm for https://code.launchpad.net/~openerp/openobject-addons/7.0.
-- 
https://code.launchpad.net/~yann-papouin/ocb-addons/7.0-bug-1260778-sale-date-confirm/+merge/210164
Your team OpenERP Community Backports Team is requested to review the proposed merge of lp:~yann-papouin/ocb-addons/7.0-bug-1260778-sale-date-confirm into lp:ocb-addons.
=== modified file 'sale_stock/sale_stock.py'
--- sale_stock/sale_stock.py	2013-11-28 11:40:19 +0000
+++ sale_stock/sale_stock.py	2014-03-10 09:59:41 +0000
@@ -340,7 +340,7 @@
         return {
             'name': pick_name,
             'origin': order.name,
-            'date': self.date_to_datetime(cr, uid, order.date_order, context),
+            'date': self.date_to_datetime(cr, uid, order.date_confirm, context),
             'type': 'out',
             'state': 'auto',
             'move_type': order.picking_policy,
@@ -407,7 +407,7 @@
             if line.state == 'done':
                 continue
 
-            date_planned = self._get_date_planned(cr, uid, order, line, order.date_order, context=context)
+            date_planned = self._get_date_planned(cr, uid, order, line, order.date_confirm, context=context)
 
             if line.product_id:
                 if line.product_id.type in ('product', 'consu'):


Follow ups