[tryton-debian-vcs] tryton-modules-product-cost-fifo branch debian updated. debian/3.2.2-1-2-gde598a3
Mathias Behrle
tryton-debian-vcs at alioth.debian.org
Thu Oct 23 12:16:43 UTC 2014
The following commit has been merged in the debian branch:
https://alioth.debian.org/plugins/scmgit/cgi-bin/gitweb.cgi/?p=tryton/tryton-modules-product-cost-fifo.git;a=commitdiff;h=debian/3.2.2-1-2-gde598a3
commit de598a36f2e98420ed30b93aabb1e307e25a6f95
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Thu Oct 23 13:32:04 2014 +0200
Releasing debian version 3.4.0-1.
Signed-off-by: Mathias Behrle <mathiasb at m9s.biz>
diff --git a/debian/changelog b/debian/changelog
index 0f2be4f..f40bc86 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+tryton-modules-product-cost-fifo (3.4.0-1) unstable; urgency=medium
+
+ * Merging upstream version 3.4.0.
+
+ -- Mathias Behrle <mathiasb at m9s.biz> Tue, 21 Oct 2014 20:24:13 +0200
+
tryton-modules-product-cost-fifo (3.2.2-1) unstable; urgency=medium
* Updating signing key while using now plain .asc files instead of .pgp
commit e5b80cef1fd6a08ec6b2f5081482334da15f772e
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Tue Oct 21 11:29:16 2014 +0200
Merging upstream version 3.4.0.
diff --git a/CHANGELOG b/CHANGELOG
index d4b9b85..92df752 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,7 +1,4 @@
-Version 3.2.2 - 2014-09-29
-* Bug fixes (see mercurial logs for details)
-
-Version 3.2.1 - 2014-04-22
+Version 3.4.0 - 2014-10-20
* Bug fixes (see mercurial logs for details)
Version 3.2.0 - 2014-04-21
diff --git a/PKG-INFO b/PKG-INFO
index 4b13372..1b707b7 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,12 +1,12 @@
Metadata-Version: 1.1
Name: trytond_product_cost_fifo
-Version: 3.2.2
+Version: 3.4.0
Summary: Tryton module to add FIFO cost method
Home-page: http://www.tryton.org/
Author: Tryton
Author-email: issue_tracker at tryton.org
License: GPL-3
-Download-URL: http://downloads.tryton.org/3.2/
+Download-URL: http://downloads.tryton.org/3.4/
Description: trytond_product_cost_fifo
=========================
diff --git a/locale/fr_FR.po b/locale/es_EC.po
similarity index 64%
copy from locale/fr_FR.po
copy to locale/es_EC.po
index dfd9da2..2c99d4b 100644
--- a/locale/fr_FR.po
+++ b/locale/es_EC.po
@@ -4,18 +4,18 @@ msgstr "Content-Type: text/plain; charset=utf-8\n"
msgctxt "error:stock.move:"
msgid "FIFO quantity can not be greater than quantity."
-msgstr "La quantité FIFO ne peut être plus grande que la quantité."
+msgstr "Cantidad PEPS no puede ser mayor que la cantidad."
msgctxt "error:stock.move:"
msgid "You can not delete move \"%s\" that is used for FIFO cost price."
msgstr ""
-"Vous ne pouvez supprimer le mouvement \"%s\" qui est utilisé pour le calcul "
-"FIFO du prix de revient."
+"No puede eliminar el movimiento \"%s\" que está siendo utilizado por el "
+"precio de costo PEPS."
msgctxt "field:stock.move,fifo_quantity:"
msgid "FIFO Quantity"
-msgstr "Quantité FIFO"
+msgstr "Cantidad PEPS"
msgctxt "selection:product.template,cost_price_method:"
msgid "FIFO"
-msgstr "FIFO"
+msgstr "PEPS"
diff --git a/locale/fr_FR.po b/locale/fr_FR.po
index dfd9da2..36aaf6f 100644
--- a/locale/fr_FR.po
+++ b/locale/fr_FR.po
@@ -9,7 +9,7 @@ msgstr "La quantité FIFO ne peut être plus grande que la quantité."
msgctxt "error:stock.move:"
msgid "You can not delete move \"%s\" that is used for FIFO cost price."
msgstr ""
-"Vous ne pouvez supprimer le mouvement \"%s\" qui est utilisé pour le calcul "
+"Vous ne pouvez supprimer le mouvement « %s » qui est utilisé pour le calcul "
"FIFO du prix de revient."
msgctxt "field:stock.move,fifo_quantity:"
diff --git a/move.py b/move.py
index d2c2160..5e52ec8 100644
--- a/move.py
+++ b/move.py
@@ -76,34 +76,22 @@ class Move:
else:
return self.product.cost_price
- @classmethod
- @ModelView.button
- @Workflow.transition('done')
- def do(cls, moves):
- pool = Pool()
- Date = pool.get('ir.date')
-
- today = Date.today()
- for move in moves:
- if not move.effective_date:
- 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('in')
- elif (move.to_location.type == 'supplier'
- and move.from_location.type == 'storage'
- and move.product.cost_price_method == 'fifo'):
- move._update_product_cost_price('out')
- elif (move.from_location.type == 'storage'
- and move.to_location.type != 'storage'
- and move.product.cost_price_method == 'fifo'):
- cost_price = move._update_fifo_out_product_cost_price()
- if not move.cost_price:
- move.cost_price = cost_price
- move.save()
-
- super(Move, cls).do(moves)
+ def _do(self):
+ if (self.from_location.type in ('supplier', 'production')
+ and self.to_location.type == 'storage'
+ and self.product.cost_price_method == 'fifo'):
+ self._update_product_cost_price('in')
+ elif (self.to_location.type == 'supplier'
+ and self.from_location.type == 'storage'
+ and self.product.cost_price_method == 'fifo'):
+ self._update_product_cost_price('out')
+ elif (self.from_location.type == 'storage'
+ 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:
+ self.cost_price = cost_price
+ super(Move, self)._do()
@classmethod
@ModelView.button
diff --git a/tryton.cfg b/tryton.cfg
index 14fd506..3b00f99 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
[tryton]
-version=3.2.2
+version=3.4.0
depends:
ir
product
diff --git a/trytond_product_cost_fifo.egg-info/PKG-INFO b/trytond_product_cost_fifo.egg-info/PKG-INFO
index 2156943..77be7b7 100644
--- a/trytond_product_cost_fifo.egg-info/PKG-INFO
+++ b/trytond_product_cost_fifo.egg-info/PKG-INFO
@@ -1,12 +1,12 @@
Metadata-Version: 1.1
Name: trytond-product-cost-fifo
-Version: 3.2.2
+Version: 3.4.0
Summary: Tryton module to add FIFO cost method
Home-page: http://www.tryton.org/
Author: Tryton
Author-email: issue_tracker at tryton.org
License: GPL-3
-Download-URL: http://downloads.tryton.org/3.2/
+Download-URL: http://downloads.tryton.org/3.4/
Description: trytond_product_cost_fifo
=========================
diff --git a/trytond_product_cost_fifo.egg-info/SOURCES.txt b/trytond_product_cost_fifo.egg-info/SOURCES.txt
index b7743e1..38bd2db 100644
--- a/trytond_product_cost_fifo.egg-info/SOURCES.txt
+++ b/trytond_product_cost_fifo.egg-info/SOURCES.txt
@@ -16,6 +16,7 @@ tryton.cfg
./locale/de_DE.po
./locale/es_AR.po
./locale/es_CO.po
+./locale/es_EC.po
./locale/es_ES.po
./locale/fr_FR.po
./locale/nl_NL.po
@@ -28,6 +29,7 @@ locale/cs_CZ.po
locale/de_DE.po
locale/es_AR.po
locale/es_CO.po
+locale/es_EC.po
locale/es_ES.po
locale/fr_FR.po
locale/nl_NL.po
diff --git a/trytond_product_cost_fifo.egg-info/requires.txt b/trytond_product_cost_fifo.egg-info/requires.txt
index c4f6720..158bea8 100644
--- a/trytond_product_cost_fifo.egg-info/requires.txt
+++ b/trytond_product_cost_fifo.egg-info/requires.txt
@@ -1,3 +1,3 @@
-trytond_product >= 3.2, < 3.3
-trytond_stock >= 3.2, < 3.3
-trytond >= 3.2, < 3.3
\ No newline at end of file
+trytond_product >= 3.4, < 3.5
+trytond_stock >= 3.4, < 3.5
+trytond >= 3.4, < 3.5
\ No newline at end of file
--
tryton-modules-product-cost-fifo
More information about the tryton-debian-vcs
mailing list