From 952b82b37eb4647945a1b44c8e4b44fbaed8eb0a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nicolas=20=C3=89vrard?= <nicoe@b2ck.com>
Date: Mon, 30 May 2011 16:21:57 +0200
Subject: [PATCH] Fix invoiced quantity of service products (transplanted from
 bae282cbc06a46a076deee3ddf4cf52813eb9cce)

---
 sale.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/sale.py b/sale.py
index 4cdb2bec92..b271f64f05 100644
--- a/sale.py
+++ b/sale.py
@@ -1276,7 +1276,9 @@ class SaleLine(ModelSQL, ModelView):
         if line.type != 'line':
             return [res]
 
-        if line.sale.invoice_method == 'order':
+        if (line.sale.invoice_method == 'order'
+                or not line.product
+                or line.product.type == 'service'):
             quantity = line.quantity
         else:
             quantity = 0.0