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

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

This is a refactoring of schedule_date and order_dates in order to overload them easily. I just defined 2 new functions : _get_schedule_date and _get_order_dates. I need it for a module calculating the expeditions considering the working time.

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

Hello Benoit,

I'm not 100% sure, but I suggest you change the signature of the methods you are introducing so that you pass the procurement object. That may allow to to access exra product or partner or order delay properties to compute the dates with more flexibility. Else please can you justify your choice not to pass the procurement object?

Regards.

review: Needs Fixing

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

Hello Raphaël,

I have changed the method, and pass the procurement object.

Regards.

[Olivier Dony (Odoo) (odo-openerp)]

Hi,

The idea is good, but in addition to passing high-level objects as much as possible in that API, it's important to have clear and explicit method names and a proper docstring. I'll fix this while merging, don't hesitate to do it directly next time ;-)

Note also that this patch only covers the computation of dates, so perhaps you'd need a refactoring to use a separate method for preparing the PO and PO lines completely (e.g. a _prepare_xxx(), as was done recently for other cases), allowing custom modules to more easily override other values.

Thanks for the patch!

review: Approve

=== modified file 'purchase/purchase.py'
--- purchase/purchase.py	2011-12-21 15:39:24 +0000
+++ purchase/purchase.py	2011-12-22 16:12:38 +0000
@@ -828,6 +828,15 @@
         po_vals.update({'order_line': [(0,0,line_vals)]})
         return self.pool.get('purchase.order').create(cr, uid, po_vals, context=context)
 
+    def _get_schedule_date(self, cr, uid, procurement, company, context=None):
+        procurement_date_planned = datetime.strptime(procurement.date_planned, '%Y-%m-%d %H:%M:%S')
+        schedule_date = (procurement_date_planned - relativedelta(days=company.po_lead))
+        return schedule_date
+
+    def _get_order_dates(self, cr, uid, schedule_date, seller_delay, context=None):
+        order_dates = schedule_date - relativedelta(days=seller_delay)
+        return order_dates
+
     def make_po(self, cr, uid, ids, context=None):
         """ Make purchase order from procurement
         @return: New created Purchase Orders procurement wise
@@ -860,9 +869,8 @@
 
             price = pricelist_obj.price_get(cr, uid, [pricelist_id], procurement.product_id.id, qty, partner_id, {'uom': uom_id})[pricelist_id]
 
-            order_date = datetime.strptime(procurement.date_planned, '%Y-%m-%d %H:%M:%S')
-            schedule_date = (order_date - relativedelta(days=company.po_lead))
-            order_dates = schedule_date - relativedelta(days=seller_delay)
+            schedule_date = self._get_schedule_date(cr, uid, procurement, company, context=context)
+            order_dates = self._get_order_dates(cr, uid, schedule_date, seller_delay, context=context)
 
             #Passing partner_id to context for purchase order line integrity of Line name
             context.update({'lang': partner.lang, 'partner_id': partner_id})