Merge lp:~akretion-team/openobject-addons/hook-for-purchase-order into lp:openobject-addons

[Sébastien BEAU - http://www.akretion.com]

For the module sale_bundle_product http://bazaar.launchpad.net/~openerp-commiter/openobject-addons/extra-6.0/files/head:/sale_bundle_product/
We need to add some field in the line before creating the PO.
I propose a generic merge which allow to modify the purchase order line and to modify the purchase order (needed for brasilian localisation) before creating the PO

Thanks to merge it

[Joël Grand-Guillaume @ camptocamp (jgrandguillaume-c2c)]

+1 for this merge ! Thanks for your work Sébastien

review: Approve

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

Hello, I helped Sebastien shaping that merge proposal, so of course I approve it.

BTW, I think we need more of such refactoring where:
1) we split large mehods into smaller overridable ones
2) we give a chance to overriders to change as many things as possible BEFORE writing anything into the database. Currently, there are many places in OpenERP where the multiplication of overriders accross extension modules tend to generate may be 5x too many database access in a given method. So we need more of such refactoring before 6.1 is out. For instance, we will now be happy to override that purchase order generation for the Brazilian localization as we need it; now we will have a clean way to do it too.

review: Approve

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

Works for me, well done!

I would add a docstring on the new method to make a little more obvious what it's supposed to do and what are the arguments. Sebastien, if you can add it it'd be great (see recent reviews for guidelines/example of the format, e.g.[1]), otherwise we'll add it after the merge.

Thanks!

[1] https://code.launchpad.net/~openerp-community/openobject-addons/stefan-therp_lp794584/+merge/63872

review: Approve

[Sébastien BEAU - http://www.akretion.com (sebastien.beau)]

Hi Olivier
I add the doc string, it's ok for you?
Thanks for merging it.
Have a good day

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

Yes it's fine like that, thanks!

=== modified file 'purchase/purchase.py'
--- purchase/purchase.py	2011-07-22 13:00:50 +0000
+++ purchase/purchase.py	2011-08-24 22:34:31 +0000
@@ -761,6 +761,17 @@
         res = res.values()
         return len(res) and res[0] or 0 #TO CHECK: why workflow is generated error if return not integer value
 
+    def create_procurement_purchase_order(self, cr, uid, procurement, po_vals, line, context=None):
+        """ Create the purchase order from the procurement
+        :params procurement: the procurement object generating the purchase order
+        :params dict po_vals: the values of the purchase order
+        :params dict line: the values of the purchase order line
+        :return: purchase order id
+        :rtype: int
+        """
+        po_vals.update({'order_line': [(0,0,line)]})
+        return self.pool.get('purchase.order').create(cr, uid, po_vals, context=context)
+
     def make_po(self, cr, uid, ids, context=None):
         """ Make purchase order from procurement
         @return: New created Purchase Orders procurement wise
@@ -774,7 +785,6 @@
         pricelist_obj = self.pool.get('product.pricelist')
         prod_obj = self.pool.get('product.product')
         acc_pos_obj = self.pool.get('account.fiscal.position')
-        po_obj = self.pool.get('purchase.order')
         for procurement in self.browse(cr, uid, ids, context=context):
             res_id = procurement.move_id.id
             partner = procurement.product_id.seller_id # Taken Main Supplier of Product of Procurement.
@@ -799,6 +809,8 @@
             context.update({'lang': partner.lang, 'partner_id': partner_id})
 
             product = prod_obj.browse(cr, uid, procurement.product_id.id, context=context)
+            taxes_ids = procurement.product_id.product_tmpl_id.supplier_taxes_id
+            taxes = acc_pos_obj.map_tax(cr, uid, partner.property_account_position, taxes_ids)
 
             line = {
                 'name': product.partner_ref,
@@ -809,25 +821,20 @@
                 'date_planned': newdate.strftime('%Y-%m-%d %H:%M:%S'),
                 'move_dest_id': res_id,
                 'notes': product.description_purchase,
+                'taxes_id': [(6,0,taxes)],
             }
-
-            taxes_ids = procurement.product_id.product_tmpl_id.supplier_taxes_id
-            taxes = acc_pos_obj.map_tax(cr, uid, partner.property_account_position, taxes_ids)
-            line.update({
-                'taxes_id': [(6,0,taxes)]
-            })
-            purchase_id = po_obj.create(cr, uid, {
+            
+            po_vals = {
                 'origin': procurement.origin,
                 'partner_id': partner_id,
                 'partner_address_id': address_id,
                 'location_id': procurement.location_id.id,
                 'pricelist_id': pricelist_id,
-                'order_line': [(0,0,line)],
                 'company_id': procurement.company_id.id,
                 'fiscal_position': partner.property_account_position and partner.property_account_position.id or False
-            })
-            res[procurement.id] = purchase_id
-            self.write(cr, uid, [procurement.id], {'state': 'running', 'purchase_id': purchase_id})
+            }
+            res[procurement.id] = self.create_procurement_purchase_order(cr, uid, procurement, po_vals, line, context=context)
+            self.write(cr, uid, [procurement.id], {'state': 'running', 'purchase_id': res[procurement.id]})
         return res
 
 procurement_order()