[tryton-debian-vcs] tryton-modules-product branch debian updated. debian/3.2.0-1-5-gd536367
Mathias Behrle
tryton-debian-vcs at alioth.debian.org
Thu Oct 23 12:16:34 UTC 2014
The following commit has been merged in the debian branch:
https://alioth.debian.org/plugins/scmgit/cgi-bin/gitweb.cgi/?p=tryton/tryton-modules-product.git;a=commitdiff;h=debian/3.2.0-1-5-gd536367
commit d536367dd27f7e4fde66924971d29cb9baed1ada
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Thu Oct 23 13:32:03 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 74c9988..1980fa1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+tryton-modules-product (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:11 +0200
+
tryton-modules-product (3.2.0-1) unstable; urgency=medium
* Removing LC_ALL=C.UTF-8 as build environment.
commit 1a216ea78759c253e3556ae16032de33ca3a4657
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Tue Oct 21 11:29:15 2014 +0200
Merging upstream version 3.4.0.
diff --git a/CHANGELOG b/CHANGELOG
index c851010..3fcdd6a 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)
diff --git a/PKG-INFO b/PKG-INFO
index ec7f7ae..57afd30 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,12 +1,12 @@
Metadata-Version: 1.1
Name: trytond_product
-Version: 3.2.0
+Version: 3.4.0
Summary: Tryton module with 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_product
===============
diff --git a/locale/bg_BG.po b/locale/bg_BG.po
index 783e235..148d642 100644
--- a/locale/bg_BG.po
+++ b/locale/bg_BG.po
@@ -193,8 +193,9 @@ msgctxt "field:product.uom,active:"
msgid "Active"
msgstr "Активен"
+#, fuzzy
msgctxt "field:product.uom,category:"
-msgid "UOM Category"
+msgid "Category"
msgstr "Категория мер. ед."
msgctxt "field:product.uom,create_date:"
diff --git a/locale/ca_ES.po b/locale/ca_ES.po
index 6a84d26..3ab8e36 100644
--- a/locale/ca_ES.po
+++ b/locale/ca_ES.po
@@ -189,8 +189,8 @@ msgid "Active"
msgstr "Actiu"
msgctxt "field:product.uom,category:"
-msgid "UOM Category"
-msgstr "Categoria d'UdM"
+msgid "Category"
+msgstr "Categoria"
msgctxt "field:product.uom,create_date:"
msgid "Create Date"
@@ -326,7 +326,7 @@ msgstr "Categories"
msgctxt "model:ir.ui.menu,name:menu_main_product"
msgid "Product"
-msgstr "Producte"
+msgstr "Productes"
msgctxt "model:ir.ui.menu,name:menu_product"
msgid "Variants"
@@ -694,7 +694,7 @@ msgstr "Categoria de producte"
msgctxt "view:product.product:"
msgid "Product"
-msgstr "Producte"
+msgstr "Productes"
msgctxt "view:product.product:"
msgid "Products"
@@ -706,7 +706,7 @@ msgstr "General"
msgctxt "view:product.template:"
msgid "Product"
-msgstr "Producte"
+msgstr "Productes"
msgctxt "view:product.template:"
msgid "Products"
diff --git a/locale/cs_CZ.po b/locale/cs_CZ.po
index 75a594a..7bc7454 100644
--- a/locale/cs_CZ.po
+++ b/locale/cs_CZ.po
@@ -185,7 +185,7 @@ msgid "Active"
msgstr ""
msgctxt "field:product.uom,category:"
-msgid "UOM Category"
+msgid "Category"
msgstr ""
msgctxt "field:product.uom,create_date:"
diff --git a/locale/de_DE.po b/locale/de_DE.po
index 86deaba..706667e 100644
--- a/locale/de_DE.po
+++ b/locale/de_DE.po
@@ -197,8 +197,8 @@ msgid "Active"
msgstr "Aktiv"
msgctxt "field:product.uom,category:"
-msgid "UOM Category"
-msgstr "Kategorie Maßeinheit"
+msgid "Category"
+msgstr "Kategorie"
msgctxt "field:product.uom,create_date:"
msgid "Create Date"
diff --git a/locale/es_AR.po b/locale/es_AR.po
index 11766d5..e1a611a 100644
--- a/locale/es_AR.po
+++ b/locale/es_AR.po
@@ -189,7 +189,7 @@ msgid "Active"
msgstr "Activo"
msgctxt "field:product.uom,category:"
-msgid "UOM Category"
+msgid "Category"
msgstr "Categoría de UdM"
msgctxt "field:product.uom,create_date:"
diff --git a/locale/es_CO.po b/locale/es_CO.po
index 093a1ea..6383909 100644
--- a/locale/es_CO.po
+++ b/locale/es_CO.po
@@ -189,8 +189,8 @@ msgid "Active"
msgstr "Activo"
msgctxt "field:product.uom,category:"
-msgid "UOM Category"
-msgstr "Categoría de UdM"
+msgid "Category"
+msgstr "Categoría"
msgctxt "field:product.uom,create_date:"
msgid "Create Date"
@@ -326,7 +326,7 @@ msgstr "Categorías"
msgctxt "model:ir.ui.menu,name:menu_main_product"
msgid "Product"
-msgstr "Catálogo de Productos"
+msgstr "Administración de Productos"
msgctxt "model:ir.ui.menu,name:menu_product"
msgid "Variants"
@@ -650,11 +650,11 @@ msgstr "Administración de Productos"
msgctxt "selection:product.product,type:"
msgid "Assets"
-msgstr "Activos"
+msgstr "Activo Fijo"
msgctxt "selection:product.product,type:"
msgid "Goods"
-msgstr "Artículos"
+msgstr "Artículo"
msgctxt "selection:product.product,type:"
msgid "Service"
@@ -670,11 +670,11 @@ msgstr "Fijo"
msgctxt "selection:product.template,type:"
msgid "Assets"
-msgstr "Activos"
+msgstr "Activo Fijo"
msgctxt "selection:product.template,type:"
msgid "Goods"
-msgstr "Artículos"
+msgstr "Artículo"
msgctxt "selection:product.template,type:"
msgid "Service"
diff --git a/locale/es_CO.po b/locale/es_EC.po
similarity index 97%
copy from locale/es_CO.po
copy to locale/es_EC.po
index 093a1ea..a8c13c4 100644
--- a/locale/es_CO.po
+++ b/locale/es_EC.po
@@ -7,12 +7,12 @@ msgid ""
"If the UOM is still not used, you can delete it otherwise you can deactivate"
" it and create a new one."
msgstr ""
-"Si no se ha usado la UdM, puede borrarla, en caso contrario, puede "
+"Si no se ha utilizado la UdM, puede eliminarla. En caso contrario, puede "
"desactivarla y crear una nueva."
msgctxt "error:product.uom:"
msgid "Invalid Factor and Rate values in UOM \"%s\"."
-msgstr "Valores inválidos en factor y tasa de conversión en UdM \"%s\"."
+msgstr "Valores de factor y tasa de conversión en UdM \"%s\" no son válidos."
msgctxt "error:product.uom:"
msgid "Rate and factor can not be both equal to zero."
@@ -70,7 +70,7 @@ msgstr "Código"
msgctxt "field:product.product,cost_price_uom:"
msgid "Cost Price"
-msgstr "Costo"
+msgstr "Precio de Costo"
msgctxt "field:product.product,create_date:"
msgid "Create Date"
@@ -130,11 +130,11 @@ msgstr "Consumible"
msgctxt "field:product.template,cost_price:"
msgid "Cost Price"
-msgstr "Costo"
+msgstr "Precio de Costo"
msgctxt "field:product.template,cost_price_method:"
msgid "Cost Method"
-msgstr "Método de Costeo"
+msgstr "Método de Costo"
msgctxt "field:product.template,create_date:"
msgid "Create Date"
@@ -166,7 +166,7 @@ msgstr "Nombre"
msgctxt "field:product.template,products:"
msgid "Variants"
-msgstr "Variedades"
+msgstr "Variantes"
msgctxt "field:product.template,rec_name:"
msgid "Name"
@@ -189,7 +189,7 @@ msgid "Active"
msgstr "Activo"
msgctxt "field:product.uom,category:"
-msgid "UOM Category"
+msgid "Category"
msgstr "Categoría de UdM"
msgctxt "field:product.uom,create_date:"
@@ -262,7 +262,7 @@ msgstr "Nombre"
msgctxt "field:product.uom.category,uoms:"
msgid "Unit of Measures"
-msgstr "Unidades de Medida"
+msgstr "Unidades de Medidas"
msgctxt "field:product.uom.category,write_date:"
msgid "Write Date"
@@ -298,7 +298,7 @@ msgstr "Categorías"
msgctxt "model:ir.action,name:act_product_form"
msgid "Variants"
-msgstr "Variedades"
+msgstr "Variantes"
msgctxt "model:ir.action,name:act_template_by_category"
msgid "Product by Category"
@@ -326,11 +326,11 @@ msgstr "Categorías"
msgctxt "model:ir.ui.menu,name:menu_main_product"
msgid "Product"
-msgstr "Catálogo de Productos"
+msgstr "Productos"
msgctxt "model:ir.ui.menu,name:menu_product"
msgid "Variants"
-msgstr "Variedades"
+msgstr "Variantes"
msgctxt "model:ir.ui.menu,name:menu_template"
msgid "Products"
@@ -350,7 +350,7 @@ msgstr "Categoría de Producto"
msgctxt "model:product.product,name:"
msgid "Product Variant"
-msgstr "Variedad de Producto"
+msgstr "Variante de Producto"
msgctxt "model:product.template,name:"
msgid "Product Template"
@@ -358,7 +358,7 @@ msgstr "Plantilla de Producto"
msgctxt "model:product.uom,name:"
msgid "Unit of measure"
-msgstr "Unidad de Medida"
+msgstr "Unidad de medida"
msgctxt "model:product.uom,name:uom_are"
msgid "Are"
@@ -482,7 +482,7 @@ msgstr "Unidad"
msgctxt "model:product.uom,name:uom_work_day"
msgid "Work Day"
-msgstr "Día Laboral"
+msgstr "Día de Trabajo"
msgctxt "model:product.uom,name:uom_yard"
msgid "Yard"
@@ -578,7 +578,7 @@ msgstr "oz"
msgctxt "model:product.uom,symbol:uom_pound"
msgid "lb"
-msgstr "lbs"
+msgstr "lb"
msgctxt "model:product.uom,symbol:uom_second"
msgid "s"
@@ -606,7 +606,7 @@ msgstr "yd²"
msgctxt "model:product.uom,symbol:uom_unit"
msgid "u"
-msgstr "und"
+msgstr "u"
msgctxt "model:product.uom,symbol:uom_work_day"
msgid "wd"
diff --git a/locale/es_ES.po b/locale/es_ES.po
index 3d95211..8827d90 100644
--- a/locale/es_ES.po
+++ b/locale/es_ES.po
@@ -189,8 +189,8 @@ msgid "Active"
msgstr "Activo"
msgctxt "field:product.uom,category:"
-msgid "UOM Category"
-msgstr "Categoría de UdM"
+msgid "Category"
+msgstr "Categoría"
msgctxt "field:product.uom,create_date:"
msgid "Create Date"
diff --git a/locale/fr_FR.po b/locale/fr_FR.po
index 01e84d4..3225132 100644
--- a/locale/fr_FR.po
+++ b/locale/fr_FR.po
@@ -20,7 +20,7 @@ msgstr ""
msgctxt "error:product.uom:"
msgid "Invalid Factor and Rate values in UOM \"%s\"."
-msgstr "Facteur et taux non valides sur l'UDM \"%s\""
+msgstr "Facteur et taux non valides sur l'UDM « %s »."
msgctxt "error:product.uom:"
msgid "Rate and factor can not be both equal to zero."
@@ -134,7 +134,7 @@ msgstr "Catégorie"
msgctxt "field:product.template,consumable:"
msgid "Consumable"
-msgstr "Consomable"
+msgstr "Consommable"
msgctxt "field:product.template,cost_price:"
msgid "Cost Price"
@@ -197,8 +197,8 @@ msgid "Active"
msgstr "Actif"
msgctxt "field:product.uom,category:"
-msgid "UOM Category"
-msgstr "Catégorie d'UDM"
+msgid "Category"
+msgstr "Catégorie"
msgctxt "field:product.uom,create_date:"
msgid "Create Date"
diff --git a/locale/nl_NL.po b/locale/nl_NL.po
index 44de8e8..31e405d 100644
--- a/locale/nl_NL.po
+++ b/locale/nl_NL.po
@@ -303,8 +303,9 @@ msgctxt "field:product.uom,active:"
msgid "Active"
msgstr "Actief"
+#, fuzzy
msgctxt "field:product.uom,category:"
-msgid "UOM Category"
+msgid "Category"
msgstr "ME categorie"
msgctxt "field:product.uom,create_date:"
diff --git a/locale/ru_RU.po b/locale/ru_RU.po
index 86abe6a..c51b078 100644
--- a/locale/ru_RU.po
+++ b/locale/ru_RU.po
@@ -188,8 +188,9 @@ msgctxt "field:product.uom,active:"
msgid "Active"
msgstr "Действующий"
+#, fuzzy
msgctxt "field:product.uom,category:"
-msgid "UOM Category"
+msgid "Category"
msgstr "Категория ед. измерения"
msgctxt "field:product.uom,create_date:"
diff --git a/locale/sl_SI.po b/locale/sl_SI.po
index b1dad08..308455b 100644
--- a/locale/sl_SI.po
+++ b/locale/sl_SI.po
@@ -8,7 +8,7 @@ msgid ""
" it and create a new one."
msgstr ""
"Če ME še vendno ni uporabljena, jo lahko zbrišete ali pa izklopite in "
-"ustvarite novo."
+"izdelate novo."
msgctxt "error:product.uom:"
msgid "Invalid Factor and Rate values in UOM \"%s\"."
@@ -29,11 +29,11 @@ msgstr "Podkategorije"
msgctxt "field:product.category,create_date:"
msgid "Create Date"
-msgstr "Ustvarjeno"
+msgstr "Izdelano"
msgctxt "field:product.category,create_uid:"
msgid "Create User"
-msgstr "Ustvaril"
+msgstr "Izdelal"
msgctxt "field:product.category,id:"
msgid "ID"
@@ -73,11 +73,11 @@ msgstr "Nabavna cena"
msgctxt "field:product.product,create_date:"
msgid "Create Date"
-msgstr "Ustvarjeno"
+msgstr "Izdelano"
msgctxt "field:product.product,create_uid:"
msgid "Create User"
-msgstr "Ustvaril"
+msgstr "Izdelal"
msgctxt "field:product.product,default_uom:"
msgid "Default UOM"
@@ -137,11 +137,11 @@ msgstr "Obračun"
msgctxt "field:product.template,create_date:"
msgid "Create Date"
-msgstr "Ustvarjeno"
+msgstr "Izdelano"
msgctxt "field:product.template,create_uid:"
msgid "Create User"
-msgstr "Ustvaril"
+msgstr "Izdelal"
msgctxt "field:product.template,default_uom:"
msgid "Default UOM"
@@ -188,16 +188,16 @@ msgid "Active"
msgstr "Aktivno"
msgctxt "field:product.uom,category:"
-msgid "UOM Category"
+msgid "Category"
msgstr "Kategorija"
msgctxt "field:product.uom,create_date:"
msgid "Create Date"
-msgstr "Ustvarjeno"
+msgstr "Izdelano"
msgctxt "field:product.uom,create_uid:"
msgid "Create User"
-msgstr "Ustvaril"
+msgstr "Izdelal"
msgctxt "field:product.uom,digits:"
msgid "Display Digits"
@@ -241,11 +241,11 @@ msgstr "Zapisal"
msgctxt "field:product.uom.category,create_date:"
msgid "Create Date"
-msgstr "Ustvarjeno"
+msgstr "Izdelano"
msgctxt "field:product.uom.category,create_uid:"
msgid "Create User"
-msgstr "Ustvaril"
+msgstr "Izdelal"
msgctxt "field:product.uom.category,id:"
msgid "ID"
diff --git a/product.py b/product.py
index 81291b3..9e981a0 100644
--- a/product.py
+++ b/product.py
@@ -225,32 +225,24 @@ class Product(ModelSQL, ModelView):
@classmethod
def search_domain(cls, domain, active_test=True):
+ def is_leaf(expression):
+ return (isinstance(expression, (list, tuple))
+ and len(expression) > 2
+ and isinstance(expression[1], basestring)
+ and expression[1] in OPERATORS) # TODO remove OPERATORS test
+
def convert_domain(domain):
'Replace missing product field by the template one'
- if not domain:
- return []
- operator = 'AND'
- if isinstance(domain[0], basestring):
- operator = domain[0]
- domain = domain[1:]
- result = [operator]
- for arg in domain:
- if (isinstance(arg, (list, tuple))
- and len(arg) > 2
- and isinstance(arg[1], basestring)
- and arg[1] in OPERATORS):
- # clause
- field = arg[0].split('.', 1)[0]
- if not getattr(cls, field, None):
- field = 'template.' + arg[0]
- result.append((field,) + tuple(arg[1:]))
- else:
- result.append(arg)
- elif isinstance(arg, list):
- # sub-domain
- result.append(convert_domain(arg))
+ if is_leaf(domain):
+ field = domain[0].split('.', 1)[0]
+ if not getattr(cls, field, None):
+ field = 'template.' + domain[0]
+ return (field,) + tuple(domain[1:])
else:
- result.append(arg)
- return result
+ return domain
+ elif domain in ['OR', 'AND']:
+ return domain
+ else:
+ return [convert_domain(d) for d in domain]
return super(Product, cls).search_domain(convert_domain(domain),
active_test=active_test)
diff --git a/tryton.cfg b/tryton.cfg
index 1503d7e..a1837a8 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
[tryton]
-version=3.2.0
+version=3.4.0
depends:
ir
res
diff --git a/trytond_product.egg-info/PKG-INFO b/trytond_product.egg-info/PKG-INFO
index f0fdddc..8a2aedc 100644
--- a/trytond_product.egg-info/PKG-INFO
+++ b/trytond_product.egg-info/PKG-INFO
@@ -1,12 +1,12 @@
Metadata-Version: 1.1
Name: trytond-product
-Version: 3.2.0
+Version: 3.4.0
Summary: Tryton module with 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_product
===============
diff --git a/trytond_product.egg-info/SOURCES.txt b/trytond_product.egg-info/SOURCES.txt
index 32fc508..cb1cc68 100644
--- a/trytond_product.egg-info/SOURCES.txt
+++ b/trytond_product.egg-info/SOURCES.txt
@@ -11,10 +11,38 @@ tryton.cfg
uom.xml
./__init__.py
./category.py
+./category.xml
./product.py
+./product.xml
+./tryton.cfg
./uom.py
+./uom.xml
+./icons/tryton-product.svg
+./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/test_product.py
+./view/category_form.xml
+./view/category_list.xml
+./view/category_tree.xml
+./view/product_form.xml
+./view/product_tree.xml
+./view/template_form.xml
+./view/template_tree.xml
+./view/uom_category_form.xml
+./view/uom_category_tree.xml
+./view/uom_form.xml
+./view/uom_tree.xml
doc/index.rst
icons/tryton-product.svg
locale/bg_BG.po
@@ -23,6 +51,7 @@ locale/cs_CZ.po
locale/de_DE.po
locale/es_AR.po
locale/es_CO.po
+locale/es_EC.po
locale/es_ES.po
locale/fr_FR.po
locale/nl_NL.po
diff --git a/trytond_product.egg-info/requires.txt b/trytond_product.egg-info/requires.txt
index 4ec7e11..962f758 100644
--- a/trytond_product.egg-info/requires.txt
+++ b/trytond_product.egg-info/requires.txt
@@ -1,2 +1,2 @@
python-sql
-trytond >= 3.2, < 3.3
\ No newline at end of file
+trytond >= 3.4, < 3.5
\ No newline at end of file
diff --git a/uom.py b/uom.py
index 01cc8bb..2c30d75 100644
--- a/uom.py
+++ b/uom.py
@@ -34,7 +34,7 @@ class Uom(ModelSQL, ModelView):
translate=True, depends=DEPENDS)
symbol = fields.Char('Symbol', size=10, required=True, states=STATES,
translate=True, depends=DEPENDS)
- category = fields.Many2One('product.uom.category', 'UOM Category',
+ category = fields.Many2One('product.uom.category', 'Category',
required=True, ondelete='RESTRICT', states=STATES, depends=DEPENDS)
rate = fields.Float('Rate', digits=(12, 12), required=True,
states=STATES, depends=DEPENDS,
@@ -80,12 +80,6 @@ class Uom(ModelSQL, ModelView):
})
@classmethod
- def __post_setup__(cls):
- super(Uom, cls).__post_setup__()
- if 'category' not in cls._fields:
- print cls, cls._fields
-
- @classmethod
def check_xml_record(cls, records, values):
return True
--
tryton-modules-product
More information about the tryton-debian-vcs
mailing list