Merge lp:~openerp-dev/openobject-addons/6.1-opw-587363-ado into lp:openobject-addons/6.1

[Amit Dodiya (OpenERP)]

Hello,

[FIX] the delivery order should take the confirmation date of SO not the creation date in order date and expected date

Steps:
1). Install sale and stock module
2). Now create sale order of date before 1 month(1st Feb.2013)
3). Confirm that sale order on today with current date
Now check the delivery order the "Order Date" and "Extected Date" is calculated based on Creation date of Sale order which is 1 month ago, the delivery date is passed because of sale order is created on Feb.2013.

Regards,
Amit

Unmerged revisions

7184. By Amit Dodiya (OpenERP) on 2013-03-13

[FIX] the delivery order should take the confirmation date of SO not the creation date in order date and expected date

=== modified file 'sale/sale.py'
--- sale/sale.py	2012-10-09 12:16:14 +0000
+++ sale/sale.py	2013-03-13 07:00:29 +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'):