[tryton-debian-vcs] tryton-modules-stock-supply branch upstream-2.2 updated. upstream/2.2.3-1-g6cff922
Mathias Behrle
tryton-debian-vcs at alioth.debian.org
Thu Mar 27 14:11:04 UTC 2014
The following commit has been merged in the upstream-2.2 branch:
https://alioth.debian.org/plugins/scmgit/cgi-bin/gitweb.cgi/?p=tryton/tryton-modules-stock-supply.git;a=commitdiff;h=upstream/2.2.3-1-g6cff922
commit 6cff9224a891ea6fb832cfab8ed5f0579b79fbc9
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Thu Mar 27 15:01:37 2014 +0100
Adding upstream version 2.2.4.
diff --git a/CHANGELOG b/CHANGELOG
index fa2c165..49496ca 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 2.2.4 - 2014-03-22
+* Bug fixes (see mercurial logs for details)
+
Version 2.2.3 - 2013-06-09
* Bug fixes (see mercurial logs for details)
diff --git a/COPYRIGHT b/COPYRIGHT
index da9ef80..fc71a1a 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-2011 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 67497ac..ae980c7 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: trytond_stock_supply
-Version: 2.2.3
+Version: 2.2.4
Summary: Supply Management Module with:
- Order point
- Purchase Request
diff --git a/__tryton__.py b/__tryton__.py
index f09c2fc..1c08bf4 100644
--- a/__tryton__.py
+++ b/__tryton__.py
@@ -7,7 +7,7 @@
'name_es_CO': 'Gestión de pedidos de inventario',
'name_es_ES': 'Gestión de suministro de existencias',
'name_fr_FR': 'Gestion des approvisionnements de stock',
- 'version': '2.2.3',
+ 'version': '2.2.4',
'author': 'B2CK',
'email': 'info at b2ck.com',
'website': 'http://www.tryton.org/',
diff --git a/order_point.py b/order_point.py
index 4e50523..fe9f6b6 100644
--- a/order_point.py
+++ b/order_point.py
@@ -130,6 +130,7 @@ class OrderPoint(ModelSQL, ModelView):
query = ['OR']
for op in self.browse(internal_ids):
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/trytond_stock_supply.egg-info/PKG-INFO b/trytond_stock_supply.egg-info/PKG-INFO
index 9b7d898..918d889 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.2.3
+Version: 2.2.4
Summary: Supply Management Module with:
- Order point
- Purchase Request
--
tryton-modules-stock-supply
More information about the tryton-debian-vcs
mailing list