Merge lp:~akretion-team/openobject-addons/purchase-date-planned2 into lp:openobject-addons

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

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

Hello, following Antony Lessuisse advice, this is a fresh rebase of the old MP https://code.launchpad.net/~akretion-team/openobject-addons/addons_purchase/+merge/88347

It's approved already, can you merge it?

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

Thanks for rebasing, that was very useful indeed!

I've just merged it, changing only a few things on-the-fly as discussed on the previous version of the MP (you had already improved some of it, that's great).
I also replaced l.16 "seller and int(seller.delay) or 0" to use the if/else Python 2.5 conditional, as it was subject to the classical problem of having a "falsy B" in `A and B or C`.

Thanks for your clean refactoring!

In related news, I will probably commit soon a trivial refactoring of the weird and useless loop on supplierinfo_ids, as we only care about one supplierinfo.

=== modified file 'purchase/purchase.py'
--- purchase/purchase.py	2012-02-14 12:25:20 +0000
+++ purchase/purchase.py	2012-02-15 22:55:22 +0000
@@ -709,6 +709,17 @@
             partner_id, date_order=date_order, fiscal_position_id=fiscal_position_id, date_planned=date_planned,
             name=name, price_unit=price_unit, notes=notes, context=context)
 
+    def _get_date_planned(self, cr, uid, seller, start_date, context=None):
+        """Return the datetime value to use as Schedule Date (``date_planned``) for the
+           Purchase Order Lines created in the purchase order.
+
+           :param browse_record supplierinfo: the supplier of the product.
+           :rtype: datetime
+           :return: the desired Schedule Date for the PO lines
+       """
+        seller_delay = seller and int(seller.delay) or 0
+        return datetime.strptime(start_date, '%Y-%m-%d') + relativedelta(days=seller_delay)
+
     def onchange_product_id(self, cr, uid, ids, pricelist_id, product_id, qty, uom_id,
             partner_id, date_order=False, fiscal_position_id=False, date_planned=False,
             name=False, price_unit=False, notes=False, context=None):
@@ -761,10 +772,10 @@
             date_order = fields.date.context_today(cr,uid,context=context)
 
         qty = qty or 1.0
-        seller_delay = 0
+        seller = False
         supplierinfo_ids = product_supplierinfo.search(cr, uid, [('name','=',partner_id),('product_id','=',product.id)])
         for supplierinfo in product_supplierinfo.browse(cr, uid, supplierinfo_ids, context=context):
-            seller_delay = supplierinfo.delay
+            seller = supplierinfo
             if supplierinfo.product_uom.id != uom_id:
                 res['warning'] = {'title': _('Warning'), 'message': _('The selected supplier only sells this product by %s') % supplierinfo.product_uom.name }
             min_qty = product_uom._compute_qty(cr, uid, supplierinfo.product_uom.id, supplierinfo.min_qty, to_uom_id=uom_id)
@@ -772,7 +783,8 @@
                 res['warning'] = {'title': _('Warning'), 'message': _('The selected supplier has a minimal quantity set to %s %s, you should not purchase less.') % (supplierinfo.min_qty, supplierinfo.product_uom.name)}
                 qty = min_qty
 
-        dt = (datetime.strptime(date_order, '%Y-%m-%d') + relativedelta(days=int(seller_delay) or 0.0)).strftime('%Y-%m-%d %H:%M:%S')
+        dt = self._get_date_planned(cr, uid, seller, date_order, context=context).strftime(DEFAULT_SERVER_DATETIME_FORMAT)
+
         res['value'].update({'date_planned': date_planned or dt, 'product_qty': qty})
 
         # - determine price_unit and taxes_id