[tryton-debian-vcs] tryton-modules-stock-lot branch upstream updated. upstream/3.6.0-1-g0c36d8a
Mathias Behrle
tryton-debian-vcs at alioth.debian.org
Wed Nov 11 11:29:29 UTC 2015
The following commit has been merged in the upstream branch:
https://alioth.debian.org/plugins/scmgit/cgi-bin/gitweb.cgi/?p=tryton/tryton-modules-stock-lot.git;a=commitdiff;h=upstream/3.6.0-1-g0c36d8a
commit 0c36d8a798bbf6ad5deecb515074c6da488f4656
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Wed Nov 11 12:11:19 2015 +0100
Adding upstream version 3.8.0.
Signed-off-by: Mathias Behrle <mathiasb at m9s.biz>
diff --git a/CHANGELOG b/CHANGELOG
index 7e27a30..0ce2542 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,7 @@
+Version 3.8.0 - 2015-11-02
+* Bug fixes (see mercurial logs for details)
+* Adapt inventory to use grouping
+
Version 3.6.0 - 2015-04-20
* Bug fixes (see mercurial logs for details)
* Add support for PyPy
diff --git a/PKG-INFO b/PKG-INFO
index 5225c24..7c70679 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,12 +1,12 @@
Metadata-Version: 1.1
Name: trytond_stock_lot
-Version: 3.6.0
+Version: 3.8.0
Summary: Tryton module for lot of products
Home-page: http://www.tryton.org/
Author: Tryton
Author-email: issue_tracker at tryton.org
License: GPL-3
-Download-URL: http://downloads.tryton.org/3.6/
+Download-URL: http://downloads.tryton.org/3.8/
Description: trytond_stock_lot
=================
@@ -60,6 +60,9 @@ Classifier: Natural Language :: Dutch
Classifier: Natural Language :: English
Classifier: Natural Language :: French
Classifier: Natural Language :: German
+Classifier: Natural Language :: Hungarian
+Classifier: Natural Language :: Italian
+Classifier: Natural Language :: Portuguese (Brazilian)
Classifier: Natural Language :: Russian
Classifier: Natural Language :: Slovenian
Classifier: Natural Language :: Spanish
diff --git a/locale/bg_BG.po b/locale/bg_BG.po
index 86246b6..13f7401 100644
--- a/locale/bg_BG.po
+++ b/locale/bg_BG.po
@@ -237,10 +237,6 @@ msgctxt "model:stock.period.cache.lot,name:"
msgid "Stock Period Cache per Lot"
msgstr ""
-msgctxt "view:product.product:"
-msgid "Lots"
-msgstr "Партиди"
-
#, fuzzy
msgctxt "view:product.template:"
msgid "Lots"
diff --git a/locale/ca_ES.po b/locale/ca_ES.po
index 64b5923..745578f 100644
--- a/locale/ca_ES.po
+++ b/locale/ca_ES.po
@@ -4,7 +4,7 @@ msgstr "Content-Type: text/plain; charset=utf-8\n"
msgctxt "error:stock.move:"
msgid "Lot is required for move of product \"%s\"."
-msgstr "El lot és requerit pel moviment del producte \"%s\"."
+msgstr "El lot pel moviment del producte \"%s\" és obligatori."
msgctxt "field:product.template,lot_required:"
msgid "Lot Required"
@@ -204,7 +204,7 @@ msgstr "Client"
msgctxt "model:stock.lot.type,name:type_lost_found"
msgid "Lost and Found"
-msgstr "Perdut/trobat"
+msgstr "Perdut-trobat"
msgctxt "model:stock.lot.type,name:type_production"
msgid "Production"
@@ -222,10 +222,6 @@ msgctxt "model:stock.period.cache.lot,name:"
msgid "Stock Period Cache per Lot"
msgstr "Període d'estoc precalculat per lot"
-msgctxt "view:product.product:"
-msgid "Lots"
-msgstr "Lots"
-
msgctxt "view:product.template:"
msgid "Lots"
msgstr "Lots"
diff --git a/locale/cs_CZ.po b/locale/cs_CZ.po
index 6aa20b9..87364b4 100644
--- a/locale/cs_CZ.po
+++ b/locale/cs_CZ.po
@@ -225,10 +225,6 @@ msgctxt "model:stock.period.cache.lot,name:"
msgid "Stock Period Cache per Lot"
msgstr ""
-msgctxt "view:product.product:"
-msgid "Lots"
-msgstr ""
-
msgctxt "view:product.template:"
msgid "Lots"
msgstr ""
diff --git a/locale/de_DE.po b/locale/de_DE.po
index f723792..dfa1958 100644
--- a/locale/de_DE.po
+++ b/locale/de_DE.po
@@ -4,7 +4,7 @@ msgstr "Content-Type: text/plain; charset=utf-8\n"
msgctxt "error:stock.move:"
msgid "Lot is required for move of product \"%s\"."
-msgstr "Chargen-Nummer erforderlich für Lagerbewegung von Artikel \"%s\"."
+msgstr "Chargen-Nummer erforderlich für Lagerbewegung von Variante \"%s\"."
msgctxt "field:product.template,lot_required:"
msgid "Lot Required"
@@ -68,7 +68,7 @@ msgstr "Nummer"
msgctxt "field:stock.lot,product:"
msgid "Product"
-msgstr "Artikel"
+msgstr "Variante"
msgctxt "field:stock.lot,quantity:"
msgid "Quantity"
@@ -156,7 +156,7 @@ msgstr "Lagerperiode"
msgctxt "field:stock.period.cache.lot,product:"
msgid "Product"
-msgstr "Artikel"
+msgstr "Variante"
msgctxt "field:stock.period.cache.lot,rec_name:"
msgid "Name"
diff --git a/locale/es_AR.po b/locale/es_AR.po
index 3304a3d..3c8c249 100644
--- a/locale/es_AR.po
+++ b/locale/es_AR.po
@@ -222,10 +222,6 @@ msgctxt "model:stock.period.cache.lot,name:"
msgid "Stock Period Cache per Lot"
msgstr "Período de stock precalculado por lote"
-msgctxt "view:product.product:"
-msgid "Lots"
-msgstr "Lotes"
-
msgctxt "view:product.template:"
msgid "Lots"
msgstr "Lotes"
diff --git a/locale/es_CO.po b/locale/es_CO.po
index d70f042..358e79e 100644
--- a/locale/es_CO.po
+++ b/locale/es_CO.po
@@ -222,10 +222,6 @@ msgctxt "model:stock.period.cache.lot,name:"
msgid "Stock Period Cache per Lot"
msgstr "Cache de Periodo de Inventarios por Lote"
-msgctxt "view:product.product:"
-msgid "Lots"
-msgstr "Lotes"
-
msgctxt "view:product.template:"
msgid "Lots"
msgstr "Lotes"
diff --git a/locale/es_EC.po b/locale/es_EC.po
index d016819..ab8a8e1 100644
--- a/locale/es_EC.po
+++ b/locale/es_EC.po
@@ -8,15 +8,15 @@ msgstr "El lote es requerido para el movimiento del producto \"%s\"."
msgctxt "field:product.template,lot_required:"
msgid "Lot Required"
-msgstr "Lote Requerido"
+msgstr "Lote requerido"
msgctxt "field:product.template-stock.lot.type,create_date:"
msgid "Create Date"
-msgstr "Fecha de Creación"
+msgstr "Fecha de creación"
msgctxt "field:product.template-stock.lot.type,create_uid:"
msgid "Create User"
-msgstr "Creado por Usuario"
+msgstr "Creado por usuario"
msgctxt "field:product.template-stock.lot.type,id:"
msgid "ID"
@@ -36,11 +36,11 @@ msgstr "Tipo"
msgctxt "field:product.template-stock.lot.type,write_date:"
msgid "Write Date"
-msgstr "Fecha de Modificación"
+msgstr "Fecha de modificación"
msgctxt "field:product.template-stock.lot.type,write_uid:"
msgid "Write User"
-msgstr "Modificado por Usuario"
+msgstr "Modificado por usuario"
msgctxt "field:stock.inventory.line,lot:"
msgid "Lot"
@@ -48,15 +48,15 @@ msgstr "Lote"
msgctxt "field:stock.lot,create_date:"
msgid "Create Date"
-msgstr "Fecha de Creación"
+msgstr "Fecha de creación"
msgctxt "field:stock.lot,create_uid:"
msgid "Create User"
-msgstr "Creado por Usuario"
+msgstr "Creado por usuario"
msgctxt "field:stock.lot,forecast_quantity:"
msgid "Forecast Quantity"
-msgstr "Cantidad Prevista"
+msgstr "Cantidad prevista"
msgctxt "field:stock.lot,id:"
msgid "ID"
@@ -80,11 +80,11 @@ msgstr "Nombre"
msgctxt "field:stock.lot,write_date:"
msgid "Write Date"
-msgstr "Fecha de Modificación"
+msgstr "Fecha de modificación"
msgctxt "field:stock.lot,write_uid:"
msgid "Write User"
-msgstr "Modificado por Usuario"
+msgstr "Modificado por usuario"
msgctxt "field:stock.lot.type,code:"
msgid "Code"
@@ -92,11 +92,11 @@ msgstr "Código"
msgctxt "field:stock.lot.type,create_date:"
msgid "Create Date"
-msgstr "Fecha de Creación"
+msgstr "Fecha de creación"
msgctxt "field:stock.lot.type,create_uid:"
msgid "Create User"
-msgstr "Creado por Usuario"
+msgstr "Creado por usuario"
msgctxt "field:stock.lot.type,id:"
msgid "ID"
@@ -112,11 +112,11 @@ msgstr "Nombre"
msgctxt "field:stock.lot.type,write_date:"
msgid "Write Date"
-msgstr "Fecha de Modificación"
+msgstr "Fecha de modificación"
msgctxt "field:stock.lot.type,write_uid:"
msgid "Write User"
-msgstr "Modificado por Usuario"
+msgstr "Modificado por usuario"
msgctxt "field:stock.move,lot:"
msgid "Lot"
@@ -124,15 +124,15 @@ msgstr "Lote"
msgctxt "field:stock.period,lot_caches:"
msgid "Lot Caches"
-msgstr "Caches de Lote"
+msgstr "Lote precalculado"
msgctxt "field:stock.period.cache.lot,create_date:"
msgid "Create Date"
-msgstr "Fecha de Creación"
+msgstr "Fecha de creación"
msgctxt "field:stock.period.cache.lot,create_uid:"
msgid "Create User"
-msgstr "Creado por Usuario"
+msgstr "Creado por usuario"
msgctxt "field:stock.period.cache.lot,id:"
msgid "ID"
@@ -140,11 +140,11 @@ msgstr "ID"
msgctxt "field:stock.period.cache.lot,internal_quantity:"
msgid "Internal Quantity"
-msgstr "Cantidad Interna"
+msgstr "Cantidad interna"
msgctxt "field:stock.period.cache.lot,location:"
msgid "Location"
-msgstr "Bodega"
+msgstr "Ubicación"
msgctxt "field:stock.period.cache.lot,lot:"
msgid "Lot"
@@ -164,15 +164,15 @@ msgstr "Nombre"
msgctxt "field:stock.period.cache.lot,write_date:"
msgid "Write Date"
-msgstr "Fecha de Modificación"
+msgstr "Fecha de modificación"
msgctxt "field:stock.period.cache.lot,write_uid:"
msgid "Write User"
-msgstr "Modificado por Usuario"
+msgstr "Modificado por usuario"
msgctxt "help:product.template,lot_required:"
msgid "The type of location for which lot is required"
-msgstr "El tipo de bodega para la cual el lote es requerido"
+msgstr "El tipo de ubicación para la cual el lote es requerido"
msgctxt "model:ir.action,name:act_lot_form"
msgid "Lots"
@@ -188,15 +188,15 @@ msgstr "Lotes"
msgctxt "model:product.template-stock.lot.type,name:"
msgid "Template - Stock Lot Type"
-msgstr "Plantilla - Tipo de Lote"
+msgstr "Plantilla - Tipo de lote de stock"
msgctxt "model:stock.lot,name:"
msgid "Stock Lot"
-msgstr "Lote de Existencias"
+msgstr "Lote de stock"
msgctxt "model:stock.lot.type,name:"
msgid "Stock Lot Type"
-msgstr "Tipo de Lote de Existencias"
+msgstr "Tipo de lote de stock"
msgctxt "model:stock.lot.type,name:type_customer"
msgid "Customer"
@@ -204,7 +204,7 @@ msgstr "Cliente"
msgctxt "model:stock.lot.type,name:type_lost_found"
msgid "Lost and Found"
-msgstr "Perdido y Encontrado"
+msgstr "Perdido y encontrado"
msgctxt "model:stock.lot.type,name:type_production"
msgid "Production"
@@ -212,7 +212,7 @@ msgstr "Producción"
msgctxt "model:stock.lot.type,name:type_storage"
msgid "Storage"
-msgstr "Almacén"
+msgstr "Almacenamiento"
msgctxt "model:stock.lot.type,name:type_supplier"
msgid "Supplier"
@@ -220,11 +220,7 @@ msgstr "Proveedor"
msgctxt "model:stock.period.cache.lot,name:"
msgid "Stock Period Cache per Lot"
-msgstr "Cache de Período de Existencias por Lote"
-
-msgctxt "view:product.product:"
-msgid "Lots"
-msgstr "Lotes"
+msgstr "Período de stock precalculado por lote"
msgctxt "view:product.template:"
msgid "Lots"
@@ -240,8 +236,8 @@ msgstr "Lotes"
msgctxt "view:stock.period.cache.lot:"
msgid "Period Lot Cache"
-msgstr "Cache de Período Lote"
+msgstr "Período de lote precalculado"
msgctxt "view:stock.period.cache.lot:"
msgid "Period Lot Caches"
-msgstr "Caches de Período Lote"
+msgstr "Período de lote precalculados"
diff --git a/locale/es_ES.po b/locale/es_ES.po
index 6c766d0..fcdeff0 100644
--- a/locale/es_ES.po
+++ b/locale/es_ES.po
@@ -4,11 +4,11 @@ msgstr "Content-Type: text/plain; charset=utf-8\n"
msgctxt "error:stock.move:"
msgid "Lot is required for move of product \"%s\"."
-msgstr "El lote es requerido para el movimiento del producto \"%s\"."
+msgstr "El lote para el movimiento del producto \"%s\" es obligatorio."
msgctxt "field:product.template,lot_required:"
msgid "Lot Required"
-msgstr "Lote requerido"
+msgstr "Lote obligatorio"
msgctxt "field:product.template-stock.lot.type,create_date:"
msgid "Create Date"
@@ -172,7 +172,7 @@ msgstr "Usuario modificación"
msgctxt "help:product.template,lot_required:"
msgid "The type of location for which lot is required"
-msgstr "El tipo de ubicación por cada lote es requerido."
+msgstr "El tipo de ubicación en la que el lote es obligatorio."
msgctxt "model:ir.action,name:act_lot_form"
msgid "Lots"
@@ -204,7 +204,7 @@ msgstr "Cliente"
msgctxt "model:stock.lot.type,name:type_lost_found"
msgid "Lost and Found"
-msgstr "Perdido/encontrado"
+msgstr "Perdido-encontrado"
msgctxt "model:stock.lot.type,name:type_production"
msgid "Production"
@@ -222,10 +222,6 @@ msgctxt "model:stock.period.cache.lot,name:"
msgid "Stock Period Cache per Lot"
msgstr "Período de stock precalculado por lote"
-msgctxt "view:product.product:"
-msgid "Lots"
-msgstr "Lotes"
-
msgctxt "view:product.template:"
msgid "Lots"
msgstr "Lotes"
diff --git a/locale/es_ES.po b/locale/es_MX.po
similarity index 95%
copy from locale/es_ES.po
copy to locale/es_MX.po
index 6c766d0..3bd2ac0 100644
--- a/locale/es_ES.po
+++ b/locale/es_MX.po
@@ -220,28 +220,24 @@ msgstr "Proveedor"
msgctxt "model:stock.period.cache.lot,name:"
msgid "Stock Period Cache per Lot"
-msgstr "Período de stock precalculado por lote"
-
-msgctxt "view:product.product:"
-msgid "Lots"
-msgstr "Lotes"
+msgstr "Período de existencias precalculado por lote"
msgctxt "view:product.template:"
msgid "Lots"
-msgstr "Lotes"
+msgstr ""
msgctxt "view:stock.lot:"
msgid "Lot"
-msgstr "Lote"
+msgstr ""
msgctxt "view:stock.lot:"
msgid "Lots"
-msgstr "Lotes"
+msgstr ""
msgctxt "view:stock.period.cache.lot:"
msgid "Period Lot Cache"
-msgstr "Período lote precalculado"
+msgstr ""
msgctxt "view:stock.period.cache.lot:"
msgid "Period Lot Caches"
-msgstr "Período lote precalculados"
+msgstr ""
diff --git a/locale/fr_FR.po b/locale/fr_FR.po
index ddd071f..df3213b 100644
--- a/locale/fr_FR.po
+++ b/locale/fr_FR.po
@@ -222,10 +222,6 @@ msgctxt "model:stock.period.cache.lot,name:"
msgid "Stock Period Cache per Lot"
msgstr "Caches de période de stock par lot"
-msgctxt "view:product.product:"
-msgid "Lots"
-msgstr "Lots"
-
msgctxt "view:product.template:"
msgid "Lots"
msgstr "Lots"
diff --git a/locale/cs_CZ.po b/locale/hu_HU.po
similarity index 97%
copy from locale/cs_CZ.po
copy to locale/hu_HU.po
index 6aa20b9..a45c74c 100644
--- a/locale/cs_CZ.po
+++ b/locale/hu_HU.po
@@ -42,10 +42,9 @@ msgctxt "field:product.template-stock.lot.type,write_uid:"
msgid "Write User"
msgstr ""
-#, fuzzy
msgctxt "field:stock.inventory.line,lot:"
msgid "Lot"
-msgstr "Lot"
+msgstr ""
msgctxt "field:stock.lot,create_date:"
msgid "Create Date"
@@ -119,10 +118,9 @@ msgctxt "field:stock.lot.type,write_uid:"
msgid "Write User"
msgstr ""
-#, fuzzy
msgctxt "field:stock.move,lot:"
msgid "Lot"
-msgstr "Lot"
+msgstr ""
msgctxt "field:stock.period,lot_caches:"
msgid "Lot Caches"
@@ -148,10 +146,9 @@ msgctxt "field:stock.period.cache.lot,location:"
msgid "Location"
msgstr ""
-#, fuzzy
msgctxt "field:stock.period.cache.lot,lot:"
msgid "Lot"
-msgstr "Lot"
+msgstr ""
msgctxt "field:stock.period.cache.lot,period:"
msgid "Period"
@@ -225,18 +222,13 @@ msgctxt "model:stock.period.cache.lot,name:"
msgid "Stock Period Cache per Lot"
msgstr ""
-msgctxt "view:product.product:"
-msgid "Lots"
-msgstr ""
-
msgctxt "view:product.template:"
msgid "Lots"
msgstr ""
-#, fuzzy
msgctxt "view:stock.lot:"
msgid "Lot"
-msgstr "Lot"
+msgstr ""
msgctxt "view:stock.lot:"
msgid "Lots"
diff --git a/locale/cs_CZ.po b/locale/it_IT.po
similarity index 97%
copy from locale/cs_CZ.po
copy to locale/it_IT.po
index 6aa20b9..a45c74c 100644
--- a/locale/cs_CZ.po
+++ b/locale/it_IT.po
@@ -42,10 +42,9 @@ msgctxt "field:product.template-stock.lot.type,write_uid:"
msgid "Write User"
msgstr ""
-#, fuzzy
msgctxt "field:stock.inventory.line,lot:"
msgid "Lot"
-msgstr "Lot"
+msgstr ""
msgctxt "field:stock.lot,create_date:"
msgid "Create Date"
@@ -119,10 +118,9 @@ msgctxt "field:stock.lot.type,write_uid:"
msgid "Write User"
msgstr ""
-#, fuzzy
msgctxt "field:stock.move,lot:"
msgid "Lot"
-msgstr "Lot"
+msgstr ""
msgctxt "field:stock.period,lot_caches:"
msgid "Lot Caches"
@@ -148,10 +146,9 @@ msgctxt "field:stock.period.cache.lot,location:"
msgid "Location"
msgstr ""
-#, fuzzy
msgctxt "field:stock.period.cache.lot,lot:"
msgid "Lot"
-msgstr "Lot"
+msgstr ""
msgctxt "field:stock.period.cache.lot,period:"
msgid "Period"
@@ -225,18 +222,13 @@ msgctxt "model:stock.period.cache.lot,name:"
msgid "Stock Period Cache per Lot"
msgstr ""
-msgctxt "view:product.product:"
-msgid "Lots"
-msgstr ""
-
msgctxt "view:product.template:"
msgid "Lots"
msgstr ""
-#, fuzzy
msgctxt "view:stock.lot:"
msgid "Lot"
-msgstr "Lot"
+msgstr ""
msgctxt "view:stock.lot:"
msgid "Lots"
diff --git a/locale/cs_CZ.po b/locale/ja_JP.po
similarity index 97%
copy from locale/cs_CZ.po
copy to locale/ja_JP.po
index 6aa20b9..a45c74c 100644
--- a/locale/cs_CZ.po
+++ b/locale/ja_JP.po
@@ -42,10 +42,9 @@ msgctxt "field:product.template-stock.lot.type,write_uid:"
msgid "Write User"
msgstr ""
-#, fuzzy
msgctxt "field:stock.inventory.line,lot:"
msgid "Lot"
-msgstr "Lot"
+msgstr ""
msgctxt "field:stock.lot,create_date:"
msgid "Create Date"
@@ -119,10 +118,9 @@ msgctxt "field:stock.lot.type,write_uid:"
msgid "Write User"
msgstr ""
-#, fuzzy
msgctxt "field:stock.move,lot:"
msgid "Lot"
-msgstr "Lot"
+msgstr ""
msgctxt "field:stock.period,lot_caches:"
msgid "Lot Caches"
@@ -148,10 +146,9 @@ msgctxt "field:stock.period.cache.lot,location:"
msgid "Location"
msgstr ""
-#, fuzzy
msgctxt "field:stock.period.cache.lot,lot:"
msgid "Lot"
-msgstr "Lot"
+msgstr ""
msgctxt "field:stock.period.cache.lot,period:"
msgid "Period"
@@ -225,18 +222,13 @@ msgctxt "model:stock.period.cache.lot,name:"
msgid "Stock Period Cache per Lot"
msgstr ""
-msgctxt "view:product.product:"
-msgid "Lots"
-msgstr ""
-
msgctxt "view:product.template:"
msgid "Lots"
msgstr ""
-#, fuzzy
msgctxt "view:stock.lot:"
msgid "Lot"
-msgstr "Lot"
+msgstr ""
msgctxt "view:stock.lot:"
msgid "Lots"
diff --git a/locale/cs_CZ.po b/locale/lt_LT.po
similarity index 97%
copy from locale/cs_CZ.po
copy to locale/lt_LT.po
index 6aa20b9..344b936 100644
--- a/locale/cs_CZ.po
+++ b/locale/lt_LT.po
@@ -45,7 +45,7 @@ msgstr ""
#, fuzzy
msgctxt "field:stock.inventory.line,lot:"
msgid "Lot"
-msgstr "Lot"
+msgstr "Lo"
msgctxt "field:stock.lot,create_date:"
msgid "Create Date"
@@ -122,7 +122,7 @@ msgstr ""
#, fuzzy
msgctxt "field:stock.move,lot:"
msgid "Lot"
-msgstr "Lot"
+msgstr "Lo"
msgctxt "field:stock.period,lot_caches:"
msgid "Lot Caches"
@@ -151,7 +151,7 @@ msgstr ""
#, fuzzy
msgctxt "field:stock.period.cache.lot,lot:"
msgid "Lot"
-msgstr "Lot"
+msgstr "Lo"
msgctxt "field:stock.period.cache.lot,period:"
msgid "Period"
@@ -225,18 +225,13 @@ msgctxt "model:stock.period.cache.lot,name:"
msgid "Stock Period Cache per Lot"
msgstr ""
-msgctxt "view:product.product:"
-msgid "Lots"
-msgstr ""
-
msgctxt "view:product.template:"
msgid "Lots"
msgstr ""
-#, fuzzy
msgctxt "view:stock.lot:"
msgid "Lot"
-msgstr "Lot"
+msgstr ""
msgctxt "view:stock.lot:"
msgid "Lots"
diff --git a/locale/nl_NL.po b/locale/nl_NL.po
index e81c5fe..540226f 100644
--- a/locale/nl_NL.po
+++ b/locale/nl_NL.po
@@ -241,10 +241,6 @@ msgctxt "model:stock.period.cache.lot,name:"
msgid "Stock Period Cache per Lot"
msgstr ""
-msgctxt "view:product.product:"
-msgid "Lots"
-msgstr ""
-
msgctxt "view:product.template:"
msgid "Lots"
msgstr ""
diff --git a/locale/es_ES.po b/locale/pt_BR.po
similarity index 77%
copy from locale/es_ES.po
copy to locale/pt_BR.po
index 6c766d0..cb29acc 100644
--- a/locale/es_ES.po
+++ b/locale/pt_BR.po
@@ -4,19 +4,19 @@ msgstr "Content-Type: text/plain; charset=utf-8\n"
msgctxt "error:stock.move:"
msgid "Lot is required for move of product \"%s\"."
-msgstr "El lote es requerido para el movimiento del producto \"%s\"."
+msgstr "O Lote é requerido para a movimentação do produto \"%s\"."
msgctxt "field:product.template,lot_required:"
msgid "Lot Required"
-msgstr "Lote requerido"
+msgstr "Lote Obrigatório"
msgctxt "field:product.template-stock.lot.type,create_date:"
msgid "Create Date"
-msgstr "Fecha creación"
+msgstr "Data de Criação"
msgctxt "field:product.template-stock.lot.type,create_uid:"
msgid "Create User"
-msgstr "Usuario creación"
+msgstr "Criado por"
msgctxt "field:product.template-stock.lot.type,id:"
msgid "ID"
@@ -24,11 +24,11 @@ msgstr "ID"
msgctxt "field:product.template-stock.lot.type,rec_name:"
msgid "Name"
-msgstr "Nombre"
+msgstr "Nome"
msgctxt "field:product.template-stock.lot.type,template:"
msgid "Template"
-msgstr "Plantilla"
+msgstr "Modelo"
msgctxt "field:product.template-stock.lot.type,type:"
msgid "Type"
@@ -36,11 +36,11 @@ msgstr "Tipo"
msgctxt "field:product.template-stock.lot.type,write_date:"
msgid "Write Date"
-msgstr "Fecha modificación"
+msgstr "Data de edição"
msgctxt "field:product.template-stock.lot.type,write_uid:"
msgid "Write User"
-msgstr "Usuario modificación"
+msgstr "Editado por"
msgctxt "field:stock.inventory.line,lot:"
msgid "Lot"
@@ -48,15 +48,15 @@ msgstr "Lote"
msgctxt "field:stock.lot,create_date:"
msgid "Create Date"
-msgstr "Fecha creación"
+msgstr "Data de criação"
msgctxt "field:stock.lot,create_uid:"
msgid "Create User"
-msgstr "Usuario creación"
+msgstr "Criado por"
msgctxt "field:stock.lot,forecast_quantity:"
msgid "Forecast Quantity"
-msgstr "Cantidad prevista"
+msgstr "Quantidade prevista"
msgctxt "field:stock.lot,id:"
msgid "ID"
@@ -68,23 +68,23 @@ msgstr "Número"
msgctxt "field:stock.lot,product:"
msgid "Product"
-msgstr "Producto"
+msgstr "Produto"
msgctxt "field:stock.lot,quantity:"
msgid "Quantity"
-msgstr "Cantidad"
+msgstr "Quantidade"
msgctxt "field:stock.lot,rec_name:"
msgid "Name"
-msgstr "Nombre"
+msgstr "Nome"
msgctxt "field:stock.lot,write_date:"
msgid "Write Date"
-msgstr "Fecha modificación"
+msgstr "Data de edição"
msgctxt "field:stock.lot,write_uid:"
msgid "Write User"
-msgstr "Usuario modificación"
+msgstr "Editado por"
msgctxt "field:stock.lot.type,code:"
msgid "Code"
@@ -92,11 +92,11 @@ msgstr "Código"
msgctxt "field:stock.lot.type,create_date:"
msgid "Create Date"
-msgstr "Fecha creación"
+msgstr "Data de criação"
msgctxt "field:stock.lot.type,create_uid:"
msgid "Create User"
-msgstr "Usuario creación"
+msgstr "Criado por"
msgctxt "field:stock.lot.type,id:"
msgid "ID"
@@ -104,19 +104,19 @@ msgstr "ID"
msgctxt "field:stock.lot.type,name:"
msgid "Name"
-msgstr "Nombre"
+msgstr "Nome"
msgctxt "field:stock.lot.type,rec_name:"
msgid "Name"
-msgstr "Nombre"
+msgstr "Nome"
msgctxt "field:stock.lot.type,write_date:"
msgid "Write Date"
-msgstr "Fecha modificación"
+msgstr "Data de edição"
msgctxt "field:stock.lot.type,write_uid:"
msgid "Write User"
-msgstr "Usuario modificación"
+msgstr "Editado por"
msgctxt "field:stock.move,lot:"
msgid "Lot"
@@ -124,15 +124,15 @@ msgstr "Lote"
msgctxt "field:stock.period,lot_caches:"
msgid "Lot Caches"
-msgstr "Lote precalculado"
+msgstr "Lotes pré-calculados"
msgctxt "field:stock.period.cache.lot,create_date:"
msgid "Create Date"
-msgstr "Fecha creación"
+msgstr "Data de Criação"
msgctxt "field:stock.period.cache.lot,create_uid:"
msgid "Create User"
-msgstr "Usuario creación"
+msgstr "Criado por"
msgctxt "field:stock.period.cache.lot,id:"
msgid "ID"
@@ -140,11 +140,11 @@ msgstr "ID"
msgctxt "field:stock.period.cache.lot,internal_quantity:"
msgid "Internal Quantity"
-msgstr "Cantidad interna"
+msgstr "Quantidade interna"
msgctxt "field:stock.period.cache.lot,location:"
msgid "Location"
-msgstr "Ubicación"
+msgstr "Localização"
msgctxt "field:stock.period.cache.lot,lot:"
msgid "Lot"
@@ -156,23 +156,23 @@ msgstr "Período"
msgctxt "field:stock.period.cache.lot,product:"
msgid "Product"
-msgstr "Producto"
+msgstr "Produto"
msgctxt "field:stock.period.cache.lot,rec_name:"
msgid "Name"
-msgstr "Nombre"
+msgstr "Nome"
msgctxt "field:stock.period.cache.lot,write_date:"
msgid "Write Date"
-msgstr "Fecha modificación"
+msgstr "Data de edição"
msgctxt "field:stock.period.cache.lot,write_uid:"
msgid "Write User"
-msgstr "Usuario modificación"
+msgstr "Editado por"
msgctxt "help:product.template,lot_required:"
msgid "The type of location for which lot is required"
-msgstr "El tipo de ubicación por cada lote es requerido."
+msgstr "O tipo de localização para a qual o lote é obrigatório"
msgctxt "model:ir.action,name:act_lot_form"
msgid "Lots"
@@ -180,7 +180,7 @@ msgstr "Lotes"
msgctxt "model:ir.action,name:act_move_form_relate_lot"
msgid "Moves"
-msgstr "Movimientos"
+msgstr "Movimentações"
msgctxt "model:ir.ui.menu,name:menu_lot_form"
msgid "Lots"
@@ -188,15 +188,15 @@ msgstr "Lotes"
msgctxt "model:product.template-stock.lot.type,name:"
msgid "Template - Stock Lot Type"
-msgstr "Plantilla - Tipo de lote"
+msgstr "Modelo - Tipo de lote"
msgctxt "model:stock.lot,name:"
msgid "Stock Lot"
-msgstr "Lote stock"
+msgstr "Lote de estoque"
msgctxt "model:stock.lot.type,name:"
msgid "Stock Lot Type"
-msgstr "Tipo lote stock"
+msgstr "Tipo do lote de estoque"
msgctxt "model:stock.lot.type,name:type_customer"
msgid "Customer"
@@ -204,27 +204,23 @@ msgstr "Cliente"
msgctxt "model:stock.lot.type,name:type_lost_found"
msgid "Lost and Found"
-msgstr "Perdido/encontrado"
+msgstr "Achados e Perdidos"
msgctxt "model:stock.lot.type,name:type_production"
msgid "Production"
-msgstr "Producción"
+msgstr "Produção"
msgctxt "model:stock.lot.type,name:type_storage"
msgid "Storage"
-msgstr "Almacenamiento"
+msgstr "Armazenamento"
msgctxt "model:stock.lot.type,name:type_supplier"
msgid "Supplier"
-msgstr "Proveedor"
+msgstr "Fornecedor"
msgctxt "model:stock.period.cache.lot,name:"
msgid "Stock Period Cache per Lot"
-msgstr "Período de stock precalculado por lote"
-
-msgctxt "view:product.product:"
-msgid "Lots"
-msgstr "Lotes"
+msgstr "Período de estoque pré-calculado por lote"
msgctxt "view:product.template:"
msgid "Lots"
@@ -240,8 +236,8 @@ msgstr "Lotes"
msgctxt "view:stock.period.cache.lot:"
msgid "Period Lot Cache"
-msgstr "Período lote precalculado"
+msgstr "Periodo de lote pré-calculado"
msgctxt "view:stock.period.cache.lot:"
msgid "Period Lot Caches"
-msgstr "Período lote precalculados"
+msgstr "Período de lotes pré-calculados"
diff --git a/locale/ru_RU.po b/locale/ru_RU.po
index ace025d..86dca01 100644
--- a/locale/ru_RU.po
+++ b/locale/ru_RU.po
@@ -264,10 +264,6 @@ msgctxt "model:stock.period.cache.lot,name:"
msgid "Stock Period Cache per Lot"
msgstr ""
-msgctxt "view:product.product:"
-msgid "Lots"
-msgstr ""
-
msgctxt "view:product.template:"
msgid "Lots"
msgstr ""
diff --git a/setup.py b/setup.py
index be21b96..64695ff 100644
--- a/setup.py
+++ b/setup.py
@@ -87,6 +87,9 @@ setup(name=name,
'Natural Language :: English',
'Natural Language :: French',
'Natural Language :: German',
+ 'Natural Language :: Hungarian',
+ 'Natural Language :: Italian',
+ 'Natural Language :: Portuguese (Brazilian)',
'Natural Language :: Russian',
'Natural Language :: Slovenian',
'Natural Language :: Spanish',
diff --git a/stock.py b/stock.py
index 5bf5d1e..1a0f85f 100644
--- a/stock.py
+++ b/stock.py
@@ -1,7 +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 collections import defaultdict
-
from trytond.model import ModelView, ModelSQL, fields
from trytond.pyson import Eval
from trytond.pool import Pool, PoolMeta
@@ -184,64 +182,8 @@ class Inventory:
__name__ = 'stock.inventory'
@classmethod
- def complete_lines(cls, inventories):
- pool = Pool()
- Product = pool.get('product.product')
- Line = pool.get('stock.inventory.line')
-
- super(Inventory, cls).complete_lines(inventories)
-
- # Create and/or update lines with product that will require lot for
- # their moves.
- to_create = []
- for inventory in inventories:
- product2lines = defaultdict(list)
- for line in inventory.lines:
- if (line.product.lot_is_required(inventory.location,
- inventory.lost_found)
- or line.product.lot_is_required(inventory.lost_found,
- inventory.location)):
- product2lines[line.product.id].append(line)
- if product2lines:
- with Transaction().set_context(stock_date_end=inventory.date):
- pbl = Product.products_by_location([inventory.location.id],
- product_ids=product2lines.keys(),
- grouping=('product', 'lot'))
- product_qty = defaultdict(dict)
- for (location_id, product_id, lot_id), quantity \
- in pbl.iteritems():
- product_qty[product_id][lot_id] = quantity
-
- products = Product.browse(product_qty.keys())
- product2uom = dict((p.id, p.default_uom.id) for p in products)
-
- for product_id, lines in product2lines.iteritems():
- quantities = product_qty[product_id]
- uom_id = product2uom[product_id]
- for line in lines:
- lot_id = line.lot.id if line.lot else None
- if lot_id in quantities:
- quantity = quantities.pop(lot_id)
- elif lot_id is None and quantities:
- lot_id = quantities.keys()[0]
- quantity = quantities.pop(lot_id)
- else:
- lot_id = None
- quantity = 0.0
-
- values = line.update_values4complete(quantity, uom_id)
- if (values or lot_id != (line.lot.id
- if line.lot else None)):
- values['lot'] = lot_id
- Line.write([line], values)
- if quantities:
- for lot_id, quantity in quantities.iteritems():
- values = Line.create_values4complete(product_id,
- inventory, quantity, uom_id)
- values['lot'] = lot_id
- to_create.append(values)
- if to_create:
- Line.create(to_create)
+ def grouping(cls):
+ return super(Inventory, cls).grouping() + ('lot', )
class InventoryLine:
@@ -263,10 +205,6 @@ class InventoryLine:
rec_name += ' - %s' % self.lot.rec_name
return rec_name
- @property
- def unique_key(self):
- return super(InventoryLine, self).unique_key + (self.lot,)
-
def get_move(self):
move = super(InventoryLine, self).get_move()
if move:
diff --git a/tests/scenario_stock_lot_shipment_out.rst b/tests/scenario_stock_lot_shipment_out.rst
index 678bc7f..3a10256 100644
--- a/tests/scenario_stock_lot_shipment_out.rst
+++ b/tests/scenario_stock_lot_shipment_out.rst
@@ -19,10 +19,10 @@ Create database::
Install stock_lot Module::
- >>> Module = Model.get('ir.module.module')
+ >>> Module = Model.get('ir.module')
>>> module, = Module.find([('name', '=', 'stock_lot')])
>>> module.click('install')
- >>> Wizard('ir.module.module.install_upgrade').execute('upgrade')
+ >>> Wizard('ir.module.install_upgrade').execute('upgrade')
Create company::
diff --git a/tryton.cfg b/tryton.cfg
index bf34306..83994fc 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
[tryton]
-version=3.6.0
+version=3.8.0
depends:
ir
product
diff --git a/trytond_stock_lot.egg-info/PKG-INFO b/trytond_stock_lot.egg-info/PKG-INFO
index cad9192..8d49d22 100644
--- a/trytond_stock_lot.egg-info/PKG-INFO
+++ b/trytond_stock_lot.egg-info/PKG-INFO
@@ -1,12 +1,12 @@
Metadata-Version: 1.1
Name: trytond-stock-lot
-Version: 3.6.0
+Version: 3.8.0
Summary: Tryton module for lot of products
Home-page: http://www.tryton.org/
Author: Tryton
Author-email: issue_tracker at tryton.org
License: GPL-3
-Download-URL: http://downloads.tryton.org/3.6/
+Download-URL: http://downloads.tryton.org/3.8/
Description: trytond_stock_lot
=================
@@ -60,6 +60,9 @@ Classifier: Natural Language :: Dutch
Classifier: Natural Language :: English
Classifier: Natural Language :: French
Classifier: Natural Language :: German
+Classifier: Natural Language :: Hungarian
+Classifier: Natural Language :: Italian
+Classifier: Natural Language :: Portuguese (Brazilian)
Classifier: Natural Language :: Russian
Classifier: Natural Language :: Slovenian
Classifier: Natural Language :: Spanish
diff --git a/trytond_stock_lot.egg-info/SOURCES.txt b/trytond_stock_lot.egg-info/SOURCES.txt
index 1ad788c..56a0f5e 100644
--- a/trytond_stock_lot.egg-info/SOURCES.txt
+++ b/trytond_stock_lot.egg-info/SOURCES.txt
@@ -22,8 +22,14 @@ tryton.cfg
./locale/es_CO.po
./locale/es_EC.po
./locale/es_ES.po
+./locale/es_MX.po
./locale/fr_FR.po
+./locale/hu_HU.po
+./locale/it_IT.po
+./locale/ja_JP.po
+./locale/lt_LT.po
./locale/nl_NL.po
+./locale/pt_BR.po
./locale/ru_RU.po
./locale/sl_SI.po
./tests/__init__.py
@@ -47,8 +53,14 @@ locale/es_AR.po
locale/es_CO.po
locale/es_EC.po
locale/es_ES.po
+locale/es_MX.po
locale/fr_FR.po
+locale/hu_HU.po
+locale/it_IT.po
+locale/ja_JP.po
+locale/lt_LT.po
locale/nl_NL.po
+locale/pt_BR.po
locale/ru_RU.po
locale/sl_SI.po
tests/scenario_stock_lot_shipment_out.rst
diff --git a/trytond_stock_lot.egg-info/requires.txt b/trytond_stock_lot.egg-info/requires.txt
index 97f70d9..193d062 100644
--- a/trytond_stock_lot.egg-info/requires.txt
+++ b/trytond_stock_lot.egg-info/requires.txt
@@ -1,3 +1,3 @@
-trytond_product >= 3.6, < 3.7
-trytond_stock >= 3.6, < 3.7
-trytond >= 3.6, < 3.7
\ No newline at end of file
+trytond_product >= 3.8, < 3.9
+trytond_stock >= 3.8, < 3.9
+trytond >= 3.8, < 3.9
\ No newline at end of file
--
tryton-modules-stock-lot
More information about the tryton-debian-vcs
mailing list