[tryton-debian-vcs] tryton-modules-product-cost-fifo branch upstream created. 6c31a14b27e543f9808dd0fbbb65b14dac289685
Mathias Behrle
tryton-debian-vcs at alioth.debian.org
Wed Nov 27 17:05:09 UTC 2013
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=6c31a14b27e543f9808dd0fbbb65b14dac289685
commit 6c31a14b27e543f9808dd0fbbb65b14dac289685
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Sun Nov 24 17:27:29 2013 +0100
Adding upstream version 3.0.0.
diff --git a/CHANGELOG b/CHANGELOG
index 88e6cbd..baa0bdf 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,4 +1,4 @@
-Version 2.8.1 - 2013-07-22
+Version 3.0.0 - 2013-10-21
* Bug fixes (see mercurial logs for details)
Version 2.8.0 - 2013-04-22
diff --git a/PKG-INFO b/PKG-INFO
index 7e67039..f4fca05 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,12 +1,12 @@
Metadata-Version: 1.1
Name: trytond_product_cost_fifo
-Version: 2.8.1
+Version: 3.0.0
Summary: Tryton module to add FIFO cost method
Home-page: http://www.tryton.org/
Author: Tryton
Author-email: UNKNOWN
License: GPL-3
-Download-URL: http://downloads.tryton.org/2.8/
+Download-URL: http://downloads.tryton.org/3.0/
Description: trytond_product_cost_fifo
=========================
@@ -60,6 +60,7 @@ Classifier: Natural Language :: English
Classifier: Natural Language :: French
Classifier: Natural Language :: German
Classifier: Natural Language :: Russian
+Classifier: Natural Language :: Slovenian
Classifier: Natural Language :: Spanish
Classifier: Operating System :: OS Independent
Classifier: Programming Language :: Python :: 2.6
diff --git a/locale/fr_FR.po b/locale/fr_FR.po
index 040d223..dfd9da2 100644
--- a/locale/fr_FR.po
+++ b/locale/fr_FR.po
@@ -19,7 +19,3 @@ msgstr "Quantité FIFO"
msgctxt "selection:product.template,cost_price_method:"
msgid "FIFO"
msgstr "FIFO"
-
-msgctxt "selection:product.template,cost_price_method:"
-msgid "FIFO"
-msgstr "FIFO"
diff --git a/locale/fr_FR.po b/locale/sl_SI.po
similarity index 57%
copy from locale/fr_FR.po
copy to locale/sl_SI.po
index 040d223..224322c 100644
--- a/locale/fr_FR.po
+++ b/locale/sl_SI.po
@@ -4,21 +4,15 @@ 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 "FIFO količina ne more biti večja od same količine."
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."
+msgstr "Prometa \"%s\", ki se uporablja za FIFO nabavno ceno, ni možno brisati."
msgctxt "field:stock.move,fifo_quantity:"
msgid "FIFO Quantity"
-msgstr "Quantité FIFO"
-
-msgctxt "selection:product.template,cost_price_method:"
-msgid "FIFO"
-msgstr "FIFO"
+msgstr "FIFO količina"
msgctxt "selection:product.template,cost_price_method:"
msgid "FIFO"
diff --git a/setup.py b/setup.py
index baecf56..69391c3 100644
--- a/setup.py
+++ b/setup.py
@@ -63,6 +63,7 @@ setup(name='trytond_product_cost_fifo',
'Natural Language :: French',
'Natural Language :: German',
'Natural Language :: Russian',
+ 'Natural Language :: Slovenian',
'Natural Language :: Spanish',
'Operating System :: OS Independent',
'Programming Language :: Python :: 2.6',
diff --git a/tryton.cfg b/tryton.cfg
index 103cc62..741ec4b 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
[tryton]
-version=2.8.1
+version=3.0.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 ff57685..ab2fa7b 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: 2.8.1
+Version: 3.0.0
Summary: Tryton module to add FIFO cost method
Home-page: http://www.tryton.org/
Author: Tryton
Author-email: UNKNOWN
License: GPL-3
-Download-URL: http://downloads.tryton.org/2.8/
+Download-URL: http://downloads.tryton.org/3.0/
Description: trytond_product_cost_fifo
=========================
@@ -60,6 +60,7 @@ Classifier: Natural Language :: English
Classifier: Natural Language :: French
Classifier: Natural Language :: German
Classifier: Natural Language :: Russian
+Classifier: Natural Language :: Slovenian
Classifier: Natural Language :: Spanish
Classifier: Operating System :: OS Independent
Classifier: Programming Language :: Python :: 2.6
diff --git a/trytond_product_cost_fifo.egg-info/SOURCES.txt b/trytond_product_cost_fifo.egg-info/SOURCES.txt
index e4d3d79..77dbcd9 100644
--- a/trytond_product_cost_fifo.egg-info/SOURCES.txt
+++ b/trytond_product_cost_fifo.egg-info/SOURCES.txt
@@ -20,6 +20,7 @@ locale/es_ES.po
locale/fr_FR.po
locale/nl_NL.po
locale/ru_RU.po
+locale/sl_SI.po
trytond_product_cost_fifo.egg-info/PKG-INFO
trytond_product_cost_fifo.egg-info/SOURCES.txt
trytond_product_cost_fifo.egg-info/dependency_links.txt
diff --git a/trytond_product_cost_fifo.egg-info/requires.txt b/trytond_product_cost_fifo.egg-info/requires.txt
index eb4aa19..943e3c2 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 >= 2.8, < 2.9
-trytond_stock >= 2.8, < 2.9
-trytond >= 2.8, < 2.9
\ No newline at end of file
+trytond_product >= 3.0, < 3.1
+trytond_stock >= 3.0, < 3.1
+trytond >= 3.0, < 3.1
\ No newline at end of file
commit 5684352992d0f93b81d27fa69132ed5a558536ef
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Mon Aug 5 18:47:27 2013 +0200
Adding upstream version 2.8.1.
diff --git a/CHANGELOG b/CHANGELOG
index 48ceaaf..88e6cbd 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 2.8.1 - 2013-07-22
+* Bug fixes (see mercurial logs for details)
+
Version 2.8.0 - 2013-04-22
* Bug fixes (see mercurial logs for details)
diff --git a/PKG-INFO b/PKG-INFO
index b4e7d6f..7e67039 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: trytond_product_cost_fifo
-Version: 2.8.0
+Version: 2.8.1
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 1fd1942..3989323 100644
--- a/move.py
+++ b/move.py
@@ -130,10 +130,10 @@ class Move:
@classmethod
def delete(cls, moves):
- moves = cls.search([
+ fifo_moves = cls.search([
('id', 'in', [m.id for m in moves]),
('fifo_quantity', '!=', 0.0),
])
- if moves:
- cls.raise_user_error('del_move_fifo', (moves[0].rec_name,))
+ if fifo_moves:
+ cls.raise_user_error('del_move_fifo', (fifo_moves[0].rec_name,))
super(Move, cls).delete(moves)
diff --git a/tryton.cfg b/tryton.cfg
index b397e25..103cc62 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
[tryton]
-version=2.8.0
+version=2.8.1
depends:
ir
product
diff --git a/trytond_product_cost_fifo.egg-info/PKG-INFO b/trytond_product_cost_fifo.egg-info/PKG-INFO
index 9b5f08c..ff57685 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.0
+Version: 2.8.1
Summary: Tryton module to add FIFO cost method
Home-page: http://www.tryton.org/
Author: Tryton
commit d56448f2d61f1052ac4651541ef0e2e5fcbb1fe7
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Thu May 2 00:36:49 2013 +0200
Adding upstream version 2.8.0.
diff --git a/CHANGELOG b/CHANGELOG
index d32cda0..48ceaaf 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 2.8.0 - 2013-04-22
+* Bug fixes (see mercurial logs for details)
+
Version 2.6.0 - 2012-10-22
* Bug fixes (see mercurial logs for details)
diff --git a/COPYRIGHT b/COPYRIGHT
index 2057c72..9192c97 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -1,6 +1,6 @@
-Copyright (C) 2008-2012 Cédric Krier.
-Copyright (C) 2008-2012 Bertrand Chenal.
-Copyright (C) 2008-2012 B2CK SPRL.
+Copyright (C) 2008-2013 Cédric Krier.
+Copyright (C) 2008-2013 Bertrand Chenal.
+Copyright (C) 2008-2013 B2CK SPRL.
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff --git a/PKG-INFO b/PKG-INFO
index ffd06b1..b4e7d6f 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,12 +1,12 @@
-Metadata-Version: 1.0
+Metadata-Version: 1.1
Name: trytond_product_cost_fifo
-Version: 2.6.0
+Version: 2.8.0
Summary: Tryton module to add FIFO cost method
Home-page: http://www.tryton.org/
Author: Tryton
Author-email: UNKNOWN
License: GPL-3
-Download-URL: http://downloads.tryton.org/2.6/
+Download-URL: http://downloads.tryton.org/2.8/
Description: trytond_product_cost_fifo
=========================
@@ -53,6 +53,7 @@ Classifier: Intended Audience :: Legal Industry
Classifier: Intended Audience :: Manufacturing
Classifier: License :: OSI Approved :: GNU General Public License (GPL)
Classifier: Natural Language :: Bulgarian
+Classifier: Natural Language :: Catalan
Classifier: Natural Language :: Czech
Classifier: Natural Language :: Dutch
Classifier: Natural Language :: English
diff --git a/locale/bg_BG.po b/locale/bg_BG.po
index 4ff7bff..7c7747c 100644
--- a/locale/bg_BG.po
+++ b/locale/bg_BG.po
@@ -3,13 +3,12 @@ msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
msgctxt "error:stock.move:"
-msgid "FIFO quantity can not be greater than quantity!"
-msgstr "FIFO-количество не може да е по-голямо от количеството!"
+msgid "FIFO quantity can not be greater than quantity."
+msgstr ""
msgctxt "error:stock.move:"
-msgid "You can not delete move that is used for FIFO cost price!"
+msgid "You can not delete move \"%s\" that is used for FIFO cost price."
msgstr ""
-"Не може да изтривате движение което се използва за изчисляване на FIFO цена!"
msgctxt "field:stock.move,fifo_quantity:"
msgid "FIFO Quantity"
diff --git a/locale/ca_ES.po b/locale/ca_ES.po
index 0062337..40099ee 100644
--- a/locale/ca_ES.po
+++ b/locale/ca_ES.po
@@ -3,14 +3,14 @@ msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
msgctxt "error:stock.move:"
-msgid "FIFO quantity can not be greater than quantity!"
-msgstr "La quantitat FIFO no pot ser major que «quantitat»"
+msgid "FIFO quantity can not be greater than quantity."
+msgstr "Quantitat FIFO no pot ser més gran que quantitat."
msgctxt "error:stock.move:"
-msgid "You can not delete move that is used for FIFO cost price!"
+msgid "You can not delete move \"%s\" that is used for FIFO cost price."
msgstr ""
-"No pot esborrar un moviment que s'utilitza per al càlcul FIFO del preu de "
-"cost"
+"No podeu esborrar el moviment \"%s\" que està sent usat pel preu de cost "
+"FIFO."
msgctxt "field:stock.move,fifo_quantity:"
msgid "FIFO Quantity"
diff --git a/locale/cs_CZ.po b/locale/cs_CZ.po
index b5d3d5d..d9d8199 100644
--- a/locale/cs_CZ.po
+++ b/locale/cs_CZ.po
@@ -3,11 +3,11 @@ msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
msgctxt "error:stock.move:"
-msgid "FIFO quantity can not be greater than quantity!"
+msgid "FIFO quantity can not be greater than quantity."
msgstr ""
msgctxt "error:stock.move:"
-msgid "You can not delete move that is used for FIFO cost price!"
+msgid "You can not delete move \"%s\" that is used for FIFO cost price."
msgstr ""
msgctxt "field:stock.move,fifo_quantity:"
diff --git a/locale/de_DE.po b/locale/de_DE.po
index cc4f995..6182154 100644
--- a/locale/de_DE.po
+++ b/locale/de_DE.po
@@ -3,14 +3,14 @@ msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
msgctxt "error:stock.move:"
-msgid "FIFO quantity can not be greater than quantity!"
-msgstr "FIFO Anzahl kann nicht größer als Anzahl sein!"
+msgid "FIFO quantity can not be greater than quantity."
+msgstr "Anzahl FIFO kann nicht größer als Anzahl sein."
msgctxt "error:stock.move:"
-msgid "You can not delete move that is used for FIFO cost price!"
+msgid "You can not delete move \"%s\" that is used for FIFO cost price."
msgstr ""
-"Eine Bewegung, die Bestandteil einer Kostenpreisermittlung nach FIFO ist, "
-"kann nicht gelöscht werden!"
+"Buchungssatz \"%s\" kann nicht gelöscht werden, da er für die Kalkulation "
+"des FIFO Kostenpreis benutzt wird."
msgctxt "field:stock.move,fifo_quantity:"
msgid "FIFO Quantity"
diff --git a/locale/es_AR.po b/locale/es_AR.po
index cd66591..39c3c57 100644
--- a/locale/es_AR.po
+++ b/locale/es_AR.po
@@ -3,14 +3,14 @@ msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
msgctxt "error:stock.move:"
-msgid "FIFO quantity can not be greater than quantity!"
-msgstr "¡La cantidad PEPS no puede se mayor que «cantidad»!"
+msgid "FIFO quantity can not be greater than quantity."
+msgstr "Cantidad PEPS no puede ser mayor que cantidad."
msgctxt "error:stock.move:"
-msgid "You can not delete move that is used for FIFO cost price!"
+msgid "You can not delete move \"%s\" that is used for FIFO cost price."
msgstr ""
-"¡No puede borrar un movimiento que se utiliza para el cálculo PEPS del "
-"precio de costo!"
+"No puede eliminar el movimiento «%s» que está siendo usado por el precio de "
+"costo PEPS."
msgctxt "field:stock.move,fifo_quantity:"
msgid "FIFO Quantity"
diff --git a/locale/es_CO.po b/locale/es_CO.po
index 124f489..d979fa7 100644
--- a/locale/es_CO.po
+++ b/locale/es_CO.po
@@ -3,17 +3,17 @@ msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
msgctxt "error:stock.move:"
-msgid "FIFO quantity can not be greater than quantity!"
-msgstr "¡Cantidad FIFO no puede ser mayor que la cantidad!"
+msgid "FIFO quantity can not be greater than quantity."
+msgstr "Cantidad PEPS no puede ser mayor que la cantidad."
msgctxt "error:stock.move:"
-msgid "You can not delete move that is used for FIFO cost price!"
-msgstr "¡No puede borrar un movimiento usado por un precio de costo de FIFO!"
+msgid "You can not delete move \"%s\" that is used for FIFO cost price."
+msgstr "Usted no puede eliminar movimientos \"%s\" utilizados para costos PEPS."
msgctxt "field:stock.move,fifo_quantity:"
msgid "FIFO Quantity"
-msgstr "Cantidad FIFO"
+msgstr "Cantidad PEPS"
msgctxt "selection:product.template,cost_price_method:"
msgid "FIFO"
-msgstr "FIFO"
+msgstr "PEPS"
diff --git a/locale/es_ES.po b/locale/es_ES.po
index e496f6a..4016d89 100644
--- a/locale/es_ES.po
+++ b/locale/es_ES.po
@@ -3,14 +3,14 @@ msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
msgctxt "error:stock.move:"
-msgid "FIFO quantity can not be greater than quantity!"
-msgstr "La cantidad FIFO no puede se mayor que la \"cantidad\"."
+msgid "FIFO quantity can not be greater than quantity."
+msgstr "Cantidad FIFO no puede ser mayor que cantidad."
msgctxt "error:stock.move:"
-msgid "You can not delete move that is used for FIFO cost price!"
+msgid "You can not delete move \"%s\" that is used for FIFO cost price."
msgstr ""
-"No puede eliminar un movimiento que se utiliza para el cálculo FIFO del "
-"precio de coste."
+"No puede borrar el movimiento \"%s\" que está siendo usado por el precio de "
+"coste FIFO."
msgctxt "field:stock.move,fifo_quantity:"
msgid "FIFO Quantity"
diff --git a/locale/fr_FR.po b/locale/fr_FR.po
index c2b4d50..040d223 100644
--- a/locale/fr_FR.po
+++ b/locale/fr_FR.po
@@ -3,24 +3,14 @@ msgid ""
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 pas être supérieure à la quantité!"
+msgid "FIFO quantity can not be greater than quantity."
+msgstr "La quantité FIFO ne peut être plus grande que la quantité."
msgctxt "error:stock.move:"
-msgid "FIFO quantity can not be greater than quantity!"
-msgstr "La quantité FIFO ne peut pas être supérieure à la quantité!"
-
-msgctxt "error:stock.move:"
-msgid "You can not delete move that is used for FIFO cost price!"
-msgstr ""
-"Vous ne pouvez pas supprimer de mouvement utilisé pour le prix de revient "
-"FIFO !"
-
-msgctxt "error:stock.move:"
-msgid "You can not delete move that is used for FIFO cost price!"
+msgid "You can not delete move \"%s\" that is used for FIFO cost price."
msgstr ""
-"Vous ne pouvez pas supprimer de mouvement utilisé pour le prix de revient "
-"FIFO !"
+"Vous ne pouvez supprimer le mouvement \"%s\" qui est utilisé pour le calcul "
+"FIFO du prix de revient."
msgctxt "field:stock.move,fifo_quantity:"
msgid "FIFO Quantity"
diff --git a/locale/nl_NL.po b/locale/nl_NL.po
index b5d3d5d..d9d8199 100644
--- a/locale/nl_NL.po
+++ b/locale/nl_NL.po
@@ -3,11 +3,11 @@ msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
msgctxt "error:stock.move:"
-msgid "FIFO quantity can not be greater than quantity!"
+msgid "FIFO quantity can not be greater than quantity."
msgstr ""
msgctxt "error:stock.move:"
-msgid "You can not delete move that is used for FIFO cost price!"
+msgid "You can not delete move \"%s\" that is used for FIFO cost price."
msgstr ""
msgctxt "field:stock.move,fifo_quantity:"
diff --git a/locale/ru_RU.po b/locale/ru_RU.po
index b5d3d5d..d9d8199 100644
--- a/locale/ru_RU.po
+++ b/locale/ru_RU.po
@@ -3,11 +3,11 @@ msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
msgctxt "error:stock.move:"
-msgid "FIFO quantity can not be greater than quantity!"
+msgid "FIFO quantity can not be greater than quantity."
msgstr ""
msgctxt "error:stock.move:"
-msgid "You can not delete move that is used for FIFO cost price!"
+msgid "You can not delete move \"%s\" that is used for FIFO cost price."
msgstr ""
msgctxt "field:stock.move,fifo_quantity:"
diff --git a/move.py b/move.py
index 65c5a3e..1fd1942 100644
--- a/move.py
+++ b/move.py
@@ -1,7 +1,7 @@
#This file is part of Tryton. The COPYRIGHT file at the top level of
#this repository contains the full copyright notices and license terms.
from decimal import Decimal
-from trytond.model import fields
+from trytond.model import Workflow, ModelView, fields
from trytond.pyson import Eval
from trytond.pool import Pool, PoolMeta
@@ -21,32 +21,30 @@ class Move:
cls._sql_constraints += [
('check_fifo_quantity_out',
'CHECK(quantity >= fifo_quantity)',
- 'FIFO quantity can not be greater than quantity!'),
+ 'FIFO quantity can not be greater than quantity.'),
]
cls._error_messages.update({
- 'del_move_fifo': 'You can not delete move that is used '\
- 'for FIFO cost price!',
+ 'del_move_fifo': ('You can not delete move "%s" that is used '
+ 'for FIFO cost price.'),
})
@staticmethod
def default_fifo_quantity():
return 0.0
- @classmethod
- def _update_fifo_out_product_cost_price(cls, product, quantity, uom,
- date):
+ def _update_fifo_out_product_cost_price(self):
'''
- Update the product cost price of the given product. Update
+ Update the product cost price of the given product on the move. Update
fifo_quantity on the concerned incomming moves. Return the
cost price for outputing the given product and quantity.
'''
Uom = Pool().get('product.uom')
- total_qty = Uom.compute_qty(uom, quantity, product.default_uom,
- round=False)
+ total_qty = Uom.compute_qty(self.uom, self.quantity,
+ self.product.default_uom, round=False)
- fifo_moves = product.template.get_fifo_move(total_qty)
+ fifo_moves = self.product.template.get_fifo_move(total_qty)
cost_price = Decimal("0.0")
consumed_qty = 0.0
@@ -57,118 +55,85 @@ class Move:
move.product.default_uom)
cost_price += move_unit_price * Decimal(str(move_qty))
- cls._update_product_cost_price(product.id, -move_qty,
- product.default_uom, move_unit_price, move.currency,
- move.company, date)
+ move.quantity = move_qty
+ move._update_product_cost_price('out')
- move_qty = Uom.compute_qty(product.default_uom, move_qty,
+ move_qty = Uom.compute_qty(self.product.default_uom, move_qty,
move.uom, round=False)
- cls.write([move], {
- 'fifo_quantity': (move.fifo_quantity or 0.0) + move_qty,
- })
+ # Use write as move instance quantity was modified to call
+ # _update_product_cost_price
+ self.write([self.__class__(move.id)], {
+ 'fifo_quantity': (move.fifo_quantity or 0.0) + move_qty,
+ })
if Decimal(str(consumed_qty)) != Decimal("0"):
cost_price = cost_price / Decimal(str(consumed_qty))
if cost_price != Decimal("0"):
- digits = cls.cost_price.digits
+ digits = self.__class__.cost_price.digits
return cost_price.quantize(
Decimal(str(10.0 ** -digits[1])))
else:
- return product.cost_price
+ return self.product.cost_price
@classmethod
- def create(cls, vals):
+ @ModelView.button
+ @Workflow.transition('done')
+ def do(cls, moves):
pool = Pool()
- Location = pool.get('stock.location')
- Product = pool.get('product.product')
Date = pool.get('ir.date')
today = Date.today()
- effective_date = vals.get('effective_date') or today
-
- if vals.get('state') == 'done':
- from_location = Location(vals['from_location'])
- to_location = Location(vals['to_location'])
- product = Product(vals['product'])
- if (from_location.type in ('supplier', 'production')
- and to_location.type == 'storage'
- and product.cost_price_method == 'fifo'):
- cls._update_product_cost_price(vals['product'],
- vals['quantity'], vals['uom'], vals['unit_price'],
- vals['currency'], effective_date)
- if (to_location.type == 'supplier'
- and from_location.type == 'storage'
- and product.cost_price_method == 'fifo'):
- cls._update_product_cost_price(vals['product'],
- -vals['quantity'], vals['uom'], vals['unit_price'],
- vals['currency'], effective_date)
- if to_location.type != 'storage' \
- and to_location.type != 'supplier' \
- and product.cost_price_method == 'fifo':
-
- cost_price = cls._update_fifo_out_product_cost_price(product,
- vals['quantity'], vals['uom'], effective_date)
- if not vals.get('cost_price'):
- vals['cost_price'] = cost_price
-
- return super(Move, cls).create(vals)
+ 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)
@classmethod
- def write(cls, moves, vals):
- Date = Pool().get('ir.date')
+ @ModelView.button
+ @Workflow.transition('cancel')
+ def cancel(cls, moves):
+ pool = Pool()
+ Date = pool.get('ir.date')
today = Date.today()
- effective_date = vals.get('effective_date') or today
-
- if 'state' in vals and vals['state'] == 'done':
- for move in moves:
- if vals['state'] == 'cancel':
- if (move.from_location.type in ('supplier', 'production')
- and move.to_location.type == 'storage'
- and move.state != 'cancel'
- and move.product.cost_price_method == 'fifo'):
- cls._update_product_cost_price(move.product.id,
- -move.quantity, move.uom, move.unit_price,
- move.currency, move.company, effective_date)
- if (move.to_location.type == 'supplier'
- and move.from_location.type == 'storage'
- and move.state != 'cancel'
- and move.product.cost_price_method == 'fifo'):
- cls._update_product_cost_price(move.product.id,
- move.quantity, move.uom, move.unit_price,
- move.currency, move.company, effective_date)
-
- elif vals['state'] == 'done':
- if (move.from_location.type in ('supplier', 'production')
- and move.to_location.type == 'storage'
- and move.state != 'done'
- and move.product.cost_price_method == 'fifo'):
- cls._update_product_cost_price(move.product.id,
- move.quantity, move.uom, move.unit_price,
- move.currency, move.company, effective_date)
- if (move.to_location.type == 'supplier'
- and move.from_location.type == 'storage'
- and move.state != 'done'
- and move.product.cost_price_method == 'fifo'):
- cls._update_product_cost_price(move.product.id,
- -move.quantity, move.uom, move.unit_price,
- move.currency, move.company, effective_date)
- if move.to_location.type != 'storage' \
- and move.to_location.type != 'supplier' \
- and move.product.cost_price_method == 'fifo':
- cost_price = cls._update_fifo_out_product_cost_price(
- move.product, move.quantity, move.uom,
- effective_date)
- if not vals.get('cost_price'):
- vals['cost_price'] = cost_price
- super(Move, cls).write(moves, vals)
+ 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)
@classmethod
def delete(cls, moves):
- if cls.search([
+ moves = cls.search([
('id', 'in', [m.id for m in moves]),
('fifo_quantity', '!=', 0.0),
- ]):
- cls.raise_user_error('del_move_fifo')
+ ])
+ if moves:
+ cls.raise_user_error('del_move_fifo', (moves[0].rec_name,))
super(Move, cls).delete(moves)
diff --git a/product.py b/product.py
index f226809..3449c3e 100644
--- a/product.py
+++ b/product.py
@@ -29,6 +29,7 @@ class Template:
Move = pool.get('stock.move')
Uom = pool.get('product.uom')
Location = pool.get('stock.location')
+ Template = pool.get('product.template')
locations = Location.search([
('type', '=', 'storage'),
diff --git a/setup.py b/setup.py
index 4b991ce..baecf56 100644
--- a/setup.py
+++ b/setup.py
@@ -25,10 +25,10 @@ requires = []
for dep in info.get('depends', []):
if not re.match(r'(ir|res|webdav)(\W|$)', dep):
requires.append('trytond_%s >= %s.%s, < %s.%s' %
- (dep, major_version, minor_version, major_version,
- minor_version + 1))
+ (dep, major_version, minor_version, major_version,
+ minor_version + 1))
requires.append('trytond >= %s.%s, < %s.%s' %
- (major_version, minor_version, major_version, minor_version + 1))
+ (major_version, minor_version, major_version, minor_version + 1))
setup(name='trytond_product_cost_fifo',
version=info.get('version', '0.0.1'),
@@ -36,15 +36,15 @@ setup(name='trytond_product_cost_fifo',
long_description=read('README'),
author='Tryton',
url='http://www.tryton.org/',
- download_url="http://downloads.tryton.org/" + \
- info.get('version', '0.0.1').rsplit('.', 1)[0] + '/',
+ download_url=("http://downloads.tryton.org/" +
+ info.get('version', '0.0.1').rsplit('.', 1)[0] + '/'),
package_dir={'trytond.modules.product_cost_fifo': '.'},
packages=[
'trytond.modules.product_cost_fifo',
],
package_data={
- 'trytond.modules.product_cost_fifo': info.get('xml', []) \
- + ['tryton.cfg', 'locale/*.po'],
+ 'trytond.modules.product_cost_fifo': (info.get('xml', [])
+ + ['tryton.cfg', 'locale/*.po']),
},
classifiers=[
'Development Status :: 5 - Production/Stable',
@@ -56,6 +56,7 @@ setup(name='trytond_product_cost_fifo',
'Intended Audience :: Manufacturing',
'License :: OSI Approved :: GNU General Public License (GPL)',
'Natural Language :: Bulgarian',
+ 'Natural Language :: Catalan',
'Natural Language :: Czech',
'Natural Language :: Dutch',
'Natural Language :: English',
diff --git a/tryton.cfg b/tryton.cfg
index 7273173..b397e25 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
[tryton]
-version=2.6.0
+version=2.8.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 8de0eea..9b5f08c 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.0
+Metadata-Version: 1.1
Name: trytond-product-cost-fifo
-Version: 2.6.0
+Version: 2.8.0
Summary: Tryton module to add FIFO cost method
Home-page: http://www.tryton.org/
Author: Tryton
Author-email: UNKNOWN
License: GPL-3
-Download-URL: http://downloads.tryton.org/2.6/
+Download-URL: http://downloads.tryton.org/2.8/
Description: trytond_product_cost_fifo
=========================
@@ -53,6 +53,7 @@ Classifier: Intended Audience :: Legal Industry
Classifier: Intended Audience :: Manufacturing
Classifier: License :: OSI Approved :: GNU General Public License (GPL)
Classifier: Natural Language :: Bulgarian
+Classifier: Natural Language :: Catalan
Classifier: Natural Language :: Czech
Classifier: Natural Language :: Dutch
Classifier: Natural Language :: English
diff --git a/trytond_product_cost_fifo.egg-info/requires.txt b/trytond_product_cost_fifo.egg-info/requires.txt
index 2480e97..eb4aa19 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 >= 2.6, < 2.7
-trytond_stock >= 2.6, < 2.7
-trytond >= 2.6, < 2.7
\ No newline at end of file
+trytond_product >= 2.8, < 2.9
+trytond_stock >= 2.8, < 2.9
+trytond >= 2.8, < 2.9
\ No newline at end of file
commit a65291cd2d8a6d3b03f5445bf85c83c8445becdc
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Tue Oct 23 19:53:38 2012 +0200
Adding upstream version 2.6.0.
diff --git a/CHANGELOG b/CHANGELOG
index 7cdb24c..d32cda0 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 2.6.0 - 2012-10-22
+* Bug fixes (see mercurial logs for details)
+
Version 2.4.0 - 2012-04-24
* Bug fixes (see mercurial logs for details)
* Update cost_price only from supplier to storage
diff --git a/MANIFEST.in b/MANIFEST.in
index 32879df..97a9596 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -4,6 +4,7 @@ include TODO
include COPYRIGHT
include CHANGELOG
include LICENSE
+include tryton.cfg
include *.xml
include *.odt
include locale/*.po
diff --git a/PKG-INFO b/PKG-INFO
index b08e476..ffd06b1 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,17 +1,48 @@
Metadata-Version: 1.0
Name: trytond_product_cost_fifo
-Version: 2.4.0
-Summary: Add FIFO cost method on the product form.
-Once installed, the price of the stock moves from a supplier or to a
-customer will update automatically the cost price of the related
-product (if the cost price method is FIFO)
-
+Version: 2.6.0
+Summary: Tryton module to add FIFO cost method
Home-page: http://www.tryton.org/
-Author: B2CK
-Author-email: info at b2ck.com
+Author: Tryton
+Author-email: UNKNOWN
License: GPL-3
-Download-URL: http://downloads.tryton.org/2.4/
-Description: UNKNOWN
+Download-URL: http://downloads.tryton.org/2.6/
+Description: trytond_product_cost_fifo
+ =========================
+
+ The product_cost_fifo module of the Tryton application platform.
+
+ Installing
+ ----------
+
+ See INSTALL
+
+ Support
+ -------
+
+ If you encounter any problems with Tryton, please don't hesitate to ask
+ questions on the Tryton bug tracker, mailing list, wiki or IRC channel:
+
+ http://bugs.tryton.org/
+ http://groups.tryton.org/
+ http://wiki.tryton.org/
+ irc://irc.freenode.net/tryton
+
+ License
+ -------
+
+ See LICENSE
+
+ Copyright
+ ---------
+
+ See COPYRIGHT
+
+
+ For more information please visit the Tryton web site:
+
+ http://www.tryton.org/
+
Platform: UNKNOWN
Classifier: Development Status :: 5 - Production/Stable
Classifier: Environment :: Plugins
diff --git a/README b/README
index e386b0b..bd15898 100644
--- a/README
+++ b/README
@@ -2,7 +2,6 @@ trytond_product_cost_fifo
=========================
The product_cost_fifo module of the Tryton application platform.
-See __tryton__.py
Installing
----------
diff --git a/__init__.py b/__init__.py
index 6487779..431d17e 100644
--- a/__init__.py
+++ b/__init__.py
@@ -1,5 +1,12 @@
#This file is part of Tryton. The COPYRIGHT file at the top level of
#this repository contains the full copyright notices and license terms.
-
+from trytond.pool import Pool
from .product import *
from .move import *
+
+
+def register():
+ Pool.register(
+ Template,
+ Move,
+ module='product_cost_fifo', type_='model')
diff --git a/__tryton__.py b/__tryton__.py
deleted file mode 100644
index 9827eec..0000000
--- a/__tryton__.py
+++ /dev/null
@@ -1,79 +0,0 @@
-#This file is part of Tryton. The COPYRIGHT file at the top level of
-#this repository contains the full copyright notices and license terms.
-{
- 'name': 'Product Cost FIFO',
- 'name_bg_BG': 'FIFO цена на продукт',
- 'name_ca_ES': 'Cost FIFO de productes',
- 'name_de_DE': 'Artikel Kostenpreisermittlung FIFO',
- 'name_es_AR': 'Costo FIFO de producto',
- 'name_es_CO': 'Costo FIFO de producto',
- 'name_es_ES': 'Coste FIFO de producto',
- 'name_fr_FR': 'Prix de revient produit FIFO',
- 'version': '2.4.0',
- 'author': 'B2CK',
- 'email': 'info at b2ck.com',
- 'website': 'http://www.tryton.org/',
- 'description': '''Add FIFO cost method on the product form.
-Once installed, the price of the stock moves from a supplier or to a
-customer will update automatically the cost price of the related
-product (if the cost price method is FIFO)
-''',
- 'description_bg_BG': '''Добавя FIFO начин на остойностяване в формата на продукт
- - Добавя FIFO (първи влязъл първи излязъл) като начин на изчисляване на
- цената на продукт.
- - След инсталиране на този модул цената на даден продукт (ако е избран този
- начин на остойностяване) се изчислява автоматично при всяко движение на
- наличност от доставчик или към клиент
-''',
- 'description_ca_ES': '''Afegeix el mètode de cost FIFO al formulari de producte.
-Un cop instal·lat, el preu dels moviments d'estoc des d'un proveïdor o un client,
-actualitzarà automàticament el preu de cost del producte relacionat (si el mètode
-de càlcul del preu de cost és FIFO).
-''',
- 'description_de_DE': '''Kostenpreisermittlung für Artikel nach Methode 'FIFO'
- - Fügt 'FIFO' (First In - First Out) zu den Methoden für die
- Kostenpreisermittlung für Artikel hinzu.
- - Nach Installation dieses Moduls wird der Kostenpreis eines Artikels (für
- den die Methode FIFO gewählt wurde) automatisch bei jeder Lagerbewegung
- von einem Lieferanten oder zu einem Kunden angepasst.
-''',
- 'description_es_AR': '''Añade el método de coste FIFO en el formulario de producto.
-Una vez instalado, el precio de los movimientos de stock desde un proveedor o
-a un cliente actualizará automáticamente el precio de costo del producto
-relacionado (si el método de cálculo del precio de costo es FIFO)
-''',
- 'description_es_CO': '''Añade el método de costo FIFO al formulario de producto.
-Cuando está instalado, el precio de los movimientos de stock desde un proveedor
-o a un cliente actualizarán automáticamente el precio de costo del producto
-relacionado (Si método del costo de producto es FIFO)
-''',
- 'description_es_ES': '''Añade el método de coste FIFO en el formulario de producto.
-Una vez instalado, el precio de los movimientos de stock desde un proveedor o
-a un cliente actualizará automáticamente el precio de coste del producto
-relacionado (si el método de cálculo del precio de coste es FIFO)
-''',
- 'description_fr_FR': '''Ajoute 'FIFO' parmi les méthodes de coût du produit.
-Une fois le module installé, le prix de chaque mouvement de stock
-depuis un fournisseur ou vers un client modifiera automatiquement le
-prix de revient du produit concerné (si la méthode de coût est FIFO).
-''',
- 'depends': [
- 'ir',
- 'product',
- 'stock',
- ],
- 'xml': [
- ],
- 'translation': [
- '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',
- ],
-}
diff --git a/locale/es_AR.po b/locale/es_AR.po
index ed1ec2f..cd66591 100644
--- a/locale/es_AR.po
+++ b/locale/es_AR.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 cantidad FIFO no puede se mayor que «cantidad»!"
+msgstr "¡La cantidad PEPS no puede se mayor que «cantidad»!"
msgctxt "error:stock.move:"
msgid "You can not delete move that is used for FIFO cost price!"
msgstr ""
-"¡No puede borrar un movimiento que se utiliza para el cálculo FIFO del "
+"¡No puede borrar un movimiento que se utiliza para el cálculo PEPS del "
"precio de costo!"
msgctxt "field:stock.move,fifo_quantity:"
msgid "FIFO Quantity"
-msgstr "Cantidad FIFO"
+msgstr "Cantidad PEPS"
msgctxt "selection:product.template,cost_price_method:"
msgid "FIFO"
-msgstr "FIFO"
+msgstr "PEPS"
diff --git a/locale/es_CO.po b/locale/es_CO.po
index 906747d..124f489 100644
--- a/locale/es_CO.po
+++ b/locale/es_CO.po
@@ -8,8 +8,7 @@ msgstr "¡Cantidad FIFO no puede ser mayor que la cantidad!"
msgctxt "error:stock.move:"
msgid "You can not delete move that is used for FIFO cost price!"
-msgstr ""
-"¡No puede borrar un movimiento que es usado por el precio de costo de FIFO!"
+msgstr "¡No puede borrar un movimiento usado por un precio de costo de FIFO!"
msgctxt "field:stock.move,fifo_quantity:"
msgid "FIFO Quantity"
diff --git a/move.py b/move.py
index 2ae8060..65c5a3e 100644
--- a/move.py
+++ b/move.py
@@ -1,73 +1,69 @@
#This file is part of Tryton. The COPYRIGHT file at the top level of
#this repository contains the full copyright notices and license terms.
from decimal import Decimal
-from trytond.model import ModelView, ModelSQL, fields
+from trytond.model import fields
from trytond.pyson import Eval
-from trytond.pool import Pool
+from trytond.pool import Pool, PoolMeta
+__all__ = ['Move']
+__metaclass__ = PoolMeta
-class Move(ModelSQL, ModelView):
- _name = 'stock.move'
+
+class Move:
+ __name__ = 'stock.move'
fifo_quantity = fields.Float('FIFO Quantity',
digits=(16, Eval('unit_digits', 2)),
depends=['unit_digits'])
- def __init__(self):
- super(Move, self).__init__()
- self._sql_constraints += [
- ('check_fifo_quantity_out',
- 'CHECK(quantity >= fifo_quantity)',
- 'FIFO quantity can not be greater than quantity!'),
- ]
- self._error_messages.update({
- 'del_move_fifo': 'You can not delete move that is used ' \
+ @classmethod
+ def __setup__(cls):
+ super(Move, cls).__setup__()
+ cls._sql_constraints += [
+ ('check_fifo_quantity_out',
+ 'CHECK(quantity >= fifo_quantity)',
+ 'FIFO quantity can not be greater than quantity!'),
+ ]
+ cls._error_messages.update({
+ 'del_move_fifo': 'You can not delete move that is used '\
'for FIFO cost price!',
- })
+ })
- def default_fifo_quantity(self):
+ @staticmethod
+ def default_fifo_quantity():
return 0.0
- def _update_fifo_out_product_cost_price(self, product, quantity, uom,
+ @classmethod
+ def _update_fifo_out_product_cost_price(cls, product, quantity, uom,
date):
'''
Update the product cost price of the given product. Update
fifo_quantity on the concerned incomming moves. Return the
cost price for outputing the given product and quantity.
-
- :param product: a BrowseRecord of the product
- :param quantity: the quantity of the outgoing product
- :param uom: the uom id or a BrowseRecord of the uom
- :param date: the date for the currency rate calculation
- :return: cost_price (of type decimal)
'''
- template_obj = Pool().get('product.template')
- uom_obj = Pool().get('product.uom')
-
- if isinstance(uom, (int, long)):
- uom = uom_obj.browse(uom)
+ Uom = Pool().get('product.uom')
- total_qty = uom_obj.compute_qty(uom, quantity, product.default_uom,
+ total_qty = Uom.compute_qty(uom, quantity, product.default_uom,
round=False)
- fifo_moves = template_obj.get_fifo_move(product.template.id, total_qty)
+ fifo_moves = product.template.get_fifo_move(total_qty)
cost_price = Decimal("0.0")
consumed_qty = 0.0
for move, move_qty in fifo_moves:
consumed_qty += move_qty
- move_unit_price = uom_obj.compute_price(move.uom, move.unit_price,
+ move_unit_price = Uom.compute_price(move.uom, move.unit_price,
move.product.default_uom)
cost_price += move_unit_price * Decimal(str(move_qty))
- self._update_product_cost_price(product.id, -move_qty,
+ cls._update_product_cost_price(product.id, -move_qty,
product.default_uom, move_unit_price, move.currency,
move.company, date)
- move_qty = uom_obj.compute_qty(product.default_uom, move_qty,
+ move_qty = Uom.compute_qty(product.default_uom, move_qty,
move.uom, round=False)
- self.write(move.id, {
+ cls.write([move], {
'fifo_quantity': (move.fifo_quantity or 0.0) + move_qty,
})
@@ -75,71 +71,71 @@ class Move(ModelSQL, ModelView):
cost_price = cost_price / Decimal(str(consumed_qty))
if cost_price != Decimal("0"):
- digits = self.cost_price.digits
+ digits = cls.cost_price.digits
return cost_price.quantize(
Decimal(str(10.0 ** -digits[1])))
else:
return product.cost_price
- def create(self, vals):
+ @classmethod
+ def create(cls, vals):
pool = Pool()
- location_obj = pool.get('stock.location')
- product_obj = pool.get('product.product')
- date_obj = pool.get('ir.date')
+ Location = pool.get('stock.location')
+ Product = pool.get('product.product')
+ Date = pool.get('ir.date')
- today = date_obj.today()
+ today = Date.today()
effective_date = vals.get('effective_date') or today
if vals.get('state') == 'done':
- from_location = location_obj.browse(vals['from_location'])
- to_location = location_obj.browse(vals['to_location'])
- product = product_obj.browse(vals['product'])
+ from_location = Location(vals['from_location'])
+ to_location = Location(vals['to_location'])
+ product = Product(vals['product'])
if (from_location.type in ('supplier', 'production')
and to_location.type == 'storage'
and product.cost_price_method == 'fifo'):
- self._update_product_cost_price(vals['product'],
+ cls._update_product_cost_price(vals['product'],
vals['quantity'], vals['uom'], vals['unit_price'],
vals['currency'], effective_date)
if (to_location.type == 'supplier'
and from_location.type == 'storage'
and product.cost_price_method == 'fifo'):
- self._update_product_cost_price(vals['product'],
+ cls._update_product_cost_price(vals['product'],
-vals['quantity'], vals['uom'], vals['unit_price'],
vals['currency'], effective_date)
if to_location.type != 'storage' \
and to_location.type != 'supplier' \
and product.cost_price_method == 'fifo':
- cost_price = self._update_fifo_out_product_cost_price(product,
+ cost_price = cls._update_fifo_out_product_cost_price(product,
vals['quantity'], vals['uom'], effective_date)
if not vals.get('cost_price'):
vals['cost_price'] = cost_price
- return super(Move, self).create(vals)
+ return super(Move, cls).create(vals)
- def write(self, ids, vals):
- date_obj = Pool().get('ir.date')
+ @classmethod
+ def write(cls, moves, vals):
+ Date = Pool().get('ir.date')
- if isinstance(ids, (int, long)):
- ids = [ids]
- today = date_obj.today()
+ today = Date.today()
effective_date = vals.get('effective_date') or today
if 'state' in vals and vals['state'] == 'done':
- for move in self.browse(ids):
+ for move in moves:
if vals['state'] == 'cancel':
if (move.from_location.type in ('supplier', 'production')
and move.to_location.type == 'storage'
and move.state != 'cancel'
and move.product.cost_price_method == 'fifo'):
- self._update_product_cost_price(move.product.id,
+ cls._update_product_cost_price(move.product.id,
-move.quantity, move.uom, move.unit_price,
move.currency, move.company, effective_date)
if (move.to_location.type == 'supplier'
and move.from_location.type == 'storage'
and move.state != 'cancel'
and move.product.cost_price_method == 'fifo'):
- self._update_product_cost_price(move.product.id,
+ cls._update_product_cost_price(move.product.id,
move.quantity, move.uom, move.unit_price,
move.currency, move.company, effective_date)
@@ -148,31 +144,31 @@ class Move(ModelSQL, ModelView):
and move.to_location.type == 'storage'
and move.state != 'done'
and move.product.cost_price_method == 'fifo'):
- self._update_product_cost_price(move.product.id,
+ cls._update_product_cost_price(move.product.id,
move.quantity, move.uom, move.unit_price,
move.currency, move.company, effective_date)
if (move.to_location.type == 'supplier'
and move.from_location.type == 'storage'
and move.state != 'done'
and move.product.cost_price_method == 'fifo'):
- self._update_product_cost_price(move.product.id,
+ cls._update_product_cost_price(move.product.id,
-move.quantity, move.uom, move.unit_price,
move.currency, move.company, effective_date)
if move.to_location.type != 'storage' \
and move.to_location.type != 'supplier' \
and move.product.cost_price_method == 'fifo':
- cost_price = self._update_fifo_out_product_cost_price(
+ cost_price = cls._update_fifo_out_product_cost_price(
move.product, move.quantity, move.uom,
effective_date)
if not vals.get('cost_price'):
vals['cost_price'] = cost_price
- return super(Move, self).write(ids, vals)
-
- def delete(self, ids):
- if self.search([
- ('id', 'in', ids),
- ('fifo_quantity', '!=', 0.0),
- ]):
- self.raise_user_error('del_move_fifo')
- return super(Move, self).delete(ids)
-Move()
+ super(Move, cls).write(moves, vals)
+
+ @classmethod
+ def delete(cls, moves):
+ if cls.search([
+ ('id', 'in', [m.id for m in moves]),
+ ('fifo_quantity', '!=', 0.0),
+ ]):
+ cls.raise_user_error('del_move_fifo')
+ super(Move, cls).delete(moves)
diff --git a/product.py b/product.py
index 197574a..f226809 100644
--- a/product.py
+++ b/product.py
@@ -1,66 +1,61 @@
#This file is part of Tryton. The COPYRIGHT file at the top level of
#this repository contains the full copyright notices and license terms.
-import copy
import datetime
-from trytond.model import ModelView, ModelSQL
from trytond.transaction import Transaction
-from trytond.pool import Pool
+from trytond.pool import Pool, PoolMeta
+__all__ = ['Template']
+__metaclass__ = PoolMeta
-class Template(ModelSQL, ModelView):
- _name = "product.template"
- def __init__(self):
- super(Template, self).__init__()
+class Template:
+ __name__ = 'product.template'
+
+ @classmethod
+ def __setup__(cls):
+ super(Template, cls).__setup__()
new_sel = ('fifo', 'FIFO')
- if new_sel not in self.cost_price_method.selection:
- self.cost_price_method = copy.copy(self.cost_price_method)
- self.cost_price_method.selection.append(new_sel)
- self._reset_columns()
+ if new_sel not in cls.cost_price_method.selection:
+ cls.cost_price_method.selection.append(new_sel)
- def get_fifo_move(self, template_id, quantity=0.0):
+ def get_fifo_move(self, quantity=0.0):
'''
Return a list of (move, qty) where move is the move to be
consumed and qty is the quantity (in the product default uom)
to be consumed on this move. The list contains the "first in"
moves for the given quantity.
-
- :param template_id: the product template id
- :param quantity: the quantity to be removed from the stock
- :return: list of (move, qty) where move is a browse record,
- qty is a float
'''
pool = Pool()
- move_obj = pool.get('stock.move')
- uom_obj = pool.get('product.uom')
- location_obj = pool.get('stock.location')
+ Move = pool.get('stock.move')
+ Uom = pool.get('product.uom')
+ Location = pool.get('stock.location')
- locations = location_obj.search([
+ locations = Location.search([
('type', '=', 'storage'),
])
stock_date_end = datetime.date.today()
-
- with Transaction().set_context(locations=locations,
+ location_ids = [l.id for l in locations]
+ with Transaction().set_context(locations=location_ids,
stock_date_end=stock_date_end):
- template = self.browse(template_id)
+ template = Template(self.id)
offset = 0
limit = Transaction().cursor.IN_MAX
avail_qty = template.quantity
fifo_moves = []
while avail_qty > 0.0:
- move_ids = move_obj.search([
+ moves = Move.search([
('product.template.id', '=', template.id),
('state', '=', 'done'),
('from_location.type', '=', 'supplier'),
], offset=offset, limit=limit,
order=[('effective_date', 'DESC'), ('id', 'DESC')])
- if not move_ids:
+ if not moves:
break
offset += limit
- for move in move_obj.browse(move_ids):
- qty = uom_obj.compute_qty(move.uom,
+ for move in moves:
+ qty = Uom.compute_qty(move.uom,
move.quantity - move.fifo_quantity,
template.default_uom, round=False)
avail_qty -= qty
@@ -76,5 +71,3 @@ class Template(ModelSQL, ModelView):
fifo_moves.reverse()
return fifo_moves
-
-Template()
diff --git a/setup.py b/setup.py
index f2d9ec8..4b991ce 100644
--- a/setup.py
+++ b/setup.py
@@ -4,8 +4,19 @@
from setuptools import setup
import re
+import os
+import ConfigParser
-info = eval(open('__tryton__.py').read())
+
+def read(fname):
+ return open(os.path.join(os.path.dirname(__file__), fname)).read()
+
+config = ConfigParser.ConfigParser()
+config.readfp(open('tryton.cfg'))
+info = dict(config.items('tryton'))
+for key in ('depends', 'extras_depend', 'xml'):
+ if key in info:
+ info[key] = info[key].strip().splitlines()
major_version, minor_version, _ = info.get('version', '0.0.1').split('.', 2)
major_version = int(major_version)
minor_version = int(minor_version)
@@ -21,20 +32,20 @@ requires.append('trytond >= %s.%s, < %s.%s' %
setup(name='trytond_product_cost_fifo',
version=info.get('version', '0.0.1'),
- description=info.get('description', ''),
- author=info.get('author', ''),
- author_email=info.get('email', ''),
- url=info.get('website', ''),
+ description='Tryton module to add FIFO cost method',
+ long_description=read('README'),
+ author='Tryton',
+ url='http://www.tryton.org/',
download_url="http://downloads.tryton.org/" + \
- info.get('version', '0.0.1').rsplit('.', 1)[0] + '/',
+ info.get('version', '0.0.1').rsplit('.', 1)[0] + '/',
package_dir={'trytond.modules.product_cost_fifo': '.'},
packages=[
'trytond.modules.product_cost_fifo',
- ],
+ ],
package_data={
'trytond.modules.product_cost_fifo': info.get('xml', []) \
- + info.get('translation', []),
- },
+ + ['tryton.cfg', 'locale/*.po'],
+ },
classifiers=[
'Development Status :: 5 - Production/Stable',
'Environment :: Plugins',
@@ -56,7 +67,7 @@ setup(name='trytond_product_cost_fifo',
'Programming Language :: Python :: 2.6',
'Programming Language :: Python :: 2.7',
'Topic :: Office/Business',
- ],
+ ],
license='GPL-3',
install_requires=requires,
zip_safe=False,
@@ -66,4 +77,4 @@ setup(name='trytond_product_cost_fifo',
""",
test_suite='tests',
test_loader='trytond.test_loader:Loader',
-)
+ )
diff --git a/tryton.cfg b/tryton.cfg
new file mode 100644
index 0000000..7273173
--- /dev/null
+++ b/tryton.cfg
@@ -0,0 +1,6 @@
+[tryton]
+version=2.6.0
+depends:
+ ir
+ product
+ stock
diff --git a/trytond_product_cost_fifo.egg-info/PKG-INFO b/trytond_product_cost_fifo.egg-info/PKG-INFO
index 73fd652..8de0eea 100644
--- a/trytond_product_cost_fifo.egg-info/PKG-INFO
+++ b/trytond_product_cost_fifo.egg-info/PKG-INFO
@@ -1,17 +1,48 @@
Metadata-Version: 1.0
Name: trytond-product-cost-fifo
-Version: 2.4.0
-Summary: Add FIFO cost method on the product form.
-Once installed, the price of the stock moves from a supplier or to a
-customer will update automatically the cost price of the related
-product (if the cost price method is FIFO)
-
+Version: 2.6.0
+Summary: Tryton module to add FIFO cost method
Home-page: http://www.tryton.org/
-Author: B2CK
-Author-email: info at b2ck.com
+Author: Tryton
+Author-email: UNKNOWN
License: GPL-3
-Download-URL: http://downloads.tryton.org/2.4/
-Description: UNKNOWN
+Download-URL: http://downloads.tryton.org/2.6/
+Description: trytond_product_cost_fifo
+ =========================
+
+ The product_cost_fifo module of the Tryton application platform.
+
+ Installing
+ ----------
+
+ See INSTALL
+
+ Support
+ -------
+
+ If you encounter any problems with Tryton, please don't hesitate to ask
+ questions on the Tryton bug tracker, mailing list, wiki or IRC channel:
+
+ http://bugs.tryton.org/
+ http://groups.tryton.org/
+ http://wiki.tryton.org/
+ irc://irc.freenode.net/tryton
+
+ License
+ -------
+
+ See LICENSE
+
+ Copyright
+ ---------
+
+ See COPYRIGHT
+
+
+ For more information please visit the Tryton web site:
+
+ http://www.tryton.org/
+
Platform: UNKNOWN
Classifier: Development Status :: 5 - Production/Stable
Classifier: Environment :: Plugins
diff --git a/trytond_product_cost_fifo.egg-info/SOURCES.txt b/trytond_product_cost_fifo.egg-info/SOURCES.txt
index 0362b33..e4d3d79 100644
--- a/trytond_product_cost_fifo.egg-info/SOURCES.txt
+++ b/trytond_product_cost_fifo.egg-info/SOURCES.txt
@@ -5,8 +5,8 @@ LICENSE
MANIFEST.in
README
setup.py
+tryton.cfg
./__init__.py
-./__tryton__.py
./move.py
./product.py
doc/index.rst
diff --git a/trytond_product_cost_fifo.egg-info/requires.txt b/trytond_product_cost_fifo.egg-info/requires.txt
index 57d794b..2480e97 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 >= 2.4, < 2.5
-trytond_stock >= 2.4, < 2.5
-trytond >= 2.4, < 2.5
\ No newline at end of file
+trytond_product >= 2.6, < 2.7
+trytond_stock >= 2.6, < 2.7
+trytond >= 2.6, < 2.7
\ No newline at end of file
commit 010b11c4f6bce957f86b5d26e10396c60e52bc44
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Tue Apr 24 19:30:55 2012 +0200
Adding upstream version 2.4.0.
diff --git a/CHANGELOG b/CHANGELOG
index 89f5a5d..7cdb24c 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,7 @@
+Version 2.4.0 - 2012-04-24
+* Bug fixes (see mercurial logs for details)
+* Update cost_price only from supplier to storage
+
Version 2.2.0 - 2011-10-24
* Bug fixes (see mercurial logs for details)
diff --git a/COPYRIGHT b/COPYRIGHT
index 3d2324b..2057c72 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -1,6 +1,6 @@
-Copyright (C) 2008-2011 Cédric Krier.
-Copyright (C) 2008-2011 Bertrand Chenal.
-Copyright (C) 2008-2011 B2CK SPRL.
+Copyright (C) 2008-2012 Cédric Krier.
+Copyright (C) 2008-2012 Bertrand Chenal.
+Copyright (C) 2008-2012 B2CK SPRL.
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff --git a/INSTALL b/INSTALL
index 07883ac..cd08f29 100644
--- a/INSTALL
+++ b/INSTALL
@@ -4,7 +4,7 @@ Installing trytond_product_cost_fifo
Prerequisites
-------------
- * Python 2.5 or later (http://www.python.org/)
+ * Python 2.6 or later (http://www.python.org/)
* trytond (http://www.tryton.org/)
* trytond_product (http://www.tryton.org/)
* trytond_stock (http://www.tryton.org/)
diff --git a/PKG-INFO b/PKG-INFO
index af72b1d..b08e476 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.0
Name: trytond_product_cost_fifo
-Version: 2.2.0
+Version: 2.4.0
Summary: Add FIFO cost method on the product form.
Once installed, the price of the stock moves from a supplier or to a
customer will update automatically the cost price of the related
@@ -10,7 +10,7 @@ Home-page: http://www.tryton.org/
Author: B2CK
Author-email: info at b2ck.com
License: GPL-3
-Download-URL: http://downloads.tryton.org/2.2/
+Download-URL: http://downloads.tryton.org/2.4/
Description: UNKNOWN
Platform: UNKNOWN
Classifier: Development Status :: 5 - Production/Stable
diff --git a/__init__.py b/__init__.py
index 8eed310..6487779 100644
--- a/__init__.py
+++ b/__init__.py
@@ -1,5 +1,5 @@
#This file is part of Tryton. The COPYRIGHT file at the top level of
#this repository contains the full copyright notices and license terms.
-from product import *
-from move import *
+from .product import *
+from .move import *
diff --git a/__tryton__.py b/__tryton__.py
index 91eba6a..9827eec 100644
--- a/__tryton__.py
+++ b/__tryton__.py
@@ -3,11 +3,13 @@
{
'name': 'Product Cost FIFO',
'name_bg_BG': 'FIFO цена на продукт',
+ 'name_ca_ES': 'Cost FIFO de productes',
'name_de_DE': 'Artikel Kostenpreisermittlung FIFO',
+ 'name_es_AR': 'Costo FIFO de producto',
'name_es_CO': 'Costo FIFO de producto',
'name_es_ES': 'Coste FIFO de producto',
'name_fr_FR': 'Prix de revient produit FIFO',
- 'version': '2.2.0',
+ 'version': '2.4.0',
'author': 'B2CK',
'email': 'info at b2ck.com',
'website': 'http://www.tryton.org/',
@@ -16,20 +18,30 @@ Once installed, the price of the stock moves from a supplier or to a
customer will update automatically the cost price of the related
product (if the cost price method is FIFO)
''',
- 'description_bg_BG':'''Добавя FIFO начин на остойностяване в формата на продукт
+ 'description_bg_BG': '''Добавя FIFO начин на остойностяване в формата на продукт
- Добавя FIFO (първи влязъл първи излязъл) като начин на изчисляване на
цената на продукт.
- След инсталиране на този модул цената на даден продукт (ако е избран този
начин на остойностяване) се изчислява автоматично при всяко движение на
наличност от доставчик или към клиент
''',
- 'description_de_DE':'''Kostenpreisermittlung für Artikel nach Methode 'FIFO'
+ 'description_ca_ES': '''Afegeix el mètode de cost FIFO al formulari de producte.
+Un cop instal·lat, el preu dels moviments d'estoc des d'un proveïdor o un client,
+actualitzarà automàticament el preu de cost del producte relacionat (si el mètode
+de càlcul del preu de cost és FIFO).
+''',
+ 'description_de_DE': '''Kostenpreisermittlung für Artikel nach Methode 'FIFO'
- Fügt 'FIFO' (First In - First Out) zu den Methoden für die
Kostenpreisermittlung für Artikel hinzu.
- Nach Installation dieses Moduls wird der Kostenpreis eines Artikels (für
den die Methode FIFO gewählt wurde) automatisch bei jeder Lagerbewegung
von einem Lieferanten oder zu einem Kunden angepasst.
''',
+ 'description_es_AR': '''Añade el método de coste FIFO en el formulario de producto.
+Una vez instalado, el precio de los movimientos de stock desde un proveedor o
+a un cliente actualizará automáticamente el precio de costo del producto
+relacionado (si el método de cálculo del precio de costo es FIFO)
+''',
'description_es_CO': '''Añade el método de costo FIFO al formulario de producto.
Cuando está instalado, el precio de los movimientos de stock desde un proveedor
o a un cliente actualizarán automáticamente el precio de costo del producto
@@ -40,7 +52,7 @@ Una vez instalado, el precio de los movimientos de stock desde un proveedor o
a un cliente actualizará automáticamente el precio de coste del producto
relacionado (si el método de cálculo del precio de coste es FIFO)
''',
- 'description_fr_FR':'''Ajoute 'FIFO' parmi les méthodes de coût du produit.
+ 'description_fr_FR': '''Ajoute 'FIFO' parmi les méthodes de coût du produit.
Une fois le module installé, le prix de chaque mouvement de stock
depuis un fournisseur ou vers un client modifiera automatiquement le
prix de revient du produit concerné (si la méthode de coût est FIFO).
@@ -54,8 +66,10 @@ prix de revient du produit concerné (si la méthode de coût est FIFO).
],
'translation': [
'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',
diff --git a/locale/bg_BG.po b/locale/bg_BG.po
index 4b78433..4ff7bff 100644
--- a/locale/bg_BG.po
+++ b/locale/bg_BG.po
@@ -2,19 +2,19 @@
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
-msgctxt "error:stock.move:0"
+msgctxt "error:stock.move:"
msgid "FIFO quantity can not be greater than quantity!"
msgstr "FIFO-количество не може да е по-голямо от количеството!"
-msgctxt "error:stock.move:0"
+msgctxt "error:stock.move:"
msgid "You can not delete move that is used for FIFO cost price!"
msgstr ""
"Не може да изтривате движение което се използва за изчисляване на FIFO цена!"
-msgctxt "field:stock.move,fifo_quantity:0"
+msgctxt "field:stock.move,fifo_quantity:"
msgid "FIFO Quantity"
msgstr "FIFO количество"
-msgctxt "selection:product.template,cost_price_method:0"
+msgctxt "selection:product.template,cost_price_method:"
msgid "FIFO"
msgstr "FIFO"
diff --git a/locale/ca_ES.po b/locale/ca_ES.po
new file mode 100644
index 0000000..0062337
--- /dev/null
+++ b/locale/ca_ES.po
@@ -0,0 +1,21 @@
+#
+msgid ""
+msgstr "Content-Type: text/plain; charset=utf-8\n"
+
+msgctxt "error:stock.move:"
+msgid "FIFO quantity can not be greater than quantity!"
+msgstr "La quantitat FIFO no pot ser major que «quantitat»"
+
+msgctxt "error:stock.move:"
+msgid "You can not delete move that is used for FIFO cost price!"
+msgstr ""
+"No pot esborrar un moviment que s'utilitza per al càlcul FIFO del preu de "
+"cost"
+
+msgctxt "field:stock.move,fifo_quantity:"
+msgid "FIFO Quantity"
+msgstr "Quantitat FIFO"
+
+msgctxt "selection:product.template,cost_price_method:"
+msgid "FIFO"
+msgstr "FIFO"
diff --git a/locale/cs_CZ.po b/locale/cs_CZ.po
index 844ecc2..b5d3d5d 100644
--- a/locale/cs_CZ.po
+++ b/locale/cs_CZ.po
@@ -2,18 +2,18 @@
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
-msgctxt "error:stock.move:0"
+msgctxt "error:stock.move:"
msgid "FIFO quantity can not be greater than quantity!"
msgstr ""
-msgctxt "error:stock.move:0"
+msgctxt "error:stock.move:"
msgid "You can not delete move that is used for FIFO cost price!"
msgstr ""
-msgctxt "field:stock.move,fifo_quantity:0"
+msgctxt "field:stock.move,fifo_quantity:"
msgid "FIFO Quantity"
msgstr ""
-msgctxt "selection:product.template,cost_price_method:0"
+msgctxt "selection:product.template,cost_price_method:"
msgid "FIFO"
msgstr ""
diff --git a/locale/de_DE.po b/locale/de_DE.po
index c5ac214..cc4f995 100644
--- a/locale/de_DE.po
+++ b/locale/de_DE.po
@@ -2,20 +2,20 @@
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
-msgctxt "error:stock.move:0"
+msgctxt "error:stock.move:"
msgid "FIFO quantity can not be greater than quantity!"
msgstr "FIFO Anzahl kann nicht größer als Anzahl sein!"
-msgctxt "error:stock.move:0"
+msgctxt "error:stock.move:"
msgid "You can not delete move that is used for FIFO cost price!"
msgstr ""
"Eine Bewegung, die Bestandteil einer Kostenpreisermittlung nach FIFO ist, "
"kann nicht gelöscht werden!"
-msgctxt "field:stock.move,fifo_quantity:0"
+msgctxt "field:stock.move,fifo_quantity:"
msgid "FIFO Quantity"
msgstr "Anzahl FIFO"
-msgctxt "selection:product.template,cost_price_method:0"
+msgctxt "selection:product.template,cost_price_method:"
msgid "FIFO"
msgstr "FIFO"
diff --git a/locale/es_AR.po b/locale/es_AR.po
new file mode 100644
index 0000000..ed1ec2f
--- /dev/null
+++ b/locale/es_AR.po
@@ -0,0 +1,21 @@
+#
+msgid ""
+msgstr "Content-Type: text/plain; charset=utf-8\n"
+
+msgctxt "error:stock.move:"
+msgid "FIFO quantity can not be greater than quantity!"
+msgstr "¡La cantidad FIFO no puede se mayor que «cantidad»!"
+
+msgctxt "error:stock.move:"
+msgid "You can not delete move that is used for FIFO cost price!"
+msgstr ""
+"¡No puede borrar un movimiento que se utiliza para el cálculo FIFO del "
+"precio de costo!"
+
+msgctxt "field:stock.move,fifo_quantity:"
+msgid "FIFO Quantity"
+msgstr "Cantidad FIFO"
+
+msgctxt "selection:product.template,cost_price_method:"
+msgid "FIFO"
+msgstr "FIFO"
diff --git a/locale/es_CO.po b/locale/es_CO.po
index 710b643..906747d 100644
--- a/locale/es_CO.po
+++ b/locale/es_CO.po
@@ -2,19 +2,19 @@
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
-msgctxt "error:stock.move:0"
+msgctxt "error:stock.move:"
msgid "FIFO quantity can not be greater than quantity!"
msgstr "¡Cantidad FIFO no puede ser mayor que la cantidad!"
-msgctxt "error:stock.move:0"
+msgctxt "error:stock.move:"
msgid "You can not delete move that is used for FIFO cost price!"
msgstr ""
"¡No puede borrar un movimiento que es usado por el precio de costo de FIFO!"
-msgctxt "field:stock.move,fifo_quantity:0"
+msgctxt "field:stock.move,fifo_quantity:"
msgid "FIFO Quantity"
msgstr "Cantidad FIFO"
-msgctxt "selection:product.template,cost_price_method:0"
+msgctxt "selection:product.template,cost_price_method:"
msgid "FIFO"
msgstr "FIFO"
diff --git a/locale/es_ES.po b/locale/es_ES.po
index 5b62818..e496f6a 100644
--- a/locale/es_ES.po
+++ b/locale/es_ES.po
@@ -2,20 +2,20 @@
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
-msgctxt "error:stock.move:0"
+msgctxt "error:stock.move:"
msgid "FIFO quantity can not be greater than quantity!"
-msgstr "La cantidad FIFO no puede se mayor que «cantidad»"
+msgstr "La cantidad FIFO no puede se mayor que la \"cantidad\"."
-msgctxt "error:stock.move:0"
+msgctxt "error:stock.move:"
msgid "You can not delete move that is used for FIFO cost price!"
msgstr ""
-"No puede borrar un movimiento que se utiliza para el cálculo FIFO del precio"
-" de coste"
+"No puede eliminar un movimiento que se utiliza para el cálculo FIFO del "
+"precio de coste."
-msgctxt "field:stock.move,fifo_quantity:0"
+msgctxt "field:stock.move,fifo_quantity:"
msgid "FIFO Quantity"
msgstr "Cantidad FIFO"
-msgctxt "selection:product.template,cost_price_method:0"
+msgctxt "selection:product.template,cost_price_method:"
msgid "FIFO"
msgstr "FIFO"
diff --git a/locale/fr_FR.po b/locale/fr_FR.po
index a219176..c2b4d50 100644
--- a/locale/fr_FR.po
+++ b/locale/fr_FR.po
@@ -2,20 +2,34 @@
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
-msgctxt "error:stock.move:0"
+msgctxt "error:stock.move:"
msgid "FIFO quantity can not be greater than quantity!"
msgstr "La quantité FIFO ne peut pas être supérieure à la quantité!"
-msgctxt "error:stock.move:0"
+msgctxt "error:stock.move:"
+msgid "FIFO quantity can not be greater than quantity!"
+msgstr "La quantité FIFO ne peut pas être supérieure à la quantité!"
+
+msgctxt "error:stock.move:"
msgid "You can not delete move that is used for FIFO cost price!"
msgstr ""
"Vous ne pouvez pas supprimer de mouvement utilisé pour le prix de revient "
"FIFO !"
-msgctxt "field:stock.move,fifo_quantity:0"
+msgctxt "error:stock.move:"
+msgid "You can not delete move that is used for FIFO cost price!"
+msgstr ""
+"Vous ne pouvez pas supprimer de mouvement utilisé pour le prix de revient "
+"FIFO !"
+
+msgctxt "field:stock.move,fifo_quantity:"
msgid "FIFO Quantity"
msgstr "Quantité FIFO"
-msgctxt "selection:product.template,cost_price_method:0"
+msgctxt "selection:product.template,cost_price_method:"
+msgid "FIFO"
+msgstr "FIFO"
+
+msgctxt "selection:product.template,cost_price_method:"
msgid "FIFO"
msgstr "FIFO"
diff --git a/locale/nl_NL.po b/locale/nl_NL.po
index 844ecc2..b5d3d5d 100644
--- a/locale/nl_NL.po
+++ b/locale/nl_NL.po
@@ -2,18 +2,18 @@
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
-msgctxt "error:stock.move:0"
+msgctxt "error:stock.move:"
msgid "FIFO quantity can not be greater than quantity!"
msgstr ""
-msgctxt "error:stock.move:0"
+msgctxt "error:stock.move:"
msgid "You can not delete move that is used for FIFO cost price!"
msgstr ""
-msgctxt "field:stock.move,fifo_quantity:0"
+msgctxt "field:stock.move,fifo_quantity:"
msgid "FIFO Quantity"
msgstr ""
-msgctxt "selection:product.template,cost_price_method:0"
+msgctxt "selection:product.template,cost_price_method:"
msgid "FIFO"
msgstr ""
diff --git a/locale/ru_RU.po b/locale/ru_RU.po
index 844ecc2..b5d3d5d 100644
--- a/locale/ru_RU.po
+++ b/locale/ru_RU.po
@@ -2,18 +2,18 @@
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
-msgctxt "error:stock.move:0"
+msgctxt "error:stock.move:"
msgid "FIFO quantity can not be greater than quantity!"
msgstr ""
-msgctxt "error:stock.move:0"
+msgctxt "error:stock.move:"
msgid "You can not delete move that is used for FIFO cost price!"
msgstr ""
-msgctxt "field:stock.move,fifo_quantity:0"
+msgctxt "field:stock.move,fifo_quantity:"
msgid "FIFO Quantity"
msgstr ""
-msgctxt "selection:product.template,cost_price_method:0"
+msgctxt "selection:product.template,cost_price_method:"
msgid "FIFO"
msgstr ""
diff --git a/move.py b/move.py
index 5b4a451..2ae8060 100644
--- a/move.py
+++ b/move.py
@@ -27,7 +27,8 @@ class Move(ModelSQL, ModelView):
def default_fifo_quantity(self):
return 0.0
- def _update_fifo_out_product_cost_price(self, product, quantity, uom, date):
+ def _update_fifo_out_product_cost_price(self, product, quantity, uom,
+ date):
'''
Update the product cost price of the given product. Update
fifo_quantity on the concerned incomming moves. Return the
@@ -51,7 +52,6 @@ class Move(ModelSQL, ModelView):
fifo_moves = template_obj.get_fifo_move(product.template.id, total_qty)
-
cost_price = Decimal("0.0")
consumed_qty = 0.0
for move, move_qty in fifo_moves:
@@ -71,14 +71,13 @@ class Move(ModelSQL, ModelView):
'fifo_quantity': (move.fifo_quantity or 0.0) + move_qty,
})
-
if Decimal(str(consumed_qty)) != Decimal("0"):
cost_price = cost_price / Decimal(str(consumed_qty))
if cost_price != Decimal("0"):
digits = self.cost_price.digits
return cost_price.quantize(
- Decimal(str(10.0**-digits[1])))
+ Decimal(str(10.0 ** -digits[1])))
else:
return product.cost_price
@@ -86,7 +85,6 @@ class Move(ModelSQL, ModelView):
pool = Pool()
location_obj = pool.get('stock.location')
product_obj = pool.get('product.product')
- uom_obj = pool.get('product.uom')
date_obj = pool.get('ir.date')
today = date_obj.today()
@@ -96,13 +94,15 @@ class Move(ModelSQL, ModelView):
from_location = location_obj.browse(vals['from_location'])
to_location = location_obj.browse(vals['to_location'])
product = product_obj.browse(vals['product'])
- if from_location.type == 'supplier' \
- and product.cost_price_method == 'fifo':
+ if (from_location.type in ('supplier', 'production')
+ and to_location.type == 'storage'
+ and product.cost_price_method == 'fifo'):
self._update_product_cost_price(vals['product'],
vals['quantity'], vals['uom'], vals['unit_price'],
vals['currency'], effective_date)
- if to_location.type == 'supplier' \
- and product.cost_price_method == 'fifo':
+ if (to_location.type == 'supplier'
+ and from_location.type == 'storage'
+ and product.cost_price_method == 'fifo'):
self._update_product_cost_price(vals['product'],
-vals['quantity'], vals['uom'], vals['unit_price'],
vals['currency'], effective_date)
@@ -128,29 +128,33 @@ class Move(ModelSQL, ModelView):
if 'state' in vals and vals['state'] == 'done':
for move in self.browse(ids):
if vals['state'] == 'cancel':
- if move.from_location.type == 'supplier' \
- and move.state != 'cancel' \
- and move.product.cost_price_method == 'fifo':
+ if (move.from_location.type in ('supplier', 'production')
+ and move.to_location.type == 'storage'
+ and move.state != 'cancel'
+ and move.product.cost_price_method == 'fifo'):
self._update_product_cost_price(move.product.id,
-move.quantity, move.uom, move.unit_price,
move.currency, move.company, effective_date)
- if move.to_location.type == 'supplier' \
- and move.state != 'cancel' \
- and move.product.cost_price_method == 'fifo':
+ if (move.to_location.type == 'supplier'
+ and move.from_location.type == 'storage'
+ and move.state != 'cancel'
+ and move.product.cost_price_method == 'fifo'):
self._update_product_cost_price(move.product.id,
move.quantity, move.uom, move.unit_price,
move.currency, move.company, effective_date)
elif vals['state'] == 'done':
- if move.from_location.type == 'supplier' \
- and move.state != 'done' \
- and move.product.cost_price_method == 'fifo':
+ if (move.from_location.type in ('supplier', 'production')
+ and move.to_location.type == 'storage'
+ and move.state != 'done'
+ and move.product.cost_price_method == 'fifo'):
self._update_product_cost_price(move.product.id,
move.quantity, move.uom, move.unit_price,
move.currency, move.company, effective_date)
- if move.to_location.type == 'supplier' \
- and move.state != 'done' \
- and move.product.cost_price_method == 'fifo':
+ if (move.to_location.type == 'supplier'
+ and move.from_location.type == 'storage'
+ and move.state != 'done'
+ and move.product.cost_price_method == 'fifo'):
self._update_product_cost_price(move.product.id,
-move.quantity, move.uom, move.unit_price,
move.currency, move.company, effective_date)
diff --git a/product.py b/product.py
index d904fb4..197574a 100644
--- a/product.py
+++ b/product.py
@@ -67,9 +67,11 @@ class Template(ModelSQL, ModelView):
if avail_qty <= quantity:
if avail_qty > 0.0:
- fifo_moves.append((move, min(qty, quantity - avail_qty)))
+ fifo_moves.append(
+ (move, min(qty, quantity - avail_qty)))
else:
- fifo_moves.append((move, min(quantity, qty + avail_qty)))
+ fifo_moves.append(
+ (move, min(quantity, qty + avail_qty)))
break
fifo_moves.reverse()
diff --git a/setup.py b/setup.py
index cfe69a3..f2d9ec8 100644
--- a/setup.py
+++ b/setup.py
@@ -12,7 +12,7 @@ minor_version = int(minor_version)
requires = []
for dep in info.get('depends', []):
- if not re.match(r'(ir|res|workflow|webdav)(\W|$)', dep):
+ if not re.match(r'(ir|res|webdav)(\W|$)', dep):
requires.append('trytond_%s >= %s.%s, < %s.%s' %
(dep, major_version, minor_version, major_version,
minor_version + 1))
diff --git a/trytond_product_cost_fifo.egg-info/PKG-INFO b/trytond_product_cost_fifo.egg-info/PKG-INFO
index 7fd05d4..73fd652 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.0
Name: trytond-product-cost-fifo
-Version: 2.2.0
+Version: 2.4.0
Summary: Add FIFO cost method on the product form.
Once installed, the price of the stock moves from a supplier or to a
customer will update automatically the cost price of the related
@@ -10,7 +10,7 @@ Home-page: http://www.tryton.org/
Author: B2CK
Author-email: info at b2ck.com
License: GPL-3
-Download-URL: http://downloads.tryton.org/2.2/
+Download-URL: http://downloads.tryton.org/2.4/
Description: UNKNOWN
Platform: UNKNOWN
Classifier: Development Status :: 5 - Production/Stable
diff --git a/trytond_product_cost_fifo.egg-info/SOURCES.txt b/trytond_product_cost_fifo.egg-info/SOURCES.txt
index 766ac29..0362b33 100644
--- a/trytond_product_cost_fifo.egg-info/SOURCES.txt
+++ b/trytond_product_cost_fifo.egg-info/SOURCES.txt
@@ -11,8 +11,10 @@ setup.py
./product.py
doc/index.rst
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
diff --git a/trytond_product_cost_fifo.egg-info/requires.txt b/trytond_product_cost_fifo.egg-info/requires.txt
index b5a2afa..57d794b 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 >= 2.2, < 2.3
-trytond_stock >= 2.2, < 2.3
-trytond >= 2.2, < 2.3
\ No newline at end of file
+trytond_product >= 2.4, < 2.5
+trytond_stock >= 2.4, < 2.5
+trytond >= 2.4, < 2.5
\ No newline at end of file
commit c0f1361ccbf74a8caa061d0a57156d2a6a4a721b
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Mon Oct 31 16:20:59 2011 +0100
Adding upstream version 2.2.0.
diff --git a/CHANGELOG b/CHANGELOG
index 0761cfd..89f5a5d 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,4 +1,4 @@
-Version 2.0.1 - 2011-05-29
+Version 2.2.0 - 2011-10-24
* Bug fixes (see mercurial logs for details)
Version 2.0.0 - 2011-04-27
diff --git a/MANIFEST.in b/MANIFEST.in
index dcb2afa..32879df 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -6,5 +6,5 @@ include CHANGELOG
include LICENSE
include *.xml
include *.odt
-include *.csv
+include locale/*.po
include doc/*
diff --git a/PKG-INFO b/PKG-INFO
index 8780cb3..af72b1d 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.0
Name: trytond_product_cost_fifo
-Version: 2.0.1
+Version: 2.2.0
Summary: Add FIFO cost method on the product form.
Once installed, the price of the stock moves from a supplier or to a
customer will update automatically the cost price of the related
@@ -10,23 +10,26 @@ Home-page: http://www.tryton.org/
Author: B2CK
Author-email: info at b2ck.com
License: GPL-3
-Download-URL: http://downloads.tryton.org/2.0/
+Download-URL: http://downloads.tryton.org/2.2/
Description: UNKNOWN
Platform: UNKNOWN
Classifier: Development Status :: 5 - Production/Stable
Classifier: Environment :: Plugins
+Classifier: Framework :: Tryton
Classifier: Intended Audience :: Developers
Classifier: Intended Audience :: Financial and Insurance Industry
Classifier: Intended Audience :: Legal Industry
Classifier: Intended Audience :: Manufacturing
Classifier: License :: OSI Approved :: GNU General Public License (GPL)
Classifier: Natural Language :: Bulgarian
+Classifier: Natural Language :: Czech
+Classifier: Natural Language :: Dutch
Classifier: Natural Language :: English
Classifier: Natural Language :: French
Classifier: Natural Language :: German
+Classifier: Natural Language :: Russian
Classifier: Natural Language :: Spanish
Classifier: Operating System :: OS Independent
-Classifier: Programming Language :: Python :: 2.5
Classifier: Programming Language :: Python :: 2.6
Classifier: Programming Language :: Python :: 2.7
Classifier: Topic :: Office/Business
diff --git a/__tryton__.py b/__tryton__.py
index 1287bfe..91eba6a 100644
--- a/__tryton__.py
+++ b/__tryton__.py
@@ -7,7 +7,7 @@
'name_es_CO': 'Costo FIFO de producto',
'name_es_ES': 'Coste FIFO de producto',
'name_fr_FR': 'Prix de revient produit FIFO',
- 'version': '2.0.1',
+ 'version': '2.2.0',
'author': 'B2CK',
'email': 'info at b2ck.com',
'website': 'http://www.tryton.org/',
@@ -20,8 +20,8 @@ product (if the cost price method is FIFO)
- Добавя FIFO (първи влязъл първи излязъл) като начин на изчисляване на
цената на продукт.
- След инсталиране на този модул цената на даден продукт (ако е избран този
- начин на остойностяване) се изчислява автоматично при всяко движение на
- наличност от доставчик или към клиент
+ начин на остойностяване) се изчислява автоматично при всяко движение на
+ наличност от доставчик или към клиент
''',
'description_de_DE':'''Kostenpreisermittlung für Artikel nach Methode 'FIFO'
- Fügt 'FIFO' (First In - First Out) zu den Methoden für die
@@ -53,10 +53,13 @@ prix de revient du produit concerné (si la méthode de coût est FIFO).
'xml': [
],
'translation': [
- 'bg_BG.csv',
- 'de_DE.csv',
- 'es_CO.csv',
- 'es_ES.csv',
- 'fr_FR.csv',
+ 'locale/bg_BG.po',
+ 'locale/cs_CZ.po',
+ 'locale/de_DE.po',
+ 'locale/es_CO.po',
+ 'locale/es_ES.po',
+ 'locale/fr_FR.po',
+ 'locale/nl_NL.po',
+ 'locale/ru_RU.po',
],
}
diff --git a/bg_BG.csv b/bg_BG.csv
deleted file mode 100644
index f68eb5b..0000000
--- a/bg_BG.csv
+++ /dev/null
@@ -1,5 +0,0 @@
-type,name,res_id,src,value,fuzzy
-error,stock.move,0,FIFO quantity can not be greater than quantity!,FIFO-количество не може да е по-голямо от количеството!,0
-error,stock.move,0,You can not delete move that is used for FIFO cost price!,Не може да изтривате движение което се използва за изчисляване на FIFO цена!,0
-field,"stock.move,fifo_quantity",0,FIFO Quantity,FIFO количество,0
-selection,"product.template,cost_price_method",0,FIFO,FIFO,0
diff --git a/de_DE.csv b/de_DE.csv
deleted file mode 100644
index 5544f2c..0000000
--- a/de_DE.csv
+++ /dev/null
@@ -1,5 +0,0 @@
-type,name,res_id,src,value,fuzzy
-error,stock.move,0,FIFO quantity can not be greater than quantity!,FIFO Anzahl kann nicht größer als Anzahl sein!,0
-error,stock.move,0,You can not delete move that is used for FIFO cost price!,"Eine Bewegung, die Bestandteil einer Kostenpreisermittlung nach FIFO ist, kann nicht gelöscht werden!",0
-field,"stock.move,fifo_quantity",0,FIFO Quantity,Anzahl FIFO,0
-selection,"product.template,cost_price_method",0,FIFO,FIFO,0
diff --git a/es_CO.csv b/es_CO.csv
deleted file mode 100644
index 9f3ee40..0000000
--- a/es_CO.csv
+++ /dev/null
@@ -1,5 +0,0 @@
-type,name,res_id,src,value,fuzzy
-error,stock.move,0,FIFO quantity can not be greater than quantity!,¡Cantidad FIFO no puede ser mayor que la cantidad!,0
-error,stock.move,0,You can not delete move that is used for FIFO cost price!,¡No puede borrar un movimiento que es usado por el precio de costo de FIFO!,0
-field,"stock.move,fifo_quantity",0,FIFO Quantity,Cantidad FIFO,0
-selection,"product.template,cost_price_method",0,FIFO,FIFO,0
diff --git a/es_ES.csv b/es_ES.csv
deleted file mode 100644
index 42f8798..0000000
--- a/es_ES.csv
+++ /dev/null
@@ -1,5 +0,0 @@
-type,name,res_id,src,value,fuzzy
-error,stock.move,0,FIFO quantity can not be greater than quantity!,La cantidad FIFO no puede se mayor que «cantidad»,0
-error,stock.move,0,You can not delete move that is used for FIFO cost price!,No puede borrar un movimiento que se utiliza para el cálculo FIFO del precio de coste,0
-field,"stock.move,fifo_quantity",0,FIFO Quantity,Cantidad FIFO,0
-selection,"product.template,cost_price_method",0,FIFO,FIFO,0
diff --git a/fr_FR.csv b/fr_FR.csv
deleted file mode 100644
index 0ccebec..0000000
--- a/fr_FR.csv
+++ /dev/null
@@ -1,5 +0,0 @@
-type,name,res_id,src,value,fuzzy
-error,stock.move,0,FIFO quantity can not be greater than quantity!,La quantité FIFO ne peut pas être supérieure à la quantité!,0
-error,stock.move,0,You can not delete move that is used for FIFO cost price!,Vous ne pouvez pas supprimer de mouvement utilisé pour le prix de revient FIFO !,0
-field,"stock.move,fifo_quantity",0,FIFO Quantity,Quantité FIFO,0
-selection,"product.template,cost_price_method",0,FIFO,FIFO,0
diff --git a/locale/bg_BG.po b/locale/bg_BG.po
new file mode 100644
index 0000000..4b78433
--- /dev/null
+++ b/locale/bg_BG.po
@@ -0,0 +1,20 @@
+#
+msgid ""
+msgstr "Content-Type: text/plain; charset=utf-8\n"
+
+msgctxt "error:stock.move:0"
+msgid "FIFO quantity can not be greater than quantity!"
+msgstr "FIFO-количество не може да е по-голямо от количеството!"
+
+msgctxt "error:stock.move:0"
+msgid "You can not delete move that is used for FIFO cost price!"
+msgstr ""
+"Не може да изтривате движение което се използва за изчисляване на FIFO цена!"
+
+msgctxt "field:stock.move,fifo_quantity:0"
+msgid "FIFO Quantity"
+msgstr "FIFO количество"
+
+msgctxt "selection:product.template,cost_price_method:0"
+msgid "FIFO"
+msgstr "FIFO"
diff --git a/locale/cs_CZ.po b/locale/cs_CZ.po
new file mode 100644
index 0000000..844ecc2
--- /dev/null
+++ b/locale/cs_CZ.po
@@ -0,0 +1,19 @@
+#
+msgid ""
+msgstr "Content-Type: text/plain; charset=utf-8\n"
+
+msgctxt "error:stock.move:0"
+msgid "FIFO quantity can not be greater than quantity!"
+msgstr ""
+
+msgctxt "error:stock.move:0"
+msgid "You can not delete move that is used for FIFO cost price!"
+msgstr ""
+
+msgctxt "field:stock.move,fifo_quantity:0"
+msgid "FIFO Quantity"
+msgstr ""
+
+msgctxt "selection:product.template,cost_price_method:0"
+msgid "FIFO"
+msgstr ""
diff --git a/locale/de_DE.po b/locale/de_DE.po
new file mode 100644
index 0000000..c5ac214
--- /dev/null
+++ b/locale/de_DE.po
@@ -0,0 +1,21 @@
+#
+msgid ""
+msgstr "Content-Type: text/plain; charset=utf-8\n"
+
+msgctxt "error:stock.move:0"
+msgid "FIFO quantity can not be greater than quantity!"
+msgstr "FIFO Anzahl kann nicht größer als Anzahl sein!"
+
+msgctxt "error:stock.move:0"
+msgid "You can not delete move that is used for FIFO cost price!"
+msgstr ""
+"Eine Bewegung, die Bestandteil einer Kostenpreisermittlung nach FIFO ist, "
+"kann nicht gelöscht werden!"
+
+msgctxt "field:stock.move,fifo_quantity:0"
+msgid "FIFO Quantity"
+msgstr "Anzahl FIFO"
+
+msgctxt "selection:product.template,cost_price_method:0"
+msgid "FIFO"
+msgstr "FIFO"
diff --git a/locale/es_CO.po b/locale/es_CO.po
new file mode 100644
index 0000000..710b643
--- /dev/null
+++ b/locale/es_CO.po
@@ -0,0 +1,20 @@
+#
+msgid ""
+msgstr "Content-Type: text/plain; charset=utf-8\n"
+
+msgctxt "error:stock.move:0"
+msgid "FIFO quantity can not be greater than quantity!"
+msgstr "¡Cantidad FIFO no puede ser mayor que la cantidad!"
+
+msgctxt "error:stock.move:0"
+msgid "You can not delete move that is used for FIFO cost price!"
+msgstr ""
+"¡No puede borrar un movimiento que es usado por el precio de costo de FIFO!"
+
+msgctxt "field:stock.move,fifo_quantity:0"
+msgid "FIFO Quantity"
+msgstr "Cantidad FIFO"
+
+msgctxt "selection:product.template,cost_price_method:0"
+msgid "FIFO"
+msgstr "FIFO"
diff --git a/locale/es_ES.po b/locale/es_ES.po
new file mode 100644
index 0000000..5b62818
--- /dev/null
+++ b/locale/es_ES.po
@@ -0,0 +1,21 @@
+#
+msgid ""
+msgstr "Content-Type: text/plain; charset=utf-8\n"
+
+msgctxt "error:stock.move:0"
+msgid "FIFO quantity can not be greater than quantity!"
+msgstr "La cantidad FIFO no puede se mayor que «cantidad»"
+
+msgctxt "error:stock.move:0"
+msgid "You can not delete move that is used for FIFO cost price!"
+msgstr ""
+"No puede borrar un movimiento que se utiliza para el cálculo FIFO del precio"
+" de coste"
+
+msgctxt "field:stock.move,fifo_quantity:0"
+msgid "FIFO Quantity"
+msgstr "Cantidad FIFO"
+
+msgctxt "selection:product.template,cost_price_method:0"
+msgid "FIFO"
+msgstr "FIFO"
diff --git a/locale/fr_FR.po b/locale/fr_FR.po
new file mode 100644
index 0000000..a219176
--- /dev/null
+++ b/locale/fr_FR.po
@@ -0,0 +1,21 @@
+#
+msgid ""
+msgstr "Content-Type: text/plain; charset=utf-8\n"
+
+msgctxt "error:stock.move:0"
+msgid "FIFO quantity can not be greater than quantity!"
+msgstr "La quantité FIFO ne peut pas être supérieure à la quantité!"
+
+msgctxt "error:stock.move:0"
+msgid "You can not delete move that is used for FIFO cost price!"
+msgstr ""
+"Vous ne pouvez pas supprimer de mouvement utilisé pour le prix de revient "
+"FIFO !"
+
+msgctxt "field:stock.move,fifo_quantity:0"
+msgid "FIFO Quantity"
+msgstr "Quantité FIFO"
+
+msgctxt "selection:product.template,cost_price_method:0"
+msgid "FIFO"
+msgstr "FIFO"
diff --git a/locale/nl_NL.po b/locale/nl_NL.po
new file mode 100644
index 0000000..844ecc2
--- /dev/null
+++ b/locale/nl_NL.po
@@ -0,0 +1,19 @@
+#
+msgid ""
+msgstr "Content-Type: text/plain; charset=utf-8\n"
+
+msgctxt "error:stock.move:0"
+msgid "FIFO quantity can not be greater than quantity!"
+msgstr ""
+
+msgctxt "error:stock.move:0"
+msgid "You can not delete move that is used for FIFO cost price!"
+msgstr ""
+
+msgctxt "field:stock.move,fifo_quantity:0"
+msgid "FIFO Quantity"
+msgstr ""
+
+msgctxt "selection:product.template,cost_price_method:0"
+msgid "FIFO"
+msgstr ""
diff --git a/locale/ru_RU.po b/locale/ru_RU.po
new file mode 100644
index 0000000..844ecc2
--- /dev/null
+++ b/locale/ru_RU.po
@@ -0,0 +1,19 @@
+#
+msgid ""
+msgstr "Content-Type: text/plain; charset=utf-8\n"
+
+msgctxt "error:stock.move:0"
+msgid "FIFO quantity can not be greater than quantity!"
+msgstr ""
+
+msgctxt "error:stock.move:0"
+msgid "You can not delete move that is used for FIFO cost price!"
+msgstr ""
+
+msgctxt "field:stock.move,fifo_quantity:0"
+msgid "FIFO Quantity"
+msgstr ""
+
+msgctxt "selection:product.template,cost_price_method:0"
+msgid "FIFO"
+msgstr ""
diff --git a/move.py b/move.py
index acb8d62..5b4a451 100644
--- a/move.py
+++ b/move.py
@@ -3,12 +3,14 @@
from decimal import Decimal
from trytond.model import ModelView, ModelSQL, fields
from trytond.pyson import Eval
+from trytond.pool import Pool
class Move(ModelSQL, ModelView):
_name = 'stock.move'
fifo_quantity = fields.Float('FIFO Quantity',
- digits=(16, Eval('unit_digits', 2)))
+ digits=(16, Eval('unit_digits', 2)),
+ depends=['unit_digits'])
def __init__(self):
super(Move, self).__init__()
@@ -38,8 +40,8 @@ class Move(ModelSQL, ModelView):
:return: cost_price (of type decimal)
'''
- template_obj = self.pool.get('product.template')
- uom_obj = self.pool.get('product.uom')
+ template_obj = Pool().get('product.template')
+ uom_obj = Pool().get('product.uom')
if isinstance(uom, (int, long)):
uom = uom_obj.browse(uom)
@@ -81,10 +83,11 @@ class Move(ModelSQL, ModelView):
return product.cost_price
def create(self, vals):
- location_obj = self.pool.get('stock.location')
- product_obj = self.pool.get('product.product')
- uom_obj = self.pool.get('product.uom')
- date_obj = self.pool.get('ir.date')
+ pool = Pool()
+ location_obj = pool.get('stock.location')
+ product_obj = pool.get('product.product')
+ uom_obj = pool.get('product.uom')
+ date_obj = pool.get('ir.date')
today = date_obj.today()
effective_date = vals.get('effective_date') or today
@@ -115,7 +118,7 @@ class Move(ModelSQL, ModelView):
return super(Move, self).create(vals)
def write(self, ids, vals):
- date_obj = self.pool.get('ir.date')
+ date_obj = Pool().get('ir.date')
if isinstance(ids, (int, long)):
ids = [ids]
diff --git a/product.py b/product.py
index bc0c454..d904fb4 100644
--- a/product.py
+++ b/product.py
@@ -1,10 +1,10 @@
#This file is part of Tryton. The COPYRIGHT file at the top level of
#this repository contains the full copyright notices and license terms.
-from __future__ import with_statement
import copy
import datetime
-from trytond.model import ModelView, ModelSQL, fields
+from trytond.model import ModelView, ModelSQL
from trytond.transaction import Transaction
+from trytond.pool import Pool
class Template(ModelSQL, ModelView):
@@ -30,9 +30,10 @@ class Template(ModelSQL, ModelView):
:return: list of (move, qty) where move is a browse record,
qty is a float
'''
- move_obj = self.pool.get('stock.move')
- uom_obj = self.pool.get('product.uom')
- location_obj = self.pool.get('stock.location')
+ pool = Pool()
+ move_obj = pool.get('stock.move')
+ uom_obj = pool.get('product.uom')
+ location_obj = pool.get('stock.location')
locations = location_obj.search([
('type', '=', 'storage'),
diff --git a/setup.py b/setup.py
index cb57c6d..cfe69a3 100644
--- a/setup.py
+++ b/setup.py
@@ -38,18 +38,21 @@ setup(name='trytond_product_cost_fifo',
classifiers=[
'Development Status :: 5 - Production/Stable',
'Environment :: Plugins',
+ 'Framework :: Tryton',
'Intended Audience :: Developers',
'Intended Audience :: Financial and Insurance Industry',
'Intended Audience :: Legal Industry',
'Intended Audience :: Manufacturing',
'License :: OSI Approved :: GNU General Public License (GPL)',
'Natural Language :: Bulgarian',
+ 'Natural Language :: Czech',
+ 'Natural Language :: Dutch',
'Natural Language :: English',
'Natural Language :: French',
'Natural Language :: German',
+ 'Natural Language :: Russian',
'Natural Language :: Spanish',
'Operating System :: OS Independent',
- 'Programming Language :: Python :: 2.5',
'Programming Language :: Python :: 2.6',
'Programming Language :: Python :: 2.7',
'Topic :: Office/Business',
@@ -61,4 +64,6 @@ setup(name='trytond_product_cost_fifo',
[trytond.modules]
product_cost_fifo = trytond.modules.product_cost_fifo
""",
+ test_suite='tests',
+ test_loader='trytond.test_loader:Loader',
)
diff --git a/trytond_product_cost_fifo.egg-info/PKG-INFO b/trytond_product_cost_fifo.egg-info/PKG-INFO
index d608a5f..7fd05d4 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.0
Name: trytond-product-cost-fifo
-Version: 2.0.1
+Version: 2.2.0
Summary: Add FIFO cost method on the product form.
Once installed, the price of the stock moves from a supplier or to a
customer will update automatically the cost price of the related
@@ -10,23 +10,26 @@ Home-page: http://www.tryton.org/
Author: B2CK
Author-email: info at b2ck.com
License: GPL-3
-Download-URL: http://downloads.tryton.org/2.0/
+Download-URL: http://downloads.tryton.org/2.2/
Description: UNKNOWN
Platform: UNKNOWN
Classifier: Development Status :: 5 - Production/Stable
Classifier: Environment :: Plugins
+Classifier: Framework :: Tryton
Classifier: Intended Audience :: Developers
Classifier: Intended Audience :: Financial and Insurance Industry
Classifier: Intended Audience :: Legal Industry
Classifier: Intended Audience :: Manufacturing
Classifier: License :: OSI Approved :: GNU General Public License (GPL)
Classifier: Natural Language :: Bulgarian
+Classifier: Natural Language :: Czech
+Classifier: Natural Language :: Dutch
Classifier: Natural Language :: English
Classifier: Natural Language :: French
Classifier: Natural Language :: German
+Classifier: Natural Language :: Russian
Classifier: Natural Language :: Spanish
Classifier: Operating System :: OS Independent
-Classifier: Programming Language :: Python :: 2.5
Classifier: Programming Language :: Python :: 2.6
Classifier: Programming Language :: Python :: 2.7
Classifier: Topic :: Office/Business
diff --git a/trytond_product_cost_fifo.egg-info/SOURCES.txt b/trytond_product_cost_fifo.egg-info/SOURCES.txt
index 4e55021..766ac29 100644
--- a/trytond_product_cost_fifo.egg-info/SOURCES.txt
+++ b/trytond_product_cost_fifo.egg-info/SOURCES.txt
@@ -4,17 +4,20 @@ INSTALL
LICENSE
MANIFEST.in
README
-bg_BG.csv
-de_DE.csv
-es_CO.csv
-es_ES.csv
-fr_FR.csv
setup.py
./__init__.py
./__tryton__.py
./move.py
./product.py
doc/index.rst
+locale/bg_BG.po
+locale/cs_CZ.po
+locale/de_DE.po
+locale/es_CO.po
+locale/es_ES.po
+locale/fr_FR.po
+locale/nl_NL.po
+locale/ru_RU.po
trytond_product_cost_fifo.egg-info/PKG-INFO
trytond_product_cost_fifo.egg-info/SOURCES.txt
trytond_product_cost_fifo.egg-info/dependency_links.txt
diff --git a/trytond_product_cost_fifo.egg-info/requires.txt b/trytond_product_cost_fifo.egg-info/requires.txt
index e78ed20..b5a2afa 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 >= 2.0, < 2.1
-trytond_stock >= 2.0, < 2.1
-trytond >= 2.0, < 2.1
\ No newline at end of file
+trytond_product >= 2.2, < 2.3
+trytond_stock >= 2.2, < 2.3
+trytond >= 2.2, < 2.3
\ No newline at end of file
commit 99d17c1711d74e022697936d456612c1046e87c4
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Sun Jun 5 13:14:54 2011 +0200
Adding upstream version 2.0.1.
diff --git a/CHANGELOG b/CHANGELOG
index 083ce10..0761cfd 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 2.0.1 - 2011-05-29
+* Bug fixes (see mercurial logs for details)
+
Version 2.0.0 - 2011-04-27
* Bug fixes (see mercurial logs for details)
diff --git a/PKG-INFO b/PKG-INFO
index 197f789..8780cb3 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.0
Name: trytond_product_cost_fifo
-Version: 2.0.0
+Version: 2.0.1
Summary: Add FIFO cost method on the product form.
Once installed, the price of the stock moves from a supplier or to a
customer will update automatically the cost price of the related
diff --git a/__tryton__.py b/__tryton__.py
index 3de3cc2..1287bfe 100644
--- a/__tryton__.py
+++ b/__tryton__.py
@@ -7,7 +7,7 @@
'name_es_CO': 'Costo FIFO de producto',
'name_es_ES': 'Coste FIFO de producto',
'name_fr_FR': 'Prix de revient produit FIFO',
- 'version': '2.0.0',
+ 'version': '2.0.1',
'author': 'B2CK',
'email': 'info at b2ck.com',
'website': 'http://www.tryton.org/',
diff --git a/product.py b/product.py
index 2b8817c..bc0c454 100644
--- a/product.py
+++ b/product.py
@@ -4,6 +4,7 @@ from __future__ import with_statement
import copy
import datetime
from trytond.model import ModelView, ModelSQL, fields
+from trytond.transaction import Transaction
class Template(ModelSQL, ModelView):
diff --git a/trytond_product_cost_fifo.egg-info/PKG-INFO b/trytond_product_cost_fifo.egg-info/PKG-INFO
index 6dca469..d608a5f 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.0
Name: trytond-product-cost-fifo
-Version: 2.0.0
+Version: 2.0.1
Summary: Add FIFO cost method on the product form.
Once installed, the price of the stock moves from a supplier or to a
customer will update automatically the cost price of the related
commit 83f60c4601f0d28ef5609ee23ac99f30b23295da
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Tue May 24 19:12:55 2011 +0200
Adding upstream version 2.0.0.
diff --git a/CHANGELOG b/CHANGELOG
index d3b0f3d..083ce10 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,4 +1,4 @@
-Version 1.8.1 - 2011-02-13
+Version 2.0.0 - 2011-04-27
* Bug fixes (see mercurial logs for details)
Version 1.8.0 - 2010-11-01
diff --git a/PKG-INFO b/PKG-INFO
index a67f9cc..197f789 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.0
Name: trytond_product_cost_fifo
-Version: 1.8.1
+Version: 2.0.0
Summary: Add FIFO cost method on the product form.
Once installed, the price of the stock moves from a supplier or to a
customer will update automatically the cost price of the related
@@ -10,7 +10,7 @@ Home-page: http://www.tryton.org/
Author: B2CK
Author-email: info at b2ck.com
License: GPL-3
-Download-URL: http://downloads.tryton.org/1.8/
+Download-URL: http://downloads.tryton.org/2.0/
Description: UNKNOWN
Platform: UNKNOWN
Classifier: Development Status :: 5 - Production/Stable
@@ -20,10 +20,13 @@ Classifier: Intended Audience :: Financial and Insurance Industry
Classifier: Intended Audience :: Legal Industry
Classifier: Intended Audience :: Manufacturing
Classifier: License :: OSI Approved :: GNU General Public License (GPL)
+Classifier: Natural Language :: Bulgarian
Classifier: Natural Language :: English
Classifier: Natural Language :: French
Classifier: Natural Language :: German
Classifier: Natural Language :: Spanish
Classifier: Operating System :: OS Independent
-Classifier: Programming Language :: Python
+Classifier: Programming Language :: Python :: 2.5
+Classifier: Programming Language :: Python :: 2.6
+Classifier: Programming Language :: Python :: 2.7
Classifier: Topic :: Office/Business
diff --git a/__tryton__.py b/__tryton__.py
index ff44207..3de3cc2 100644
--- a/__tryton__.py
+++ b/__tryton__.py
@@ -2,11 +2,12 @@
#this repository contains the full copyright notices and license terms.
{
'name': 'Product Cost FIFO',
+ 'name_bg_BG': 'FIFO цена на продукт',
'name_de_DE': 'Artikel Kostenpreisermittlung FIFO',
'name_es_CO': 'Costo FIFO de producto',
'name_es_ES': 'Coste FIFO de producto',
'name_fr_FR': 'Prix de revient produit FIFO',
- 'version': '1.8.1',
+ 'version': '2.0.0',
'author': 'B2CK',
'email': 'info at b2ck.com',
'website': 'http://www.tryton.org/',
@@ -15,6 +16,13 @@ Once installed, the price of the stock moves from a supplier or to a
customer will update automatically the cost price of the related
product (if the cost price method is FIFO)
''',
+ 'description_bg_BG':'''Добавя FIFO начин на остойностяване в формата на продукт
+ - Добавя FIFO (първи влязъл първи излязъл) като начин на изчисляване на
+ цената на продукт.
+ - След инсталиране на този модул цената на даден продукт (ако е избран този
+ начин на остойностяване) се изчислява автоматично при всяко движение на
+ наличност от доставчик или към клиент
+''',
'description_de_DE':'''Kostenpreisermittlung für Artikel nach Methode 'FIFO'
- Fügt 'FIFO' (First In - First Out) zu den Methoden für die
Kostenpreisermittlung für Artikel hinzu.
@@ -45,6 +53,7 @@ prix de revient du produit concerné (si la méthode de coût est FIFO).
'xml': [
],
'translation': [
+ 'bg_BG.csv',
'de_DE.csv',
'es_CO.csv',
'es_ES.csv',
diff --git a/bg_BG.csv b/bg_BG.csv
new file mode 100644
index 0000000..f68eb5b
--- /dev/null
+++ b/bg_BG.csv
@@ -0,0 +1,5 @@
+type,name,res_id,src,value,fuzzy
+error,stock.move,0,FIFO quantity can not be greater than quantity!,FIFO-количество не може да е по-голямо от количеството!,0
+error,stock.move,0,You can not delete move that is used for FIFO cost price!,Не може да изтривате движение което се използва за изчисляване на FIFO цена!,0
+field,"stock.move,fifo_quantity",0,FIFO Quantity,FIFO количество,0
+selection,"product.template,cost_price_method",0,FIFO,FIFO,0
diff --git a/move.py b/move.py
index 2f306cd..acb8d62 100644
--- a/move.py
+++ b/move.py
@@ -25,7 +25,7 @@ class Move(ModelSQL, ModelView):
def default_fifo_quantity(self):
return 0.0
- def _update_fifo_out_product_cost_price(self, product, quantity, uom):
+ def _update_fifo_out_product_cost_price(self, product, quantity, uom, date):
'''
Update the product cost price of the given product. Update
fifo_quantity on the concerned incomming moves. Return the
@@ -34,6 +34,7 @@ class Move(ModelSQL, ModelView):
:param product: a BrowseRecord of the product
:param quantity: the quantity of the outgoing product
:param uom: the uom id or a BrowseRecord of the uom
+ :param date: the date for the currency rate calculation
:return: cost_price (of type decimal)
'''
@@ -60,7 +61,7 @@ class Move(ModelSQL, ModelView):
self._update_product_cost_price(product.id, -move_qty,
product.default_uom, move_unit_price, move.currency,
- move.company)
+ move.company, date)
move_qty = uom_obj.compute_qty(product.default_uom, move_qty,
move.uom, round=False)
@@ -83,6 +84,10 @@ class Move(ModelSQL, ModelView):
location_obj = self.pool.get('stock.location')
product_obj = self.pool.get('product.product')
uom_obj = self.pool.get('product.uom')
+ date_obj = self.pool.get('ir.date')
+
+ today = date_obj.today()
+ effective_date = vals.get('effective_date') or today
if vals.get('state') == 'done':
from_location = location_obj.browse(vals['from_location'])
@@ -92,26 +97,31 @@ class Move(ModelSQL, ModelView):
and product.cost_price_method == 'fifo':
self._update_product_cost_price(vals['product'],
vals['quantity'], vals['uom'], vals['unit_price'],
- vals['currency'])
+ vals['currency'], effective_date)
if to_location.type == 'supplier' \
and product.cost_price_method == 'fifo':
self._update_product_cost_price(vals['product'],
-vals['quantity'], vals['uom'], vals['unit_price'],
- vals['currency'])
+ vals['currency'], effective_date)
if to_location.type != 'storage' \
and to_location.type != 'supplier' \
and product.cost_price_method == 'fifo':
cost_price = self._update_fifo_out_product_cost_price(product,
- vals['quantity'], vals['uom'])
+ vals['quantity'], vals['uom'], effective_date)
if not vals.get('cost_price'):
vals['cost_price'] = cost_price
return super(Move, self).create(vals)
def write(self, ids, vals):
+ date_obj = self.pool.get('ir.date')
+
if isinstance(ids, (int, long)):
ids = [ids]
+ today = date_obj.today()
+ effective_date = vals.get('effective_date') or today
+
if 'state' in vals and vals['state'] == 'done':
for move in self.browse(ids):
if vals['state'] == 'cancel':
@@ -120,13 +130,13 @@ class Move(ModelSQL, ModelView):
and move.product.cost_price_method == 'fifo':
self._update_product_cost_price(move.product.id,
-move.quantity, move.uom, move.unit_price,
- move.currency, move.company)
+ move.currency, move.company, effective_date)
if move.to_location.type == 'supplier' \
and move.state != 'cancel' \
and move.product.cost_price_method == 'fifo':
self._update_product_cost_price(move.product.id,
move.quantity, move.uom, move.unit_price,
- move.currency, move.company)
+ move.currency, move.company, effective_date)
elif vals['state'] == 'done':
if move.from_location.type == 'supplier' \
@@ -134,18 +144,19 @@ class Move(ModelSQL, ModelView):
and move.product.cost_price_method == 'fifo':
self._update_product_cost_price(move.product.id,
move.quantity, move.uom, move.unit_price,
- move.currency, move.company)
+ move.currency, move.company, effective_date)
if move.to_location.type == 'supplier' \
and move.state != 'done' \
and move.product.cost_price_method == 'fifo':
self._update_product_cost_price(move.product.id,
-move.quantity, move.uom, move.unit_price,
- move.currency, move.company)
+ move.currency, move.company, effective_date)
if move.to_location.type != 'storage' \
and move.to_location.type != 'supplier' \
and move.product.cost_price_method == 'fifo':
cost_price = self._update_fifo_out_product_cost_price(
- move.product, move.quantity, move.uom)
+ move.product, move.quantity, move.uom,
+ effective_date)
if not vals.get('cost_price'):
vals['cost_price'] = cost_price
return super(Move, self).write(ids, vals)
diff --git a/setup.py b/setup.py
index 608f64d..cb57c6d 100644
--- a/setup.py
+++ b/setup.py
@@ -43,12 +43,15 @@ setup(name='trytond_product_cost_fifo',
'Intended Audience :: Legal Industry',
'Intended Audience :: Manufacturing',
'License :: OSI Approved :: GNU General Public License (GPL)',
+ 'Natural Language :: Bulgarian',
'Natural Language :: English',
'Natural Language :: French',
'Natural Language :: German',
'Natural Language :: Spanish',
'Operating System :: OS Independent',
- 'Programming Language :: Python',
+ 'Programming Language :: Python :: 2.5',
+ 'Programming Language :: Python :: 2.6',
+ 'Programming Language :: Python :: 2.7',
'Topic :: Office/Business',
],
license='GPL-3',
diff --git a/trytond_product_cost_fifo.egg-info/PKG-INFO b/trytond_product_cost_fifo.egg-info/PKG-INFO
index 5a4d5b0..6dca469 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.0
Name: trytond-product-cost-fifo
-Version: 1.8.1
+Version: 2.0.0
Summary: Add FIFO cost method on the product form.
Once installed, the price of the stock moves from a supplier or to a
customer will update automatically the cost price of the related
@@ -10,7 +10,7 @@ Home-page: http://www.tryton.org/
Author: B2CK
Author-email: info at b2ck.com
License: GPL-3
-Download-URL: http://downloads.tryton.org/1.8/
+Download-URL: http://downloads.tryton.org/2.0/
Description: UNKNOWN
Platform: UNKNOWN
Classifier: Development Status :: 5 - Production/Stable
@@ -20,10 +20,13 @@ Classifier: Intended Audience :: Financial and Insurance Industry
Classifier: Intended Audience :: Legal Industry
Classifier: Intended Audience :: Manufacturing
Classifier: License :: OSI Approved :: GNU General Public License (GPL)
+Classifier: Natural Language :: Bulgarian
Classifier: Natural Language :: English
Classifier: Natural Language :: French
Classifier: Natural Language :: German
Classifier: Natural Language :: Spanish
Classifier: Operating System :: OS Independent
-Classifier: Programming Language :: Python
+Classifier: Programming Language :: Python :: 2.5
+Classifier: Programming Language :: Python :: 2.6
+Classifier: Programming Language :: Python :: 2.7
Classifier: Topic :: Office/Business
diff --git a/trytond_product_cost_fifo.egg-info/SOURCES.txt b/trytond_product_cost_fifo.egg-info/SOURCES.txt
index 5856328..4e55021 100644
--- a/trytond_product_cost_fifo.egg-info/SOURCES.txt
+++ b/trytond_product_cost_fifo.egg-info/SOURCES.txt
@@ -4,6 +4,7 @@ INSTALL
LICENSE
MANIFEST.in
README
+bg_BG.csv
de_DE.csv
es_CO.csv
es_ES.csv
diff --git a/trytond_product_cost_fifo.egg-info/requires.txt b/trytond_product_cost_fifo.egg-info/requires.txt
index 7c49621..e78ed20 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 >= 1.8, < 1.9
-trytond_stock >= 1.8, < 1.9
-trytond >= 1.8, < 1.9
\ No newline at end of file
+trytond_product >= 2.0, < 2.1
+trytond_stock >= 2.0, < 2.1
+trytond >= 2.0, < 2.1
\ No newline at end of file
commit 74d9d2e49c39a8fd673ced10006533d0f824710f
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Tue Feb 15 11:46:15 2011 +0100
Adding upstream version 1.8.1.
diff --git a/CHANGELOG b/CHANGELOG
index 5fcda21..d3b0f3d 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 1.8.1 - 2011-02-13
+* Bug fixes (see mercurial logs for details)
+
Version 1.8.0 - 2010-11-01
* Bug fixes (see mercurial logs for details)
diff --git a/COPYRIGHT b/COPYRIGHT
index cca7db9..3d2324b 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -1,6 +1,6 @@
-Copyright (C) 2008-2010 Cédric Krier.
-Copyright (C) 2008-2010 Bertrand Chenal.
-Copyright (C) 2008-2010 B2CK SPRL.
+Copyright (C) 2008-2011 Cédric Krier.
+Copyright (C) 2008-2011 Bertrand Chenal.
+Copyright (C) 2008-2011 B2CK SPRL.
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff --git a/PKG-INFO b/PKG-INFO
index 851fe14..a67f9cc 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.0
Name: trytond_product_cost_fifo
-Version: 1.8.0
+Version: 1.8.1
Summary: Add FIFO cost method on the product form.
Once installed, the price of the stock moves from a supplier or to a
customer will update automatically the cost price of the related
diff --git a/__tryton__.py b/__tryton__.py
index 9365c80..ff44207 100644
--- a/__tryton__.py
+++ b/__tryton__.py
@@ -6,7 +6,7 @@
'name_es_CO': 'Costo FIFO de producto',
'name_es_ES': 'Coste FIFO de producto',
'name_fr_FR': 'Prix de revient produit FIFO',
- 'version': '1.8.0',
+ 'version': '1.8.1',
'author': 'B2CK',
'email': 'info at b2ck.com',
'website': 'http://www.tryton.org/',
diff --git a/move.py b/move.py
index 2f920e4..2f306cd 100644
--- a/move.py
+++ b/move.py
@@ -22,7 +22,7 @@ class Move(ModelSQL, ModelView):
'for FIFO cost price!',
})
- def default_fifo_quantity_out(self):
+ def default_fifo_quantity(self):
return 0.0
def _update_fifo_out_product_cost_price(self, product, quantity, uom):
diff --git a/trytond_product_cost_fifo.egg-info/PKG-INFO b/trytond_product_cost_fifo.egg-info/PKG-INFO
index fa282f4..5a4d5b0 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.0
Name: trytond-product-cost-fifo
-Version: 1.8.0
+Version: 1.8.1
Summary: Add FIFO cost method on the product form.
Once installed, the price of the stock moves from a supplier or to a
customer will update automatically the cost price of the related
commit b33ff35d6862391a86e46ced2d29f0c29eb54254
Author: Daniel Baumann <daniel at debian.org>
Date: Thu Nov 4 20:12:25 2010 +0100
Adding upstream version 1.8.0.
diff --git a/CHANGELOG b/CHANGELOG
index 0fac9b2..5fcda21 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 1.8.0 - 2010-11-01
+* Bug fixes (see mercurial logs for details)
+
Version 1.6.0 - 2010-05-12
* Bug fixes (see mercurial logs for details)
diff --git a/INSTALL b/INSTALL
index 370644c..07883ac 100644
--- a/INSTALL
+++ b/INSTALL
@@ -4,7 +4,7 @@ Installing trytond_product_cost_fifo
Prerequisites
-------------
- * Python 2.4 or later (http://www.python.org/)
+ * Python 2.5 or later (http://www.python.org/)
* trytond (http://www.tryton.org/)
* trytond_product (http://www.tryton.org/)
* trytond_stock (http://www.tryton.org/)
diff --git a/PKG-INFO b/PKG-INFO
index 66324e3..851fe14 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.0
Name: trytond_product_cost_fifo
-Version: 1.6.0
+Version: 1.8.0
Summary: Add FIFO cost method on the product form.
Once installed, the price of the stock moves from a supplier or to a
customer will update automatically the cost price of the related
@@ -10,7 +10,7 @@ Home-page: http://www.tryton.org/
Author: B2CK
Author-email: info at b2ck.com
License: GPL-3
-Download-URL: http://downloads.tryton.org/1.6/
+Download-URL: http://downloads.tryton.org/1.8/
Description: UNKNOWN
Platform: UNKNOWN
Classifier: Development Status :: 5 - Production/Stable
diff --git a/__tryton__.py b/__tryton__.py
index e20e7cb..9365c80 100644
--- a/__tryton__.py
+++ b/__tryton__.py
@@ -6,7 +6,7 @@
'name_es_CO': 'Costo FIFO de producto',
'name_es_ES': 'Coste FIFO de producto',
'name_fr_FR': 'Prix de revient produit FIFO',
- 'version': '1.6.0',
+ 'version': '1.8.0',
'author': 'B2CK',
'email': 'info at b2ck.com',
'website': 'http://www.tryton.org/',
diff --git a/move.py b/move.py
index ac7d614..2f920e4 100644
--- a/move.py
+++ b/move.py
@@ -1,8 +1,8 @@
#This file is part of Tryton. The COPYRIGHT file at the top level of
#this repository contains the full copyright notices and license terms.
+from decimal import Decimal
from trytond.model import ModelView, ModelSQL, fields
from trytond.pyson import Eval
-from decimal import Decimal
class Move(ModelSQL, ModelView):
@@ -22,22 +22,18 @@ class Move(ModelSQL, ModelView):
'for FIFO cost price!',
})
- def default_fifo_quantity_out(self, cursor, user, context=None):
+ def default_fifo_quantity_out(self):
return 0.0
- def _update_fifo_out_product_cost_price(self, cursor, user, product,
- quantity, uom, context=None):
+ def _update_fifo_out_product_cost_price(self, product, quantity, uom):
'''
Update the product cost price of the given product. Update
fifo_quantity on the concerned incomming moves. Return the
cost price for outputing the given product and quantity.
- :param cursor: the database cursor
- :param user: the user id
:param product: a BrowseRecord of the product
:param quantity: the quantity of the outgoing product
:param uom: the uom id or a BrowseRecord of the uom
- :param context: the context
:return: cost_price (of type decimal)
'''
@@ -45,14 +41,12 @@ class Move(ModelSQL, ModelView):
uom_obj = self.pool.get('product.uom')
if isinstance(uom, (int, long)):
- uom = uom_obj.browse(cursor, user, uom, context=context)
+ uom = uom_obj.browse(uom)
- total_qty = uom_obj.compute_qty(
- cursor, user, uom, quantity, product.default_uom, round=False,
- context=context)
+ total_qty = uom_obj.compute_qty(uom, quantity, product.default_uom,
+ round=False)
- fifo_moves = template_obj.get_fifo_move(
- cursor, user, product.template.id, total_qty, context=context)
+ fifo_moves = template_obj.get_fifo_move(product.template.id, total_qty)
cost_price = Decimal("0.0")
@@ -60,22 +54,19 @@ class Move(ModelSQL, ModelView):
for move, move_qty in fifo_moves:
consumed_qty += move_qty
- move_unit_price = uom_obj.compute_price(
- cursor, user, move.uom, move.unit_price,
- move.product.default_uom, context=context)
+ move_unit_price = uom_obj.compute_price(move.uom, move.unit_price,
+ move.product.default_uom)
cost_price += move_unit_price * Decimal(str(move_qty))
- self._update_product_cost_price(
- cursor, user, product.id, -move_qty, product.default_uom,
- move_unit_price, move.currency, move.company, context=context)
+ self._update_product_cost_price(product.id, -move_qty,
+ product.default_uom, move_unit_price, move.currency,
+ move.company)
- move_qty = uom_obj.compute_qty(
- cursor, user, product.default_uom, move_qty, move.uom,
- round=False, context=context)
- self.write(
- cursor, user, move.id,
- {'fifo_quantity': (move.fifo_quantity or 0.0) + move_qty},
- context=context)
+ move_qty = uom_obj.compute_qty(product.default_uom, move_qty,
+ move.uom, round=False)
+ self.write(move.id, {
+ 'fifo_quantity': (move.fifo_quantity or 0.0) + move_qty,
+ })
if Decimal(str(consumed_qty)) != Decimal("0"):
@@ -88,93 +79,82 @@ class Move(ModelSQL, ModelView):
else:
return product.cost_price
- def create(self, cursor, user, vals, context=None):
+ def create(self, vals):
location_obj = self.pool.get('stock.location')
product_obj = self.pool.get('product.product')
uom_obj = self.pool.get('product.uom')
if vals.get('state') == 'done':
- from_location = location_obj.browse(cursor, user,
- vals['from_location'], context=context)
- to_location = location_obj.browse(cursor, user,
- vals['to_location'], context=context)
- product = product_obj.browse(cursor, user, vals['product'],
- context=context)
+ from_location = location_obj.browse(vals['from_location'])
+ to_location = location_obj.browse(vals['to_location'])
+ product = product_obj.browse(vals['product'])
if from_location.type == 'supplier' \
and product.cost_price_method == 'fifo':
- self._update_product_cost_price(cursor, user,
- vals['product'], vals['quantity'], vals['uom'],
- vals['unit_price'], vals['currency'],
- context=context)
+ self._update_product_cost_price(vals['product'],
+ vals['quantity'], vals['uom'], vals['unit_price'],
+ vals['currency'])
if to_location.type == 'supplier' \
and product.cost_price_method == 'fifo':
- self._update_product_cost_price(cursor, user,
- vals['product'], -vals['quantity'], vals['uom'],
- vals['unit_price'], vals['currency'],
- context=context)
+ self._update_product_cost_price(vals['product'],
+ -vals['quantity'], vals['uom'], vals['unit_price'],
+ vals['currency'])
if to_location.type != 'storage' \
and to_location.type != 'supplier' \
and product.cost_price_method == 'fifo':
- cost_price = self._update_fifo_out_product_cost_price(
- cursor, user, product, vals['quantity'], vals['uom'],
- context=context)
+ cost_price = self._update_fifo_out_product_cost_price(product,
+ vals['quantity'], vals['uom'])
if not vals.get('cost_price'):
vals['cost_price'] = cost_price
- return super(Move, self).create(cursor, user, vals, context=context)
+ return super(Move, self).create(vals)
- def write(self, cursor, user, ids, vals, context=None):
+ def write(self, ids, vals):
if isinstance(ids, (int, long)):
ids = [ids]
if 'state' in vals and vals['state'] == 'done':
- for move in self.browse(cursor, user, ids, context=context):
+ for move in self.browse(ids):
if vals['state'] == 'cancel':
if move.from_location.type == 'supplier' \
and move.state != 'cancel' \
and move.product.cost_price_method == 'fifo':
- self._update_product_cost_price(cursor, user,
- move.product.id, -move.quantity, move.uom,
- move.unit_price, move.currency, move.company,
- context=context)
+ self._update_product_cost_price(move.product.id,
+ -move.quantity, move.uom, move.unit_price,
+ move.currency, move.company)
if move.to_location.type == 'supplier' \
and move.state != 'cancel' \
and move.product.cost_price_method == 'fifo':
- self._update_product_cost_price(cursor, user,
- move.product.id, move.quantity, move.uom,
- move.unit_price, move.currency, move.company,
- context=context)
+ self._update_product_cost_price(move.product.id,
+ move.quantity, move.uom, move.unit_price,
+ move.currency, move.company)
elif vals['state'] == 'done':
if move.from_location.type == 'supplier' \
and move.state != 'done' \
and move.product.cost_price_method == 'fifo':
- self._update_product_cost_price(cursor, user,
- move.product.id, move.quantity, move.uom,
- move.unit_price, move.currency, move.company,
- context=context)
+ self._update_product_cost_price(move.product.id,
+ move.quantity, move.uom, move.unit_price,
+ move.currency, move.company)
if move.to_location.type == 'supplier' \
and move.state != 'done' \
and move.product.cost_price_method == 'fifo':
- self._update_product_cost_price(cursor, user,
- move.product.id, -move.quantity, move.uom,
- move.unit_price, move.currency, move.company,
- context=context)
+ self._update_product_cost_price(move.product.id,
+ -move.quantity, move.uom, move.unit_price,
+ move.currency, move.company)
if move.to_location.type != 'storage' \
and move.to_location.type != 'supplier' \
and move.product.cost_price_method == 'fifo':
cost_price = self._update_fifo_out_product_cost_price(
- cursor, user, move.product, move.quantity,
- move.uom, context=context)
+ move.product, move.quantity, move.uom)
if not vals.get('cost_price'):
vals['cost_price'] = cost_price
- return super(Move, self).write(cursor, user, ids, vals, context=context)
+ return super(Move, self).write(ids, vals)
- def delete(self, cursor, user, ids, context=None):
- if self.search(cursor, user, [
+ def delete(self, ids):
+ if self.search([
('id', 'in', ids),
('fifo_quantity', '!=', 0.0),
- ], context=context):
- self.raise_user_error(cursor, 'del_move_fifo', context=context)
- return super(Move, self).delete(cursor, user, ids, context=context)
+ ]):
+ self.raise_user_error('del_move_fifo')
+ return super(Move, self).delete(ids)
Move()
diff --git a/product.py b/product.py
index bc488ac..2b8817c 100644
--- a/product.py
+++ b/product.py
@@ -1,8 +1,9 @@
#This file is part of Tryton. The COPYRIGHT file at the top level of
#this repository contains the full copyright notices and license terms.
-from trytond.model import ModelView, ModelSQL, fields
+from __future__ import with_statement
import copy
import datetime
+from trytond.model import ModelView, ModelSQL, fields
class Template(ModelSQL, ModelView):
@@ -16,19 +17,15 @@ class Template(ModelSQL, ModelView):
self.cost_price_method.selection.append(new_sel)
self._reset_columns()
- def get_fifo_move(self, cursor, user, template_id, quantity=0.0,
- context=None):
+ def get_fifo_move(self, template_id, quantity=0.0):
'''
Return a list of (move, qty) where move is the move to be
consumed and qty is the quantity (in the product default uom)
to be consumed on this move. The list contains the "first in"
moves for the given quantity.
- :param cursor: the database cursor
- :param user: the user id
:param template_id: the product template id
:param quantity: the quantity to be removed from the stock
- :param context: the context
:return: list of (move, qty) where move is a browse record,
qty is a float
'''
@@ -36,35 +33,34 @@ class Template(ModelSQL, ModelView):
uom_obj = self.pool.get('product.uom')
location_obj = self.pool.get('stock.location')
- ctx = context and context.copy() or {}
- ctx['locations'] = location_obj.search(cursor, user, [
+ locations = location_obj.search([
('type', '=', 'storage'),
- ], context=context)
- ctx['stock_date_end'] = datetime.date.today()
+ ])
+ stock_date_end = datetime.date.today()
- template = self.browse(cursor, user, template_id, context=ctx)
+ with Transaction().set_context(locations=locations,
+ stock_date_end=stock_date_end):
+ template = self.browse(template_id)
offset = 0
- limit = cursor.IN_MAX
+ limit = Transaction().cursor.IN_MAX
avail_qty = template.quantity
fifo_moves = []
while avail_qty > 0.0:
- move_ids = move_obj.search(cursor, user, [
+ move_ids = move_obj.search([
('product.template.id', '=', template.id),
('state', '=', 'done'),
('from_location.type', '=', 'supplier'),
], offset=offset, limit=limit,
- order=[('effective_date', 'DESC'), ('id', 'DESC')],
- context=context)
+ order=[('effective_date', 'DESC'), ('id', 'DESC')])
if not move_ids:
break
offset += limit
- for move in move_obj.browse(cursor, user, move_ids,
- context=context):
- qty = uom_obj.compute_qty(cursor, user, move.uom,
+ for move in move_obj.browse(move_ids):
+ qty = uom_obj.compute_qty(move.uom,
move.quantity - move.fifo_quantity,
- template.default_uom, round=False, context=context)
+ template.default_uom, round=False)
avail_qty -= qty
if avail_qty <= quantity:
diff --git a/trytond_product_cost_fifo.egg-info/PKG-INFO b/trytond_product_cost_fifo.egg-info/PKG-INFO
index 3ffbf92..fa282f4 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.0
Name: trytond-product-cost-fifo
-Version: 1.6.0
+Version: 1.8.0
Summary: Add FIFO cost method on the product form.
Once installed, the price of the stock moves from a supplier or to a
customer will update automatically the cost price of the related
@@ -10,7 +10,7 @@ Home-page: http://www.tryton.org/
Author: B2CK
Author-email: info at b2ck.com
License: GPL-3
-Download-URL: http://downloads.tryton.org/1.6/
+Download-URL: http://downloads.tryton.org/1.8/
Description: UNKNOWN
Platform: UNKNOWN
Classifier: Development Status :: 5 - Production/Stable
diff --git a/trytond_product_cost_fifo.egg-info/requires.txt b/trytond_product_cost_fifo.egg-info/requires.txt
index 1990304..7c49621 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 >= 1.6, < 1.7
-trytond_stock >= 1.6, < 1.7
-trytond >= 1.6, < 1.7
\ No newline at end of file
+trytond_product >= 1.8, < 1.9
+trytond_stock >= 1.8, < 1.9
+trytond >= 1.8, < 1.9
\ No newline at end of file
commit 889564f21685901b39c96b0d4a4b504bd188b8f6
Author: Mathias Behrle <mathiasb at mbsolutions.selfip.biz>
Date: Thu May 13 11:29:22 2010 +0200
Adding upstream version 1.6.0.
diff --git a/CHANGELOG b/CHANGELOG
index 9ac2994..0fac9b2 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 1.6.0 - 2010-05-12
+* Bug fixes (see mercurial logs for details)
+
Version 1.4.0 - 2009-10-19
* Bug fixes (see mercurial logs for details)
diff --git a/COPYRIGHT b/COPYRIGHT
index 853f1f7..cca7db9 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -1,5 +1,6 @@
-Copyright (C) 2008-2009 Cédric Krier.
-Copyright (C) 2008-2009 B2CK SPRL.
+Copyright (C) 2008-2010 Cédric Krier.
+Copyright (C) 2008-2010 Bertrand Chenal.
+Copyright (C) 2008-2010 B2CK SPRL.
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff --git a/PKG-INFO b/PKG-INFO
index 11e055a..66324e3 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.0
Name: trytond_product_cost_fifo
-Version: 1.4.0
+Version: 1.6.0
Summary: Add FIFO cost method on the product form.
Once installed, the price of the stock moves from a supplier or to a
customer will update automatically the cost price of the related
@@ -10,7 +10,7 @@ Home-page: http://www.tryton.org/
Author: B2CK
Author-email: info at b2ck.com
License: GPL-3
-Download-URL: http://downloads.tryton.org/1.4/
+Download-URL: http://downloads.tryton.org/1.6/
Description: UNKNOWN
Platform: UNKNOWN
Classifier: Development Status :: 5 - Production/Stable
diff --git a/__tryton__.py b/__tryton__.py
index 2b335ed..e20e7cb 100644
--- a/__tryton__.py
+++ b/__tryton__.py
@@ -6,7 +6,7 @@
'name_es_CO': 'Costo FIFO de producto',
'name_es_ES': 'Coste FIFO de producto',
'name_fr_FR': 'Prix de revient produit FIFO',
- 'version': '1.4.0',
+ 'version': '1.6.0',
'author': 'B2CK',
'email': 'info at b2ck.com',
'website': 'http://www.tryton.org/',
diff --git a/move.py b/move.py
index 21a4a29..ac7d614 100644
--- a/move.py
+++ b/move.py
@@ -1,13 +1,14 @@
#This file is part of Tryton. The COPYRIGHT file at the top level of
#this repository contains the full copyright notices and license terms.
from trytond.model import ModelView, ModelSQL, fields
+from trytond.pyson import Eval
from decimal import Decimal
class Move(ModelSQL, ModelView):
_name = 'stock.move'
fifo_quantity = fields.Float('FIFO Quantity',
- digits="(16, unit_digits)")
+ digits=(16, Eval('unit_digits', 2)))
def __init__(self):
super(Move, self).__init__()
@@ -81,7 +82,9 @@ class Move(ModelSQL, ModelView):
cost_price = cost_price / Decimal(str(consumed_qty))
if cost_price != Decimal("0"):
- return cost_price
+ digits = self.cost_price.digits
+ return cost_price.quantize(
+ Decimal(str(10.0**-digits[1])))
else:
return product.cost_price
diff --git a/setup.py b/setup.py
index 8bdb635..608f64d 100644
--- a/setup.py
+++ b/setup.py
@@ -2,19 +2,22 @@
#This file is part of Tryton. The COPYRIGHT file at the top level of
#this repository contains the full copyright notices and license terms.
-from setuptools import setup, find_packages
+from setuptools import setup
import re
-info = eval(file('__tryton__.py').read())
+info = eval(open('__tryton__.py').read())
+major_version, minor_version, _ = info.get('version', '0.0.1').split('.', 2)
+major_version = int(major_version)
+minor_version = int(minor_version)
requires = []
for dep in info.get('depends', []):
if not re.match(r'(ir|res|workflow|webdav)(\W|$)', dep):
- requires.append('trytond_' + dep)
-
-major_version, minor_version, _ = info.get('version', '0.0.1').split('.', 2)
-requires.append('trytond >= %s.%s' % (major_version, minor_version))
-requires.append('trytond < %s.%s' % (major_version, int(minor_version) + 1))
+ requires.append('trytond_%s >= %s.%s, < %s.%s' %
+ (dep, major_version, minor_version, major_version,
+ minor_version + 1))
+requires.append('trytond >= %s.%s, < %s.%s' %
+ (major_version, minor_version, major_version, minor_version + 1))
setup(name='trytond_product_cost_fifo',
version=info.get('version', '0.0.1'),
diff --git a/trytond_product_cost_fifo.egg-info/PKG-INFO b/trytond_product_cost_fifo.egg-info/PKG-INFO
index c6f47de..3ffbf92 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.0
Name: trytond-product-cost-fifo
-Version: 1.4.0
+Version: 1.6.0
Summary: Add FIFO cost method on the product form.
Once installed, the price of the stock moves from a supplier or to a
customer will update automatically the cost price of the related
@@ -10,7 +10,7 @@ Home-page: http://www.tryton.org/
Author: B2CK
Author-email: info at b2ck.com
License: GPL-3
-Download-URL: http://downloads.tryton.org/1.4/
+Download-URL: http://downloads.tryton.org/1.6/
Description: UNKNOWN
Platform: UNKNOWN
Classifier: Development Status :: 5 - Production/Stable
diff --git a/trytond_product_cost_fifo.egg-info/requires.txt b/trytond_product_cost_fifo.egg-info/requires.txt
index 5df9de7..1990304 100644
--- a/trytond_product_cost_fifo.egg-info/requires.txt
+++ b/trytond_product_cost_fifo.egg-info/requires.txt
@@ -1,4 +1,3 @@
-trytond_product
-trytond_stock
-trytond >= 1.4
-trytond < 1.5
\ No newline at end of file
+trytond_product >= 1.6, < 1.7
+trytond_stock >= 1.6, < 1.7
+trytond >= 1.6, < 1.7
\ No newline at end of file
commit 01594cbd51111d85b34e79169f45489e29d4209f
Author: Daniel Baumann <daniel at debian.org>
Date: Mon Oct 19 22:18:53 2009 +0200
Adding upstream version 1.4.0.
diff --git a/CHANGELOG b/CHANGELOG
index 1931a0a..9ac2994 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,2 +1,5 @@
+Version 1.4.0 - 2009-10-19
+* Bug fixes (see mercurial logs for details)
+
Version 1.2.0 - 2009-07-28
* Initial release
diff --git a/MANIFEST.in b/MANIFEST.in
index 5343ad8..dcb2afa 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -7,3 +7,4 @@ include LICENSE
include *.xml
include *.odt
include *.csv
+include doc/*
diff --git a/PKG-INFO b/PKG-INFO
index c036215..11e055a 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.0
Name: trytond_product_cost_fifo
-Version: 1.2.0
+Version: 1.4.0
Summary: Add FIFO cost method on the product form.
Once installed, the price of the stock moves from a supplier or to a
customer will update automatically the cost price of the related
@@ -10,7 +10,7 @@ Home-page: http://www.tryton.org/
Author: B2CK
Author-email: info at b2ck.com
License: GPL-3
-Download-URL: http://downloads.tryton.org/1.2/
+Download-URL: http://downloads.tryton.org/1.4/
Description: UNKNOWN
Platform: UNKNOWN
Classifier: Development Status :: 5 - Production/Stable
diff --git a/__tryton__.py b/__tryton__.py
index c343883..2b335ed 100644
--- a/__tryton__.py
+++ b/__tryton__.py
@@ -2,11 +2,11 @@
#this repository contains the full copyright notices and license terms.
{
'name': 'Product Cost FIFO',
- 'name_fr_FR': 'Prix de revient produit FIFO',
'name_de_DE': 'Artikel Kostenpreisermittlung FIFO',
- 'name_es_ES': 'Coste FIFO de producto',
'name_es_CO': 'Costo FIFO de producto',
- 'version': '1.2.0',
+ 'name_es_ES': 'Coste FIFO de producto',
+ 'name_fr_FR': 'Prix de revient produit FIFO',
+ 'version': '1.4.0',
'author': 'B2CK',
'email': 'info at b2ck.com',
'website': 'http://www.tryton.org/',
@@ -15,11 +15,6 @@ Once installed, the price of the stock moves from a supplier or to a
customer will update automatically the cost price of the related
product (if the cost price method is FIFO)
''',
- 'description_fr_FR':'''Ajoute 'FIFO' parmi les méthodes de coût du produit.
-Une fois le module installé, le prix de chaque mouvement de stock
-depuis un fournisseur ou vers un client modifiera automatiquement le
-prix de revient du produit concerné (si la méthode de coût est FIFO).
-''',
'description_de_DE':'''Kostenpreisermittlung für Artikel nach Methode 'FIFO'
- Fügt 'FIFO' (First In - First Out) zu den Methoden für die
Kostenpreisermittlung für Artikel hinzu.
@@ -27,15 +22,20 @@ prix de revient du produit concerné (si la méthode de coût est FIFO).
den die Methode FIFO gewählt wurde) automatisch bei jeder Lagerbewegung
von einem Lieferanten oder zu einem Kunden angepasst.
''',
+ 'description_es_CO': '''Añade el método de costo FIFO al formulario de producto.
+Cuando está instalado, el precio de los movimientos de stock desde un proveedor
+o a un cliente actualizarán automáticamente el precio de costo del producto
+relacionado (Si método del costo de producto es FIFO)
+''',
'description_es_ES': '''Añade el método de coste FIFO en el formulario de producto.
Una vez instalado, el precio de los movimientos de stock desde un proveedor o
a un cliente actualizará automáticamente el precio de coste del producto
relacionado (si el método de cálculo del precio de coste es FIFO)
''',
- 'description_es_CO': '''Añade el método de costo FIFO al formulario de producto.
-Cuando está instalado, el precio de los movimientos de stock desde un proveedor
-o a un cliente actualizarán automáticamente el precio de costo del producto
-relacionado (Si método del costo de producto es FIFO)
+ 'description_fr_FR':'''Ajoute 'FIFO' parmi les méthodes de coût du produit.
+Une fois le module installé, le prix de chaque mouvement de stock
+depuis un fournisseur ou vers un client modifiera automatiquement le
+prix de revient du produit concerné (si la méthode de coût est FIFO).
''',
'depends': [
'ir',
@@ -45,9 +45,9 @@ relacionado (Si método del costo de producto es FIFO)
'xml': [
],
'translation': [
- 'fr_FR.csv',
'de_DE.csv',
- 'es_ES.csv',
'es_CO.csv',
+ 'es_ES.csv',
+ 'fr_FR.csv',
],
}
diff --git a/doc/index.rst b/doc/index.rst
new file mode 100644
index 0000000..cef0ab5
--- /dev/null
+++ b/doc/index.rst
@@ -0,0 +1,12 @@
+Product Cost FIFO Module
+########################
+
+The Product Cost FIFO Module add a *FIFO* option in the Cost Method
+field of the product form.
+
+The cost price of product whose cost price method is *FIFO* will be
+updated automatically when stock moves coming from a supplier or going
+to a customer are made. The page `FIFO and LIFO accounting`_ on
+Wikipedia gives some information about this costing method.
+
+.. _FIFO and LIFO accounting: http://en.wikipedia.org/wiki/FIFO_and_LIFO_accounting
diff --git a/fr_FR.csv b/fr_FR.csv
index eeaca92..0ccebec 100644
--- a/fr_FR.csv
+++ b/fr_FR.csv
@@ -1,5 +1,5 @@
type,name,res_id,src,value,fuzzy
error,stock.move,0,FIFO quantity can not be greater than quantity!,La quantité FIFO ne peut pas être supérieure à la quantité!,0
-error,stock.move,0,You can not delete move that is used for FIFO cost price!,Vous ne pouvez pas supprimer de mouvement qui est utilisé pour le prix de revient FIFO !,0
+error,stock.move,0,You can not delete move that is used for FIFO cost price!,Vous ne pouvez pas supprimer de mouvement utilisé pour le prix de revient FIFO !,0
field,"stock.move,fifo_quantity",0,FIFO Quantity,Quantité FIFO,0
selection,"product.template,cost_price_method",0,FIFO,FIFO,0
diff --git a/move.py b/move.py
index a4a993e..21a4a29 100644
--- a/move.py
+++ b/move.py
@@ -141,7 +141,6 @@ class Move(ModelSQL, ModelView):
move.product.id, move.quantity, move.uom,
move.unit_price, move.currency, move.company,
context=context)
- #XXX update cost price for out move cancelled
elif vals['state'] == 'done':
if move.from_location.type == 'supplier' \
diff --git a/setup.py b/setup.py
index ce3336e..8bdb635 100644
--- a/setup.py
+++ b/setup.py
@@ -9,17 +9,12 @@ info = eval(file('__tryton__.py').read())
requires = []
for dep in info.get('depends', []):
- match = re.compile(
- '(ir|res|workflow|webdav)((\s|$|<|>|<=|>=|==|!=).*?$)').match(dep)
- if match:
- continue
- else:
- dep = 'trytond_' + dep
- requires.append(dep)
+ if not re.match(r'(ir|res|workflow|webdav)(\W|$)', dep):
+ requires.append('trytond_' + dep)
major_version, minor_version, _ = info.get('version', '0.0.1').split('.', 2)
requires.append('trytond >= %s.%s' % (major_version, minor_version))
-requires.append('trytond < %s.%s' % (major_version, str(int(minor_version) + 1)))
+requires.append('trytond < %s.%s' % (major_version, int(minor_version) + 1))
setup(name='trytond_product_cost_fifo',
version=info.get('version', '0.0.1'),
diff --git a/trytond_product_cost_fifo.egg-info/PKG-INFO b/trytond_product_cost_fifo.egg-info/PKG-INFO
index d9a3556..c6f47de 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.0
Name: trytond-product-cost-fifo
-Version: 1.2.0
+Version: 1.4.0
Summary: Add FIFO cost method on the product form.
Once installed, the price of the stock moves from a supplier or to a
customer will update automatically the cost price of the related
@@ -10,7 +10,7 @@ Home-page: http://www.tryton.org/
Author: B2CK
Author-email: info at b2ck.com
License: GPL-3
-Download-URL: http://downloads.tryton.org/1.2/
+Download-URL: http://downloads.tryton.org/1.4/
Description: UNKNOWN
Platform: UNKNOWN
Classifier: Development Status :: 5 - Production/Stable
diff --git a/trytond_product_cost_fifo.egg-info/SOURCES.txt b/trytond_product_cost_fifo.egg-info/SOURCES.txt
index b82cb59..5856328 100644
--- a/trytond_product_cost_fifo.egg-info/SOURCES.txt
+++ b/trytond_product_cost_fifo.egg-info/SOURCES.txt
@@ -13,6 +13,7 @@ setup.py
./__tryton__.py
./move.py
./product.py
+doc/index.rst
trytond_product_cost_fifo.egg-info/PKG-INFO
trytond_product_cost_fifo.egg-info/SOURCES.txt
trytond_product_cost_fifo.egg-info/dependency_links.txt
diff --git a/trytond_product_cost_fifo.egg-info/requires.txt b/trytond_product_cost_fifo.egg-info/requires.txt
index f1efd63..5df9de7 100644
--- a/trytond_product_cost_fifo.egg-info/requires.txt
+++ b/trytond_product_cost_fifo.egg-info/requires.txt
@@ -1,4 +1,4 @@
trytond_product
trytond_stock
-trytond >= 1.2
-trytond < 1.3
\ No newline at end of file
+trytond >= 1.4
+trytond < 1.5
\ No newline at end of file
commit afe961d616ba7804259579cbc4b1ccc33254c66c
Author: Daniel Baumann <daniel at debian.org>
Date: Sun Aug 2 01:06:59 2009 +0200
Adding upstream version 1.2.0.
diff --git a/CHANGELOG b/CHANGELOG
new file mode 100644
index 0000000..1931a0a
--- /dev/null
+++ b/CHANGELOG
@@ -0,0 +1,2 @@
+Version 1.2.0 - 2009-07-28
+* Initial release
diff --git a/COPYRIGHT b/COPYRIGHT
new file mode 100644
index 0000000..853f1f7
--- /dev/null
+++ b/COPYRIGHT
@@ -0,0 +1,15 @@
+Copyright (C) 2008-2009 Cédric Krier.
+Copyright (C) 2008-2009 B2CK SPRL.
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program. If not, see <http://www.gnu.org/licenses/>.
diff --git a/INSTALL b/INSTALL
new file mode 100644
index 0000000..370644c
--- /dev/null
+++ b/INSTALL
@@ -0,0 +1,31 @@
+Installing trytond_product_cost_fifo
+====================================
+
+Prerequisites
+-------------
+
+ * Python 2.4 or later (http://www.python.org/)
+ * trytond (http://www.tryton.org/)
+ * trytond_product (http://www.tryton.org/)
+ * trytond_stock (http://www.tryton.org/)
+
+Installation
+------------
+
+Once you've downloaded and unpacked the trytond_product_cost_fifo source release, enter the
+directory where the archive was unpacked, and run:
+
+ python setup.py install
+
+Note that you may need administrator/root privileges for this step, as
+this command will by default attempt to install module to the Python
+site-packages directory on your system.
+
+For advanced options, please refer to the easy_install and/or the distutils
+documentation:
+
+ http://peak.telecommunity.com/DevCenter/EasyInstall
+ http://docs.python.org/inst/inst.html
+
+To use without installation, extract the archive into ``trytond/modules`` with
+the directory name product_cost_fifo.
diff --git a/LICENSE b/LICENSE
new file mode 100644
index 0000000..94a9ed0
--- /dev/null
+++ b/LICENSE
@@ -0,0 +1,674 @@
+ GNU GENERAL PUBLIC LICENSE
+ Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+ Preamble
+
+ The GNU General Public License is a free, copyleft license for
+software and other kinds of works.
+
+ The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works. By contrast,
+the GNU General Public License is intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users. We, the Free Software Foundation, use the
+GNU General Public License for most of our software; it applies also to
+any other work released this way by its authors. You can apply it to
+your programs, too.
+
+ When we speak of free software, we are referring to freedom, not
+price. Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
+
+ To protect your rights, we need to prevent others from denying you
+these rights or asking you to surrender the rights. Therefore, you have
+certain responsibilities if you distribute copies of the software, or if
+you modify it: responsibilities to respect the freedom of others.
+
+ For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must pass on to the recipients the same
+freedoms that you received. You must make sure that they, too, receive
+or can get the source code. And you must show them these terms so they
+know their rights.
+
+ Developers that use the GNU GPL protect your rights with two steps:
+(1) assert copyright on the software, and (2) offer you this License
+giving you legal permission to copy, distribute and/or modify it.
+
+ For the developers' and authors' protection, the GPL clearly explains
+that there is no warranty for this free software. For both users' and
+authors' sake, the GPL requires that modified versions be marked as
+changed, so that their problems will not be attributed erroneously to
+authors of previous versions.
+
+ Some devices are designed to deny users access to install or run
+modified versions of the software inside them, although the manufacturer
+can do so. This is fundamentally incompatible with the aim of
+protecting users' freedom to change the software. The systematic
+pattern of such abuse occurs in the area of products for individuals to
+use, which is precisely where it is most unacceptable. Therefore, we
+have designed this version of the GPL to prohibit the practice for those
+products. If such problems arise substantially in other domains, we
+stand ready to extend this provision to those domains in future versions
+of the GPL, as needed to protect the freedom of users.
+
+ Finally, every program is threatened constantly by software patents.
+States should not allow patents to restrict development and use of
+software on general-purpose computers, but in those that do, we wish to
+avoid the special danger that patents applied to a free program could
+make it effectively proprietary. To prevent this, the GPL assures that
+patents cannot be used to render the program non-free.
+
+ The precise terms and conditions for copying, distribution and
+modification follow.
+
+ TERMS AND CONDITIONS
+
+ 0. Definitions.
+
+ "This License" refers to version 3 of the GNU General Public License.
+
+ "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+
+ "The Program" refers to any copyrightable work licensed under this
+License. Each licensee is addressed as "you". "Licensees" and
+"recipients" may be individuals or organizations.
+
+ To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy. The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
+
+ A "covered work" means either the unmodified Program or a work based
+on the Program.
+
+ To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy. Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+ To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies. Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
+
+ An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License. If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+ 1. Source Code.
+
+ The "source code" for a work means the preferred form of the work
+for making modifications to it. "Object code" means any non-source
+form of a work.
+
+ A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+ The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form. A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+ The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities. However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work. For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+
+ The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
+
+ The Corresponding Source for a work in source code form is that
+same work.
+
+ 2. Basic Permissions.
+
+ All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met. This License explicitly affirms your unlimited
+permission to run the unmodified Program. The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work. This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+ You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force. You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright. Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
+
+ Conveying under any other circumstances is permitted solely under
+the conditions stated below. Sublicensing is not allowed; section 10
+makes it unnecessary.
+
+ 3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+ No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+ When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+
+ 4. Conveying Verbatim Copies.
+
+ You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+ You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+ 5. Conveying Modified Source Versions.
+
+ You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+
+ a) The work must carry prominent notices stating that you modified
+ it, and giving a relevant date.
+
+ b) The work must carry prominent notices stating that it is
+ released under this License and any conditions added under section
+ 7. This requirement modifies the requirement in section 4 to
+ "keep intact all notices".
+
+ c) You must license the entire work, as a whole, under this
+ License to anyone who comes into possession of a copy. This
+ License will therefore apply, along with any applicable section 7
+ additional terms, to the whole of the work, and all its parts,
+ regardless of how they are packaged. This License gives no
+ permission to license the work in any other way, but it does not
+ invalidate such permission if you have separately received it.
+
+ d) If the work has interactive user interfaces, each must display
+ Appropriate Legal Notices; however, if the Program has interactive
+ interfaces that do not display Appropriate Legal Notices, your
+ work need not make them do so.
+
+ A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit. Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+ 6. Conveying Non-Source Forms.
+
+ You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+
+ a) Convey the object code in, or embodied in, a physical product
+ (including a physical distribution medium), accompanied by the
+ Corresponding Source fixed on a durable physical medium
+ customarily used for software interchange.
+
+ b) Convey the object code in, or embodied in, a physical product
+ (including a physical distribution medium), accompanied by a
+ written offer, valid for at least three years and valid for as
+ long as you offer spare parts or customer support for that product
+ model, to give anyone who possesses the object code either (1) a
+ copy of the Corresponding Source for all the software in the
+ product that is covered by this License, on a durable physical
+ medium customarily used for software interchange, for a price no
+ more than your reasonable cost of physically performing this
+ conveying of source, or (2) access to copy the
+ Corresponding Source from a network server at no charge.
+
+ c) Convey individual copies of the object code with a copy of the
+ written offer to provide the Corresponding Source. This
+ alternative is allowed only occasionally and noncommercially, and
+ only if you received the object code with such an offer, in accord
+ with subsection 6b.
+
+ d) Convey the object code by offering access from a designated
+ place (gratis or for a charge), and offer equivalent access to the
+ Corresponding Source in the same way through the same place at no
+ further charge. You need not require recipients to copy the
+ Corresponding Source along with the object code. If the place to
+ copy the object code is a network server, the Corresponding Source
+ may be on a different server (operated by you or a third party)
+ that supports equivalent copying facilities, provided you maintain
+ clear directions next to the object code saying where to find the
+ Corresponding Source. Regardless of what server hosts the
+ Corresponding Source, you remain obligated to ensure that it is
+ available for as long as needed to satisfy these requirements.
+
+ e) Convey the object code using peer-to-peer transmission, provided
+ you inform other peers where the object code and Corresponding
+ Source of the work are being offered to the general public at no
+ charge under subsection 6d.
+
+ A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+ A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling. In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage. For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product. A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+
+ "Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source. The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
+
+ If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information. But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+ The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed. Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+
+ Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+ 7. Additional Terms.
+
+ "Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law. If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+ When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it. (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.) You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+ Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+
+ a) Disclaiming warranty or limiting liability differently from the
+ terms of sections 15 and 16 of this License; or
+
+ b) Requiring preservation of specified reasonable legal notices or
+ author attributions in that material or in the Appropriate Legal
+ Notices displayed by works containing it; or
+
+ c) Prohibiting misrepresentation of the origin of that material, or
+ requiring that modified versions of such material be marked in
+ reasonable ways as different from the original version; or
+
+ d) Limiting the use for publicity purposes of names of licensors or
+ authors of the material; or
+
+ e) Declining to grant rights under trademark law for use of some
+ trade names, trademarks, or service marks; or
+
+ f) Requiring indemnification of licensors and authors of that
+ material by anyone who conveys the material (or modified versions of
+ it) with contractual assumptions of liability to the recipient, for
+ any liability that these contractual assumptions directly impose on
+ those licensors and authors.
+
+ All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10. If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term. If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+ If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+ Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+ 8. Termination.
+
+ You may not propagate or modify a covered work except as expressly
+provided under this License. Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+ However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+
+ Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+ Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License. If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+ 9. Acceptance Not Required for Having Copies.
+
+ You are not required to accept this License in order to receive or
+run a copy of the Program. Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance. However,
+nothing other than this License grants you permission to propagate or
+modify any covered work. These actions infringe copyright if you do
+not accept this License. Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+ 10. Automatic Licensing of Downstream Recipients.
+
+ Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License. You are not responsible
+for enforcing compliance by third parties with this License.
+
+ An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations. If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+ You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License. For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+ 11. Patents.
+
+ A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based. The
+work thus licensed is called the contributor's "contributor version".
+
+ A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version. For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.
+
+ Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+ In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement). To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+ If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients. "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+ If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+ A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License. You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+
+ Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+ 12. No Surrender of Others' Freedom.
+
+ If conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License. If you cannot convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all. For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
+
+ 13. Use with the GNU Affero General Public License.
+
+ Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU Affero General Public License into a single
+combined work, and to convey the resulting work. The terms of this
+License will continue to apply to the part which is the covered work,
+but the special requirements of the GNU Affero General Public License,
+section 13, concerning interaction through a network will apply to the
+combination as such.
+
+ 14. Revised Versions of this License.
+
+ The Free Software Foundation may publish revised and/or new versions of
+the GNU General Public License from time to time. Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+ Each version is given a distinguishing version number. If the
+Program specifies that a certain numbered version of the GNU General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation. If the Program does not specify a version number of the
+GNU General Public License, you may choose any version ever published
+by the Free Software Foundation.
+
+ If the Program specifies that a proxy can decide which future
+versions of the GNU General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
+
+ Later license versions may give you additional or different
+permissions. However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+ 15. Disclaimer of Warranty.
+
+ THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
+IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+ 16. Limitation of Liability.
+
+ IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
+USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
+DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.
+
+ 17. Interpretation of Sections 15 and 16.
+
+ If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+
+ END OF TERMS AND CONDITIONS
+
+ How to Apply These Terms to Your New Programs
+
+ If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+ To do so, attach the following notices to the program. It is safest
+to attach them to the start of each source file to most effectively
+state the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+ <one line to give the program's name and a brief idea of what it does.>
+ Copyright (C) <year> <name of author>
+
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+Also add information on how to contact you by electronic and paper mail.
+
+ If the program does terminal interaction, make it output a short
+notice like this when it starts in an interactive mode:
+
+ <program> Copyright (C) <year> <name of author>
+ This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+ This is free software, and you are welcome to redistribute it
+ under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License. Of course, your program's commands
+might be different; for a GUI interface, you would use an "about box".
+
+ You should also get your employer (if you work as a programmer) or school,
+if any, to sign a "copyright disclaimer" for the program, if necessary.
+For more information on this, and how to apply and follow the GNU GPL, see
+<http://www.gnu.org/licenses/>.
+
+ The GNU General Public License does not permit incorporating your program
+into proprietary programs. If your program is a subroutine library, you
+may consider it more useful to permit linking proprietary applications with
+the library. If this is what you want to do, use the GNU Lesser General
+Public License instead of this License. But first, please read
+<http://www.gnu.org/philosophy/why-not-lgpl.html>.
diff --git a/MANIFEST.in b/MANIFEST.in
new file mode 100644
index 0000000..5343ad8
--- /dev/null
+++ b/MANIFEST.in
@@ -0,0 +1,9 @@
+include INSTALL
+include README
+include TODO
+include COPYRIGHT
+include CHANGELOG
+include LICENSE
+include *.xml
+include *.odt
+include *.csv
diff --git a/PKG-INFO b/PKG-INFO
new file mode 100644
index 0000000..c036215
--- /dev/null
+++ b/PKG-INFO
@@ -0,0 +1,29 @@
+Metadata-Version: 1.0
+Name: trytond_product_cost_fifo
+Version: 1.2.0
+Summary: Add FIFO cost method on the product form.
+Once installed, the price of the stock moves from a supplier or to a
+customer will update automatically the cost price of the related
+product (if the cost price method is FIFO)
+
+Home-page: http://www.tryton.org/
+Author: B2CK
+Author-email: info at b2ck.com
+License: GPL-3
+Download-URL: http://downloads.tryton.org/1.2/
+Description: UNKNOWN
+Platform: UNKNOWN
+Classifier: Development Status :: 5 - Production/Stable
+Classifier: Environment :: Plugins
+Classifier: Intended Audience :: Developers
+Classifier: Intended Audience :: Financial and Insurance Industry
+Classifier: Intended Audience :: Legal Industry
+Classifier: Intended Audience :: Manufacturing
+Classifier: License :: OSI Approved :: GNU General Public License (GPL)
+Classifier: Natural Language :: English
+Classifier: Natural Language :: French
+Classifier: Natural Language :: German
+Classifier: Natural Language :: Spanish
+Classifier: Operating System :: OS Independent
+Classifier: Programming Language :: Python
+Classifier: Topic :: Office/Business
diff --git a/README b/README
new file mode 100644
index 0000000..e386b0b
--- /dev/null
+++ b/README
@@ -0,0 +1,36 @@
+trytond_product_cost_fifo
+=========================
+
+The product_cost_fifo module of the Tryton application platform.
+See __tryton__.py
+
+Installing
+----------
+
+See INSTALL
+
+Support
+-------
+
+If you encounter any problems with Tryton, please don't hesitate to ask
+questions on the Tryton bug tracker, mailing list, wiki or IRC channel:
+
+ http://bugs.tryton.org/
+ http://groups.tryton.org/
+ http://wiki.tryton.org/
+ irc://irc.freenode.net/tryton
+
+License
+-------
+
+See LICENSE
+
+Copyright
+---------
+
+See COPYRIGHT
+
+
+For more information please visit the Tryton web site:
+
+ http://www.tryton.org/
diff --git a/__init__.py b/__init__.py
new file mode 100644
index 0000000..8eed310
--- /dev/null
+++ b/__init__.py
@@ -0,0 +1,5 @@
+#This file is part of Tryton. The COPYRIGHT file at the top level of
+#this repository contains the full copyright notices and license terms.
+
+from product import *
+from move import *
diff --git a/__tryton__.py b/__tryton__.py
new file mode 100644
index 0000000..c343883
--- /dev/null
+++ b/__tryton__.py
@@ -0,0 +1,53 @@
+#This file is part of Tryton. The COPYRIGHT file at the top level of
+#this repository contains the full copyright notices and license terms.
+{
+ 'name': 'Product Cost FIFO',
+ 'name_fr_FR': 'Prix de revient produit FIFO',
+ 'name_de_DE': 'Artikel Kostenpreisermittlung FIFO',
+ 'name_es_ES': 'Coste FIFO de producto',
+ 'name_es_CO': 'Costo FIFO de producto',
+ 'version': '1.2.0',
+ 'author': 'B2CK',
+ 'email': 'info at b2ck.com',
+ 'website': 'http://www.tryton.org/',
+ 'description': '''Add FIFO cost method on the product form.
+Once installed, the price of the stock moves from a supplier or to a
+customer will update automatically the cost price of the related
+product (if the cost price method is FIFO)
+''',
+ 'description_fr_FR':'''Ajoute 'FIFO' parmi les méthodes de coût du produit.
+Une fois le module installé, le prix de chaque mouvement de stock
+depuis un fournisseur ou vers un client modifiera automatiquement le
+prix de revient du produit concerné (si la méthode de coût est FIFO).
+''',
+ 'description_de_DE':'''Kostenpreisermittlung für Artikel nach Methode 'FIFO'
+ - Fügt 'FIFO' (First In - First Out) zu den Methoden für die
+ Kostenpreisermittlung für Artikel hinzu.
+ - Nach Installation dieses Moduls wird der Kostenpreis eines Artikels (für
+ den die Methode FIFO gewählt wurde) automatisch bei jeder Lagerbewegung
+ von einem Lieferanten oder zu einem Kunden angepasst.
+''',
+ 'description_es_ES': '''Añade el método de coste FIFO en el formulario de producto.
+Una vez instalado, el precio de los movimientos de stock desde un proveedor o
+a un cliente actualizará automáticamente el precio de coste del producto
+relacionado (si el método de cálculo del precio de coste es FIFO)
+''',
+ 'description_es_CO': '''Añade el método de costo FIFO al formulario de producto.
+Cuando está instalado, el precio de los movimientos de stock desde un proveedor
+o a un cliente actualizarán automáticamente el precio de costo del producto
+relacionado (Si método del costo de producto es FIFO)
+''',
+ 'depends': [
+ 'ir',
+ 'product',
+ 'stock',
+ ],
+ 'xml': [
+ ],
+ 'translation': [
+ 'fr_FR.csv',
+ 'de_DE.csv',
+ 'es_ES.csv',
+ 'es_CO.csv',
+ ],
+}
diff --git a/de_DE.csv b/de_DE.csv
new file mode 100644
index 0000000..5544f2c
--- /dev/null
+++ b/de_DE.csv
@@ -0,0 +1,5 @@
+type,name,res_id,src,value,fuzzy
+error,stock.move,0,FIFO quantity can not be greater than quantity!,FIFO Anzahl kann nicht größer als Anzahl sein!,0
+error,stock.move,0,You can not delete move that is used for FIFO cost price!,"Eine Bewegung, die Bestandteil einer Kostenpreisermittlung nach FIFO ist, kann nicht gelöscht werden!",0
+field,"stock.move,fifo_quantity",0,FIFO Quantity,Anzahl FIFO,0
+selection,"product.template,cost_price_method",0,FIFO,FIFO,0
diff --git a/es_CO.csv b/es_CO.csv
new file mode 100644
index 0000000..9f3ee40
--- /dev/null
+++ b/es_CO.csv
@@ -0,0 +1,5 @@
+type,name,res_id,src,value,fuzzy
+error,stock.move,0,FIFO quantity can not be greater than quantity!,¡Cantidad FIFO no puede ser mayor que la cantidad!,0
+error,stock.move,0,You can not delete move that is used for FIFO cost price!,¡No puede borrar un movimiento que es usado por el precio de costo de FIFO!,0
+field,"stock.move,fifo_quantity",0,FIFO Quantity,Cantidad FIFO,0
+selection,"product.template,cost_price_method",0,FIFO,FIFO,0
diff --git a/es_ES.csv b/es_ES.csv
new file mode 100644
index 0000000..42f8798
--- /dev/null
+++ b/es_ES.csv
@@ -0,0 +1,5 @@
+type,name,res_id,src,value,fuzzy
+error,stock.move,0,FIFO quantity can not be greater than quantity!,La cantidad FIFO no puede se mayor que «cantidad»,0
+error,stock.move,0,You can not delete move that is used for FIFO cost price!,No puede borrar un movimiento que se utiliza para el cálculo FIFO del precio de coste,0
+field,"stock.move,fifo_quantity",0,FIFO Quantity,Cantidad FIFO,0
+selection,"product.template,cost_price_method",0,FIFO,FIFO,0
diff --git a/fr_FR.csv b/fr_FR.csv
new file mode 100644
index 0000000..eeaca92
--- /dev/null
+++ b/fr_FR.csv
@@ -0,0 +1,5 @@
+type,name,res_id,src,value,fuzzy
+error,stock.move,0,FIFO quantity can not be greater than quantity!,La quantité FIFO ne peut pas être supérieure à la quantité!,0
+error,stock.move,0,You can not delete move that is used for FIFO cost price!,Vous ne pouvez pas supprimer de mouvement qui est utilisé pour le prix de revient FIFO !,0
+field,"stock.move,fifo_quantity",0,FIFO Quantity,Quantité FIFO,0
+selection,"product.template,cost_price_method",0,FIFO,FIFO,0
diff --git a/move.py b/move.py
new file mode 100644
index 0000000..a4a993e
--- /dev/null
+++ b/move.py
@@ -0,0 +1,178 @@
+#This file is part of Tryton. The COPYRIGHT file at the top level of
+#this repository contains the full copyright notices and license terms.
+from trytond.model import ModelView, ModelSQL, fields
+from decimal import Decimal
+
+
+class Move(ModelSQL, ModelView):
+ _name = 'stock.move'
+ fifo_quantity = fields.Float('FIFO Quantity',
+ digits="(16, unit_digits)")
+
+ def __init__(self):
+ super(Move, self).__init__()
+ self._sql_constraints += [
+ ('check_fifo_quantity_out',
+ 'CHECK(quantity >= fifo_quantity)',
+ 'FIFO quantity can not be greater than quantity!'),
+ ]
+ self._error_messages.update({
+ 'del_move_fifo': 'You can not delete move that is used ' \
+ 'for FIFO cost price!',
+ })
+
+ def default_fifo_quantity_out(self, cursor, user, context=None):
+ return 0.0
+
+ def _update_fifo_out_product_cost_price(self, cursor, user, product,
+ quantity, uom, context=None):
+ '''
+ Update the product cost price of the given product. Update
+ fifo_quantity on the concerned incomming moves. Return the
+ cost price for outputing the given product and quantity.
+
+ :param cursor: the database cursor
+ :param user: the user id
+ :param product: a BrowseRecord of the product
+ :param quantity: the quantity of the outgoing product
+ :param uom: the uom id or a BrowseRecord of the uom
+ :param context: the context
+ :return: cost_price (of type decimal)
+ '''
+
+ template_obj = self.pool.get('product.template')
+ uom_obj = self.pool.get('product.uom')
+
+ if isinstance(uom, (int, long)):
+ uom = uom_obj.browse(cursor, user, uom, context=context)
+
+ total_qty = uom_obj.compute_qty(
+ cursor, user, uom, quantity, product.default_uom, round=False,
+ context=context)
+
+ fifo_moves = template_obj.get_fifo_move(
+ cursor, user, product.template.id, total_qty, context=context)
+
+
+ cost_price = Decimal("0.0")
+ consumed_qty = 0.0
+ for move, move_qty in fifo_moves:
+ consumed_qty += move_qty
+
+ move_unit_price = uom_obj.compute_price(
+ cursor, user, move.uom, move.unit_price,
+ move.product.default_uom, context=context)
+ cost_price += move_unit_price * Decimal(str(move_qty))
+
+ self._update_product_cost_price(
+ cursor, user, product.id, -move_qty, product.default_uom,
+ move_unit_price, move.currency, move.company, context=context)
+
+ move_qty = uom_obj.compute_qty(
+ cursor, user, product.default_uom, move_qty, move.uom,
+ round=False, context=context)
+ self.write(
+ cursor, user, move.id,
+ {'fifo_quantity': (move.fifo_quantity or 0.0) + move_qty},
+ context=context)
+
+
+ if Decimal(str(consumed_qty)) != Decimal("0"):
+ cost_price = cost_price / Decimal(str(consumed_qty))
+
+ if cost_price != Decimal("0"):
+ return cost_price
+ else:
+ return product.cost_price
+
+ def create(self, cursor, user, vals, context=None):
+ location_obj = self.pool.get('stock.location')
+ product_obj = self.pool.get('product.product')
+ uom_obj = self.pool.get('product.uom')
+
+ if vals.get('state') == 'done':
+ from_location = location_obj.browse(cursor, user,
+ vals['from_location'], context=context)
+ to_location = location_obj.browse(cursor, user,
+ vals['to_location'], context=context)
+ product = product_obj.browse(cursor, user, vals['product'],
+ context=context)
+ if from_location.type == 'supplier' \
+ and product.cost_price_method == 'fifo':
+ self._update_product_cost_price(cursor, user,
+ vals['product'], vals['quantity'], vals['uom'],
+ vals['unit_price'], vals['currency'],
+ context=context)
+ if to_location.type == 'supplier' \
+ and product.cost_price_method == 'fifo':
+ self._update_product_cost_price(cursor, user,
+ vals['product'], -vals['quantity'], vals['uom'],
+ vals['unit_price'], vals['currency'],
+ context=context)
+ if to_location.type != 'storage' \
+ and to_location.type != 'supplier' \
+ and product.cost_price_method == 'fifo':
+
+ cost_price = self._update_fifo_out_product_cost_price(
+ cursor, user, product, vals['quantity'], vals['uom'],
+ context=context)
+ if not vals.get('cost_price'):
+ vals['cost_price'] = cost_price
+
+ return super(Move, self).create(cursor, user, vals, context=context)
+
+ def write(self, cursor, user, ids, vals, context=None):
+ if isinstance(ids, (int, long)):
+ ids = [ids]
+ if 'state' in vals and vals['state'] == 'done':
+ for move in self.browse(cursor, user, ids, context=context):
+ if vals['state'] == 'cancel':
+ if move.from_location.type == 'supplier' \
+ and move.state != 'cancel' \
+ and move.product.cost_price_method == 'fifo':
+ self._update_product_cost_price(cursor, user,
+ move.product.id, -move.quantity, move.uom,
+ move.unit_price, move.currency, move.company,
+ context=context)
+ if move.to_location.type == 'supplier' \
+ and move.state != 'cancel' \
+ and move.product.cost_price_method == 'fifo':
+ self._update_product_cost_price(cursor, user,
+ move.product.id, move.quantity, move.uom,
+ move.unit_price, move.currency, move.company,
+ context=context)
+ #XXX update cost price for out move cancelled
+
+ elif vals['state'] == 'done':
+ if move.from_location.type == 'supplier' \
+ and move.state != 'done' \
+ and move.product.cost_price_method == 'fifo':
+ self._update_product_cost_price(cursor, user,
+ move.product.id, move.quantity, move.uom,
+ move.unit_price, move.currency, move.company,
+ context=context)
+ if move.to_location.type == 'supplier' \
+ and move.state != 'done' \
+ and move.product.cost_price_method == 'fifo':
+ self._update_product_cost_price(cursor, user,
+ move.product.id, -move.quantity, move.uom,
+ move.unit_price, move.currency, move.company,
+ context=context)
+ if move.to_location.type != 'storage' \
+ and move.to_location.type != 'supplier' \
+ and move.product.cost_price_method == 'fifo':
+ cost_price = self._update_fifo_out_product_cost_price(
+ cursor, user, move.product, move.quantity,
+ move.uom, context=context)
+ if not vals.get('cost_price'):
+ vals['cost_price'] = cost_price
+ return super(Move, self).write(cursor, user, ids, vals, context=context)
+
+ def delete(self, cursor, user, ids, context=None):
+ if self.search(cursor, user, [
+ ('id', 'in', ids),
+ ('fifo_quantity', '!=', 0.0),
+ ], context=context):
+ self.raise_user_error(cursor, 'del_move_fifo', context=context)
+ return super(Move, self).delete(cursor, user, ids, context=context)
+Move()
diff --git a/product.py b/product.py
new file mode 100644
index 0000000..bc488ac
--- /dev/null
+++ b/product.py
@@ -0,0 +1,80 @@
+#This file is part of Tryton. The COPYRIGHT file at the top level of
+#this repository contains the full copyright notices and license terms.
+from trytond.model import ModelView, ModelSQL, fields
+import copy
+import datetime
+
+
+class Template(ModelSQL, ModelView):
+ _name = "product.template"
+
+ def __init__(self):
+ super(Template, self).__init__()
+ new_sel = ('fifo', 'FIFO')
+ if new_sel not in self.cost_price_method.selection:
+ self.cost_price_method = copy.copy(self.cost_price_method)
+ self.cost_price_method.selection.append(new_sel)
+ self._reset_columns()
+
+ def get_fifo_move(self, cursor, user, template_id, quantity=0.0,
+ context=None):
+ '''
+ Return a list of (move, qty) where move is the move to be
+ consumed and qty is the quantity (in the product default uom)
+ to be consumed on this move. The list contains the "first in"
+ moves for the given quantity.
+
+ :param cursor: the database cursor
+ :param user: the user id
+ :param template_id: the product template id
+ :param quantity: the quantity to be removed from the stock
+ :param context: the context
+ :return: list of (move, qty) where move is a browse record,
+ qty is a float
+ '''
+ move_obj = self.pool.get('stock.move')
+ uom_obj = self.pool.get('product.uom')
+ location_obj = self.pool.get('stock.location')
+
+ ctx = context and context.copy() or {}
+ ctx['locations'] = location_obj.search(cursor, user, [
+ ('type', '=', 'storage'),
+ ], context=context)
+ ctx['stock_date_end'] = datetime.date.today()
+
+ template = self.browse(cursor, user, template_id, context=ctx)
+ offset = 0
+ limit = cursor.IN_MAX
+ avail_qty = template.quantity
+ fifo_moves = []
+
+ while avail_qty > 0.0:
+ move_ids = move_obj.search(cursor, user, [
+ ('product.template.id', '=', template.id),
+ ('state', '=', 'done'),
+ ('from_location.type', '=', 'supplier'),
+ ], offset=offset, limit=limit,
+ order=[('effective_date', 'DESC'), ('id', 'DESC')],
+ context=context)
+ if not move_ids:
+ break
+ offset += limit
+
+ for move in move_obj.browse(cursor, user, move_ids,
+ context=context):
+ qty = uom_obj.compute_qty(cursor, user, move.uom,
+ move.quantity - move.fifo_quantity,
+ template.default_uom, round=False, context=context)
+ avail_qty -= qty
+
+ if avail_qty <= quantity:
+ if avail_qty > 0.0:
+ fifo_moves.append((move, min(qty, quantity - avail_qty)))
+ else:
+ fifo_moves.append((move, min(quantity, qty + avail_qty)))
+ break
+
+ fifo_moves.reverse()
+ return fifo_moves
+
+Template()
diff --git a/setup.cfg b/setup.cfg
new file mode 100644
index 0000000..861a9f5
--- /dev/null
+++ b/setup.cfg
@@ -0,0 +1,5 @@
+[egg_info]
+tag_build =
+tag_date = 0
+tag_svn_revision = 0
+
diff --git a/setup.py b/setup.py
new file mode 100644
index 0000000..ce3336e
--- /dev/null
+++ b/setup.py
@@ -0,0 +1,63 @@
+#!/usr/bin/env python
+#This file is part of Tryton. The COPYRIGHT file at the top level of
+#this repository contains the full copyright notices and license terms.
+
+from setuptools import setup, find_packages
+import re
+
+info = eval(file('__tryton__.py').read())
+
+requires = []
+for dep in info.get('depends', []):
+ match = re.compile(
+ '(ir|res|workflow|webdav)((\s|$|<|>|<=|>=|==|!=).*?$)').match(dep)
+ if match:
+ continue
+ else:
+ dep = 'trytond_' + dep
+ requires.append(dep)
+
+major_version, minor_version, _ = info.get('version', '0.0.1').split('.', 2)
+requires.append('trytond >= %s.%s' % (major_version, minor_version))
+requires.append('trytond < %s.%s' % (major_version, str(int(minor_version) + 1)))
+
+setup(name='trytond_product_cost_fifo',
+ version=info.get('version', '0.0.1'),
+ description=info.get('description', ''),
+ author=info.get('author', ''),
+ author_email=info.get('email', ''),
+ url=info.get('website', ''),
+ download_url="http://downloads.tryton.org/" + \
+ info.get('version', '0.0.1').rsplit('.', 1)[0] + '/',
+ package_dir={'trytond.modules.product_cost_fifo': '.'},
+ packages=[
+ 'trytond.modules.product_cost_fifo',
+ ],
+ package_data={
+ 'trytond.modules.product_cost_fifo': info.get('xml', []) \
+ + info.get('translation', []),
+ },
+ classifiers=[
+ 'Development Status :: 5 - Production/Stable',
+ 'Environment :: Plugins',
+ 'Intended Audience :: Developers',
+ 'Intended Audience :: Financial and Insurance Industry',
+ 'Intended Audience :: Legal Industry',
+ 'Intended Audience :: Manufacturing',
+ 'License :: OSI Approved :: GNU General Public License (GPL)',
+ 'Natural Language :: English',
+ 'Natural Language :: French',
+ 'Natural Language :: German',
+ 'Natural Language :: Spanish',
+ 'Operating System :: OS Independent',
+ 'Programming Language :: Python',
+ 'Topic :: Office/Business',
+ ],
+ license='GPL-3',
+ install_requires=requires,
+ zip_safe=False,
+ entry_points="""
+ [trytond.modules]
+ product_cost_fifo = trytond.modules.product_cost_fifo
+ """,
+)
diff --git a/trytond_product_cost_fifo.egg-info/PKG-INFO b/trytond_product_cost_fifo.egg-info/PKG-INFO
new file mode 100644
index 0000000..d9a3556
--- /dev/null
+++ b/trytond_product_cost_fifo.egg-info/PKG-INFO
@@ -0,0 +1,29 @@
+Metadata-Version: 1.0
+Name: trytond-product-cost-fifo
+Version: 1.2.0
+Summary: Add FIFO cost method on the product form.
+Once installed, the price of the stock moves from a supplier or to a
+customer will update automatically the cost price of the related
+product (if the cost price method is FIFO)
+
+Home-page: http://www.tryton.org/
+Author: B2CK
+Author-email: info at b2ck.com
+License: GPL-3
+Download-URL: http://downloads.tryton.org/1.2/
+Description: UNKNOWN
+Platform: UNKNOWN
+Classifier: Development Status :: 5 - Production/Stable
+Classifier: Environment :: Plugins
+Classifier: Intended Audience :: Developers
+Classifier: Intended Audience :: Financial and Insurance Industry
+Classifier: Intended Audience :: Legal Industry
+Classifier: Intended Audience :: Manufacturing
+Classifier: License :: OSI Approved :: GNU General Public License (GPL)
+Classifier: Natural Language :: English
+Classifier: Natural Language :: French
+Classifier: Natural Language :: German
+Classifier: Natural Language :: Spanish
+Classifier: Operating System :: OS Independent
+Classifier: Programming Language :: Python
+Classifier: Topic :: Office/Business
diff --git a/trytond_product_cost_fifo.egg-info/SOURCES.txt b/trytond_product_cost_fifo.egg-info/SOURCES.txt
new file mode 100644
index 0000000..b82cb59
--- /dev/null
+++ b/trytond_product_cost_fifo.egg-info/SOURCES.txt
@@ -0,0 +1,22 @@
+CHANGELOG
+COPYRIGHT
+INSTALL
+LICENSE
+MANIFEST.in
+README
+de_DE.csv
+es_CO.csv
+es_ES.csv
+fr_FR.csv
+setup.py
+./__init__.py
+./__tryton__.py
+./move.py
+./product.py
+trytond_product_cost_fifo.egg-info/PKG-INFO
+trytond_product_cost_fifo.egg-info/SOURCES.txt
+trytond_product_cost_fifo.egg-info/dependency_links.txt
+trytond_product_cost_fifo.egg-info/entry_points.txt
+trytond_product_cost_fifo.egg-info/not-zip-safe
+trytond_product_cost_fifo.egg-info/requires.txt
+trytond_product_cost_fifo.egg-info/top_level.txt
\ No newline at end of file
diff --git a/trytond_product_cost_fifo.egg-info/dependency_links.txt b/trytond_product_cost_fifo.egg-info/dependency_links.txt
new file mode 100644
index 0000000..8b13789
--- /dev/null
+++ b/trytond_product_cost_fifo.egg-info/dependency_links.txt
@@ -0,0 +1 @@
+
diff --git a/trytond_product_cost_fifo.egg-info/entry_points.txt b/trytond_product_cost_fifo.egg-info/entry_points.txt
new file mode 100644
index 0000000..913b57b
--- /dev/null
+++ b/trytond_product_cost_fifo.egg-info/entry_points.txt
@@ -0,0 +1,4 @@
+
+ [trytond.modules]
+ product_cost_fifo = trytond.modules.product_cost_fifo
+
\ No newline at end of file
diff --git a/trytond_product_cost_fifo.egg-info/not-zip-safe b/trytond_product_cost_fifo.egg-info/not-zip-safe
new file mode 100644
index 0000000..8b13789
--- /dev/null
+++ b/trytond_product_cost_fifo.egg-info/not-zip-safe
@@ -0,0 +1 @@
+
diff --git a/trytond_product_cost_fifo.egg-info/requires.txt b/trytond_product_cost_fifo.egg-info/requires.txt
new file mode 100644
index 0000000..f1efd63
--- /dev/null
+++ b/trytond_product_cost_fifo.egg-info/requires.txt
@@ -0,0 +1,4 @@
+trytond_product
+trytond_stock
+trytond >= 1.2
+trytond < 1.3
\ No newline at end of file
diff --git a/trytond_product_cost_fifo.egg-info/top_level.txt b/trytond_product_cost_fifo.egg-info/top_level.txt
new file mode 100644
index 0000000..93df119
--- /dev/null
+++ b/trytond_product_cost_fifo.egg-info/top_level.txt
@@ -0,0 +1 @@
+trytond
--
tryton-modules-product-cost-fifo
More information about the tryton-debian-vcs
mailing list