[tryton-debian-vcs] tryton-modules-production branch upstream-2.6 updated. upstream/2.6.4-1-gd17d3e5

Mathias Behrle tryton-debian-vcs at alioth.debian.org
Sun May 24 12:19:13 UTC 2015


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.4-1-gd17d3e5

commit d17d3e5f0b36162158386c08cd9790436b35e94c
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Sat May 23 21:08:52 2015 +0200

    Adding upstream version 2.6.5.
    
    Signed-off-by: Mathias Behrle <mathiasb at m9s.biz>

diff --git a/CHANGELOG b/CHANGELOG
index b6c5ec5..23fe7a6 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 2.6.5 - 2015-05-22
+* Bug fixes (see mercurial logs for details)
+
 Version 2.6.4 - 2015-02-22
 * Bug fixes (see mercurial logs for details)
 
diff --git a/PKG-INFO b/PKG-INFO
index a9590e1..10d5d61 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: trytond_production
-Version: 2.6.4
+Version: 2.6.5
 Summary: Tryton module for production
 Home-page: http://www.tryton.org/
 Author: Tryton
diff --git a/production.py b/production.py
index fa1e3a9..79317b6 100644
--- a/production.py
+++ b/production.py
@@ -365,7 +365,9 @@ class Production(Workflow, ModelSQL, ModelView):
             else:
                 cost_price = input_.product.cost_price
             cost += (Decimal(str(input_.internal_quantity)) * cost_price)
-        return cost
+
+        digits = self.__class__.cost.digits
+        return cost.quantize(Decimal(str(10 ** -digits[1])))
 
     def on_change_with_cost(self):
         Uom = Pool().get('product.uom')
diff --git a/tryton.cfg b/tryton.cfg
index 84c7367..1a7b33c 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
 [tryton]
-version=2.6.4
+version=2.6.5
 depends:
     company
     ir
diff --git a/trytond_production.egg-info/PKG-INFO b/trytond_production.egg-info/PKG-INFO
index 7c5bf30..e9bdea6 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.4
+Version: 2.6.5
 Summary: Tryton module for production
 Home-page: http://www.tryton.org/
 Author: Tryton
-- 
tryton-modules-production



More information about the tryton-debian-vcs mailing list