[tryton-debian-vcs] tryton-modules-product-cost-fifo branch upstream-3.4 updated. upstream/3.4.1-1-g91d63e6
Mathias Behrle
tryton-debian-vcs at alioth.debian.org
Wed Dec 23 16:53:06 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-product-cost-fifo.git;a=commitdiff;h=upstream/3.4.1-1-g91d63e6
commit 91d63e6794ef871b2d55ad52a798b1ccc1137118
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Wed Dec 23 14:22:02 2015 +0100
Adding upstream version 3.4.2.
Signed-off-by: Mathias Behrle <mathiasb at m9s.biz>
diff --git a/CHANGELOG b/CHANGELOG
index 6cc9c69..74f1f9c 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 3.4.2 - 2015-12-22
+* Bug fixes (see mercurial logs for details)
+
Version 3.4.1 - 2015-02-22
* Bug fixes (see mercurial logs for details)
diff --git a/PKG-INFO b/PKG-INFO
index 45b852e..e85b896 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: trytond_product_cost_fifo
-Version: 3.4.1
+Version: 3.4.2
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 5e52ec8..8d36aee 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))
@@ -89,7 +95,7 @@ class Move:
and self.to_location.type != 'storage'
and self.product.cost_price_method == 'fifo'):
cost_price = self._update_fifo_out_product_cost_price()
- if not self.cost_price:
+ if self.cost_price is None:
self.cost_price = cost_price
super(Move, self)._do()
diff --git a/tryton.cfg b/tryton.cfg
index 2774f35..8cd50e8 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
[tryton]
-version=3.4.1
+version=3.4.2
depends:
ir
product
diff --git a/trytond_product_cost_fifo.egg-info/PKG-INFO b/trytond_product_cost_fifo.egg-info/PKG-INFO
index 9845e36..bc7aea2 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.4.1
+Version: 3.4.2
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