[tryton-debian-vcs] tryton-modules-stock-lot branch upstream updated. upstream/4.2.0-1-g3a9fddf
Mathias Behrle
tryton-debian-vcs at alioth.debian.org
Wed Jun 7 13:36:43 UTC 2017
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/4.2.0-1-g3a9fddf
commit 3a9fddf5888a78803e09f3fba77ac2efba94709f
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Wed Jun 7 15:27:02 2017 +0200
Adding upstream version 4.4.0.
Signed-off-by: Mathias Behrle <mathiasb at m9s.biz>
diff --git a/CHANGELOG b/CHANGELOG
index fda2eb3..2a23e6f 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 4.4.0 - 2017-05-01
+* Bug fixes (see mercurial logs for details)
+
Version 4.2.0 - 2016-11-28
* Bug fixes (see mercurial logs for details)
* Add entry to show lot quantities
diff --git a/COPYRIGHT b/COPYRIGHT
index 442fb2d..5d0de2b 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -1,5 +1,5 @@
-Copyright (C) 2012-2016 Cédric Krier.
-Copyright (C) 2012-2016 B2CK SPRL.
+Copyright (C) 2012-2017 Cédric Krier.
+Copyright (C) 2012-2017 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 4734fba..b8103ff 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,12 +1,12 @@
Metadata-Version: 1.1
Name: trytond_stock_lot
-Version: 4.2.0
+Version: 4.4.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/4.2/
+Download-URL: http://downloads.tryton.org/4.4/
Description: trytond_stock_lot
=================
@@ -52,7 +52,7 @@ 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: License :: OSI Approved :: GNU General Public License v3 or later (GPLv3+)
Classifier: Natural Language :: Bulgarian
Classifier: Natural Language :: Catalan
Classifier: Natural Language :: Chinese (Simplified)
diff --git a/locale/ca.po b/locale/ca.po
index 9eb66cf..aac97a5 100644
--- a/locale/ca.po
+++ b/locale/ca.po
@@ -200,7 +200,7 @@ msgid ""
"* An empty value is an infinite date in the future.\n"
"* A date in the past will provide historical values."
msgstr ""
-"Permet calcular les quantitats previstes d'estoc per a aquesta data.\n"
+"Permet calcular les quantitats previstes per a aquesta data.\n"
"* Un valor buit és un data infinita en el futur.\n"
"* Una data en el passat proporcionarà valors històrics. "
@@ -258,7 +258,7 @@ msgstr "Lot per ubicació"
msgctxt "model:stock.period.cache.lot,name:"
msgid "Stock Period Cache per Lot"
-msgstr "Període d'estoc precalculat per lot"
+msgstr "Període d'existències precalculat per lot"
msgctxt "view:product.template:"
msgid "Lots"
@@ -274,8 +274,8 @@ msgstr "Lots"
msgctxt "view:stock.period.cache.lot:"
msgid "Period Lot Cache"
-msgstr "Període d'estoc precalculat "
+msgstr "Període d'existències precalculat"
msgctxt "view:stock.period.cache.lot:"
msgid "Period Lot Caches"
-msgstr "Períodes d'estoc precalculat "
+msgstr "Períodes d'existències precalculat"
diff --git a/locale/es.po b/locale/es.po
index 835f10d..c553893 100644
--- a/locale/es.po
+++ b/locale/es.po
@@ -226,11 +226,11 @@ msgstr "Plantilla - Tipo de lote"
msgctxt "model:stock.lot,name:"
msgid "Stock Lot"
-msgstr "Lote stock"
+msgstr "Lote"
msgctxt "model:stock.lot.type,name:"
msgid "Stock Lot Type"
-msgstr "Tipo lote stock"
+msgstr "Tipo lote"
msgctxt "model:stock.lot.type,name:type_customer"
msgid "Customer"
@@ -258,7 +258,7 @@ msgstr "Lote por ubicación"
msgctxt "model:stock.period.cache.lot,name:"
msgid "Stock Period Cache per Lot"
-msgstr "Período de stock precalculado por lote"
+msgstr "Período de existencias precalculado por lote"
msgctxt "view:product.template:"
msgid "Lots"
diff --git a/locale/es_419.po b/locale/es_419.po
index 5b92d24..58daf13 100644
--- a/locale/es_419.po
+++ b/locale/es_419.po
@@ -4,15 +4,15 @@ msgstr "Content-Type: text/plain; charset=utf-8\n"
msgctxt "error:stock.move:"
msgid "Lot is required for move of product \"%s\"."
-msgstr ""
+msgstr "El lote es requerido para el movimiento del producto \\\"%s\\\"."
msgctxt "field:product.product,lot_required:"
msgid "Lot Required"
-msgstr ""
+msgstr "Lote requerido"
msgctxt "field:product.template,lot_required:"
msgid "Lot Required"
-msgstr ""
+msgstr "Lote requerido"
msgctxt "field:product.template-stock.lot.type,create_date:"
msgid "Create Date"
@@ -20,7 +20,7 @@ msgstr ""
msgctxt "field:product.template-stock.lot.type,create_uid:"
msgid "Create User"
-msgstr ""
+msgstr "Creado por usuario"
msgctxt "field:product.template-stock.lot.type,id:"
msgid "ID"
@@ -44,12 +44,11 @@ msgstr ""
msgctxt "field:product.template-stock.lot.type,write_uid:"
msgid "Write User"
-msgstr ""
+msgstr "Modificado por usuario"
-#, fuzzy
msgctxt "field:stock.inventory.line,lot:"
msgid "Lot"
-msgstr "Lot"
+msgstr ""
msgctxt "field:stock.lot,create_date:"
msgid "Create Date"
@@ -57,7 +56,7 @@ msgstr ""
msgctxt "field:stock.lot,create_uid:"
msgid "Create User"
-msgstr ""
+msgstr "Creado por usuario"
msgctxt "field:stock.lot,forecast_quantity:"
msgid "Forecast Quantity"
@@ -89,7 +88,7 @@ msgstr ""
msgctxt "field:stock.lot,write_uid:"
msgid "Write User"
-msgstr ""
+msgstr "Modificado por usuario"
msgctxt "field:stock.lot.type,code:"
msgid "Code"
@@ -101,7 +100,7 @@ msgstr ""
msgctxt "field:stock.lot.type,create_uid:"
msgid "Create User"
-msgstr ""
+msgstr "Creado por usuario"
msgctxt "field:stock.lot.type,id:"
msgid "ID"
@@ -121,7 +120,7 @@ msgstr ""
msgctxt "field:stock.lot.type,write_uid:"
msgid "Write User"
-msgstr ""
+msgstr "Modificado por usuario"
msgctxt "field:stock.lots_by_location.context,forecast_date:"
msgid "At Date"
@@ -135,10 +134,9 @@ msgctxt "field:stock.lots_by_location.context,stock_date_end:"
msgid "At Date"
msgstr ""
-#, fuzzy
msgctxt "field:stock.move,lot:"
msgid "Lot"
-msgstr "Lot"
+msgstr ""
msgctxt "field:stock.period,lot_caches:"
msgid "Lot Caches"
@@ -150,7 +148,7 @@ msgstr ""
msgctxt "field:stock.period.cache.lot,create_uid:"
msgid "Create User"
-msgstr ""
+msgstr "Creado por usuario"
msgctxt "field:stock.period.cache.lot,id:"
msgid "ID"
@@ -164,10 +162,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"
@@ -187,15 +184,15 @@ msgstr ""
msgctxt "field:stock.period.cache.lot,write_uid:"
msgid "Write User"
-msgstr ""
+msgstr "Modificado por usuario"
msgctxt "help:product.product,lot_required:"
msgid "The type of location for which lot is required"
-msgstr ""
+msgstr "El tipo de ubicación para la cual el lote es requerido"
msgctxt "help:product.template,lot_required:"
msgid "The type of location for which lot is required"
-msgstr ""
+msgstr "El tipo de ubicación para la cual el lote es requerido"
msgctxt "help:stock.lots_by_location.context,forecast_date:"
msgid ""
@@ -206,51 +203,51 @@ msgstr ""
msgctxt "model:ir.action,name:act_lot_form"
msgid "Lots"
-msgstr "Lots"
+msgstr ""
msgctxt "model:ir.action,name:act_lots_by_locations"
msgid "Lot"
-msgstr "Lot"
+msgstr ""
msgctxt "model:ir.action,name:act_move_form_relate_lot"
msgid "Moves"
-msgstr "Moves"
+msgstr ""
msgctxt "model:ir.ui.menu,name:menu_lot_form"
msgid "Lots"
-msgstr "Lots"
+msgstr ""
msgctxt "model:product.template-stock.lot.type,name:"
msgid "Template - Stock Lot Type"
-msgstr ""
+msgstr "Plantilla - Tipo de lote de stock"
msgctxt "model:stock.lot,name:"
msgid "Stock Lot"
-msgstr ""
+msgstr "Lote de stock"
msgctxt "model:stock.lot.type,name:"
msgid "Stock Lot Type"
-msgstr ""
+msgstr "Tipo de lote de stock"
msgctxt "model:stock.lot.type,name:type_customer"
msgid "Customer"
-msgstr "Customer"
+msgstr ""
msgctxt "model:stock.lot.type,name:type_lost_found"
msgid "Lost and Found"
-msgstr "Lost and Found"
+msgstr "Perdido y encontrado"
msgctxt "model:stock.lot.type,name:type_production"
msgid "Production"
-msgstr "Production"
+msgstr ""
msgctxt "model:stock.lot.type,name:type_storage"
msgid "Storage"
-msgstr "Storage"
+msgstr ""
msgctxt "model:stock.lot.type,name:type_supplier"
msgid "Supplier"
-msgstr "Supplier"
+msgstr ""
msgctxt "model:stock.lots_by_location.context,name:"
msgid "Lot by Location"
@@ -260,7 +257,6 @@ msgctxt "model:stock.period.cache.lot,name:"
msgid "Stock Period Cache per Lot"
msgstr ""
-#, fuzzy
msgctxt "view:product.template:"
msgid "Lots"
-msgstr "Lots"
+msgstr ""
diff --git a/locale/pt_BR.po b/locale/pt_BR.po
index 7690e93..323bc27 100644
--- a/locale/pt_BR.po
+++ b/locale/pt_BR.po
@@ -6,7 +6,6 @@ msgctxt "error:stock.move:"
msgid "Lot is required for move of product \"%s\"."
msgstr "O Lote é requerido para a movimentação do produto \"%s\"."
-#, fuzzy
msgctxt "field:product.product,lot_required:"
msgid "Lot Required"
msgstr "Lote Obrigatório"
@@ -125,16 +124,15 @@ msgstr "Editado por"
msgctxt "field:stock.lots_by_location.context,forecast_date:"
msgid "At Date"
-msgstr ""
+msgstr "Na Data"
-#, fuzzy
msgctxt "field:stock.lots_by_location.context,id:"
msgid "ID"
msgstr "ID"
msgctxt "field:stock.lots_by_location.context,stock_date_end:"
msgid "At Date"
-msgstr ""
+msgstr "Na Data"
msgctxt "field:stock.move,lot:"
msgid "Lot"
@@ -188,7 +186,6 @@ msgctxt "field:stock.period.cache.lot,write_uid:"
msgid "Write User"
msgstr "Editado por"
-#, fuzzy
msgctxt "help:product.product,lot_required:"
msgid "The type of location for which lot is required"
msgstr "O tipo de localização para a qual o lote é obrigatório"
@@ -203,12 +200,14 @@ msgid ""
"* An empty value is an infinite date in the future.\n"
"* A date in the past will provide historical values."
msgstr ""
+"Permite o cálculo esperado das quantidades do estoque para esta data.\n"
+"* Um valor vazio é uma data infinita no futuro.\n"
+"* Uma data no passado mostrará valores históricos."
msgctxt "model:ir.action,name:act_lot_form"
msgid "Lots"
msgstr "Lotes"
-#, fuzzy
msgctxt "model:ir.action,name:act_lots_by_locations"
msgid "Lot"
msgstr "Lote"
@@ -255,7 +254,7 @@ msgstr "Fornecedor"
msgctxt "model:stock.lots_by_location.context,name:"
msgid "Lot by Location"
-msgstr ""
+msgstr "Lote Localização"
msgctxt "model:stock.period.cache.lot,name:"
msgid "Stock Period Cache per Lot"
diff --git a/locale/sl.po b/locale/sl.po
index 6e8a8cc..9620ba8 100644
--- a/locale/sl.po
+++ b/locale/sl.po
@@ -124,16 +124,15 @@ msgstr "Zapisal"
msgctxt "field:stock.lots_by_location.context,forecast_date:"
msgid "At Date"
-msgstr ""
+msgstr "Na dan"
-#, fuzzy
msgctxt "field:stock.lots_by_location.context,id:"
msgid "ID"
msgstr "ID"
msgctxt "field:stock.lots_by_location.context,stock_date_end:"
msgid "At Date"
-msgstr ""
+msgstr "Na dan"
msgctxt "field:stock.move,lot:"
msgid "Lot"
@@ -201,12 +200,14 @@ msgid ""
"* An empty value is an infinite date in the future.\n"
"* A date in the past will provide historical values."
msgstr ""
+"Omogoča izračun predvidenih zalog na ta dan.\n"
+"* Prazno polje pomeni neskončno v prihodnost.\n"
+"* Pretekli datum daje zgodovino zaloge."
msgctxt "model:ir.action,name:act_lot_form"
msgid "Lots"
msgstr "Serije"
-#, fuzzy
msgctxt "model:ir.action,name:act_lots_by_locations"
msgid "Lot"
msgstr "Serija"
@@ -253,7 +254,7 @@ msgstr "Dobavitelj"
msgctxt "model:stock.lots_by_location.context,name:"
msgid "Lot by Location"
-msgstr ""
+msgstr "Serija po lokaciji"
msgctxt "model:stock.period.cache.lot,name:"
msgid "Stock Period Cache per Lot"
diff --git a/setup.py b/setup.py
index 3b4ec7e..1592f0c 100644
--- a/setup.py
+++ b/setup.py
@@ -85,7 +85,7 @@ setup(name=name,
'Intended Audience :: Financial and Insurance Industry',
'Intended Audience :: Legal Industry',
'Intended Audience :: Manufacturing',
- 'License :: OSI Approved :: GNU General Public License (GPL)',
+ 'License :: OSI Approved :: GNU General Public License v3 or later (GPLv3+)',
'Natural Language :: Bulgarian',
'Natural Language :: Catalan',
'Natural Language :: Chinese (Simplified)',
diff --git a/stock.xml b/stock.xml
index 8952c3f..01101f2 100644
--- a/stock.xml
+++ b/stock.xml
@@ -83,7 +83,13 @@ this repository contains the full copyright notices and license terms. -->
<field name="act_window" ref="act_lots_by_locations"/>
</record>
<record model="ir.action.keyword"
- id="act_products_by_locations_keyword2">
+ id="act_lots_by_locations_keyword1">
+ <field name="keyword">tree_open</field>
+ <field name="model">stock.location,-1</field>
+ <field name="action" ref="act_lots_by_locations"/>
+ </record>
+ <record model="ir.action.keyword"
+ id="act_lots_by_locations_keyword2">
<field name="keyword">form_relate</field>
<field name="model">stock.location,-1</field>
<field name="action" ref="act_lots_by_locations"/>
@@ -93,7 +99,8 @@ this repository contains the full copyright notices and license terms. -->
<field name="name">Moves</field>
<field name="res_model">stock.move</field>
<field name="domain"
- eval="[('lot', 'in', Eval('active_ids'))]" pyson="1"/>
+ eval="[If(Eval('active_ids', []) == [Eval('active_id')], ('lot', '=', Eval('active_id')), ('lot', 'in', Eval('active_ids')))]"
+ pyson="1"/>
<field name="order"
eval="[('effective_date', 'DESC'), ('planned_date', 'DESC')]"
pyson="1"/>
diff --git a/tryton.cfg b/tryton.cfg
index dfdab7d..aaad031 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
[tryton]
-version=4.2.0
+version=4.4.0
depends:
ir
product
diff --git a/trytond_stock_lot.egg-info/PKG-INFO b/trytond_stock_lot.egg-info/PKG-INFO
index 4dd8fce..d1d2fe1 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: 4.2.0
+Version: 4.4.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/4.2/
+Download-URL: http://downloads.tryton.org/4.4/
Description: trytond_stock_lot
=================
@@ -52,7 +52,7 @@ 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: License :: OSI Approved :: GNU General Public License v3 or later (GPLv3+)
Classifier: Natural Language :: Bulgarian
Classifier: Natural Language :: Catalan
Classifier: Natural Language :: Chinese (Simplified)
diff --git a/trytond_stock_lot.egg-info/requires.txt b/trytond_stock_lot.egg-info/requires.txt
index 0a18204..89264c2 100644
--- a/trytond_stock_lot.egg-info/requires.txt
+++ b/trytond_stock_lot.egg-info/requires.txt
@@ -1,3 +1,3 @@
-trytond_product >= 4.2, < 4.3
-trytond_stock >= 4.2, < 4.3
-trytond >= 4.2, < 4.3
+trytond_product >= 4.4, < 4.5
+trytond_stock >= 4.4, < 4.5
+trytond >= 4.4, < 4.5
--
tryton-modules-stock-lot
More information about the tryton-debian-vcs
mailing list