From 657466eb54fd8a08f5b6abb1091a65f1e71f7f06 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=A9dric=20Krier?= <ced@b2ck.com>
Date: Tue, 1 Feb 2011 20:46:36 +0100
Subject: [PATCH] Test if invoice line is linked to an invoice for issue1839
 (transplanted from c30406c50795ab572858ca5c7124f5baa5e503ac)

---
 sale.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/sale.py b/sale.py
index 44676809c5..f19dcec701 100644
--- a/sale.py
+++ b/sale.py
@@ -1165,8 +1165,9 @@ class SaleLine(ModelSQL, ModelView):
         ignored_ids = set(
             l.id for i in line.sale.invoices_ignored for l in i.lines)
         for invoice_line in line.invoice_lines:
-            if invoice_line.invoice.state != 'cancel' or \
-                    invoice_line.id in ignored_ids:
+            if ((invoice_lines.invoice and
+                    invoice_line.invoice.state != 'cancel') or
+                invoice_line.id in ignored_ids):
                 quantity -= uom_obj.compute_qty(invoice_line.unit, 
                         invoice_line.quantity, line.unit)
         res['quantity'] = quantity