[tryton-debian-vcs] tryton-modules-stock-supply branch upstream updated. upstream/3.0.0-1-gaaced5c

[Mathias Behrle]

The following commit has been merged in the upstream branch:
https://alioth.debian.org/plugins/scmgit/cgi-bin/gitweb.cgi/?p=tryton/tryton-modules-stock-supply.git;a=commitdiff;h=upstream/3.0.0-1-gaaced5c

commit aaced5c47299cf5198ce8db487f71b61478006c4
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Wed Mar 26 18:45:28 2014 +0100

    Adding upstream version 3.0.1.

diff --git a/CHANGELOG b/CHANGELOG
index a09c106..e815e21 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 3.0.1 - 2014-03-22
+* Bug fixes (see mercurial logs for details)
+
 Version 3.0.0 - 2013-10-21
 * Bug fixes (see mercurial logs for details)
 * Add wizard to create internal shipments
diff --git a/COPYRIGHT b/COPYRIGHT
index 14a0f29..afdd87b 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -1,7 +1,7 @@
 Copyright (C) 2013 NaN-tic.
-Copyright (C) 2008-2013 Cédric Krier.
+Copyright (C) 2008-2014 Cédric Krier.
 Copyright (C) 2008-2013 Bertrand Chenal.
-Copyright (C) 2008-2013 B2CK SPRL.
+Copyright (C) 2008-2014 B2CK SPRL.
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
diff --git a/PKG-INFO b/PKG-INFO
index b98dbac..f5a53c7 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: trytond_stock_supply
-Version: 3.0.0
+Version: 3.0.1
 Summary: Tryton module for stock supply
 Home-page: http://www.tryton.org/
 Author: Tryton
diff --git a/order_point.py b/order_point.py
index 360b334..9cce236 100644
--- a/order_point.py
+++ b/order_point.py
@@ -140,6 +140,7 @@ class OrderPoint(ModelSQL, ModelView):
         query = ['OR']
         for op in internals:
             arg = ['AND',
+                   ('product', '=', op.product.id),
                    ('provisioning_location', '=', op.storage_location.id),
                    ('storage_location', '=', op.provisioning_location.id),
                    ('company', '=', op.company.id),
diff --git a/purchase_request.py b/purchase_request.py
index f6362cc..ebf7985 100644
--- a/purchase_request.py
+++ b/purchase_request.py
@@ -187,10 +187,10 @@ class PurchaseRequest(ModelSQL, ModelView):
         # compute requests
         new_requests = []
         cursor = Transaction().cursor
-        for dates, products in date2products.iteritems():
+        for dates, sub_products in date2products.iteritems():
             min_date, max_date = dates
-            for i in range(0, len(products), cursor.IN_MAX):
-                product_ids = [p.id for p in products[i:i + cursor.IN_MAX]]
+            for i in range(0, len(sub_products), cursor.IN_MAX):
+                product_ids = [p.id for p in sub_products[i:i + cursor.IN_MAX]]
                 with Transaction().set_context(forecast=True,
                         stock_date_end=min_date or datetime.date.max):
                     pbl = Product.products_by_location(warehouse_ids,
@@ -203,7 +203,7 @@ class PurchaseRequest(ModelSQL, ModelView):
                         min_date, max_date, min_date_qties=min_date_qties,
                         order_points=product2ops)
 
-                    for product in products[i:i + cursor.IN_MAX]:
+                    for product in sub_products[i:i + cursor.IN_MAX]:
                         shortage_date, product_quantity = shortages[product.id]
                         if shortage_date is None or product_quantity is None:
                             continue
diff --git a/tryton.cfg b/tryton.cfg
index 19267e0..d13f669 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
 [tryton]
-version=3.0.0
+version=3.0.1
 depends:
     account
     ir
diff --git a/trytond_stock_supply.egg-info/PKG-INFO b/trytond_stock_supply.egg-info/PKG-INFO
index 94893db..51f5cf2 100644
--- a/trytond_stock_supply.egg-info/PKG-INFO
+++ b/trytond_stock_supply.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: trytond-stock-supply
-Version: 3.0.0
+Version: 3.0.1
 Summary: Tryton module for stock supply
 Home-page: http://www.tryton.org/
 Author: Tryton
-- 
tryton-modules-stock-supply