[tryton-debian-vcs] tryton-modules-product-cost-fifo branch upstream updated. upstream/3.2.0-1-g49a28d7

Mathias Behrle tryton-debian-vcs at alioth.debian.org
Wed Oct 8 16:52:19 UTC 2014


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

commit 49a28d75f23ef9cf4bfa61bb1c09224aabcae3a6
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Wed Oct 8 13:38:30 2014 +0200

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

diff --git a/CHANGELOG b/CHANGELOG
index 5b05889..d4b9b85 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 3.2.2 - 2014-09-29
+* Bug fixes (see mercurial logs for details)
+
 Version 3.2.1 - 2014-04-22
 * Bug fixes (see mercurial logs for details)
 
diff --git a/PKG-INFO b/PKG-INFO
index ce4ac82..4b13372 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: trytond_product_cost_fifo
-Version: 3.2.1
+Version: 3.2.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 3989323..d2c2160 100644
--- a/move.py
+++ b/move.py
@@ -109,24 +109,7 @@ class Move:
     @ModelView.button
     @Workflow.transition('cancel')
     def cancel(cls, moves):
-        pool = Pool()
-        Date = pool.get('ir.date')
-
-        today = Date.today()
-        for move in moves:
-            move.effective_date = today
-            if (move.from_location.type in ('supplier', 'production')
-                    and move.to_location.type == 'storage'
-                    and move.product.cost_price_method == 'fifo'):
-                move._update_product_cost_price('out')
-            elif (move.to_location.type == 'supplier'
-                    and move.from_location.type == 'storage'
-                    and move.product.cost_price_method == 'fifo'):
-                move._update_product_cost_price('in')
-            move.effective_date = None
-            move.save()
-
-        super(Move, cls).cancel(moves)
+        pass
 
     @classmethod
     def delete(cls, moves):
diff --git a/tryton.cfg b/tryton.cfg
index 2933a04..14fd506 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
 [tryton]
-version=3.2.1
+version=3.2.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 e18d2f3..2156943 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.2.1
+Version: 3.2.2
 Summary: Tryton module to add FIFO cost method
 Home-page: http://www.tryton.org/
 Author: Tryton
diff --git a/trytond_product_cost_fifo.egg-info/SOURCES.txt b/trytond_product_cost_fifo.egg-info/SOURCES.txt
index 77dbcd9..b7743e1 100644
--- a/trytond_product_cost_fifo.egg-info/SOURCES.txt
+++ b/trytond_product_cost_fifo.egg-info/SOURCES.txt
@@ -9,6 +9,18 @@ tryton.cfg
 ./__init__.py
 ./move.py
 ./product.py
+./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
+./locale/sl_SI.po
 doc/index.rst
 locale/bg_BG.po
 locale/ca_ES.po
-- 
tryton-modules-product-cost-fifo



More information about the tryton-debian-vcs mailing list