[tryton-debian-vcs] tryton-modules-stock-supply branch debian-wheezy-2.6 created. 38f913f4412ed859fa03c3035d9cee730c345596

Mathias Behrle tryton-debian-vcs at alioth.debian.org
Wed Nov 27 17:12:08 UTC 2013 

The following commit has been merged in the debian-wheezy-2.6 branch:
https://alioth.debian.org/plugins/scmgit/cgi-bin/gitweb.cgi/?p=tryton/tryton-modules-stock-supply.git;a=commitdiff;h=38f913f4412ed859fa03c3035d9cee730c345596
commit 38f913f4412ed859fa03c3035d9cee730c345596
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Tue Jun 11 13:42:27 2013 +0200

    Releasing debian version 2.6.1-1.

diff --git a/debian/changelog b/debian/changelog
index 34ca780..4f3dd59 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+tryton-modules-stock-supply (2.6.1-1) unstable; urgency=low
+
+  * Removing Daniel from Uploaders. Thanks for your work! (Closes: #704405).
+  * Versioning watch file for Tryton branch 2.6.
+  * Improving update of major version in Depends.
+  * Merging upstream version 2.6.1.
+  * Updating copyright.
+
+ -- Mathias Behrle <mathiasb at m9s.biz>  Mon, 10 Jun 2013 18:22:03 +0200
+
 tryton-modules-stock-supply (2.6.0-3) experimental; urgency=low
 
   * Updating Vcs-Git to correct address.
commit a9dd0398bd28790abcff3d63f1c7992f19e3659e
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Mon Jun 10 18:17:48 2013 +0200

    Updating copyright.

diff --git a/debian/copyright b/debian/copyright
index 3c647d6..6bf2702 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,9 +1,9 @@
 Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 
 Files: *
-Copyright: 2008-2012 Cédric Krier
+Copyright: 2008-2013 Cédric Krier
            2008-2012 Bertrand Chenal
-           2008-2012 B2CK SPRL
+           2008-2013 B2CK SPRL
 License: GPL-3+
 
 Files: debian/*
commit f93c26b5933673b00a7f42f594502de1b87fae89
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Mon Jun 10 18:10:41 2013 +0200

    Merging 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
commit b133b44066bfcb86402cc32ee29151dbf0edd9f6
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Sat Apr 27 14:54:48 2013 +0200

    Improving update of major version in Depends.
    
    Pulling the major version for Depends directly from the package version.
    Thanks to Ilya Melnikov for pushing the idea.

diff --git a/debian/control b/debian/control
index 84c5d2f..fab15a1 100644
--- a/debian/control
+++ b/debian/control
@@ -13,10 +13,12 @@ X-Python-Version: >= 2.5
 Package: tryton-modules-stock-supply
 Architecture: all
 Depends:
- ${misc:Depends}, ${python:Depends}, tryton-server (>= 2.6),
- tryton-modules-account (>= 2.6), tryton-modules-party (>= 2.6),
- tryton-modules-product (>= 2.6), tryton-modules-purchase (>= 2.6),
- tryton-modules-stock (>= 2.6), python-pkg-resources
+ ${misc:Depends}, ${python:Depends}, tryton-server (>= ${version:major}),
+ tryton-modules-account (>= ${version:major}),
+ tryton-modules-party (>= ${version:major}),
+ tryton-modules-product (>= ${version:major}),
+ tryton-modules-purchase (>= ${version:major}),
+ tryton-modules-stock (>= ${version:major}), python-pkg-resources
 Description: Tryton Application Platform (Stock Supply Module)
  Tryton is a high-level general purpose application platform written in Python
  and using PostgreSQL as database engine. It is the core base of a complete
diff --git a/debian/rules b/debian/rules
index 1ae0776..0f63ab4 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,5 +1,7 @@
 #!/usr/bin/make -f
 
+MAJOR := $(shell python setup.py --version | awk -F "." '{print $$1 "." $$2}')
+
 %:
 	dh ${@} --with python2
 
@@ -8,5 +10,8 @@ override_dh_auto_clean:
 
 	rm -rf *.egg-info
 
+override_dh_gencontrol:
+	dh_gencontrol -- -Vversion:major="$(MAJOR)"
+
 override_dh_builddeb:
 	dh_builddeb -- -Zxz -z9
commit e946ed4182254c8c3f46e8201fee3a0efc55e4b0
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Wed Apr 24 00:59:50 2013 +0200

    Versioning watch file for Tryton branch 2.6.

diff --git a/debian/watch b/debian/watch
index 0dcadff..3825acc 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,2 +1,2 @@
 version=3
-http://downloads.tryton.org/current/ .*trytond_stock_supply-(\d.*)\.(?:tgz|tbz2|txz|tar\.(?:gz|bz2|xz))
+http://downloads.tryton.org/2.6/ .*trytond_stock_supply-(\d.*)\.(?:tgz|tbz2|txz|tar\.(?:gz|bz2|xz))
-- 
tryton-modules-stock-supply

More information about the tryton-debian-vcs mailing list