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

[Yann Papouin]

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.

[Holger Brunn (Therp) (hbrunn)]

same as in 6.1-ocb

review: Approve (code review)

[Sandy Carter (http://www.savoirfairelinux.com) (sandy-carter)]

LGTM

review: Approve (code review, pep8)

[Pedro Manuel Baeza (pedro.baeza)]

Thanks for bringing all these patches to 7.0 branch.

Regards.

review: Approve (code review)

[Ronald Portier (Therp) (rportier1962)]

Approve

review: Approve (code review)

=== 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'):