Merge lp:~taktik/openobject-addons/6.0-sale-cleaned into lp:openobject-addons/6.0

[David Lefever @ Taktik]

Refactored invoice_line_create.

Refactored invoice_line_create to add a new step, invoice_line_prepare, which only purpose is to prepare a set of values and return it.
This way we can inherit invoice_line_prepare to modify or add values before the actual creation.

=== modified file 'sale/sale.py'
--- sale/sale.py	2011-09-22 10:28:12 +0000
+++ sale/sale.py	2012-01-05 10:39:37 +0000
@@ -887,8 +887,9 @@
         'product_packaging': False,
         'price_unit': 0.0,
     }
-
-    def invoice_line_create(self, cr, uid, ids, context=None):
+    
+    def invoice_line_prepare(self, cr, uid, ids, context=None):
+        values = {}
         if context is None:
             context = {}
 
@@ -939,7 +940,7 @@
                 if not a:
                     raise osv.except_osv(_('Error !'),
                                 _('There is no income category account defined in default Properties for Product Category or Fiscal Position is not defined !'))
-                inv_id = self.pool.get('account.invoice.line').create(cr, uid, {
+                values[line.id] = {
                     'name': line.name,
                     'origin': line.order_id.name,
                     'account_id': a,
@@ -951,11 +952,23 @@
                     'invoice_line_tax_id': [(6, 0, [x.id for x in line.tax_id])],
                     'note': line.notes,
                     'account_analytic_id': line.order_id.project_id and line.order_id.project_id.id or False,
-                })
-                cr.execute('insert into sale_order_line_invoice_rel (order_line_id,invoice_id) values (%s,%s)', (line.id, inv_id))
-                self.write(cr, uid, [line.id], {'invoiced': True})
-                sales[line.order_id.id] = True
-                create_ids.append(inv_id)
+                }
+        return values
+
+    def invoice_line_create(self, cr, uid, ids, context=None):
+        if context is None:
+            context = {}
+        create_ids = []
+        sales = {}
+        values = self.invoice_line_prepare(cr, uid, ids, context)
+        for line_id in values.keys() :
+            line = self.browse(cr, uid, line_id)
+            inv_id = self.pool.get('account.invoice.line').create(cr, uid, values[line_id])
+            cr.execute('insert into sale_order_line_invoice_rel (order_line_id,invoice_id) values (%s,%s)', (line.id, inv_id))
+            self.write(cr, uid, [line.id], {'invoiced': True})
+            sales[line.order_id.id] = True
+            create_ids.append(inv_id)
+        
         # Trigger workflow events
         wf_service = netsvc.LocalService("workflow")
         for sid in sales.keys():