Merge lp:~extra-addons-commiter/e-commerce-addons/7.0-sale-workflow-create_invoice_on into lp:~extra-addons-commiter/e-commerce-addons/7.0

[Guewen Baconnier @ Camptocamp]

[IMP] the option to create an invoice now allows to choose if it is created on the confirmation of the sale order or after the delivery

Since the postpaid invoice policy has been removed from OpenERP 7.0 (lp:1160835), I had to remove it from the automatic workflows.

In order to emulate it, I replace the boolean option 'create_invoice' by a selection of values allowing to choose if the invoice is:
 - not created automatically
 - created on the confirmation of the sale order
 - created after the delivery

This is efficient only if the invoice policy is 'On Demand', so i also set the field to readonly when an other policy is selected (it was the case before but the checkbox was not deactivated).

[lp:~extra-addons-commiter/e-commerce-addons/7.0-sale-workflow-create_invoice_on]

304. By Guewen Baconnier @ Camptocamp on 2013-04-17

[FIX] updated base data according to last change and addded a manual workflow

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

Great job Guewen, I just read the code and I have some comment
Regarding the default value for the workflow method before it was 'creating invoice after delivery' now it's manual, maybe it' will be better to keep the same behaviour? And setting invoice => 'after delivery' instead of "manual".
also I am not sure that activating by default the option "invoice_date_is_order_date" is a good idea. It's usefull for importing an historic but in day to day you will have invoice number than will not match with the invoice date.

What do you think?

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

review: Needs Information

[Guewen Baconnier @ Camptocamp (gbaconnier-c2c)]

'creating invoice after delivery' (with invoice in ordered quantities) is the 'postpaid' option which has disappeared.

That's why I put 'manual' (On Demand) with the option create invoice on 'on_picking_done', which emulates the automatic creation of the invoice after the delivery.

The whole purpose of this MP is to keep the same behaviour.

I will remove the 'Force Invoice Date'. BTW, it makes me wonder if it shouldn't be an option of the payment method instead of the workflow.

[lp:~extra-addons-commiter/e-commerce-addons/7.0-sale-workflow-create_invoice_on]

305. By Guewen Baconnier @ Camptocamp on 2013-04-17

[FIX] do not activate force invoice date in the base workflows

[Guewen Baconnier @ Camptocamp (gbaconnier-c2c)]

Updated with the force invoice date set to False on the default workflows.

Unmerged revisions

305. By Guewen Baconnier @ Camptocamp on 2013-04-17

[FIX] do not activate force invoice date in the base workflows

304. By Guewen Baconnier @ Camptocamp on 2013-04-17

[FIX] updated base data according to last change and addded a manual workflow

303. By Guewen Baconnier @ Camptocamp on 2013-04-17

[IMP] the option to create an invoice now allows to choose if it is created on the confirmation of the sale order or after the delivery

=== modified file 'sale_automatic_workflow/automatic_workflow_data.xml'
--- sale_automatic_workflow/automatic_workflow_data.xml	2013-04-17 09:43:28 +0000
+++ sale_automatic_workflow/automatic_workflow_data.xml	2013-04-17 09:43:28 +0000
@@ -8,18 +8,28 @@
 <openerp>
     <data noupdate="1">
 
-        <!-- VIEW FOR THE OBJECT : payment_method -->
         <record id="automatic_validation" model="sale.workflow.process">
-            <field name="name">Automatic Validation</field>
-            <field name="picking_policy">one</field>
-            <field name="order_policy">picking</field>
+            <field name="name">Automatic</field>
+            <field name="picking_policy">one</field>
+            <field name="order_policy">manual</field>
+            <field name="invoice_quantity">order</field>
+            <field name="validate_order" eval="1"/>
+            <field name="create_invoice_on">on_picking_done</field>
+            <field name="validate_invoice" eval="1" />
+            <field name="invoice_date_is_order_date" eval="0" />
+            <field name="validate_picking" eval="0" />
+        </record>
+
+        <record id="manual_validation" model="sale.workflow.process">
+            <field name="name">Manual</field>
+            <field name="picking_policy">one</field>
+            <field name="order_policy">manual</field>
             <field name="invoice_quantity">order</field>
             <field name="validate_order" eval="0"/>
-            <field name="create_invoice" eval="1" />
-            <field name="validate_invoice" eval="1" />
+            <field name="create_invoice_on">manual</field>
+            <field name="validate_invoice" eval="0" />
             <field name="invoice_date_is_order_date" eval="0" />
             <field name="validate_picking" eval="0" />
-            <field name="validate_manufactoring_order" eval="0" />
         </record>
 
         <record forcecreate="True" id="ir_cron_automatic_workflow_job" model="ir.cron">
 
=== modified file 'sale_automatic_workflow/sale.py'
--- sale_automatic_workflow/sale.py	2013-04-17 09:43:28 +0000
+++ sale_automatic_workflow/sale.py	2013-04-17 09:43:28 +0000
@@ -72,3 +72,19 @@
         if workflow.invoice_quantity:
             result['invoice_quantity'] = workflow.invoice_quantity
         return {'value': result}
+
+    def test_create_invoice(self, cr, uid, ids):
+        """ Workflow condition: test if an invoice should be created,
+        based on the automatic workflow rules """
+        if isinstance(ids, (list, tuple)):
+            assert len(ids) == 1
+            ids = ids[0]
+        order = self.browse(cr, uid, ids)
+        if order.order_policy != 'manual' or not order.workflow_process_id:
+            return False
+        invoice_on = order.workflow_process_id.create_invoice_on
+        if invoice_on == 'on_order_confirm':
+            return True
+        elif invoice_on == 'on_picking_done' and order.shipped:
+            return True
+        return False
 
=== modified file 'sale_automatic_workflow/sale_workflow.xml'
--- sale_automatic_workflow/sale_workflow.xml	2012-04-22 12:49:21 +0000
+++ sale_automatic_workflow/sale_workflow.xml	2013-04-17 09:43:28 +0000
@@ -5,7 +5,7 @@
         <record id="trans_wait_invoice_invoice" model="workflow.transition">
             <field name="act_from" ref="sale.act_wait_invoice"/>
             <field name="act_to" ref="sale.act_invoice"/>
-            <field name="condition">(order_policy=='manual' and workflow_process_id.create_invoice)</field>
+            <field name="condition">test_create_invoice()</field>
         </record>
 
     </data>
 
=== modified file 'sale_automatic_workflow/sale_workflow_process.py'
--- sale_automatic_workflow/sale_workflow_process.py	2013-04-17 09:43:28 +0000
+++ sale_automatic_workflow/sale_workflow_process.py	2013-04-17 09:43:28 +0000
@@ -28,21 +28,25 @@
 
     _columns = {
         'name': fields.char('Name', size=64),
-        'picking_policy': fields.selection([('direct', 'Deliver each product when available'),
-                                            ('one', 'Deliver all products at once')],
-                                           string='Shipping Policy'),
-        'order_policy': fields.selection([
-            ('prepaid', 'Before Delivery'),
-            ('manual', 'On Demand'),
-            # https://bugs.launchpad.net/openobject-addons/+bug/1160835
-            # ('postpaid', 'Invoice on Order After Delivery'),
-            ('picking', 'On Delivery Order'),
-        ], 'Invoice Policy'),
-        'invoice_quantity': fields.selection([('order', 'Ordered Quantities'),
-                                              ('procurement', 'Shipped Quantities')],
-                                             string='Invoice on'),
+        'picking_policy': fields.selection(
+            [('direct', 'Deliver each product when available'),
+             ('one', 'Deliver all products at once')],
+            string='Shipping Policy'),
+        'order_policy': fields.selection([('prepaid', 'Before Delivery'),
+                                          ('manual', 'On Demand'),
+                                          ('picking', 'On Delivery Order')],
+                                         string='Invoice Policy'),
+        'invoice_quantity': fields.selection(
+            [('order', 'Ordered Quantities'),
+             ('procurement', 'Shipped Quantities')],
+            string='Invoice on'),
         'validate_order': fields.boolean('Validate Order'),
-        'create_invoice': fields.boolean('Create Invoice'),
+        'create_invoice_on': fields.selection(
+            [('manual', 'No automatic invoice'),
+             ('on_order_confirm', 'On confirmation of Sale Order'),
+             ('on_picking_done', 'After Delivery')],
+            required=True,
+            string='Create Invoice'),
         'validate_invoice': fields.boolean('Validate Invoice'),
         'validate_picking': fields.boolean('Confirm and Close Picking'),
         # TODO not implemented actually
@@ -56,6 +60,7 @@
     _defaults = {
         'picking_policy': 'direct',
         'order_policy': 'manual',
+        'create_invoice_on': 'manual',
         'invoice_quantity': 'order',
         'validate_invoice': False,
     }
 
=== modified file 'sale_automatic_workflow/sale_workflow_process_view.xml'
--- sale_automatic_workflow/sale_workflow_process_view.xml	2013-04-17 09:43:28 +0000
+++ sale_automatic_workflow/sale_workflow_process_view.xml	2013-04-17 09:43:28 +0000
@@ -23,7 +23,7 @@
                     <field name="validate_order"/>
                     <field name="validate_picking"/>
                     <!-- <field name="validate_manufactoring_order"/> -->
-                    <field name="create_invoice" />
+                    <field name="create_invoice_on" attrs="{'readonly': [('order_policy', '!=', 'manual')]}" />
                     <field name="validate_invoice"/>
                     <field name="invoice_date_is_order_date"/>
 
@@ -43,7 +43,7 @@
                     <field name="validate_order"/>
                     <field name="validate_picking"/>
                     <!-- <field name="validate_manufactoring_order"/> -->
-                    <field name="create_invoice" />
+                    <field name="create_invoice_on" />
                     <field name="validate_invoice"/>
                     <field name="invoice_date_is_order_date"/>
                 </tree>