Merge lp:~akretion-team/openobject-addons/date_planned_refactor into lp:openobject-addons

[Benoit Guillot - http://www.akretion.com]

This is a refactoring of date_planned in order to overload it easily. I just defined a new function : _get_date_planned. I need it for a module calculating the delivery delays and managing the supplier shortages.

[Raphaël Valyi - http://www.akretion.com (rvalyi)]

Hello Benoît,

Overall I agree with the idea, but technically could you please consider my last commit here:
https://code.launchpad.net/~akretion-team/openobject-addons/sale-modular-picking-better-context/+merge/82944
(that is http://bazaar.launchpad.net/~akretion-team/openobject-addons/sale-modular-picking-better-context/revision/6026 )

So as you can see, according to our recent discussions on LP, we assume that ideally methods called by workflow action have a normal context aware signature. My last commit bring that normalization to the methods I recently refactored. I'm now requesting the merge of 82944 to OpenERP SA. Could you please refactor your method to have a context as the last arg like if my merge were approved already?

Thanks.

[Benoit Guillot - http://www.akretion.com (benoit-guillot-z)]

Hello Raphaël,

I changed the method with context as the last arg.

[Benoit Guillot - http://www.akretion.com (benoit-guillot-z)]

Hum actually the merge as already been done, but you can change the method in your merge if you want. Otherwise I can propose a new merge with the modifications.

=== modified file 'sale/sale.py'
--- sale/sale.py	2011-12-19 21:47:45 +0000
+++ sale/sale.py	2011-12-20 10:10:07 +0000
@@ -771,6 +771,11 @@
                                 self.pool.get('procurement.order').write(cr, uid, [proc_id], {'product_qty': mov.product_qty, 'product_uos_qty': mov.product_uos_qty})
         return True
 
+    def _get_date_planned(self, cr, uid, order, line, start_date, *args):
+        date_planned = datetime.strptime(start_date, DEFAULT_SERVER_DATE_FORMAT) + relativedelta(days=line.delay or 0.0)    
+        date_planned = (date_planned - timedelta(days=order.company_id.security_lead)).strftime(DEFAULT_SERVER_DATETIME_FORMAT)
+        return date_planned
+
     def _create_pickings_and_procurements(self, cr, uid, order, order_lines, picking_id=False, *args):
         """Create the required procurements to supply sale order lines, also connecting
         the procurements to appropriate stock moves in order to bring the goods to the
@@ -799,8 +804,7 @@
             if line.state == 'done':
                 continue
 
-            date_planned = datetime.strptime(order.date_order, DEFAULT_SERVER_DATE_FORMAT) + relativedelta(days=line.delay or 0.0)
-            date_planned = (date_planned - timedelta(days=order.company_id.security_lead)).strftime(DEFAULT_SERVER_DATETIME_FORMAT)
+            date_planned = self._get_date_planned(cr, uid, order, line, order.date_order, *args)
 
             if line.product_id:
                 if line.product_id.product_tmpl_id.type in ('product', 'consu'):