[tryton-debian-vcs] tryton-modules-stock branch upstream-3.4 updated. upstream/3.4.2-1-g8cd5e13
Mathias Behrle
tryton-debian-vcs at alioth.debian.org
Wed Dec 23 16:54:50 UTC 2015
The following commit has been merged in the upstream-3.4 branch:
https://alioth.debian.org/plugins/scmgit/cgi-bin/gitweb.cgi/?p=tryton/tryton-modules-stock.git;a=commitdiff;h=upstream/3.4.2-1-g8cd5e13
commit 8cd5e134eaaefde4a6e56eef7746c955d6db9664
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Wed Dec 23 14:41:27 2015 +0100
Adding upstream version 3.4.3.
Signed-off-by: Mathias Behrle <mathiasb at m9s.biz>
diff --git a/CHANGELOG b/CHANGELOG
index 4e3febc..9578ade 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 3.4.3 - 2015-12-22
+* Bug fixes (see mercurial logs for details)
+
Version 3.4.2 - 2015-05-22
* Bug fixes (see mercurial logs for details)
diff --git a/PKG-INFO b/PKG-INFO
index b18211d..bf4a323 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: trytond_stock
-Version: 3.4.2
+Version: 3.4.3
Summary: Tryton module for stock and inventory
Home-page: http://www.tryton.org/
Author: Tryton
diff --git a/move.py b/move.py
index 956101d..f993dbf 100644
--- a/move.py
+++ b/move.py
@@ -547,7 +547,7 @@ class Move(Workflow, ModelSQL, ModelView):
product_qty = product.quantity
else:
product_qty = product.template.quantity
- product_qty = Decimal(str(product_qty))
+ product_qty = Decimal(str(max(product_qty, 0)))
# convert wrt currency
with Transaction().set_context(date=self.effective_date):
unit_price = Currency.compute(self.currency, self.unit_price,
@@ -628,7 +628,7 @@ class Move(Workflow, ModelSQL, ModelView):
and self.from_location.type == 'storage'
and self.product.cost_price_method == 'average'):
self._update_product_cost_price('out')
- if not self.cost_price:
+ if self.cost_price is None:
self.cost_price = self.product.cost_price
@classmethod
diff --git a/tryton.cfg b/tryton.cfg
index 0ae4f69..b840cd6 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
[tryton]
-version=3.4.2
+version=3.4.3
depends:
company
currency
diff --git a/trytond_stock.egg-info/PKG-INFO b/trytond_stock.egg-info/PKG-INFO
index d9cc725..49676da 100644
--- a/trytond_stock.egg-info/PKG-INFO
+++ b/trytond_stock.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: trytond-stock
-Version: 3.4.2
+Version: 3.4.3
Summary: Tryton module for stock and inventory
Home-page: http://www.tryton.org/
Author: Tryton
--
tryton-modules-stock
More information about the tryton-debian-vcs
mailing list