[tryton-debian-vcs] tryton-modules-product-cost-fifo branch debian-jessie-2.8 updated. debian/2.8.3-1-2-g97e5e59
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-2.8 branch:
https://alioth.debian.org/plugins/scmgit/cgi-bin/gitweb.cgi/?p=tryton/tryton-modules-product-cost-fifo.git;a=commitdiff;h=debian/2.8.3-1-2-g97e5e59
commit 97e5e595791042379c358fa82f0abe965779ad8b
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Wed Dec 23 14:18:55 2015 +0100
Releasing debian version 2.8.4-1.
Signed-off-by: Mathias Behrle <mathiasb at m9s.biz>
diff --git a/debian/changelog b/debian/changelog
index 8a26734..37d8d74 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+tryton-modules-product-cost-fifo (2.8.4-1) unstable; urgency=medium
+
+ * Merging upstream version 2.8.4.
+
+ -- Mathias Behrle <mathiasb at m9s.biz> Wed, 23 Dec 2015 14:18:55 +0100
+
tryton-modules-product-cost-fifo (2.8.3-1) unstable; urgency=medium
* Merging upstream version 2.8.3.
commit 29adaab911a996cfd9b9ac7f4f3043439f057569
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Wed Dec 23 14:18:55 2015 +0100
Merging upstream version 2.8.4.
diff --git a/CHANGELOG b/CHANGELOG
index 948557e..2415840 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 2.8.4 - 2015-12-22
+* Bug fixes (see mercurial logs for details)
+
Version 2.8.3 - 2015-02-22
* Bug fixes (see mercurial logs for details)
diff --git a/PKG-INFO b/PKG-INFO
index b2aca71..6d4d85e 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: trytond_product_cost_fifo
-Version: 2.8.3
+Version: 2.8.4
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 446ea78..8aefe59 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
[tryton]
-version=2.8.3
+version=2.8.4
depends:
ir
product
diff --git a/trytond_product_cost_fifo.egg-info/PKG-INFO b/trytond_product_cost_fifo.egg-info/PKG-INFO
index 497fd74..caa7b0b 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: 2.8.3
+Version: 2.8.4
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