[tryton-debian-vcs] tryton-modules-production branch upstream-2.6 updated. upstream/2.6.2-1-gee75ef4
Mathias Behrle
tryton-debian-vcs at alioth.debian.org
Wed Oct 8 16:52:30 UTC 2014
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-production.git;a=commitdiff;h=upstream/2.6.2-1-gee75ef4
commit ee75ef44aefa583ae16f628e9eb9a75f3766136c
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Wed Oct 8 14:07:14 2014 +0200
Adding upstream version 2.6.3.
Signed-off-by: Mathias Behrle <mathiasb at m9s.biz>
diff --git a/CHANGELOG b/CHANGELOG
index 8053a79..ecc9bfe 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 2.6.3 - 2014-09-29
+* Bug fixes (see mercurial logs for details)
+
Version 2.6.2 - 2013-05-02
* Bug fixes (see mercurial logs for details)
diff --git a/COPYRIGHT b/COPYRIGHT
index 7668cfa..5695e54 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -1,5 +1,5 @@
-Copyright (C) 2012-2013 Cédric Krier.
-Copyright (C) 2012-2013 B2CK SPRL.
+Copyright (C) 2012-2014 Cédric Krier.
+Copyright (C) 2012-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 c1dd90d..87a041a 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: trytond_production
-Version: 2.6.2
+Version: 2.6.3
Summary: Tryton module for production
Home-page: http://www.tryton.org/
Author: Tryton
diff --git a/bom.py b/bom.py
index 1378dc0..b3ed0a8 100644
--- a/bom.py
+++ b/bom.py
@@ -33,6 +33,8 @@ class BOM(ModelSQL, ModelView):
Uom = Pool().get('product.uom')
for output in self.outputs:
if output.product == product:
+ if not output.quantity:
+ return 0.0
quantity = Uom.compute_qty(uom, quantity,
output.uom, round=False)
return quantity / output.quantity
diff --git a/tryton.cfg b/tryton.cfg
index 33377f2..4af78bd 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
[tryton]
-version=2.6.2
+version=2.6.3
depends:
company
ir
diff --git a/trytond_production.egg-info/PKG-INFO b/trytond_production.egg-info/PKG-INFO
index 0764e7b..2539645 100644
--- a/trytond_production.egg-info/PKG-INFO
+++ b/trytond_production.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: trytond-production
-Version: 2.6.2
+Version: 2.6.3
Summary: Tryton module for production
Home-page: http://www.tryton.org/
Author: Tryton
diff --git a/trytond_production.egg-info/SOURCES.txt b/trytond_production.egg-info/SOURCES.txt
index fee7965..500cea2 100644
--- a/trytond_production.egg-info/SOURCES.txt
+++ b/trytond_production.egg-info/SOURCES.txt
@@ -13,11 +13,28 @@ stock.xml
tryton.cfg
./__init__.py
./bom.py
+./bom.xml
./configuration.py
+./configuration.xml
./product.py
+./product.xml
./production.py
+./production.xml
./stock.py
+./stock.xml
+./tryton.cfg
+./locale/bg_BG.po
+./locale/ca_ES.po
+./locale/cs_CZ.po
+./locale/de_DE.po
+./locale/es_AR.po
+./locale/es_CO.po
+./locale/es_ES.po
+./locale/fr_FR.po
+./locale/nl_NL.po
+./locale/ru_RU.po
./tests/__init__.py
+./tests/scenario_production.rst
./tests/test_production.py
doc/index.rst
locale/bg_BG.po
--
tryton-modules-production
More information about the tryton-debian-vcs
mailing list