Merge lp:~openerp-dev/openobject-addons/6.0-bug-793468-rha1 into lp:openobject-addons/6.0

[Rifakat Husen (OpenERP)]

Hello,

This fix solves the problem for calling action_create_invoice() two times while sale and mrp modules are installed.

Regards,
Rifakat

Unmerged revisions

4776. By Rifakat Husen (OpenERP) on 2011-08-18

[FIX] sale: fixed the problem for action_create_invoice() called two times

=== modified file 'sale/sale.py'
--- sale/sale.py	2011-08-04 06:36:26 +0000
+++ sale/sale.py	2011-08-18 09:03:28 +0000
@@ -612,6 +612,12 @@
                     res.append(line.procurement_id.id)
         return res
 
+    def test_invoice(self, cr, uid, ids, *args):
+        for order in self.browse(cr, uid, ids, context={}):
+            if len(order.invoice_ids):
+                return False
+        return True
+
     # if mode == 'finished':
     #   returns True if all lines are done, False otherwise
     # if mode == 'canceled':

=== modified file 'sale/sale_workflow.xml'
--- sale/sale_workflow.xml	2011-01-14 00:11:01 +0000
+++ sale/sale_workflow.xml	2011-08-18 09:03:28 +0000
@@ -172,7 +172,7 @@
         <record id="trans_wait_invoice_invoice" model="workflow.transition">
             <field name="act_from" ref="act_wait_invoice"/>
             <field name="act_to" ref="act_invoice"/>
-            <field name="condition">(order_policy=='prepaid') or ((order_policy=='postpaid') and shipped)</field>
+            <field name="condition">(order_policy=='prepaid') or ((order_policy=='postpaid') and shipped and test_invoice())</field>
         </record>
 
         <record id="trans_wait_invoice_invoice_manual" model="workflow.transition">