Merge e737db3 into 7acbbe1

odoomrp · Apr 13, 2016 · d9668e8 · d9668e8
2 parents 7acbbe1 + e737db3
commit d9668e8
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/stock_planning/wizard/wiz_stock_planning.py b/stock_planning/wizard/wiz_stock_planning.py
@@ -81,8 +81,12 @@ def calculate_stock_planning(self):
         for procurement in proc_obj._find_procurements_from_stock_planning(
             self.company, fdate, category=self.category,
                 template=self.template, product=self.product, periods=True):
-            product_datas = self._find_product_in_table(
-                product_datas, procurement.product_id, procurement.location_id)
+            if (not self.locations or
+                (self.locations and procurement.location_id.id in
+                 self.locations.ids)):
+                product_datas = self._find_product_in_table(
+                    product_datas, procurement.product_id,
+                    procurement.location_id)
         self._generate_stock_planning(product_datas)
         return {'name': _('Stock Planning'),
                 'type': 'ir.actions.act_window',