Merge lp:~openerp-dev/openobject-addons/trunk-bug-929373-mtr into lp:openobject-addons

[Meera Trambadia (OpenERP)]

Sale: Paid(boolean) now works correctly if SO has more than one invoice in different states

[qdp (OpenERP) (qdp)]

code has been improved then merged in revision 6613.

Thanks

Unmerged revisions

6584. By Arif(arifmlpm) on 2012-02-15

[FIX] sale: Paid(boolean) now works correctly if SO has more than one invoice in different states

=== modified file 'sale/sale.py'
--- sale/sale.py	2012-02-14 12:25:20 +0000
+++ sale/sale.py	2012-02-15 09:56:09 +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