From: Quentin (OpenERP) <qdp-launchpad@openerp.com>
Date: Thu, 16 Feb 2012 16:52:53 +0000 (+0100)
Subject: [MERGE] lp:929373. Courtesy of Arif
X-Git-Tag: 6.1.0-web~4
X-Git-Url: http://git.inspyration.org/?a=commitdiff_plain;h=25a80236961436cd4065684aa068deba240e1cd6;p=odoo%2Fodoo.git

[MERGE] lp:929373. Courtesy of Arif

bzr revid: qdp-launchpad@openerp.com-20120216165253-01d70hrlf8pmnn7x
---

25a80236961436cd4065684aa068deba240e1cd6
diff --cc addons/sale/sale.py
index 99d2e49,c65c552..82bfda7
--- a/addons/sale/sale.py
+++ b/addons/sale/sale.py
@@@ -147,11 -147,15 +147,14 @@@ class sale_order(osv.osv)
          res = {}
          for sale in self.browse(cursor, user, ids, context=context):
              res[sale.id] = True
 -            invoices = []
++            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':
 -                    invoices.append(invoice)
 -            for invoice in invoices: 
 -                if invoice.state != 'paid':
 -                    res[sale.id] = False
 -                    break
 -            if not invoices:
++                    invoice_existence = True
++                    if invoice.state != 'paid':
++                        res[sale.id] = False
++                        break
++            if not invoice_existence:
                  res[sale.id] = False
          return res