[tryton-debian-vcs] tryton-modules-stock-supply branch upstream-2.6 created. 6c4e330445cbfce11fcc3afd8d4d6339c7841ce7
Mathias Behrle
tryton-debian-vcs at alioth.debian.org
Wed Nov 27 17:12:09 UTC 2013
The following commit has been merged in the upstream-2.6 branch:
https://alioth.debian.org/plugins/scmgit/cgi-bin/gitweb.cgi/?p=tryton/tryton-modules-stock-supply.git;a=commitdiff;h=6c4e330445cbfce11fcc3afd8d4d6339c7841ce7
commit 6c4e330445cbfce11fcc3afd8d4d6339c7841ce7
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Mon Jun 10 18:10:40 2013 +0200
Adding upstream version 2.6.1.
diff --git a/CHANGELOG b/CHANGELOG
index 0a733df..7d043f2 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 2.6.1 - 2013-06-09
+* Bug fixes (see mercurial logs for details)
+
Version 2.6.0 - 2012-10-22
* Bug fixes (see mercurial logs for details)
* Generate also purchase requests for assets
diff --git a/COPYRIGHT b/COPYRIGHT
index 2057c72..d7165c7 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -1,6 +1,6 @@
-Copyright (C) 2008-2012 Cédric Krier.
+Copyright (C) 2008-2013 Cédric Krier.
Copyright (C) 2008-2012 Bertrand Chenal.
-Copyright (C) 2008-2012 B2CK SPRL.
+Copyright (C) 2008-2013 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 3cf5a31..73670be 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
-Metadata-Version: 1.0
+Metadata-Version: 1.1
Name: trytond_stock_supply
-Version: 2.6.0
+Version: 2.6.1
Summary: Tryton module for stock supply
Home-page: http://www.tryton.org/
Author: Tryton
diff --git a/shipment.py b/shipment.py
index a9d5f7f..5778420 100644
--- a/shipment.py
+++ b/shipment.py
@@ -59,8 +59,8 @@ class ShipmentInternal(ModelSQL, ModelView):
for op in order_points:
qty = pbl.get((op.storage_location.id, op.product.id), 0)
if qty < op.min_quantity:
- key = (op.storage_location.id,
- op.provisioning_location.id,
+ key = (op.provisioning_location.id,
+ op.storage_location.id,
op.product.id)
moves[key] = op.max_quantity - qty
@@ -74,8 +74,8 @@ class ShipmentInternal(ModelSQL, ModelView):
])
for shipment in shipments:
for move in shipment.moves:
- key = (shipment.to_location.id,
- shipment.from_location.id,
+ key = (shipment.from_location.id,
+ shipment.to_location.id,
move.product.id)
if key not in moves:
continue
diff --git a/tests/test_stock_supply.py b/tests/test_stock_supply.py
index 0dde8fb..a2bb45a 100644
--- a/tests/test_stock_supply.py
+++ b/tests/test_stock_supply.py
@@ -123,7 +123,7 @@ class StockSupplyTestCase(unittest.TestCase):
'account_payable': payable.id,
})
product_supplier = self.product_supplier.create({
- 'product': product.id,
+ 'product': product.template.id,
'company': company.id,
'party': supplier.id,
'delivery_time': delivery_time,
diff --git a/tryton.cfg b/tryton.cfg
index c016a81..4084498 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
[tryton]
-version=2.6.0
+version=2.6.1
depends:
account
ir
diff --git a/trytond_stock_supply.egg-info/PKG-INFO b/trytond_stock_supply.egg-info/PKG-INFO
index d525a1b..480b79b 100644
--- a/trytond_stock_supply.egg-info/PKG-INFO
+++ b/trytond_stock_supply.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
-Metadata-Version: 1.0
+Metadata-Version: 1.1
Name: trytond-stock-supply
-Version: 2.6.0
+Version: 2.6.1
Summary: Tryton module for stock supply
Home-page: http://www.tryton.org/
Author: Tryton
--
tryton-modules-stock-supply
More information about the tryton-debian-vcs
mailing list