Merge lp:~akretion-team/openobject-addons/better-progressive-invoicing into lp:openobject-addons

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

Hello
this merge proposal is the concrete result of 2 limitations we have seen in OpenERP:

1) In some countries, we may not mix everything on an invoice and use negative quantities. Take Brazil, service and product invoices need to be different records. If you sale both a service and a product, you will need to split the order in 2 invoices: one for service and an other one for products. A convenient way to generate 2 invoices is calling the sale.order#_make_invoice method twice with the proper filtered order lines.
This would almost work but the 2nd invoice would contain the lines of the 1st invoice with a negative value. We need a way to avoid this. Generating the invoice lines to delete them is really not a clean options as it would make OpenERP even more slower than it is already.

2) Take progressive invoicing of projects based on orders (you invoice ordered value by parts according to some progress estimation, it's common in civil engineering for instance), so you have the same need to partition order lines over several invoices. Again, the natural way to implement this is to call sale.order#_make_invoice several times with the appropriate lines and quantities. Again you want to implement the split logic BEFORE entering _make_invoice so you don't want _make_invoice to mess up the result by guesstimating itself some negative lines.

The simplest way I found to implement that is to have an option in the context, so that an overrider might skip that default advance invoice logic when calling super.

We used that in production for nearly a year now. Could you merge it in 6.1?

[Fabien (Open ERP) (fp-tinyerp)]

I don't think it's logic to introduce a context that is used but not defined in the sale module.
Is there any other solution ?

Unmerged revisions

6099. By Raphaël Valyi - http://www.akretion.com on 2011-12-21

[IMP] sale: add a way through which an overrider (like localization) can easily partition a sale order over several invoices WITHOUT having to use the default negative quantities which may not be very readable nor legal in some countries.

=== modified file 'sale/sale.py'
--- sale/sale.py	2011-12-21 13:10:28 +0000
+++ sale/sale.py	2011-12-21 20:17:37 +0000
@@ -414,16 +414,17 @@
         a = order.partner_id.property_account_receivable.id
         pay_term = order.payment_term and order.payment_term.id or False
         invoiced_sale_line_ids = self.pool.get('sale.order.line').search(cr, uid, [('order_id', '=', order.id), ('invoiced', '=', True)], context=context)
-        from_line_invoice_ids = []
-        for invoiced_sale_line_id in self.pool.get('sale.order.line').browse(cr, uid, invoiced_sale_line_ids, context=context):
-            for invoice_line_id in invoiced_sale_line_id.invoice_lines:
-                if invoice_line_id.invoice_id.id not in from_line_invoice_ids:
-                    from_line_invoice_ids.append(invoice_line_id.invoice_id.id)
-        for preinv in order.invoice_ids:
-            if preinv.state not in ('cancel',) and preinv.id not in from_line_invoice_ids:
-                for preline in preinv.invoice_line:
-                    inv_line_id = obj_invoice_line.copy(cr, uid, preline.id, {'invoice_id': False, 'price_unit': -preline.price_unit})
-                    lines.append(inv_line_id)
+        if not context.get('skip_preinv', False):
+            from_line_invoice_ids = []
+            for invoiced_sale_line_id in self.pool.get('sale.order.line').browse(cr, uid, invoiced_sale_line_ids, context=context):
+                for invoice_line_id in invoiced_sale_line_id.invoice_lines:
+                    if invoice_line_id.invoice_id.id not in from_line_invoice_ids:
+                        from_line_invoice_ids.append(invoice_line_id.invoice_id.id)
+            for preinv in order.invoice_ids:
+                if preinv.state not in ('cancel',) and preinv.id not in from_line_invoice_ids:
+                    for preline in preinv.invoice_line:
+                        inv_line_id = obj_invoice_line.copy(cr, uid, preline.id, {'invoice_id': False, 'price_unit': -preline.price_unit})
+                        lines.append(inv_line_id)
         inv = {
             'name': order.client_order_ref or '',
             'origin': order.name,