From 3e9690c058a7a30d2f90f97c97556a7917c1771e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=A9dric=20Krier?= <ced@b2ck.com>
Date: Wed, 13 Jun 2012 23:23:29 +0200
Subject: [PATCH] Improve warehouse requirement test and fix get_from_location

issue2644
review386003
---
 sale.py | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/sale.py b/sale.py
index 522fc941ea..9f804245be 100644
--- a/sale.py
+++ b/sale.py
@@ -671,7 +671,7 @@ class Sale(Workflow, ModelSQL, ModelView):
                     location = line.from_location
                 else:
                     location = line.to_location
-                if (not location
+                if ((not location or not line.warehouse)
                         and line.product
                         and line.product.type in ('goods', 'assets')):
                     self.raise_user_error('warehouse_required')
@@ -1329,8 +1329,11 @@ class SaleLine(ModelSQL, ModelView):
     def get_from_location(self, ids, name):
         result = {}
         for line in self.browse(ids):
-            if line.quantity >= 0 and line.warehouse:
-                result[line.id] = line.warehouse.output_location.id
+            if line.quantity >= 0:
+                if line.warehouse:
+                    result[line.id] = line.warehouse.output_location.id
+                else:
+                    result[line.id] = None
             else:
                 result[line.id] = line.sale.party.customer_location.id
         return result