[tryton-debian-vcs] tryton-modules-product-cost-fifo branch debian-jessie-3.0 updated. debian/3.0.2-1-2-g8ed29ce

Mathias Behrle tryton-debian-vcs at alioth.debian.org
Wed Dec 23 16:53:05 UTC 2015


The following commit has been merged in the debian-jessie-3.0 branch:
https://alioth.debian.org/plugins/scmgit/cgi-bin/gitweb.cgi/?p=tryton/tryton-modules-product-cost-fifo.git;a=commitdiff;h=debian/3.0.2-1-2-g8ed29ce

commit 8ed29cedd8b57d70e67c9c795e76a671c526f64c
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Wed Dec 23 14:19:58 2015 +0100

    Releasing debian version 3.0.3-1.
    
    Signed-off-by: Mathias Behrle <mathiasb at m9s.biz>

diff --git a/debian/changelog b/debian/changelog
index bcd6fa8..c939784 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+tryton-modules-product-cost-fifo (3.0.3-1) unstable; urgency=medium
+
+  * Merging upstream version 3.0.3.
+
+ -- Mathias Behrle <mathiasb at m9s.biz>  Wed, 23 Dec 2015 14:19:58 +0100
+
 tryton-modules-product-cost-fifo (3.0.2-1) unstable; urgency=medium
 
   * Adding actual upstream signing key.
commit 20928564519d1f5dfd37a376a64c004f07476164
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Wed Dec 23 14:19:58 2015 +0100

    Merging upstream version 3.0.3.

diff --git a/CHANGELOG b/CHANGELOG
index 24a79ae..dca73dc 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 3.0.3 - 2015-12-22
+* Bug fixes (see mercurial logs for details)
+
 Version 3.0.2 - 2015-02-22
 * Bug fixes (see mercurial logs for details)
 
diff --git a/PKG-INFO b/PKG-INFO
index 5d15fb0..adde413 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: trytond_product_cost_fifo
-Version: 3.0.2
+Version: 3.0.3
 Summary: Tryton module to add FIFO cost method
 Home-page: http://www.tryton.org/
 Author: Tryton
diff --git a/move.py b/move.py
index d2c2160..e189fee 100644
--- a/move.py
+++ b/move.py
@@ -4,6 +4,7 @@ from decimal import Decimal
 from trytond.model import Workflow, ModelView, fields
 from trytond.pyson import Eval
 from trytond.pool import Pool, PoolMeta
+from trytond.transaction import Transaction
 
 __all__ = ['Move']
 __metaclass__ = PoolMeta
@@ -38,8 +39,9 @@ class Move:
         fifo_quantity on the concerned incomming moves. Return the
         cost price for outputing the given product and quantity.
         '''
-
-        Uom = Pool().get('product.uom')
+        pool = Pool()
+        Uom = pool.get('product.uom')
+        Currency = pool.get('currency.currency')
 
         total_qty = Uom.compute_qty(self.uom, self.quantity,
             self.product.default_uom, round=False)
@@ -51,7 +53,11 @@ class Move:
         for move, move_qty in fifo_moves:
             consumed_qty += move_qty
 
-            move_unit_price = Uom.compute_price(move.uom, move.unit_price,
+            with Transaction().set_context(date=move.effective_date):
+                move_unit_price = Currency.compute(
+                    move.currency, move.unit_price,
+                    self.company.currency, round=False)
+            move_unit_price = Uom.compute_price(move.uom, move_unit_price,
                     move.product.default_uom)
             cost_price += move_unit_price * Decimal(str(move_qty))
 
diff --git a/tryton.cfg b/tryton.cfg
index 7944f8b..ec43362 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
 [tryton]
-version=3.0.2
+version=3.0.3
 depends:
     ir
     product
diff --git a/trytond_product_cost_fifo.egg-info/PKG-INFO b/trytond_product_cost_fifo.egg-info/PKG-INFO
index 4a419ae..42c2518 100644
--- a/trytond_product_cost_fifo.egg-info/PKG-INFO
+++ b/trytond_product_cost_fifo.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: trytond-product-cost-fifo
-Version: 3.0.2
+Version: 3.0.3
 Summary: Tryton module to add FIFO cost method
 Home-page: http://www.tryton.org/
 Author: Tryton
-- 
tryton-modules-product-cost-fifo



More information about the tryton-debian-vcs mailing list