[tryton-debian-vcs] tryton-modules-stock-supply branch debian-wheezy-2.6 updated. debian/2.6.1-1-3-g64f0a0c

Mathias Behrle tryton-debian-vcs at alioth.debian.org
Thu Mar 27 13:46:40 UTC 2014


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=debian/2.6.1-1-3-g64f0a0c

commit 64f0a0cd44a536db40d2560e67a62c586589312f
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Thu Mar 27 14:46:12 2014 +0100

    Releasing debian version 2.6.2-1.

diff --git a/debian/changelog b/debian/changelog
index 4f3dd59..8205093 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+tryton-modules-stock-supply (2.6.2-1) unstable; urgency=medium
+
+  * Merging upstream version 2.6.2.
+  * Updating copyright.
+
+ -- Mathias Behrle <mathiasb at m9s.biz>  Wed, 26 Mar 2014 21:59:36 +0100
+
 tryton-modules-stock-supply (2.6.1-1) unstable; urgency=low
 
   * Removing Daniel from Uploaders. Thanks for your work! (Closes: #704405).
commit 9540fa0c2739796d4179b9893b358b710f3870ad
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Wed Mar 26 21:58:46 2014 +0100

    Updating copyright.

diff --git a/debian/copyright b/debian/copyright
index 6bf2702..2d55ea5 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-2013 Cédric Krier
+Copyright: 2008-2014 Cédric Krier
            2008-2012 Bertrand Chenal
-           2008-2013 B2CK SPRL
+           2008-2014 B2CK SPRL
 License: GPL-3+
 
 Files: debian/*
commit 69eaa9085d897a61d7fdb936113bce108189bcac
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Wed Mar 26 21:54:21 2014 +0100

    Merging upstream version 2.6.2.

diff --git a/CHANGELOG b/CHANGELOG
index 7d043f2..bc9acb1 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 2.6.2 - 2014-03-22
+* Bug fixes (see mercurial logs for details)
+
 Version 2.6.1 - 2013-06-09
 * Bug fixes (see mercurial logs for details)
 
diff --git a/COPYRIGHT b/COPYRIGHT
index d7165c7..9925e7d 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -1,6 +1,6 @@
-Copyright (C) 2008-2013 Cédric Krier.
+Copyright (C) 2008-2014 Cédric Krier.
 Copyright (C) 2008-2012 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 73670be..880460e 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: trytond_stock_supply
-Version: 2.6.1
+Version: 2.6.2
 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 59c8cf8..9afe764 100644
--- a/order_point.py
+++ b/order_point.py
@@ -137,6 +137,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/tryton.cfg b/tryton.cfg
index 4084498..c5f2682 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
 [tryton]
-version=2.6.1
+version=2.6.2
 depends:
     account
     ir
diff --git a/trytond_stock_supply.egg-info/PKG-INFO b/trytond_stock_supply.egg-info/PKG-INFO
index 480b79b..7b2d50e 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: 2.6.1
+Version: 2.6.2
 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