Merge lp:~arifmlpm/openobject-addons/arif-openobject-addons into lp:openobject-addons

[Arif]

It contain the bug fix for the confirmed bug

https://bugs.launchpad.net/openobject-addons/+bug/929373

Kind Regds,
Arif

[qdp (OpenERP) (qdp)]

Hello Arif,

Thanks for your contribution. I just improved your code in order to remove the extra loop, and to use a flag instead of a list.

FYI, here is the patch i merged
=== modified file 'sale/sale.py'
--- sale/sale.py 2012-02-15 17:32:52 +0000
+++ sale/sale.py 2012-02-16 16:22:11 +0000
@@ -147,11 +147,14 @@
         res = {}
         for sale in self.browse(cursor, user, ids, context=context):
             res[sale.id] = True
+ invoice_existence = False
             for invoice in sale.invoice_ids:
- if invoice.state != 'paid':
- res[sale.id] = False
- break
- if not sale.invoice_ids:
+ if invoice.state != 'cancel':
+ invoice_existence = True
+ if invoice.state != 'paid':
+ res[sale.id] = False
+ break
+ if not invoice_existence:
                 res[sale.id

review: Approve

[Arif (arifmlpm)]

Thank you very much.

=== modified file 'sale/sale.py'
--- sale/sale.py	2012-02-14 12:25:20 +0000
+++ sale/sale.py	2012-02-14 13:05:22 +0000
@@ -147,11 +147,15 @@
         res = {}
         for sale in self.browse(cursor, user, ids, context=context):
             res[sale.id] = True
+            invoices = []
             for invoice in sale.invoice_ids:
+                if invoice.state!='cancel':
+                    invoices.append(invoice)
+            for invoice in invoices: 
                 if invoice.state != 'paid':
                     res[sale.id] = False
                     break
-            if not sale.invoice_ids:
+            if not invoices:
                 res[sale.id] = False
         return res