[tryton-debian-vcs] tryton-modules-stock-lot branch debian updated. debian/3.2.0-1-5-g8988d7b
Mathias Behrle
tryton-debian-vcs at alioth.debian.org
Thu Oct 23 12:18:45 UTC 2014
The following commit has been merged in the debian branch:
https://alioth.debian.org/plugins/scmgit/cgi-bin/gitweb.cgi/?p=tryton/tryton-modules-stock-lot.git;a=commitdiff;h=debian/3.2.0-1-5-g8988d7b
commit 8988d7b85a88af0831162f4a6402ddd0308f4132
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Thu Oct 23 13:32:09 2014 +0200
Releasing debian version 3.4.0-1.
Signed-off-by: Mathias Behrle <mathiasb at m9s.biz>
diff --git a/debian/changelog b/debian/changelog
index 3d30c21..de51a33 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+tryton-modules-stock-lot (3.4.0-1) unstable; urgency=medium
+
+ * Updating signing key while using now plain .asc files instead of .pgp
+ binaries.
+ * Adding actual upstream signing key.
+ * Updating to Standards-Version: 3.9.6, no changes needed.
+ * Merging upstream version 3.4.0.
+
+ -- Mathias Behrle <mathiasb at m9s.biz> Tue, 21 Oct 2014 20:24:33 +0200
+
tryton-modules-stock-lot (3.2.0-1) unstable; urgency=medium
* Removing LC_ALL=C.UTF-8 as build environment.
commit 936cdbc5b96a88e5b2f006bb5dace9ca08f6054a
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Tue Oct 21 11:29:23 2014 +0200
Merging upstream version 3.4.0.
diff --git a/CHANGELOG b/CHANGELOG
index c0dfc1d..ae78c29 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 3.4.0 - 2014-10-20
+* Bug fixes (see mercurial logs for details)
+
Version 3.2.0 - 2014-04-21
* Bug fixes (see mercurial logs for details)
* Add relate from lot to moves
diff --git a/PKG-INFO b/PKG-INFO
index bae3dae..ed88376 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,12 +1,12 @@
Metadata-Version: 1.1
Name: trytond_stock_lot
-Version: 3.2.0
+Version: 3.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/3.2/
+Download-URL: http://downloads.tryton.org/3.4/
Description: trytond_stock_lot
=================
diff --git a/locale/fr_FR.po b/locale/es_EC.po
similarity index 73%
copy from locale/fr_FR.po
copy to locale/es_EC.po
index 332d363..d016819 100644
--- a/locale/fr_FR.po
+++ b/locale/es_EC.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 "Un lot est requis pour les mouvements du produit \"%s\"."
+msgstr "El lote es requerido para el movimiento del producto \"%s\"."
msgctxt "field:product.template,lot_required:"
msgid "Lot Required"
-msgstr "Lot requis"
+msgstr "Lote Requerido"
msgctxt "field:product.template-stock.lot.type,create_date:"
msgid "Create Date"
-msgstr "Date de création"
+msgstr "Fecha de Creación"
msgctxt "field:product.template-stock.lot.type,create_uid:"
msgid "Create User"
-msgstr "Créé par"
+msgstr "Creado por Usuario"
msgctxt "field:product.template-stock.lot.type,id:"
msgid "ID"
@@ -24,39 +24,39 @@ msgstr "ID"
msgctxt "field:product.template-stock.lot.type,rec_name:"
msgid "Name"
-msgstr "Nom"
+msgstr "Nombre"
msgctxt "field:product.template-stock.lot.type,template:"
msgid "Template"
-msgstr "Modèle produit"
+msgstr "Plantilla"
msgctxt "field:product.template-stock.lot.type,type:"
msgid "Type"
-msgstr "Type"
+msgstr "Tipo"
msgctxt "field:product.template-stock.lot.type,write_date:"
msgid "Write Date"
-msgstr "Date de mise à jour"
+msgstr "Fecha de Modificación"
msgctxt "field:product.template-stock.lot.type,write_uid:"
msgid "Write User"
-msgstr "Mis à jour par"
+msgstr "Modificado por Usuario"
msgctxt "field:stock.inventory.line,lot:"
msgid "Lot"
-msgstr "Lot"
+msgstr "Lote"
msgctxt "field:stock.lot,create_date:"
msgid "Create Date"
-msgstr "Date de création"
+msgstr "Fecha de Creación"
msgctxt "field:stock.lot,create_uid:"
msgid "Create User"
-msgstr "Créé par"
+msgstr "Creado por Usuario"
msgctxt "field:stock.lot,forecast_quantity:"
msgid "Forecast Quantity"
-msgstr "Quantités prévisionnelles"
+msgstr "Cantidad Prevista"
msgctxt "field:stock.lot,id:"
msgid "ID"
@@ -64,39 +64,39 @@ msgstr "ID"
msgctxt "field:stock.lot,number:"
msgid "Number"
-msgstr "Numéro"
+msgstr "Número"
msgctxt "field:stock.lot,product:"
msgid "Product"
-msgstr "Produit"
+msgstr "Producto"
msgctxt "field:stock.lot,quantity:"
msgid "Quantity"
-msgstr "Quantité"
+msgstr "Cantidad"
msgctxt "field:stock.lot,rec_name:"
msgid "Name"
-msgstr "Nom"
+msgstr "Nombre"
msgctxt "field:stock.lot,write_date:"
msgid "Write Date"
-msgstr "Date de mise à jour"
+msgstr "Fecha de Modificación"
msgctxt "field:stock.lot,write_uid:"
msgid "Write User"
-msgstr "Mis à jour par"
+msgstr "Modificado por Usuario"
msgctxt "field:stock.lot.type,code:"
msgid "Code"
-msgstr "Code"
+msgstr "Código"
msgctxt "field:stock.lot.type,create_date:"
msgid "Create Date"
-msgstr "Date de création"
+msgstr "Fecha de Creación"
msgctxt "field:stock.lot.type,create_uid:"
msgid "Create User"
-msgstr "Créé par"
+msgstr "Creado por Usuario"
msgctxt "field:stock.lot.type,id:"
msgid "ID"
@@ -104,35 +104,35 @@ msgstr "ID"
msgctxt "field:stock.lot.type,name:"
msgid "Name"
-msgstr "Nom"
+msgstr "Nombre"
msgctxt "field:stock.lot.type,rec_name:"
msgid "Name"
-msgstr "Nom"
+msgstr "Nombre"
msgctxt "field:stock.lot.type,write_date:"
msgid "Write Date"
-msgstr "Date de mise à jour"
+msgstr "Fecha de Modificación"
msgctxt "field:stock.lot.type,write_uid:"
msgid "Write User"
-msgstr "Mis à jour par"
+msgstr "Modificado por Usuario"
msgctxt "field:stock.move,lot:"
msgid "Lot"
-msgstr "Lot"
+msgstr "Lote"
msgctxt "field:stock.period,lot_caches:"
msgid "Lot Caches"
-msgstr "Caches de lot"
+msgstr "Caches de Lote"
msgctxt "field:stock.period.cache.lot,create_date:"
msgid "Create Date"
-msgstr "Date de création"
+msgstr "Fecha de Creación"
msgctxt "field:stock.period.cache.lot,create_uid:"
msgid "Create User"
-msgstr "Créé par"
+msgstr "Creado por Usuario"
msgctxt "field:stock.period.cache.lot,id:"
msgid "ID"
@@ -140,108 +140,108 @@ msgstr "ID"
msgctxt "field:stock.period.cache.lot,internal_quantity:"
msgid "Internal Quantity"
-msgstr "Quantité interne"
+msgstr "Cantidad Interna"
msgctxt "field:stock.period.cache.lot,location:"
msgid "Location"
-msgstr "Emplacement"
+msgstr "Bodega"
msgctxt "field:stock.period.cache.lot,lot:"
msgid "Lot"
-msgstr "Lot"
+msgstr "Lote"
msgctxt "field:stock.period.cache.lot,period:"
msgid "Period"
-msgstr "Période"
+msgstr "Período"
msgctxt "field:stock.period.cache.lot,product:"
msgid "Product"
-msgstr "Produit"
+msgstr "Producto"
msgctxt "field:stock.period.cache.lot,rec_name:"
msgid "Name"
-msgstr "Nom"
+msgstr "Nombre"
msgctxt "field:stock.period.cache.lot,write_date:"
msgid "Write Date"
-msgstr "Date de mise à jour"
+msgstr "Fecha de Modificación"
msgctxt "field:stock.period.cache.lot,write_uid:"
msgid "Write User"
-msgstr "Mis à jour par"
+msgstr "Modificado por Usuario"
msgctxt "help:product.template,lot_required:"
msgid "The type of location for which lot is required"
-msgstr "Le type d'emplacement pour lequel un lot est requis"
+msgstr "El tipo de bodega para la cual el lote es requerido"
msgctxt "model:ir.action,name:act_lot_form"
msgid "Lots"
-msgstr "Lots"
+msgstr "Lotes"
msgctxt "model:ir.action,name:act_move_form_relate_lot"
msgid "Moves"
-msgstr "Mouvements"
+msgstr "Movimientos"
msgctxt "model:ir.ui.menu,name:menu_lot_form"
msgid "Lots"
-msgstr "Lots"
+msgstr "Lotes"
msgctxt "model:product.template-stock.lot.type,name:"
msgid "Template - Stock Lot Type"
-msgstr "Modèle - Type de lot"
+msgstr "Plantilla - Tipo de Lote"
msgctxt "model:stock.lot,name:"
msgid "Stock Lot"
-msgstr "Lot"
+msgstr "Lote de Existencias"
msgctxt "model:stock.lot.type,name:"
msgid "Stock Lot Type"
-msgstr "Type de lot"
+msgstr "Tipo de Lote de Existencias"
msgctxt "model:stock.lot.type,name:type_customer"
msgid "Customer"
-msgstr "Client"
+msgstr "Cliente"
msgctxt "model:stock.lot.type,name:type_lost_found"
msgid "Lost and Found"
-msgstr "Pertes et surplus"
+msgstr "Perdido y Encontrado"
msgctxt "model:stock.lot.type,name:type_production"
msgid "Production"
-msgstr "Production"
+msgstr "Producción"
msgctxt "model:stock.lot.type,name:type_storage"
msgid "Storage"
-msgstr "Magasin"
+msgstr "Almacén"
msgctxt "model:stock.lot.type,name:type_supplier"
msgid "Supplier"
-msgstr "Fournisseur"
+msgstr "Proveedor"
msgctxt "model:stock.period.cache.lot,name:"
msgid "Stock Period Cache per Lot"
-msgstr "Caches de période de stock par lot"
+msgstr "Cache de Período de Existencias por Lote"
msgctxt "view:product.product:"
msgid "Lots"
-msgstr "Lots"
+msgstr "Lotes"
msgctxt "view:product.template:"
msgid "Lots"
-msgstr "Lots"
+msgstr "Lotes"
msgctxt "view:stock.lot:"
msgid "Lot"
-msgstr "Lot"
+msgstr "Lote"
msgctxt "view:stock.lot:"
msgid "Lots"
-msgstr "Lots"
+msgstr "Lotes"
msgctxt "view:stock.period.cache.lot:"
msgid "Period Lot Cache"
-msgstr "Cache de période et lot"
+msgstr "Cache de Período Lote"
msgctxt "view:stock.period.cache.lot:"
msgid "Period Lot Caches"
-msgstr "Caches de période et lot"
+msgstr "Caches de Período Lote"
diff --git a/locale/fr_FR.po b/locale/fr_FR.po
index 332d363..ddd071f 100644
--- a/locale/fr_FR.po
+++ b/locale/fr_FR.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 "Un lot est requis pour les mouvements du produit \"%s\"."
+msgstr "Un lot est requis pour les mouvements du produit « %s »."
msgctxt "field:product.template,lot_required:"
msgid "Lot Required"
diff --git a/locale/sl_SI.po b/locale/sl_SI.po
index 6abdec1..3e43b35 100644
--- a/locale/sl_SI.po
+++ b/locale/sl_SI.po
@@ -12,11 +12,11 @@ msgstr "Šarža zahtevana"
msgctxt "field:product.template-stock.lot.type,create_date:"
msgid "Create Date"
-msgstr "Ustvarjeno"
+msgstr "Izdelano"
msgctxt "field:product.template-stock.lot.type,create_uid:"
msgid "Create User"
-msgstr "Ustvaril"
+msgstr "Izdelal"
msgctxt "field:product.template-stock.lot.type,id:"
msgid "ID"
@@ -48,11 +48,11 @@ msgstr "Šarža"
msgctxt "field:stock.lot,create_date:"
msgid "Create Date"
-msgstr "Ustvarjeno"
+msgstr "Izdelano"
msgctxt "field:stock.lot,create_uid:"
msgid "Create User"
-msgstr "Ustvaril"
+msgstr "Izdelal"
msgctxt "field:stock.lot,forecast_quantity:"
msgid "Forecast Quantity"
@@ -92,11 +92,11 @@ msgstr "Šifra"
msgctxt "field:stock.lot.type,create_date:"
msgid "Create Date"
-msgstr "Ustvarjeno"
+msgstr "Izdelano"
msgctxt "field:stock.lot.type,create_uid:"
msgid "Create User"
-msgstr "Ustvaril"
+msgstr "Izdelal"
msgctxt "field:stock.lot.type,id:"
msgid "ID"
@@ -128,11 +128,11 @@ msgstr "Predpomnjene šarže"
msgctxt "field:stock.period.cache.lot,create_date:"
msgid "Create Date"
-msgstr "Ustvarjeno"
+msgstr "Izdelano"
msgctxt "field:stock.period.cache.lot,create_uid:"
msgid "Create User"
-msgstr "Ustvaril"
+msgstr "Izdelal"
msgctxt "field:stock.period.cache.lot,id:"
msgid "ID"
diff --git a/product.py b/product.py
index 87debcf..d1bf2b7 100644
--- a/product.py
+++ b/product.py
@@ -37,5 +37,6 @@ class TemplateLotType(ModelSQL):
__name__ = 'product.template-stock.lot.type'
template = fields.Many2One('product.template', 'Template', required=True,
- select=True)
- type = fields.Many2One('stock.lot.type', 'Type', required=True)
+ select=True, ondelete='CASCADE')
+ type = fields.Many2One('stock.lot.type', 'Type', required=True,
+ ondelete='CASCADE')
diff --git a/tests/test_stock_lot.py b/tests/test_stock_lot.py
index 4c0ecfc..f3814d6 100644
--- a/tests/test_stock_lot.py
+++ b/tests/test_stock_lot.py
@@ -8,7 +8,8 @@ from decimal import Decimal
import trytond.tests.test_tryton
from trytond.tests.test_tryton import POOL, DB_NAME, USER, CONTEXT, test_view,\
- test_depends, doctest_dropdb
+ test_depends
+from trytond.tests.test_tryton import doctest_setup, doctest_teardown
from trytond.transaction import Transaction
@@ -243,6 +244,6 @@ def suite():
suite.addTests(unittest.TestLoader().loadTestsFromTestCase(
StockLotTestCase))
suite.addTests(doctest.DocFileSuite('scenario_stock_lot_shipment_out.rst',
- setUp=doctest_dropdb, tearDown=doctest_dropdb, encoding='utf-8',
+ setUp=doctest_setup, tearDown=doctest_teardown, encoding='utf-8',
optionflags=doctest.REPORT_ONLY_FIRST_FAILURE))
return suite
diff --git a/tryton.cfg b/tryton.cfg
index e1d6040..7d6831b 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
[tryton]
-version=3.2.0
+version=3.4.0
depends:
ir
product
diff --git a/trytond_stock_lot.egg-info/PKG-INFO b/trytond_stock_lot.egg-info/PKG-INFO
index f5532df..ffd39e0 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.2.0
+Version: 3.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/3.2/
+Download-URL: http://downloads.tryton.org/3.4/
Description: trytond_stock_lot
=================
diff --git a/trytond_stock_lot.egg-info/SOURCES.txt b/trytond_stock_lot.egg-info/SOURCES.txt
index 68da135..1ad788c 100644
--- a/trytond_stock_lot.egg-info/SOURCES.txt
+++ b/trytond_stock_lot.egg-info/SOURCES.txt
@@ -10,9 +10,34 @@ stock.xml
tryton.cfg
./__init__.py
./product.py
+./product.xml
./stock.py
+./stock.xml
+./tryton.cfg
+./locale/bg_BG.po
+./locale/ca_ES.po
+./locale/cs_CZ.po
+./locale/de_DE.po
+./locale/es_AR.po
+./locale/es_CO.po
+./locale/es_EC.po
+./locale/es_ES.po
+./locale/fr_FR.po
+./locale/nl_NL.po
+./locale/ru_RU.po
+./locale/sl_SI.po
./tests/__init__.py
+./tests/scenario_stock_lot_shipment_out.rst
./tests/test_stock_lot.py
+./view/inventory_line_form.xml
+./view/inventory_line_tree.xml
+./view/lot_form.xml
+./view/lot_tree.xml
+./view/move_form.xml
+./view/move_tree.xml
+./view/period_cache_lot_form.xml
+./view/period_cache_lot_list.xml
+./view/template_form.xml
doc/index.rst
locale/bg_BG.po
locale/ca_ES.po
@@ -20,6 +45,7 @@ locale/cs_CZ.po
locale/de_DE.po
locale/es_AR.po
locale/es_CO.po
+locale/es_EC.po
locale/es_ES.po
locale/fr_FR.po
locale/nl_NL.po
diff --git a/trytond_stock_lot.egg-info/requires.txt b/trytond_stock_lot.egg-info/requires.txt
index c4f6720..158bea8 100644
--- a/trytond_stock_lot.egg-info/requires.txt
+++ b/trytond_stock_lot.egg-info/requires.txt
@@ -1,3 +1,3 @@
-trytond_product >= 3.2, < 3.3
-trytond_stock >= 3.2, < 3.3
-trytond >= 3.2, < 3.3
\ No newline at end of file
+trytond_product >= 3.4, < 3.5
+trytond_stock >= 3.4, < 3.5
+trytond >= 3.4, < 3.5
\ No newline at end of file
diff --git a/view/template_form.xml b/view/template_form.xml
index f518dc6..47429a5 100644
--- a/view/template_form.xml
+++ b/view/template_form.xml
@@ -5,7 +5,8 @@ this repository contains the full copyright notices and license terms. -->
<xpath expr="/form/notebook/page[@id='general']" position="after">
<page string="Lots" id="lots"
states="{'invisible': ~Eval('type').in_(['goods', 'assets'])}">
- <field name="lot_required" colspan="4" widget="multiselection"/>
+ <label name="lot_required"/>
+ <field name="lot_required" widget="multiselection" yexpand="0"/>
</page>
</xpath>
</data>
--
tryton-modules-stock-lot
More information about the tryton-debian-vcs
mailing list