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

[Yann Papouin]

[Pedro Manuel Baeza (pedro.baeza)]

Thanks for the patch!

review: Approve (code review)

[Guewen Baconnier @ Camptocamp (gbaconnier-c2c)]

Thanks.
Same as the OPW patch https://code.launchpad.net/~openerp-dev/openobject-addons/6.1-opw-587363-ado/+merge/153063
Who is the author? If Amit Dodiya is, it would have been better if you committed with --author attributed to Amit.

review: Approve (code review)

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

review: Approve (code review, no test)

[Holger Brunn (Therp) (hbrunn)]

we can give the credits also at merge time

review: Approve (code review)

=== modified file 'sale/sale.py'
--- sale/sale.py	2013-11-20 01:17:39 +0000
+++ sale/sale.py	2013-12-18 15:47:54 +0000
@@ -756,7 +756,7 @@
         return {
             'name': pick_name,
             'origin': order.name,
-            'date': order.date_order,
+            'date': order.date_confirm,
             'type': 'out',
             'state': 'auto',
             'move_type': order.picking_policy,
@@ -822,7 +822,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.product_tmpl_id.type in ('product', 'consu'):