[tryton-debian-vcs] tryton-modules-product branch debian created. d466ede3923f766b5a927477d4ecd107fad26671
Mathias Behrle
tryton-debian-vcs at alioth.debian.org
Wed Nov 27 17:04:44 UTC 2013
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=d466ede3923f766b5a927477d4ecd107fad26671
commit d466ede3923f766b5a927477d4ecd107fad26671
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Mon Nov 25 20:30:17 2013 +0100
Releasing debian version 3.0.0-1.
diff --git a/debian/changelog b/debian/changelog
index 411cc08..d73a794 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+tryton-modules-product (3.0.0-1) unstable; urgency=low
+
+ * Removing inadvertently commited .pc directory.
+ * Merging upstream version 3.0.0.
+ * Updating to standards version 3.9.5, no changes needed.
+ * Changing to buildsystem pybuild.
+ * Adding python-sql to Depends.
+
+ -- Mathias Behrle <mathiasb at m9s.biz> Mon, 25 Nov 2013 17:54:26 +0100
+
tryton-modules-product (2.8.1-1) unstable; urgency=low
* Merging upstream version 2.8.1.
commit 490c50cf3ff8a6586463c511f9ec47c3378a8d73
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Mon Nov 25 17:43:44 2013 +0100
Adding python-sql to Depends.
diff --git a/debian/control b/debian/control
index 7e08e50..5a897cd 100644
--- a/debian/control
+++ b/debian/control
@@ -15,7 +15,7 @@ Package: tryton-modules-product
Architecture: all
Depends:
${misc:Depends}, ${python:Depends}, tryton-server (>= ${version:major}),
- python-pkg-resources
+ python-sql, python-pkg-resources
Description: Tryton Application Platform (Product Module)
Tryton is a high-level general purpose application platform written in Python
and using PostgreSQL as database engine. It is the core base of a complete
commit b5b69be4fdc0af8558a49d34b01b720361499a64
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Sun Nov 24 19:51:51 2013 +0100
Changing to buildsystem pybuild.
diff --git a/debian/control b/debian/control
index 216a6ab..7e08e50 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,8 @@ Section: python
Priority: optional
Maintainer: Debian Tryton Maintainers <maintainers at debian.tryton.org>
Uploaders: Mathias Behrle <mathiasb at m9s.biz>
-Build-Depends: debhelper (>= 9), python (>= 2.6.6-3~), python-setuptools
+Build-Depends:
+ debhelper (>= 9), python (>= 2.6.6-3~), python-setuptools, dh-python
Standards-Version: 3.9.5
Homepage: http://www.tryton.org/
Vcs-Browser: http://debian.tryton.org/gitweb/?p=packages/tryton-modules-product.git
diff --git a/debian/rules b/debian/rules
index 30074ad..5b8c326 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,24 +1,17 @@
#!/usr/bin/make -f
-MAJOR := $(shell python setup.py --version | awk -F "." '{print $$1 "." $$2}')
-PACKAGE_NAME := $(shell python setup.py --name)
-
-%:
- dh ${@} --with python2
+# needed for pbuilder
+export LC_ALL=C.UTF-8
-override_dh_auto_clean:
- dh_auto_clean
+MAJOR := $(shell python setup.py --version | awk -F "." '{print $$1 "." $$2}')
+PACKAGE_NAME := tryton-modules-$(shell python setup.py --name | sed s/^trytond_// | sed s/_/-/g)
+export PYBUILD_DESTDIR_python2=debian/${PACKAGE_NAME}
-override_dh_auto_build:
- mv $(PACKAGE_NAME).egg-info $(PACKAGE_NAME).hen-info
- mv PKG-INFO PKG-INFO.hen
- dh_auto_build
+# Don't run tests for Tryton modules, they try to download dependencies from pypi
+export PYBUILD_DISABLE_python2.7=test
-override_dh_auto_install:
- dh_auto_install
- rm -rf *.egg-info
- mv $(PACKAGE_NAME).hen-info $(PACKAGE_NAME).egg-info
- mv PKG-INFO.hen PKG-INFO
+%:
+ dh ${@} --with python2 --buildsystem=pybuild
override_dh_gencontrol:
dh_gencontrol -- -Vversion:major="$(MAJOR)"
commit 0fa31be88a96a5d6c2e45ac3b148444050a76791
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Sun Nov 24 19:14:21 2013 +0100
Updating to standards version 3.9.5, no changes needed.
diff --git a/debian/control b/debian/control
index ce3f72f..216a6ab 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: optional
Maintainer: Debian Tryton Maintainers <maintainers at debian.tryton.org>
Uploaders: Mathias Behrle <mathiasb at m9s.biz>
Build-Depends: debhelper (>= 9), python (>= 2.6.6-3~), python-setuptools
-Standards-Version: 3.9.4
+Standards-Version: 3.9.5
Homepage: http://www.tryton.org/
Vcs-Browser: http://debian.tryton.org/gitweb/?p=packages/tryton-modules-product.git
Vcs-Git: git://debian.tryton.org/packages/tryton-modules-product.git
commit a8d1a70462a122946e217063fb60eac53ec86670
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Sun Nov 24 17:27:26 2013 +0100
Merging upstream version 3.0.0.
diff --git a/CHANGELOG b/CHANGELOG
index 28df943..3bb38a0 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,4 +1,4 @@
-Version 2.8.1 - 2013-10-01
+Version 3.0.0 - 2013-10-21
* Bug fixes (see mercurial logs for details)
Version 2.8.0 - 2013-04-22
diff --git a/INSTALL b/INSTALL
index b821262..f86a464 100644
--- a/INSTALL
+++ b/INSTALL
@@ -6,6 +6,7 @@ Prerequisites
* Python 2.6 or later (http://www.python.org/)
* trytond (http://www.tryton.org/)
+ * python-sql (http://code.google.com/p/python-sql/)
Installation
------------
diff --git a/PKG-INFO b/PKG-INFO
index 7b95c39..6fe687d 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,12 +1,12 @@
Metadata-Version: 1.1
Name: trytond_product
-Version: 2.8.1
+Version: 3.0.0
Summary: Tryton module with products
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
===============
@@ -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/category.xml b/category.xml
index fb008df..7cfc937 100644
--- a/category.xml
+++ b/category.xml
@@ -25,7 +25,7 @@ this repository contains the full copyright notices and license terms. -->
<record model="ir.action.act_window" id="act_category_tree">
<field name="name">Categories</field>
<field name="res_model">product.category</field>
- <field name="domain">[('parent', '=', False)]</field>
+ <field name="domain">[('parent', '=', None)]</field>
</record>
<record model="ir.action.act_window.view" id="act_category_tree_view1">
<field name="sequence" eval="10"/>
diff --git a/locale/ca_ES.po b/locale/ca_ES.po
index ea268d1..c4e988d 100644
--- a/locale/ca_ES.po
+++ b/locale/ca_ES.po
@@ -7,8 +7,8 @@ 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 s'ha usat la UdM, pot esborrar-la, en cas contrari, pot desactivar-la "
-"i crear-ne una de nova."
+"Si no s'ha usat la UdM, podeu esborrar-la, en cas contrari, podeu "
+"desactivar-la i crear-ne una de nova."
msgctxt "error:product.uom:"
msgid "Invalid Factor and Rate values in UOM \"%s\"."
@@ -218,7 +218,7 @@ msgstr "Nom"
msgctxt "field:product.uom,rate:"
msgid "Rate"
-msgstr "Conversió"
+msgstr "RÃ tio"
msgctxt "field:product.uom,rec_name:"
msgid "Name"
@@ -296,7 +296,6 @@ msgctxt "model:ir.action,name:act_category_tree"
msgid "Categories"
msgstr "Categories"
-#, fuzzy
msgctxt "model:ir.action,name:act_product_form"
msgid "Variants"
msgstr "Productes"
@@ -329,7 +328,6 @@ msgctxt "model:ir.ui.menu,name:menu_main_product"
msgid "Product"
msgstr "Producte"
-#, fuzzy
msgctxt "model:ir.ui.menu,name:menu_product"
msgid "Variants"
msgstr "Variants"
diff --git a/locale/de_DE.po b/locale/de_DE.po
index 53f2048..18f71f7 100644
--- a/locale/de_DE.po
+++ b/locale/de_DE.po
@@ -300,11 +300,11 @@ msgstr ""
msgctxt "model:ir.action,name:act_category_list"
msgid "Categories"
-msgstr "Parteikategorien"
+msgstr "Artikelkategorien"
msgctxt "model:ir.action,name:act_category_tree"
msgid "Categories"
-msgstr "Parteikategorien"
+msgstr "Artikelkategorien"
msgctxt "model:ir.action,name:act_product_form"
msgid "Variants"
diff --git a/locale/es_CO.po b/locale/es_CO.po
index f93bc16..33eac95 100644
--- a/locale/es_CO.po
+++ b/locale/es_CO.po
@@ -94,7 +94,7 @@ msgstr "ID"
msgctxt "field:product.product,list_price_uom:"
msgid "List Price"
-msgstr "Precio de Lista"
+msgstr "Precio de Venta"
msgctxt "field:product.product,rec_name:"
msgid "Name"
@@ -134,7 +134,7 @@ msgstr "Precio de Costo"
msgctxt "field:product.template,cost_price_method:"
msgid "Cost Method"
-msgstr "Método de Costo"
+msgstr "Método de Costeo"
msgctxt "field:product.template,create_date:"
msgid "Create Date"
@@ -158,7 +158,7 @@ msgstr "ID"
msgctxt "field:product.template,list_price:"
msgid "List Price"
-msgstr "Precio de Lista"
+msgstr "Precio de Venta"
msgctxt "field:product.template,name:"
msgid "Name"
@@ -166,7 +166,7 @@ msgstr "Nombre"
msgctxt "field:product.template,products:"
msgid "Variants"
-msgstr "Productos"
+msgstr "Variantes"
msgctxt "field:product.template,rec_name:"
msgid "Name"
@@ -298,7 +298,7 @@ msgstr "CategorÃas"
msgctxt "model:ir.action,name:act_product_form"
msgid "Variants"
-msgstr "Variedad"
+msgstr "Variantes"
msgctxt "model:ir.action,name:act_template_by_category"
msgid "Product by Category"
@@ -306,7 +306,7 @@ msgstr "Producto por CategorÃa"
msgctxt "model:ir.action,name:act_template_form"
msgid "Products"
-msgstr "Productos"
+msgstr "Catálogo de Productos"
msgctxt "model:ir.action,name:act_uom_category_form"
msgid "Categories of Unit of Measure"
@@ -326,15 +326,15 @@ msgstr "CategorÃas"
msgctxt "model:ir.ui.menu,name:menu_main_product"
msgid "Product"
-msgstr "Producto"
+msgstr "Productos"
msgctxt "model:ir.ui.menu,name:menu_product"
msgid "Variants"
-msgstr "Variedad"
+msgstr "Variedades"
msgctxt "model:ir.ui.menu,name:menu_template"
msgid "Products"
-msgstr "Productos"
+msgstr "Catálogo de Productos"
msgctxt "model:ir.ui.menu,name:menu_uom_category_form"
msgid "Categories"
@@ -704,12 +704,10 @@ msgctxt "view:product.template:"
msgid "General"
msgstr "General"
-#, fuzzy
msgctxt "view:product.template:"
msgid "Product"
-msgstr "Productos"
+msgstr "Producto"
-#, fuzzy
msgctxt "view:product.template:"
msgid "Products"
msgstr "Productos"
diff --git a/locale/es_ES.po b/locale/es_ES.po
index ba5ca44..bd32654 100644
--- a/locale/es_ES.po
+++ b/locale/es_ES.po
@@ -12,7 +12,7 @@ msgstr ""
msgctxt "error:product.uom:"
msgid "Invalid Factor and Rate values in UOM \"%s\"."
-msgstr "Valores de factor y ratio en UdM \"%s\" no es correcto."
+msgstr "Valores de factor y ratio en UdM \"%s\" no correctos."
msgctxt "error:product.uom:"
msgid "Rate and factor can not be both equal to zero."
@@ -296,7 +296,6 @@ msgctxt "model:ir.action,name:act_category_tree"
msgid "Categories"
msgstr "CategorÃas"
-#, fuzzy
msgctxt "model:ir.action,name:act_product_form"
msgid "Variants"
msgstr "Productos"
@@ -329,7 +328,6 @@ msgctxt "model:ir.ui.menu,name:menu_main_product"
msgid "Product"
msgstr "Productos"
-#, fuzzy
msgctxt "model:ir.ui.menu,name:menu_product"
msgid "Variants"
msgstr "Variantes"
diff --git a/locale/fr_FR.po b/locale/fr_FR.po
index f671ccc..e158985 100644
--- a/locale/fr_FR.po
+++ b/locale/fr_FR.po
@@ -19,14 +19,6 @@ msgstr ""
"désactiver et en créer une nouvelle."
msgctxt "error:product.uom:"
-msgid ""
-"If the UOM is still not used, you can delete it otherwise you can deactivate"
-" it and create a new one."
-msgstr ""
-"Si l'UDM n'est pas utilisée, vous pouvez la supprimer, sinon vous pouvez la "
-"désactiver et en créer une nouvelle."
-
-msgctxt "error:product.uom:"
msgid "Invalid Factor and Rate values in UOM \"%s\"."
msgstr "Facteur et taux non valides sur l'UDM \"%s\""
@@ -35,16 +27,6 @@ msgid "Rate and factor can not be both equal to zero."
msgstr "Le taux et le facteur ne peuvent pas être égaux à zéro."
msgctxt "error:product.uom:"
-msgid "Rate and factor can not be both equal to zero."
-msgstr "Le taux et le facteur ne peuvent pas être égaux à zéro."
-
-msgctxt "error:product.uom:"
-msgid "You cannot change Rate, Factor or Category on a Unit of Measure. "
-msgstr ""
-"Vous ne pouvez pas changer le taux, le facteur ou la catégorie d'une unité "
-"de mesure."
-
-msgctxt "error:product.uom:"
msgid "You cannot change Rate, Factor or Category on a Unit of Measure. "
msgstr ""
"Vous ne pouvez pas changer le taux, le facteur ou la catégorie d'une unité "
@@ -691,14 +673,6 @@ msgid "Average"
msgstr "Moyenne"
msgctxt "selection:product.template,cost_price_method:"
-msgid "Average"
-msgstr "Moyenne"
-
-msgctxt "selection:product.template,cost_price_method:"
-msgid "Fixed"
-msgstr "Fixe"
-
-msgctxt "selection:product.template,cost_price_method:"
msgid "Fixed"
msgstr "Fixe"
@@ -714,14 +688,6 @@ msgctxt "selection:product.template,type:"
msgid "Service"
msgstr "Service"
-msgctxt "selection:product.template,type:"
-msgid "Service"
-msgstr "Service"
-
-msgctxt "view:product.category:"
-msgid "Children"
-msgstr "Enfants"
-
msgctxt "view:product.category:"
msgid "Children"
msgstr "Enfants"
@@ -731,14 +697,6 @@ msgid "Product Categories"
msgstr "Catégories de produit"
msgctxt "view:product.category:"
-msgid "Product Categories"
-msgstr "Catégories de produit"
-
-msgctxt "view:product.category:"
-msgid "Product Category"
-msgstr "Catégorie de produit"
-
-msgctxt "view:product.category:"
msgid "Product Category"
msgstr "Catégorie de produit"
@@ -750,14 +708,6 @@ msgctxt "view:product.product:"
msgid "Products"
msgstr "Produits"
-msgctxt "view:product.product:"
-msgid "Products"
-msgstr "Produits"
-
-msgctxt "view:product.template:"
-msgid "General"
-msgstr "Général"
-
msgctxt "view:product.template:"
msgid "General"
msgstr "Général"
@@ -775,14 +725,6 @@ msgid "Categories of Unit of Measure"
msgstr "Catégories d'Unité de mesure"
msgctxt "view:product.uom.category:"
-msgid "Categories of Unit of Measure"
-msgstr "Catégories d'Unité de mesure"
-
-msgctxt "view:product.uom.category:"
-msgid "Category of Unit of Measure"
-msgstr "Catégorie d'unité de mesure"
-
-msgctxt "view:product.uom.category:"
msgid "Category of Unit of Measure"
msgstr "Catégorie d'unité de mesure"
@@ -791,13 +733,5 @@ msgid "Unit of Measure"
msgstr "Unité de mesure"
msgctxt "view:product.uom:"
-msgid "Unit of Measure"
-msgstr "Unité de mesure"
-
-msgctxt "view:product.uom:"
-msgid "Units of Measure"
-msgstr "Unités de mesure"
-
-msgctxt "view:product.uom:"
msgid "Units of Measure"
msgstr "Unités de mesure"
diff --git a/locale/ca_ES.po b/locale/sl_SI.po
similarity index 77%
copy from locale/ca_ES.po
copy to locale/sl_SI.po
index ea268d1..6767a3f 100644
--- a/locale/ca_ES.po
+++ b/locale/sl_SI.po
@@ -7,34 +7,33 @@ 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 s'ha usat la UdM, pot esborrar-la, en cas contrari, pot desactivar-la "
-"i crear-ne una de nova."
+"Če ME še vendno ni uporabljena, jo lahko zbrišete ali pa izklopite in "
+"ustvarite novo."
msgctxt "error:product.uom:"
msgid "Invalid Factor and Rate values in UOM \"%s\"."
-msgstr "Valors de factor i ratio a UdM \"%s\" incorrectes."
+msgstr "Neveljavna faktor in razmerje v ME\"%s\"."
msgctxt "error:product.uom:"
msgid "Rate and factor can not be both equal to zero."
-msgstr "Conversió i factor no poden ser zero simultà niament."
+msgstr "Oba, razmerje in faktor, ne moreta biti enaka niÄli."
msgctxt "error:product.uom:"
msgid "You cannot change Rate, Factor or Category on a Unit of Measure. "
msgstr ""
-"No podeu canviar la conversió, el factor o la categoria d'una unitat de "
-"mesura."
+"Pri merski enoti ni možno popraviti razmerja, faktorja ali kategorije."
msgctxt "field:product.category,childs:"
msgid "Children"
-msgstr "Fills"
+msgstr "Podkategorije"
msgctxt "field:product.category,create_date:"
msgid "Create Date"
-msgstr "Data creació"
+msgstr "Ustvarjeno"
msgctxt "field:product.category,create_uid:"
msgid "Create User"
-msgstr "Usuari creació"
+msgstr "Ustvaril"
msgctxt "field:product.category,id:"
msgid "ID"
@@ -42,51 +41,51 @@ msgstr "ID"
msgctxt "field:product.category,name:"
msgid "Name"
-msgstr "Nom"
+msgstr "Naziv"
msgctxt "field:product.category,parent:"
msgid "Parent"
-msgstr "Pare"
+msgstr "MatiÄna kategorija"
msgctxt "field:product.category,rec_name:"
msgid "Name"
-msgstr "Nom"
+msgstr "Ime"
msgctxt "field:product.category,write_date:"
msgid "Write Date"
-msgstr "Data modificació"
+msgstr "Zapisano"
msgctxt "field:product.category,write_uid:"
msgid "Write User"
-msgstr "Usuari modificació"
+msgstr "Zapisal"
msgctxt "field:product.product,active:"
msgid "Active"
-msgstr "Actiu"
+msgstr "Aktivno"
msgctxt "field:product.product,code:"
msgid "Code"
-msgstr "Codi"
+msgstr "Å ifra"
msgctxt "field:product.product,cost_price_uom:"
msgid "Cost Price"
-msgstr "Preu de cost"
+msgstr "Nabavna cena"
msgctxt "field:product.product,create_date:"
msgid "Create Date"
-msgstr "Data creació"
+msgstr "Ustvarjeno"
msgctxt "field:product.product,create_uid:"
msgid "Create User"
-msgstr "Usuari creació"
+msgstr "Ustvaril"
msgctxt "field:product.product,default_uom:"
msgid "Default UOM"
-msgstr "UdM per defecte"
+msgstr "Privzeta ME"
msgctxt "field:product.product,description:"
msgid "Description"
-msgstr "Descripció"
+msgstr "Opis"
msgctxt "field:product.product,id:"
msgid "ID"
@@ -94,63 +93,63 @@ msgstr "ID"
msgctxt "field:product.product,list_price_uom:"
msgid "List Price"
-msgstr "Preu de venda"
+msgstr "Prodajna cena"
msgctxt "field:product.product,rec_name:"
msgid "Name"
-msgstr "Nom"
+msgstr "Ime"
msgctxt "field:product.product,template:"
msgid "Product Template"
-msgstr "Plantilla de producte"
+msgstr "Predloga"
msgctxt "field:product.product,type:"
msgid "Type"
-msgstr "Tipus"
+msgstr "Tip"
msgctxt "field:product.product,write_date:"
msgid "Write Date"
-msgstr "Data modificació"
+msgstr "Zapisano"
msgctxt "field:product.product,write_uid:"
msgid "Write User"
-msgstr "Usuari modificació"
+msgstr "Zapisal"
msgctxt "field:product.template,active:"
msgid "Active"
-msgstr "Actiu"
+msgstr "Aktivno"
msgctxt "field:product.template,category:"
msgid "Category"
-msgstr "Categoria"
+msgstr "Kategorija"
msgctxt "field:product.template,consumable:"
msgid "Consumable"
-msgstr "Consumible"
+msgstr "Potrošni material"
msgctxt "field:product.template,cost_price:"
msgid "Cost Price"
-msgstr "Preu de cost"
+msgstr "Nabavna cena"
msgctxt "field:product.template,cost_price_method:"
msgid "Cost Method"
-msgstr "Mètode de cost"
+msgstr "ObraÄun"
msgctxt "field:product.template,create_date:"
msgid "Create Date"
-msgstr "Data creació"
+msgstr "Ustvarjeno"
msgctxt "field:product.template,create_uid:"
msgid "Create User"
-msgstr "Usuari creació"
+msgstr "Ustvaril"
msgctxt "field:product.template,default_uom:"
msgid "Default UOM"
-msgstr "UdM per defecte"
+msgstr "Privzeta ME"
msgctxt "field:product.template,default_uom_category:"
msgid "Default UOM Category"
-msgstr "Categoria per defecte UdM"
+msgstr "Kategorija privzete ME"
msgctxt "field:product.template,id:"
msgid "ID"
@@ -158,55 +157,55 @@ msgstr "ID"
msgctxt "field:product.template,list_price:"
msgid "List Price"
-msgstr "Preu de venda"
+msgstr "Prodajna cena"
msgctxt "field:product.template,name:"
msgid "Name"
-msgstr "Nom"
+msgstr "Naziv"
msgctxt "field:product.template,products:"
msgid "Variants"
-msgstr "Variants"
+msgstr "RazliÄice"
msgctxt "field:product.template,rec_name:"
msgid "Name"
-msgstr "Nom"
+msgstr "Ime"
msgctxt "field:product.template,type:"
msgid "Type"
-msgstr "Tipus"
+msgstr "Tip"
msgctxt "field:product.template,write_date:"
msgid "Write Date"
-msgstr "Data modificació"
+msgstr "Zapisano"
msgctxt "field:product.template,write_uid:"
msgid "Write User"
-msgstr "Usuari modificació"
+msgstr "Zapisal"
msgctxt "field:product.uom,active:"
msgid "Active"
-msgstr "Actiu"
+msgstr "Aktivno"
msgctxt "field:product.uom,category:"
msgid "UOM Category"
-msgstr "Categoria d'UdM"
+msgstr "Kategorija"
msgctxt "field:product.uom,create_date:"
msgid "Create Date"
-msgstr "Data creació"
+msgstr "Ustvarjeno"
msgctxt "field:product.uom,create_uid:"
msgid "Create User"
-msgstr "Usuari creació"
+msgstr "Ustvaril"
msgctxt "field:product.uom,digits:"
msgid "Display Digits"
-msgstr "Decimals a mostrar"
+msgstr "Decimalke"
msgctxt "field:product.uom,factor:"
msgid "Factor"
-msgstr "Factor"
+msgstr "Faktor"
msgctxt "field:product.uom,id:"
msgid "ID"
@@ -214,39 +213,39 @@ msgstr "ID"
msgctxt "field:product.uom,name:"
msgid "Name"
-msgstr "Nom"
+msgstr "Naziv"
msgctxt "field:product.uom,rate:"
msgid "Rate"
-msgstr "Conversió"
+msgstr "Razmerje"
msgctxt "field:product.uom,rec_name:"
msgid "Name"
-msgstr "Nom"
+msgstr "Ime"
msgctxt "field:product.uom,rounding:"
msgid "Rounding Precision"
-msgstr "Precisió d'arrodoniment"
+msgstr "Zaokroževanje"
msgctxt "field:product.uom,symbol:"
msgid "Symbol"
-msgstr "SÃmbol"
+msgstr "Simbol"
msgctxt "field:product.uom,write_date:"
msgid "Write Date"
-msgstr "Data modificació"
+msgstr "Zapisano"
msgctxt "field:product.uom,write_uid:"
msgid "Write User"
-msgstr "Usuari modificació"
+msgstr "Zapisal"
msgctxt "field:product.uom.category,create_date:"
msgid "Create Date"
-msgstr "Data creació"
+msgstr "Ustvarjeno"
msgctxt "field:product.uom.category,create_uid:"
msgid "Create User"
-msgstr "Usuari creació"
+msgstr "Ustvaril"
msgctxt "field:product.uom.category,id:"
msgid "ID"
@@ -254,241 +253,239 @@ msgstr "ID"
msgctxt "field:product.uom.category,name:"
msgid "Name"
-msgstr "Nom"
+msgstr "Naziv"
msgctxt "field:product.uom.category,rec_name:"
msgid "Name"
-msgstr "Nom"
+msgstr "Ime"
msgctxt "field:product.uom.category,uoms:"
msgid "Unit of Measures"
-msgstr "Unitats de mesura"
+msgstr "Merske enote"
msgctxt "field:product.uom.category,write_date:"
msgid "Write Date"
-msgstr "Data modificació"
+msgstr "Zapisano"
msgctxt "field:product.uom.category,write_uid:"
msgid "Write User"
-msgstr "Usuari modificació"
+msgstr "Zapisal"
msgctxt "help:product.uom,factor:"
msgid ""
"The coefficient for the formula:\n"
"coef (base unit) = 1 (this unit)"
msgstr ""
-"El coeficient de la fórmula:\n"
-"coeficient (unitat base) = 1 (aquesta unitat)"
+"Koeficient za formulo:\n"
+"koef * (osnovna enota) = 1 (ta enota)"
msgctxt "help:product.uom,rate:"
msgid ""
"The coefficient for the formula:\n"
"1 (base unit) = coef (this unit)"
msgstr ""
-"El coeficient de la fórmula:\n"
-"1 (unitat base) = coeficient (aquesta unitat)"
+"Koeficient za formulo:\n"
+"1 (osnovna enota) = koef * (ta enota)"
msgctxt "model:ir.action,name:act_category_list"
msgid "Categories"
-msgstr "Categories"
+msgstr "Kategorije"
msgctxt "model:ir.action,name:act_category_tree"
msgid "Categories"
-msgstr "Categories"
+msgstr "Kategorije"
-#, fuzzy
msgctxt "model:ir.action,name:act_product_form"
msgid "Variants"
-msgstr "Productes"
+msgstr "RazliÄice"
msgctxt "model:ir.action,name:act_template_by_category"
msgid "Product by Category"
-msgstr "Productes per categoria"
+msgstr "Izdelki po kategorijah"
msgctxt "model:ir.action,name:act_template_form"
msgid "Products"
-msgstr "Productes"
+msgstr "Izdelki"
msgctxt "model:ir.action,name:act_uom_category_form"
msgid "Categories of Unit of Measure"
-msgstr "Categories de la unitat de mesura"
+msgstr "Kategorije merskih enot"
msgctxt "model:ir.action,name:act_uom_form"
msgid "Units of Measure"
-msgstr "Unitats de mesura"
+msgstr "Merske enote"
msgctxt "model:ir.ui.menu,name:menu_category_list"
msgid "Categories"
-msgstr "Categories"
+msgstr "Kategorije"
msgctxt "model:ir.ui.menu,name:menu_category_tree"
msgid "Categories"
-msgstr "Categories"
+msgstr "Kategorije"
msgctxt "model:ir.ui.menu,name:menu_main_product"
msgid "Product"
-msgstr "Producte"
+msgstr "Izdelek"
-#, fuzzy
msgctxt "model:ir.ui.menu,name:menu_product"
msgid "Variants"
-msgstr "Variants"
+msgstr "RazliÄice"
msgctxt "model:ir.ui.menu,name:menu_template"
msgid "Products"
-msgstr "Productes"
+msgstr "Izdelki"
msgctxt "model:ir.ui.menu,name:menu_uom_category_form"
msgid "Categories"
-msgstr "Categories"
+msgstr "Kategorije"
msgctxt "model:ir.ui.menu,name:menu_uom_form"
msgid "Units of Measure"
-msgstr "Unitats de mesura"
+msgstr "Merske enote"
msgctxt "model:product.category,name:"
msgid "Product Category"
-msgstr "Categoria de producte"
+msgstr "Kategorija izdelkov"
msgctxt "model:product.product,name:"
msgid "Product Variant"
-msgstr "Variant de producte"
+msgstr "RazliÄica"
msgctxt "model:product.template,name:"
msgid "Product Template"
-msgstr "Plantilla de producte"
+msgstr "Predloga izdelka"
msgctxt "model:product.uom,name:"
msgid "Unit of measure"
-msgstr "Unitat de mesura"
+msgstr "Merska enota"
msgctxt "model:product.uom,name:uom_are"
msgid "Are"
-msgstr "Àrea"
+msgstr "ar"
msgctxt "model:product.uom,name:uom_carat"
msgid "Carat"
-msgstr "Quirat"
+msgstr "karat"
msgctxt "model:product.uom,name:uom_centimeter"
msgid "centimeter"
-msgstr "centÃmetre"
+msgstr "centimeter"
msgctxt "model:product.uom,name:uom_cubic_centimeter"
msgid "Cubic centimeter"
-msgstr "CentÃmetre cúbic"
+msgstr "kubiÄni centimeter"
msgctxt "model:product.uom,name:uom_cubic_foot"
msgid "Cubic foot"
-msgstr "Peu cúbic"
+msgstr "kubiÄni Äevelj"
msgctxt "model:product.uom,name:uom_cubic_inch"
msgid "Cubic inch"
-msgstr "Polzada cúbica"
+msgstr "kubiÄni palec"
msgctxt "model:product.uom,name:uom_cubic_meter"
msgid "Cubic meter"
-msgstr "Metre cúbic"
+msgstr "kubiÄni meter"
msgctxt "model:product.uom,name:uom_day"
msgid "Day"
-msgstr "Dia"
+msgstr "dan"
msgctxt "model:product.uom,name:uom_foot"
msgid "Foot"
-msgstr "Peu"
+msgstr "Äevelj"
msgctxt "model:product.uom,name:uom_gallon"
msgid "Gallon"
-msgstr "Galó"
+msgstr "galona"
msgctxt "model:product.uom,name:uom_gram"
msgid "Gram"
-msgstr "Gram"
+msgstr "gram"
msgctxt "model:product.uom,name:uom_hectare"
msgid "Hectare"
-msgstr "Hectà rea"
+msgstr "hektar"
msgctxt "model:product.uom,name:uom_hour"
msgid "Hour"
-msgstr "Hora"
+msgstr "ura"
msgctxt "model:product.uom,name:uom_inch"
msgid "Inch"
-msgstr "Polzada"
+msgstr "palec"
msgctxt "model:product.uom,name:uom_kilogram"
msgid "Kilogram"
-msgstr "Quilogram"
+msgstr "kilogram"
msgctxt "model:product.uom,name:uom_kilometer"
msgid "Kilometer"
-msgstr "Quilòmetre"
+msgstr "kilometer"
msgctxt "model:product.uom,name:uom_liter"
msgid "Liter"
-msgstr "Litre"
+msgstr "liter"
msgctxt "model:product.uom,name:uom_meter"
msgid "Meter"
-msgstr "Metre"
+msgstr "meter"
msgctxt "model:product.uom,name:uom_mile"
msgid "Mile"
-msgstr "Milla"
+msgstr "milja"
msgctxt "model:product.uom,name:uom_millimeter"
msgid "Millimeter"
-msgstr "Mil·lÃmetre"
+msgstr "milimeter"
msgctxt "model:product.uom,name:uom_minute"
msgid "Minute"
-msgstr "Minut"
+msgstr "minuta"
msgctxt "model:product.uom,name:uom_ounce"
msgid "Ounce"
-msgstr "Unça"
+msgstr "unÄa"
msgctxt "model:product.uom,name:uom_pound"
msgid "Pound"
-msgstr "Lliura"
+msgstr "funt"
msgctxt "model:product.uom,name:uom_second"
msgid "Second"
-msgstr "Segon"
+msgstr "sekunda"
msgctxt "model:product.uom,name:uom_square_centimeter"
msgid "Square centimeter"
-msgstr "CentÃmetre quadrat"
+msgstr "kvadratni centimeter"
msgctxt "model:product.uom,name:uom_square_foot"
msgid "Square foot"
-msgstr "Peu quadrat"
+msgstr "kvadratni Äevelj"
msgctxt "model:product.uom,name:uom_square_inch"
msgid "Square inch"
-msgstr "Polzada quadrada"
+msgstr "kvadratni palec"
msgctxt "model:product.uom,name:uom_square_meter"
msgid "Square meter"
-msgstr "Metre quadrat"
+msgstr "kvadratni meter"
msgctxt "model:product.uom,name:uom_square_yard"
msgid "Square yard"
-msgstr "Iarda quadrada"
+msgstr "kvadratni jard"
msgctxt "model:product.uom,name:uom_unit"
msgid "Unit"
-msgstr "Unitat"
+msgstr "enota"
msgctxt "model:product.uom,name:uom_work_day"
msgid "Work Day"
-msgstr "Dia de treball"
+msgstr "Delovni dan"
msgctxt "model:product.uom,name:uom_yard"
msgid "Yard"
-msgstr "Iarda"
+msgstr "jard"
msgctxt "model:product.uom,symbol:uom_are"
msgid "a"
@@ -508,11 +505,11 @@ msgstr "cm³"
msgctxt "model:product.uom,symbol:uom_cubic_foot"
msgid "ft³"
-msgstr "peu³"
+msgstr "ft³"
msgctxt "model:product.uom,symbol:uom_cubic_inch"
msgid "in³"
-msgstr "pul³"
+msgstr "in³"
msgctxt "model:product.uom,symbol:uom_cubic_meter"
msgid "m³"
@@ -524,7 +521,7 @@ msgstr "d"
msgctxt "model:product.uom,symbol:uom_foot"
msgid "ft"
-msgstr "peu"
+msgstr "ft"
msgctxt "model:product.uom,symbol:uom_gallon"
msgid "gal"
@@ -544,7 +541,7 @@ msgstr "h"
msgctxt "model:product.uom,symbol:uom_inch"
msgid "in"
-msgstr "pul"
+msgstr "in"
msgctxt "model:product.uom,symbol:uom_kilogram"
msgid "kg"
@@ -592,11 +589,11 @@ msgstr "cm²"
msgctxt "model:product.uom,symbol:uom_square_foot"
msgid "ft²"
-msgstr "peu²"
+msgstr "ft²"
msgctxt "model:product.uom,symbol:uom_square_inch"
msgid "in²"
-msgstr "pul²"
+msgstr "in²"
msgctxt "model:product.uom,symbol:uom_square_meter"
msgid "m²"
@@ -608,11 +605,11 @@ msgstr "yd²"
msgctxt "model:product.uom,symbol:uom_unit"
msgid "u"
-msgstr "u"
+msgstr "e"
msgctxt "model:product.uom,symbol:uom_work_day"
msgid "wd"
-msgstr "wd"
+msgstr "dd"
msgctxt "model:product.uom,symbol:uom_yard"
msgid "yd"
@@ -620,112 +617,112 @@ msgstr "yd"
msgctxt "model:product.uom.category,name:"
msgid "Product uom category"
-msgstr "Categoria d'UdM de producte"
+msgstr "Kategorija ME izdelkov"
msgctxt "model:product.uom.category,name:uom_cat_length"
msgid "Length"
-msgstr "Longitud"
+msgstr "Dolžina"
msgctxt "model:product.uom.category,name:uom_cat_surface"
msgid "Surface"
-msgstr "SuperfÃcie"
+msgstr "Površina"
msgctxt "model:product.uom.category,name:uom_cat_time"
msgid "Time"
-msgstr "Temps"
+msgstr "ÄŒas"
msgctxt "model:product.uom.category,name:uom_cat_unit"
msgid "Units"
-msgstr "Unitats"
+msgstr "Enote"
msgctxt "model:product.uom.category,name:uom_cat_volume"
msgid "Volume"
-msgstr "Volum"
+msgstr "Prostornina"
msgctxt "model:product.uom.category,name:uom_cat_weight"
msgid "Weight"
-msgstr "Pes"
+msgstr "Teža"
msgctxt "model:res.group,name:group_product_admin"
msgid "Product Administration"
-msgstr "Administració de productes"
+msgstr "Izdelek - vodenje"
msgctxt "selection:product.product,type:"
msgid "Assets"
-msgstr "Actius"
+msgstr "Osnovna sredstva"
msgctxt "selection:product.product,type:"
msgid "Goods"
-msgstr "Béns"
+msgstr "Blago"
msgctxt "selection:product.product,type:"
msgid "Service"
-msgstr "Serveis"
+msgstr "Storitev"
msgctxt "selection:product.template,cost_price_method:"
msgid "Average"
-msgstr "Mitjana"
+msgstr "PovpreÄna cena"
msgctxt "selection:product.template,cost_price_method:"
msgid "Fixed"
-msgstr "Fix"
+msgstr "Fiksna"
msgctxt "selection:product.template,type:"
msgid "Assets"
-msgstr "Actius"
+msgstr "Osnovna sredstva"
msgctxt "selection:product.template,type:"
msgid "Goods"
-msgstr "Béns"
+msgstr "Blago"
msgctxt "selection:product.template,type:"
msgid "Service"
-msgstr "Serveis"
+msgstr "Storitev"
msgctxt "view:product.category:"
msgid "Children"
-msgstr "Fills"
+msgstr "Podkategorije"
msgctxt "view:product.category:"
msgid "Product Categories"
-msgstr "Categories de producte"
+msgstr "Kategorije"
msgctxt "view:product.category:"
msgid "Product Category"
-msgstr "Categoria de producte"
+msgstr "Kategorija"
msgctxt "view:product.product:"
msgid "Product"
-msgstr "Producte"
+msgstr "Izdelek"
msgctxt "view:product.product:"
msgid "Products"
-msgstr "Productes"
+msgstr "Izdelki"
msgctxt "view:product.template:"
msgid "General"
-msgstr "General"
+msgstr "Splošno"
msgctxt "view:product.template:"
msgid "Product"
-msgstr "Producte"
+msgstr "Izdelek"
msgctxt "view:product.template:"
msgid "Products"
-msgstr "Productes"
+msgstr "Izdelki"
msgctxt "view:product.uom.category:"
msgid "Categories of Unit of Measure"
-msgstr "Categories d'unitats de mesura"
+msgstr "Kategorije merskih enot"
msgctxt "view:product.uom.category:"
msgid "Category of Unit of Measure"
-msgstr "Categoria d'unitat de mesura"
+msgstr "Kategorija merskih enot"
msgctxt "view:product.uom:"
msgid "Unit of Measure"
-msgstr "Unitat de mesura"
+msgstr "Merska enota"
msgctxt "view:product.uom:"
msgid "Units of Measure"
-msgstr "Unitats de mesura"
+msgstr "Merske enote"
diff --git a/product.py b/product.py
index b99a117..d79dc58 100644
--- a/product.py
+++ b/product.py
@@ -4,7 +4,7 @@ from trytond.model import ModelView, ModelSQL, fields
from trytond.pyson import Eval
from trytond.transaction import Transaction
from trytond.pool import Pool
-from trytond.backend import TableHandler
+from trytond import backend
from trytond.const import OPERATORS
__all__ = ['Template', 'Product']
@@ -49,14 +49,17 @@ class Template(ModelSQL, ModelView):
default_uom_category = fields.Function(
fields.Many2One('product.uom.category', 'Default UOM Category',
on_change_with=['default_uom']),
- 'on_change_with_default_uom_category')
+ 'on_change_with_default_uom_category',
+ searcher='search_default_uom_category')
active = fields.Boolean('Active', select=True)
products = fields.One2Many('product.product', 'template', 'Variants',
states=STATES, depends=DEPENDS)
@classmethod
def __register__(cls, module_name):
+ TableHandler = backend.get('TableHandler')
cursor = Transaction().cursor
+ sql_table = cls.__table__()
super(Template, cls).__register__(module_name)
@@ -65,11 +68,14 @@ class Template(ModelSQL, ModelView):
table.not_null_action('category', 'remove')
# Migration from 2.2: new types
- cursor.execute('UPDATE "' + cls._table + '" '
- 'SET consumable = %s WHERE type = %s', (True, 'consumable'))
- cursor.execute('UPDATE "' + cls._table + '" '
- 'SET type = %s WHERE type IN (%s, %s)',
- ('goods', 'stockable', 'consumable'))
+ cursor.execute(*sql_table.update(
+ columns=[sql_table.consumable],
+ values=[True],
+ where=sql_table.type == 'consumable'))
+ cursor.execute(*sql_table.update(
+ columns=[sql_table.type],
+ values=['goods'],
+ where=sql_table.type.in_(['stockable', 'consumable'])))
@staticmethod
def default_active():
@@ -102,6 +108,10 @@ class Template(ModelSQL, ModelView):
if self.default_uom:
return self.default_uom.category.id
+ @classmethod
+ def search_default_uom_category(cls, name, clause):
+ return [('default_uom.category',) + tuple(clause[1:])]
+
class Product(ModelSQL, ModelView):
"Product Variant"
@@ -126,12 +136,19 @@ class Product(ModelSQL, ModelView):
digits=(16, 4)), 'get_price_uom')
@classmethod
- def __setup__(cls):
- super(Product, cls).__setup__()
- # XXX order by id until order by joined name is possible
- # but at least products are grouped
- cls.rec_name.order_field = ("%(table)s.code %(order)s, "
- "%(table)s.id %(order)s")
+ def order_rec_name(cls, tables):
+ pool = Pool()
+ Template = pool.get('product.template')
+ product, _ = tables[None]
+ if 'template' not in tables:
+ template = Template.__table__()
+ tables['template'] = {
+ None: (template, product.template == template.id),
+ }
+ else:
+ template = tables['template']
+ return [product.code] + Template.name.convert_order('name',
+ tables['template'], Template)
@staticmethod
def default_active():
@@ -152,12 +169,12 @@ class Product(ModelSQL, ModelView):
@classmethod
def search_rec_name(cls, name, clause):
- ids = map(int, cls.search([('code',) + clause[1:]], order=[]))
+ ids = map(int, cls.search([('code',) + tuple(clause[1:])], order=[]))
if ids:
- ids += map(int, cls.search([('template.name',) + clause[1:]],
- order=[]))
+ ids += map(int,
+ cls.search([('template.name',) + tuple(clause[1:])], order=[]))
return [('id', 'in', ids)]
- return [('template.name',) + clause[1:]]
+ return [('template.name',) + tuple(clause[1:])]
def get_default_uom(self, name):
return self.template.default_uom.id
@@ -209,7 +226,9 @@ class Product(ModelSQL, ModelView):
field = arg[0].split('.', 1)[0]
if not getattr(cls, field, None):
field = 'template.' + arg[0]
- result.append((field,) + tuple(arg[1:]))
+ result.append((field,) + tuple(arg[1:]))
+ else:
+ result.append(arg)
elif isinstance(arg, list):
# sub-domain
result.append(convert_domain(arg))
diff --git a/setup.py b/setup.py
index d4f82ad..ca5f08c 100644
--- a/setup.py
+++ b/setup.py
@@ -21,7 +21,7 @@ major_version, minor_version, _ = info.get('version', '0.0.1').split('.', 2)
major_version = int(major_version)
minor_version = int(minor_version)
-requires = []
+requires = ['python-sql']
for dep in info.get('depends', []):
if not re.match(r'(ir|res|webdav)(\W|$)', dep):
requires.append('trytond_%s >= %s.%s, < %s.%s' %
@@ -64,6 +64,7 @@ setup(name='trytond_product',
'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/tests/__init__.py b/tests/__init__.py
index e00cc8d..2c5a660 100644
--- a/tests/__init__.py
+++ b/tests/__init__.py
@@ -2,3 +2,5 @@
#this repository contains the full copyright notices and license terms.
from .test_product import suite
+
+__all__ = ['suite']
diff --git a/tests/test_product.py b/tests/test_product.py
index 666a1af..e113161 100644
--- a/tests/test_product.py
+++ b/tests/test_product.py
@@ -26,6 +26,9 @@ class ProductTestCase(unittest.TestCase):
trytond.tests.test_tryton.install_module('product')
self.uom = POOL.get('product.uom')
self.uom_category = POOL.get('product.uom.category')
+ self.template = POOL.get('product.template')
+ self.product = POOL.get('product.product')
+ self.category = POOL.get('product.category')
def test0005views(self):
'''
@@ -189,6 +192,101 @@ class ProductTestCase(unittest.TestCase):
self.assertEqual(result, self.uom.compute_price(from_uom,
price, to_uom))
+ def test0060product_search_domain(self):
+ '''
+ Test product.product search_domain function.
+ '''
+ with Transaction().start(DB_NAME, USER, context=CONTEXT):
+ kilogram, = self.uom.search([
+ ('name', '=', 'Kilogram'),
+ ], limit=1)
+ millimeter, = self.uom.search([
+ ('name', '=', 'Millimeter'),
+ ])
+ pt1, pt2 = self.template.create([{
+ 'name': 'P1',
+ 'type': 'goods',
+ 'list_price': Decimal(20),
+ 'cost_price': Decimal(10),
+ 'default_uom': kilogram.id,
+ 'products': [('create', [{
+ 'code': '1',
+ }])]
+ }, {
+ 'name': 'P2',
+ 'type': 'goods',
+ 'list_price': Decimal(20),
+ 'cost_price': Decimal(10),
+ 'default_uom': millimeter.id,
+ 'products': [('create', [{
+ 'code': '2',
+ }])]
+ }])
+ p, = self.product.search([
+ ('default_uom.name', '=', 'Kilogram'),
+ ])
+ self.assertEqual(p, pt1.products[0])
+ p, = self.product.search([
+ ('default_uom.name', '=', 'Millimeter'),
+ ])
+ self.assertEqual(p, pt2.products[0])
+
+ def test0060search_domain_conversion(self):
+ '''
+ Test the search domain conversion
+ '''
+ with Transaction().start(DB_NAME, USER, context=CONTEXT):
+ category1, = self.category.create([{'name': 'Category1'}])
+ category2, = self.category.create([{'name': 'Category2'}])
+ uom, = self.uom.search([], limit=1)
+ values1 = {
+ 'name': 'Some product-1',
+ 'category': category1.id,
+ 'type': 'goods',
+ 'list_price': Decimal('10'),
+ 'cost_price': Decimal('5'),
+ 'default_uom': uom.id,
+ }
+ values2 = {
+ 'name': 'Some product-2',
+ 'category': category2.id,
+ 'type': 'goods',
+ 'list_price': Decimal('10'),
+ 'cost_price': Decimal('5'),
+ 'default_uom': uom.id,
+ }
+
+ # This is a false positive as there is 1 product with the
+ # template 1 and the same product with category 1. If you do not
+ # create two categories (or any other relation on the template
+ # model) you wont be able to check as in most cases the
+ # id of the template and the related model would be same (1).
+ # So two products have been created with same category. So that
+ # domain ('template.category', '=', 1) will return 2 records which
+ # it supposed to be.
+ template1, template2, template3, template4 = self.template.create(
+ [values1, values1.copy(), values2, values2.copy()]
+ )
+ self.assertEqual(self.product.search([], count=True), 4)
+ self.assertEqual(
+ self.product.search([
+ ('category', '=', category1.id),
+ ], count=True), 2)
+
+ self.assertEqual(
+ self.product.search([
+ ('template.category', '=', category1.id),
+ ], count=True), 2)
+
+ self.assertEqual(
+ self.product.search([
+ ('category', '=', category2.id),
+ ], count=True), 2)
+ self.assertEqual(
+ self.product.search([
+ ('template.category', '=', category2.id),
+ ], count=True), 2)
+
def suite():
suite = trytond.tests.test_tryton.suite()
diff --git a/tryton.cfg b/tryton.cfg
index af2ad81..a3aa1aa 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
[tryton]
-version=2.8.1
+version=3.0.0
depends:
ir
res
diff --git a/trytond_product.egg-info/PKG-INFO b/trytond_product.egg-info/PKG-INFO
index f4c6de5..009cb8c 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: 2.8.1
+Version: 3.0.0
Summary: Tryton module with products
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
===============
@@ -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.egg-info/SOURCES.txt b/trytond_product.egg-info/SOURCES.txt
index 56faa6d..32fc508 100644
--- a/trytond_product.egg-info/SOURCES.txt
+++ b/trytond_product.egg-info/SOURCES.txt
@@ -27,6 +27,7 @@ locale/es_ES.po
locale/fr_FR.po
locale/nl_NL.po
locale/ru_RU.po
+locale/sl_SI.po
trytond_product.egg-info/PKG-INFO
trytond_product.egg-info/SOURCES.txt
trytond_product.egg-info/dependency_links.txt
diff --git a/trytond_product.egg-info/requires.txt b/trytond_product.egg-info/requires.txt
index c0b1648..adea631 100644
--- a/trytond_product.egg-info/requires.txt
+++ b/trytond_product.egg-info/requires.txt
@@ -1 +1,2 @@
-trytond >= 2.8, < 2.9
\ No newline at end of file
+python-sql
+trytond >= 3.0, < 3.1
\ No newline at end of file
diff --git a/uom.py b/uom.py
index d8878fa..987a3f0 100644
--- a/uom.py
+++ b/uom.py
@@ -1,6 +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 sql import Table
+
from trytond.model import ModelView, ModelSQL, fields
from trytond.pyson import Eval
from trytond.transaction import Transaction
@@ -50,10 +52,13 @@ class Uom(ModelSQL, ModelView):
@classmethod
def __register__(cls, module_name):
cursor = Transaction().cursor
+ model_data = Table('ir_model_data')
# Migration from 1.6: corrected misspelling of ounce (was once)
- cursor.execute("UPDATE ir_model_data "
- "SET fs_id = REPLACE(fs_id, 'uom_once', 'uom_ounce') "
- "WHERE fs_id = 'uom_once' AND module = 'product'")
+ cursor.execute(*model_data.update(
+ columns=[model_data.fs_id],
+ values=['uom_ounce'],
+ where=(model_data.fs_id == 'uom_once')
+ & (model_data.module == 'product')))
super(Uom, cls).__register__(module_name)
@classmethod
@@ -70,8 +75,8 @@ class Uom(ModelSQL, ModelView):
'change_uom_rate': ('If the UOM is still not used, you can '
'delete it otherwise you can deactivate it '
'and create a new one.'),
- 'invalid_factor_and_rate': ('Invalid Factor and Rate values in '
- 'UOM "%s".'),
+ 'invalid_factor_and_rate': (
+ 'Invalid Factor and Rate values in UOM "%s".'),
})
@classmethod
@@ -139,7 +144,7 @@ class Uom(ModelSQL, ModelView):
def check_factor_and_rate(self):
"Check coherence between factor and rate"
if self.rate == self.factor == 0.0:
- return True
+ return
if (self.rate != round(
1.0 / self.factor, self.__class__.rate.digits[1])
and self.factor != round(
commit 9ab1a2dae3cbe46439f202651956e8f1cf254890
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Thu Nov 21 12:03:13 2013 +0100
Removing inadvertently commited .pc directory.
diff --git a/.pc/.quilt_patches b/.pc/.quilt_patches
deleted file mode 100644
index 6857a8d..0000000
--- a/.pc/.quilt_patches
+++ /dev/null
@@ -1 +0,0 @@
-debian/patches
diff --git a/.pc/.quilt_series b/.pc/.quilt_series
deleted file mode 100644
index c206706..0000000
--- a/.pc/.quilt_series
+++ /dev/null
@@ -1 +0,0 @@
-series
diff --git a/.pc/.version b/.pc/.version
deleted file mode 100644
index 0cfbf08..0000000
--- a/.pc/.version
+++ /dev/null
@@ -1 +0,0 @@
-2
commit d5631cd9053d08d1c5fbd27553a63fdf6771b577
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Sun Oct 13 21:59:18 2013 +0200
Releasing debian version 2.8.1-1.
diff --git a/debian/changelog b/debian/changelog
index 11b90fe..411cc08 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+tryton-modules-product (2.8.1-1) unstable; urgency=low
+
+ * Merging upstream version 2.8.1.
+
+ -- Mathias Behrle <mathiasb at m9s.biz> Sun, 13 Oct 2013 20:05:39 +0200
+
tryton-modules-product (2.8.0-3) unstable; urgency=low
* Adapting the rules file to work also with git-buildpackage.
commit 6f5f2a0a8b2ac5fe512c797a77a637b35863391c
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Sun Oct 13 20:01:57 2013 +0200
Merging upstream version 2.8.1.
diff --git a/CHANGELOG b/CHANGELOG
index 212618e..28df943 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 2.8.1 - 2013-10-01
+* 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 bdf4d65..7b95c39 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: trytond_product
-Version: 2.8.0
+Version: 2.8.1
Summary: Tryton module with products
Home-page: http://www.tryton.org/
Author: Tryton
diff --git a/tryton.cfg b/tryton.cfg
index ed63229..af2ad81 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
[tryton]
-version=2.8.0
+version=2.8.1
depends:
ir
res
diff --git a/trytond_product.egg-info/PKG-INFO b/trytond_product.egg-info/PKG-INFO
index 558446f..f4c6de5 100644
--- a/trytond_product.egg-info/PKG-INFO
+++ b/trytond_product.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: trytond-product
-Version: 2.8.0
+Version: 2.8.1
Summary: Tryton module with products
Home-page: http://www.tryton.org/
Author: Tryton
diff --git a/uom.py b/uom.py
index 3685ed6..d8878fa 100644
--- a/uom.py
+++ b/uom.py
@@ -121,8 +121,8 @@ class Uom(ModelSQL, ModelView):
@classmethod
def search_rec_name(cls, name, clause):
ids = map(int, cls.search(['OR',
- (cls._rec_name,) + clause[1:],
- ('symbol',) + clause[1:],
+ (cls._rec_name,) + tuple(clause[1:]),
+ ('symbol',) + tuple(clause[1:]),
], order=[]))
return [('id', 'in', ids)]
commit cc7f5f04c449e2ef210cf44de9f69eb16b6b8bca
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Tue Aug 6 16:20:58 2013 +0200
Releasing debian version 2.8.0-3.
diff --git a/debian/changelog b/debian/changelog
index 669ecd7..11b90fe 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+tryton-modules-product (2.8.0-3) unstable; urgency=low
+
+ * Adapting the rules file to work also with git-buildpackage.
+
+ -- Mathias Behrle <mathiasb at m9s.biz> Tue, 06 Aug 2013 13:33:05 +0200
+
tryton-modules-product (2.8.0-2) unstable; urgency=low
* Adding doc/ to docs file.
commit 91336e2bdcf21af7a7e836d6cab0c277aaeb0869
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Mon Aug 5 18:06:36 2013 +0200
Adapting the rules file to work also with git-buildpackage.
diff --git a/debian/rules b/debian/rules
index a6a1fb8..30074ad 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,13 +1,24 @@
#!/usr/bin/make -f
MAJOR := $(shell python setup.py --version | awk -F "." '{print $$1 "." $$2}')
+PACKAGE_NAME := $(shell python setup.py --name)
%:
dh ${@} --with python2
override_dh_auto_clean:
dh_auto_clean
+
+override_dh_auto_build:
+ mv $(PACKAGE_NAME).egg-info $(PACKAGE_NAME).hen-info
+ mv PKG-INFO PKG-INFO.hen
+ dh_auto_build
+
+override_dh_auto_install:
+ dh_auto_install
rm -rf *.egg-info
+ mv $(PACKAGE_NAME).hen-info $(PACKAGE_NAME).egg-info
+ mv PKG-INFO.hen PKG-INFO
override_dh_gencontrol:
dh_gencontrol -- -Vversion:major="$(MAJOR)"
commit e7a50b4f0bde88381e102b62bc6dd9b6f8e28fc6
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Fri May 31 19:57:31 2013 +0200
Releasing debian version 2.8.0-2.
diff --git a/debian/changelog b/debian/changelog
index 5698757..669ecd7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+tryton-modules-product (2.8.0-2) unstable; urgency=low
+
+ * Adding doc/ to docs file.
+ * Simplifying package layout by renaming <pkg_name>.docs to docs.
+ * Removing needless empty line in rules.
+
+ -- Mathias Behrle <mathiasb at m9s.biz> Fri, 31 May 2013 17:26:46 +0200
+
tryton-modules-product (2.8.0-1) experimental; urgency=low
* Merging upstream version 2.8.0.
commit 00e201297c3a7250e2766d7242d582f08e3f5a61
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Wed May 29 17:19:29 2013 +0200
Removing needless empty line in rules.
diff --git a/debian/rules b/debian/rules
index 0f63ab4..a6a1fb8 100755
--- a/debian/rules
+++ b/debian/rules
@@ -7,7 +7,6 @@ MAJOR := $(shell python setup.py --version | awk -F "." '{print $$1 "." $$2}')
override_dh_auto_clean:
dh_auto_clean
-
rm -rf *.egg-info
override_dh_gencontrol:
commit 88173e7e9dc65aa9fee9486b9ff9ec7844cd4e44
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Wed May 29 17:01:48 2013 +0200
Simplifying package layout by renaming <pkg_name>.docs to docs.
Thanks to Andreas Tille for this proposal. Since tryton module packages
will most probably stay simple binary packages this change simplifies the
package layout.
diff --git a/debian/tryton-modules-product.docs b/debian/docs
similarity index 100%
rename from debian/tryton-modules-product.docs
rename to debian/docs
commit 95c09987257a1b20d0c3447615869d239ecf6b87
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Tue May 14 18:54:41 2013 +0200
Adding doc/ to docs file.
diff --git a/debian/tryton-modules-product.docs b/debian/tryton-modules-product.docs
new file mode 100644
index 0000000..a2e6bd4
--- /dev/null
+++ b/debian/tryton-modules-product.docs
@@ -0,0 +1 @@
+doc/
commit 54afa7c7af16502e0cd61d23d3d9e212b4743fc6
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Thu May 2 17:27:07 2013 +0200
Releasing debian version 2.8.0-1.
diff --git a/debian/changelog b/debian/changelog
index 579c183..5698757 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+tryton-modules-product (2.8.0-1) experimental; urgency=low
+
+ * Merging upstream version 2.8.0.
+ * Updating copyright.
+
+ -- Mathias Behrle <mathiasb at m9s.biz> Thu, 02 May 2013 15:20:23 +0200
+
tryton-modules-product (2.6.0-4) experimental; urgency=low
* Removing Daniel from Uploaders. Thanks for your work! (Closes: #704388).
commit 922baeb2550159cd770daea07c9a177da6dba1a2
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Thu May 2 14:13:10 2013 +0200
Updating copyright.
diff --git a/debian/copyright b/debian/copyright
index ca8ed21..d3640cc 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,9 +1,9 @@
Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Files: *
-Copyright: 2008-2012 Cédric Krier
- 2008-2012 Bertrand Chenal
- 2008-2012 B2CK SPRL
+Copyright: 2008-2013 Cédric Krier
+ 2008-2013 Bertrand Chenal
+ 2008-2013 B2CK SPRL
2004-2008 Tiny SPRL
License: GPL-3+
commit 17d4a68106388a4583ebfa35eeb682f20d07375f
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Thu May 2 00:36:48 2013 +0200
Merging upstream version 2.8.0.
diff --git a/CHANGELOG b/CHANGELOG
index 247d489..212618e 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 ede3fac..5d422e0 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.
Copyright (C) 2004-2008 Tiny SPRL.
This program is free software: you can redistribute it and/or modify
diff --git a/MANIFEST.in b/MANIFEST.in
index e4632a1..732a76e 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -6,6 +6,7 @@ include CHANGELOG
include LICENSE
include tryton.cfg
include *.xml
+include view/*.xml
include *.odt
include locale/*.po
include doc/*
diff --git a/PKG-INFO b/PKG-INFO
index 7e195b3..bdf4d65 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,12 +1,12 @@
-Metadata-Version: 1.0
+Metadata-Version: 1.1
Name: trytond_product
-Version: 2.6.0
+Version: 2.8.0
Summary: Tryton module with products
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
===============
@@ -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/category.py b/category.py
index 7c8e53c..4c21436 100644
--- a/category.py
+++ b/category.py
@@ -18,16 +18,28 @@ class Category(ModelSQL, ModelView):
super(Category, cls).__setup__()
cls._order.insert(0, ('name', 'ASC'))
- cls._constraints += [
- ('check_recursion', 'recursive_categories'),
- ]
- cls._error_messages.update({
- 'recursive_categories': \
- 'You can not create recursive categories!',
- })
+ @classmethod
+ def validate(cls, categories):
+ super(Category, cls).validate(categories)
+ cls.check_recursion(categories, rec_name='name')
def get_rec_name(self, name):
if self.parent:
return self.parent.get_rec_name(name) + ' / ' + self.name
else:
return self.name
+
+ @classmethod
+ def search_rec_name(cls, name, clause):
+ if isinstance(clause[2], basestring):
+ values = clause[2].split('/')
+ values.reverse()
+ domain = []
+ field = 'name'
+ for name in values:
+ domain.append((field, clause[1], name.strip()))
+ field = 'parent.' + field
+ else:
+ domain = [('name',) + tuple(clause[1:])]
+ ids = [w.id for w in cls.search(domain, order=[])]
+ return [('parent', 'child_of', ids)]
diff --git a/category.xml b/category.xml
index 2895eab..fb008df 100644
--- a/category.xml
+++ b/category.xml
@@ -7,50 +7,19 @@ this repository contains the full copyright notices and license terms. -->
<field name="model">product.category</field>
<field name="type">tree</field>
<field name="priority">10</field>
- <field name="arch" type="xml">
- <![CDATA[
- <tree string="Product Categories">
- <field name="name"/>
- <field name="rec_name"/>
- </tree>
- ]]>
- </field>
+ <field name="name">category_list</field>
</record>
<record model="ir.ui.view" id="category_view_tree">
<field name="model">product.category</field>
<field name="type">tree</field>
<field name="priority">20</field>
<field name="field_childs">childs</field>
- <field name="arch" type="xml">
- <![CDATA[
- <tree string="Product Categories" keyword_open="1">
- <field name="name"/>
- <field name="parent" tree_invisible="1"/>
- <field name="childs" tree_invisible="1"/>
- </tree>
- ]]>
- </field>
+ <field name="name">category_tree</field>
</record>
<record model="ir.ui.view" id="category_view_form">
<field name="model">product.category</field>
<field name="type">form</field>
- <field name="arch" type="xml">
- <![CDATA[
- <form string="Product Category">
- <label name="name"/>
- <field name="name"/>
- <label name="parent"/>
- <field name="parent"/>
- <label name="rec_name"/>
- <field name="rec_name" colspan="3"/>
- <notebook colspan="4">
- <page string="Children" col="1" id="childs">
- <field name="childs"/>
- </page>
- </notebook>
- </form>
- ]]>
- </field>
+ <field name="name">category_form</field>
</record>
<record model="ir.action.act_window" id="act_category_tree">
@@ -105,7 +74,5 @@ this repository contains the full copyright notices and license terms. -->
<field name="perm_create" eval="True"/>
<field name="perm_delete" eval="True"/>
</record>
-
-
</data>
</tryton>
diff --git a/locale/bg_BG.po b/locale/bg_BG.po
index df2812b..00a09fb 100644
--- a/locale/bg_BG.po
+++ b/locale/bg_BG.po
@@ -2,10 +2,6 @@
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
-msgctxt "error:product.category:"
-msgid "You can not create recursive categories!"
-msgstr "Ðе може да Ñъздавате взаимно вложени категории!"
-
msgctxt "error:product.uom:"
msgid ""
"If the UOM is still not used, you can delete it otherwise you can deactivate"
@@ -15,8 +11,8 @@ msgstr ""
"може да Ñ Ð´ÐµÐºÐ°Ñ‚Ð¸Ð²Ð¸Ñ€Ð°Ñ‚Ðµ и Ñъздадете нова."
msgctxt "error:product.uom:"
-msgid "Invalid Factor and Rate values!"
-msgstr "Ðевалиден ÑтойноÑти за фактор и отношение!"
+msgid "Invalid Factor and Rate values in UOM \"%s\"."
+msgstr ""
msgctxt "error:product.uom:"
msgid "Rate and factor can not be both equal to zero."
@@ -63,10 +59,20 @@ msgctxt "field:product.category,write_uid:"
msgid "Write User"
msgstr "Променено от"
+#, fuzzy
+msgctxt "field:product.product,active:"
+msgid "Active"
+msgstr "Ðктивен"
+
msgctxt "field:product.product,code:"
msgid "Code"
msgstr "Код"
+#, fuzzy
+msgctxt "field:product.product,cost_price_uom:"
+msgid "Cost Price"
+msgstr "Фабрична цена"
+
msgctxt "field:product.product,create_date:"
msgid "Create Date"
msgstr "Създадено на"
@@ -75,6 +81,11 @@ msgctxt "field:product.product,create_uid:"
msgid "Create User"
msgstr "Създадено от"
+#, fuzzy
+msgctxt "field:product.product,default_uom:"
+msgid "Default UOM"
+msgstr "Мер. ед. по подрабиране"
+
msgctxt "field:product.product,description:"
msgid "Description"
msgstr "ОпиÑание"
@@ -83,6 +94,11 @@ msgctxt "field:product.product,id:"
msgid "ID"
msgstr "ID"
+#, fuzzy
+msgctxt "field:product.product,list_price_uom:"
+msgid "List Price"
+msgstr "Каталожна цена"
+
msgctxt "field:product.product,rec_name:"
msgid "Name"
msgstr "Име"
@@ -91,6 +107,11 @@ msgctxt "field:product.product,template:"
msgid "Product Template"
msgstr "Щаблон за продукт"
+#, fuzzy
+msgctxt "field:product.product,type:"
+msgid "Type"
+msgstr "Вид"
+
msgctxt "field:product.product,write_date:"
msgid "Write Date"
msgstr "Променено на"
@@ -119,10 +140,6 @@ msgctxt "field:product.template,cost_price_method:"
msgid "Cost Method"
msgstr "Ðачин на оÑтойноÑÑ‚Ñване"
-msgctxt "field:product.template,cost_price_uom:"
-msgid "Cost Price"
-msgstr "Фабрична цена"
-
msgctxt "field:product.template,create_date:"
msgid "Create Date"
msgstr "Създадено на"
@@ -147,16 +164,13 @@ msgctxt "field:product.template,list_price:"
msgid "List Price"
msgstr "Каталожна цена"
-msgctxt "field:product.template,list_price_uom:"
-msgid "List Price"
-msgstr "Каталожна цена"
-
msgctxt "field:product.template,name:"
msgid "Name"
msgstr "Име"
+#, fuzzy
msgctxt "field:product.template,products:"
-msgid "Products"
+msgid "Variants"
msgstr "Продукти"
msgctxt "field:product.template,rec_name:"
@@ -287,13 +301,19 @@ msgctxt "model:ir.action,name:act_category_tree"
msgid "Categories"
msgstr "Категории"
-msgctxt "model:ir.action,name:act_product_by_category"
+#, fuzzy
+msgctxt "model:ir.action,name:act_product_form"
+msgid "Variants"
+msgstr "Продукти"
+
+msgctxt "model:ir.action,name:act_template_by_category"
msgid "Product by Category"
-msgstr "Продукт по категориÑ"
+msgstr ""
-msgctxt "model:ir.action,name:act_product_form"
+#, fuzzy
+msgctxt "model:ir.action,name:act_template_form"
msgid "Products"
-msgstr "Продукти"
+msgstr "Продукти по меÑтонахождениÑ"
msgctxt "model:ir.action,name:act_uom_category_form"
msgid "Categories of Unit of Measure"
@@ -315,10 +335,16 @@ msgctxt "model:ir.ui.menu,name:menu_main_product"
msgid "Product"
msgstr "Продукт"
-msgctxt "model:ir.ui.menu,name:menu_product_product"
-msgid "Products"
+#, fuzzy
+msgctxt "model:ir.ui.menu,name:menu_product"
+msgid "Variants"
msgstr "Продукти"
+#, fuzzy
+msgctxt "model:ir.ui.menu,name:menu_template"
+msgid "Products"
+msgstr "Продукти по меÑтонахождениÑ"
+
msgctxt "model:ir.ui.menu,name:menu_uom_category_form"
msgid "Categories"
msgstr "Категории"
@@ -331,8 +357,9 @@ msgctxt "model:product.category,name:"
msgid "Product Category"
msgstr "ÐšÐ°Ñ‚ÐµÐ³Ð¾Ñ€Ð¸Ñ Ð½Ð° продукт"
+#, fuzzy
msgctxt "model:product.product,name:"
-msgid "Product"
+msgid "Product Variant"
msgstr "Продукт"
msgctxt "model:product.template,name:"
@@ -631,6 +658,21 @@ msgctxt "model:res.group,name:group_product_admin"
msgid "Product Administration"
msgstr "Управление на продукти"
+#, fuzzy
+msgctxt "selection:product.product,type:"
+msgid "Assets"
+msgstr "Ðктиви"
+
+#, fuzzy
+msgctxt "selection:product.product,type:"
+msgid "Goods"
+msgstr "Стока"
+
+#, fuzzy
+msgctxt "selection:product.product,type:"
+msgid "Service"
+msgstr "УÑлуга"
+
msgctxt "selection:product.template,cost_price_method:"
msgid "Average"
msgstr "Средна"
@@ -663,6 +705,11 @@ msgctxt "view:product.category:"
msgid "Product Category"
msgstr "ÐšÐ°Ñ‚ÐµÐ³Ð¾Ñ€Ð¸Ñ Ð½Ð° продукт"
+#, fuzzy
+msgctxt "view:product.product:"
+msgid "Product"
+msgstr "Продукт"
+
msgctxt "view:product.product:"
msgid "Products"
msgstr "Продукти"
@@ -671,13 +718,15 @@ msgctxt "view:product.template:"
msgid "General"
msgstr "ОÑновен"
+#, fuzzy
msgctxt "view:product.template:"
-msgid "Product Template"
-msgstr "Щаблон за продукт"
+msgid "Product"
+msgstr "Продукт"
+#, fuzzy
msgctxt "view:product.template:"
-msgid "Product Templates"
-msgstr "Шаблони на продукти"
+msgid "Products"
+msgstr "Продукти по меÑтонахождениÑ"
msgctxt "view:product.uom.category:"
msgid "Categories of Unit of Measure"
diff --git a/locale/ca_ES.po b/locale/ca_ES.po
index b6c60e6..ea268d1 100644
--- a/locale/ca_ES.po
+++ b/locale/ca_ES.po
@@ -2,10 +2,6 @@
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
-msgctxt "error:product.category:"
-msgid "You can not create recursive categories!"
-msgstr "No pot crear categories recursives."
-
msgctxt "error:product.uom:"
msgid ""
"If the UOM is still not used, you can delete it otherwise you can deactivate"
@@ -15,10 +11,8 @@ msgstr ""
"i crear-ne una de nova."
msgctxt "error:product.uom:"
-msgid "Invalid Factor and Rate values!"
-msgstr ""
-"No pot canviar la conversió, el factor o la categoria d'una unitat de "
-"mesura."
+msgid "Invalid Factor and Rate values in UOM \"%s\"."
+msgstr "Valors de factor i ratio a UdM \"%s\" incorrectes."
msgctxt "error:product.uom:"
msgid "Rate and factor can not be both equal to zero."
@@ -27,7 +21,7 @@ msgstr "Conversió i factor no poden ser zero simultà niament."
msgctxt "error:product.uom:"
msgid "You cannot change Rate, Factor or Category on a Unit of Measure. "
msgstr ""
-"No pot canviar la conversió, el factor o la categoria d'una unitat de "
+"No podeu canviar la conversió, el factor o la categoria d'una unitat de "
"mesura."
msgctxt "field:product.category,childs:"
@@ -66,10 +60,18 @@ msgctxt "field:product.category,write_uid:"
msgid "Write User"
msgstr "Usuari modificació"
+msgctxt "field:product.product,active:"
+msgid "Active"
+msgstr "Actiu"
+
msgctxt "field:product.product,code:"
msgid "Code"
msgstr "Codi"
+msgctxt "field:product.product,cost_price_uom:"
+msgid "Cost Price"
+msgstr "Preu de cost"
+
msgctxt "field:product.product,create_date:"
msgid "Create Date"
msgstr "Data creació"
@@ -78,6 +80,10 @@ msgctxt "field:product.product,create_uid:"
msgid "Create User"
msgstr "Usuari creació"
+msgctxt "field:product.product,default_uom:"
+msgid "Default UOM"
+msgstr "UdM per defecte"
+
msgctxt "field:product.product,description:"
msgid "Description"
msgstr "Descripció"
@@ -86,6 +92,10 @@ msgctxt "field:product.product,id:"
msgid "ID"
msgstr "ID"
+msgctxt "field:product.product,list_price_uom:"
+msgid "List Price"
+msgstr "Preu de venda"
+
msgctxt "field:product.product,rec_name:"
msgid "Name"
msgstr "Nom"
@@ -94,6 +104,10 @@ msgctxt "field:product.product,template:"
msgid "Product Template"
msgstr "Plantilla de producte"
+msgctxt "field:product.product,type:"
+msgid "Type"
+msgstr "Tipus"
+
msgctxt "field:product.product,write_date:"
msgid "Write Date"
msgstr "Data modificació"
@@ -122,10 +136,6 @@ msgctxt "field:product.template,cost_price_method:"
msgid "Cost Method"
msgstr "Mètode de cost"
-msgctxt "field:product.template,cost_price_uom:"
-msgid "Cost Price"
-msgstr "Preu de cost"
-
msgctxt "field:product.template,create_date:"
msgid "Create Date"
msgstr "Data creació"
@@ -150,17 +160,13 @@ msgctxt "field:product.template,list_price:"
msgid "List Price"
msgstr "Preu de venda"
-msgctxt "field:product.template,list_price_uom:"
-msgid "List Price"
-msgstr "Preu de venda"
-
msgctxt "field:product.template,name:"
msgid "Name"
msgstr "Nom"
msgctxt "field:product.template,products:"
-msgid "Products"
-msgstr "Productes"
+msgid "Variants"
+msgstr "Variants"
msgctxt "field:product.template,rec_name:"
msgid "Name"
@@ -290,11 +296,16 @@ msgctxt "model:ir.action,name:act_category_tree"
msgid "Categories"
msgstr "Categories"
-msgctxt "model:ir.action,name:act_product_by_category"
+#, fuzzy
+msgctxt "model:ir.action,name:act_product_form"
+msgid "Variants"
+msgstr "Productes"
+
+msgctxt "model:ir.action,name:act_template_by_category"
msgid "Product by Category"
-msgstr "Producte per categoria"
+msgstr "Productes per categoria"
-msgctxt "model:ir.action,name:act_product_form"
+msgctxt "model:ir.action,name:act_template_form"
msgid "Products"
msgstr "Productes"
@@ -316,9 +327,14 @@ msgstr "Categories"
msgctxt "model:ir.ui.menu,name:menu_main_product"
msgid "Product"
-msgstr "Productes"
+msgstr "Producte"
+
+#, fuzzy
+msgctxt "model:ir.ui.menu,name:menu_product"
+msgid "Variants"
+msgstr "Variants"
-msgctxt "model:ir.ui.menu,name:menu_product_product"
+msgctxt "model:ir.ui.menu,name:menu_template"
msgid "Products"
msgstr "Productes"
@@ -335,8 +351,8 @@ msgid "Product Category"
msgstr "Categoria de producte"
msgctxt "model:product.product,name:"
-msgid "Product"
-msgstr "Producte"
+msgid "Product Variant"
+msgstr "Variant de producte"
msgctxt "model:product.template,name:"
msgid "Product Template"
@@ -592,7 +608,7 @@ msgstr "yd²"
msgctxt "model:product.uom,symbol:uom_unit"
msgid "u"
-msgstr "o"
+msgstr "u"
msgctxt "model:product.uom,symbol:uom_work_day"
msgid "wd"
@@ -634,6 +650,18 @@ msgctxt "model:res.group,name:group_product_admin"
msgid "Product Administration"
msgstr "Administració de productes"
+msgctxt "selection:product.product,type:"
+msgid "Assets"
+msgstr "Actius"
+
+msgctxt "selection:product.product,type:"
+msgid "Goods"
+msgstr "Béns"
+
+msgctxt "selection:product.product,type:"
+msgid "Service"
+msgstr "Serveis"
+
msgctxt "selection:product.template,cost_price_method:"
msgid "Average"
msgstr "Mitjana"
@@ -644,15 +672,15 @@ msgstr "Fix"
msgctxt "selection:product.template,type:"
msgid "Assets"
-msgstr "Servei"
+msgstr "Actius"
msgctxt "selection:product.template,type:"
msgid "Goods"
-msgstr "Servei"
+msgstr "Béns"
msgctxt "selection:product.template,type:"
msgid "Service"
-msgstr "Servei"
+msgstr "Serveis"
msgctxt "view:product.category:"
msgid "Children"
@@ -667,18 +695,10 @@ msgid "Product Category"
msgstr "Categoria de producte"
msgctxt "view:product.product:"
-msgid "General"
-msgstr "General"
-
-msgctxt "view:product.product:"
msgid "Product"
msgstr "Producte"
msgctxt "view:product.product:"
-msgid "Product Suppliers"
-msgstr "Proveïdors de productes"
-
-msgctxt "view:product.product:"
msgid "Products"
msgstr "Productes"
@@ -687,12 +707,12 @@ msgid "General"
msgstr "General"
msgctxt "view:product.template:"
-msgid "Product Template"
-msgstr "Plantilla de producte"
+msgid "Product"
+msgstr "Producte"
msgctxt "view:product.template:"
-msgid "Product Templates"
-msgstr "Plantilles de producte"
+msgid "Products"
+msgstr "Productes"
msgctxt "view:product.uom.category:"
msgid "Categories of Unit of Measure"
diff --git a/locale/cs_CZ.po b/locale/cs_CZ.po
index f774c9e..d180c8a 100644
--- a/locale/cs_CZ.po
+++ b/locale/cs_CZ.po
@@ -2,10 +2,6 @@
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
-msgctxt "error:product.category:"
-msgid "You can not create recursive categories!"
-msgstr ""
-
msgctxt "error:product.uom:"
msgid ""
"If the UOM is still not used, you can delete it otherwise you can deactivate"
@@ -13,7 +9,7 @@ msgid ""
msgstr ""
msgctxt "error:product.uom:"
-msgid "Invalid Factor and Rate values!"
+msgid "Invalid Factor and Rate values in UOM \"%s\"."
msgstr ""
msgctxt "error:product.uom:"
@@ -60,10 +56,18 @@ msgctxt "field:product.category,write_uid:"
msgid "Write User"
msgstr ""
+msgctxt "field:product.product,active:"
+msgid "Active"
+msgstr ""
+
msgctxt "field:product.product,code:"
msgid "Code"
msgstr ""
+msgctxt "field:product.product,cost_price_uom:"
+msgid "Cost Price"
+msgstr ""
+
msgctxt "field:product.product,create_date:"
msgid "Create Date"
msgstr ""
@@ -72,6 +76,10 @@ msgctxt "field:product.product,create_uid:"
msgid "Create User"
msgstr ""
+msgctxt "field:product.product,default_uom:"
+msgid "Default UOM"
+msgstr ""
+
msgctxt "field:product.product,description:"
msgid "Description"
msgstr ""
@@ -80,6 +88,10 @@ msgctxt "field:product.product,id:"
msgid "ID"
msgstr ""
+msgctxt "field:product.product,list_price_uom:"
+msgid "List Price"
+msgstr ""
+
msgctxt "field:product.product,rec_name:"
msgid "Name"
msgstr ""
@@ -88,6 +100,10 @@ msgctxt "field:product.product,template:"
msgid "Product Template"
msgstr ""
+msgctxt "field:product.product,type:"
+msgid "Type"
+msgstr ""
+
msgctxt "field:product.product,write_date:"
msgid "Write Date"
msgstr ""
@@ -116,10 +132,6 @@ msgctxt "field:product.template,cost_price_method:"
msgid "Cost Method"
msgstr ""
-msgctxt "field:product.template,cost_price_uom:"
-msgid "Cost Price"
-msgstr ""
-
msgctxt "field:product.template,create_date:"
msgid "Create Date"
msgstr ""
@@ -144,16 +156,12 @@ msgctxt "field:product.template,list_price:"
msgid "List Price"
msgstr ""
-msgctxt "field:product.template,list_price_uom:"
-msgid "List Price"
-msgstr ""
-
msgctxt "field:product.template,name:"
msgid "Name"
msgstr ""
msgctxt "field:product.template,products:"
-msgid "Products"
+msgid "Variants"
msgstr ""
msgctxt "field:product.template,rec_name:"
@@ -280,11 +288,15 @@ msgctxt "model:ir.action,name:act_category_tree"
msgid "Categories"
msgstr ""
-msgctxt "model:ir.action,name:act_product_by_category"
+msgctxt "model:ir.action,name:act_product_form"
+msgid "Variants"
+msgstr ""
+
+msgctxt "model:ir.action,name:act_template_by_category"
msgid "Product by Category"
msgstr ""
-msgctxt "model:ir.action,name:act_product_form"
+msgctxt "model:ir.action,name:act_template_form"
msgid "Products"
msgstr ""
@@ -308,7 +320,11 @@ msgctxt "model:ir.ui.menu,name:menu_main_product"
msgid "Product"
msgstr ""
-msgctxt "model:ir.ui.menu,name:menu_product_product"
+msgctxt "model:ir.ui.menu,name:menu_product"
+msgid "Variants"
+msgstr ""
+
+msgctxt "model:ir.ui.menu,name:menu_template"
msgid "Products"
msgstr ""
@@ -325,7 +341,7 @@ msgid "Product Category"
msgstr ""
msgctxt "model:product.product,name:"
-msgid "Product"
+msgid "Product Variant"
msgstr ""
msgctxt "model:product.template,name:"
@@ -624,6 +640,18 @@ msgctxt "model:res.group,name:group_product_admin"
msgid "Product Administration"
msgstr ""
+msgctxt "selection:product.product,type:"
+msgid "Assets"
+msgstr ""
+
+msgctxt "selection:product.product,type:"
+msgid "Goods"
+msgstr ""
+
+msgctxt "selection:product.product,type:"
+msgid "Service"
+msgstr ""
+
msgctxt "selection:product.template,cost_price_method:"
msgid "Average"
msgstr ""
@@ -657,6 +685,10 @@ msgid "Product Category"
msgstr ""
msgctxt "view:product.product:"
+msgid "Product"
+msgstr ""
+
+msgctxt "view:product.product:"
msgid "Products"
msgstr ""
@@ -665,11 +697,11 @@ msgid "General"
msgstr ""
msgctxt "view:product.template:"
-msgid "Product Template"
+msgid "Product"
msgstr ""
msgctxt "view:product.template:"
-msgid "Product Templates"
+msgid "Products"
msgstr ""
msgctxt "view:product.uom.category:"
diff --git a/locale/de_DE.po b/locale/de_DE.po
index a8b3321..53f2048 100644
--- a/locale/de_DE.po
+++ b/locale/de_DE.po
@@ -2,10 +2,6 @@
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
-msgctxt "error:product.category:"
-msgid "You can not create recursive categories!"
-msgstr "Kategorien können nicht rekursiv angelegt werden!"
-
msgctxt "error:product.template:"
msgid ""
"You cannot change the default uom for a product which is associated to stock"
@@ -23,8 +19,8 @@ msgstr ""
"Andernfalls kann sie nur deaktiviert und eine andere neue erstellt werden."
msgctxt "error:product.uom:"
-msgid "Invalid Factor and Rate values!"
-msgstr "Ungültige Werte für Faktor und Kehrwert!"
+msgid "Invalid Factor and Rate values in UOM \"%s\"."
+msgstr "Ungültige Werte für Faktor und Kurs in Maßeinheit \"%s\"."
msgctxt "error:product.uom:"
msgid "Rate and factor can not be both equal to zero."
@@ -72,10 +68,18 @@ msgctxt "field:product.category,write_uid:"
msgid "Write User"
msgstr "Letzte Änderung durch"
+msgctxt "field:product.product,active:"
+msgid "Active"
+msgstr "Aktiv"
+
msgctxt "field:product.product,code:"
msgid "Code"
msgstr "Artikelnummer"
+msgctxt "field:product.product,cost_price_uom:"
+msgid "Cost Price"
+msgstr "Kostenpreis"
+
msgctxt "field:product.product,create_date:"
msgid "Create Date"
msgstr "Erstellungsdatum"
@@ -84,6 +88,10 @@ msgctxt "field:product.product,create_uid:"
msgid "Create User"
msgstr "Erstellt durch"
+msgctxt "field:product.product,default_uom:"
+msgid "Default UOM"
+msgstr "Standardeinheit"
+
msgctxt "field:product.product,description:"
msgid "Description"
msgstr "Beschreibung"
@@ -92,6 +100,10 @@ msgctxt "field:product.product,id:"
msgid "ID"
msgstr "ID"
+msgctxt "field:product.product,list_price_uom:"
+msgid "List Price"
+msgstr "Listenpreis"
+
msgctxt "field:product.product,rec_name:"
msgid "Name"
msgstr "Name"
@@ -100,6 +112,10 @@ msgctxt "field:product.product,template:"
msgid "Product Template"
msgstr "Artikelvorlage"
+msgctxt "field:product.product,type:"
+msgid "Type"
+msgstr "Typ"
+
msgctxt "field:product.product,write_date:"
msgid "Write Date"
msgstr "Zuletzt geändert"
@@ -128,10 +144,6 @@ msgctxt "field:product.template,cost_price_method:"
msgid "Cost Method"
msgstr "Kostenmethode"
-msgctxt "field:product.template,cost_price_uom:"
-msgid "Cost Price"
-msgstr "Einkaufspreis"
-
msgctxt "field:product.template,create_date:"
msgid "Create Date"
msgstr "Erstellungsdatum"
@@ -156,17 +168,13 @@ msgctxt "field:product.template,list_price:"
msgid "List Price"
msgstr "Listenpreis"
-msgctxt "field:product.template,list_price_uom:"
-msgid "List Price"
-msgstr "Listenpreis"
-
msgctxt "field:product.template,name:"
msgid "Name"
msgstr "Name"
msgctxt "field:product.template,products:"
-msgid "Products"
-msgstr "Artikel"
+msgid "Variants"
+msgstr "Varianten"
msgctxt "field:product.template,rec_name:"
msgid "Name"
@@ -292,17 +300,21 @@ msgstr ""
msgctxt "model:ir.action,name:act_category_list"
msgid "Categories"
-msgstr "Kategorien"
+msgstr "Parteikategorien"
msgctxt "model:ir.action,name:act_category_tree"
msgid "Categories"
-msgstr "Artikelkategorien"
+msgstr "Parteikategorien"
+
+msgctxt "model:ir.action,name:act_product_form"
+msgid "Variants"
+msgstr "Varianten"
-msgctxt "model:ir.action,name:act_product_by_category"
+msgctxt "model:ir.action,name:act_template_by_category"
msgid "Product by Category"
msgstr "Artikel nach Kategorie"
-msgctxt "model:ir.action,name:act_product_form"
+msgctxt "model:ir.action,name:act_template_form"
msgid "Products"
msgstr "Artikel"
@@ -326,7 +338,11 @@ msgctxt "model:ir.ui.menu,name:menu_main_product"
msgid "Product"
msgstr "Artikel"
-msgctxt "model:ir.ui.menu,name:menu_product_product"
+msgctxt "model:ir.ui.menu,name:menu_product"
+msgid "Variants"
+msgstr "Varianten"
+
+msgctxt "model:ir.ui.menu,name:menu_template"
msgid "Products"
msgstr "Artikel"
@@ -343,8 +359,8 @@ msgid "Product Category"
msgstr "Artikel Kategorie"
msgctxt "model:product.product,name:"
-msgid "Product"
-msgstr "Artikel"
+msgid "Product Variant"
+msgstr "Artikel Variante"
msgctxt "model:product.template,name:"
msgid "Product Template"
@@ -642,6 +658,18 @@ msgctxt "model:res.group,name:group_product_admin"
msgid "Product Administration"
msgstr "Artikel Administration"
+msgctxt "selection:product.product,type:"
+msgid "Assets"
+msgstr "Inventar"
+
+msgctxt "selection:product.product,type:"
+msgid "Goods"
+msgstr "Ware"
+
+msgctxt "selection:product.product,type:"
+msgid "Service"
+msgstr "Dienstleistung"
+
msgctxt "selection:product.template,cost_price_method:"
msgid "Average"
msgstr "Durchschnitt"
@@ -675,18 +703,10 @@ msgid "Product Category"
msgstr "Artikelkategorie"
msgctxt "view:product.product:"
-msgid "General"
-msgstr "Allgemein"
-
-msgctxt "view:product.product:"
msgid "Product"
msgstr "Artikel"
msgctxt "view:product.product:"
-msgid "Product Suppliers"
-msgstr "Lieferanten"
-
-msgctxt "view:product.product:"
msgid "Products"
msgstr "Artikel"
@@ -699,14 +719,6 @@ msgid "Product"
msgstr "Artikel"
msgctxt "view:product.template:"
-msgid "Product Template"
-msgstr "Artikelvorlage"
-
-msgctxt "view:product.template:"
-msgid "Product Templates"
-msgstr "Artikelvorlagen"
-
-msgctxt "view:product.template:"
msgid "Products"
msgstr "Artikel"
diff --git a/locale/es_AR.po b/locale/es_AR.po
index 47289da..0872432 100644
--- a/locale/es_AR.po
+++ b/locale/es_AR.po
@@ -2,21 +2,17 @@
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
-msgctxt "error:product.category:"
-msgid "You can not create recursive categories!"
-msgstr "¡No puede crear categorÃas recursivas!"
-
msgctxt "error:product.uom:"
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 usado la UdM, puede eliminarla, en caso contrario, puede "
"desactivarla y crear una nueva."
msgctxt "error:product.uom:"
-msgid "Invalid Factor and Rate values!"
-msgstr "¡Factor y valores de tasa de cambio inválidas!"
+msgid "Invalid Factor and Rate values in UOM \"%s\"."
+msgstr "Valores de factor y ratio en UdM «%s» no son correctos."
msgctxt "error:product.uom:"
msgid "Rate and factor can not be both equal to zero."
@@ -64,10 +60,18 @@ msgctxt "field:product.category,write_uid:"
msgid "Write User"
msgstr "Usuario modificación"
+msgctxt "field:product.product,active:"
+msgid "Active"
+msgstr "Activo"
+
msgctxt "field:product.product,code:"
msgid "Code"
msgstr "Código"
+msgctxt "field:product.product,cost_price_uom:"
+msgid "Cost Price"
+msgstr "Precio de costo"
+
msgctxt "field:product.product,create_date:"
msgid "Create Date"
msgstr "Fecha creación"
@@ -76,6 +80,10 @@ msgctxt "field:product.product,create_uid:"
msgid "Create User"
msgstr "Usuario creación"
+msgctxt "field:product.product,default_uom:"
+msgid "Default UOM"
+msgstr "UdM por defecto"
+
msgctxt "field:product.product,description:"
msgid "Description"
msgstr "Descripción"
@@ -84,6 +92,10 @@ msgctxt "field:product.product,id:"
msgid "ID"
msgstr "ID"
+msgctxt "field:product.product,list_price_uom:"
+msgid "List Price"
+msgstr "Precio de lista"
+
msgctxt "field:product.product,rec_name:"
msgid "Name"
msgstr "Nombre"
@@ -92,6 +104,10 @@ msgctxt "field:product.product,template:"
msgid "Product Template"
msgstr "Plantilla de producto"
+msgctxt "field:product.product,type:"
+msgid "Type"
+msgstr "Tipo"
+
msgctxt "field:product.product,write_date:"
msgid "Write Date"
msgstr "Fecha modificación"
@@ -120,10 +136,6 @@ msgctxt "field:product.template,cost_price_method:"
msgid "Cost Method"
msgstr "Método de costo"
-msgctxt "field:product.template,cost_price_uom:"
-msgid "Cost Price"
-msgstr "Precio de costo"
-
msgctxt "field:product.template,create_date:"
msgid "Create Date"
msgstr "Fecha creación"
@@ -134,11 +146,11 @@ msgstr "Usuario creación"
msgctxt "field:product.template,default_uom:"
msgid "Default UOM"
-msgstr "UdM predeterminada"
+msgstr "UdM por defecto"
msgctxt "field:product.template,default_uom_category:"
msgid "Default UOM Category"
-msgstr "CategorÃa de UdM predeterminada"
+msgstr "CategorÃa de UdM por defecto"
msgctxt "field:product.template,id:"
msgid "ID"
@@ -148,17 +160,13 @@ msgctxt "field:product.template,list_price:"
msgid "List Price"
msgstr "Precio de lista"
-msgctxt "field:product.template,list_price_uom:"
-msgid "List Price"
-msgstr "Precio de lista"
-
msgctxt "field:product.template,name:"
msgid "Name"
msgstr "Nombre"
msgctxt "field:product.template,products:"
-msgid "Products"
-msgstr "Productos"
+msgid "Variants"
+msgstr "Variantes"
msgctxt "field:product.template,rec_name:"
msgid "Name"
@@ -288,11 +296,15 @@ msgctxt "model:ir.action,name:act_category_tree"
msgid "Categories"
msgstr "CategorÃas"
-msgctxt "model:ir.action,name:act_product_by_category"
+msgctxt "model:ir.action,name:act_product_form"
+msgid "Variants"
+msgstr "Variantes"
+
+msgctxt "model:ir.action,name:act_template_by_category"
msgid "Product by Category"
-msgstr "Producto por categorÃa"
+msgstr "Productos por categorÃa"
-msgctxt "model:ir.action,name:act_product_form"
+msgctxt "model:ir.action,name:act_template_form"
msgid "Products"
msgstr "Productos"
@@ -314,9 +326,13 @@ msgstr "CategorÃas"
msgctxt "model:ir.ui.menu,name:menu_main_product"
msgid "Product"
-msgstr "Producto"
+msgstr "Productos"
-msgctxt "model:ir.ui.menu,name:menu_product_product"
+msgctxt "model:ir.ui.menu,name:menu_product"
+msgid "Variants"
+msgstr "Variantes"
+
+msgctxt "model:ir.ui.menu,name:menu_template"
msgid "Products"
msgstr "Productos"
@@ -333,8 +349,8 @@ msgid "Product Category"
msgstr "CategorÃa de producto"
msgctxt "model:product.product,name:"
-msgid "Product"
-msgstr "Producto"
+msgid "Product Variant"
+msgstr "Variante de producto"
msgctxt "model:product.template,name:"
msgid "Product Template"
@@ -632,6 +648,18 @@ msgctxt "model:res.group,name:group_product_admin"
msgid "Product Administration"
msgstr "Administración de productos"
+msgctxt "selection:product.product,type:"
+msgid "Assets"
+msgstr "Activos"
+
+msgctxt "selection:product.product,type:"
+msgid "Goods"
+msgstr "Bienes"
+
+msgctxt "selection:product.product,type:"
+msgid "Service"
+msgstr "Servicio"
+
msgctxt "selection:product.template,cost_price_method:"
msgid "Average"
msgstr "Promedio"
@@ -665,18 +693,10 @@ msgid "Product Category"
msgstr "CategorÃa de producto"
msgctxt "view:product.product:"
-msgid "General"
-msgstr "General"
-
-msgctxt "view:product.product:"
msgid "Product"
msgstr "Producto"
msgctxt "view:product.product:"
-msgid "Product Suppliers"
-msgstr "Proveedores de productos"
-
-msgctxt "view:product.product:"
msgid "Products"
msgstr "Productos"
@@ -685,12 +705,12 @@ msgid "General"
msgstr "General"
msgctxt "view:product.template:"
-msgid "Product Template"
-msgstr "Plantilla de producto"
+msgid "Product"
+msgstr "Producto"
msgctxt "view:product.template:"
-msgid "Product Templates"
-msgstr "Plantillas de producto"
+msgid "Products"
+msgstr "Productos"
msgctxt "view:product.uom.category:"
msgid "Categories of Unit of Measure"
diff --git a/locale/es_CO.po b/locale/es_CO.po
index e13b79c..f93bc16 100644
--- a/locale/es_CO.po
+++ b/locale/es_CO.po
@@ -2,10 +2,6 @@
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
-msgctxt "error:product.category:"
-msgid "You can not create recursive categories!"
-msgstr "¡No puede crear categorÃas recursivas!"
-
msgctxt "error:product.uom:"
msgid ""
"If the UOM is still not used, you can delete it otherwise you can deactivate"
@@ -15,8 +11,8 @@ msgstr ""
"desactivarla y crear una nueva."
msgctxt "error:product.uom:"
-msgid "Invalid Factor and Rate values!"
-msgstr "¡Factor y valores de tasa de cambio inválidas!"
+msgid "Invalid Factor and Rate values in UOM \"%s\"."
+msgstr "Valores inválidos en factor y tasa de conversión en UdM \"%s\"."
msgctxt "error:product.uom:"
msgid "Rate and factor can not be both equal to zero."
@@ -64,10 +60,18 @@ msgctxt "field:product.category,write_uid:"
msgid "Write User"
msgstr "Modificado por Usuario"
+msgctxt "field:product.product,active:"
+msgid "Active"
+msgstr "Activo"
+
msgctxt "field:product.product,code:"
msgid "Code"
msgstr "Código"
+msgctxt "field:product.product,cost_price_uom:"
+msgid "Cost Price"
+msgstr "Precio de Costo"
+
msgctxt "field:product.product,create_date:"
msgid "Create Date"
msgstr "Fecha de Creación"
@@ -76,6 +80,10 @@ msgctxt "field:product.product,create_uid:"
msgid "Create User"
msgstr "Creado por Usuario"
+msgctxt "field:product.product,default_uom:"
+msgid "Default UOM"
+msgstr "UdM por Defecto"
+
msgctxt "field:product.product,description:"
msgid "Description"
msgstr "Descripción"
@@ -84,6 +92,10 @@ msgctxt "field:product.product,id:"
msgid "ID"
msgstr "ID"
+msgctxt "field:product.product,list_price_uom:"
+msgid "List Price"
+msgstr "Precio de Lista"
+
msgctxt "field:product.product,rec_name:"
msgid "Name"
msgstr "Nombre"
@@ -92,6 +104,10 @@ msgctxt "field:product.product,template:"
msgid "Product Template"
msgstr "Plantilla de Producto"
+msgctxt "field:product.product,type:"
+msgid "Type"
+msgstr "Tipo"
+
msgctxt "field:product.product,write_date:"
msgid "Write Date"
msgstr "Fecha de Modificación"
@@ -120,10 +136,6 @@ msgctxt "field:product.template,cost_price_method:"
msgid "Cost Method"
msgstr "Método de Costo"
-msgctxt "field:product.template,cost_price_uom:"
-msgid "Cost Price"
-msgstr "Precio de Costo"
-
msgctxt "field:product.template,create_date:"
msgid "Create Date"
msgstr "Fecha de Creación"
@@ -134,11 +146,11 @@ msgstr "Creado por Usuario"
msgctxt "field:product.template,default_uom:"
msgid "Default UOM"
-msgstr "UdM Predeterminada"
+msgstr "UdM por Defecto"
msgctxt "field:product.template,default_uom_category:"
msgid "Default UOM Category"
-msgstr "CategorÃa de UdM predeterminada"
+msgstr "CategorÃa de UdM por Defecto"
msgctxt "field:product.template,id:"
msgid "ID"
@@ -148,16 +160,12 @@ msgctxt "field:product.template,list_price:"
msgid "List Price"
msgstr "Precio de Lista"
-msgctxt "field:product.template,list_price_uom:"
-msgid "List Price"
-msgstr "Precio de Lista"
-
msgctxt "field:product.template,name:"
msgid "Name"
msgstr "Nombre"
msgctxt "field:product.template,products:"
-msgid "Products"
+msgid "Variants"
msgstr "Productos"
msgctxt "field:product.template,rec_name:"
@@ -288,11 +296,15 @@ msgctxt "model:ir.action,name:act_category_tree"
msgid "Categories"
msgstr "CategorÃas"
-msgctxt "model:ir.action,name:act_product_by_category"
+msgctxt "model:ir.action,name:act_product_form"
+msgid "Variants"
+msgstr "Variedad"
+
+msgctxt "model:ir.action,name:act_template_by_category"
msgid "Product by Category"
msgstr "Producto por CategorÃa"
-msgctxt "model:ir.action,name:act_product_form"
+msgctxt "model:ir.action,name:act_template_form"
msgid "Products"
msgstr "Productos"
@@ -316,7 +328,11 @@ msgctxt "model:ir.ui.menu,name:menu_main_product"
msgid "Product"
msgstr "Producto"
-msgctxt "model:ir.ui.menu,name:menu_product_product"
+msgctxt "model:ir.ui.menu,name:menu_product"
+msgid "Variants"
+msgstr "Variedad"
+
+msgctxt "model:ir.ui.menu,name:menu_template"
msgid "Products"
msgstr "Productos"
@@ -333,8 +349,8 @@ msgid "Product Category"
msgstr "CategorÃa de Producto"
msgctxt "model:product.product,name:"
-msgid "Product"
-msgstr "Producto"
+msgid "Product Variant"
+msgstr "Variedad de Producto"
msgctxt "model:product.template,name:"
msgid "Product Template"
@@ -466,7 +482,7 @@ msgstr "Unidad"
msgctxt "model:product.uom,name:uom_work_day"
msgid "Work Day"
-msgstr "DÃa de trabajo"
+msgstr "DÃa Laboral"
msgctxt "model:product.uom,name:uom_yard"
msgid "Yard"
@@ -590,7 +606,7 @@ msgstr "yd²"
msgctxt "model:product.uom,symbol:uom_unit"
msgid "u"
-msgstr "u"
+msgstr "und"
msgctxt "model:product.uom,symbol:uom_work_day"
msgid "wd"
@@ -632,6 +648,18 @@ msgctxt "model:res.group,name:group_product_admin"
msgid "Product Administration"
msgstr "Administración de Productos"
+msgctxt "selection:product.product,type:"
+msgid "Assets"
+msgstr "Activos"
+
+msgctxt "selection:product.product,type:"
+msgid "Goods"
+msgstr "ArtÃculos"
+
+msgctxt "selection:product.product,type:"
+msgid "Service"
+msgstr "Servicio"
+
msgctxt "selection:product.template,cost_price_method:"
msgid "Average"
msgstr "Promedio"
@@ -646,7 +674,7 @@ msgstr "Activos"
msgctxt "selection:product.template,type:"
msgid "Goods"
-msgstr "Bienes"
+msgstr "ArtÃculos"
msgctxt "selection:product.template,type:"
msgid "Service"
@@ -665,18 +693,10 @@ msgid "Product Category"
msgstr "CategorÃa de Producto"
msgctxt "view:product.product:"
-msgid "General"
-msgstr "General"
-
-msgctxt "view:product.product:"
msgid "Product"
msgstr "Producto"
msgctxt "view:product.product:"
-msgid "Product Suppliers"
-msgstr "Proveedores de Productos"
-
-msgctxt "view:product.product:"
msgid "Products"
msgstr "Productos"
@@ -684,17 +704,19 @@ msgctxt "view:product.template:"
msgid "General"
msgstr "General"
+#, fuzzy
msgctxt "view:product.template:"
-msgid "Product Template"
-msgstr "Plantilla de Producto"
+msgid "Product"
+msgstr "Productos"
+#, fuzzy
msgctxt "view:product.template:"
-msgid "Product Templates"
-msgstr "Plantillas de Producto"
+msgid "Products"
+msgstr "Productos"
msgctxt "view:product.uom.category:"
msgid "Categories of Unit of Measure"
-msgstr "CategorÃas de Unidades de Medida"
+msgstr "CategorÃas de Unidad de Medida"
msgctxt "view:product.uom.category:"
msgid "Category of Unit of Measure"
diff --git a/locale/es_ES.po b/locale/es_ES.po
index 1fa8f17..ba5ca44 100644
--- a/locale/es_ES.po
+++ b/locale/es_ES.po
@@ -2,10 +2,6 @@
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
-msgctxt "error:product.category:"
-msgid "You can not create recursive categories!"
-msgstr "No puede crear categorÃas recursivas."
-
msgctxt "error:product.uom:"
msgid ""
"If the UOM is still not used, you can delete it otherwise you can deactivate"
@@ -15,8 +11,8 @@ msgstr ""
"desactivarla y crear una de nueva."
msgctxt "error:product.uom:"
-msgid "Invalid Factor and Rate values!"
-msgstr "Los valores de factor y conversión no son correctos."
+msgid "Invalid Factor and Rate values in UOM \"%s\"."
+msgstr "Valores de factor y ratio en UdM \"%s\" no es correcto."
msgctxt "error:product.uom:"
msgid "Rate and factor can not be both equal to zero."
@@ -64,10 +60,18 @@ msgctxt "field:product.category,write_uid:"
msgid "Write User"
msgstr "Usuario modificación"
+msgctxt "field:product.product,active:"
+msgid "Active"
+msgstr "Activo"
+
msgctxt "field:product.product,code:"
msgid "Code"
msgstr "Código"
+msgctxt "field:product.product,cost_price_uom:"
+msgid "Cost Price"
+msgstr "Precio de coste"
+
msgctxt "field:product.product,create_date:"
msgid "Create Date"
msgstr "Fecha creación"
@@ -76,6 +80,10 @@ msgctxt "field:product.product,create_uid:"
msgid "Create User"
msgstr "Usuario creación"
+msgctxt "field:product.product,default_uom:"
+msgid "Default UOM"
+msgstr "UdM por defecto"
+
msgctxt "field:product.product,description:"
msgid "Description"
msgstr "Descripción"
@@ -84,6 +92,10 @@ msgctxt "field:product.product,id:"
msgid "ID"
msgstr "ID"
+msgctxt "field:product.product,list_price_uom:"
+msgid "List Price"
+msgstr "Precio de venta"
+
msgctxt "field:product.product,rec_name:"
msgid "Name"
msgstr "Nombre"
@@ -92,6 +104,10 @@ msgctxt "field:product.product,template:"
msgid "Product Template"
msgstr "Plantilla de producto"
+msgctxt "field:product.product,type:"
+msgid "Type"
+msgstr "Tipo"
+
msgctxt "field:product.product,write_date:"
msgid "Write Date"
msgstr "Fecha modificación"
@@ -120,10 +136,6 @@ msgctxt "field:product.template,cost_price_method:"
msgid "Cost Method"
msgstr "Método de coste"
-msgctxt "field:product.template,cost_price_uom:"
-msgid "Cost Price"
-msgstr "Precio de coste"
-
msgctxt "field:product.template,create_date:"
msgid "Create Date"
msgstr "Fecha creación"
@@ -148,17 +160,13 @@ msgctxt "field:product.template,list_price:"
msgid "List Price"
msgstr "Precio de venta"
-msgctxt "field:product.template,list_price_uom:"
-msgid "List Price"
-msgstr "Precio de venta"
-
msgctxt "field:product.template,name:"
msgid "Name"
msgstr "Nombre"
msgctxt "field:product.template,products:"
-msgid "Products"
-msgstr "Productos"
+msgid "Variants"
+msgstr "Variantes"
msgctxt "field:product.template,rec_name:"
msgid "Name"
@@ -288,11 +296,16 @@ msgctxt "model:ir.action,name:act_category_tree"
msgid "Categories"
msgstr "CategorÃas"
-msgctxt "model:ir.action,name:act_product_by_category"
+#, fuzzy
+msgctxt "model:ir.action,name:act_product_form"
+msgid "Variants"
+msgstr "Productos"
+
+msgctxt "model:ir.action,name:act_template_by_category"
msgid "Product by Category"
-msgstr "Producto por categorÃa"
+msgstr "Productos por categorÃa"
-msgctxt "model:ir.action,name:act_product_form"
+msgctxt "model:ir.action,name:act_template_form"
msgid "Products"
msgstr "Productos"
@@ -316,7 +329,12 @@ msgctxt "model:ir.ui.menu,name:menu_main_product"
msgid "Product"
msgstr "Productos"
-msgctxt "model:ir.ui.menu,name:menu_product_product"
+#, fuzzy
+msgctxt "model:ir.ui.menu,name:menu_product"
+msgid "Variants"
+msgstr "Variantes"
+
+msgctxt "model:ir.ui.menu,name:menu_template"
msgid "Products"
msgstr "Productos"
@@ -333,8 +351,8 @@ msgid "Product Category"
msgstr "CategorÃa de producto"
msgctxt "model:product.product,name:"
-msgid "Product"
-msgstr "Producto"
+msgid "Product Variant"
+msgstr "Variante de producto"
msgctxt "model:product.template,name:"
msgid "Product Template"
@@ -632,6 +650,18 @@ msgctxt "model:res.group,name:group_product_admin"
msgid "Product Administration"
msgstr "Administración de productos"
+msgctxt "selection:product.product,type:"
+msgid "Assets"
+msgstr "Activos"
+
+msgctxt "selection:product.product,type:"
+msgid "Goods"
+msgstr "Bienes"
+
+msgctxt "selection:product.product,type:"
+msgid "Service"
+msgstr "Servicios"
+
msgctxt "selection:product.template,cost_price_method:"
msgid "Average"
msgstr "Promedio"
@@ -650,7 +680,7 @@ msgstr "Bienes"
msgctxt "selection:product.template,type:"
msgid "Service"
-msgstr "Servicio"
+msgstr "Servicios"
msgctxt "view:product.category:"
msgid "Children"
@@ -665,18 +695,10 @@ msgid "Product Category"
msgstr "CategorÃa de producto"
msgctxt "view:product.product:"
-msgid "General"
-msgstr "General"
-
-msgctxt "view:product.product:"
msgid "Product"
msgstr "Producto"
msgctxt "view:product.product:"
-msgid "Product Suppliers"
-msgstr "Proveedores de producto"
-
-msgctxt "view:product.product:"
msgid "Products"
msgstr "Productos"
@@ -685,12 +707,12 @@ msgid "General"
msgstr "General"
msgctxt "view:product.template:"
-msgid "Product Template"
-msgstr "Plantilla de producto"
+msgid "Product"
+msgstr "Productos"
msgctxt "view:product.template:"
-msgid "Product Templates"
-msgstr "Plantillas de producto"
+msgid "Products"
+msgstr "Productos"
msgctxt "view:product.uom.category:"
msgid "Categories of Unit of Measure"
diff --git a/locale/fr_FR.po b/locale/fr_FR.po
index b91b033..f671ccc 100644
--- a/locale/fr_FR.po
+++ b/locale/fr_FR.po
@@ -2,14 +2,6 @@
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
-msgctxt "error:product.category:"
-msgid "You can not create recursive categories!"
-msgstr "Vous ne pouvez pas créer des catégories récursives !"
-
-msgctxt "error:product.category:"
-msgid "You can not create recursive categories!"
-msgstr "Vous ne pouvez pas créer des catégories récursives !"
-
msgctxt "error:product.template:"
msgid ""
"You cannot change the default uom for a product which is associated to stock"
@@ -35,12 +27,8 @@ msgstr ""
"désactiver et en créer une nouvelle."
msgctxt "error:product.uom:"
-msgid "Invalid Factor and Rate values!"
-msgstr "Valeurs de facteur et de taux invalides !"
-
-msgctxt "error:product.uom:"
-msgid "Invalid Factor and Rate values!"
-msgstr "Valeurs de facteur et de taux invalides !"
+msgid "Invalid Factor and Rate values in UOM \"%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."
@@ -98,10 +86,18 @@ msgctxt "field:product.category,write_uid:"
msgid "Write User"
msgstr "Mis à jour par"
+msgctxt "field:product.product,active:"
+msgid "Active"
+msgstr "Actif"
+
msgctxt "field:product.product,code:"
msgid "Code"
msgstr "Code"
+msgctxt "field:product.product,cost_price_uom:"
+msgid "Cost Price"
+msgstr "Prix de revient"
+
msgctxt "field:product.product,create_date:"
msgid "Create Date"
msgstr "Date de création"
@@ -110,6 +106,10 @@ msgctxt "field:product.product,create_uid:"
msgid "Create User"
msgstr "Créé par"
+msgctxt "field:product.product,default_uom:"
+msgid "Default UOM"
+msgstr "UDM par défaut"
+
msgctxt "field:product.product,description:"
msgid "Description"
msgstr "Description"
@@ -118,6 +118,10 @@ msgctxt "field:product.product,id:"
msgid "ID"
msgstr "ID"
+msgctxt "field:product.product,list_price_uom:"
+msgid "List Price"
+msgstr "Prix listé"
+
msgctxt "field:product.product,rec_name:"
msgid "Name"
msgstr "Nom"
@@ -126,6 +130,10 @@ msgctxt "field:product.product,template:"
msgid "Product Template"
msgstr "Modèle produit"
+msgctxt "field:product.product,type:"
+msgid "Type"
+msgstr "Type"
+
msgctxt "field:product.product,write_date:"
msgid "Write Date"
msgstr "Date de mise à jour"
@@ -154,10 +162,6 @@ msgctxt "field:product.template,cost_price_method:"
msgid "Cost Method"
msgstr "Méthode de coût"
-msgctxt "field:product.template,cost_price_uom:"
-msgid "Cost Price"
-msgstr "Prix de revient"
-
msgctxt "field:product.template,create_date:"
msgid "Create Date"
msgstr "Date de création"
@@ -182,17 +186,13 @@ msgctxt "field:product.template,list_price:"
msgid "List Price"
msgstr "Prix listé"
-msgctxt "field:product.template,list_price_uom:"
-msgid "List Price"
-msgstr "Prix listé"
-
msgctxt "field:product.template,name:"
msgid "Name"
msgstr "Nom"
msgctxt "field:product.template,products:"
-msgid "Products"
-msgstr "Produits"
+msgid "Variants"
+msgstr "Variantes"
msgctxt "field:product.template,rec_name:"
msgid "Name"
@@ -322,11 +322,15 @@ msgctxt "model:ir.action,name:act_category_tree"
msgid "Categories"
msgstr "Catégories"
-msgctxt "model:ir.action,name:act_product_by_category"
+msgctxt "model:ir.action,name:act_product_form"
+msgid "Variants"
+msgstr "Variantes"
+
+msgctxt "model:ir.action,name:act_template_by_category"
msgid "Product by Category"
-msgstr "Produits par catégories"
+msgstr "Catégorie de produit"
-msgctxt "model:ir.action,name:act_product_form"
+msgctxt "model:ir.action,name:act_template_form"
msgid "Products"
msgstr "Produits"
@@ -350,7 +354,11 @@ msgctxt "model:ir.ui.menu,name:menu_main_product"
msgid "Product"
msgstr "Produit"
-msgctxt "model:ir.ui.menu,name:menu_product_product"
+msgctxt "model:ir.ui.menu,name:menu_product"
+msgid "Variants"
+msgstr "Variantes"
+
+msgctxt "model:ir.ui.menu,name:menu_template"
msgid "Products"
msgstr "Produits"
@@ -367,8 +375,8 @@ msgid "Product Category"
msgstr "Catégorie de produit"
msgctxt "model:product.product,name:"
-msgid "Product"
-msgstr "Produit"
+msgid "Product Variant"
+msgstr "Variante produit"
msgctxt "model:product.template,name:"
msgid "Product Template"
@@ -666,6 +674,18 @@ msgctxt "model:res.group,name:group_product_admin"
msgid "Product Administration"
msgstr "Administration de produits"
+msgctxt "selection:product.product,type:"
+msgid "Assets"
+msgstr "Biens"
+
+msgctxt "selection:product.product,type:"
+msgid "Goods"
+msgstr "Biens"
+
+msgctxt "selection:product.product,type:"
+msgid "Service"
+msgstr "Service"
+
msgctxt "selection:product.template,cost_price_method:"
msgid "Average"
msgstr "Moyenne"
@@ -722,14 +742,6 @@ msgctxt "view:product.category:"
msgid "Product Category"
msgstr "Catégorie de produit"
-msgctxt "view:product.category:"
-msgid "Properties"
-msgstr "Propriétés"
-
-msgctxt "view:product.product:"
-msgid "General"
-msgstr "Général"
-
msgctxt "view:product.product:"
msgid "Product"
msgstr "Produit"
@@ -742,10 +754,6 @@ msgctxt "view:product.product:"
msgid "Products"
msgstr "Produits"
-msgctxt "view:product.product:"
-msgid "Properties"
-msgstr "Propriétés"
-
msgctxt "view:product.template:"
msgid "General"
msgstr "Général"
@@ -755,20 +763,12 @@ msgid "General"
msgstr "Général"
msgctxt "view:product.template:"
-msgid "Product Template"
-msgstr "Modèle produit"
-
-msgctxt "view:product.template:"
-msgid "Product Template"
-msgstr "Modèle produit"
-
-msgctxt "view:product.template:"
-msgid "Product Templates"
-msgstr "Modèles de produit"
+msgid "Product"
+msgstr "Produit"
msgctxt "view:product.template:"
-msgid "Product Templates"
-msgstr "Modèles de produit"
+msgid "Products"
+msgstr "Produits"
msgctxt "view:product.uom.category:"
msgid "Categories of Unit of Measure"
diff --git a/locale/nl_NL.po b/locale/nl_NL.po
index 38b3d89..c25e883 100644
--- a/locale/nl_NL.po
+++ b/locale/nl_NL.po
@@ -2,11 +2,6 @@
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
-#, fuzzy
-msgctxt "error:product.category:"
-msgid "You can not create recursive categories!"
-msgstr "U kunt geen recursieve categorieën aanmaken!"
-
msgctxt "error:product.template:"
msgid "There is no account expense/revenue defined on the product %s (%d)"
msgstr ""
@@ -21,8 +16,8 @@ msgstr ""
"je hem deactiveren en een nieuwe aanmaken."
msgctxt "error:product.uom:"
-msgid "Invalid Factor and Rate values!"
-msgstr "Ongeldige factor en verhouding waarden"
+msgid "Invalid Factor and Rate values in UOM \"%s\"."
+msgstr ""
msgctxt "error:product.uom:"
msgid "Rate and factor can not be both equal to zero."
@@ -109,10 +104,20 @@ msgctxt "field:product.category-supplier-account.tax,tax:"
msgid "Tax"
msgstr "Belasting"
+#, fuzzy
+msgctxt "field:product.product,active:"
+msgid "Active"
+msgstr "Actief"
+
msgctxt "field:product.product,code:"
msgid "Code"
msgstr "Code"
+#, fuzzy
+msgctxt "field:product.product,cost_price_uom:"
+msgid "Cost Price"
+msgstr "Kostprijs"
+
msgctxt "field:product.product,create_date:"
msgid "Create Date"
msgstr ""
@@ -121,6 +126,11 @@ msgctxt "field:product.product,create_uid:"
msgid "Create User"
msgstr ""
+#, fuzzy
+msgctxt "field:product.product,default_uom:"
+msgid "Default UOM"
+msgstr "Standaard ME"
+
msgctxt "field:product.product,description:"
msgid "Description"
msgstr "Omschrijving"
@@ -129,6 +139,11 @@ msgctxt "field:product.product,id:"
msgid "ID"
msgstr ""
+#, fuzzy
+msgctxt "field:product.product,list_price_uom:"
+msgid "List Price"
+msgstr "Catalogusprijs"
+
msgctxt "field:product.product,rec_name:"
msgid "Name"
msgstr "Naam"
@@ -137,6 +152,11 @@ msgctxt "field:product.product,template:"
msgid "Product Template"
msgstr "Productsjabloon"
+#, fuzzy
+msgctxt "field:product.product,type:"
+msgid "Type"
+msgstr "Type"
+
msgctxt "field:product.product,write_date:"
msgid "Write Date"
msgstr ""
@@ -185,10 +205,6 @@ msgctxt "field:product.template,cost_price_method:"
msgid "Cost Method"
msgstr "Kostprijsmethode"
-msgctxt "field:product.template,cost_price_uom:"
-msgid "Cost Price"
-msgstr "Kostprijs"
-
msgctxt "field:product.template,create_date:"
msgid "Create Date"
msgstr ""
@@ -221,16 +237,13 @@ msgctxt "field:product.template,list_price:"
msgid "List Price"
msgstr "Catalogusprijs"
-msgctxt "field:product.template,list_price_uom:"
-msgid "List Price"
-msgstr "Catalogusprijs"
-
msgctxt "field:product.template,name:"
msgid "Name"
msgstr "Naam"
+#, fuzzy
msgctxt "field:product.template,products:"
-msgid "Products"
+msgid "Variants"
msgstr "Producten"
msgctxt "field:product.template,rec_name:"
@@ -417,11 +430,17 @@ msgctxt "model:ir.action,name:act_category_tree"
msgid "Categories"
msgstr "Categorieën"
-msgctxt "model:ir.action,name:act_product_by_category"
+#, fuzzy
+msgctxt "model:ir.action,name:act_product_form"
+msgid "Variants"
+msgstr "Producten"
+
+msgctxt "model:ir.action,name:act_template_by_category"
msgid "Product by Category"
-msgstr "Product per categorie"
+msgstr ""
-msgctxt "model:ir.action,name:act_product_form"
+#, fuzzy
+msgctxt "model:ir.action,name:act_template_form"
msgid "Products"
msgstr "Producten"
@@ -446,7 +465,13 @@ msgctxt "model:ir.ui.menu,name:menu_main_product"
msgid "Product"
msgstr "Productbeheer"
-msgctxt "model:ir.ui.menu,name:menu_product_product"
+#, fuzzy
+msgctxt "model:ir.ui.menu,name:menu_product"
+msgid "Variants"
+msgstr "Producten"
+
+#, fuzzy
+msgctxt "model:ir.ui.menu,name:menu_template"
msgid "Products"
msgstr "Producten"
@@ -470,8 +495,9 @@ msgctxt "model:product.category-supplier-account.tax,name:"
msgid "Category - Supplier Tax"
msgstr "Categorie - belasting leverancier"
+#, fuzzy
msgctxt "model:product.product,name:"
-msgid "Product"
+msgid "Product Variant"
msgstr "Product"
msgctxt "model:product.template,name:"
@@ -778,6 +804,19 @@ msgctxt "model:res.group,name:group_product_admin"
msgid "Product Administration"
msgstr "Productregistratie"
+msgctxt "selection:product.product,type:"
+msgid "Assets"
+msgstr ""
+
+msgctxt "selection:product.product,type:"
+msgid "Goods"
+msgstr ""
+
+#, fuzzy
+msgctxt "selection:product.product,type:"
+msgid "Service"
+msgstr "Service"
+
msgctxt "selection:product.template,cost_price_method:"
msgid "Average"
msgstr "Gemiddeld"
@@ -810,33 +849,28 @@ msgctxt "view:product.category:"
msgid "Product Category"
msgstr "Product categorie"
+#, fuzzy
msgctxt "view:product.product:"
-msgid "Products"
+msgid "Product"
msgstr "Producten"
-msgctxt "view:product.template:"
-msgid "Accounting"
-msgstr "Boekhouden"
-
-msgctxt "view:product.template:"
-msgid "Accounts"
-msgstr "Rekeningen"
+msgctxt "view:product.product:"
+msgid "Products"
+msgstr "Producten"
msgctxt "view:product.template:"
msgid "General"
msgstr "Algemeen"
+#, fuzzy
msgctxt "view:product.template:"
-msgid "Product Template"
-msgstr "Productsjabloon"
-
-msgctxt "view:product.template:"
-msgid "Product Templates"
-msgstr "Productsjabloon"
+msgid "Product"
+msgstr "Producten"
+#, fuzzy
msgctxt "view:product.template:"
-msgid "Taxes"
-msgstr "Belastingen"
+msgid "Products"
+msgstr "Producten"
msgctxt "view:product.uom.category:"
msgid "Categories of Unit of Measure"
diff --git a/locale/ru_RU.po b/locale/ru_RU.po
index 643c62e..2edff00 100644
--- a/locale/ru_RU.po
+++ b/locale/ru_RU.po
@@ -2,45 +2,43 @@
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
-#, fuzzy
-msgctxt "error:product.category:"
-msgid "You can not create recursive categories!"
-msgstr "Ð’Ñ‹ не можете Ñоздавать рекурÑивные категории!"
-
msgctxt "error:product.uom:"
msgid ""
"If the UOM is still not used, you can delete it otherwise you can deactivate"
" it and create a new one."
msgstr ""
+"ЕÑли ед.Ð¸Ð·Ð¼ÐµÑ€ÐµÐ½Ð¸Ñ Ð½Ðµ иÑпользуетÑÑ, то можно её удалить, иначе её нужно "
+"деактивировать и Ñоздать новую."
msgctxt "error:product.uom:"
-msgid "Invalid Factor and Rate values!"
-msgstr "Ðе правильные Ð·Ð½Ð°Ñ‡ÐµÐ½Ð¸Ñ Ñ„Ð°ÐºÑ‚Ð¾Ñ€Ð° и курÑа"
+msgid "Invalid Factor and Rate values in UOM \"%s\"."
+msgstr "Ðекорректный коÑффициент и размер в Ед.Ð¸Ð·Ð¼ÐµÑ€ÐµÐ½Ð¸Ñ \"%s\"."
msgctxt "error:product.uom:"
msgid "Rate and factor can not be both equal to zero."
-msgstr "Ставка и фактор не могут быть одновременно равны нулю."
+msgstr "Размер и коÑффициент не могут быть одновременно равны нулю."
msgctxt "error:product.uom:"
msgid "You cannot change Rate, Factor or Category on a Unit of Measure. "
msgstr ""
-"Ð’Ñ‹ не можете изменить КурÑ, фактор или категорию на единицу измерениÑ."
+"Ð’Ñ‹ не можете изменить размер, коÑффициент или категорию на единицу "
+"измерениÑ."
msgctxt "field:product.category,childs:"
msgid "Children"
-msgstr "Подчиненый"
+msgstr "Подчиненные"
msgctxt "field:product.category,create_date:"
msgid "Create Date"
-msgstr ""
+msgstr "Дата ÑозданиÑ"
msgctxt "field:product.category,create_uid:"
msgid "Create User"
-msgstr ""
+msgstr "Создано пользователем"
msgctxt "field:product.category,id:"
msgid "ID"
-msgstr ""
+msgstr "ID"
msgctxt "field:product.category,name:"
msgid "Name"
@@ -48,31 +46,43 @@ msgstr "Ðаименование"
msgctxt "field:product.category,parent:"
msgid "Parent"
-msgstr "ОÑновной"
+msgstr "Предок"
msgctxt "field:product.category,rec_name:"
msgid "Name"
-msgstr "Ðаименование"
+msgstr "Полное наименование"
msgctxt "field:product.category,write_date:"
msgid "Write Date"
-msgstr ""
+msgstr "Дата изменениÑ"
msgctxt "field:product.category,write_uid:"
msgid "Write User"
-msgstr ""
+msgstr "Изменено пользователем"
+
+msgctxt "field:product.product,active:"
+msgid "Active"
+msgstr "ДейÑтвующий"
msgctxt "field:product.product,code:"
msgid "Code"
msgstr "Код"
+msgctxt "field:product.product,cost_price_uom:"
+msgid "Cost Price"
+msgstr "СебеÑтоимоÑÑ‚ÑŒ"
+
msgctxt "field:product.product,create_date:"
msgid "Create Date"
-msgstr ""
+msgstr "Дата ÑозданиÑ"
msgctxt "field:product.product,create_uid:"
msgid "Create User"
-msgstr ""
+msgstr "Создано пользователем"
+
+msgctxt "field:product.product,default_uom:"
+msgid "Default UOM"
+msgstr "Ед.Ð¸Ð·Ð¼ÐµÑ€ÐµÐ½Ð¸Ñ Ð¿Ð¾ умолчанию"
msgctxt "field:product.product,description:"
msgid "Description"
@@ -80,7 +90,11 @@ msgstr "ОпиÑание"
msgctxt "field:product.product,id:"
msgid "ID"
-msgstr ""
+msgstr "ID"
+
+msgctxt "field:product.product,list_price_uom:"
+msgid "List Price"
+msgstr "Цена"
msgctxt "field:product.product,rec_name:"
msgid "Name"
@@ -88,75 +102,71 @@ msgstr "Ðаименование"
msgctxt "field:product.product,template:"
msgid "Product Template"
-msgstr "Шаблон Товара"
+msgstr "Шаблон продукта"
+
+msgctxt "field:product.product,type:"
+msgid "Type"
+msgstr "Тип"
msgctxt "field:product.product,write_date:"
msgid "Write Date"
-msgstr ""
+msgstr "Дата изменениÑ"
msgctxt "field:product.product,write_uid:"
msgid "Write User"
-msgstr ""
+msgstr "Изменено пользователем"
msgctxt "field:product.template,active:"
msgid "Active"
-msgstr "ДейÑтвительнный"
+msgstr "ДейÑтвующий"
msgctxt "field:product.template,category:"
msgid "Category"
-msgstr "Категории"
+msgstr "КатегориÑ"
msgctxt "field:product.template,consumable:"
msgid "Consumable"
-msgstr ""
+msgstr "ПотреблÑемый"
msgctxt "field:product.template,cost_price:"
msgid "Cost Price"
-msgstr "ÐŸÐ¾ÐºÑƒÐ¿Ð½Ð°Ñ Ñ†ÐµÐ½Ð°"
+msgstr "СебеÑтоимоÑÑ‚ÑŒ"
msgctxt "field:product.template,cost_price_method:"
msgid "Cost Method"
-msgstr "Затратный метод"
-
-msgctxt "field:product.template,cost_price_uom:"
-msgid "Cost Price"
-msgstr "Цена за единицу"
+msgstr "Учет ÑтоимоÑти"
msgctxt "field:product.template,create_date:"
msgid "Create Date"
-msgstr ""
+msgstr "Дата ÑозданиÑ"
msgctxt "field:product.template,create_uid:"
msgid "Create User"
-msgstr ""
+msgstr "Создано пользователем"
msgctxt "field:product.template,default_uom:"
msgid "Default UOM"
-msgstr "По умолчанию ед.измерениÑ"
+msgstr "Ед.Ð¸Ð·Ð¼ÐµÑ€ÐµÐ½Ð¸Ñ Ð¿Ð¾ умолчанию"
msgctxt "field:product.template,default_uom_category:"
msgid "Default UOM Category"
-msgstr ""
+msgstr "ÐšÐ°Ñ‚ÐµÐ³Ð¾Ñ€Ð¸Ñ ÐµÐ´.Ð¸Ð·Ð¼ÐµÑ€ÐµÐ½Ð¸Ñ Ð¿Ð¾ умолчанию"
msgctxt "field:product.template,id:"
msgid "ID"
-msgstr ""
+msgstr "ID"
msgctxt "field:product.template,list_price:"
msgid "List Price"
-msgstr "ПрайÑ-лиÑÑ‚"
-
-msgctxt "field:product.template,list_price_uom:"
-msgid "List Price"
-msgstr "ПрайÑ-лиÑÑ‚"
+msgstr "Цена"
msgctxt "field:product.template,name:"
msgid "Name"
msgstr "Ðаименование"
msgctxt "field:product.template,products:"
-msgid "Products"
-msgstr "ТМЦ"
+msgid "Variants"
+msgstr "РазновидноÑти"
msgctxt "field:product.template,rec_name:"
msgid "Name"
@@ -168,27 +178,27 @@ msgstr "Тип"
msgctxt "field:product.template,write_date:"
msgid "Write Date"
-msgstr ""
+msgstr "Дата изменениÑ"
msgctxt "field:product.template,write_uid:"
msgid "Write User"
-msgstr ""
+msgstr "Изменено пользователем"
msgctxt "field:product.uom,active:"
msgid "Active"
-msgstr "ДейÑтвительнный"
+msgstr "ДейÑтвующий"
msgctxt "field:product.uom,category:"
msgid "UOM Category"
-msgstr "ÐšÐ°Ñ‚ÐµÐ³Ð¾Ñ€Ð¸Ñ Ð•Ð´.изм."
+msgstr "ÐšÐ°Ñ‚ÐµÐ³Ð¾Ñ€Ð¸Ñ ÐµÐ´. измерениÑ"
msgctxt "field:product.uom,create_date:"
msgid "Create Date"
-msgstr ""
+msgstr "Дата ÑозданиÑ"
msgctxt "field:product.uom,create_uid:"
msgid "Create User"
-msgstr ""
+msgstr "Создано пользователем"
msgctxt "field:product.uom,digits:"
msgid "Display Digits"
@@ -200,7 +210,7 @@ msgstr "КоÑффициент к оÑновной единице"
msgctxt "field:product.uom,id:"
msgid "ID"
-msgstr ""
+msgstr "ID"
msgctxt "field:product.uom,name:"
msgid "Name"
@@ -224,23 +234,23 @@ msgstr "УÑловное обозначение"
msgctxt "field:product.uom,write_date:"
msgid "Write Date"
-msgstr ""
+msgstr "Дата изменениÑ"
msgctxt "field:product.uom,write_uid:"
msgid "Write User"
-msgstr ""
+msgstr "Изменено пользователем"
msgctxt "field:product.uom.category,create_date:"
msgid "Create Date"
-msgstr ""
+msgstr "Дата ÑозданиÑ"
msgctxt "field:product.uom.category,create_uid:"
msgid "Create User"
-msgstr ""
+msgstr "Создано пользователем"
msgctxt "field:product.uom.category,id:"
msgid "ID"
-msgstr ""
+msgstr "ID"
msgctxt "field:product.uom.category,name:"
msgid "Name"
@@ -256,11 +266,11 @@ msgstr "Единица измерений"
msgctxt "field:product.uom.category,write_date:"
msgid "Write Date"
-msgstr ""
+msgstr "Дата изменениÑ"
msgctxt "field:product.uom.category,write_uid:"
msgid "Write User"
-msgstr ""
+msgstr "Изменено пользователем"
msgctxt "help:product.uom,factor:"
msgid ""
@@ -278,22 +288,25 @@ msgstr ""
"КоÑффициент по формуле:\n"
"1 (Ð±Ð°Ð·Ð¾Ð²Ð°Ñ ÐµÐ´Ð¸Ð½Ð¸Ñ†Ð°) = коÑффициенту (Ñтой ед.измерениÑ)"
-#, fuzzy
msgctxt "model:ir.action,name:act_category_list"
msgid "Categories"
-msgstr "КатегориÑ"
+msgstr "Категории"
msgctxt "model:ir.action,name:act_category_tree"
msgid "Categories"
-msgstr "КатегориÑ"
+msgstr "Категории"
+
+msgctxt "model:ir.action,name:act_product_form"
+msgid "Variants"
+msgstr "РазновидноÑти"
-msgctxt "model:ir.action,name:act_product_by_category"
+msgctxt "model:ir.action,name:act_template_by_category"
msgid "Product by Category"
-msgstr "ТМЦ по категориÑм"
+msgstr "Товары по категориÑм"
-msgctxt "model:ir.action,name:act_product_form"
+msgctxt "model:ir.action,name:act_template_form"
msgid "Products"
-msgstr "ТМЦ"
+msgstr "ПродукциÑ"
msgctxt "model:ir.action,name:act_uom_category_form"
msgid "Categories of Unit of Measure"
@@ -303,26 +316,29 @@ msgctxt "model:ir.action,name:act_uom_form"
msgid "Units of Measure"
msgstr "Единицы измерениÑ"
-#, fuzzy
msgctxt "model:ir.ui.menu,name:menu_category_list"
msgid "Categories"
-msgstr "КатегориÑ"
+msgstr "Категории"
msgctxt "model:ir.ui.menu,name:menu_category_tree"
msgid "Categories"
-msgstr "КатегориÑ"
+msgstr "Категории в виде дерева"
msgctxt "model:ir.ui.menu,name:menu_main_product"
msgid "Product"
-msgstr "Товарно материальные ценноÑти (ТМЦ)"
+msgstr "ПродукциÑ"
-msgctxt "model:ir.ui.menu,name:menu_product_product"
+msgctxt "model:ir.ui.menu,name:menu_product"
+msgid "Variants"
+msgstr "РазновидноÑти"
+
+msgctxt "model:ir.ui.menu,name:menu_template"
msgid "Products"
-msgstr "ТМЦ"
+msgstr "ПродукциÑ"
msgctxt "model:ir.ui.menu,name:menu_uom_category_form"
msgid "Categories"
-msgstr "КатегориÑ"
+msgstr "Категории"
msgctxt "model:ir.ui.menu,name:menu_uom_form"
msgid "Units of Measure"
@@ -330,15 +346,15 @@ msgstr "Единицы измерениÑ"
msgctxt "model:product.category,name:"
msgid "Product Category"
-msgstr "ÐšÐ°Ñ‚ÐµÐ³Ð¾Ñ€Ð¸Ñ Ð¢ÐœÐ¦"
+msgstr "ÐšÐ°Ñ‚ÐµÐ³Ð¾Ñ€Ð¸Ñ Ð¿Ñ€Ð¾Ð´ÑƒÐºÑ†Ð¸Ð¸"
msgctxt "model:product.product,name:"
-msgid "Product"
-msgstr "ТМЦ"
+msgid "Product Variant"
+msgstr "Вид продукта"
msgctxt "model:product.template,name:"
msgid "Product Template"
-msgstr "Шаблон ТМЦ"
+msgstr "Шаблон продукта"
msgctxt "model:product.uom,name:"
msgid "Unit of measure"
@@ -346,7 +362,7 @@ msgstr "Единица измерениÑ"
msgctxt "model:product.uom,name:uom_are"
msgid "Are"
-msgstr ""
+msgstr "ÐÑ€"
msgctxt "model:product.uom,name:uom_carat"
msgid "Carat"
@@ -474,135 +490,135 @@ msgstr "Ярд"
msgctxt "model:product.uom,symbol:uom_are"
msgid "a"
-msgstr ""
+msgstr "а"
msgctxt "model:product.uom,symbol:uom_carat"
msgid "c"
-msgstr ""
+msgstr "карат"
msgctxt "model:product.uom,symbol:uom_centimeter"
msgid "cm"
-msgstr ""
+msgstr "Ñм"
msgctxt "model:product.uom,symbol:uom_cubic_centimeter"
msgid "cm³"
-msgstr ""
+msgstr "Ñм³"
msgctxt "model:product.uom,symbol:uom_cubic_foot"
msgid "ft³"
-msgstr ""
+msgstr "фут³"
msgctxt "model:product.uom,symbol:uom_cubic_inch"
msgid "in³"
-msgstr ""
+msgstr "дюйм³"
msgctxt "model:product.uom,symbol:uom_cubic_meter"
msgid "m³"
-msgstr ""
+msgstr "м³"
msgctxt "model:product.uom,symbol:uom_day"
msgid "d"
-msgstr ""
+msgstr "д"
msgctxt "model:product.uom,symbol:uom_foot"
msgid "ft"
-msgstr ""
+msgstr "фут"
msgctxt "model:product.uom,symbol:uom_gallon"
msgid "gal"
-msgstr ""
+msgstr "галлон"
msgctxt "model:product.uom,symbol:uom_gram"
msgid "g"
-msgstr ""
+msgstr "г"
msgctxt "model:product.uom,symbol:uom_hectare"
msgid "ha"
-msgstr ""
+msgstr "га"
msgctxt "model:product.uom,symbol:uom_hour"
msgid "h"
-msgstr ""
+msgstr "ч"
msgctxt "model:product.uom,symbol:uom_inch"
msgid "in"
-msgstr ""
+msgstr "дюйм"
msgctxt "model:product.uom,symbol:uom_kilogram"
msgid "kg"
-msgstr ""
+msgstr "кг"
msgctxt "model:product.uom,symbol:uom_kilometer"
msgid "km"
-msgstr ""
+msgstr "км"
msgctxt "model:product.uom,symbol:uom_liter"
msgid "l"
-msgstr ""
+msgstr "л"
msgctxt "model:product.uom,symbol:uom_meter"
msgid "m"
-msgstr ""
+msgstr "м"
msgctxt "model:product.uom,symbol:uom_mile"
msgid "mi"
-msgstr ""
+msgstr "милÑ"
msgctxt "model:product.uom,symbol:uom_millimeter"
msgid "mm"
-msgstr ""
+msgstr "мм"
msgctxt "model:product.uom,symbol:uom_minute"
msgid "min"
-msgstr ""
+msgstr "мин"
msgctxt "model:product.uom,symbol:uom_ounce"
msgid "oz"
-msgstr ""
+msgstr "унциÑ"
msgctxt "model:product.uom,symbol:uom_pound"
msgid "lbs"
-msgstr ""
+msgstr "фунт"
msgctxt "model:product.uom,symbol:uom_second"
msgid "s"
-msgstr ""
+msgstr "Ñ"
msgctxt "model:product.uom,symbol:uom_square_centimeter"
msgid "cm²"
-msgstr ""
+msgstr "Ñм²"
msgctxt "model:product.uom,symbol:uom_square_foot"
msgid "ft²"
-msgstr ""
+msgstr "фут²"
msgctxt "model:product.uom,symbol:uom_square_inch"
msgid "in²"
-msgstr ""
+msgstr "дюйм²"
msgctxt "model:product.uom,symbol:uom_square_meter"
msgid "m²"
-msgstr ""
+msgstr "м²"
msgctxt "model:product.uom,symbol:uom_square_yard"
msgid "yd²"
-msgstr ""
+msgstr "Ñрд²"
msgctxt "model:product.uom,symbol:uom_unit"
msgid "u"
-msgstr ""
+msgstr "шт."
msgctxt "model:product.uom,symbol:uom_work_day"
msgid "wd"
-msgstr ""
+msgstr "р.д."
msgctxt "model:product.uom,symbol:uom_yard"
msgid "yd"
-msgstr ""
+msgstr "Ñрд"
msgctxt "model:product.uom.category,name:"
msgid "Product uom category"
-msgstr "ÐšÐ°Ñ‚ÐµÐ³Ð¾Ñ€Ð¸Ñ ÐµÐ´. Ð¸Ð·Ð¼ÐµÑ€ÐµÐ½Ð¸Ñ Ð¢ÐœÐ¦"
+msgstr "ÐšÐ°Ñ‚ÐµÐ³Ð¾Ñ€Ð¸Ñ ÐµÐ´. Ð¸Ð·Ð¼ÐµÑ€ÐµÐ½Ð¸Ñ Ð¿Ñ€Ð¾Ð´ÑƒÐºÑ†Ð¸Ð¸"
msgctxt "model:product.uom.category,name:uom_cat_length"
msgid "Length"
@@ -626,11 +642,23 @@ msgstr "Объем"
msgctxt "model:product.uom.category,name:uom_cat_weight"
msgid "Weight"
-msgstr "Ширина"
+msgstr "ВеÑ"
msgctxt "model:res.group,name:group_product_admin"
msgid "Product Administration"
-msgstr "Управление ТМЦ"
+msgstr "ÐдминиÑтрирование продукции"
+
+msgctxt "selection:product.product,type:"
+msgid "Assets"
+msgstr "Ðктивы"
+
+msgctxt "selection:product.product,type:"
+msgid "Goods"
+msgstr "Товары"
+
+msgctxt "selection:product.product,type:"
+msgid "Service"
+msgstr "УÑлуги"
msgctxt "selection:product.template,cost_price_method:"
msgid "Average"
@@ -638,15 +666,15 @@ msgstr "СреднÑÑ Ñ†ÐµÐ½Ð°"
msgctxt "selection:product.template,cost_price_method:"
msgid "Fixed"
-msgstr "ФикÑированнаÑ"
+msgstr "ФикÑÐ¸Ñ€Ð¾Ð²Ð°Ð½Ð½Ð°Ñ Ñ†ÐµÐ½Ð°"
msgctxt "selection:product.template,type:"
msgid "Assets"
-msgstr ""
+msgstr "Ðктивы"
msgctxt "selection:product.template,type:"
msgid "Goods"
-msgstr ""
+msgstr "Товары"
msgctxt "selection:product.template,type:"
msgid "Service"
@@ -654,39 +682,43 @@ msgstr "УÑлуги"
msgctxt "view:product.category:"
msgid "Children"
-msgstr "Подчиненый"
+msgstr "Подчиненные"
msgctxt "view:product.category:"
msgid "Product Categories"
-msgstr "ÐšÐ°Ñ‚ÐµÐ³Ð¾Ñ€Ð¸Ñ Ð¢ÐœÐ¦"
+msgstr "Категории продукции"
msgctxt "view:product.category:"
msgid "Product Category"
-msgstr "Категории ТМЦ"
+msgstr "ÐšÐ°Ñ‚ÐµÐ³Ð¾Ñ€Ð¸Ñ Ð¿Ñ€Ð¾Ð´ÑƒÐºÑ†Ð¸Ð¸"
+
+msgctxt "view:product.product:"
+msgid "Product"
+msgstr "Продукт"
msgctxt "view:product.product:"
msgid "Products"
-msgstr "ТМЦ"
+msgstr "ПродукциÑ"
msgctxt "view:product.template:"
msgid "General"
-msgstr "ОÑновной"
+msgstr "ОÑновные"
msgctxt "view:product.template:"
-msgid "Product Template"
-msgstr "Шаблон Товара"
+msgid "Product"
+msgstr "Продукт"
msgctxt "view:product.template:"
-msgid "Product Templates"
-msgstr "Шаблоны Товара"
+msgid "Products"
+msgstr "ПродукциÑ"
msgctxt "view:product.uom.category:"
msgid "Categories of Unit of Measure"
-msgstr "ÐšÐ°Ñ‚ÐµÐ³Ð¾Ñ€Ð¸Ñ ÐµÐ´.измерениÑ"
+msgstr "Категории ед.измерениÑ"
msgctxt "view:product.uom.category:"
msgid "Category of Unit of Measure"
-msgstr "Категории ед.измерениÑ"
+msgstr "ÐšÐ°Ñ‚ÐµÐ³Ð¾Ñ€Ð¸Ñ ÐµÐ´.измерениÑ"
msgctxt "view:product.uom:"
msgid "Unit of Measure"
diff --git a/product.py b/product.py
index 80acdb6..b99a117 100644
--- a/product.py
+++ b/product.py
@@ -5,6 +5,7 @@ from trytond.pyson import Eval
from trytond.transaction import Transaction
from trytond.pool import Pool
from trytond.backend import TableHandler
+from trytond.const import OPERATORS
__all__ = ['Template', 'Product']
@@ -12,6 +13,11 @@ STATES = {
'readonly': ~Eval('active', True),
}
DEPENDS = ['active']
+TYPES = [
+ ('goods', 'Goods'),
+ ('assets', 'Assets'),
+ ('service', 'Service'),
+ ]
class Template(ModelSQL, ModelView):
@@ -19,11 +25,8 @@ class Template(ModelSQL, ModelView):
__name__ = "product.template"
name = fields.Char('Name', size=None, required=True, translate=True,
select=True, states=STATES, depends=DEPENDS)
- type = fields.Selection([
- ('goods', 'Goods'),
- ('assets', 'Assets'),
- ('service', 'Service')
- ], 'Type', required=True, states=STATES, depends=DEPENDS)
+ type = fields.Selection(TYPES, 'Type', required=True, states=STATES,
+ depends=DEPENDS)
consumable = fields.Boolean('Consumable',
states={
'readonly': ~Eval('active', True),
@@ -34,12 +37,8 @@ class Template(ModelSQL, ModelView):
states=STATES, depends=DEPENDS)
list_price = fields.Property(fields.Numeric('List Price', states=STATES,
digits=(16, 4), depends=DEPENDS, required=True))
- list_price_uom = fields.Function(fields.Numeric('List Price',
- digits=(16, 4)), 'get_price_uom')
cost_price = fields.Property(fields.Numeric('Cost Price',
states=STATES, digits=(16, 4), depends=DEPENDS, required=True))
- cost_price_uom = fields.Function(fields.Numeric('Cost Price',
- digits=(16, 4)), 'get_price_uom')
cost_price_method = fields.Property(fields.Selection([
("fixed", "Fixed"),
("average", "Average")
@@ -52,7 +51,7 @@ class Template(ModelSQL, ModelView):
on_change_with=['default_uom']),
'on_change_with_default_uom_category')
active = fields.Boolean('Active', select=True)
- products = fields.One2Many('product.product', 'template', 'Products',
+ products = fields.One2Many('product.product', 'template', 'Variants',
states=STATES, depends=DEPENDS)
@classmethod
@@ -88,42 +87,62 @@ class Template(ModelSQL, ModelView):
def default_cost_price_method():
return 'fixed'
+ @staticmethod
+ def default_products():
+ pool = Pool()
+ Product = pool.get('product.product')
+ if Transaction().user == 0:
+ return []
+ fields_names = list(f for f in Product._fields.keys()
+ if f not in ('id', 'create_uid', 'create_date',
+ 'write_uid', 'write_date'))
+ return [Product.default_get(fields_names)]
+
def on_change_with_default_uom_category(self, name=None):
if self.default_uom:
return self.default_uom.category.id
- @staticmethod
- def get_price_uom(products, name):
- Uom = Pool().get('product.uom')
- res = {}
- field = name[:-4]
- if Transaction().context.get('uom'):
- to_uom = Uom(Transaction().context['uom'])
- for product in products:
- res[product.id] = Uom.compute_price(
- product.default_uom, getattr(product, field), to_uom)
- else:
- for product in products:
- res[product.id] = getattr(product, field)
- return res
-
- @classmethod
- def copy(cls, templates, default=None):
- if default is None:
- default = {}
- default = default.copy()
- default['products'] = None
- return super(Template, cls).copy(templates, default=default)
-
class Product(ModelSQL, ModelView):
- "Product"
+ "Product Variant"
__name__ = "product.product"
- _inherits = {'product.template': 'template'}
+ _order_name = 'rec_name'
template = fields.Many2One('product.template', 'Product Template',
- required=True, ondelete='CASCADE', select=True)
- code = fields.Char("Code", size=None, select=True)
- description = fields.Text("Description", translate=True)
+ required=True, ondelete='CASCADE', select=True, states=STATES,
+ depends=DEPENDS)
+ code = fields.Char("Code", size=None, select=True, states=STATES,
+ depends=DEPENDS)
+ description = fields.Text("Description", translate=True, states=STATES,
+ depends=DEPENDS)
+ active = fields.Boolean('Active', select=True)
+ default_uom = fields.Function(fields.Many2One('product.uom',
+ 'Default UOM'), 'get_default_uom', searcher='search_default_uom')
+ type = fields.Function(fields.Selection(TYPES, 'Type',
+ on_change_with=['template']),
+ 'on_change_with_type', searcher='search_type')
+ list_price_uom = fields.Function(fields.Numeric('List Price',
+ digits=(16, 4)), 'get_price_uom')
+ cost_price_uom = fields.Function(fields.Numeric('Cost Price',
+ digits=(16, 4)), 'get_price_uom')
+
+ @classmethod
+ def __setup__(cls):
+ super(Product, cls).__setup__()
+ # XXX order by id until order by joined name is possible
+ # but at least products are grouped
+ cls.rec_name.order_field = ("%(table)s.code %(order)s, "
+ "%(table)s.id %(order)s")
+
+ @staticmethod
+ def default_active():
+ return True
+
+ def __getattr__(self, name):
+ try:
+ return super(Product, self).__getattr__(name)
+ except AttributeError:
+ pass
+ return getattr(self.template, name)
def get_rec_name(self, name):
if self.code:
@@ -135,37 +154,67 @@ class Product(ModelSQL, ModelView):
def search_rec_name(cls, name, clause):
ids = map(int, cls.search([('code',) + clause[1:]], order=[]))
if ids:
- ids += map(int, cls.search([('name',) + clause[1:]], order=[]))
+ ids += map(int, cls.search([('template.name',) + clause[1:]],
+ order=[]))
return [('id', 'in', ids)]
- return [('name',) + clause[1:]]
+ return [('template.name',) + clause[1:]]
+
+ def get_default_uom(self, name):
+ return self.template.default_uom.id
@classmethod
- def delete(cls, products):
- Template = Pool().get('product.template')
+ def search_default_uom(cls, name, clause):
+ return [('template.default_uom',) + tuple(clause[1:])]
- # Get the templates before we delete the products.
- templates = [product.template for product in products]
+ def on_change_with_type(self, name=None):
+ if self.template:
+ return self.template.type
- super(Product, cls).delete(products)
+ @classmethod
+ def search_type(cls, name, clause):
+ return [('template.type',) + tuple(clause[1:])]
- # Get templates that are still linked after delete.
- unlinked_templates = [template for template in templates
- if not template.products]
- if unlinked_templates:
- Template.delete(unlinked_templates)
+ @staticmethod
+ def get_price_uom(products, name):
+ Uom = Pool().get('product.uom')
+ res = {}
+ field = name[:-4]
+ if Transaction().context.get('uom'):
+ to_uom = Uom(Transaction().context['uom'])
+ for product in products:
+ res[product.id] = Uom.compute_price(
+ product.default_uom, getattr(product, field), to_uom)
+ else:
+ for product in products:
+ res[product.id] = getattr(product, field)
+ return res
@classmethod
- def copy(cls, products, default=None):
- Template = Pool().get('product.template')
-
- if default is None:
- default = {}
- default = default.copy()
- default['products'] = None
- new_products = []
- for product in products:
- template, = Template.copy([product.template])
- default['template'] = template.id
- new_products.extend(super(Product, cls).copy([product],
- default=default))
- return new_products
+ def search_domain(cls, domain, active_test=True):
+ 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:]))
+ elif isinstance(arg, list):
+ # sub-domain
+ result.append(convert_domain(arg))
+ else:
+ result.append(arg)
+ return result
+ return super(Product, cls).search_domain(convert_domain(domain),
+ active_test=active_test)
diff --git a/product.xml b/product.xml
index f726a0a..d2d4990 100644
--- a/product.xml
+++ b/product.xml
@@ -26,149 +26,86 @@ this repository contains the full copyright notices and license terms. -->
<record model="ir.ui.view" id="template_view_tree">
<field name="model">product.template</field>
<field name="type">tree</field>
- <field name="arch" type="xml">
- <![CDATA[
- <tree string="Product Templates">
- <field name="name"/>
- <field name="list_price_uom"/>
- <field name="cost_price_uom"/>
- <field name="type"/>
- <field name="category"/>
- <field name="default_uom"/>
- <field name="active" tree_invisible="1"/>
- </tree>
- ]]>
- </field>
+ <field name="name">template_tree</field>
</record>
<record model="ir.ui.view" id="template_view_form">
<field name="model">product.template</field>
<field name="type">form</field>
- <field name="arch" type="xml">
- <![CDATA[
- <form string="Product Template" col="6">
- <label name="name"/>
- <field name="name" xexpand="1"/>
- <label name="active"/>
- <field name="active" xexpand="0" width="100"/>
- <notebook colspan="6">
- <page string="General" id="general">
- <label name="type"/>
- <field name="type"/>
- <label name="consumable"/>
- <field name="consumable"/>
- <label name="category"/>
- <field name="category" />
- <label name="default_uom"/>
- <field name="default_uom" />
- <label name="list_price"/>
- <field name="list_price"/>
- <newline/>
- <label name="cost_price"/>
- <field name="cost_price"/>
- <label name="cost_price_method"/>
- <field name="cost_price_method"/>
- </page>
- </notebook>
- </form>
- ]]>
- </field>
+ <field name="name">template_form</field>
+ </record>
+
+ <record model="ir.action.act_window" id="act_template_form">
+ <field name="name">Products</field>
+ <field name="res_model">product.template</field>
+ </record>
+ <record model="ir.action.act_window.view" id="act_template_list_view">
+ <field name="sequence" eval="10"/>
+ <field name="view" ref="template_view_tree"/>
+ <field name="act_window" ref="act_template_form"/>
+ </record>
+ <record model="ir.action.act_window.view" id="act_template_form_view">
+ <field name="sequence" eval="20"/>
+ <field name="view" ref="template_view_form"/>
+ <field name="act_window" ref="act_template_form"/>
+ </record>
+
+ <menuitem parent="menu_main_product" sequence="1" id="menu_template"
+ action="act_template_form"/>
+
+ <record model="ir.action.act_window" id="act_template_by_category">
+ <field name="name">Product by Category</field>
+ <field name="res_model">product.template</field>
+ <field name="context">{'categories': [Eval('active_id')]}</field>
+ <field name="domain">[('category','child_of', [Eval('active_id')], 'parent')]</field>
+ </record>
+ <record model="ir.action.act_window.view" id="act_template_by_category_view1">
+ <field name="sequence" eval="10"/>
+ <field name="view" ref="template_view_tree"/>
+ <field name="act_window" ref="act_template_by_category"/>
+ </record>
+ <record model="ir.action.act_window.view" id="act_template_by_category_view2">
+ <field name="sequence" eval="20"/>
+ <field name="view" ref="template_view_form"/>
+ <field name="act_window" ref="act_template_by_category"/>
+ </record>
+ <record model="ir.action.keyword" id="act_template_by_category_keyword1">
+ <field name="keyword">tree_open</field>
+ <field name="model">product.category,-1</field>
+ <field name="action" ref="act_template_by_category"/>
</record>
<record model="ir.ui.view" id="product_view_tree">
<field name="model">product.product</field>
<field name="type">tree</field>
- <field name="inherit" ref="template_view_tree"/>
- <field name="arch" type="xml">
- <![CDATA[
- <data>
- <xpath
- expr="/tree"
- position="replace_attributes">
- <tree string="Products"/>
- </xpath>
- <xpath
- expr="/tree/field[@name="name"]"
- position="after">
- <field name="code"/>
- </xpath>
- </data>
- ]]>
- </field>
+ <field name="inherit" eval="None"/>
+ <field name="name">product_tree</field>
</record>
<record model="ir.ui.view" id="product_view_form">
<field name="model">product.product</field>
<field name="type">form</field>
- <field name="inherit" ref="template_view_form"/>
- <field name="arch" type="xml">
- <![CDATA[
- <data>
- <xpath
- expr="/form"
- position="replace_attributes">
- <form string="Products"/>
- </xpath>
- <xpath
- expr="/form/field[@name='name']"
- position="after">
- <label name="code"/>
- <field name="code"/>
- </xpath>
- <xpath
- expr="/form/notebook/page[@id="general"]"
- position="inside">
- <separator name="description" colspan="4"/>
- <field name="description" colspan="4"/>
- </xpath>
- </data>
- ]]>
- </field>
+ <field name="inherit" eval="None"/>
+ <field name="name">product_form</field>
</record>
<record model="ir.action.act_window" id="act_product_form">
- <field name="name">Products</field>
+ <field name="name">Variants</field>
<field name="res_model">product.product</field>
</record>
-
-
<record model="ir.action.act_window.view" id="act_product_list_view">
<field name="sequence" eval="10"/>
<field name="view" ref="product_view_tree"/>
<field name="act_window" ref="act_product_form"/>
</record>
-
<record model="ir.action.act_window.view" id="act_product_form_view">
<field name="sequence" eval="20"/>
<field name="view" ref="product_view_form"/>
<field name="act_window" ref="act_product_form"/>
</record>
- <menuitem name="Products" parent="menu_main_product"
- sequence="1" id="menu_product_product"
- action="act_product_form"/>
-
- <record model="ir.action.act_window" id="act_product_by_category">
- <field name="name">Product by Category</field>
- <field name="res_model">product.product</field>
- <field name="context">{'categories': [Eval('active_id')]}</field>
- <field name="domain">[('category','child_of', [Eval('active_id')], 'parent')]</field>
- </record>
- <record model="ir.action.act_window.view" id="act_product_by_category_view1">
- <field name="sequence" eval="10"/>
- <field name="view" ref="product_view_tree"/>
- <field name="act_window" ref="act_product_by_category"/>
- </record>
- <record model="ir.action.act_window.view" id="act_product_by_category_view2">
- <field name="sequence" eval="20"/>
- <field name="view" ref="product_view_form"/>
- <field name="act_window" ref="act_product_by_category"/>
- </record>
- <record model="ir.action.keyword" id="act_product_by_category_keyword1">
- <field name="keyword">tree_open</field>
- <field name="model">product.category,-1</field>
- <field name="action" ref="act_product_by_category"/>
- </record>
+ <menuitem parent="menu_template" sequence="1" id="menu_product"
+ action="act_product_form"/>
<record model="ir.model.access" id="access_product">
<field name="model" search="[('model', '=', 'product.product')]"/>
diff --git a/setup.py b/setup.py
index 425c1cc..d4f82ad 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',
version=info.get('version', '0.0.1'),
@@ -36,16 +36,16 @@ setup(name='trytond_product',
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': '.'},
packages=[
'trytond.modules.product',
'trytond.modules.product.tests',
],
package_data={
- 'trytond.modules.product': info.get('xml', []) \
- + ['tryton.cfg', 'locale/*.po', 'icons/*.svg'],
+ 'trytond.modules.product': (info.get('xml', [])
+ + ['tryton.cfg', 'view/*.xml', 'locale/*.po', 'icons/*.svg']),
},
classifiers=[
'Development Status :: 5 - Production/Stable',
@@ -57,6 +57,7 @@ setup(name='trytond_product',
'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/tests/test_product.py b/tests/test_product.py
index 5fa6998..666a1af 100644
--- a/tests/test_product.py
+++ b/tests/test_product.py
@@ -45,25 +45,25 @@ class ProductTestCase(unittest.TestCase):
'''
with Transaction().start(DB_NAME, USER,
context=CONTEXT) as transaction:
- category = self.uom_category.create({'name': 'Test'})
+ category, = self.uom_category.create([{'name': 'Test'}])
transaction.cursor.commit()
- self.assertRaises(Exception, self.uom.create, {
+ self.assertRaises(Exception, self.uom.create, [{
'name': 'Test',
'symbol': 'T',
'category': category.id,
'rate': 0,
'factor': 0,
- })
+ }])
transaction.cursor.rollback()
- uom = self.uom.create({
- 'name': 'Test',
- 'symbol': 'T',
- 'category': category.id,
- 'rate': 1.0,
- 'factor': 1.0,
- })
+ uom, = self.uom.create([{
+ 'name': 'Test',
+ 'symbol': 'T',
+ 'category': category.id,
+ 'rate': 1.0,
+ 'factor': 1.0,
+ }])
transaction.cursor.commit()
self.assertRaises(Exception, self.uom.write, [uom], {
@@ -92,13 +92,13 @@ class ProductTestCase(unittest.TestCase):
('name', '=', 'Test'),
], limit=1)
- self.assertRaises(Exception, self.uom.create, {
+ self.assertRaises(Exception, self.uom.create, [{
'name': 'Test',
'symbol': 'T',
'category': category.id,
'rate': 2,
'factor': 2,
- })
+ }])
transaction.cursor.rollback()
uom, = self.uom.search([
diff --git a/tryton.cfg b/tryton.cfg
index 9e6da25..ed63229 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
[tryton]
-version=2.6.0
+version=2.8.0
depends:
ir
res
diff --git a/trytond_product.egg-info/PKG-INFO b/trytond_product.egg-info/PKG-INFO
index 2500961..558446f 100644
--- a/trytond_product.egg-info/PKG-INFO
+++ b/trytond_product.egg-info/PKG-INFO
@@ -1,12 +1,12 @@
-Metadata-Version: 1.0
+Metadata-Version: 1.1
Name: trytond-product
-Version: 2.6.0
+Version: 2.8.0
Summary: Tryton module with products
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
===============
@@ -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.egg-info/SOURCES.txt b/trytond_product.egg-info/SOURCES.txt
index 6ba1b94..56faa6d 100644
--- a/trytond_product.egg-info/SOURCES.txt
+++ b/trytond_product.egg-info/SOURCES.txt
@@ -33,4 +33,15 @@ trytond_product.egg-info/dependency_links.txt
trytond_product.egg-info/entry_points.txt
trytond_product.egg-info/not-zip-safe
trytond_product.egg-info/requires.txt
-trytond_product.egg-info/top_level.txt
\ No newline at end of file
+trytond_product.egg-info/top_level.txt
+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
\ No newline at end of file
diff --git a/trytond_product.egg-info/requires.txt b/trytond_product.egg-info/requires.txt
index af826e8..c0b1648 100644
--- a/trytond_product.egg-info/requires.txt
+++ b/trytond_product.egg-info/requires.txt
@@ -1 +1 @@
-trytond >= 2.6, < 2.7
\ No newline at end of file
+trytond >= 2.8, < 2.9
\ No newline at end of file
diff --git a/uom.py b/uom.py
index e9dfbd3..3685ed6 100644
--- a/uom.py
+++ b/uom.py
@@ -36,12 +36,12 @@ class Uom(ModelSQL, ModelView):
required=True, ondelete='RESTRICT', states=STATES, depends=DEPENDS)
rate = fields.Float('Rate', digits=(12, 12), required=True,
on_change=['rate'], states=STATES, depends=DEPENDS,
- help='The coefficient for the formula:\n' \
- '1 (base unit) = coef (this unit)')
+ help=('The coefficient for the formula:\n'
+ '1 (base unit) = coef (this unit)'))
factor = fields.Float('Factor', digits=(12, 12), states=STATES,
on_change=['factor'], required=True, depends=DEPENDS,
- help='The coefficient for the formula:\n' \
- 'coef (base unit) = 1 (this unit)')
+ help=('The coefficient for the formula:\n'
+ 'coef (base unit) = 1 (this unit)'))
rounding = fields.Float('Rounding Precision', digits=(12, 12),
required=True, states=STATES, depends=DEPENDS)
digits = fields.Integer('Display Digits', required=True)
@@ -51,9 +51,9 @@ class Uom(ModelSQL, ModelView):
def __register__(cls, module_name):
cursor = Transaction().cursor
# Migration from 1.6: corrected misspelling of ounce (was once)
- cursor.execute("UPDATE ir_model_data "\
- "SET fs_id = REPLACE(fs_id, 'uom_once', 'uom_ounce') "\
- "WHERE fs_id = 'uom_once' AND module = 'product'")
+ cursor.execute("UPDATE ir_model_data "
+ "SET fs_id = REPLACE(fs_id, 'uom_once', 'uom_ounce') "
+ "WHERE fs_id = 'uom_once' AND module = 'product'")
super(Uom, cls).__register__(module_name)
@classmethod
@@ -63,17 +63,15 @@ class Uom(ModelSQL, ModelView):
('non_zero_rate_factor', 'CHECK((rate != 0.0) or (factor != 0.0))',
'Rate and factor can not be both equal to zero.')
]
- cls._constraints += [
- ('check_factor_and_rate', 'invalid_factor_and_rate'),
- ]
cls._order.insert(0, ('name', 'ASC'))
cls._error_messages.update({
- 'change_uom_rate_title': 'You cannot change Rate, Factor or ' \
- 'Category on a Unit of Measure. ',
- 'change_uom_rate': 'If the UOM is still not used, you can ' \
- 'delete it otherwise you can deactivate it ' \
- 'and create a new one.',
- 'invalid_factor_and_rate': 'Invalid Factor and Rate values!',
+ 'change_uom_rate_title': ('You cannot change Rate, Factor or '
+ 'Category on a Unit of Measure. '),
+ 'change_uom_rate': ('If the UOM is still not used, you can '
+ 'delete it otherwise you can deactivate it '
+ 'and create a new one.'),
+ 'invalid_factor_and_rate': ('Invalid Factor and Rate values in '
+ 'UOM "%s".'),
})
@classmethod
@@ -132,6 +130,12 @@ class Uom(ModelSQL, ModelView):
def round(number, precision=1.0):
return round(number / precision) * precision
+ @classmethod
+ def validate(cls, uoms):
+ super(Uom, cls).validate(uoms)
+ for uom in uoms:
+ uom.check_factor_and_rate()
+
def check_factor_and_rate(self):
"Check coherence between factor and rate"
if self.rate == self.factor == 0.0:
@@ -140,8 +144,8 @@ class Uom(ModelSQL, ModelView):
1.0 / self.factor, self.__class__.rate.digits[1])
and self.factor != round(
1.0 / self.rate, self.__class__.factor.digits[1])):
- return False
- return True
+ self.raise_user_error('invalid_factor_and_rate', (
+ self.rec_name,))
@classmethod
def write(cls, uoms, values):
@@ -152,8 +156,8 @@ class Uom(ModelSQL, ModelView):
super(Uom, cls).write(uoms, values)
return
- old_uom = dict((uom.id, (uom.factor, uom.rate, uom.category.id)) \
- for uom in uoms)
+ old_uom = dict((uom.id, (uom.factor, uom.rate, uom.category.id))
+ for uom in uoms)
super(Uom, cls).write(uoms, values)
diff --git a/uom.xml b/uom.xml
index 48ea756..540ba56 100644
--- a/uom.xml
+++ b/uom.xml
@@ -6,45 +6,12 @@ this repository contains the full copyright notices and license terms. -->
<record model="ir.ui.view" id="uom_view_tree">
<field name="model">product.uom</field>
<field name="type">tree</field>
- <field name="arch" type="xml">
- <![CDATA[
- <tree string="Units of Measure">
- <field name="name"/>
- <field name="symbol"/>
- <field name="category"/>
- <field name="factor"/>
- <field name="rate"/>
- <field name="rounding"/>
- <field name="active" tree_invisible="1"/>
- </tree>
- ]]>
- </field>
+ <field name="name">uom_tree</field>
</record>
<record model="ir.ui.view" id="uom_view_form">
<field name="model">product.uom</field>
<field name="type">form</field>
- <field name="arch" type="xml">
- <![CDATA[
- <form string="Unit of Measure" col="4">
- <label name="name"/>
- <field name="name"/>
- <label name="category"/>
- <field name="category"/>
- <label name="symbol"/>
- <field name="symbol"/>
- <label name="active"/>
- <field name="active"/>
- <label name="factor"/>
- <field name="factor"/>
- <label name="rate"/>
- <field name="rate"/>
- <label name="rounding"/>
- <field name="rounding"/>
- <label name="digits"/>
- <field name="digits"/>
- </form>
- ]]>
- </field>
+ <field name="name">uom_form</field>
</record>
<record model="ir.action.act_window" id="act_uom_form">
<field name="name">Units of Measure</field>
@@ -66,26 +33,13 @@ this repository contains the full copyright notices and license terms. -->
<record model="ir.ui.view" id="uom_category_view_tree">
<field name="model">product.uom.category</field>
<field name="type">tree</field>
- <field name="arch" type="xml">
- <![CDATA[
- <tree string="Categories of Unit of Measure">
- <field name="name"/>
- </tree>
- ]]>
- </field>
+ <field name="name">uom_category_tree</field>
</record>
<record model="ir.ui.view" id="uom_category_view_form">
<field name="model">product.uom.category</field>
<field name="type">form</field>
- <field name="arch" type="xml">
- <![CDATA[
- <form string="Category of Unit of Measure" col="6">
- <label name="name"/>
- <field name="name"/>
- </form>
- ]]>
- </field>
+ <field name="name">uom_category_form</field>
</record>
<record model="ir.action.act_window" id="act_uom_category_form">
diff --git a/view/category_form.xml b/view/category_form.xml
new file mode 100644
index 0000000..8b25285
--- /dev/null
+++ b/view/category_form.xml
@@ -0,0 +1,16 @@
+<?xml version="1.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. -->
+<form string="Product Category">
+ <label name="name"/>
+ <field name="name"/>
+ <label name="parent"/>
+ <field name="parent"/>
+ <label name="rec_name"/>
+ <field name="rec_name" colspan="3"/>
+ <notebook colspan="4">
+ <page string="Children" col="1" id="childs">
+ <field name="childs"/>
+ </page>
+ </notebook>
+</form>
diff --git a/view/category_list.xml b/view/category_list.xml
new file mode 100644
index 0000000..af5b4a6
--- /dev/null
+++ b/view/category_list.xml
@@ -0,0 +1,7 @@
+<?xml version="1.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. -->
+<tree string="Product Categories">
+ <field name="name"/>
+ <field name="rec_name"/>
+</tree>
diff --git a/view/category_tree.xml b/view/category_tree.xml
new file mode 100644
index 0000000..409e11d
--- /dev/null
+++ b/view/category_tree.xml
@@ -0,0 +1,8 @@
+<?xml version="1.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. -->
+<tree string="Product Categories" keyword_open="1">
+ <field name="name"/>
+ <field name="parent" tree_invisible="1"/>
+ <field name="childs" tree_invisible="1"/>
+</tree>
diff --git a/view/product_form.xml b/view/product_form.xml
new file mode 100644
index 0000000..caf9017
--- /dev/null
+++ b/view/product_form.xml
@@ -0,0 +1,13 @@
+<?xml version="1.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. -->
+<form string="Product" col="6">
+ <label name="template"/>
+ <field name="template"/>
+ <label name="code"/>
+ <field name="code"/>
+ <label name="active"/>
+ <field name="active" xexpand="0" width="100"/>
+ <separator name="description" colspan="6"/>
+ <field name="description" colspan="6"/>
+</form>
diff --git a/view/product_tree.xml b/view/product_tree.xml
new file mode 100644
index 0000000..ce420ee
--- /dev/null
+++ b/view/product_tree.xml
@@ -0,0 +1,6 @@
+<?xml version="1.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. -->
+<tree string="Products">
+ <field name="rec_name"/>
+</tree>
diff --git a/view/template_form.xml b/view/template_form.xml
new file mode 100644
index 0000000..ee61a24
--- /dev/null
+++ b/view/template_form.xml
@@ -0,0 +1,29 @@
+<?xml version="1.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. -->
+<form string="Product" col="6">
+ <label name="name"/>
+ <field name="name" xexpand="1"/>
+ <label name="active"/>
+ <field name="active" xexpand="0" width="100"/>
+ <notebook colspan="6">
+ <page string="General" id="general">
+ <label name="type"/>
+ <field name="type"/>
+ <label name="consumable"/>
+ <field name="consumable"/>
+ <label name="category"/>
+ <field name="category" />
+ <label name="default_uom"/>
+ <field name="default_uom" />
+ <label name="list_price"/>
+ <field name="list_price"/>
+ <newline/>
+ <label name="cost_price"/>
+ <field name="cost_price"/>
+ <label name="cost_price_method"/>
+ <field name="cost_price_method"/>
+ <field name="products" mode="form,tree" colspan="4"/>
+ </page>
+ </notebook>
+</form>
diff --git a/view/template_tree.xml b/view/template_tree.xml
new file mode 100644
index 0000000..ee33d79
--- /dev/null
+++ b/view/template_tree.xml
@@ -0,0 +1,12 @@
+<?xml version="1.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. -->
+<tree string="Products">
+ <field name="name"/>
+ <field name="list_price"/>
+ <field name="cost_price"/>
+ <field name="type"/>
+ <field name="category"/>
+ <field name="default_uom"/>
+ <field name="active" tree_invisible="1"/>
+</tree>
diff --git a/view/uom_category_form.xml b/view/uom_category_form.xml
new file mode 100644
index 0000000..e4e1848
--- /dev/null
+++ b/view/uom_category_form.xml
@@ -0,0 +1,7 @@
+<?xml version="1.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. -->
+<form string="Category of Unit of Measure" col="6">
+ <label name="name"/>
+ <field name="name"/>
+</form>
diff --git a/view/uom_category_tree.xml b/view/uom_category_tree.xml
new file mode 100644
index 0000000..c2f4ce4
--- /dev/null
+++ b/view/uom_category_tree.xml
@@ -0,0 +1,6 @@
+<?xml version="1.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. -->
+<tree string="Categories of Unit of Measure">
+ <field name="name"/>
+</tree>
diff --git a/view/uom_form.xml b/view/uom_form.xml
new file mode 100644
index 0000000..614bce1
--- /dev/null
+++ b/view/uom_form.xml
@@ -0,0 +1,21 @@
+<?xml version="1.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. -->
+<form string="Unit of Measure" col="4">
+ <label name="name"/>
+ <field name="name"/>
+ <label name="category"/>
+ <field name="category"/>
+ <label name="symbol"/>
+ <field name="symbol"/>
+ <label name="active"/>
+ <field name="active"/>
+ <label name="factor"/>
+ <field name="factor"/>
+ <label name="rate"/>
+ <field name="rate"/>
+ <label name="rounding"/>
+ <field name="rounding"/>
+ <label name="digits"/>
+ <field name="digits"/>
+</form>
diff --git a/view/uom_tree.xml b/view/uom_tree.xml
new file mode 100644
index 0000000..db0df8c
--- /dev/null
+++ b/view/uom_tree.xml
@@ -0,0 +1,12 @@
+<?xml version="1.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. -->
+<tree string="Units of Measure">
+ <field name="name"/>
+ <field name="symbol"/>
+ <field name="category"/>
+ <field name="factor"/>
+ <field name="rate"/>
+ <field name="rounding"/>
+ <field name="active" tree_invisible="1"/>
+</tree>
commit 1e4b60420cb1457252b158d959074cec591a7167
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Sat Apr 27 18:44:46 2013 +0200
Releasing debian version 2.6.0-4.
diff --git a/debian/changelog b/debian/changelog
index 5529577..579c183 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+tryton-modules-product (2.6.0-4) experimental; urgency=low
+
+ * Removing Daniel from Uploaders. Thanks for your work! (Closes: #704388).
+ * Improving update of major version in Depends.
+
+ -- Mathias Behrle <mathiasb at m9s.biz> Sat, 27 Apr 2013 15:07:40 +0200
+
tryton-modules-product (2.6.0-3) experimental; urgency=low
* Updating Vcs-Git to correct address.
commit 1475ff45ab7d484d9e5bac962118f4c8af37991a
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Sat Apr 27 14:54:48 2013 +0200
Improving update of major version in Depends.
Pulling the major version for Depends directly from the package version.
Thanks to Ilya Melnikov for pushing the idea.
diff --git a/debian/control b/debian/control
index aaded30..ce3f72f 100644
--- a/debian/control
+++ b/debian/control
@@ -13,7 +13,7 @@ X-Python-Version: >= 2.6
Package: tryton-modules-product
Architecture: all
Depends:
- ${misc:Depends}, ${python:Depends}, tryton-server (>= 2.6),
+ ${misc:Depends}, ${python:Depends}, tryton-server (>= ${version:major}),
python-pkg-resources
Description: Tryton Application Platform (Product Module)
Tryton is a high-level general purpose application platform written in Python
diff --git a/debian/rules b/debian/rules
index 1ae0776..0f63ab4 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,5 +1,7 @@
#!/usr/bin/make -f
+MAJOR := $(shell python setup.py --version | awk -F "." '{print $$1 "." $$2}')
+
%:
dh ${@} --with python2
@@ -8,5 +10,8 @@ override_dh_auto_clean:
rm -rf *.egg-info
+override_dh_gencontrol:
+ dh_gencontrol -- -Vversion:major="$(MAJOR)"
+
override_dh_builddeb:
dh_builddeb -- -Zxz -z9
commit aa20af8e5dfbb97955109cf73dc86af250bae7e5
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Sun Apr 21 23:33:36 2013 +0200
Removing Daniel from Uploaders. Thanks for your work! (Closes: #704388).
diff --git a/debian/control b/debian/control
index cecb732..aaded30 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: tryton-modules-product
Section: python
Priority: optional
Maintainer: Debian Tryton Maintainers <maintainers at debian.tryton.org>
-Uploaders: Daniel Baumann <daniel at debian.org>, Mathias Behrle <mathiasb at m9s.biz>
+Uploaders: Mathias Behrle <mathiasb at m9s.biz>
Build-Depends: debhelper (>= 9), python (>= 2.6.6-3~), python-setuptools
Standards-Version: 3.9.4
Homepage: http://www.tryton.org/
commit 10bb5331b9efe53da8f895db7f21e096ab2d7589
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Sat Mar 23 15:04:08 2013 +0100
Releasing debian version 2.6.0-3.
diff --git a/debian/changelog b/debian/changelog
index bcb051e..5529577 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+tryton-modules-product (2.6.0-3) experimental; urgency=low
+
+ * Updating Vcs-Git to correct address.
+ * Adding watch file. Thanks to Bart Martens <bartm at debian.org>.
+
+ -- Mathias Behrle <mathiasb at m9s.biz> Sat, 23 Mar 2013 14:00:53 +0100
+
tryton-modules-product (2.6.0-2) experimental; urgency=low
* Removing obsolete Dm-Upload-Allowed
commit 2c075eba10a8cc341ca199f8cb5711a87abc0583
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Sat Mar 23 13:52:33 2013 +0100
Adding watch file. Thanks to Bart Martens <bartm at debian.org>.
diff --git a/debian/watch b/debian/watch
new file mode 100644
index 0000000..cc472a8
--- /dev/null
+++ b/debian/watch
@@ -0,0 +1,2 @@
+version=3
+http://downloads.tryton.org/current/ .*trytond_product-(\d.*)\.(?:tgz|tbz2|txz|tar\.(?:gz|bz2|xz))
commit 849aa076e408e5342c4b9ce096528538e837a2dd
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Sat Feb 23 20:08:10 2013 +0100
Updating Vcs-Git to correct address.
diff --git a/debian/control b/debian/control
index a3b67ed..cecb732 100644
--- a/debian/control
+++ b/debian/control
@@ -7,7 +7,7 @@ Build-Depends: debhelper (>= 9), python (>= 2.6.6-3~), python-setuptools
Standards-Version: 3.9.4
Homepage: http://www.tryton.org/
Vcs-Browser: http://debian.tryton.org/gitweb/?p=packages/tryton-modules-product.git
-Vcs-Git: git://debian.tryton.org/git/packages/tryton-modules-product.git
+Vcs-Git: git://debian.tryton.org/packages/tryton-modules-product.git
X-Python-Version: >= 2.6
Package: tryton-modules-product
commit b1ae6a423e9a6d1eac7c1daed6687752c7321342
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Sun Feb 17 13:50:43 2013 +0100
Releasing debian version 2.6.0-2.
diff --git a/debian/changelog b/debian/changelog
index ae663a6..bcb051e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+tryton-modules-product (2.6.0-2) experimental; urgency=low
+
+ * Removing obsolete Dm-Upload-Allowed
+ * Updating to Standards-Version: 3.9.4, no changes needed.
+ * Updating copyright.
+
+ -- Mathias Behrle <mathiasb at m9s.biz> Sat, 16 Feb 2013 21:41:04 +0100
+
tryton-modules-product (2.6.0-1) experimental; urgency=low
* Merging upstream version 2.6.0.
commit 4da6963d13d0a8ef22de540e3075e8dd38bf5b22
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Sat Feb 16 21:29:20 2013 +0100
Updating copyright.
diff --git a/debian/copyright b/debian/copyright
index da88797..ca8ed21 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,11 +1,10 @@
Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Files: *
-Copyright:
- 2004-2008 Tiny SPRL
- 2008-2012 Cedric Krier
+Copyright: 2008-2012 Cédric Krier
2008-2012 Bertrand Chenal
2008-2012 B2CK SPRL
+ 2004-2008 Tiny SPRL
License: GPL-3+
Files: icons/*
@@ -15,7 +14,7 @@ License: public-domain
Files: debian/*
Copyright:
2009-2012 Daniel Baumann <daniel at debian.org>
- 2011-2012 Mathias Behrle <mathiasb at m9s.biz>
+ 2011-2013 Mathias Behrle <mathiasb at m9s.biz>
License: GPL-3+
License: GPL-3+
commit 50fd1779bcd517525e58e64690c1a750faabb2c0
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Fri Feb 15 19:28:33 2013 +0100
Updating to Standards-Version: 3.9.4, no changes needed.
diff --git a/debian/control b/debian/control
index cc2411d..a3b67ed 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: optional
Maintainer: Debian Tryton Maintainers <maintainers at debian.tryton.org>
Uploaders: Daniel Baumann <daniel at debian.org>, Mathias Behrle <mathiasb at m9s.biz>
Build-Depends: debhelper (>= 9), python (>= 2.6.6-3~), python-setuptools
-Standards-Version: 3.9.3
+Standards-Version: 3.9.4
Homepage: http://www.tryton.org/
Vcs-Browser: http://debian.tryton.org/gitweb/?p=packages/tryton-modules-product.git
Vcs-Git: git://debian.tryton.org/git/packages/tryton-modules-product.git
commit 61c93d0da1965085e1096579e64410fe59a8f06b
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Wed Feb 13 21:37:13 2013 +0100
Removing obsolete Dm-Upload-Allowed
diff --git a/debian/control b/debian/control
index 560b988..cc2411d 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,6 @@ Section: python
Priority: optional
Maintainer: Debian Tryton Maintainers <maintainers at debian.tryton.org>
Uploaders: Daniel Baumann <daniel at debian.org>, Mathias Behrle <mathiasb at m9s.biz>
-Dm-Upload-Allowed: yes
Build-Depends: debhelper (>= 9), python (>= 2.6.6-3~), python-setuptools
Standards-Version: 3.9.3
Homepage: http://www.tryton.org/
commit 64989afe8053dcc0cd5063d1cfe8b06c3c166fa0
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Wed Oct 24 22:02:05 2012 +0200
Releasing debian version 2.6.0-1.
diff --git a/debian/changelog b/debian/changelog
index 40f7930..ae663a6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+tryton-modules-product (2.6.0-1) experimental; urgency=low
+
+ * Merging upstream version 2.6.0.
+ * Bumping versioned tryton depends to 2.6.
+
+ -- Mathias Behrle <mathiasb at m9s.biz> Wed, 24 Oct 2012 14:24:44 +0200
+
tryton-modules-product (2.4.1-2) experimental; urgency=low
[ Daniel Baumann ]
commit f528944758e004155b87fb68fd92a70285963d40
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Tue Oct 23 19:59:46 2012 +0200
Bumping versioned tryton depends to 2.6.
diff --git a/debian/control b/debian/control
index 62c9b5e..560b988 100644
--- a/debian/control
+++ b/debian/control
@@ -14,7 +14,7 @@ X-Python-Version: >= 2.6
Package: tryton-modules-product
Architecture: all
Depends:
- ${misc:Depends}, ${python:Depends}, tryton-server (>= 2.4),
+ ${misc:Depends}, ${python:Depends}, tryton-server (>= 2.6),
python-pkg-resources
Description: Tryton Application Platform (Product Module)
Tryton is a high-level general purpose application platform written in Python
commit 08e736ddaa46ce0f2aabf8bb101415048c7503a9
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Tue Oct 23 19:53:38 2012 +0200
Merging upstream version 2.6.0.
diff --git a/CHANGELOG b/CHANGELOG
index 2d131e2..247d489 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,4 +1,4 @@
-Version 2.4.1 - 2012-09-02
+Version 2.6.0 - 2012-10-22
* Bug fixes (see mercurial logs for details)
Version 2.4.0 - 2012-04-24
diff --git a/MANIFEST.in b/MANIFEST.in
index 44a0685..e4632a1 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 e242e1e..7e195b3 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,13 +1,48 @@
Metadata-Version: 1.0
Name: trytond_product
-Version: 2.4.1
-Summary: Define products, categories of product, units of measure, categories of units of measure.
+Version: 2.6.0
+Summary: Tryton module with products
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
+ ===============
+
+ The product 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 02e7d8d..21f6dbb 100644
--- a/README
+++ b/README
@@ -2,7 +2,6 @@ trytond_product
===============
The product module of the Tryton application platform.
-See __tryton__.py
Installing
----------
diff --git a/__init__.py b/__init__.py
index 5e6b936..3e1cc1e 100644
--- a/__init__.py
+++ b/__init__.py
@@ -1,6 +1,17 @@
#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 .uom import *
from .category import *
from .product import *
+
+
+def register():
+ Pool.register(
+ UomCategory,
+ Uom,
+ Category,
+ Template,
+ Product,
+ module='product', type_='model')
diff --git a/__tryton__.py b/__tryton__.py
deleted file mode 100644
index 125c6d7..0000000
--- a/__tryton__.py
+++ /dev/null
@@ -1,62 +0,0 @@
-# -*- coding: utf-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.
-{
- 'name': 'Product',
- 'name_bg_BG': 'Продукт',
- 'name_ca_ES': 'Productes',
- 'name_de_DE': 'Artikel',
- 'name_es_AR': 'Productos',
- 'name_es_CO': 'Productos',
- 'name_es_ES': 'Productos',
- 'name_fr_FR': 'Produit',
- 'name_nl_NL': 'Producten',
- 'name_ru_RU': 'ТМЦ',
- 'version': '2.4.1',
- 'author': 'B2CK',
- 'email': 'info at b2ck.com',
- 'website': 'http://www.tryton.org/',
- 'description': 'Define products, categories of product, units ' \
- 'of measure, categories of units of measure.',
- 'description_bg_BG': 'Задаване на продукти, категории продукти, мерни единици, категории мерни единици.',
- 'description_ca_ES': '''Defineix productes, categories de producte, unitats
-de mesura, categories d'unitats de mesura.''',
- 'description_de_DE': 'Dient der Erstellung von Artikeln, Artikelkategorien, Maßeinheiten und Kategorien für Maßeinheiten.',
- 'description_es_AR': '''Define:
- - Productos
- - CategorÃas de producto
- - Unidades de medida
- - CategorÃas de unidades de medida
-''',
- 'description_es_CO': 'Definición de productos, categorÃas de producto unidades de medida y categorÃas de unidades de medida',
- 'description_es_ES': 'Define productos, categorÃas de producto, unidades de medida y categorÃas de unidades de medida.',
- 'description_fr_FR': '''Défini:
- - Produit
- - Catégorie de produit
- - Unité de mesure
- - Catégorie d'unité de mesure
-''',
- 'description_nl_NL': 'Definieert producten, productcategorieën, meeteenheden en categorieën van meeteenheden.',
- 'description_ru_RU': 'Определение ТМЦ, категорий ТМЦ, единиц измерениÑ, категорий единиц измерениÑ.',
- 'depends': [
- 'ir',
- 'res',
- ],
- 'xml': [
- 'product.xml',
- 'category.xml',
- 'uom.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/category.py b/category.py
index 40ebe0e..7c8e53c 100644
--- a/category.py
+++ b/category.py
@@ -2,42 +2,32 @@
#this repository contains the full copyright notices and license terms.
from trytond.model import ModelView, ModelSQL, fields
+__all__ = ['Category']
+
class Category(ModelSQL, ModelView):
"Product Category"
- _name = "product.category"
- _description = __doc__
-
+ __name__ = "product.category"
name = fields.Char('Name', required=True, translate=True)
parent = fields.Many2One('product.category', 'Parent', select=True)
childs = fields.One2Many('product.category', 'parent',
string='Children')
- def __init__(self):
- super(Category, self).__init__()
- self._order.insert(0, ('name', 'ASC'))
+ @classmethod
+ def __setup__(cls):
+ super(Category, cls).__setup__()
+ cls._order.insert(0, ('name', 'ASC'))
- self._constraints += [
+ cls._constraints += [
('check_recursion', 'recursive_categories'),
- ]
- self._error_messages.update({
- 'recursive_categories': 'You can not create recursive categories!',
- })
-
- def get_rec_name(self, ids, name):
- if not ids:
- return {}
- res = {}
-
- def _name(category):
- if category.id in res:
- return res[category.id]
- elif category.parent:
- return _name(category.parent) + ' / ' + category.name
- else:
- return category.name
- for category in self.browse(ids):
- res[category.id] = _name(category)
- return res
-
-Category()
+ ]
+ cls._error_messages.update({
+ 'recursive_categories': \
+ 'You can not create recursive categories!',
+ })
+
+ def get_rec_name(self, name):
+ if self.parent:
+ return self.parent.get_rec_name(name) + ' / ' + self.name
+ else:
+ return self.name
diff --git a/locale/bg_BG.po b/locale/bg_BG.po
index 9815c43..df2812b 100644
--- a/locale/bg_BG.po
+++ b/locale/bg_BG.po
@@ -29,7 +29,7 @@ msgstr ""
msgctxt "field:product.category,childs:"
msgid "Children"
-msgstr "Деца"
+msgstr "ÐаÑледници"
msgctxt "field:product.category,create_date:"
msgid "Create Date"
@@ -137,7 +137,7 @@ msgstr "Мер. ед. по подрабиране"
msgctxt "field:product.template,default_uom_category:"
msgid "Default UOM Category"
-msgstr ""
+msgstr "ÐšÐ°Ñ‚ÐµÐ³Ð¾Ñ€Ð¸Ñ Ð¼ÐµÑ€. ед. по подразбиране"
msgctxt "field:product.template,id:"
msgid "ID"
@@ -641,11 +641,11 @@ msgstr "ФикÑирана"
msgctxt "selection:product.template,type:"
msgid "Assets"
-msgstr ""
+msgstr "Ðктиви"
msgctxt "selection:product.template,type:"
msgid "Goods"
-msgstr ""
+msgstr "Стока"
msgctxt "selection:product.template,type:"
msgid "Service"
@@ -653,7 +653,7 @@ msgstr "УÑлуга"
msgctxt "view:product.category:"
msgid "Children"
-msgstr "Деца"
+msgstr "ÐаÑледници"
msgctxt "view:product.category:"
msgid "Product Categories"
diff --git a/locale/ca_ES.po b/locale/ca_ES.po
index 9654194..b6c60e6 100644
--- a/locale/ca_ES.po
+++ b/locale/ca_ES.po
@@ -2,10 +2,9 @@
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
-#, fuzzy
msgctxt "error:product.category:"
msgid "You can not create recursive categories!"
-msgstr "No pot crear categories recursives"
+msgstr "No pot crear categories recursives."
msgctxt "error:product.uom:"
msgid ""
@@ -18,6 +17,8 @@ msgstr ""
msgctxt "error:product.uom:"
msgid "Invalid Factor and Rate values!"
msgstr ""
+"No pot canviar la conversió, el factor o la categoria d'una unitat de "
+"mesura."
msgctxt "error:product.uom:"
msgid "Rate and factor can not be both equal to zero."
@@ -35,16 +36,15 @@ msgstr "Fills"
msgctxt "field:product.category,create_date:"
msgid "Create Date"
-msgstr ""
+msgstr "Data creació"
-#, fuzzy
msgctxt "field:product.category,create_uid:"
msgid "Create User"
-msgstr "Crear usuari"
+msgstr "Usuari creació"
msgctxt "field:product.category,id:"
msgid "ID"
-msgstr ""
+msgstr "ID"
msgctxt "field:product.category,name:"
msgid "Name"
@@ -60,11 +60,11 @@ msgstr "Nom"
msgctxt "field:product.category,write_date:"
msgid "Write Date"
-msgstr ""
+msgstr "Data modificació"
msgctxt "field:product.category,write_uid:"
msgid "Write User"
-msgstr ""
+msgstr "Usuari modificació"
msgctxt "field:product.product,code:"
msgid "Code"
@@ -72,12 +72,11 @@ msgstr "Codi"
msgctxt "field:product.product,create_date:"
msgid "Create Date"
-msgstr ""
+msgstr "Data creació"
-#, fuzzy
msgctxt "field:product.product,create_uid:"
msgid "Create User"
-msgstr "Crear usuari"
+msgstr "Usuari creació"
msgctxt "field:product.product,description:"
msgid "Description"
@@ -85,7 +84,7 @@ msgstr "Descripció"
msgctxt "field:product.product,id:"
msgid "ID"
-msgstr ""
+msgstr "ID"
msgctxt "field:product.product,rec_name:"
msgid "Name"
@@ -97,11 +96,11 @@ msgstr "Plantilla de producte"
msgctxt "field:product.product,write_date:"
msgid "Write Date"
-msgstr ""
+msgstr "Data modificació"
msgctxt "field:product.product,write_uid:"
msgid "Write User"
-msgstr ""
+msgstr "Usuari modificació"
msgctxt "field:product.template,active:"
msgid "Active"
@@ -113,7 +112,7 @@ msgstr "Categoria"
msgctxt "field:product.template,consumable:"
msgid "Consumable"
-msgstr ""
+msgstr "Consumible"
msgctxt "field:product.template,cost_price:"
msgid "Cost Price"
@@ -129,32 +128,31 @@ msgstr "Preu de cost"
msgctxt "field:product.template,create_date:"
msgid "Create Date"
-msgstr ""
+msgstr "Data creació"
-#, fuzzy
msgctxt "field:product.template,create_uid:"
msgid "Create User"
-msgstr "Crear usuari"
+msgstr "Usuari creació"
msgctxt "field:product.template,default_uom:"
msgid "Default UOM"
-msgstr "UdM predeterminada"
+msgstr "UdM per defecte"
msgctxt "field:product.template,default_uom_category:"
msgid "Default UOM Category"
-msgstr ""
+msgstr "Categoria per defecte UdM"
msgctxt "field:product.template,id:"
msgid "ID"
-msgstr ""
+msgstr "ID"
msgctxt "field:product.template,list_price:"
msgid "List Price"
-msgstr "Preu de llista"
+msgstr "Preu de venda"
msgctxt "field:product.template,list_price_uom:"
msgid "List Price"
-msgstr "Preu de llista"
+msgstr "Preu de venda"
msgctxt "field:product.template,name:"
msgid "Name"
@@ -174,11 +172,11 @@ msgstr "Tipus"
msgctxt "field:product.template,write_date:"
msgid "Write Date"
-msgstr ""
+msgstr "Data modificació"
msgctxt "field:product.template,write_uid:"
msgid "Write User"
-msgstr ""
+msgstr "Usuari modificació"
msgctxt "field:product.uom,active:"
msgid "Active"
@@ -190,12 +188,11 @@ msgstr "Categoria d'UdM"
msgctxt "field:product.uom,create_date:"
msgid "Create Date"
-msgstr ""
+msgstr "Data creació"
-#, fuzzy
msgctxt "field:product.uom,create_uid:"
msgid "Create User"
-msgstr "Crear usuari"
+msgstr "Usuari creació"
msgctxt "field:product.uom,digits:"
msgid "Display Digits"
@@ -207,7 +204,7 @@ msgstr "Factor"
msgctxt "field:product.uom,id:"
msgid "ID"
-msgstr ""
+msgstr "ID"
msgctxt "field:product.uom,name:"
msgid "Name"
@@ -231,24 +228,23 @@ msgstr "SÃmbol"
msgctxt "field:product.uom,write_date:"
msgid "Write Date"
-msgstr ""
+msgstr "Data modificació"
msgctxt "field:product.uom,write_uid:"
msgid "Write User"
-msgstr ""
+msgstr "Usuari modificació"
msgctxt "field:product.uom.category,create_date:"
msgid "Create Date"
-msgstr ""
+msgstr "Data creació"
-#, fuzzy
msgctxt "field:product.uom.category,create_uid:"
msgid "Create User"
-msgstr "Crear usuari"
+msgstr "Usuari creació"
msgctxt "field:product.uom.category,id:"
msgid "ID"
-msgstr ""
+msgstr "ID"
msgctxt "field:product.uom.category,name:"
msgid "Name"
@@ -264,11 +260,11 @@ msgstr "Unitats de mesura"
msgctxt "field:product.uom.category,write_date:"
msgid "Write Date"
-msgstr ""
+msgstr "Data modificació"
msgctxt "field:product.uom.category,write_uid:"
msgid "Write User"
-msgstr ""
+msgstr "Usuari modificació"
msgctxt "help:product.uom,factor:"
msgid ""
@@ -286,7 +282,6 @@ msgstr ""
"El coeficient de la fórmula:\n"
"1 (unitat base) = coeficient (aquesta unitat)"
-#, fuzzy
msgctxt "model:ir.action,name:act_category_list"
msgid "Categories"
msgstr "Categories"
@@ -311,7 +306,6 @@ msgctxt "model:ir.action,name:act_uom_form"
msgid "Units of Measure"
msgstr "Unitats de mesura"
-#, fuzzy
msgctxt "model:ir.ui.menu,name:menu_category_list"
msgid "Categories"
msgstr "Categories"
@@ -322,7 +316,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_product"
msgid "Products"
@@ -650,11 +644,11 @@ msgstr "Fix"
msgctxt "selection:product.template,type:"
msgid "Assets"
-msgstr ""
+msgstr "Servei"
msgctxt "selection:product.template,type:"
msgid "Goods"
-msgstr ""
+msgstr "Servei"
msgctxt "selection:product.template,type:"
msgid "Service"
diff --git a/locale/es_CO.po b/locale/es_CO.po
index 49de0ef..e13b79c 100644
--- a/locale/es_CO.po
+++ b/locale/es_CO.po
@@ -2,26 +2,17 @@
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
-#, fuzzy
msgctxt "error:product.category:"
msgid "You can not create recursive categories!"
-msgstr "No puede crear categorÃas recursivas!"
-
-msgctxt "error:product.template:"
-msgid ""
-"You cannot change the default uom for a product which is associated to stock"
-" moves."
-msgstr ""
-"No puede cambiar la UdM predeterminada para un producto asociado con "
-"movimientos de inventario."
+msgstr "¡No puede crear categorÃas recursivas!"
msgctxt "error:product.uom:"
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 eliminar, de otra forma puede desactivarla y"
-" crear una nueva."
+"Si no se ha usado la UdM, puede borrarla, en caso contrario, puede "
+"desactivarla y crear una nueva."
msgctxt "error:product.uom:"
msgid "Invalid Factor and Rate values!"
@@ -29,29 +20,29 @@ msgstr "¡Factor y valores de tasa de cambio inválidas!"
msgctxt "error:product.uom:"
msgid "Rate and factor can not be both equal to zero."
-msgstr "Tasa de cambio y factor no pueden ser cero simultáneamente."
+msgstr "Conversión y factor no pueden ser cero simultáneamente."
msgctxt "error:product.uom:"
msgid "You cannot change Rate, Factor or Category on a Unit of Measure. "
msgstr ""
-"No puede cambiar la Rata, el Factor o la CategorÃa de una Unidad de Medida."
+"No puede cambiar la conversión, el factor o la categorÃa de una unidad de "
+"medida."
msgctxt "field:product.category,childs:"
msgid "Children"
-msgstr "Hij at s"
+msgstr "Hijos"
msgctxt "field:product.category,create_date:"
msgid "Create Date"
-msgstr ""
+msgstr "Fecha de Creación"
-#, fuzzy
msgctxt "field:product.category,create_uid:"
msgid "Create User"
-msgstr "Crear usuario"
+msgstr "Creado por Usuario"
msgctxt "field:product.category,id:"
msgid "ID"
-msgstr ""
+msgstr "ID"
msgctxt "field:product.category,name:"
msgid "Name"
@@ -67,11 +58,11 @@ msgstr "Nombre"
msgctxt "field:product.category,write_date:"
msgid "Write Date"
-msgstr ""
+msgstr "Fecha de Modificación"
msgctxt "field:product.category,write_uid:"
msgid "Write User"
-msgstr ""
+msgstr "Modificado por Usuario"
msgctxt "field:product.product,code:"
msgid "Code"
@@ -79,12 +70,11 @@ msgstr "Código"
msgctxt "field:product.product,create_date:"
msgid "Create Date"
-msgstr ""
+msgstr "Fecha de Creación"
-#, fuzzy
msgctxt "field:product.product,create_uid:"
msgid "Create User"
-msgstr "Crear usuario"
+msgstr "Creado por Usuario"
msgctxt "field:product.product,description:"
msgid "Description"
@@ -92,7 +82,7 @@ msgstr "Descripción"
msgctxt "field:product.product,id:"
msgid "ID"
-msgstr ""
+msgstr "ID"
msgctxt "field:product.product,rec_name:"
msgid "Name"
@@ -104,11 +94,11 @@ msgstr "Plantilla de Producto"
msgctxt "field:product.product,write_date:"
msgid "Write Date"
-msgstr ""
+msgstr "Fecha de Modificación"
msgctxt "field:product.product,write_uid:"
msgid "Write User"
-msgstr ""
+msgstr "Modificado por Usuario"
msgctxt "field:product.template,active:"
msgid "Active"
@@ -120,40 +110,39 @@ msgstr "CategorÃa"
msgctxt "field:product.template,consumable:"
msgid "Consumable"
-msgstr ""
+msgstr "Consumible"
msgctxt "field:product.template,cost_price:"
msgid "Cost Price"
-msgstr "Método de Precio"
+msgstr "Precio de Costo"
msgctxt "field:product.template,cost_price_method:"
msgid "Cost Method"
-msgstr "Método de Coste"
+msgstr "Método de Costo"
msgctxt "field:product.template,cost_price_uom:"
msgid "Cost Price"
-msgstr "Método de Precio"
+msgstr "Precio de Costo"
msgctxt "field:product.template,create_date:"
msgid "Create Date"
-msgstr ""
+msgstr "Fecha de Creación"
-#, fuzzy
msgctxt "field:product.template,create_uid:"
msgid "Create User"
-msgstr "Crear usuario"
+msgstr "Creado por Usuario"
msgctxt "field:product.template,default_uom:"
msgid "Default UOM"
-msgstr "UdM Predeterminado"
+msgstr "UdM Predeterminada"
msgctxt "field:product.template,default_uom_category:"
msgid "Default UOM Category"
-msgstr ""
+msgstr "CategorÃa de UdM predeterminada"
msgctxt "field:product.template,id:"
msgid "ID"
-msgstr ""
+msgstr "ID"
msgctxt "field:product.template,list_price:"
msgid "List Price"
@@ -181,11 +170,11 @@ msgstr "Tipo"
msgctxt "field:product.template,write_date:"
msgid "Write Date"
-msgstr ""
+msgstr "Fecha de Modificación"
msgctxt "field:product.template,write_uid:"
msgid "Write User"
-msgstr ""
+msgstr "Modificado por Usuario"
msgctxt "field:product.uom,active:"
msgid "Active"
@@ -193,20 +182,19 @@ msgstr "Activo"
msgctxt "field:product.uom,category:"
msgid "UOM Category"
-msgstr "CategorÃa UDM"
+msgstr "CategorÃa de UdM"
msgctxt "field:product.uom,create_date:"
msgid "Create Date"
-msgstr ""
+msgstr "Fecha de Creación"
-#, fuzzy
msgctxt "field:product.uom,create_uid:"
msgid "Create User"
-msgstr "Crear usuario"
+msgstr "Creado por Usuario"
msgctxt "field:product.uom,digits:"
msgid "Display Digits"
-msgstr "Mostrar DÃgitos"
+msgstr "Decimales a Mostrar"
msgctxt "field:product.uom,factor:"
msgid "Factor"
@@ -214,7 +202,7 @@ msgstr "Factor"
msgctxt "field:product.uom,id:"
msgid "ID"
-msgstr ""
+msgstr "ID"
msgctxt "field:product.uom,name:"
msgid "Name"
@@ -222,7 +210,7 @@ msgstr "Nombre"
msgctxt "field:product.uom,rate:"
msgid "Rate"
-msgstr "Tasa de Cambio"
+msgstr "Conversión"
msgctxt "field:product.uom,rec_name:"
msgid "Name"
@@ -238,24 +226,23 @@ msgstr "SÃmbolo"
msgctxt "field:product.uom,write_date:"
msgid "Write Date"
-msgstr ""
+msgstr "Fecha de Modificación"
msgctxt "field:product.uom,write_uid:"
msgid "Write User"
-msgstr ""
+msgstr "Modificado por Usuario"
msgctxt "field:product.uom.category,create_date:"
msgid "Create Date"
-msgstr ""
+msgstr "Fecha de Creación"
-#, fuzzy
msgctxt "field:product.uom.category,create_uid:"
msgid "Create User"
-msgstr "Crear usuario"
+msgstr "Creado por Usuario"
msgctxt "field:product.uom.category,id:"
msgid "ID"
-msgstr ""
+msgstr "ID"
msgctxt "field:product.uom.category,name:"
msgid "Name"
@@ -267,29 +254,32 @@ msgstr "Nombre"
msgctxt "field:product.uom.category,uoms:"
msgid "Unit of Measures"
-msgstr "Unidad de Medidas"
+msgstr "Unidades de Medida"
msgctxt "field:product.uom.category,write_date:"
msgid "Write Date"
-msgstr ""
+msgstr "Fecha de Modificación"
msgctxt "field:product.uom.category,write_uid:"
msgid "Write User"
-msgstr ""
+msgstr "Modificado por Usuario"
msgctxt "help:product.uom,factor:"
msgid ""
"The coefficient for the formula:\n"
"coef (base unit) = 1 (this unit)"
-msgstr "El coeficiente para la fórmula:"
+msgstr ""
+"El coeficiente de la fórmula:\n"
+"coeficiente (unidad base) = 1 (esta unidad)"
msgctxt "help:product.uom,rate:"
msgid ""
"The coefficient for the formula:\n"
"1 (base unit) = coef (this unit)"
-msgstr "El coeficiente para la fórmula:"
+msgstr ""
+"El coeficiente de la fórmula:\n"
+"1 (unidad base) = coeficiente (esta unidad)"
-#, fuzzy
msgctxt "model:ir.action,name:act_category_list"
msgid "Categories"
msgstr "CategorÃas"
@@ -314,7 +304,6 @@ msgctxt "model:ir.action,name:act_uom_form"
msgid "Units of Measure"
msgstr "Unidades de Medida"
-#, fuzzy
msgctxt "model:ir.ui.menu,name:menu_category_list"
msgid "Categories"
msgstr "CategorÃas"
@@ -353,15 +342,15 @@ 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"
-msgstr "Son"
+msgstr "Ãrea"
msgctxt "model:product.uom,name:uom_carat"
msgid "Carat"
-msgstr "Carat"
+msgstr "Quilate"
msgctxt "model:product.uom,name:uom_centimeter"
msgid "centimeter"
@@ -369,19 +358,19 @@ msgstr "centÃmetro"
msgctxt "model:product.uom,name:uom_cubic_centimeter"
msgid "Cubic centimeter"
-msgstr "CentÃmetro Cúbico"
+msgstr "CentÃmetro cúbico"
msgctxt "model:product.uom,name:uom_cubic_foot"
msgid "Cubic foot"
-msgstr "Pie Cúbico"
+msgstr "Pie cúbico"
msgctxt "model:product.uom,name:uom_cubic_inch"
msgid "Cubic inch"
-msgstr "Pulgada Cúbica"
+msgstr "Pulgada cúbica"
msgctxt "model:product.uom,name:uom_cubic_meter"
msgid "Cubic meter"
-msgstr "Metro Cúbico"
+msgstr "Metro cúbico"
msgctxt "model:product.uom,name:uom_day"
msgid "Day"
@@ -397,7 +386,7 @@ msgstr "Galón"
msgctxt "model:product.uom,name:uom_gram"
msgid "Gram"
-msgstr "Gram"
+msgstr "Gramo"
msgctxt "model:product.uom,name:uom_hectare"
msgid "Hectare"
@@ -453,23 +442,23 @@ msgstr "Segundo"
msgctxt "model:product.uom,name:uom_square_centimeter"
msgid "Square centimeter"
-msgstr "CentÃmetro Cuadrado"
+msgstr "CentÃmetro cuadrado"
msgctxt "model:product.uom,name:uom_square_foot"
msgid "Square foot"
-msgstr "Pie Cuadrado"
+msgstr "Pie cuadrado"
msgctxt "model:product.uom,name:uom_square_inch"
msgid "Square inch"
-msgstr "Pulgada Cuadrada"
+msgstr "Pulgada cuadrada"
msgctxt "model:product.uom,name:uom_square_meter"
msgid "Square meter"
-msgstr "Metro Cuadrado"
+msgstr "Metro cuadrado"
msgctxt "model:product.uom,name:uom_square_yard"
msgid "Square yard"
-msgstr "Yarda Cuadrada"
+msgstr "Yarda cuadrada"
msgctxt "model:product.uom,name:uom_unit"
msgid "Unit"
@@ -477,7 +466,7 @@ msgstr "Unidad"
msgctxt "model:product.uom,name:uom_work_day"
msgid "Work Day"
-msgstr "DÃa de Trabajo"
+msgstr "DÃa de trabajo"
msgctxt "model:product.uom,name:uom_yard"
msgid "Yard"
@@ -537,7 +526,7 @@ msgstr "h"
msgctxt "model:product.uom,symbol:uom_inch"
msgid "in"
-msgstr "en"
+msgstr "pul"
msgctxt "model:product.uom,symbol:uom_kilogram"
msgid "kg"
@@ -613,7 +602,7 @@ msgstr "yd"
msgctxt "model:product.uom.category,name:"
msgid "Product uom category"
-msgstr "CategorÃa de udm de Producto"
+msgstr "CategorÃa de UdM de Producto"
msgctxt "model:product.uom.category,name:uom_cat_length"
msgid "Length"
@@ -641,35 +630,31 @@ msgstr "Peso"
msgctxt "model:res.group,name:group_product_admin"
msgid "Product Administration"
-msgstr "Productos"
+msgstr "Administración de Productos"
msgctxt "selection:product.template,cost_price_method:"
msgid "Average"
msgstr "Promedio"
msgctxt "selection:product.template,cost_price_method:"
-msgid "FIFO"
-msgstr "FIFO"
-
-msgctxt "selection:product.template,cost_price_method:"
msgid "Fixed"
msgstr "Fijo"
msgctxt "selection:product.template,type:"
msgid "Assets"
-msgstr ""
+msgstr "Activos"
msgctxt "selection:product.template,type:"
msgid "Goods"
-msgstr ""
+msgstr "Bienes"
msgctxt "selection:product.template,type:"
msgid "Service"
-msgstr "Servicios"
+msgstr "Servicio"
msgctxt "view:product.category:"
msgid "Children"
-msgstr "Hij at s"
+msgstr "Hijos"
msgctxt "view:product.category:"
msgid "Product Categories"
@@ -709,11 +694,11 @@ msgstr "Plantillas de Producto"
msgctxt "view:product.uom.category:"
msgid "Categories of Unit of Measure"
-msgstr "CategorÃas de Unidad de Medida"
+msgstr "CategorÃas de Unidades de Medida"
msgctxt "view:product.uom.category:"
msgid "Category of Unit of Measure"
-msgstr "CategorÃa de unidad de Medida"
+msgstr "CategorÃa de Unidad de Medida"
msgctxt "view:product.uom:"
msgid "Unit of Measure"
diff --git a/locale/es_ES.po b/locale/es_ES.po
index c3ae0ba..1fa8f17 100644
--- a/locale/es_ES.po
+++ b/locale/es_ES.po
@@ -314,7 +314,7 @@ msgstr "CategorÃas"
msgctxt "model:ir.ui.menu,name:menu_main_product"
msgid "Product"
-msgstr "Producto"
+msgstr "Productos"
msgctxt "model:ir.ui.menu,name:menu_product_product"
msgid "Products"
diff --git a/product.py b/product.py
index 90114b1..80acdb6 100644
--- a/product.py
+++ b/product.py
@@ -6,6 +6,8 @@ from trytond.transaction import Transaction
from trytond.pool import Pool
from trytond.backend import TableHandler
+__all__ = ['Template', 'Product']
+
STATES = {
'readonly': ~Eval('active', True),
}
@@ -14,9 +16,7 @@ DEPENDS = ['active']
class Template(ModelSQL, ModelView):
"Product Template"
- _name = "product.template"
- _description = __doc__
-
+ __name__ = "product.template"
name = fields.Char('Name', size=None, required=True, translate=True,
select=True, states=STATES, depends=DEPENDS)
type = fields.Selection([
@@ -50,146 +50,122 @@ class Template(ModelSQL, ModelView):
default_uom_category = fields.Function(
fields.Many2One('product.uom.category', 'Default UOM Category',
on_change_with=['default_uom']),
- 'get_default_uom_category')
+ 'on_change_with_default_uom_category')
active = fields.Boolean('Active', select=True)
products = fields.One2Many('product.product', 'template', 'Products',
states=STATES, depends=DEPENDS)
- def init(self, module_name):
+ @classmethod
+ def __register__(cls, module_name):
cursor = Transaction().cursor
- super(Template, self).init(module_name)
+ super(Template, cls).__register__(module_name)
- table = TableHandler(cursor, self, module_name)
+ table = TableHandler(cursor, cls, module_name)
# Migration from 2.2: category is no more required
table.not_null_action('category', 'remove')
# Migration from 2.2: new types
- cursor.execute('UPDATE "' + self._table + '" '
+ cursor.execute('UPDATE "' + cls._table + '" '
'SET consumable = %s WHERE type = %s', (True, 'consumable'))
- cursor.execute('UPDATE "' + self._table + '" '
+ cursor.execute('UPDATE "' + cls._table + '" '
'SET type = %s WHERE type IN (%s, %s)',
('goods', 'stockable', 'consumable'))
- def default_active(self):
+ @staticmethod
+ def default_active():
return True
- def default_type(self):
+ @staticmethod
+ def default_type():
return 'goods'
- def default_consumable(self):
+ @staticmethod
+ def default_consumable():
return False
- def default_cost_price_method(self):
+ @staticmethod
+ def default_cost_price_method():
return 'fixed'
- def on_change_with_default_uom_category(self, values):
- pool = Pool()
- uom_obj = pool.get('product.uom')
- if values.get('default_uom'):
- uom = uom_obj.browse(values['default_uom'])
- return uom.category.id
-
- def get_default_uom_category(self, ids, name):
- categories = {}
- for template in self.browse(ids):
- categories[template.id] = template.default_uom.category.id
- return categories
-
- def get_price_uom(self, ids, name):
- product_uom_obj = Pool().get('product.uom')
+ def on_change_with_default_uom_category(self, name=None):
+ if self.default_uom:
+ return self.default_uom.category.id
+
+ @staticmethod
+ def get_price_uom(products, name):
+ Uom = Pool().get('product.uom')
res = {}
field = name[:-4]
if Transaction().context.get('uom'):
- to_uom = product_uom_obj.browse(
- Transaction().context['uom'])
- for product in self.browse(ids):
- res[product.id] = product_uom_obj.compute_price(
- product.default_uom, product[field], to_uom)
+ to_uom = Uom(Transaction().context['uom'])
+ for product in products:
+ res[product.id] = Uom.compute_price(
+ product.default_uom, getattr(product, field), to_uom)
else:
- for product in self.browse(ids):
- res[product.id] = product[field]
+ for product in products:
+ res[product.id] = getattr(product, field)
return res
- def copy(self, ids, default=None):
+ @classmethod
+ def copy(cls, templates, default=None):
if default is None:
default = {}
default = default.copy()
default['products'] = None
- return super(Template, self).copy(ids, default=default)
-
-Template()
+ return super(Template, cls).copy(templates, default=default)
class Product(ModelSQL, ModelView):
"Product"
- _name = "product.product"
- _description = __doc__
+ __name__ = "product.product"
_inherits = {'product.template': 'template'}
-
template = fields.Many2One('product.template', 'Product Template',
required=True, ondelete='CASCADE', select=True)
code = fields.Char("Code", size=None, select=True)
description = fields.Text("Description", translate=True)
- def get_rec_name(self, ids, name):
- if not ids:
- return {}
- res = {}
- for product in self.browse(ids):
- name = product.name
- if product.code:
- name = '[' + product.code + '] ' + product.name
- res[product.id] = name
- return res
+ def get_rec_name(self, name):
+ if self.code:
+ return '[' + self.code + '] ' + self.name
+ else:
+ return self.name
- def search_rec_name(self, name, clause):
- ids = self.search([('code',) + clause[1:]], order=[])
+ @classmethod
+ def search_rec_name(cls, name, clause):
+ ids = map(int, cls.search([('code',) + clause[1:]], order=[]))
if ids:
- ids += self.search([('name',) + clause[1:]], order=[])
+ ids += map(int, cls.search([('name',) + clause[1:]], order=[]))
return [('id', 'in', ids)]
return [('name',) + clause[1:]]
- def delete(self, ids):
- template_obj = Pool().get('product.template')
-
- if isinstance(ids, (int, long)):
- ids = [ids]
+ @classmethod
+ def delete(cls, products):
+ Template = Pool().get('product.template')
# Get the templates before we delete the products.
- products = self.browse(ids)
- template_ids = [product.template.id for product in products]
+ templates = [product.template for product in products]
- res = super(Product, self).delete(ids)
+ super(Product, cls).delete(products)
# Get templates that are still linked after delete.
- templates = template_obj.browse(template_ids)
- unlinked_template_ids = [template.id for template in templates \
- if not template.products]
- if unlinked_template_ids:
- template_obj.delete(unlinked_template_ids)
-
- return res
+ unlinked_templates = [template for template in templates
+ if not template.products]
+ if unlinked_templates:
+ Template.delete(unlinked_templates)
- def copy(self, ids, default=None):
- template_obj = Pool().get('product.template')
+ @classmethod
+ def copy(cls, products, default=None):
+ Template = Pool().get('product.template')
- int_id = False
- if isinstance(ids, (int, long)):
- int_id = True
- ids = [ids]
if default is None:
default = {}
default = default.copy()
default['products'] = None
- new_ids = []
- for product in self.browse(ids):
- default['template'] = template_obj.copy(product.template.id)
- new_id = super(Product, self).copy(product.id, default=default)
- new_ids.append(new_id)
-
- if int_id:
- return new_ids[0]
- return new_ids
-
-Product()
+ new_products = []
+ for product in products:
+ template, = Template.copy([product.template])
+ default['template'] = template.id
+ new_products.extend(super(Product, cls).copy([product],
+ default=default))
+ return new_products
diff --git a/setup.py b/setup.py
index e0ad0c0..425c1cc 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,22 +32,21 @@ requires.append('trytond >= %s.%s, < %s.%s' %
setup(name='trytond_product',
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 with products',
+ 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': '.'},
packages=[
'trytond.modules.product',
'trytond.modules.product.tests',
- ],
+ ],
package_data={
'trytond.modules.product': info.get('xml', []) \
- + info.get('translation', []) \
- + ['icons/*.svg'],
- },
+ + ['tryton.cfg', 'locale/*.po', 'icons/*.svg'],
+ },
classifiers=[
'Development Status :: 5 - Production/Stable',
'Environment :: Plugins',
@@ -58,7 +68,7 @@ setup(name='trytond_product',
'Programming Language :: Python :: 2.6',
'Programming Language :: Python :: 2.7',
'Topic :: Office/Business',
- ],
+ ],
license='GPL-3',
install_requires=requires,
zip_safe=False,
@@ -68,4 +78,4 @@ setup(name='trytond_product',
""",
test_suite='tests',
test_loader='trytond.test_loader:Loader',
-)
+ )
diff --git a/tests/test_product.py b/tests/test_product.py
index 7fbfeeb..5fa6998 100644
--- a/tests/test_product.py
+++ b/tests/test_product.py
@@ -45,41 +45,41 @@ class ProductTestCase(unittest.TestCase):
'''
with Transaction().start(DB_NAME, USER,
context=CONTEXT) as transaction:
- category_id = self.uom_category.create({'name': 'Test'})
+ category = self.uom_category.create({'name': 'Test'})
transaction.cursor.commit()
- self.failUnlessRaises(Exception, self.uom.create, {
- 'name': 'Test',
- 'symbol': 'T',
- 'category': category_id,
- 'rate': 0,
- 'factor': 0,
- })
+ self.assertRaises(Exception, self.uom.create, {
+ 'name': 'Test',
+ 'symbol': 'T',
+ 'category': category.id,
+ 'rate': 0,
+ 'factor': 0,
+ })
transaction.cursor.rollback()
- uom_id = self.uom.create({
- 'name': 'Test',
- 'symbol': 'T',
- 'category': category_id,
- 'rate': 1.0,
- 'factor': 1.0,
- })
+ uom = self.uom.create({
+ 'name': 'Test',
+ 'symbol': 'T',
+ 'category': category.id,
+ 'rate': 1.0,
+ 'factor': 1.0,
+ })
transaction.cursor.commit()
- self.failUnlessRaises(Exception, self.uom.write, uom_id, {
- 'rate': 0.0,
- })
+ self.assertRaises(Exception, self.uom.write, [uom], {
+ 'rate': 0.0,
+ })
transaction.cursor.rollback()
- self.failUnlessRaises(Exception, self.uom.write, uom_id, {
- 'factor': 0.0,
- })
+ self.assertRaises(Exception, self.uom.write, [uom], {
+ 'factor': 0.0,
+ })
transaction.cursor.rollback()
- self.failUnlessRaises(Exception, self.uom.write, uom_id, {
- 'rate': 0.0,
- 'factor': 0.0,
- })
+ self.assertRaises(Exception, self.uom.write, [uom], {
+ 'rate': 0.0,
+ 'factor': 0.0,
+ })
transaction.cursor.rollback()
def test0020uom_check_factor_and_rate(self):
@@ -88,33 +88,33 @@ class ProductTestCase(unittest.TestCase):
'''
with Transaction().start(DB_NAME, USER,
context=CONTEXT) as transaction:
- category_id = self.uom_category.search([
- ('name', '=', 'Test'),
- ], limit=1)[0]
-
- self.failUnlessRaises(Exception, self.uom.create, {
- 'name': 'Test',
- 'symbol': 'T',
- 'category': category_id,
- 'rate': 2,
- 'factor': 2,
- })
+ category, = self.uom_category.search([
+ ('name', '=', 'Test'),
+ ], limit=1)
+
+ self.assertRaises(Exception, self.uom.create, {
+ 'name': 'Test',
+ 'symbol': 'T',
+ 'category': category.id,
+ 'rate': 2,
+ 'factor': 2,
+ })
transaction.cursor.rollback()
- uom_id = self.uom.search([
- ('name', '=', 'Test'),
- ], limit=1)[0]
+ uom, = self.uom.search([
+ ('name', '=', 'Test'),
+ ], limit=1)
- self.failUnlessRaises(Exception, self.uom.write, uom_id,
- {
- 'rate': 2.0,
- })
+ self.assertRaises(Exception, self.uom.write, [uom],
+ {
+ 'rate': 2.0,
+ })
transaction.cursor.rollback()
- self.failUnlessRaises(Exception, self.uom.write, uom_id,
- {
- 'factor': 2.0,
- })
+ self.assertRaises(Exception, self.uom.write, [uom],
+ {
+ 'factor': 2.0,
+ })
transaction.cursor.rollback()
def test0030uom_select_accurate_field(self):
@@ -126,14 +126,13 @@ class ProductTestCase(unittest.TestCase):
('Kilometer', 'factor'),
('centimeter', 'rate'),
('Foot', 'factor'),
- ]
+ ]
with Transaction().start(DB_NAME, USER, context=CONTEXT):
for name, result in tests:
- uom_id = self.uom.search([
- ('name', '=', name),
- ], limit=1)[0]
- uom = self.uom.browse(uom_id)
- self.assert_(result == self.uom.select_accurate_field(uom))
+ uom, = self.uom.search([
+ ('name', '=', name),
+ ], limit=1)
+ self.assertEqual(result, uom.accurate_field)
def test0040uom_compute_qty(self):
'''
@@ -145,28 +144,28 @@ class ProductTestCase(unittest.TestCase):
('Second', 5, 'Minute', 0.083333333333333343, 0.08),
('Second', 25, 'Hour', 0.0069444444444444441, 0.01),
('Millimeter', 3, 'Inch', 0.11811023622047245, 0.12),
- ]
+ ]
with Transaction().start(DB_NAME, USER, context=CONTEXT):
for from_name, qty, to_name, result, rounded_result in tests:
- from_uom = self.uom.browse(self.uom.search(
- [
- ('name', '=', from_name),
- ], limit=1)[0])
- to_uom = self.uom.browse(self.uom.search(
- [
+ from_uom, = self.uom.search([
+ ('name', '=', from_name),
+ ], limit=1)
+ to_uom, = self.uom.search([
('name', '=', to_name),
- ], limit=1)[0])
- self.assert_(result == self.uom.compute_qty(from_uom,
- qty, to_uom, False))
- self.assert_(rounded_result == self.uom.compute_qty(
- from_uom, qty, to_uom, True))
-
- self.assert_(10 == self.uom.compute_qty(None, 10, to_uom))
- self.assert_(10 == self.uom.compute_qty(None, 10, to_uom, True))
- self.assert_(0 == self.uom.compute_qty(from_uom, 0, to_uom))
- self.assert_(0 == self.uom.compute_qty(from_uom, 0, to_uom, True))
- self.assert_(10 == self.uom.compute_qty(from_uom, 10, None))
- self.assert_(10 == self.uom.compute_qty(from_uom, 10, None, True))
+ ], limit=1)
+ self.assertEqual(result, self.uom.compute_qty(from_uom,
+ qty, to_uom, False))
+ self.assertEqual(rounded_result, self.uom.compute_qty(
+ from_uom, qty, to_uom, True))
+
+ self.assertEqual(10, self.uom.compute_qty(None, 10, to_uom))
+ self.assertEqual(10, self.uom.compute_qty(None, 10, to_uom, True))
+ self.assertEqual(0, self.uom.compute_qty(from_uom, 0, to_uom))
+ self.assertEqual(0,
+ self.uom.compute_qty(from_uom, 0, to_uom, True))
+ self.assertEqual(10, self.uom.compute_qty(from_uom, 10, None))
+ self.assertEqual(10,
+ self.uom.compute_qty(from_uom, 10, None, True))
def test0050uom_compute_price(self):
'''
@@ -178,19 +177,17 @@ class ProductTestCase(unittest.TestCase):
('Second', Decimal('5'), 'Minute', Decimal('300')),
('Second', Decimal('25'), 'Hour', Decimal('90000')),
('Millimeter', Decimal('3'), 'Inch', Decimal('76.2')),
- ]
+ ]
with Transaction().start(DB_NAME, USER, context=CONTEXT):
for from_name, price, to_name, result in tests:
- from_uom = self.uom.browse(self.uom.search(
- [
+ from_uom, = self.uom.search([
('name', '=', from_name),
- ], limit=1)[0])
- to_uom = self.uom.browse(self.uom.search(
- [
+ ], limit=1)
+ to_uom, = self.uom.search([
('name', '=', to_name),
- ], limit=1)[0])
- self.assert_(result == self.uom.compute_price(from_uom,
- price, to_uom))
+ ], limit=1)
+ self.assertEqual(result, self.uom.compute_price(from_uom,
+ price, to_uom))
def suite():
diff --git a/tryton.cfg b/tryton.cfg
new file mode 100644
index 0000000..9e6da25
--- /dev/null
+++ b/tryton.cfg
@@ -0,0 +1,9 @@
+[tryton]
+version=2.6.0
+depends:
+ ir
+ res
+xml:
+ product.xml
+ category.xml
+ uom.xml
diff --git a/trytond_product.egg-info/PKG-INFO b/trytond_product.egg-info/PKG-INFO
index 12e540e..2500961 100644
--- a/trytond_product.egg-info/PKG-INFO
+++ b/trytond_product.egg-info/PKG-INFO
@@ -1,13 +1,48 @@
Metadata-Version: 1.0
Name: trytond-product
-Version: 2.4.1
-Summary: Define products, categories of product, units of measure, categories of units of measure.
+Version: 2.6.0
+Summary: Tryton module with products
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
+ ===============
+
+ The product 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.egg-info/SOURCES.txt b/trytond_product.egg-info/SOURCES.txt
index 3d9c60a..6ba1b94 100644
--- a/trytond_product.egg-info/SOURCES.txt
+++ b/trytond_product.egg-info/SOURCES.txt
@@ -7,9 +7,9 @@ README
category.xml
product.xml
setup.py
+tryton.cfg
uom.xml
./__init__.py
-./__tryton__.py
./category.py
./product.py
./uom.py
diff --git a/trytond_product.egg-info/requires.txt b/trytond_product.egg-info/requires.txt
index 62c6315..af826e8 100644
--- a/trytond_product.egg-info/requires.txt
+++ b/trytond_product.egg-info/requires.txt
@@ -1 +1 @@
-trytond >= 2.4, < 2.5
\ No newline at end of file
+trytond >= 2.6, < 2.7
\ No newline at end of file
diff --git a/uom.py b/uom.py
index 04501a3..e9dfbd3 100644
--- a/uom.py
+++ b/uom.py
@@ -5,6 +5,8 @@ from trytond.model import ModelView, ModelSQL, fields
from trytond.pyson import Eval
from trytond.transaction import Transaction
+__all__ = ['UomCategory', 'Uom']
+
STATES = {
'readonly': ~Eval('active', True),
}
@@ -13,22 +15,19 @@ DEPENDS = ['active']
class UomCategory(ModelSQL, ModelView):
'Product uom category'
- _name = 'product.uom.category'
- _description = __doc__
+ __name__ = 'product.uom.category'
name = fields.Char('Name', required=True, translate=True)
uoms = fields.One2Many('product.uom', 'category', 'Unit of Measures')
- def __init__(self):
- super(UomCategory, self).__init__()
- self._order.insert(0, ('name', 'ASC'))
-
-UomCategory()
+ @classmethod
+ def __setup__(cls):
+ super(UomCategory, cls).__setup__()
+ cls._order.insert(0, ('name', 'ASC'))
class Uom(ModelSQL, ModelView):
'Unit of measure'
- _name = 'product.uom'
- _description = __doc__
+ __name__ = 'product.uom'
name = fields.Char('Name', size=None, required=True, states=STATES,
translate=True, depends=DEPENDS)
symbol = fields.Char('Symbol', size=10, required=True, states=STATES,
@@ -48,183 +47,186 @@ class Uom(ModelSQL, ModelView):
digits = fields.Integer('Display Digits', required=True)
active = fields.Boolean('Active')
- def init(self, module_name):
+ @classmethod
+ def __register__(cls, module_name):
cursor = Transaction().cursor
# Migration from 1.6: corrected misspelling of ounce (was once)
cursor.execute("UPDATE ir_model_data "\
"SET fs_id = REPLACE(fs_id, 'uom_once', 'uom_ounce') "\
"WHERE fs_id = 'uom_once' AND module = 'product'")
- super(Uom, self).init(module_name)
+ super(Uom, cls).__register__(module_name)
- def __init__(self):
- super(Uom, self).__init__()
- self._sql_constraints += [
+ @classmethod
+ def __setup__(cls):
+ super(Uom, cls).__setup__()
+ cls._sql_constraints += [
('non_zero_rate_factor', 'CHECK((rate != 0.0) or (factor != 0.0))',
'Rate and factor can not be both equal to zero.')
- ]
- self._constraints += [
+ ]
+ cls._constraints += [
('check_factor_and_rate', 'invalid_factor_and_rate'),
- ]
- self._order.insert(0, ('name', 'ASC'))
- self._error_messages.update({
- 'change_uom_rate_title': 'You cannot change Rate, Factor or '
+ ]
+ cls._order.insert(0, ('name', 'ASC'))
+ cls._error_messages.update({
+ 'change_uom_rate_title': 'You cannot change Rate, Factor or ' \
'Category on a Unit of Measure. ',
- 'change_uom_rate': 'If the UOM is still not used, you can '
- 'delete it otherwise you can deactivate it '
+ 'change_uom_rate': 'If the UOM is still not used, you can ' \
+ 'delete it otherwise you can deactivate it ' \
'and create a new one.',
'invalid_factor_and_rate': 'Invalid Factor and Rate values!',
- })
+ })
- def check_xml_record(self, ids, values):
+ @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
- def default_rate(self):
+ @staticmethod
+ def default_rate():
return 1.0
- def default_factor(self):
+ @staticmethod
+ def default_factor():
return 1.0
- def default_active(self):
+ @staticmethod
+ def default_active():
return True
- def default_rounding(self):
+ @staticmethod
+ def default_rounding():
return 0.01
- def default_digits(self):
+ @staticmethod
+ def default_digits():
return 2
- def on_change_factor(self, value):
- if value.get('factor', 0.0) == 0.0:
+ def on_change_factor(self):
+ if (self.factor or 0.0) == 0.0:
return {'rate': 0.0}
- return {'rate': round(1.0 / value['factor'], self.rate.digits[1])}
+ return {
+ 'rate': round(1.0 / self.factor, self.__class__.rate.digits[1]),
+ }
- def on_change_rate(self, value):
- if value.get('rate', 0.0) == 0.0:
+ def on_change_rate(self):
+ if (self.rate or 0.0) == 0.0:
return {'factor': 0.0}
- return {'factor': round(1.0 / value['rate'], self.factor.digits[1])}
-
- def search_rec_name(self, name, clause):
- ids = self.search(['OR',
- (self._rec_name,) + clause[1:],
- ('symbol',) + clause[1:],
- ], order=[])
+ return {
+ 'factor': round(1.0 / self.rate, self.__class__.factor.digits[1]),
+ }
+
+ @classmethod
+ def search_rec_name(cls, name, clause):
+ ids = map(int, cls.search(['OR',
+ (cls._rec_name,) + clause[1:],
+ ('symbol',) + clause[1:],
+ ], order=[]))
return [('id', 'in', ids)]
@staticmethod
def round(number, precision=1.0):
return round(number / precision) * precision
- def check_factor_and_rate(self, ids):
+ def check_factor_and_rate(self):
"Check coherence between factor and rate"
- for uom in self.browse(ids):
- if uom.rate == uom.factor == 0.0:
- continue
- if uom.rate != round(1.0 / uom.factor, self.rate.digits[1]) and \
- uom.factor != round(1.0 / uom.rate, self.factor.digits[1]):
- return False
+ if self.rate == self.factor == 0.0:
+ return True
+ if (self.rate != round(
+ 1.0 / self.factor, self.__class__.rate.digits[1])
+ and self.factor != round(
+ 1.0 / self.rate, self.__class__.factor.digits[1])):
+ return False
return True
- def write(self, ids, values):
+ @classmethod
+ def write(cls, uoms, values):
if Transaction().user == 0:
- return super(Uom, self).write(ids, values)
+ return super(Uom, cls).write(uoms, values)
if 'rate' not in values and 'factor' not in values \
and 'category' not in values:
- return super(Uom, self).write(ids, values)
+ super(Uom, cls).write(uoms, values)
+ return
- if isinstance(ids, (int, long)):
- ids = [ids]
-
- uoms = self.browse(ids)
old_uom = dict((uom.id, (uom.factor, uom.rate, uom.category.id)) \
for uom in uoms)
- res = super(Uom, self).write(ids, values)
- uoms = self.browse(ids)
+ super(Uom, cls).write(uoms, values)
for uom in uoms:
if uom.factor != old_uom[uom.id][0] \
or uom.rate != old_uom[uom.id][1] \
or uom.category.id != old_uom[uom.id][2]:
- self.raise_user_error('change_uom_rate_title',
- error_description='change_uom_rate')
- return res
+ cls.raise_user_error('change_uom_rate_title',
+ error_description='change_uom_rate')
- def select_accurate_field(self, uom):
+ @property
+ def accurate_field(self):
"""
Select the more accurate field.
It chooses the field that has the least decimal.
-
- :param uom: a BrowseRecord of UOM.
- :return: 'factor' or 'rate'.
"""
lengths = {}
for field in ('rate', 'factor'):
- format = '%%.%df' % getattr(self, field).digits[1]
- lengths[field] = len((format % getattr(uom,
- field)).split('.')[1].rstrip('0'))
+ format = '%%.%df' % getattr(self.__class__, field).digits[1]
+ lengths[field] = len((format % getattr(self,
+ field)).split('.')[1].rstrip('0'))
if lengths['rate'] < lengths['factor']:
return 'rate'
elif lengths['factor'] < lengths['rate']:
return 'factor'
- elif uom.factor >= 1.0:
+ elif self.factor >= 1.0:
return 'factor'
else:
return 'rate'
- def compute_qty(self, from_uom, qty, to_uom=None, round=True):
+ @classmethod
+ def compute_qty(cls, from_uom, qty, to_uom=None, round=True):
"""
Convert quantity for given uom's.
-
- :param from_uom: a BrowseRecord of product.uom
- :param qty: an int or long or float value
- :param to_uom: a BrowseRecord of product.uom
- :param round: a boolean to round or not the result
- :return: the converted quantity
"""
if not from_uom or not qty or not to_uom:
return qty
if from_uom.category.id != to_uom.category.id:
return qty
- if self.select_accurate_field(from_uom) == 'factor':
+ if from_uom.accurate_field == 'factor':
amount = qty * from_uom.factor
else:
amount = qty / from_uom.rate
if to_uom is not None:
- if self.select_accurate_field(to_uom) == 'factor':
+ if to_uom.accurate_field == 'factor':
amount = amount / to_uom.factor
else:
amount = amount * to_uom.rate
if round:
- amount = self.round(amount, to_uom.rounding)
+ amount = cls.round(amount, to_uom.rounding)
return amount
- def compute_price(self, from_uom, price, to_uom=None):
+ @classmethod
+ def compute_price(cls, from_uom, price, to_uom=None):
"""
Convert price for given uom's.
-
- :param from_uom: a BrowseRecord of product.uom
- :param price: a Decimal value
- :param to_uom: a BrowseRecord of product.uom
- :return: the converted price
"""
if not from_uom or not price or not to_uom:
return price
if from_uom.category.id != to_uom.category.id:
return price
- factor_format = '%%.%df' % self.factor.digits[1]
- rate_format = '%%.%df' % self.rate.digits[1]
+ factor_format = '%%.%df' % cls.factor.digits[1]
+ rate_format = '%%.%df' % cls.rate.digits[1]
- if self.select_accurate_field(from_uom) == 'factor':
+ if from_uom.accurate_field == 'factor':
new_price = price / Decimal(factor_format % from_uom.factor)
else:
new_price = price * Decimal(rate_format % from_uom.rate)
- if self.select_accurate_field(to_uom) == 'factor':
+ if to_uom.accurate_field == 'factor':
new_price = new_price * Decimal(factor_format % to_uom.factor)
else:
new_price = new_price / Decimal(rate_format % to_uom.rate)
return new_price
-
-Uom()
commit c09e3ab686e63fb897299026effe77e2e62b1a36
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Tue Sep 18 16:07:22 2012 +0200
Releasing debian version 2.4.1-2.
diff --git a/debian/changelog b/debian/changelog
index b5cb375..40f7930 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,17 @@
+tryton-modules-product (2.4.1-2) experimental; urgency=low
+
+ [ Daniel Baumann ]
+ * Updating maintainers field.
+ * Updating vcs fields.
+ * Correcting copyright file to match format version 1.0.
+ * Switching to xz compression.
+ * Updating to debhelper version 9.
+
+ [ Mathias Behrle ]
+ * Merging branch debian-wheezy-2.2 (Closes: #687756).
+
+ -- Mathias Behrle <mathiasb at m9s.biz> Mon, 17 Sep 2012 16:48:55 +0200
+
tryton-modules-product (2.4.1-1) experimental; urgency=low
* Merging upstream version 2.4.1.
commit 6f12c3c030617bcffe641b52a9b0941f33e985ba
Author: Daniel Baumann <daniel at debian.org>
Date: Sat Jun 30 18:02:29 2012 +0200
Updating to debhelper version 9.
diff --git a/debian/compat b/debian/compat
index 45a4fb7..ec63514 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-8
+9
diff --git a/debian/control b/debian/control
index c3ba3a0..62c9b5e 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: optional
Maintainer: Debian Tryton Maintainers <maintainers at debian.tryton.org>
Uploaders: Daniel Baumann <daniel at debian.org>, Mathias Behrle <mathiasb at m9s.biz>
Dm-Upload-Allowed: yes
-Build-Depends: debhelper (>= 8), python (>= 2.6.6-3~), python-setuptools
+Build-Depends: debhelper (>= 9), python (>= 2.6.6-3~), python-setuptools
Standards-Version: 3.9.3
Homepage: http://www.tryton.org/
Vcs-Browser: http://debian.tryton.org/gitweb/?p=packages/tryton-modules-product.git
commit 8ee6009760063e4214f55638e9060bafc1dcb9f9
Author: Daniel Baumann <daniel at debian.org>
Date: Sat Jun 30 17:54:36 2012 +0200
Switching to xz compression.
diff --git a/debian/rules b/debian/rules
index e32b791..1ae0776 100755
--- a/debian/rules
+++ b/debian/rules
@@ -7,3 +7,6 @@ override_dh_auto_clean:
dh_auto_clean
rm -rf *.egg-info
+
+override_dh_builddeb:
+ dh_builddeb -- -Zxz -z9
diff --git a/debian/source/options b/debian/source/options
index d053b65..22a4de9 100644
--- a/debian/source/options
+++ b/debian/source/options
@@ -1,2 +1,2 @@
-compression = gzip
+compression = xz
compression-level = 9
commit de62cf3a1b02d8ffd13a24a8b6073c81d3552ea0
Author: Daniel Baumann <daniel at debian.org>
Date: Sat Jun 30 17:50:24 2012 +0200
Correcting copyright file to match format version 1.0.
diff --git a/debian/copyright b/debian/copyright
index 686c3f5..da88797 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -2,10 +2,10 @@ Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Files: *
Copyright:
- (C) 2004-2008 Tiny SPRL
- (C) 2008-2012 Cedric Krier
- (C) 2008-2012 Bertrand Chenal
- (C) 2008-2012 B2CK SPRL
+ 2004-2008 Tiny SPRL
+ 2008-2012 Cedric Krier
+ 2008-2012 Bertrand Chenal
+ 2008-2012 B2CK SPRL
License: GPL-3+
Files: icons/*
@@ -14,8 +14,8 @@ License: public-domain
Files: debian/*
Copyright:
- (C) 2009-2012 Daniel Baumann <daniel at debian.org>
- (C) 2011-2012 Mathias Behrle <mathiasb at m9s.biz>
+ 2009-2012 Daniel Baumann <daniel at debian.org>
+ 2011-2012 Mathias Behrle <mathiasb at m9s.biz>
License: GPL-3+
License: GPL-3+
commit f1cdc0d893938a105ae79f04ee1c0297d3934a57
Author: Daniel Baumann <daniel at 127011.net>
Date: Sat Jun 30 16:55:04 2012 +0200
Updating vcs fields.
diff --git a/debian/control b/debian/control
index e499a95..c3ba3a0 100644
--- a/debian/control
+++ b/debian/control
@@ -7,8 +7,8 @@ Dm-Upload-Allowed: yes
Build-Depends: debhelper (>= 8), python (>= 2.6.6-3~), python-setuptools
Standards-Version: 3.9.3
Homepage: http://www.tryton.org/
-Vcs-Browser: http://git.debian-maintainers.org/?p=tryton/tryton-modules-product.git
-Vcs-Git: git://git.debian-maintainers.org/git/tryton/tryton-modules-product.git
+Vcs-Browser: http://debian.tryton.org/gitweb/?p=packages/tryton-modules-product.git
+Vcs-Git: git://debian.tryton.org/git/packages/tryton-modules-product.git
X-Python-Version: >= 2.6
Package: tryton-modules-product
commit c090f2aa5a54c702fe02c615fc80a073de157828
Author: Daniel Baumann <daniel at 127011.net>
Date: Sat Jun 30 16:52:31 2012 +0200
Updating maintainers field.
diff --git a/debian/control b/debian/control
index c3d31dc..e499a95 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,7 @@
Source: tryton-modules-product
Section: python
Priority: optional
-Maintainer: Debian Tryton Maintainers <tryton at lists.debian-maintainers.org>
+Maintainer: Debian Tryton Maintainers <maintainers at debian.tryton.org>
Uploaders: Daniel Baumann <daniel at debian.org>, Mathias Behrle <mathiasb at m9s.biz>
Dm-Upload-Allowed: yes
Build-Depends: debhelper (>= 8), python (>= 2.6.6-3~), python-setuptools
commit 8ef4cb1f8e13beb237ceddd0bd9179e478d6cd0f
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Tue Sep 11 14:27:42 2012 +0200
Releasing debian version 2.4.1-1.
diff --git a/debian/changelog b/debian/changelog
index 3b98d83..b5cb375 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+tryton-modules-product (2.4.1-1) experimental; urgency=low
+
+ * Merging upstream version 2.4.1.
+
+ -- Mathias Behrle <mathiasb at m9s.biz> Tue, 11 Sep 2012 13:19:38 +0200
+
tryton-modules-product (2.4.0-1) experimental; urgency=low
* Updating to Standards-Version: 3.9.3, no changes needed.
commit 566a948aec8e36dcb100eae0536a132ed2701935
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Tue Sep 11 13:16:48 2012 +0200
Merging upstream version 2.4.1.
diff --git a/CHANGELOG b/CHANGELOG
index 9c2ce5e..2d131e2 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 2.4.1 - 2012-09-02
+* Bug fixes (see mercurial logs for details)
+
Version 2.4.0 - 2012-04-24
* Bug fixes (see mercurial logs for details)
* Remove special uom search clause
diff --git a/PKG-INFO b/PKG-INFO
index 88b93a3..e242e1e 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.0
Name: trytond_product
-Version: 2.4.0
+Version: 2.4.1
Summary: Define products, categories of product, units of measure, categories of units of measure.
Home-page: http://www.tryton.org/
Author: B2CK
diff --git a/__tryton__.py b/__tryton__.py
index d1e768f..125c6d7 100644
--- a/__tryton__.py
+++ b/__tryton__.py
@@ -12,7 +12,7 @@
'name_fr_FR': 'Produit',
'name_nl_NL': 'Producten',
'name_ru_RU': 'ТМЦ',
- 'version': '2.4.0',
+ 'version': '2.4.1',
'author': 'B2CK',
'email': 'info at b2ck.com',
'website': 'http://www.tryton.org/',
diff --git a/product.py b/product.py
index 088d186..90114b1 100644
--- a/product.py
+++ b/product.py
@@ -77,6 +77,9 @@ class Template(ModelSQL, ModelView):
def default_type(self):
return 'goods'
+ def default_consumable(self):
+ return False
+
def default_cost_price_method(self):
return 'fixed'
diff --git a/tests/test_product.py b/tests/test_product.py
index 748f853..7fbfeeb 100644
--- a/tests/test_product.py
+++ b/tests/test_product.py
@@ -57,7 +57,7 @@ class ProductTestCase(unittest.TestCase):
})
transaction.cursor.rollback()
- self.uom.create({
+ uom_id = self.uom.create({
'name': 'Test',
'symbol': 'T',
'category': category_id,
@@ -66,17 +66,17 @@ class ProductTestCase(unittest.TestCase):
})
transaction.cursor.commit()
- self.failUnlessRaises(Exception, self.uom.write, {
+ self.failUnlessRaises(Exception, self.uom.write, uom_id, {
'rate': 0.0,
})
transaction.cursor.rollback()
- self.failUnlessRaises(Exception, self.uom.write, {
+ self.failUnlessRaises(Exception, self.uom.write, uom_id, {
'factor': 0.0,
})
transaction.cursor.rollback()
- self.failUnlessRaises(Exception, self.uom.write, {
+ self.failUnlessRaises(Exception, self.uom.write, uom_id, {
'rate': 0.0,
'factor': 0.0,
})
diff --git a/trytond_product.egg-info/PKG-INFO b/trytond_product.egg-info/PKG-INFO
index ea3f75f..12e540e 100644
--- a/trytond_product.egg-info/PKG-INFO
+++ b/trytond_product.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.0
Name: trytond-product
-Version: 2.4.0
+Version: 2.4.1
Summary: Define products, categories of product, units of measure, categories of units of measure.
Home-page: http://www.tryton.org/
Author: B2CK
commit b216a37a875c26d597b76909aa6a2db68fdab544
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Sat Apr 28 12:44:04 2012 +0200
Releasing debian version 2.4.0-1.
diff --git a/debian/changelog b/debian/changelog
index 912c690..3b98d83 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+tryton-modules-product (2.4.0-1) experimental; urgency=low
+
+ * Updating to Standards-Version: 3.9.3, no changes needed.
+ * Updating year in copyright.
+ * Adding Format header for DEP5.
+ * Merging upstream version 2.4.0.
+ * Updating Copyright.
+ * Bumping versioned tryton depends to 2.4.
+
+ -- Mathias Behrle <mathiasb at m9s.biz> Thu, 26 Apr 2012 19:31:08 +0200
+
tryton-modules-product (2.2.1-1) unstable; urgency=low
* Merging upstream version 2.2.1.
commit f595cf4a4a1dc685986fc79cdee836cfa501494e
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Thu Apr 26 19:11:44 2012 +0200
Bumping versioned tryton depends to 2.4.
diff --git a/debian/control b/debian/control
index 102f846..c3d31dc 100644
--- a/debian/control
+++ b/debian/control
@@ -14,7 +14,7 @@ X-Python-Version: >= 2.6
Package: tryton-modules-product
Architecture: all
Depends:
- ${misc:Depends}, ${python:Depends}, tryton-server (>= 2.2),
+ ${misc:Depends}, ${python:Depends}, tryton-server (>= 2.4),
python-pkg-resources
Description: Tryton Application Platform (Product Module)
Tryton is a high-level general purpose application platform written in Python
commit b5c7f6f482a713bd733f8329865b309f856519fe
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Wed Apr 25 20:08:13 2012 +0200
Updating Copyright.
diff --git a/debian/copyright b/debian/copyright
index 165d163..686c3f5 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -3,9 +3,9 @@ Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Files: *
Copyright:
(C) 2004-2008 Tiny SPRL
- (C) 2008-2011 Cedric Krier
- (C) 2008-2011 Bertrand Chenal
- (C) 2008-2011 B2CK SPRL
+ (C) 2008-2012 Cedric Krier
+ (C) 2008-2012 Bertrand Chenal
+ (C) 2008-2012 B2CK SPRL
License: GPL-3+
Files: icons/*
commit d3c5babac93a5fc2c7b43e06cc3dc44956fe43f2
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Tue Apr 24 19:30:55 2012 +0200
Merging upstream version 2.4.0.
diff --git a/CHANGELOG b/CHANGELOG
index 3ac4344..9c2ce5e 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,5 +1,8 @@
-Version 2.2.1 - 2011-12-26
+Version 2.4.0 - 2012-04-24
* Bug fixes (see mercurial logs for details)
+* Remove special uom search clause
+* New product types: Goods, Assets and Service
+* Category is no more required on product
Version 2.2.0 - 2011-10-24
* Bug fixes (see mercurial logs for details)
diff --git a/COPYRIGHT b/COPYRIGHT
index a9feb41..ede3fac 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.
Copyright (C) 2004-2008 Tiny SPRL.
This program is free software: you can redistribute it and/or modify
diff --git a/INSTALL b/INSTALL
index 851d837..b821262 100644
--- a/INSTALL
+++ b/INSTALL
@@ -4,7 +4,7 @@ Installing trytond_product
Prerequisites
-------------
- * Python 2.5 or later (http://www.python.org/)
+ * Python 2.6 or later (http://www.python.org/)
* trytond (http://www.tryton.org/)
Installation
diff --git a/PKG-INFO b/PKG-INFO
index 61b54f3..88b93a3 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,12 +1,12 @@
-Metadata-Version: 1.1
+Metadata-Version: 1.0
Name: trytond_product
-Version: 2.2.1
+Version: 2.4.0
Summary: Define products, categories of product, units of measure, categories of units of measure.
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 f07b229..5e6b936 100644
--- a/__init__.py
+++ b/__init__.py
@@ -1,6 +1,6 @@
#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 uom import *
-from category import *
-from product import *
+from .uom import *
+from .category import *
+from .product import *
diff --git a/__tryton__.py b/__tryton__.py
index 94e1f65..d1e768f 100644
--- a/__tryton__.py
+++ b/__tryton__.py
@@ -2,45 +2,57 @@
#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',
+ 'name': 'Product',
'name_bg_BG': 'Продукт',
+ 'name_ca_ES': 'Productes',
'name_de_DE': 'Artikel',
+ 'name_es_AR': 'Productos',
'name_es_CO': 'Productos',
- 'name_es_ES': 'Producto',
+ 'name_es_ES': 'Productos',
'name_fr_FR': 'Produit',
'name_nl_NL': 'Producten',
'name_ru_RU': 'ТМЦ',
- 'version' : '2.2.1',
- 'author' : 'B2CK',
+ 'version': '2.4.0',
+ 'author': 'B2CK',
'email': 'info at b2ck.com',
'website': 'http://www.tryton.org/',
'description': 'Define products, categories of product, units ' \
'of measure, categories of units of measure.',
'description_bg_BG': 'Задаване на продукти, категории продукти, мерни единици, категории мерни единици.',
+ 'description_ca_ES': '''Defineix productes, categories de producte, unitats
+de mesura, categories d'unitats de mesura.''',
'description_de_DE': 'Dient der Erstellung von Artikeln, Artikelkategorien, Maßeinheiten und Kategorien für Maßeinheiten.',
+ 'description_es_AR': '''Define:
+ - Productos
+ - CategorÃas de producto
+ - Unidades de medida
+ - CategorÃas de unidades de medida
+''',
'description_es_CO': 'Definición de productos, categorÃas de producto unidades de medida y categorÃas de unidades de medida',
- 'description_es_ES': 'Define productos, categorÃas de producto, unidades de medida y categorÃas de unidades de medida',
+ 'description_es_ES': 'Define productos, categorÃas de producto, unidades de medida y categorÃas de unidades de medida.',
'description_fr_FR': '''Défini:
- Produit
- Catégorie de produit
- Unité de mesure
- Catégorie d'unité de mesure
''',
- 'description_nl_NL': 'Definieert producten, productcategorieën, meeteenheden en categorieën van meeteenheden.',
+ 'description_nl_NL': 'Definieert producten, productcategorieën, meeteenheden en categorieën van meeteenheden.',
'description_ru_RU': 'Определение ТМЦ, категорий ТМЦ, единиц измерениÑ, категорий единиц измерениÑ.',
- 'depends' : [
+ 'depends': [
'ir',
'res',
],
- 'xml' : [
+ 'xml': [
'product.xml',
'category.xml',
'uom.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',
@@ -48,4 +60,3 @@
'locale/ru_RU.po',
]
}
-
diff --git a/category.py b/category.py
index db5df4c..40ebe0e 100644
--- a/category.py
+++ b/category.py
@@ -9,7 +9,7 @@ class Category(ModelSQL, ModelView):
_description = __doc__
name = fields.Char('Name', required=True, translate=True)
- parent = fields.Many2One('product.category','Parent', select=1)
+ parent = fields.Many2One('product.category', 'Parent', select=True)
childs = fields.One2Many('product.category', 'parent',
string='Children')
@@ -28,6 +28,7 @@ class Category(ModelSQL, ModelView):
if not ids:
return {}
res = {}
+
def _name(category):
if category.id in res:
return res[category.id]
diff --git a/doc/index.rst b/doc/index.rst
index 1df7b2a..2e9ab39 100644
--- a/doc/index.rst
+++ b/doc/index.rst
@@ -42,7 +42,7 @@ Template and Product.
The Product Template model contains the following fields:
- Name.
-- Type, whose value can be *Stockable*, *Consumable*, *Service*.
+- Type, whose value can be *Goods*, *Assets*, *Service*.
- Category.
- List Price, the default sale price expressed in the List Price UOM.
product.
diff --git a/locale/bg_BG.po b/locale/bg_BG.po
index 541d061..9815c43 100644
--- a/locale/bg_BG.po
+++ b/locale/bg_BG.po
@@ -2,12 +2,11 @@
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
-#, fuzzy
-msgctxt "error:product.category:0"
+msgctxt "error:product.category:"
msgid "You can not create recursive categories!"
msgstr "Ðе може да Ñъздавате взаимно вложени категории!"
-msgctxt "error:product.uom:0"
+msgctxt "error:product.uom:"
msgid ""
"If the UOM is still not used, you can delete it otherwise you can deactivate"
" it and create a new one."
@@ -15,148 +14,256 @@ msgstr ""
"Ðко мер. ед. вÑе още не Ñе ползват може да Ñ Ð¸Ð·Ñ‚Ñ€Ð¸ÐµÑ‚Ðµ, в противен Ñлучай "
"може да Ñ Ð´ÐµÐºÐ°Ñ‚Ð¸Ð²Ð¸Ñ€Ð°Ñ‚Ðµ и Ñъздадете нова."
-msgctxt "error:product.uom:0"
+msgctxt "error:product.uom:"
msgid "Invalid Factor and Rate values!"
msgstr "Ðевалиден ÑтойноÑти за фактор и отношение!"
-msgctxt "error:product.uom:0"
+msgctxt "error:product.uom:"
msgid "Rate and factor can not be both equal to zero."
msgstr "КурÑа и коефициента не може едновременно да Ñа нула."
-msgctxt "error:product.uom:0"
+msgctxt "error:product.uom:"
msgid "You cannot change Rate, Factor or Category on a Unit of Measure. "
msgstr ""
"За мерна единица не може да променате отношение, коефициент или категориÑ."
-msgctxt "field:product.category,childs:0"
+msgctxt "field:product.category,childs:"
msgid "Children"
msgstr "Деца"
-msgctxt "field:product.category,name:0"
+msgctxt "field:product.category,create_date:"
+msgid "Create Date"
+msgstr "Създадено на"
+
+msgctxt "field:product.category,create_uid:"
+msgid "Create User"
+msgstr "Създадено от"
+
+msgctxt "field:product.category,id:"
+msgid "ID"
+msgstr "ID"
+
+msgctxt "field:product.category,name:"
msgid "Name"
msgstr "Име"
-msgctxt "field:product.category,parent:0"
+msgctxt "field:product.category,parent:"
msgid "Parent"
msgstr "Родител"
-msgctxt "field:product.category,rec_name:0"
+msgctxt "field:product.category,rec_name:"
msgid "Name"
msgstr "Име"
-msgctxt "field:product.product,code:0"
+msgctxt "field:product.category,write_date:"
+msgid "Write Date"
+msgstr "Променено на"
+
+msgctxt "field:product.category,write_uid:"
+msgid "Write User"
+msgstr "Променено от"
+
+msgctxt "field:product.product,code:"
msgid "Code"
msgstr "Код"
-msgctxt "field:product.product,description:0"
+msgctxt "field:product.product,create_date:"
+msgid "Create Date"
+msgstr "Създадено на"
+
+msgctxt "field:product.product,create_uid:"
+msgid "Create User"
+msgstr "Създадено от"
+
+msgctxt "field:product.product,description:"
msgid "Description"
msgstr "ОпиÑание"
-msgctxt "field:product.product,rec_name:0"
+msgctxt "field:product.product,id:"
+msgid "ID"
+msgstr "ID"
+
+msgctxt "field:product.product,rec_name:"
msgid "Name"
msgstr "Име"
-msgctxt "field:product.product,template:0"
+msgctxt "field:product.product,template:"
msgid "Product Template"
msgstr "Щаблон за продукт"
-msgctxt "field:product.template,active:0"
+msgctxt "field:product.product,write_date:"
+msgid "Write Date"
+msgstr "Променено на"
+
+msgctxt "field:product.product,write_uid:"
+msgid "Write User"
+msgstr "Променено от"
+
+msgctxt "field:product.template,active:"
msgid "Active"
msgstr "Ðктивен"
-msgctxt "field:product.template,category:0"
+msgctxt "field:product.template,category:"
msgid "Category"
msgstr "КатегориÑ"
-msgctxt "field:product.template,cost_price:0"
+msgctxt "field:product.template,consumable:"
+msgid "Consumable"
+msgstr "КонÑуматив"
+
+msgctxt "field:product.template,cost_price:"
msgid "Cost Price"
msgstr "Фабрична цена"
-msgctxt "field:product.template,cost_price_method:0"
+msgctxt "field:product.template,cost_price_method:"
msgid "Cost Method"
msgstr "Ðачин на оÑтойноÑÑ‚Ñване"
-msgctxt "field:product.template,cost_price_uom:0"
+msgctxt "field:product.template,cost_price_uom:"
msgid "Cost Price"
msgstr "Фабрична цена"
-msgctxt "field:product.template,default_uom:0"
+msgctxt "field:product.template,create_date:"
+msgid "Create Date"
+msgstr "Създадено на"
+
+msgctxt "field:product.template,create_uid:"
+msgid "Create User"
+msgstr "Създадено от"
+
+msgctxt "field:product.template,default_uom:"
msgid "Default UOM"
msgstr "Мер. ед. по подрабиране"
-msgctxt "field:product.template,list_price:0"
+msgctxt "field:product.template,default_uom_category:"
+msgid "Default UOM Category"
+msgstr ""
+
+msgctxt "field:product.template,id:"
+msgid "ID"
+msgstr "ID"
+
+msgctxt "field:product.template,list_price:"
msgid "List Price"
msgstr "Каталожна цена"
-msgctxt "field:product.template,list_price_uom:0"
+msgctxt "field:product.template,list_price_uom:"
msgid "List Price"
msgstr "Каталожна цена"
-msgctxt "field:product.template,name:0"
+msgctxt "field:product.template,name:"
msgid "Name"
msgstr "Име"
-msgctxt "field:product.template,products:0"
+msgctxt "field:product.template,products:"
msgid "Products"
msgstr "Продукти"
-msgctxt "field:product.template,rec_name:0"
+msgctxt "field:product.template,rec_name:"
msgid "Name"
msgstr "Име"
-msgctxt "field:product.template,type:0"
+msgctxt "field:product.template,type:"
msgid "Type"
msgstr "Вид"
-msgctxt "field:product.uom,active:0"
+msgctxt "field:product.template,write_date:"
+msgid "Write Date"
+msgstr "Променено на"
+
+msgctxt "field:product.template,write_uid:"
+msgid "Write User"
+msgstr "Променено от"
+
+msgctxt "field:product.uom,active:"
msgid "Active"
msgstr "Ðктивен"
-msgctxt "field:product.uom,category:0"
+msgctxt "field:product.uom,category:"
msgid "UOM Category"
msgstr "ÐšÐ°Ñ‚ÐµÐ³Ð¾Ñ€Ð¸Ñ Ð¼ÐµÑ€. ед."
-msgctxt "field:product.uom,digits:0"
+msgctxt "field:product.uom,create_date:"
+msgid "Create Date"
+msgstr "Създадено на"
+
+msgctxt "field:product.uom,create_uid:"
+msgid "Create User"
+msgstr "Създадено от"
+
+msgctxt "field:product.uom,digits:"
msgid "Display Digits"
msgstr "Цифри за показване"
-msgctxt "field:product.uom,factor:0"
+msgctxt "field:product.uom,factor:"
msgid "Factor"
msgstr "Коефициент"
-msgctxt "field:product.uom,name:0"
+msgctxt "field:product.uom,id:"
+msgid "ID"
+msgstr "ID"
+
+msgctxt "field:product.uom,name:"
msgid "Name"
msgstr "Име"
-msgctxt "field:product.uom,rate:0"
+msgctxt "field:product.uom,rate:"
msgid "Rate"
msgstr "Отношение"
-msgctxt "field:product.uom,rec_name:0"
+msgctxt "field:product.uom,rec_name:"
msgid "Name"
msgstr "Име"
-msgctxt "field:product.uom,rounding:0"
+msgctxt "field:product.uom,rounding:"
msgid "Rounding Precision"
msgstr "ТочноÑÑ‚ на закръгление"
-msgctxt "field:product.uom,symbol:0"
+msgctxt "field:product.uom,symbol:"
msgid "Symbol"
msgstr "Символ"
-msgctxt "field:product.uom.category,name:0"
+msgctxt "field:product.uom,write_date:"
+msgid "Write Date"
+msgstr "Променено на"
+
+msgctxt "field:product.uom,write_uid:"
+msgid "Write User"
+msgstr "Променено от"
+
+msgctxt "field:product.uom.category,create_date:"
+msgid "Create Date"
+msgstr "Създадено на"
+
+msgctxt "field:product.uom.category,create_uid:"
+msgid "Create User"
+msgstr "Създадено от"
+
+msgctxt "field:product.uom.category,id:"
+msgid "ID"
+msgstr "ID"
+
+msgctxt "field:product.uom.category,name:"
msgid "Name"
msgstr "Име"
-msgctxt "field:product.uom.category,rec_name:0"
+msgctxt "field:product.uom.category,rec_name:"
msgid "Name"
msgstr "Име"
-msgctxt "field:product.uom.category,uoms:0"
+msgctxt "field:product.uom.category,uoms:"
msgid "Unit of Measures"
msgstr "Мерни единици"
-msgctxt "help:product.uom,factor:0"
+msgctxt "field:product.uom.category,write_date:"
+msgid "Write Date"
+msgstr "Променено на"
+
+msgctxt "field:product.uom.category,write_uid:"
+msgid "Write User"
+msgstr "Променено от"
+
+msgctxt "help:product.uom,factor:"
msgid ""
"The coefficient for the formula:\n"
"coef (base unit) = 1 (this unit)"
@@ -164,7 +271,7 @@ msgstr ""
"Коефициент в тази формула:\n"
"1 (баз. единица) = коеф. (тази единица)"
-msgctxt "help:product.uom,rate:0"
+msgctxt "help:product.uom,rate:"
msgid ""
"The coefficient for the formula:\n"
"1 (base unit) = coef (this unit)"
@@ -172,7 +279,6 @@ msgstr ""
"Коефициент в тази формула:\n"
"1 (баз. единица) = коеф. (тази единица)"
-#, fuzzy
msgctxt "model:ir.action,name:act_category_list"
msgid "Categories"
msgstr "Категории"
@@ -197,7 +303,6 @@ msgctxt "model:ir.action,name:act_uom_form"
msgid "Units of Measure"
msgstr "Мерни едниници"
-#, fuzzy
msgctxt "model:ir.ui.menu,name:menu_category_list"
msgid "Categories"
msgstr "Категории"
@@ -222,19 +327,19 @@ msgctxt "model:ir.ui.menu,name:menu_uom_form"
msgid "Units of Measure"
msgstr "Мерни едниници"
-msgctxt "model:product.category,name:0"
+msgctxt "model:product.category,name:"
msgid "Product Category"
msgstr "ÐšÐ°Ñ‚ÐµÐ³Ð¾Ñ€Ð¸Ñ Ð½Ð° продукт"
-msgctxt "model:product.product,name:0"
+msgctxt "model:product.product,name:"
msgid "Product"
msgstr "Продукт"
-msgctxt "model:product.template,name:0"
+msgctxt "model:product.template,name:"
msgid "Product Template"
msgstr "Щаблон за продукт"
-msgctxt "model:product.uom,name:0"
+msgctxt "model:product.uom,name:"
msgid "Unit of measure"
msgstr "Мерна единица"
@@ -494,7 +599,7 @@ msgctxt "model:product.uom,symbol:uom_yard"
msgid "yd"
msgstr "yd"
-msgctxt "model:product.uom.category,name:0"
+msgctxt "model:product.uom.category,name:"
msgid "Product uom category"
msgstr "ÐšÐ°Ñ‚ÐµÐ³Ð¾Ñ€Ð¸Ñ Ð¼ÐµÑ€. ед. на продукт"
@@ -526,66 +631,66 @@ msgctxt "model:res.group,name:group_product_admin"
msgid "Product Administration"
msgstr "Управление на продукти"
-msgctxt "selection:product.template,cost_price_method:0"
+msgctxt "selection:product.template,cost_price_method:"
msgid "Average"
msgstr "Средна"
-msgctxt "selection:product.template,cost_price_method:0"
+msgctxt "selection:product.template,cost_price_method:"
msgid "Fixed"
msgstr "ФикÑирана"
-msgctxt "selection:product.template,type:0"
-msgid "Consumable"
-msgstr "КонÑуматив"
+msgctxt "selection:product.template,type:"
+msgid "Assets"
+msgstr ""
+
+msgctxt "selection:product.template,type:"
+msgid "Goods"
+msgstr ""
-msgctxt "selection:product.template,type:0"
+msgctxt "selection:product.template,type:"
msgid "Service"
msgstr "УÑлуга"
-msgctxt "selection:product.template,type:0"
-msgid "Stockable"
-msgstr "Складируем"
-
-msgctxt "view:product.category:0"
+msgctxt "view:product.category:"
msgid "Children"
msgstr "Деца"
-msgctxt "view:product.category:0"
+msgctxt "view:product.category:"
msgid "Product Categories"
msgstr "Категории продукти"
-msgctxt "view:product.category:0"
+msgctxt "view:product.category:"
msgid "Product Category"
msgstr "ÐšÐ°Ñ‚ÐµÐ³Ð¾Ñ€Ð¸Ñ Ð½Ð° продукт"
-msgctxt "view:product.product:0"
+msgctxt "view:product.product:"
msgid "Products"
msgstr "Продукти"
-msgctxt "view:product.template:0"
+msgctxt "view:product.template:"
msgid "General"
msgstr "ОÑновен"
-msgctxt "view:product.template:0"
+msgctxt "view:product.template:"
msgid "Product Template"
msgstr "Щаблон за продукт"
-msgctxt "view:product.template:0"
+msgctxt "view:product.template:"
msgid "Product Templates"
msgstr "Шаблони на продукти"
-msgctxt "view:product.uom.category:0"
+msgctxt "view:product.uom.category:"
msgid "Categories of Unit of Measure"
msgstr "Категории мер. ед."
-msgctxt "view:product.uom.category:0"
+msgctxt "view:product.uom.category:"
msgid "Category of Unit of Measure"
msgstr "ÐšÐ°Ñ‚ÐµÐ³Ð¾Ñ€Ð¸Ñ Ð¼ÐµÑ€Ð½Ð¸ единици"
-msgctxt "view:product.uom:0"
+msgctxt "view:product.uom:"
msgid "Unit of Measure"
msgstr "Мерни единици"
-msgctxt "view:product.uom:0"
+msgctxt "view:product.uom:"
msgid "Units of Measure"
msgstr "Мерни едниници"
diff --git a/locale/es_ES.po b/locale/ca_ES.po
similarity index 51%
copy from locale/es_ES.po
copy to locale/ca_ES.po
index c32bb98..9654194 100644
--- a/locale/es_ES.po
+++ b/locale/ca_ES.po
@@ -3,289 +3,402 @@ msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
#, fuzzy
-msgctxt "error:product.category:0"
+msgctxt "error:product.category:"
msgid "You can not create recursive categories!"
-msgstr "No puede crear categorÃas recursivas"
+msgstr "No pot crear categories recursives"
-msgctxt "error:product.uom:0"
+msgctxt "error:product.uom:"
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 "
-"desactivarla y crear una nueva."
+"Si no s'ha usat la UdM, pot esborrar-la, en cas contrari, pot desactivar-la "
+"i crear-ne una de nova."
-msgctxt "error:product.uom:0"
+msgctxt "error:product.uom:"
msgid "Invalid Factor and Rate values!"
msgstr ""
-msgctxt "error:product.uom:0"
+msgctxt "error:product.uom:"
msgid "Rate and factor can not be both equal to zero."
-msgstr "Conversión y factor no pueden ser cero simultáneamente."
+msgstr "Conversió i factor no poden ser zero simultà niament."
-msgctxt "error:product.uom:0"
+msgctxt "error:product.uom:"
msgid "You cannot change Rate, Factor or Category on a Unit of Measure. "
msgstr ""
-"No puede cambiar la conversión, el factor o la categorÃa de una unidad de "
-"medida."
+"No pot canviar la conversió, el factor o la categoria d'una unitat de "
+"mesura."
-msgctxt "field:product.category,childs:0"
+msgctxt "field:product.category,childs:"
msgid "Children"
-msgstr "Hijos"
+msgstr "Fills"
-msgctxt "field:product.category,name:0"
+msgctxt "field:product.category,create_date:"
+msgid "Create Date"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:product.category,create_uid:"
+msgid "Create User"
+msgstr "Crear usuari"
+
+msgctxt "field:product.category,id:"
+msgid "ID"
+msgstr ""
+
+msgctxt "field:product.category,name:"
msgid "Name"
-msgstr "Nombre"
+msgstr "Nom"
-msgctxt "field:product.category,parent:0"
+msgctxt "field:product.category,parent:"
msgid "Parent"
-msgstr "Padre"
+msgstr "Pare"
-msgctxt "field:product.category,rec_name:0"
+msgctxt "field:product.category,rec_name:"
msgid "Name"
-msgstr "Nombre"
+msgstr "Nom"
+
+msgctxt "field:product.category,write_date:"
+msgid "Write Date"
+msgstr ""
-msgctxt "field:product.product,code:0"
+msgctxt "field:product.category,write_uid:"
+msgid "Write User"
+msgstr ""
+
+msgctxt "field:product.product,code:"
msgid "Code"
-msgstr "Código"
+msgstr "Codi"
+
+msgctxt "field:product.product,create_date:"
+msgid "Create Date"
+msgstr ""
-msgctxt "field:product.product,description:0"
+#, fuzzy
+msgctxt "field:product.product,create_uid:"
+msgid "Create User"
+msgstr "Crear usuari"
+
+msgctxt "field:product.product,description:"
msgid "Description"
-msgstr "Descripción"
+msgstr "Descripció"
+
+msgctxt "field:product.product,id:"
+msgid "ID"
+msgstr ""
-msgctxt "field:product.product,rec_name:0"
+msgctxt "field:product.product,rec_name:"
msgid "Name"
-msgstr "Nombre"
+msgstr "Nom"
-msgctxt "field:product.product,template:0"
+msgctxt "field:product.product,template:"
msgid "Product Template"
-msgstr "Plantilla de producto"
+msgstr "Plantilla de producte"
+
+msgctxt "field:product.product,write_date:"
+msgid "Write Date"
+msgstr ""
+
+msgctxt "field:product.product,write_uid:"
+msgid "Write User"
+msgstr ""
-msgctxt "field:product.template,active:0"
+msgctxt "field:product.template,active:"
msgid "Active"
-msgstr "Activo"
+msgstr "Actiu"
-msgctxt "field:product.template,category:0"
+msgctxt "field:product.template,category:"
msgid "Category"
-msgstr "CategorÃa"
+msgstr "Categoria"
+
+msgctxt "field:product.template,consumable:"
+msgid "Consumable"
+msgstr ""
-msgctxt "field:product.template,cost_price:0"
+msgctxt "field:product.template,cost_price:"
msgid "Cost Price"
-msgstr "Precio de coste"
+msgstr "Preu de cost"
-msgctxt "field:product.template,cost_price_method:0"
+msgctxt "field:product.template,cost_price_method:"
msgid "Cost Method"
-msgstr "Método de coste"
+msgstr "Mètode de cost"
-msgctxt "field:product.template,cost_price_uom:0"
+msgctxt "field:product.template,cost_price_uom:"
msgid "Cost Price"
-msgstr "Precio de coste"
+msgstr "Preu de cost"
-msgctxt "field:product.template,default_uom:0"
+msgctxt "field:product.template,create_date:"
+msgid "Create Date"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:product.template,create_uid:"
+msgid "Create User"
+msgstr "Crear usuari"
+
+msgctxt "field:product.template,default_uom:"
msgid "Default UOM"
msgstr "UdM predeterminada"
-msgctxt "field:product.template,list_price:0"
+msgctxt "field:product.template,default_uom_category:"
+msgid "Default UOM Category"
+msgstr ""
+
+msgctxt "field:product.template,id:"
+msgid "ID"
+msgstr ""
+
+msgctxt "field:product.template,list_price:"
msgid "List Price"
-msgstr "Precio de lista"
+msgstr "Preu de llista"
-msgctxt "field:product.template,list_price_uom:0"
+msgctxt "field:product.template,list_price_uom:"
msgid "List Price"
-msgstr "Precio de lista"
+msgstr "Preu de llista"
-msgctxt "field:product.template,name:0"
+msgctxt "field:product.template,name:"
msgid "Name"
-msgstr "Nombre"
+msgstr "Nom"
-msgctxt "field:product.template,products:0"
+msgctxt "field:product.template,products:"
msgid "Products"
-msgstr "Productos"
+msgstr "Productes"
-msgctxt "field:product.template,rec_name:0"
+msgctxt "field:product.template,rec_name:"
msgid "Name"
-msgstr "Nombre"
+msgstr "Nom"
-msgctxt "field:product.template,type:0"
+msgctxt "field:product.template,type:"
msgid "Type"
-msgstr "Tipo"
+msgstr "Tipus"
+
+msgctxt "field:product.template,write_date:"
+msgid "Write Date"
+msgstr ""
+
+msgctxt "field:product.template,write_uid:"
+msgid "Write User"
+msgstr ""
-msgctxt "field:product.uom,active:0"
+msgctxt "field:product.uom,active:"
msgid "Active"
-msgstr "Activo"
+msgstr "Actiu"
-msgctxt "field:product.uom,category:0"
+msgctxt "field:product.uom,category:"
msgid "UOM Category"
-msgstr "CategorÃa de UdM"
+msgstr "Categoria d'UdM"
+
+msgctxt "field:product.uom,create_date:"
+msgid "Create Date"
+msgstr ""
-msgctxt "field:product.uom,digits:0"
+#, fuzzy
+msgctxt "field:product.uom,create_uid:"
+msgid "Create User"
+msgstr "Crear usuari"
+
+msgctxt "field:product.uom,digits:"
msgid "Display Digits"
-msgstr "Decimales a mostrar"
+msgstr "Decimals a mostrar"
-msgctxt "field:product.uom,factor:0"
+msgctxt "field:product.uom,factor:"
msgid "Factor"
msgstr "Factor"
-msgctxt "field:product.uom,name:0"
+msgctxt "field:product.uom,id:"
+msgid "ID"
+msgstr ""
+
+msgctxt "field:product.uom,name:"
msgid "Name"
-msgstr "Nombre"
+msgstr "Nom"
-msgctxt "field:product.uom,rate:0"
+msgctxt "field:product.uom,rate:"
msgid "Rate"
-msgstr "Conversión"
+msgstr "Conversió"
-msgctxt "field:product.uom,rec_name:0"
+msgctxt "field:product.uom,rec_name:"
msgid "Name"
-msgstr "Nombre"
+msgstr "Nom"
-msgctxt "field:product.uom,rounding:0"
+msgctxt "field:product.uom,rounding:"
msgid "Rounding Precision"
-msgstr "Precisión de redondeo"
+msgstr "Precisió d'arrodoniment"
-msgctxt "field:product.uom,symbol:0"
+msgctxt "field:product.uom,symbol:"
msgid "Symbol"
-msgstr "SÃmbolo"
+msgstr "SÃmbol"
+
+msgctxt "field:product.uom,write_date:"
+msgid "Write Date"
+msgstr ""
+
+msgctxt "field:product.uom,write_uid:"
+msgid "Write User"
+msgstr ""
-msgctxt "field:product.uom.category,name:0"
+msgctxt "field:product.uom.category,create_date:"
+msgid "Create Date"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:product.uom.category,create_uid:"
+msgid "Create User"
+msgstr "Crear usuari"
+
+msgctxt "field:product.uom.category,id:"
+msgid "ID"
+msgstr ""
+
+msgctxt "field:product.uom.category,name:"
msgid "Name"
-msgstr "Nombre"
+msgstr "Nom"
-msgctxt "field:product.uom.category,rec_name:0"
+msgctxt "field:product.uom.category,rec_name:"
msgid "Name"
-msgstr "Nombre"
+msgstr "Nom"
-msgctxt "field:product.uom.category,uoms:0"
+msgctxt "field:product.uom.category,uoms:"
msgid "Unit of Measures"
-msgstr "Unidades de medidas"
+msgstr "Unitats de mesura"
+
+msgctxt "field:product.uom.category,write_date:"
+msgid "Write Date"
+msgstr ""
-msgctxt "help:product.uom,factor:0"
+msgctxt "field:product.uom.category,write_uid:"
+msgid "Write User"
+msgstr ""
+
+msgctxt "help:product.uom,factor:"
msgid ""
"The coefficient for the formula:\n"
"coef (base unit) = 1 (this unit)"
msgstr ""
-"El coeficiente de la fórmula:\n"
-"coeficiente (unidad base) = 1 (esta unidad)"
+"El coeficient de la fórmula:\n"
+"coeficient (unitat base) = 1 (aquesta unitat)"
-msgctxt "help:product.uom,rate:0"
+msgctxt "help:product.uom,rate:"
msgid ""
"The coefficient for the formula:\n"
"1 (base unit) = coef (this unit)"
msgstr ""
-"El coeficiente de la fórmula:\n"
-"1 (unidad base) = coeficiente (esta unidad)"
+"El coeficient de la fórmula:\n"
+"1 (unitat base) = coeficient (aquesta unitat)"
#, fuzzy
msgctxt "model:ir.action,name:act_category_list"
msgid "Categories"
-msgstr "CategorÃas"
+msgstr "Categories"
msgctxt "model:ir.action,name:act_category_tree"
msgid "Categories"
-msgstr "CategorÃas"
+msgstr "Categories"
msgctxt "model:ir.action,name:act_product_by_category"
msgid "Product by Category"
-msgstr "Producto por categorÃa"
+msgstr "Producte per categoria"
msgctxt "model:ir.action,name:act_product_form"
msgid "Products"
-msgstr "Productos"
+msgstr "Productes"
msgctxt "model:ir.action,name:act_uom_category_form"
msgid "Categories of Unit of Measure"
-msgstr "CategorÃas de la unidad de medida"
+msgstr "Categories de la unitat de mesura"
msgctxt "model:ir.action,name:act_uom_form"
msgid "Units of Measure"
-msgstr "Unidades de medida"
+msgstr "Unitats de mesura"
#, fuzzy
msgctxt "model:ir.ui.menu,name:menu_category_list"
msgid "Categories"
-msgstr "CategorÃas"
+msgstr "Categories"
msgctxt "model:ir.ui.menu,name:menu_category_tree"
msgid "Categories"
-msgstr "CategorÃas"
+msgstr "Categories"
msgctxt "model:ir.ui.menu,name:menu_main_product"
msgid "Product"
-msgstr "Producto"
+msgstr "Producte"
msgctxt "model:ir.ui.menu,name:menu_product_product"
msgid "Products"
-msgstr "Productos"
+msgstr "Productes"
msgctxt "model:ir.ui.menu,name:menu_uom_category_form"
msgid "Categories"
-msgstr "CategorÃas"
+msgstr "Categories"
msgctxt "model:ir.ui.menu,name:menu_uom_form"
msgid "Units of Measure"
-msgstr "Unidades de medida"
+msgstr "Unitats de mesura"
-msgctxt "model:product.category,name:0"
+msgctxt "model:product.category,name:"
msgid "Product Category"
-msgstr "CategorÃa de producto"
+msgstr "Categoria de producte"
-msgctxt "model:product.product,name:0"
+msgctxt "model:product.product,name:"
msgid "Product"
-msgstr "Producto"
+msgstr "Producte"
-msgctxt "model:product.template,name:0"
+msgctxt "model:product.template,name:"
msgid "Product Template"
-msgstr "Plantilla de producto"
+msgstr "Plantilla de producte"
-msgctxt "model:product.uom,name:0"
+msgctxt "model:product.uom,name:"
msgid "Unit of measure"
-msgstr "Unidad de medida"
+msgstr "Unitat de mesura"
msgctxt "model:product.uom,name:uom_are"
msgid "Are"
-msgstr "Ãrea"
+msgstr "Àrea"
msgctxt "model:product.uom,name:uom_carat"
msgid "Carat"
-msgstr "Quilate"
+msgstr "Quirat"
msgctxt "model:product.uom,name:uom_centimeter"
msgid "centimeter"
-msgstr "centÃmetro"
+msgstr "centÃmetre"
msgctxt "model:product.uom,name:uom_cubic_centimeter"
msgid "Cubic centimeter"
-msgstr "CentÃmetro cúbico"
+msgstr "CentÃmetre cúbic"
msgctxt "model:product.uom,name:uom_cubic_foot"
msgid "Cubic foot"
-msgstr "Pie cúbico"
+msgstr "Peu cúbic"
msgctxt "model:product.uom,name:uom_cubic_inch"
msgid "Cubic inch"
-msgstr "Pulgada cúbica"
+msgstr "Polzada cúbica"
msgctxt "model:product.uom,name:uom_cubic_meter"
msgid "Cubic meter"
-msgstr "Metro cúbico"
+msgstr "Metre cúbic"
msgctxt "model:product.uom,name:uom_day"
msgid "Day"
-msgstr "DÃa"
+msgstr "Dia"
msgctxt "model:product.uom,name:uom_foot"
msgid "Foot"
-msgstr "Pie"
+msgstr "Peu"
msgctxt "model:product.uom,name:uom_gallon"
msgid "Gallon"
-msgstr "Galón"
+msgstr "Galó"
msgctxt "model:product.uom,name:uom_gram"
msgid "Gram"
-msgstr "Gramo"
+msgstr "Gram"
msgctxt "model:product.uom,name:uom_hectare"
msgid "Hectare"
-msgstr "Hectárea"
+msgstr "Hectà rea"
msgctxt "model:product.uom,name:uom_hour"
msgid "Hour"
@@ -293,23 +406,23 @@ msgstr "Hora"
msgctxt "model:product.uom,name:uom_inch"
msgid "Inch"
-msgstr "Pulgada"
+msgstr "Polzada"
msgctxt "model:product.uom,name:uom_kilogram"
msgid "Kilogram"
-msgstr "Kilogramo"
+msgstr "Quilogram"
msgctxt "model:product.uom,name:uom_kilometer"
msgid "Kilometer"
-msgstr "Kilómetro"
+msgstr "Quilòmetre"
msgctxt "model:product.uom,name:uom_liter"
msgid "Liter"
-msgstr "Litro"
+msgstr "Litre"
msgctxt "model:product.uom,name:uom_meter"
msgid "Meter"
-msgstr "Metro"
+msgstr "Metre"
msgctxt "model:product.uom,name:uom_mile"
msgid "Mile"
@@ -317,55 +430,55 @@ msgstr "Milla"
msgctxt "model:product.uom,name:uom_millimeter"
msgid "Millimeter"
-msgstr "MilÃmetro"
+msgstr "Mil·lÃmetre"
msgctxt "model:product.uom,name:uom_minute"
msgid "Minute"
-msgstr "Minuto"
+msgstr "Minut"
msgctxt "model:product.uom,name:uom_ounce"
msgid "Ounce"
-msgstr "Onza"
+msgstr "Unça"
msgctxt "model:product.uom,name:uom_pound"
msgid "Pound"
-msgstr "Libra"
+msgstr "Lliura"
msgctxt "model:product.uom,name:uom_second"
msgid "Second"
-msgstr "Segundo"
+msgstr "Segon"
msgctxt "model:product.uom,name:uom_square_centimeter"
msgid "Square centimeter"
-msgstr "CentÃmetro cuadrado"
+msgstr "CentÃmetre quadrat"
msgctxt "model:product.uom,name:uom_square_foot"
msgid "Square foot"
-msgstr "Pie cuadrado"
+msgstr "Peu quadrat"
msgctxt "model:product.uom,name:uom_square_inch"
msgid "Square inch"
-msgstr "Pulgada cuadrada"
+msgstr "Polzada quadrada"
msgctxt "model:product.uom,name:uom_square_meter"
msgid "Square meter"
-msgstr "Metro cuadrado"
+msgstr "Metre quadrat"
msgctxt "model:product.uom,name:uom_square_yard"
msgid "Square yard"
-msgstr "Yarda cuadrada"
+msgstr "Iarda quadrada"
msgctxt "model:product.uom,name:uom_unit"
msgid "Unit"
-msgstr "Unidad"
+msgstr "Unitat"
msgctxt "model:product.uom,name:uom_work_day"
msgid "Work Day"
-msgstr "DÃa de trabajo"
+msgstr "Dia de treball"
msgctxt "model:product.uom,name:uom_yard"
msgid "Yard"
-msgstr "Yarda"
+msgstr "Iarda"
msgctxt "model:product.uom,symbol:uom_are"
msgid "a"
@@ -385,7 +498,7 @@ msgstr "cm³"
msgctxt "model:product.uom,symbol:uom_cubic_foot"
msgid "ft³"
-msgstr "pie³"
+msgstr "peu³"
msgctxt "model:product.uom,symbol:uom_cubic_inch"
msgid "in³"
@@ -401,7 +514,7 @@ msgstr "d"
msgctxt "model:product.uom,symbol:uom_foot"
msgid "ft"
-msgstr "pie"
+msgstr "peu"
msgctxt "model:product.uom,symbol:uom_gallon"
msgid "gal"
@@ -469,7 +582,7 @@ msgstr "cm²"
msgctxt "model:product.uom,symbol:uom_square_foot"
msgid "ft²"
-msgstr "pie²"
+msgstr "peu²"
msgctxt "model:product.uom,symbol:uom_square_inch"
msgid "in²"
@@ -485,7 +598,7 @@ msgstr "yd²"
msgctxt "model:product.uom,symbol:uom_unit"
msgid "u"
-msgstr "u"
+msgstr "o"
msgctxt "model:product.uom,symbol:uom_work_day"
msgid "wd"
@@ -495,9 +608,9 @@ msgctxt "model:product.uom,symbol:uom_yard"
msgid "yd"
msgstr "yd"
-msgctxt "model:product.uom.category,name:0"
+msgctxt "model:product.uom.category,name:"
msgid "Product uom category"
-msgstr "CategorÃa de UdM de producto"
+msgstr "Categoria d'UdM de producte"
msgctxt "model:product.uom.category,name:uom_cat_length"
msgid "Length"
@@ -505,100 +618,100 @@ msgstr "Longitud"
msgctxt "model:product.uom.category,name:uom_cat_surface"
msgid "Surface"
-msgstr "Superficie"
+msgstr "SuperfÃcie"
msgctxt "model:product.uom.category,name:uom_cat_time"
msgid "Time"
-msgstr "Tiempo"
+msgstr "Temps"
msgctxt "model:product.uom.category,name:uom_cat_unit"
msgid "Units"
-msgstr "Unidades"
+msgstr "Unitats"
msgctxt "model:product.uom.category,name:uom_cat_volume"
msgid "Volume"
-msgstr "Volumen"
+msgstr "Volum"
msgctxt "model:product.uom.category,name:uom_cat_weight"
msgid "Weight"
-msgstr "Peso"
+msgstr "Pes"
msgctxt "model:res.group,name:group_product_admin"
msgid "Product Administration"
-msgstr "Administración de productos"
+msgstr "Administració de productes"
-msgctxt "selection:product.template,cost_price_method:0"
+msgctxt "selection:product.template,cost_price_method:"
msgid "Average"
-msgstr "Promedio"
+msgstr "Mitjana"
-msgctxt "selection:product.template,cost_price_method:0"
+msgctxt "selection:product.template,cost_price_method:"
msgid "Fixed"
-msgstr "Fijo"
+msgstr "Fix"
-msgctxt "selection:product.template,type:0"
-msgid "Consumable"
-msgstr "Consumible"
+msgctxt "selection:product.template,type:"
+msgid "Assets"
+msgstr ""
-msgctxt "selection:product.template,type:0"
-msgid "Service"
-msgstr "Servicio"
+msgctxt "selection:product.template,type:"
+msgid "Goods"
+msgstr ""
-msgctxt "selection:product.template,type:0"
-msgid "Stockable"
-msgstr "Almacenable"
+msgctxt "selection:product.template,type:"
+msgid "Service"
+msgstr "Servei"
-msgctxt "view:product.category:0"
+msgctxt "view:product.category:"
msgid "Children"
-msgstr "Hijos"
+msgstr "Fills"
-msgctxt "view:product.category:0"
+msgctxt "view:product.category:"
msgid "Product Categories"
-msgstr "CategorÃas de producto"
+msgstr "Categories de producte"
-msgctxt "view:product.category:0"
+msgctxt "view:product.category:"
msgid "Product Category"
-msgstr "CategorÃa de producto"
+msgstr "Categoria de producte"
-msgctxt "view:product.product:0"
+msgctxt "view:product.product:"
msgid "General"
msgstr "General"
-msgctxt "view:product.product:0"
+msgctxt "view:product.product:"
msgid "Product"
-msgstr "Producto"
+msgstr "Producte"
-msgctxt "view:product.product:0"
+msgctxt "view:product.product:"
msgid "Product Suppliers"
-msgstr "Proveedores de productos"
+msgstr "Proveïdors de productes"
-msgctxt "view:product.product:0"
+msgctxt "view:product.product:"
msgid "Products"
-msgstr "Productos"
+msgstr "Productes"
-msgctxt "view:product.template:0"
+msgctxt "view:product.template:"
msgid "General"
msgstr "General"
-msgctxt "view:product.template:0"
+msgctxt "view:product.template:"
msgid "Product Template"
-msgstr "Plantilla de producto"
+msgstr "Plantilla de producte"
-msgctxt "view:product.template:0"
+msgctxt "view:product.template:"
msgid "Product Templates"
-msgstr "Plantillas de producto"
+msgstr "Plantilles de producte"
-msgctxt "view:product.uom.category:0"
+msgctxt "view:product.uom.category:"
msgid "Categories of Unit of Measure"
-msgstr "CategorÃas de unidades de medida"
+msgstr "Categories d'unitats de mesura"
-msgctxt "view:product.uom.category:0"
+msgctxt "view:product.uom.category:"
msgid "Category of Unit of Measure"
-msgstr "CategorÃa de unidad de medida"
+msgstr "Categoria d'unitat de mesura"
-msgctxt "view:product.uom:0"
+msgctxt "view:product.uom:"
msgid "Unit of Measure"
-msgstr "Unidad de medida"
+msgstr "Unitat de mesura"
-msgctxt "view:product.uom:0"
+msgctxt "view:product.uom:"
msgid "Units of Measure"
-msgstr "Unidades de medida"
+msgstr "Unitats de mesura"
diff --git a/locale/cs_CZ.po b/locale/cs_CZ.po
index 7fd07b2..f774c9e 100644
--- a/locale/cs_CZ.po
+++ b/locale/cs_CZ.po
@@ -2,163 +2,271 @@
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
-msgctxt "error:product.category:0"
+msgctxt "error:product.category:"
msgid "You can not create recursive categories!"
msgstr ""
-msgctxt "error:product.uom:0"
+msgctxt "error:product.uom:"
msgid ""
"If the UOM is still not used, you can delete it otherwise you can deactivate"
" it and create a new one."
msgstr ""
-msgctxt "error:product.uom:0"
+msgctxt "error:product.uom:"
msgid "Invalid Factor and Rate values!"
msgstr ""
-msgctxt "error:product.uom:0"
+msgctxt "error:product.uom:"
msgid "Rate and factor can not be both equal to zero."
msgstr ""
-msgctxt "error:product.uom:0"
+msgctxt "error:product.uom:"
msgid "You cannot change Rate, Factor or Category on a Unit of Measure. "
msgstr ""
-msgctxt "field:product.category,childs:0"
+msgctxt "field:product.category,childs:"
msgid "Children"
msgstr ""
-msgctxt "field:product.category,name:0"
+msgctxt "field:product.category,create_date:"
+msgid "Create Date"
+msgstr ""
+
+msgctxt "field:product.category,create_uid:"
+msgid "Create User"
+msgstr ""
+
+msgctxt "field:product.category,id:"
+msgid "ID"
+msgstr ""
+
+msgctxt "field:product.category,name:"
msgid "Name"
msgstr ""
-msgctxt "field:product.category,parent:0"
+msgctxt "field:product.category,parent:"
msgid "Parent"
msgstr ""
-msgctxt "field:product.category,rec_name:0"
+msgctxt "field:product.category,rec_name:"
msgid "Name"
msgstr ""
-msgctxt "field:product.product,code:0"
+msgctxt "field:product.category,write_date:"
+msgid "Write Date"
+msgstr ""
+
+msgctxt "field:product.category,write_uid:"
+msgid "Write User"
+msgstr ""
+
+msgctxt "field:product.product,code:"
msgid "Code"
msgstr ""
-msgctxt "field:product.product,description:0"
+msgctxt "field:product.product,create_date:"
+msgid "Create Date"
+msgstr ""
+
+msgctxt "field:product.product,create_uid:"
+msgid "Create User"
+msgstr ""
+
+msgctxt "field:product.product,description:"
msgid "Description"
msgstr ""
-msgctxt "field:product.product,rec_name:0"
+msgctxt "field:product.product,id:"
+msgid "ID"
+msgstr ""
+
+msgctxt "field:product.product,rec_name:"
msgid "Name"
msgstr ""
-msgctxt "field:product.product,template:0"
+msgctxt "field:product.product,template:"
msgid "Product Template"
msgstr ""
-msgctxt "field:product.template,active:0"
+msgctxt "field:product.product,write_date:"
+msgid "Write Date"
+msgstr ""
+
+msgctxt "field:product.product,write_uid:"
+msgid "Write User"
+msgstr ""
+
+msgctxt "field:product.template,active:"
msgid "Active"
msgstr ""
-msgctxt "field:product.template,category:0"
+msgctxt "field:product.template,category:"
msgid "Category"
msgstr ""
-msgctxt "field:product.template,cost_price:0"
+msgctxt "field:product.template,consumable:"
+msgid "Consumable"
+msgstr ""
+
+msgctxt "field:product.template,cost_price:"
msgid "Cost Price"
msgstr ""
-msgctxt "field:product.template,cost_price_method:0"
+msgctxt "field:product.template,cost_price_method:"
msgid "Cost Method"
msgstr ""
-msgctxt "field:product.template,cost_price_uom:0"
+msgctxt "field:product.template,cost_price_uom:"
msgid "Cost Price"
msgstr ""
-msgctxt "field:product.template,default_uom:0"
+msgctxt "field:product.template,create_date:"
+msgid "Create Date"
+msgstr ""
+
+msgctxt "field:product.template,create_uid:"
+msgid "Create User"
+msgstr ""
+
+msgctxt "field:product.template,default_uom:"
msgid "Default UOM"
msgstr ""
-msgctxt "field:product.template,list_price:0"
+msgctxt "field:product.template,default_uom_category:"
+msgid "Default UOM Category"
+msgstr ""
+
+msgctxt "field:product.template,id:"
+msgid "ID"
+msgstr ""
+
+msgctxt "field:product.template,list_price:"
msgid "List Price"
msgstr ""
-msgctxt "field:product.template,list_price_uom:0"
+msgctxt "field:product.template,list_price_uom:"
msgid "List Price"
msgstr ""
-msgctxt "field:product.template,name:0"
+msgctxt "field:product.template,name:"
msgid "Name"
msgstr ""
-msgctxt "field:product.template,products:0"
+msgctxt "field:product.template,products:"
msgid "Products"
msgstr ""
-msgctxt "field:product.template,rec_name:0"
+msgctxt "field:product.template,rec_name:"
msgid "Name"
msgstr ""
-msgctxt "field:product.template,type:0"
+msgctxt "field:product.template,type:"
msgid "Type"
msgstr ""
-msgctxt "field:product.uom,active:0"
+msgctxt "field:product.template,write_date:"
+msgid "Write Date"
+msgstr ""
+
+msgctxt "field:product.template,write_uid:"
+msgid "Write User"
+msgstr ""
+
+msgctxt "field:product.uom,active:"
msgid "Active"
msgstr ""
-msgctxt "field:product.uom,category:0"
+msgctxt "field:product.uom,category:"
msgid "UOM Category"
msgstr ""
-msgctxt "field:product.uom,digits:0"
+msgctxt "field:product.uom,create_date:"
+msgid "Create Date"
+msgstr ""
+
+msgctxt "field:product.uom,create_uid:"
+msgid "Create User"
+msgstr ""
+
+msgctxt "field:product.uom,digits:"
msgid "Display Digits"
msgstr ""
-msgctxt "field:product.uom,factor:0"
+msgctxt "field:product.uom,factor:"
msgid "Factor"
msgstr ""
-msgctxt "field:product.uom,name:0"
+msgctxt "field:product.uom,id:"
+msgid "ID"
+msgstr ""
+
+msgctxt "field:product.uom,name:"
msgid "Name"
msgstr ""
-msgctxt "field:product.uom,rate:0"
+msgctxt "field:product.uom,rate:"
msgid "Rate"
msgstr ""
-msgctxt "field:product.uom,rec_name:0"
+msgctxt "field:product.uom,rec_name:"
msgid "Name"
msgstr ""
-msgctxt "field:product.uom,rounding:0"
+msgctxt "field:product.uom,rounding:"
msgid "Rounding Precision"
msgstr ""
-msgctxt "field:product.uom,symbol:0"
+msgctxt "field:product.uom,symbol:"
msgid "Symbol"
msgstr ""
-msgctxt "field:product.uom.category,name:0"
+msgctxt "field:product.uom,write_date:"
+msgid "Write Date"
+msgstr ""
+
+msgctxt "field:product.uom,write_uid:"
+msgid "Write User"
+msgstr ""
+
+msgctxt "field:product.uom.category,create_date:"
+msgid "Create Date"
+msgstr ""
+
+msgctxt "field:product.uom.category,create_uid:"
+msgid "Create User"
+msgstr ""
+
+msgctxt "field:product.uom.category,id:"
+msgid "ID"
+msgstr ""
+
+msgctxt "field:product.uom.category,name:"
msgid "Name"
msgstr ""
-msgctxt "field:product.uom.category,rec_name:0"
+msgctxt "field:product.uom.category,rec_name:"
msgid "Name"
msgstr ""
-msgctxt "field:product.uom.category,uoms:0"
+msgctxt "field:product.uom.category,uoms:"
msgid "Unit of Measures"
msgstr ""
-msgctxt "help:product.uom,factor:0"
+msgctxt "field:product.uom.category,write_date:"
+msgid "Write Date"
+msgstr ""
+
+msgctxt "field:product.uom.category,write_uid:"
+msgid "Write User"
+msgstr ""
+
+msgctxt "help:product.uom,factor:"
msgid ""
"The coefficient for the formula:\n"
"coef (base unit) = 1 (this unit)"
msgstr ""
-msgctxt "help:product.uom,rate:0"
+msgctxt "help:product.uom,rate:"
msgid ""
"The coefficient for the formula:\n"
"1 (base unit) = coef (this unit)"
@@ -212,19 +320,19 @@ msgctxt "model:ir.ui.menu,name:menu_uom_form"
msgid "Units of Measure"
msgstr ""
-msgctxt "model:product.category,name:0"
+msgctxt "model:product.category,name:"
msgid "Product Category"
msgstr ""
-msgctxt "model:product.product,name:0"
+msgctxt "model:product.product,name:"
msgid "Product"
msgstr ""
-msgctxt "model:product.template,name:0"
+msgctxt "model:product.template,name:"
msgid "Product Template"
msgstr ""
-msgctxt "model:product.uom,name:0"
+msgctxt "model:product.uom,name:"
msgid "Unit of measure"
msgstr ""
@@ -484,7 +592,7 @@ msgctxt "model:product.uom,symbol:uom_yard"
msgid "yd"
msgstr ""
-msgctxt "model:product.uom.category,name:0"
+msgctxt "model:product.uom.category,name:"
msgid "Product uom category"
msgstr ""
@@ -516,66 +624,66 @@ msgctxt "model:res.group,name:group_product_admin"
msgid "Product Administration"
msgstr ""
-msgctxt "selection:product.template,cost_price_method:0"
+msgctxt "selection:product.template,cost_price_method:"
msgid "Average"
msgstr ""
-msgctxt "selection:product.template,cost_price_method:0"
+msgctxt "selection:product.template,cost_price_method:"
msgid "Fixed"
msgstr ""
-msgctxt "selection:product.template,type:0"
-msgid "Consumable"
+msgctxt "selection:product.template,type:"
+msgid "Assets"
msgstr ""
-msgctxt "selection:product.template,type:0"
-msgid "Service"
+msgctxt "selection:product.template,type:"
+msgid "Goods"
msgstr ""
-msgctxt "selection:product.template,type:0"
-msgid "Stockable"
+msgctxt "selection:product.template,type:"
+msgid "Service"
msgstr ""
-msgctxt "view:product.category:0"
+msgctxt "view:product.category:"
msgid "Children"
msgstr ""
-msgctxt "view:product.category:0"
+msgctxt "view:product.category:"
msgid "Product Categories"
msgstr ""
-msgctxt "view:product.category:0"
+msgctxt "view:product.category:"
msgid "Product Category"
msgstr ""
-msgctxt "view:product.product:0"
+msgctxt "view:product.product:"
msgid "Products"
msgstr ""
-msgctxt "view:product.template:0"
+msgctxt "view:product.template:"
msgid "General"
msgstr ""
-msgctxt "view:product.template:0"
+msgctxt "view:product.template:"
msgid "Product Template"
msgstr ""
-msgctxt "view:product.template:0"
+msgctxt "view:product.template:"
msgid "Product Templates"
msgstr ""
-msgctxt "view:product.uom.category:0"
+msgctxt "view:product.uom.category:"
msgid "Categories of Unit of Measure"
msgstr ""
-msgctxt "view:product.uom.category:0"
+msgctxt "view:product.uom.category:"
msgid "Category of Unit of Measure"
msgstr ""
-msgctxt "view:product.uom:0"
+msgctxt "view:product.uom:"
msgid "Unit of Measure"
msgstr ""
-msgctxt "view:product.uom:0"
+msgctxt "view:product.uom:"
msgid "Units of Measure"
msgstr ""
diff --git a/locale/de_DE.po b/locale/de_DE.po
index ce8a503..a8b3321 100644
--- a/locale/de_DE.po
+++ b/locale/de_DE.po
@@ -2,11 +2,11 @@
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
-msgctxt "error:product.category:0"
+msgctxt "error:product.category:"
msgid "You can not create recursive categories!"
msgstr "Kategorien können nicht rekursiv angelegt werden!"
-msgctxt "error:product.template:0"
+msgctxt "error:product.template:"
msgid ""
"You cannot change the default uom for a product which is associated to stock"
" moves."
@@ -14,7 +14,7 @@ msgstr ""
"Die Standardmaßeinheit kann nicht für einen Artikel geändert werden, der "
"Lagerbewegungen zugeordnet ist."
-msgctxt "error:product.uom:0"
+msgctxt "error:product.uom:"
msgid ""
"If the UOM is still not used, you can delete it otherwise you can deactivate"
" it and create a new one."
@@ -22,249 +22,257 @@ msgstr ""
"Wenn die Maßeinheit noch nicht verwendet wurde, kann sie gelöscht werden.\n"
"Andernfalls kann sie nur deaktiviert und eine andere neue erstellt werden."
-msgctxt "error:product.uom:0"
+msgctxt "error:product.uom:"
msgid "Invalid Factor and Rate values!"
msgstr "Ungültige Werte für Faktor und Kehrwert!"
-msgctxt "error:product.uom:0"
+msgctxt "error:product.uom:"
msgid "Rate and factor can not be both equal to zero."
msgstr "Faktor und Kehrwert Faktor können beide nicht 0 sein"
-msgctxt "error:product.uom:0"
+msgctxt "error:product.uom:"
msgid "You cannot change Rate, Factor or Category on a Unit of Measure. "
msgstr ""
"Faktor, Faktorkehrwert oder Kategorie einer Maßeinheit können nicht geändert"
" werden."
-msgctxt "field:product.category,childs:0"
+msgctxt "field:product.category,childs:"
msgid "Children"
msgstr "Untergeordnet (Kategorien)"
-msgctxt "field:product.category,create_date:0"
-msgid "Creation date"
+msgctxt "field:product.category,create_date:"
+msgid "Create Date"
msgstr "Erstellungsdatum"
-msgctxt "field:product.category,create_uid:0"
-msgid "Creation user"
-msgstr "Ersteller"
+msgctxt "field:product.category,create_uid:"
+msgid "Create User"
+msgstr "Erstellt durch"
-msgctxt "field:product.category,id:0"
+msgctxt "field:product.category,id:"
msgid "ID"
msgstr "ID"
-msgctxt "field:product.category,name:0"
+msgctxt "field:product.category,name:"
msgid "Name"
msgstr "Name"
-msgctxt "field:product.category,parent:0"
+msgctxt "field:product.category,parent:"
msgid "Parent"
msgstr "Ãœbergeordnet (Kategorie)"
-msgctxt "field:product.category,rec_name:0"
+msgctxt "field:product.category,rec_name:"
msgid "Name"
msgstr "Name"
-msgctxt "field:product.category,write_date:0"
-msgid "Last modification date"
-msgstr "Zuletzt geändert am"
+msgctxt "field:product.category,write_date:"
+msgid "Write Date"
+msgstr "Zuletzt geändert"
-msgctxt "field:product.category,write_uid:0"
-msgid "Last modification by"
-msgstr "Zuletzt geändert von"
+msgctxt "field:product.category,write_uid:"
+msgid "Write User"
+msgstr "Letzte Änderung durch"
-msgctxt "field:product.product,code:0"
+msgctxt "field:product.product,code:"
msgid "Code"
msgstr "Artikelnummer"
-msgctxt "field:product.product,create_date:0"
-msgid "Creation date"
+msgctxt "field:product.product,create_date:"
+msgid "Create Date"
msgstr "Erstellungsdatum"
-msgctxt "field:product.product,create_uid:0"
-msgid "Creation user"
-msgstr "Ersteller"
+msgctxt "field:product.product,create_uid:"
+msgid "Create User"
+msgstr "Erstellt durch"
-msgctxt "field:product.product,description:0"
+msgctxt "field:product.product,description:"
msgid "Description"
msgstr "Beschreibung"
-msgctxt "field:product.product,id:0"
+msgctxt "field:product.product,id:"
msgid "ID"
msgstr "ID"
-msgctxt "field:product.product,rec_name:0"
+msgctxt "field:product.product,rec_name:"
msgid "Name"
msgstr "Name"
-msgctxt "field:product.product,template:0"
+msgctxt "field:product.product,template:"
msgid "Product Template"
msgstr "Artikelvorlage"
-msgctxt "field:product.product,write_date:0"
-msgid "Last modification date"
-msgstr "Zuletzt geändert am"
+msgctxt "field:product.product,write_date:"
+msgid "Write Date"
+msgstr "Zuletzt geändert"
-msgctxt "field:product.product,write_uid:0"
-msgid "Last modification by"
-msgstr "Zuletzt geändert von"
+msgctxt "field:product.product,write_uid:"
+msgid "Write User"
+msgstr "Letzte Änderung durch"
-msgctxt "field:product.template,active:0"
+msgctxt "field:product.template,active:"
msgid "Active"
msgstr "Aktiv"
-msgctxt "field:product.template,category:0"
+msgctxt "field:product.template,category:"
msgid "Category"
msgstr "Artikelkategorie"
-msgctxt "field:product.template,cost_price:0"
+msgctxt "field:product.template,consumable:"
+msgid "Consumable"
+msgstr "Verbrauchsmaterial"
+
+msgctxt "field:product.template,cost_price:"
msgid "Cost Price"
msgstr "Einkaufspreis"
-msgctxt "field:product.template,cost_price_method:0"
+msgctxt "field:product.template,cost_price_method:"
msgid "Cost Method"
msgstr "Kostenmethode"
-msgctxt "field:product.template,cost_price_uom:0"
+msgctxt "field:product.template,cost_price_uom:"
msgid "Cost Price"
msgstr "Einkaufspreis"
-msgctxt "field:product.template,create_date:0"
-msgid "Creation date"
+msgctxt "field:product.template,create_date:"
+msgid "Create Date"
msgstr "Erstellungsdatum"
-msgctxt "field:product.template,create_uid:0"
-msgid "Creation user"
-msgstr "Ersteller"
+msgctxt "field:product.template,create_uid:"
+msgid "Create User"
+msgstr "Erstellt durch"
-msgctxt "field:product.template,default_uom:0"
+msgctxt "field:product.template,default_uom:"
msgid "Default UOM"
msgstr "Standardeinheit"
-msgctxt "field:product.template,id:0"
+msgctxt "field:product.template,default_uom_category:"
+msgid "Default UOM Category"
+msgstr "Standardkategorie Maßeinheit"
+
+msgctxt "field:product.template,id:"
msgid "ID"
msgstr "ID"
-msgctxt "field:product.template,list_price:0"
+msgctxt "field:product.template,list_price:"
msgid "List Price"
msgstr "Listenpreis"
-msgctxt "field:product.template,list_price_uom:0"
+msgctxt "field:product.template,list_price_uom:"
msgid "List Price"
msgstr "Listenpreis"
-msgctxt "field:product.template,name:0"
+msgctxt "field:product.template,name:"
msgid "Name"
msgstr "Name"
-msgctxt "field:product.template,products:0"
+msgctxt "field:product.template,products:"
msgid "Products"
msgstr "Artikel"
-msgctxt "field:product.template,rec_name:0"
+msgctxt "field:product.template,rec_name:"
msgid "Name"
msgstr "Name"
-msgctxt "field:product.template,type:0"
+msgctxt "field:product.template,type:"
msgid "Type"
msgstr "Typ"
-msgctxt "field:product.template,write_date:0"
-msgid "Last modification date"
-msgstr "Zuletzt geändert am"
+msgctxt "field:product.template,write_date:"
+msgid "Write Date"
+msgstr "Zuletzt geändert"
-msgctxt "field:product.template,write_uid:0"
-msgid "Last modification by"
-msgstr "Zuletzt geändert von"
+msgctxt "field:product.template,write_uid:"
+msgid "Write User"
+msgstr "Letzte Änderung durch"
-msgctxt "field:product.uom,active:0"
+msgctxt "field:product.uom,active:"
msgid "Active"
msgstr "Aktiv"
-msgctxt "field:product.uom,category:0"
+msgctxt "field:product.uom,category:"
msgid "UOM Category"
msgstr "Kategorie Maßeinheit"
-msgctxt "field:product.uom,create_date:0"
-msgid "Creation date"
+msgctxt "field:product.uom,create_date:"
+msgid "Create Date"
msgstr "Erstellungsdatum"
-msgctxt "field:product.uom,create_uid:0"
-msgid "Creation user"
-msgstr "Ersteller"
+msgctxt "field:product.uom,create_uid:"
+msgid "Create User"
+msgstr "Erstellt durch"
-msgctxt "field:product.uom,digits:0"
+msgctxt "field:product.uom,digits:"
msgid "Display Digits"
msgstr "Angezeigte Stellen"
-msgctxt "field:product.uom,factor:0"
+msgctxt "field:product.uom,factor:"
msgid "Factor"
msgstr "Faktor"
-msgctxt "field:product.uom,id:0"
+msgctxt "field:product.uom,id:"
msgid "ID"
msgstr "ID"
-msgctxt "field:product.uom,name:0"
+msgctxt "field:product.uom,name:"
msgid "Name"
msgstr "Name"
-msgctxt "field:product.uom,rate:0"
+msgctxt "field:product.uom,rate:"
msgid "Rate"
msgstr "Kehrwert Faktor"
-msgctxt "field:product.uom,rec_name:0"
+msgctxt "field:product.uom,rec_name:"
msgid "Name"
msgstr "Name"
-msgctxt "field:product.uom,rounding:0"
+msgctxt "field:product.uom,rounding:"
msgid "Rounding Precision"
msgstr "Rundungsgenauigkeit"
-msgctxt "field:product.uom,symbol:0"
+msgctxt "field:product.uom,symbol:"
msgid "Symbol"
msgstr "Symbol"
-msgctxt "field:product.uom,write_date:0"
-msgid "Last modification date"
-msgstr "Zuletzt geändert am"
+msgctxt "field:product.uom,write_date:"
+msgid "Write Date"
+msgstr "Zuletzt geändert"
-msgctxt "field:product.uom,write_uid:0"
-msgid "Last modification by"
-msgstr "Zuletzt geändert von"
+msgctxt "field:product.uom,write_uid:"
+msgid "Write User"
+msgstr "Letzte Änderung durch"
-msgctxt "field:product.uom.category,create_date:0"
-msgid "Creation date"
+msgctxt "field:product.uom.category,create_date:"
+msgid "Create Date"
msgstr "Erstellungsdatum"
-msgctxt "field:product.uom.category,create_uid:0"
-msgid "Creation user"
-msgstr "Ersteller"
+msgctxt "field:product.uom.category,create_uid:"
+msgid "Create User"
+msgstr "Erstellt durch"
-msgctxt "field:product.uom.category,id:0"
+msgctxt "field:product.uom.category,id:"
msgid "ID"
msgstr "ID"
-msgctxt "field:product.uom.category,name:0"
+msgctxt "field:product.uom.category,name:"
msgid "Name"
msgstr "Name"
-msgctxt "field:product.uom.category,rec_name:0"
+msgctxt "field:product.uom.category,rec_name:"
msgid "Name"
msgstr "Name"
-msgctxt "field:product.uom.category,uoms:0"
+msgctxt "field:product.uom.category,uoms:"
msgid "Unit of Measures"
msgstr "Maßeinheiten"
-msgctxt "field:product.uom.category,write_date:0"
-msgid "Last modification date"
-msgstr "Zuletzt geändert am"
+msgctxt "field:product.uom.category,write_date:"
+msgid "Write Date"
+msgstr "Zuletzt geändert"
-msgctxt "field:product.uom.category,write_uid:0"
-msgid "Last modification by"
-msgstr "Zuletzt geändert von"
+msgctxt "field:product.uom.category,write_uid:"
+msgid "Write User"
+msgstr "Letzte Änderung durch"
-msgctxt "help:product.uom,factor:0"
+msgctxt "help:product.uom,factor:"
msgid ""
"The coefficient for the formula:\n"
"coef (base unit) = 1 (this unit)"
@@ -273,7 +281,7 @@ msgstr ""
"Formel: diese Einheit = Faktor * Basiseinheit\n"
"Das Feld Kehrwert Faktor wird automatisch aus dem hier eingetragenen Wert ermittelt."
-msgctxt "help:product.uom,rate:0"
+msgctxt "help:product.uom,rate:"
msgid ""
"The coefficient for the formula:\n"
"1 (base unit) = coef (this unit)"
@@ -330,19 +338,19 @@ msgctxt "model:ir.ui.menu,name:menu_uom_form"
msgid "Units of Measure"
msgstr "Maßeinheiten"
-msgctxt "model:product.category,name:0"
+msgctxt "model:product.category,name:"
msgid "Product Category"
msgstr "Artikel Kategorie"
-msgctxt "model:product.product,name:0"
+msgctxt "model:product.product,name:"
msgid "Product"
msgstr "Artikel"
-msgctxt "model:product.template,name:0"
+msgctxt "model:product.template,name:"
msgid "Product Template"
msgstr "Artikel Vorlage"
-msgctxt "model:product.uom,name:0"
+msgctxt "model:product.uom,name:"
msgid "Unit of measure"
msgstr "Maßeinheit"
@@ -602,7 +610,7 @@ msgctxt "model:product.uom,symbol:uom_yard"
msgid "yd"
msgstr "yd"
-msgctxt "model:product.uom.category,name:0"
+msgctxt "model:product.uom.category,name:"
msgid "Product uom category"
msgstr "Artikel Maßeinheit Kategorie"
@@ -634,86 +642,86 @@ msgctxt "model:res.group,name:group_product_admin"
msgid "Product Administration"
msgstr "Artikel Administration"
-msgctxt "selection:product.template,cost_price_method:0"
+msgctxt "selection:product.template,cost_price_method:"
msgid "Average"
msgstr "Durchschnitt"
-msgctxt "selection:product.template,cost_price_method:0"
+msgctxt "selection:product.template,cost_price_method:"
msgid "Fixed"
msgstr "Fix"
-msgctxt "selection:product.template,type:0"
-msgid "Consumable"
-msgstr "Verbrauchsmaterial"
+msgctxt "selection:product.template,type:"
+msgid "Assets"
+msgstr "Inventar"
-msgctxt "selection:product.template,type:0"
+msgctxt "selection:product.template,type:"
+msgid "Goods"
+msgstr "Ware"
+
+msgctxt "selection:product.template,type:"
msgid "Service"
msgstr "Dienstleistung"
-msgctxt "selection:product.template,type:0"
-msgid "Stockable"
-msgstr "Lagerware"
-
-msgctxt "view:product.category:0"
+msgctxt "view:product.category:"
msgid "Children"
msgstr "Untergeordnet (Kategorien)"
-msgctxt "view:product.category:0"
+msgctxt "view:product.category:"
msgid "Product Categories"
msgstr "Artikelkategorien"
-msgctxt "view:product.category:0"
+msgctxt "view:product.category:"
msgid "Product Category"
msgstr "Artikelkategorie"
-msgctxt "view:product.product:0"
+msgctxt "view:product.product:"
msgid "General"
msgstr "Allgemein"
-msgctxt "view:product.product:0"
+msgctxt "view:product.product:"
msgid "Product"
msgstr "Artikel"
-msgctxt "view:product.product:0"
+msgctxt "view:product.product:"
msgid "Product Suppliers"
msgstr "Lieferanten"
-msgctxt "view:product.product:0"
+msgctxt "view:product.product:"
msgid "Products"
msgstr "Artikel"
-msgctxt "view:product.template:0"
+msgctxt "view:product.template:"
msgid "General"
msgstr "Allgemein"
-msgctxt "view:product.template:0"
+msgctxt "view:product.template:"
msgid "Product"
msgstr "Artikel"
-msgctxt "view:product.template:0"
+msgctxt "view:product.template:"
msgid "Product Template"
msgstr "Artikelvorlage"
-msgctxt "view:product.template:0"
+msgctxt "view:product.template:"
msgid "Product Templates"
msgstr "Artikelvorlagen"
-msgctxt "view:product.template:0"
+msgctxt "view:product.template:"
msgid "Products"
msgstr "Artikel"
-msgctxt "view:product.uom.category:0"
+msgctxt "view:product.uom.category:"
msgid "Categories of Unit of Measure"
msgstr "Kategorien Maßeinheiten"
-msgctxt "view:product.uom.category:0"
+msgctxt "view:product.uom.category:"
msgid "Category of Unit of Measure"
msgstr "Kategorie Maßeinheit"
-msgctxt "view:product.uom:0"
+msgctxt "view:product.uom:"
msgid "Unit of Measure"
msgstr "Maßeinheit"
-msgctxt "view:product.uom:0"
+msgctxt "view:product.uom:"
msgid "Units of Measure"
msgstr "Maßeinheiten"
diff --git a/locale/es_ES.po b/locale/es_AR.po
similarity index 66%
copy from locale/es_ES.po
copy to locale/es_AR.po
index c32bb98..47289da 100644
--- a/locale/es_ES.po
+++ b/locale/es_AR.po
@@ -2,12 +2,11 @@
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
-#, fuzzy
-msgctxt "error:product.category:0"
+msgctxt "error:product.category:"
msgid "You can not create recursive categories!"
-msgstr "No puede crear categorÃas recursivas"
+msgstr "¡No puede crear categorÃas recursivas!"
-msgctxt "error:product.uom:0"
+msgctxt "error:product.uom:"
msgid ""
"If the UOM is still not used, you can delete it otherwise you can deactivate"
" it and create a new one."
@@ -15,149 +14,257 @@ msgstr ""
"Si no se ha usado la UdM, puede borrarla, en caso contrario, puede "
"desactivarla y crear una nueva."
-msgctxt "error:product.uom:0"
+msgctxt "error:product.uom:"
msgid "Invalid Factor and Rate values!"
-msgstr ""
+msgstr "¡Factor y valores de tasa de cambio inválidas!"
-msgctxt "error:product.uom:0"
+msgctxt "error:product.uom:"
msgid "Rate and factor can not be both equal to zero."
msgstr "Conversión y factor no pueden ser cero simultáneamente."
-msgctxt "error:product.uom:0"
+msgctxt "error:product.uom:"
msgid "You cannot change Rate, Factor or Category on a Unit of Measure. "
msgstr ""
"No puede cambiar la conversión, el factor o la categorÃa de una unidad de "
"medida."
-msgctxt "field:product.category,childs:0"
+msgctxt "field:product.category,childs:"
msgid "Children"
msgstr "Hijos"
-msgctxt "field:product.category,name:0"
+msgctxt "field:product.category,create_date:"
+msgid "Create Date"
+msgstr "Fecha creación"
+
+msgctxt "field:product.category,create_uid:"
+msgid "Create User"
+msgstr "Usuario creación"
+
+msgctxt "field:product.category,id:"
+msgid "ID"
+msgstr "ID"
+
+msgctxt "field:product.category,name:"
msgid "Name"
msgstr "Nombre"
-msgctxt "field:product.category,parent:0"
+msgctxt "field:product.category,parent:"
msgid "Parent"
msgstr "Padre"
-msgctxt "field:product.category,rec_name:0"
+msgctxt "field:product.category,rec_name:"
msgid "Name"
msgstr "Nombre"
-msgctxt "field:product.product,code:0"
+msgctxt "field:product.category,write_date:"
+msgid "Write Date"
+msgstr "Fecha modificación"
+
+msgctxt "field:product.category,write_uid:"
+msgid "Write User"
+msgstr "Usuario modificación"
+
+msgctxt "field:product.product,code:"
msgid "Code"
msgstr "Código"
-msgctxt "field:product.product,description:0"
+msgctxt "field:product.product,create_date:"
+msgid "Create Date"
+msgstr "Fecha creación"
+
+msgctxt "field:product.product,create_uid:"
+msgid "Create User"
+msgstr "Usuario creación"
+
+msgctxt "field:product.product,description:"
msgid "Description"
msgstr "Descripción"
-msgctxt "field:product.product,rec_name:0"
+msgctxt "field:product.product,id:"
+msgid "ID"
+msgstr "ID"
+
+msgctxt "field:product.product,rec_name:"
msgid "Name"
msgstr "Nombre"
-msgctxt "field:product.product,template:0"
+msgctxt "field:product.product,template:"
msgid "Product Template"
msgstr "Plantilla de producto"
-msgctxt "field:product.template,active:0"
+msgctxt "field:product.product,write_date:"
+msgid "Write Date"
+msgstr "Fecha modificación"
+
+msgctxt "field:product.product,write_uid:"
+msgid "Write User"
+msgstr "Usuario modificación"
+
+msgctxt "field:product.template,active:"
msgid "Active"
msgstr "Activo"
-msgctxt "field:product.template,category:0"
+msgctxt "field:product.template,category:"
msgid "Category"
msgstr "CategorÃa"
-msgctxt "field:product.template,cost_price:0"
+msgctxt "field:product.template,consumable:"
+msgid "Consumable"
+msgstr "Consumible"
+
+msgctxt "field:product.template,cost_price:"
msgid "Cost Price"
-msgstr "Precio de coste"
+msgstr "Precio de costo"
-msgctxt "field:product.template,cost_price_method:0"
+msgctxt "field:product.template,cost_price_method:"
msgid "Cost Method"
-msgstr "Método de coste"
+msgstr "Método de costo"
-msgctxt "field:product.template,cost_price_uom:0"
+msgctxt "field:product.template,cost_price_uom:"
msgid "Cost Price"
-msgstr "Precio de coste"
+msgstr "Precio de costo"
+
+msgctxt "field:product.template,create_date:"
+msgid "Create Date"
+msgstr "Fecha creación"
-msgctxt "field:product.template,default_uom:0"
+msgctxt "field:product.template,create_uid:"
+msgid "Create User"
+msgstr "Usuario creación"
+
+msgctxt "field:product.template,default_uom:"
msgid "Default UOM"
msgstr "UdM predeterminada"
-msgctxt "field:product.template,list_price:0"
+msgctxt "field:product.template,default_uom_category:"
+msgid "Default UOM Category"
+msgstr "CategorÃa de UdM predeterminada"
+
+msgctxt "field:product.template,id:"
+msgid "ID"
+msgstr "ID"
+
+msgctxt "field:product.template,list_price:"
msgid "List Price"
msgstr "Precio de lista"
-msgctxt "field:product.template,list_price_uom:0"
+msgctxt "field:product.template,list_price_uom:"
msgid "List Price"
msgstr "Precio de lista"
-msgctxt "field:product.template,name:0"
+msgctxt "field:product.template,name:"
msgid "Name"
msgstr "Nombre"
-msgctxt "field:product.template,products:0"
+msgctxt "field:product.template,products:"
msgid "Products"
msgstr "Productos"
-msgctxt "field:product.template,rec_name:0"
+msgctxt "field:product.template,rec_name:"
msgid "Name"
msgstr "Nombre"
-msgctxt "field:product.template,type:0"
+msgctxt "field:product.template,type:"
msgid "Type"
msgstr "Tipo"
-msgctxt "field:product.uom,active:0"
+msgctxt "field:product.template,write_date:"
+msgid "Write Date"
+msgstr "Fecha modificación"
+
+msgctxt "field:product.template,write_uid:"
+msgid "Write User"
+msgstr "Usuario modificación"
+
+msgctxt "field:product.uom,active:"
msgid "Active"
msgstr "Activo"
-msgctxt "field:product.uom,category:0"
+msgctxt "field:product.uom,category:"
msgid "UOM Category"
msgstr "CategorÃa de UdM"
-msgctxt "field:product.uom,digits:0"
+msgctxt "field:product.uom,create_date:"
+msgid "Create Date"
+msgstr "Fecha creación"
+
+msgctxt "field:product.uom,create_uid:"
+msgid "Create User"
+msgstr "Usuario creación"
+
+msgctxt "field:product.uom,digits:"
msgid "Display Digits"
msgstr "Decimales a mostrar"
-msgctxt "field:product.uom,factor:0"
+msgctxt "field:product.uom,factor:"
msgid "Factor"
msgstr "Factor"
-msgctxt "field:product.uom,name:0"
+msgctxt "field:product.uom,id:"
+msgid "ID"
+msgstr "ID"
+
+msgctxt "field:product.uom,name:"
msgid "Name"
msgstr "Nombre"
-msgctxt "field:product.uom,rate:0"
+msgctxt "field:product.uom,rate:"
msgid "Rate"
msgstr "Conversión"
-msgctxt "field:product.uom,rec_name:0"
+msgctxt "field:product.uom,rec_name:"
msgid "Name"
msgstr "Nombre"
-msgctxt "field:product.uom,rounding:0"
+msgctxt "field:product.uom,rounding:"
msgid "Rounding Precision"
msgstr "Precisión de redondeo"
-msgctxt "field:product.uom,symbol:0"
+msgctxt "field:product.uom,symbol:"
msgid "Symbol"
msgstr "SÃmbolo"
-msgctxt "field:product.uom.category,name:0"
+msgctxt "field:product.uom,write_date:"
+msgid "Write Date"
+msgstr "Fecha modificación"
+
+msgctxt "field:product.uom,write_uid:"
+msgid "Write User"
+msgstr "Usuario modificación"
+
+msgctxt "field:product.uom.category,create_date:"
+msgid "Create Date"
+msgstr "Fecha creación"
+
+msgctxt "field:product.uom.category,create_uid:"
+msgid "Create User"
+msgstr "Usuario creación"
+
+msgctxt "field:product.uom.category,id:"
+msgid "ID"
+msgstr "ID"
+
+msgctxt "field:product.uom.category,name:"
msgid "Name"
msgstr "Nombre"
-msgctxt "field:product.uom.category,rec_name:0"
+msgctxt "field:product.uom.category,rec_name:"
msgid "Name"
msgstr "Nombre"
-msgctxt "field:product.uom.category,uoms:0"
+msgctxt "field:product.uom.category,uoms:"
msgid "Unit of Measures"
msgstr "Unidades de medidas"
-msgctxt "help:product.uom,factor:0"
+msgctxt "field:product.uom.category,write_date:"
+msgid "Write Date"
+msgstr "Fecha modificación"
+
+msgctxt "field:product.uom.category,write_uid:"
+msgid "Write User"
+msgstr "Usuario modificación"
+
+msgctxt "help:product.uom,factor:"
msgid ""
"The coefficient for the formula:\n"
"coef (base unit) = 1 (this unit)"
@@ -165,7 +272,7 @@ msgstr ""
"El coeficiente de la fórmula:\n"
"coeficiente (unidad base) = 1 (esta unidad)"
-msgctxt "help:product.uom,rate:0"
+msgctxt "help:product.uom,rate:"
msgid ""
"The coefficient for the formula:\n"
"1 (base unit) = coef (this unit)"
@@ -173,7 +280,6 @@ msgstr ""
"El coeficiente de la fórmula:\n"
"1 (unidad base) = coeficiente (esta unidad)"
-#, fuzzy
msgctxt "model:ir.action,name:act_category_list"
msgid "Categories"
msgstr "CategorÃas"
@@ -198,7 +304,6 @@ msgctxt "model:ir.action,name:act_uom_form"
msgid "Units of Measure"
msgstr "Unidades de medida"
-#, fuzzy
msgctxt "model:ir.ui.menu,name:menu_category_list"
msgid "Categories"
msgstr "CategorÃas"
@@ -223,19 +328,19 @@ msgctxt "model:ir.ui.menu,name:menu_uom_form"
msgid "Units of Measure"
msgstr "Unidades de medida"
-msgctxt "model:product.category,name:0"
+msgctxt "model:product.category,name:"
msgid "Product Category"
msgstr "CategorÃa de producto"
-msgctxt "model:product.product,name:0"
+msgctxt "model:product.product,name:"
msgid "Product"
msgstr "Producto"
-msgctxt "model:product.template,name:0"
+msgctxt "model:product.template,name:"
msgid "Product Template"
msgstr "Plantilla de producto"
-msgctxt "model:product.uom,name:0"
+msgctxt "model:product.uom,name:"
msgid "Unit of measure"
msgstr "Unidad de medida"
@@ -495,7 +600,7 @@ msgctxt "model:product.uom,symbol:uom_yard"
msgid "yd"
msgstr "yd"
-msgctxt "model:product.uom.category,name:0"
+msgctxt "model:product.uom.category,name:"
msgid "Product uom category"
msgstr "CategorÃa de UdM de producto"
@@ -527,78 +632,78 @@ msgctxt "model:res.group,name:group_product_admin"
msgid "Product Administration"
msgstr "Administración de productos"
-msgctxt "selection:product.template,cost_price_method:0"
+msgctxt "selection:product.template,cost_price_method:"
msgid "Average"
msgstr "Promedio"
-msgctxt "selection:product.template,cost_price_method:0"
+msgctxt "selection:product.template,cost_price_method:"
msgid "Fixed"
msgstr "Fijo"
-msgctxt "selection:product.template,type:0"
-msgid "Consumable"
-msgstr "Consumible"
+msgctxt "selection:product.template,type:"
+msgid "Assets"
+msgstr "Activos"
-msgctxt "selection:product.template,type:0"
+msgctxt "selection:product.template,type:"
+msgid "Goods"
+msgstr "Bienes"
+
+msgctxt "selection:product.template,type:"
msgid "Service"
msgstr "Servicio"
-msgctxt "selection:product.template,type:0"
-msgid "Stockable"
-msgstr "Almacenable"
-
-msgctxt "view:product.category:0"
+msgctxt "view:product.category:"
msgid "Children"
msgstr "Hijos"
-msgctxt "view:product.category:0"
+msgctxt "view:product.category:"
msgid "Product Categories"
msgstr "CategorÃas de producto"
-msgctxt "view:product.category:0"
+msgctxt "view:product.category:"
msgid "Product Category"
msgstr "CategorÃa de producto"
-msgctxt "view:product.product:0"
+msgctxt "view:product.product:"
msgid "General"
msgstr "General"
-msgctxt "view:product.product:0"
+msgctxt "view:product.product:"
msgid "Product"
msgstr "Producto"
-msgctxt "view:product.product:0"
+msgctxt "view:product.product:"
msgid "Product Suppliers"
msgstr "Proveedores de productos"
-msgctxt "view:product.product:0"
+msgctxt "view:product.product:"
msgid "Products"
msgstr "Productos"
-msgctxt "view:product.template:0"
+msgctxt "view:product.template:"
msgid "General"
msgstr "General"
-msgctxt "view:product.template:0"
+msgctxt "view:product.template:"
msgid "Product Template"
msgstr "Plantilla de producto"
-msgctxt "view:product.template:0"
+msgctxt "view:product.template:"
msgid "Product Templates"
msgstr "Plantillas de producto"
-msgctxt "view:product.uom.category:0"
+msgctxt "view:product.uom.category:"
msgid "Categories of Unit of Measure"
msgstr "CategorÃas de unidades de medida"
-msgctxt "view:product.uom.category:0"
+msgctxt "view:product.uom.category:"
msgid "Category of Unit of Measure"
msgstr "CategorÃa de unidad de medida"
-msgctxt "view:product.uom:0"
+msgctxt "view:product.uom:"
msgid "Unit of Measure"
msgstr "Unidad de medida"
-msgctxt "view:product.uom:0"
+msgctxt "view:product.uom:"
msgid "Units of Measure"
msgstr "Unidades de medida"
diff --git a/locale/es_CO.po b/locale/es_CO.po
index 70684e3..49de0ef 100644
--- a/locale/es_CO.po
+++ b/locale/es_CO.po
@@ -3,11 +3,11 @@ msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
#, fuzzy
-msgctxt "error:product.category:0"
+msgctxt "error:product.category:"
msgid "You can not create recursive categories!"
msgstr "No puede crear categorÃas recursivas!"
-msgctxt "error:product.template:0"
+msgctxt "error:product.template:"
msgid ""
"You cannot change the default uom for a product which is associated to stock"
" moves."
@@ -15,7 +15,7 @@ msgstr ""
"No puede cambiar la UdM predeterminada para un producto asociado con "
"movimientos de inventario."
-msgctxt "error:product.uom:0"
+msgctxt "error:product.uom:"
msgid ""
"If the UOM is still not used, you can delete it otherwise you can deactivate"
" it and create a new one."
@@ -23,154 +23,267 @@ msgstr ""
"Si no se ha usado la UdM, puede eliminar, de otra forma puede desactivarla y"
" crear una nueva."
-msgctxt "error:product.uom:0"
+msgctxt "error:product.uom:"
msgid "Invalid Factor and Rate values!"
msgstr "¡Factor y valores de tasa de cambio inválidas!"
-msgctxt "error:product.uom:0"
+msgctxt "error:product.uom:"
msgid "Rate and factor can not be both equal to zero."
msgstr "Tasa de cambio y factor no pueden ser cero simultáneamente."
-msgctxt "error:product.uom:0"
+msgctxt "error:product.uom:"
msgid "You cannot change Rate, Factor or Category on a Unit of Measure. "
msgstr ""
"No puede cambiar la Rata, el Factor o la CategorÃa de una Unidad de Medida."
-msgctxt "field:product.category,childs:0"
+msgctxt "field:product.category,childs:"
msgid "Children"
msgstr "Hij at s"
-msgctxt "field:product.category,name:0"
+msgctxt "field:product.category,create_date:"
+msgid "Create Date"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:product.category,create_uid:"
+msgid "Create User"
+msgstr "Crear usuario"
+
+msgctxt "field:product.category,id:"
+msgid "ID"
+msgstr ""
+
+msgctxt "field:product.category,name:"
msgid "Name"
msgstr "Nombre"
-msgctxt "field:product.category,parent:0"
+msgctxt "field:product.category,parent:"
msgid "Parent"
msgstr "Padre"
-msgctxt "field:product.category,rec_name:0"
+msgctxt "field:product.category,rec_name:"
msgid "Name"
msgstr "Nombre"
-msgctxt "field:product.product,code:0"
+msgctxt "field:product.category,write_date:"
+msgid "Write Date"
+msgstr ""
+
+msgctxt "field:product.category,write_uid:"
+msgid "Write User"
+msgstr ""
+
+msgctxt "field:product.product,code:"
msgid "Code"
msgstr "Código"
-msgctxt "field:product.product,description:0"
+msgctxt "field:product.product,create_date:"
+msgid "Create Date"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:product.product,create_uid:"
+msgid "Create User"
+msgstr "Crear usuario"
+
+msgctxt "field:product.product,description:"
msgid "Description"
msgstr "Descripción"
-msgctxt "field:product.product,rec_name:0"
+msgctxt "field:product.product,id:"
+msgid "ID"
+msgstr ""
+
+msgctxt "field:product.product,rec_name:"
msgid "Name"
msgstr "Nombre"
-msgctxt "field:product.product,template:0"
+msgctxt "field:product.product,template:"
msgid "Product Template"
msgstr "Plantilla de Producto"
-msgctxt "field:product.template,active:0"
+msgctxt "field:product.product,write_date:"
+msgid "Write Date"
+msgstr ""
+
+msgctxt "field:product.product,write_uid:"
+msgid "Write User"
+msgstr ""
+
+msgctxt "field:product.template,active:"
msgid "Active"
msgstr "Activo"
-msgctxt "field:product.template,category:0"
+msgctxt "field:product.template,category:"
msgid "Category"
msgstr "CategorÃa"
-msgctxt "field:product.template,cost_price:0"
+msgctxt "field:product.template,consumable:"
+msgid "Consumable"
+msgstr ""
+
+msgctxt "field:product.template,cost_price:"
msgid "Cost Price"
msgstr "Método de Precio"
-msgctxt "field:product.template,cost_price_method:0"
+msgctxt "field:product.template,cost_price_method:"
msgid "Cost Method"
msgstr "Método de Coste"
-msgctxt "field:product.template,cost_price_uom:0"
+msgctxt "field:product.template,cost_price_uom:"
msgid "Cost Price"
msgstr "Método de Precio"
-msgctxt "field:product.template,default_uom:0"
+msgctxt "field:product.template,create_date:"
+msgid "Create Date"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:product.template,create_uid:"
+msgid "Create User"
+msgstr "Crear usuario"
+
+msgctxt "field:product.template,default_uom:"
msgid "Default UOM"
msgstr "UdM Predeterminado"
-msgctxt "field:product.template,list_price:0"
+msgctxt "field:product.template,default_uom_category:"
+msgid "Default UOM Category"
+msgstr ""
+
+msgctxt "field:product.template,id:"
+msgid "ID"
+msgstr ""
+
+msgctxt "field:product.template,list_price:"
msgid "List Price"
msgstr "Precio de Lista"
-msgctxt "field:product.template,list_price_uom:0"
+msgctxt "field:product.template,list_price_uom:"
msgid "List Price"
msgstr "Precio de Lista"
-msgctxt "field:product.template,name:0"
+msgctxt "field:product.template,name:"
msgid "Name"
msgstr "Nombre"
-msgctxt "field:product.template,products:0"
+msgctxt "field:product.template,products:"
msgid "Products"
msgstr "Productos"
-msgctxt "field:product.template,rec_name:0"
+msgctxt "field:product.template,rec_name:"
msgid "Name"
msgstr "Nombre"
-msgctxt "field:product.template,type:0"
+msgctxt "field:product.template,type:"
msgid "Type"
msgstr "Tipo"
-msgctxt "field:product.uom,active:0"
+msgctxt "field:product.template,write_date:"
+msgid "Write Date"
+msgstr ""
+
+msgctxt "field:product.template,write_uid:"
+msgid "Write User"
+msgstr ""
+
+msgctxt "field:product.uom,active:"
msgid "Active"
msgstr "Activo"
-msgctxt "field:product.uom,category:0"
+msgctxt "field:product.uom,category:"
msgid "UOM Category"
msgstr "CategorÃa UDM"
-msgctxt "field:product.uom,digits:0"
+msgctxt "field:product.uom,create_date:"
+msgid "Create Date"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:product.uom,create_uid:"
+msgid "Create User"
+msgstr "Crear usuario"
+
+msgctxt "field:product.uom,digits:"
msgid "Display Digits"
msgstr "Mostrar DÃgitos"
-msgctxt "field:product.uom,factor:0"
+msgctxt "field:product.uom,factor:"
msgid "Factor"
msgstr "Factor"
-msgctxt "field:product.uom,name:0"
+msgctxt "field:product.uom,id:"
+msgid "ID"
+msgstr ""
+
+msgctxt "field:product.uom,name:"
msgid "Name"
msgstr "Nombre"
-msgctxt "field:product.uom,rate:0"
+msgctxt "field:product.uom,rate:"
msgid "Rate"
msgstr "Tasa de Cambio"
-msgctxt "field:product.uom,rec_name:0"
+msgctxt "field:product.uom,rec_name:"
msgid "Name"
msgstr "Nombre"
-msgctxt "field:product.uom,rounding:0"
+msgctxt "field:product.uom,rounding:"
msgid "Rounding Precision"
msgstr "Precisión de Redondeo"
-msgctxt "field:product.uom,symbol:0"
+msgctxt "field:product.uom,symbol:"
msgid "Symbol"
msgstr "SÃmbolo"
-msgctxt "field:product.uom.category,name:0"
+msgctxt "field:product.uom,write_date:"
+msgid "Write Date"
+msgstr ""
+
+msgctxt "field:product.uom,write_uid:"
+msgid "Write User"
+msgstr ""
+
+msgctxt "field:product.uom.category,create_date:"
+msgid "Create Date"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:product.uom.category,create_uid:"
+msgid "Create User"
+msgstr "Crear usuario"
+
+msgctxt "field:product.uom.category,id:"
+msgid "ID"
+msgstr ""
+
+msgctxt "field:product.uom.category,name:"
msgid "Name"
msgstr "Nombre"
-msgctxt "field:product.uom.category,rec_name:0"
+msgctxt "field:product.uom.category,rec_name:"
msgid "Name"
msgstr "Nombre"
-msgctxt "field:product.uom.category,uoms:0"
+msgctxt "field:product.uom.category,uoms:"
msgid "Unit of Measures"
msgstr "Unidad de Medidas"
-msgctxt "help:product.uom,factor:0"
+msgctxt "field:product.uom.category,write_date:"
+msgid "Write Date"
+msgstr ""
+
+msgctxt "field:product.uom.category,write_uid:"
+msgid "Write User"
+msgstr ""
+
+msgctxt "help:product.uom,factor:"
msgid ""
"The coefficient for the formula:\n"
"coef (base unit) = 1 (this unit)"
msgstr "El coeficiente para la fórmula:"
-msgctxt "help:product.uom,rate:0"
+msgctxt "help:product.uom,rate:"
msgid ""
"The coefficient for the formula:\n"
"1 (base unit) = coef (this unit)"
@@ -226,19 +339,19 @@ msgctxt "model:ir.ui.menu,name:menu_uom_form"
msgid "Units of Measure"
msgstr "Unidades de Medida"
-msgctxt "model:product.category,name:0"
+msgctxt "model:product.category,name:"
msgid "Product Category"
msgstr "CategorÃa de Producto"
-msgctxt "model:product.product,name:0"
+msgctxt "model:product.product,name:"
msgid "Product"
msgstr "Producto"
-msgctxt "model:product.template,name:0"
+msgctxt "model:product.template,name:"
msgid "Product Template"
msgstr "Plantilla de Producto"
-msgctxt "model:product.uom,name:0"
+msgctxt "model:product.uom,name:"
msgid "Unit of measure"
msgstr "Unidad de medida"
@@ -498,7 +611,7 @@ msgctxt "model:product.uom,symbol:uom_yard"
msgid "yd"
msgstr "yd"
-msgctxt "model:product.uom.category,name:0"
+msgctxt "model:product.uom.category,name:"
msgid "Product uom category"
msgstr "CategorÃa de udm de Producto"
@@ -530,82 +643,82 @@ msgctxt "model:res.group,name:group_product_admin"
msgid "Product Administration"
msgstr "Productos"
-msgctxt "selection:product.template,cost_price_method:0"
+msgctxt "selection:product.template,cost_price_method:"
msgid "Average"
msgstr "Promedio"
-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:0"
+msgctxt "selection:product.template,cost_price_method:"
msgid "Fixed"
msgstr "Fijo"
-msgctxt "selection:product.template,type:0"
-msgid "Consumable"
-msgstr "Consumible"
+msgctxt "selection:product.template,type:"
+msgid "Assets"
+msgstr ""
-msgctxt "selection:product.template,type:0"
+msgctxt "selection:product.template,type:"
+msgid "Goods"
+msgstr ""
+
+msgctxt "selection:product.template,type:"
msgid "Service"
msgstr "Servicios"
-msgctxt "selection:product.template,type:0"
-msgid "Stockable"
-msgstr "Almacenable"
-
-msgctxt "view:product.category:0"
+msgctxt "view:product.category:"
msgid "Children"
msgstr "Hij at s"
-msgctxt "view:product.category:0"
+msgctxt "view:product.category:"
msgid "Product Categories"
msgstr "CategorÃas de Producto"
-msgctxt "view:product.category:0"
+msgctxt "view:product.category:"
msgid "Product Category"
msgstr "CategorÃa de Producto"
-msgctxt "view:product.product:0"
+msgctxt "view:product.product:"
msgid "General"
msgstr "General"
-msgctxt "view:product.product:0"
+msgctxt "view:product.product:"
msgid "Product"
msgstr "Producto"
-msgctxt "view:product.product:0"
+msgctxt "view:product.product:"
msgid "Product Suppliers"
msgstr "Proveedores de Productos"
-msgctxt "view:product.product:0"
+msgctxt "view:product.product:"
msgid "Products"
msgstr "Productos"
-msgctxt "view:product.template:0"
+msgctxt "view:product.template:"
msgid "General"
msgstr "General"
-msgctxt "view:product.template:0"
+msgctxt "view:product.template:"
msgid "Product Template"
msgstr "Plantilla de Producto"
-msgctxt "view:product.template:0"
+msgctxt "view:product.template:"
msgid "Product Templates"
msgstr "Plantillas de Producto"
-msgctxt "view:product.uom.category:0"
+msgctxt "view:product.uom.category:"
msgid "Categories of Unit of Measure"
msgstr "CategorÃas de Unidad de Medida"
-msgctxt "view:product.uom.category:0"
+msgctxt "view:product.uom.category:"
msgid "Category of Unit of Measure"
msgstr "CategorÃa de unidad de Medida"
-msgctxt "view:product.uom:0"
+msgctxt "view:product.uom:"
msgid "Unit of Measure"
msgstr "Unidad de Medida"
-msgctxt "view:product.uom:0"
+msgctxt "view:product.uom:"
msgid "Units of Measure"
msgstr "Unidades de Medida"
diff --git a/locale/es_ES.po b/locale/es_ES.po
index c32bb98..c3ae0ba 100644
--- a/locale/es_ES.po
+++ b/locale/es_ES.po
@@ -2,162 +2,269 @@
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
-#, fuzzy
-msgctxt "error:product.category:0"
+msgctxt "error:product.category:"
msgid "You can not create recursive categories!"
-msgstr "No puede crear categorÃas recursivas"
+msgstr "No puede crear categorÃas recursivas."
-msgctxt "error:product.uom:0"
+msgctxt "error:product.uom:"
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 "
-"desactivarla y crear una nueva."
+"Si no se ha usado la UdM puede eliminarla. En caso contrario, puede "
+"desactivarla y crear una de nueva."
-msgctxt "error:product.uom:0"
+msgctxt "error:product.uom:"
msgid "Invalid Factor and Rate values!"
-msgstr ""
+msgstr "Los valores de factor y conversión no son correctos."
-msgctxt "error:product.uom:0"
+msgctxt "error:product.uom:"
msgid "Rate and factor can not be both equal to zero."
-msgstr "Conversión y factor no pueden ser cero simultáneamente."
+msgstr "La conversión y el factor no pueden ser cero simultáneamente."
-msgctxt "error:product.uom:0"
+msgctxt "error:product.uom:"
msgid "You cannot change Rate, Factor or Category on a Unit of Measure. "
msgstr ""
"No puede cambiar la conversión, el factor o la categorÃa de una unidad de "
"medida."
-msgctxt "field:product.category,childs:0"
+msgctxt "field:product.category,childs:"
msgid "Children"
msgstr "Hijos"
-msgctxt "field:product.category,name:0"
+msgctxt "field:product.category,create_date:"
+msgid "Create Date"
+msgstr "Fecha creación"
+
+msgctxt "field:product.category,create_uid:"
+msgid "Create User"
+msgstr "Usuario creación"
+
+msgctxt "field:product.category,id:"
+msgid "ID"
+msgstr "ID"
+
+msgctxt "field:product.category,name:"
msgid "Name"
msgstr "Nombre"
-msgctxt "field:product.category,parent:0"
+msgctxt "field:product.category,parent:"
msgid "Parent"
msgstr "Padre"
-msgctxt "field:product.category,rec_name:0"
+msgctxt "field:product.category,rec_name:"
msgid "Name"
msgstr "Nombre"
-msgctxt "field:product.product,code:0"
+msgctxt "field:product.category,write_date:"
+msgid "Write Date"
+msgstr "Fecha modificación"
+
+msgctxt "field:product.category,write_uid:"
+msgid "Write User"
+msgstr "Usuario modificación"
+
+msgctxt "field:product.product,code:"
msgid "Code"
msgstr "Código"
-msgctxt "field:product.product,description:0"
+msgctxt "field:product.product,create_date:"
+msgid "Create Date"
+msgstr "Fecha creación"
+
+msgctxt "field:product.product,create_uid:"
+msgid "Create User"
+msgstr "Usuario creación"
+
+msgctxt "field:product.product,description:"
msgid "Description"
msgstr "Descripción"
-msgctxt "field:product.product,rec_name:0"
+msgctxt "field:product.product,id:"
+msgid "ID"
+msgstr "ID"
+
+msgctxt "field:product.product,rec_name:"
msgid "Name"
msgstr "Nombre"
-msgctxt "field:product.product,template:0"
+msgctxt "field:product.product,template:"
msgid "Product Template"
msgstr "Plantilla de producto"
-msgctxt "field:product.template,active:0"
+msgctxt "field:product.product,write_date:"
+msgid "Write Date"
+msgstr "Fecha modificación"
+
+msgctxt "field:product.product,write_uid:"
+msgid "Write User"
+msgstr "Usuario modificación"
+
+msgctxt "field:product.template,active:"
msgid "Active"
msgstr "Activo"
-msgctxt "field:product.template,category:0"
+msgctxt "field:product.template,category:"
msgid "Category"
msgstr "CategorÃa"
-msgctxt "field:product.template,cost_price:0"
+msgctxt "field:product.template,consumable:"
+msgid "Consumable"
+msgstr "Consumible"
+
+msgctxt "field:product.template,cost_price:"
msgid "Cost Price"
msgstr "Precio de coste"
-msgctxt "field:product.template,cost_price_method:0"
+msgctxt "field:product.template,cost_price_method:"
msgid "Cost Method"
msgstr "Método de coste"
-msgctxt "field:product.template,cost_price_uom:0"
+msgctxt "field:product.template,cost_price_uom:"
msgid "Cost Price"
msgstr "Precio de coste"
-msgctxt "field:product.template,default_uom:0"
+msgctxt "field:product.template,create_date:"
+msgid "Create Date"
+msgstr "Fecha creación"
+
+msgctxt "field:product.template,create_uid:"
+msgid "Create User"
+msgstr "Usuario creación"
+
+msgctxt "field:product.template,default_uom:"
msgid "Default UOM"
-msgstr "UdM predeterminada"
+msgstr "UdM por defecto"
+
+msgctxt "field:product.template,default_uom_category:"
+msgid "Default UOM Category"
+msgstr "CategorÃa por defecto UdM"
-msgctxt "field:product.template,list_price:0"
+msgctxt "field:product.template,id:"
+msgid "ID"
+msgstr "ID"
+
+msgctxt "field:product.template,list_price:"
msgid "List Price"
-msgstr "Precio de lista"
+msgstr "Precio de venta"
-msgctxt "field:product.template,list_price_uom:0"
+msgctxt "field:product.template,list_price_uom:"
msgid "List Price"
-msgstr "Precio de lista"
+msgstr "Precio de venta"
-msgctxt "field:product.template,name:0"
+msgctxt "field:product.template,name:"
msgid "Name"
msgstr "Nombre"
-msgctxt "field:product.template,products:0"
+msgctxt "field:product.template,products:"
msgid "Products"
msgstr "Productos"
-msgctxt "field:product.template,rec_name:0"
+msgctxt "field:product.template,rec_name:"
msgid "Name"
msgstr "Nombre"
-msgctxt "field:product.template,type:0"
+msgctxt "field:product.template,type:"
msgid "Type"
msgstr "Tipo"
-msgctxt "field:product.uom,active:0"
+msgctxt "field:product.template,write_date:"
+msgid "Write Date"
+msgstr "Fecha modificación"
+
+msgctxt "field:product.template,write_uid:"
+msgid "Write User"
+msgstr "Usuario modificación"
+
+msgctxt "field:product.uom,active:"
msgid "Active"
msgstr "Activo"
-msgctxt "field:product.uom,category:0"
+msgctxt "field:product.uom,category:"
msgid "UOM Category"
msgstr "CategorÃa de UdM"
-msgctxt "field:product.uom,digits:0"
+msgctxt "field:product.uom,create_date:"
+msgid "Create Date"
+msgstr "Fecha creación"
+
+msgctxt "field:product.uom,create_uid:"
+msgid "Create User"
+msgstr "Usuario creación"
+
+msgctxt "field:product.uom,digits:"
msgid "Display Digits"
msgstr "Decimales a mostrar"
-msgctxt "field:product.uom,factor:0"
+msgctxt "field:product.uom,factor:"
msgid "Factor"
msgstr "Factor"
-msgctxt "field:product.uom,name:0"
+msgctxt "field:product.uom,id:"
+msgid "ID"
+msgstr "ID"
+
+msgctxt "field:product.uom,name:"
msgid "Name"
msgstr "Nombre"
-msgctxt "field:product.uom,rate:0"
+msgctxt "field:product.uom,rate:"
msgid "Rate"
msgstr "Conversión"
-msgctxt "field:product.uom,rec_name:0"
+msgctxt "field:product.uom,rec_name:"
msgid "Name"
msgstr "Nombre"
-msgctxt "field:product.uom,rounding:0"
+msgctxt "field:product.uom,rounding:"
msgid "Rounding Precision"
msgstr "Precisión de redondeo"
-msgctxt "field:product.uom,symbol:0"
+msgctxt "field:product.uom,symbol:"
msgid "Symbol"
msgstr "SÃmbolo"
-msgctxt "field:product.uom.category,name:0"
+msgctxt "field:product.uom,write_date:"
+msgid "Write Date"
+msgstr "Fecha modificación"
+
+msgctxt "field:product.uom,write_uid:"
+msgid "Write User"
+msgstr "Usuario modificación"
+
+msgctxt "field:product.uom.category,create_date:"
+msgid "Create Date"
+msgstr "Fecha creación"
+
+msgctxt "field:product.uom.category,create_uid:"
+msgid "Create User"
+msgstr "Usuario creación"
+
+msgctxt "field:product.uom.category,id:"
+msgid "ID"
+msgstr "ID"
+
+msgctxt "field:product.uom.category,name:"
msgid "Name"
msgstr "Nombre"
-msgctxt "field:product.uom.category,rec_name:0"
+msgctxt "field:product.uom.category,rec_name:"
msgid "Name"
msgstr "Nombre"
-msgctxt "field:product.uom.category,uoms:0"
+msgctxt "field:product.uom.category,uoms:"
msgid "Unit of Measures"
msgstr "Unidades de medidas"
-msgctxt "help:product.uom,factor:0"
+msgctxt "field:product.uom.category,write_date:"
+msgid "Write Date"
+msgstr "Fecha modificación"
+
+msgctxt "field:product.uom.category,write_uid:"
+msgid "Write User"
+msgstr "Usuario modificación"
+
+msgctxt "help:product.uom,factor:"
msgid ""
"The coefficient for the formula:\n"
"coef (base unit) = 1 (this unit)"
@@ -165,7 +272,7 @@ msgstr ""
"El coeficiente de la fórmula:\n"
"coeficiente (unidad base) = 1 (esta unidad)"
-msgctxt "help:product.uom,rate:0"
+msgctxt "help:product.uom,rate:"
msgid ""
"The coefficient for the formula:\n"
"1 (base unit) = coef (this unit)"
@@ -173,7 +280,6 @@ msgstr ""
"El coeficiente de la fórmula:\n"
"1 (unidad base) = coeficiente (esta unidad)"
-#, fuzzy
msgctxt "model:ir.action,name:act_category_list"
msgid "Categories"
msgstr "CategorÃas"
@@ -198,7 +304,6 @@ msgctxt "model:ir.action,name:act_uom_form"
msgid "Units of Measure"
msgstr "Unidades de medida"
-#, fuzzy
msgctxt "model:ir.ui.menu,name:menu_category_list"
msgid "Categories"
msgstr "CategorÃas"
@@ -223,19 +328,19 @@ msgctxt "model:ir.ui.menu,name:menu_uom_form"
msgid "Units of Measure"
msgstr "Unidades de medida"
-msgctxt "model:product.category,name:0"
+msgctxt "model:product.category,name:"
msgid "Product Category"
msgstr "CategorÃa de producto"
-msgctxt "model:product.product,name:0"
+msgctxt "model:product.product,name:"
msgid "Product"
msgstr "Producto"
-msgctxt "model:product.template,name:0"
+msgctxt "model:product.template,name:"
msgid "Product Template"
msgstr "Plantilla de producto"
-msgctxt "model:product.uom,name:0"
+msgctxt "model:product.uom,name:"
msgid "Unit of measure"
msgstr "Unidad de medida"
@@ -249,7 +354,7 @@ msgstr "Quilate"
msgctxt "model:product.uom,name:uom_centimeter"
msgid "centimeter"
-msgstr "centÃmetro"
+msgstr "CentÃmetro"
msgctxt "model:product.uom,name:uom_cubic_centimeter"
msgid "Cubic centimeter"
@@ -495,7 +600,7 @@ msgctxt "model:product.uom,symbol:uom_yard"
msgid "yd"
msgstr "yd"
-msgctxt "model:product.uom.category,name:0"
+msgctxt "model:product.uom.category,name:"
msgid "Product uom category"
msgstr "CategorÃa de UdM de producto"
@@ -527,78 +632,78 @@ msgctxt "model:res.group,name:group_product_admin"
msgid "Product Administration"
msgstr "Administración de productos"
-msgctxt "selection:product.template,cost_price_method:0"
+msgctxt "selection:product.template,cost_price_method:"
msgid "Average"
msgstr "Promedio"
-msgctxt "selection:product.template,cost_price_method:0"
+msgctxt "selection:product.template,cost_price_method:"
msgid "Fixed"
msgstr "Fijo"
-msgctxt "selection:product.template,type:0"
-msgid "Consumable"
-msgstr "Consumible"
+msgctxt "selection:product.template,type:"
+msgid "Assets"
+msgstr "Activos"
-msgctxt "selection:product.template,type:0"
+msgctxt "selection:product.template,type:"
+msgid "Goods"
+msgstr "Bienes"
+
+msgctxt "selection:product.template,type:"
msgid "Service"
msgstr "Servicio"
-msgctxt "selection:product.template,type:0"
-msgid "Stockable"
-msgstr "Almacenable"
-
-msgctxt "view:product.category:0"
+msgctxt "view:product.category:"
msgid "Children"
msgstr "Hijos"
-msgctxt "view:product.category:0"
+msgctxt "view:product.category:"
msgid "Product Categories"
msgstr "CategorÃas de producto"
-msgctxt "view:product.category:0"
+msgctxt "view:product.category:"
msgid "Product Category"
msgstr "CategorÃa de producto"
-msgctxt "view:product.product:0"
+msgctxt "view:product.product:"
msgid "General"
msgstr "General"
-msgctxt "view:product.product:0"
+msgctxt "view:product.product:"
msgid "Product"
msgstr "Producto"
-msgctxt "view:product.product:0"
+msgctxt "view:product.product:"
msgid "Product Suppliers"
-msgstr "Proveedores de productos"
+msgstr "Proveedores de producto"
-msgctxt "view:product.product:0"
+msgctxt "view:product.product:"
msgid "Products"
msgstr "Productos"
-msgctxt "view:product.template:0"
+msgctxt "view:product.template:"
msgid "General"
msgstr "General"
-msgctxt "view:product.template:0"
+msgctxt "view:product.template:"
msgid "Product Template"
msgstr "Plantilla de producto"
-msgctxt "view:product.template:0"
+msgctxt "view:product.template:"
msgid "Product Templates"
msgstr "Plantillas de producto"
-msgctxt "view:product.uom.category:0"
+msgctxt "view:product.uom.category:"
msgid "Categories of Unit of Measure"
msgstr "CategorÃas de unidades de medida"
-msgctxt "view:product.uom.category:0"
+msgctxt "view:product.uom.category:"
msgid "Category of Unit of Measure"
msgstr "CategorÃa de unidad de medida"
-msgctxt "view:product.uom:0"
+msgctxt "view:product.uom:"
msgid "Unit of Measure"
msgstr "Unidad de medida"
-msgctxt "view:product.uom:0"
+msgctxt "view:product.uom:"
msgid "Units of Measure"
msgstr "Unidades de medida"
diff --git a/locale/fr_FR.po b/locale/fr_FR.po
index 56c2a80..b91b033 100644
--- a/locale/fr_FR.po
+++ b/locale/fr_FR.po
@@ -2,11 +2,15 @@
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
-msgctxt "error:product.category:0"
+msgctxt "error:product.category:"
msgid "You can not create recursive categories!"
msgstr "Vous ne pouvez pas créer des catégories récursives !"
-msgctxt "error:product.template:0"
+msgctxt "error:product.category:"
+msgid "You can not create recursive categories!"
+msgstr "Vous ne pouvez pas créer des catégories récursives !"
+
+msgctxt "error:product.template:"
msgid ""
"You cannot change the default uom for a product which is associated to stock"
" moves."
@@ -14,7 +18,15 @@ msgstr ""
"Vous ne pouvez pas changer l'UDM par défaut pour un produit qui a déjà fait "
"l'objet de mouvements de stock"
-msgctxt "error:product.uom:0"
+msgctxt "error:product.uom:"
+msgid ""
+"If the UOM is still not used, you can delete it otherwise you can deactivate"
+" it and create a new one."
+msgstr ""
+"Si l'UDM n'est pas utilisée, vous pouvez la supprimer, sinon vous pouvez la "
+"désactiver et en créer une nouvelle."
+
+msgctxt "error:product.uom:"
msgid ""
"If the UOM is still not used, you can delete it otherwise you can deactivate"
" it and create a new one."
@@ -22,149 +34,271 @@ msgstr ""
"Si l'UDM n'est pas utilisée, vous pouvez la supprimer, sinon vous pouvez la "
"désactiver et en créer une nouvelle."
-msgctxt "error:product.uom:0"
+msgctxt "error:product.uom:"
msgid "Invalid Factor and Rate values!"
msgstr "Valeurs de facteur et de taux invalides !"
-msgctxt "error:product.uom:0"
+msgctxt "error:product.uom:"
+msgid "Invalid Factor and Rate values!"
+msgstr "Valeurs de facteur et de taux invalides !"
+
+msgctxt "error:product.uom:"
+msgid "Rate and factor can not be both equal to zero."
+msgstr "Le taux et le facteur ne peuvent pas être égaux à zéro."
+
+msgctxt "error:product.uom:"
msgid "Rate and factor can not be both equal to zero."
msgstr "Le taux et le facteur ne peuvent pas être égaux à zéro."
-msgctxt "error:product.uom:0"
+msgctxt "error:product.uom:"
msgid "You cannot change Rate, Factor or Category on a Unit of Measure. "
msgstr ""
"Vous ne pouvez pas changer le taux, le facteur ou la catégorie d'une unité "
"de mesure."
-msgctxt "field:product.category,childs:0"
+msgctxt "error:product.uom:"
+msgid "You cannot change Rate, Factor or Category on a Unit of Measure. "
+msgstr ""
+"Vous ne pouvez pas changer le taux, le facteur ou la catégorie d'une unité "
+"de mesure."
+
+msgctxt "field:product.category,childs:"
msgid "Children"
msgstr "Enfants"
-msgctxt "field:product.category,name:0"
+msgctxt "field:product.category,create_date:"
+msgid "Create Date"
+msgstr "Date de création"
+
+msgctxt "field:product.category,create_uid:"
+msgid "Create User"
+msgstr "Créé par"
+
+msgctxt "field:product.category,id:"
+msgid "ID"
+msgstr "ID"
+
+msgctxt "field:product.category,name:"
msgid "Name"
msgstr "Nom"
-msgctxt "field:product.category,parent:0"
+msgctxt "field:product.category,parent:"
msgid "Parent"
msgstr "Parent"
-msgctxt "field:product.category,rec_name:0"
+msgctxt "field:product.category,rec_name:"
msgid "Name"
msgstr "Nom"
-msgctxt "field:product.product,code:0"
+msgctxt "field:product.category,write_date:"
+msgid "Write Date"
+msgstr "Date de mise à jour"
+
+msgctxt "field:product.category,write_uid:"
+msgid "Write User"
+msgstr "Mis à jour par"
+
+msgctxt "field:product.product,code:"
msgid "Code"
msgstr "Code"
-msgctxt "field:product.product,description:0"
+msgctxt "field:product.product,create_date:"
+msgid "Create Date"
+msgstr "Date de création"
+
+msgctxt "field:product.product,create_uid:"
+msgid "Create User"
+msgstr "Créé par"
+
+msgctxt "field:product.product,description:"
msgid "Description"
msgstr "Description"
-msgctxt "field:product.product,rec_name:0"
+msgctxt "field:product.product,id:"
+msgid "ID"
+msgstr "ID"
+
+msgctxt "field:product.product,rec_name:"
msgid "Name"
msgstr "Nom"
-msgctxt "field:product.product,template:0"
+msgctxt "field:product.product,template:"
msgid "Product Template"
msgstr "Modèle produit"
-msgctxt "field:product.template,active:0"
+msgctxt "field:product.product,write_date:"
+msgid "Write Date"
+msgstr "Date de mise à jour"
+
+msgctxt "field:product.product,write_uid:"
+msgid "Write User"
+msgstr "Mis à jour par"
+
+msgctxt "field:product.template,active:"
msgid "Active"
msgstr "Actif"
-msgctxt "field:product.template,category:0"
+msgctxt "field:product.template,category:"
msgid "Category"
msgstr "Catégorie"
-msgctxt "field:product.template,cost_price:0"
+msgctxt "field:product.template,consumable:"
+msgid "Consumable"
+msgstr "Consomable"
+
+msgctxt "field:product.template,cost_price:"
msgid "Cost Price"
msgstr "Prix de revient"
-msgctxt "field:product.template,cost_price_method:0"
+msgctxt "field:product.template,cost_price_method:"
msgid "Cost Method"
msgstr "Méthode de coût"
-msgctxt "field:product.template,cost_price_uom:0"
+msgctxt "field:product.template,cost_price_uom:"
msgid "Cost Price"
msgstr "Prix de revient"
-msgctxt "field:product.template,default_uom:0"
+msgctxt "field:product.template,create_date:"
+msgid "Create Date"
+msgstr "Date de création"
+
+msgctxt "field:product.template,create_uid:"
+msgid "Create User"
+msgstr "Créé par"
+
+msgctxt "field:product.template,default_uom:"
msgid "Default UOM"
msgstr "UDM par défaut"
-msgctxt "field:product.template,list_price:0"
+msgctxt "field:product.template,default_uom_category:"
+msgid "Default UOM Category"
+msgstr "Catégorie d'unité de mesure par défaut"
+
+msgctxt "field:product.template,id:"
+msgid "ID"
+msgstr "ID"
+
+msgctxt "field:product.template,list_price:"
msgid "List Price"
msgstr "Prix listé"
-msgctxt "field:product.template,list_price_uom:0"
+msgctxt "field:product.template,list_price_uom:"
msgid "List Price"
msgstr "Prix listé"
-msgctxt "field:product.template,name:0"
+msgctxt "field:product.template,name:"
msgid "Name"
msgstr "Nom"
-msgctxt "field:product.template,products:0"
+msgctxt "field:product.template,products:"
msgid "Products"
msgstr "Produits"
-msgctxt "field:product.template,rec_name:0"
+msgctxt "field:product.template,rec_name:"
msgid "Name"
msgstr "Nom"
-msgctxt "field:product.template,type:0"
+msgctxt "field:product.template,type:"
msgid "Type"
msgstr "Type"
-msgctxt "field:product.uom,active:0"
+msgctxt "field:product.template,write_date:"
+msgid "Write Date"
+msgstr "Date de mise à jour"
+
+msgctxt "field:product.template,write_uid:"
+msgid "Write User"
+msgstr "Mis à jour par"
+
+msgctxt "field:product.uom,active:"
msgid "Active"
msgstr "Actif"
-msgctxt "field:product.uom,category:0"
+msgctxt "field:product.uom,category:"
msgid "UOM Category"
msgstr "Catégorie d'UDM"
-msgctxt "field:product.uom,digits:0"
+msgctxt "field:product.uom,create_date:"
+msgid "Create Date"
+msgstr "Date de création"
+
+msgctxt "field:product.uom,create_uid:"
+msgid "Create User"
+msgstr "Créé par"
+
+msgctxt "field:product.uom,digits:"
msgid "Display Digits"
msgstr "Décimales affichées"
-msgctxt "field:product.uom,factor:0"
+msgctxt "field:product.uom,factor:"
msgid "Factor"
msgstr "Facteur"
-msgctxt "field:product.uom,name:0"
+msgctxt "field:product.uom,id:"
+msgid "ID"
+msgstr "ID"
+
+msgctxt "field:product.uom,name:"
msgid "Name"
msgstr "Nom"
-msgctxt "field:product.uom,rate:0"
+msgctxt "field:product.uom,rate:"
msgid "Rate"
msgstr "Taux"
-msgctxt "field:product.uom,rec_name:0"
+msgctxt "field:product.uom,rec_name:"
msgid "Name"
msgstr "Nom"
-msgctxt "field:product.uom,rounding:0"
+msgctxt "field:product.uom,rounding:"
msgid "Rounding Precision"
msgstr "Précision d'arrondi"
-msgctxt "field:product.uom,symbol:0"
+msgctxt "field:product.uom,symbol:"
msgid "Symbol"
msgstr "Symbole"
-msgctxt "field:product.uom.category,name:0"
+msgctxt "field:product.uom,write_date:"
+msgid "Write Date"
+msgstr "Date de mise à jour"
+
+msgctxt "field:product.uom,write_uid:"
+msgid "Write User"
+msgstr "Mis à jour par"
+
+msgctxt "field:product.uom.category,create_date:"
+msgid "Create Date"
+msgstr "Date de création"
+
+msgctxt "field:product.uom.category,create_uid:"
+msgid "Create User"
+msgstr "Créé par"
+
+msgctxt "field:product.uom.category,id:"
+msgid "ID"
+msgstr "ID"
+
+msgctxt "field:product.uom.category,name:"
msgid "Name"
msgstr "Nom"
-msgctxt "field:product.uom.category,rec_name:0"
+msgctxt "field:product.uom.category,rec_name:"
msgid "Name"
msgstr "Nom"
-msgctxt "field:product.uom.category,uoms:0"
+msgctxt "field:product.uom.category,uoms:"
msgid "Unit of Measures"
msgstr "Unité de mesure"
-msgctxt "help:product.uom,factor:0"
+msgctxt "field:product.uom.category,write_date:"
+msgid "Write Date"
+msgstr "Date de mise à jour"
+
+msgctxt "field:product.uom.category,write_uid:"
+msgid "Write User"
+msgstr "Mis à jour par"
+
+msgctxt "help:product.uom,factor:"
msgid ""
"The coefficient for the formula:\n"
"coef (base unit) = 1 (this unit)"
@@ -172,7 +306,7 @@ msgstr ""
"Le coefficient pour la formule:\n"
"coef (unité de base) = 1 (cette unité)"
-msgctxt "help:product.uom,rate:0"
+msgctxt "help:product.uom,rate:"
msgid ""
"The coefficient for the formula:\n"
"1 (base unit) = coef (this unit)"
@@ -228,19 +362,19 @@ msgctxt "model:ir.ui.menu,name:menu_uom_form"
msgid "Units of Measure"
msgstr "Unités de mesure"
-msgctxt "model:product.category,name:0"
+msgctxt "model:product.category,name:"
msgid "Product Category"
msgstr "Catégorie de produit"
-msgctxt "model:product.product,name:0"
+msgctxt "model:product.product,name:"
msgid "Product"
msgstr "Produit"
-msgctxt "model:product.template,name:0"
+msgctxt "model:product.template,name:"
msgid "Product Template"
msgstr "Modèle produit"
-msgctxt "model:product.uom,name:0"
+msgctxt "model:product.uom,name:"
msgid "Unit of measure"
msgstr "Unité de mesure"
@@ -500,7 +634,7 @@ msgctxt "model:product.uom,symbol:uom_yard"
msgid "yd"
msgstr "yd"
-msgctxt "model:product.uom.category,name:0"
+msgctxt "model:product.uom.category,name:"
msgid "Product uom category"
msgstr "Catégorie d'UDM de produit"
@@ -532,82 +666,138 @@ msgctxt "model:res.group,name:group_product_admin"
msgid "Product Administration"
msgstr "Administration de produits"
-msgctxt "selection:product.template,cost_price_method:0"
+msgctxt "selection:product.template,cost_price_method:"
msgid "Average"
-msgstr "Moyen"
+msgstr "Moyenne"
-msgctxt "selection:product.template,cost_price_method:0"
+msgctxt "selection:product.template,cost_price_method:"
+msgid "Average"
+msgstr "Moyenne"
+
+msgctxt "selection:product.template,cost_price_method:"
msgid "Fixed"
msgstr "Fixe"
-msgctxt "selection:product.template,type:0"
-msgid "Consumable"
-msgstr "Consommable"
+msgctxt "selection:product.template,cost_price_method:"
+msgid "Fixed"
+msgstr "Fixe"
+
+msgctxt "selection:product.template,type:"
+msgid "Assets"
+msgstr "Biens"
-msgctxt "selection:product.template,type:0"
+msgctxt "selection:product.template,type:"
+msgid "Goods"
+msgstr "Marchandises"
+
+msgctxt "selection:product.template,type:"
msgid "Service"
msgstr "Service"
-msgctxt "selection:product.template,type:0"
-msgid "Stockable"
-msgstr "Stockable"
+msgctxt "selection:product.template,type:"
+msgid "Service"
+msgstr "Service"
-msgctxt "view:product.category:0"
+msgctxt "view:product.category:"
msgid "Children"
msgstr "Enfants"
-msgctxt "view:product.category:0"
+msgctxt "view:product.category:"
+msgid "Children"
+msgstr "Enfants"
+
+msgctxt "view:product.category:"
+msgid "Product Categories"
+msgstr "Catégories de produit"
+
+msgctxt "view:product.category:"
msgid "Product Categories"
msgstr "Catégories de produit"
-msgctxt "view:product.category:0"
+msgctxt "view:product.category:"
msgid "Product Category"
msgstr "Catégorie de produit"
-msgctxt "view:product.category:0"
+msgctxt "view:product.category:"
+msgid "Product Category"
+msgstr "Catégorie de produit"
+
+msgctxt "view:product.category:"
msgid "Properties"
msgstr "Propriétés"
-msgctxt "view:product.product:0"
+msgctxt "view:product.product:"
msgid "General"
msgstr "Général"
-msgctxt "view:product.product:0"
+msgctxt "view:product.product:"
msgid "Product"
msgstr "Produit"
-msgctxt "view:product.product:0"
+msgctxt "view:product.product:"
msgid "Products"
msgstr "Produits"
-msgctxt "view:product.product:0"
+msgctxt "view:product.product:"
+msgid "Products"
+msgstr "Produits"
+
+msgctxt "view:product.product:"
msgid "Properties"
msgstr "Propriétés"
-msgctxt "view:product.template:0"
+msgctxt "view:product.template:"
+msgid "General"
+msgstr "Général"
+
+msgctxt "view:product.template:"
msgid "General"
msgstr "Général"
-msgctxt "view:product.template:0"
+msgctxt "view:product.template:"
msgid "Product Template"
msgstr "Modèle produit"
-msgctxt "view:product.template:0"
+msgctxt "view:product.template:"
+msgid "Product Template"
+msgstr "Modèle produit"
+
+msgctxt "view:product.template:"
msgid "Product Templates"
msgstr "Modèles de produit"
-msgctxt "view:product.uom.category:0"
+msgctxt "view:product.template:"
+msgid "Product Templates"
+msgstr "Modèles de produit"
+
+msgctxt "view:product.uom.category:"
+msgid "Categories of Unit of Measure"
+msgstr "Catégories d'Unité de mesure"
+
+msgctxt "view:product.uom.category:"
msgid "Categories of Unit of Measure"
msgstr "Catégories d'Unité de mesure"
-msgctxt "view:product.uom.category:0"
+msgctxt "view:product.uom.category:"
+msgid "Category of Unit of Measure"
+msgstr "Catégorie d'unité de mesure"
+
+msgctxt "view:product.uom.category:"
msgid "Category of Unit of Measure"
msgstr "Catégorie d'unité de mesure"
-msgctxt "view:product.uom:0"
+msgctxt "view:product.uom:"
msgid "Unit of Measure"
msgstr "Unité de mesure"
-msgctxt "view:product.uom:0"
+msgctxt "view:product.uom:"
+msgid "Unit of Measure"
+msgstr "Unité de mesure"
+
+msgctxt "view:product.uom:"
+msgid "Units of Measure"
+msgstr "Unités de mesure"
+
+msgctxt "view:product.uom:"
msgid "Units of Measure"
msgstr "Unités de mesure"
diff --git a/locale/nl_NL.po b/locale/nl_NL.po
index 97a5410..38b3d89 100644
--- a/locale/nl_NL.po
+++ b/locale/nl_NL.po
@@ -3,16 +3,16 @@ msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
#, fuzzy
-msgctxt "error:product.category:0"
+msgctxt "error:product.category:"
msgid "You can not create recursive categories!"
msgstr "U kunt geen recursieve categorieën aanmaken!"
-msgctxt "error:product.template:0"
+msgctxt "error:product.template:"
msgid "There is no account expense/revenue defined on the product %s (%d)"
msgstr ""
"Er is geen kosten-/opbrengstenrekening gedefinieerd voor product %s (%d)"
-msgctxt "error:product.uom:0"
+msgctxt "error:product.uom:"
msgid ""
"If the UOM is still not used, you can delete it otherwise you can deactivate"
" it and create a new one."
@@ -20,270 +20,379 @@ msgstr ""
"Als de maateenheid nog niet is gebruikt kan je hem verwijderen, anders kan "
"je hem deactiveren en een nieuwe aanmaken."
-msgctxt "error:product.uom:0"
+msgctxt "error:product.uom:"
msgid "Invalid Factor and Rate values!"
msgstr "Ongeldige factor en verhouding waarden"
-msgctxt "error:product.uom:0"
+msgctxt "error:product.uom:"
msgid "Rate and factor can not be both equal to zero."
msgstr "Verhouding en factor kunnen niet beiden nul zijn! "
-msgctxt "error:product.uom:0"
+msgctxt "error:product.uom:"
msgid "You cannot change Rate, Factor or Category on a Unit of Measure. "
msgstr ""
"U kunt Verhouding, Factor of Categorie van een maateenheid niet wijzigen."
-msgctxt "field:product.category,account_expense:0"
+msgctxt "field:product.category,account_expense:"
msgid "Account Expense"
msgstr "Kostenrekening"
-msgctxt "field:product.category,account_revenue:0"
+msgctxt "field:product.category,account_revenue:"
msgid "Account Revenue"
msgstr "Opbrengstrekening"
-msgctxt "field:product.category,childs:0"
+msgctxt "field:product.category,childs:"
msgid "Children"
msgstr "Onderliggende niveaus"
-msgctxt "field:product.category,customer_taxes:0"
+msgctxt "field:product.category,create_date:"
+msgid "Create Date"
+msgstr ""
+
+msgctxt "field:product.category,create_uid:"
+msgid "Create User"
+msgstr ""
+
+msgctxt "field:product.category,customer_taxes:"
msgid "Customer Taxes"
msgstr "Belasting klanten"
-msgctxt "field:product.category,name:0"
+msgctxt "field:product.category,id:"
+msgid "ID"
+msgstr ""
+
+msgctxt "field:product.category,name:"
msgid "Name"
msgstr "Naam"
-msgctxt "field:product.category,parent:0"
+msgctxt "field:product.category,parent:"
msgid "Parent"
msgstr "Bovenliggend niveau"
-msgctxt "field:product.category,rec_name:0"
+msgctxt "field:product.category,rec_name:"
msgid "Name"
msgstr "Naam"
-msgctxt "field:product.category,supplier_taxes:0"
+msgctxt "field:product.category,supplier_taxes:"
msgid "Supplier Taxes"
msgstr "Belastingen inkoop"
-msgctxt "field:product.category-customer-account.tax,category:0"
+msgctxt "field:product.category,write_date:"
+msgid "Write Date"
+msgstr ""
+
+msgctxt "field:product.category,write_uid:"
+msgid "Write User"
+msgstr ""
+
+msgctxt "field:product.category-customer-account.tax,category:"
msgid "Category"
msgstr "Categorie"
-msgctxt "field:product.category-customer-account.tax,rec_name:0"
+msgctxt "field:product.category-customer-account.tax,rec_name:"
msgid "Name"
msgstr "Naam"
-msgctxt "field:product.category-customer-account.tax,tax:0"
+msgctxt "field:product.category-customer-account.tax,tax:"
msgid "Tax"
msgstr "Belasting"
-msgctxt "field:product.category-supplier-account.tax,category:0"
+msgctxt "field:product.category-supplier-account.tax,category:"
msgid "Category"
msgstr "Categorie"
-msgctxt "field:product.category-supplier-account.tax,rec_name:0"
+msgctxt "field:product.category-supplier-account.tax,rec_name:"
msgid "Name"
msgstr "Naam"
-msgctxt "field:product.category-supplier-account.tax,tax:0"
+msgctxt "field:product.category-supplier-account.tax,tax:"
msgid "Tax"
msgstr "Belasting"
-msgctxt "field:product.product,code:0"
+msgctxt "field:product.product,code:"
msgid "Code"
msgstr "Code"
-msgctxt "field:product.product,description:0"
+msgctxt "field:product.product,create_date:"
+msgid "Create Date"
+msgstr ""
+
+msgctxt "field:product.product,create_uid:"
+msgid "Create User"
+msgstr ""
+
+msgctxt "field:product.product,description:"
msgid "Description"
msgstr "Omschrijving"
-msgctxt "field:product.product,rec_name:0"
+msgctxt "field:product.product,id:"
+msgid "ID"
+msgstr ""
+
+msgctxt "field:product.product,rec_name:"
msgid "Name"
msgstr "Naam"
-msgctxt "field:product.product,template:0"
+msgctxt "field:product.product,template:"
msgid "Product Template"
msgstr "Productsjabloon"
-msgctxt "field:product.template,account_category:0"
+msgctxt "field:product.product,write_date:"
+msgid "Write Date"
+msgstr ""
+
+msgctxt "field:product.product,write_uid:"
+msgid "Write User"
+msgstr ""
+
+msgctxt "field:product.template,account_category:"
msgid "Use Category's accounts"
msgstr "Gebruik de rekeningen van de categorie"
-msgctxt "field:product.template,account_expense:0"
+msgctxt "field:product.template,account_expense:"
msgid "Account Expense"
msgstr "Kostenrekening"
-msgctxt "field:product.template,account_expense_used:0"
+msgctxt "field:product.template,account_expense_used:"
msgid "Account Expense Used"
msgstr "Gebruikte kostenrekening"
-msgctxt "field:product.template,account_revenue:0"
+msgctxt "field:product.template,account_revenue:"
msgid "Account Revenue"
msgstr "Opbrengstrekening"
-msgctxt "field:product.template,account_revenue_used:0"
+msgctxt "field:product.template,account_revenue_used:"
msgid "Account Revenue Used"
msgstr "Opbrengstrekening gebruikt"
-msgctxt "field:product.template,active:0"
+msgctxt "field:product.template,active:"
msgid "Active"
msgstr "Actief"
-msgctxt "field:product.template,category:0"
+msgctxt "field:product.template,category:"
msgid "Category"
msgstr "Categorie"
-msgctxt "field:product.template,cost_price:0"
+msgctxt "field:product.template,consumable:"
+msgid "Consumable"
+msgstr ""
+
+msgctxt "field:product.template,cost_price:"
msgid "Cost Price"
msgstr "Kostprijs"
-msgctxt "field:product.template,cost_price_method:0"
+msgctxt "field:product.template,cost_price_method:"
msgid "Cost Method"
msgstr "Kostprijsmethode"
-msgctxt "field:product.template,cost_price_uom:0"
+msgctxt "field:product.template,cost_price_uom:"
msgid "Cost Price"
msgstr "Kostprijs"
-msgctxt "field:product.template,customer_taxes:0"
+msgctxt "field:product.template,create_date:"
+msgid "Create Date"
+msgstr ""
+
+msgctxt "field:product.template,create_uid:"
+msgid "Create User"
+msgstr ""
+
+msgctxt "field:product.template,customer_taxes:"
msgid "Customer Taxes"
msgstr "Belasting klanten"
-msgctxt "field:product.template,customer_taxes_used:0"
+msgctxt "field:product.template,customer_taxes_used:"
msgid "Customer Taxes Used"
msgstr "Belasting klanten gebruikt"
-msgctxt "field:product.template,default_uom:0"
+msgctxt "field:product.template,default_uom:"
msgid "Default UOM"
msgstr "Standaard ME"
-msgctxt "field:product.template,list_price:0"
+msgctxt "field:product.template,default_uom_category:"
+msgid "Default UOM Category"
+msgstr ""
+
+msgctxt "field:product.template,id:"
+msgid "ID"
+msgstr ""
+
+msgctxt "field:product.template,list_price:"
msgid "List Price"
msgstr "Catalogusprijs"
-msgctxt "field:product.template,list_price_uom:0"
+msgctxt "field:product.template,list_price_uom:"
msgid "List Price"
msgstr "Catalogusprijs"
-msgctxt "field:product.template,name:0"
+msgctxt "field:product.template,name:"
msgid "Name"
msgstr "Naam"
-msgctxt "field:product.template,products:0"
+msgctxt "field:product.template,products:"
msgid "Products"
msgstr "Producten"
-msgctxt "field:product.template,rec_name:0"
+msgctxt "field:product.template,rec_name:"
msgid "Name"
msgstr "Naam"
-msgctxt "field:product.template,supplier_taxes:0"
+msgctxt "field:product.template,supplier_taxes:"
msgid "Supplier Taxes"
msgstr "Belastingen inkoop"
-msgctxt "field:product.template,supplier_taxes_used:0"
-msgid "Customer Taxes Used"
+#, fuzzy
+msgctxt "field:product.template,supplier_taxes_used:"
+msgid "Supplier Taxes Used"
msgstr "Belasting klanten gebruikt"
-msgctxt "field:product.template,taxes_category:0"
+msgctxt "field:product.template,taxes_category:"
msgid "Use Category's Taxes"
msgstr "Gebruik de belastingen van de categorie"
-msgctxt "field:product.template,type:0"
+msgctxt "field:product.template,type:"
msgid "Type"
msgstr "Type"
-msgctxt "field:product.template-customer-account.tax,product:0"
+msgctxt "field:product.template,write_date:"
+msgid "Write Date"
+msgstr ""
+
+msgctxt "field:product.template,write_uid:"
+msgid "Write User"
+msgstr ""
+
+msgctxt "field:product.template-customer-account.tax,product:"
msgid "Product Template"
msgstr "Productsjabloon"
-msgctxt "field:product.template-customer-account.tax,rec_name:0"
+msgctxt "field:product.template-customer-account.tax,rec_name:"
msgid "Name"
msgstr "Naam"
-msgctxt "field:product.template-customer-account.tax,tax:0"
+msgctxt "field:product.template-customer-account.tax,tax:"
msgid "Tax"
msgstr "Belasting"
-msgctxt "field:product.template-supplier-account.tax,product:0"
+msgctxt "field:product.template-supplier-account.tax,product:"
msgid "Product Template"
msgstr "Productsjabloon"
-msgctxt "field:product.template-supplier-account.tax,rec_name:0"
+msgctxt "field:product.template-supplier-account.tax,rec_name:"
msgid "Name"
msgstr "Naam"
-msgctxt "field:product.template-supplier-account.tax,tax:0"
+msgctxt "field:product.template-supplier-account.tax,tax:"
msgid "Tax"
msgstr "Belasting"
-msgctxt "field:product.uom,active:0"
+msgctxt "field:product.uom,active:"
msgid "Active"
msgstr "Actief"
-msgctxt "field:product.uom,category:0"
+msgctxt "field:product.uom,category:"
msgid "UOM Category"
msgstr "ME categorie"
-msgctxt "field:product.uom,digits:0"
+msgctxt "field:product.uom,create_date:"
+msgid "Create Date"
+msgstr ""
+
+msgctxt "field:product.uom,create_uid:"
+msgid "Create User"
+msgstr ""
+
+msgctxt "field:product.uom,digits:"
msgid "Display Digits"
msgstr "Zichtbare decimalen"
-msgctxt "field:product.uom,factor:0"
+msgctxt "field:product.uom,factor:"
msgid "Factor"
msgstr "Faktor"
-msgctxt "field:product.uom,name:0"
+msgctxt "field:product.uom,id:"
+msgid "ID"
+msgstr ""
+
+msgctxt "field:product.uom,name:"
msgid "Name"
msgstr "Naam"
-msgctxt "field:product.uom,rate:0"
+msgctxt "field:product.uom,rate:"
msgid "Rate"
msgstr "Verhouding"
-msgctxt "field:product.uom,rec_name:0"
+msgctxt "field:product.uom,rec_name:"
msgid "Name"
msgstr "Naam"
-msgctxt "field:product.uom,rounding:0"
+msgctxt "field:product.uom,rounding:"
msgid "Rounding Precision"
msgstr "Afronding"
-msgctxt "field:product.uom,symbol:0"
+msgctxt "field:product.uom,symbol:"
msgid "Symbol"
msgstr "Symbool"
-msgctxt "field:product.uom.category,name:0"
+msgctxt "field:product.uom,write_date:"
+msgid "Write Date"
+msgstr ""
+
+msgctxt "field:product.uom,write_uid:"
+msgid "Write User"
+msgstr ""
+
+msgctxt "field:product.uom.category,create_date:"
+msgid "Create Date"
+msgstr ""
+
+msgctxt "field:product.uom.category,create_uid:"
+msgid "Create User"
+msgstr ""
+
+msgctxt "field:product.uom.category,id:"
+msgid "ID"
+msgstr ""
+
+msgctxt "field:product.uom.category,name:"
msgid "Name"
msgstr "Naam"
-msgctxt "field:product.uom.category,rec_name:0"
+msgctxt "field:product.uom.category,rec_name:"
msgid "Name"
msgstr "Naam"
-msgctxt "field:product.uom.category,uoms:0"
+msgctxt "field:product.uom.category,uoms:"
msgid "Unit of Measures"
msgstr "Meeteenheid"
-msgctxt "help:product.template,account_category:0"
+msgctxt "field:product.uom.category,write_date:"
+msgid "Write Date"
+msgstr ""
+
+msgctxt "field:product.uom.category,write_uid:"
+msgid "Write User"
+msgstr ""
+
+msgctxt "help:product.template,account_category:"
msgid "Use the accounts defined on the category"
msgstr "Gebruik de rekeningen van de categorie"
-msgctxt "help:product.template,account_expense:0"
+msgctxt "help:product.template,account_expense:"
msgid "This account will be used instead of the one defined on the category."
msgstr ""
"Deze rekening zal gebruikt worden in de plaats van die van de categorie."
-msgctxt "help:product.template,account_revenue:0"
+msgctxt "help:product.template,account_revenue:"
msgid "This account will be used instead of the one defined on the category."
msgstr ""
"Deze rekening zal gebruikt worden in de plaats van die van de categorie."
-msgctxt "help:product.template,taxes_category:0"
+msgctxt "help:product.template,taxes_category:"
msgid "Use the taxes defined on the category"
msgstr "Gebruik de belastingen van de categorie"
-msgctxt "help:product.uom,factor:0"
+msgctxt "help:product.uom,factor:"
msgid ""
"The coefficient for the formula:\n"
"coef (base unit) = 1 (this unit)"
@@ -291,7 +400,7 @@ msgstr ""
"De coëfficiënt voor deze formule:\n"
"coëf (basiseenheid) = 1 (deze eenheid)"
-msgctxt "help:product.uom,rate:0"
+msgctxt "help:product.uom,rate:"
msgid ""
"The coefficient for the formula:\n"
"1 (base unit) = coef (this unit)"
@@ -349,35 +458,35 @@ msgctxt "model:ir.ui.menu,name:menu_uom_form"
msgid "Units of Measure"
msgstr "Meeteenheden"
-msgctxt "model:product.category,name:0"
+msgctxt "model:product.category,name:"
msgid "Product Category"
msgstr "Product categorie"
-msgctxt "model:product.category-customer-account.tax,name:0"
+msgctxt "model:product.category-customer-account.tax,name:"
msgid "Category - Customer Tax"
msgstr "Categorie - belasting klant"
-msgctxt "model:product.category-supplier-account.tax,name:0"
+msgctxt "model:product.category-supplier-account.tax,name:"
msgid "Category - Supplier Tax"
msgstr "Categorie - belasting leverancier"
-msgctxt "model:product.product,name:0"
+msgctxt "model:product.product,name:"
msgid "Product"
msgstr "Product"
-msgctxt "model:product.template,name:0"
+msgctxt "model:product.template,name:"
msgid "Product Template"
msgstr "Productsjabloon"
-msgctxt "model:product.template-customer-account.tax,name:0"
+msgctxt "model:product.template-customer-account.tax,name:"
msgid "Product Template - Customer Tax"
msgstr "Productsjabloon - Belasting verkoop"
-msgctxt "model:product.template-supplier-account.tax,name:0"
+msgctxt "model:product.template-supplier-account.tax,name:"
msgid "Product Template - Supplier Tax"
msgstr "Productsjabloon - Belasting inkoop"
-msgctxt "model:product.uom,name:0"
+msgctxt "model:product.uom,name:"
msgid "Unit of measure"
msgstr "Meeteenheid"
@@ -637,7 +746,7 @@ msgctxt "model:product.uom,symbol:uom_yard"
msgid "yd"
msgstr ""
-msgctxt "model:product.uom.category,name:0"
+msgctxt "model:product.uom.category,name:"
msgid "Product uom category"
msgstr "Product ME catergorie"
@@ -669,78 +778,78 @@ msgctxt "model:res.group,name:group_product_admin"
msgid "Product Administration"
msgstr "Productregistratie"
-msgctxt "selection:product.template,cost_price_method:0"
+msgctxt "selection:product.template,cost_price_method:"
msgid "Average"
msgstr "Gemiddeld"
-msgctxt "selection:product.template,cost_price_method:0"
+msgctxt "selection:product.template,cost_price_method:"
msgid "Fixed"
msgstr "Vast"
-msgctxt "selection:product.template,type:0"
-msgid "Consumable"
-msgstr "Verbruik"
+msgctxt "selection:product.template,type:"
+msgid "Assets"
+msgstr ""
-msgctxt "selection:product.template,type:0"
+msgctxt "selection:product.template,type:"
+msgid "Goods"
+msgstr ""
+
+msgctxt "selection:product.template,type:"
msgid "Service"
msgstr "Service"
-msgctxt "selection:product.template,type:0"
-msgid "Stockable"
-msgstr "Op voorraad"
-
-msgctxt "view:product.category:0"
+msgctxt "view:product.category:"
msgid "Children"
msgstr "Onderliggende niveaus"
-msgctxt "view:product.category:0"
+msgctxt "view:product.category:"
msgid "Product Categories"
msgstr "Product categorieën"
-msgctxt "view:product.category:0"
+msgctxt "view:product.category:"
msgid "Product Category"
msgstr "Product categorie"
-msgctxt "view:product.product:0"
+msgctxt "view:product.product:"
msgid "Products"
msgstr "Producten"
-msgctxt "view:product.template:0"
+msgctxt "view:product.template:"
msgid "Accounting"
msgstr "Boekhouden"
-msgctxt "view:product.template:0"
+msgctxt "view:product.template:"
msgid "Accounts"
msgstr "Rekeningen"
-msgctxt "view:product.template:0"
+msgctxt "view:product.template:"
msgid "General"
msgstr "Algemeen"
-msgctxt "view:product.template:0"
+msgctxt "view:product.template:"
msgid "Product Template"
msgstr "Productsjabloon"
-msgctxt "view:product.template:0"
+msgctxt "view:product.template:"
msgid "Product Templates"
msgstr "Productsjabloon"
-msgctxt "view:product.template:0"
+msgctxt "view:product.template:"
msgid "Taxes"
msgstr "Belastingen"
-msgctxt "view:product.uom.category:0"
+msgctxt "view:product.uom.category:"
msgid "Categories of Unit of Measure"
msgstr "Categorieën van meeteenheden"
-msgctxt "view:product.uom.category:0"
+msgctxt "view:product.uom.category:"
msgid "Category of Unit of Measure"
msgstr "Categorie van meeteenheden"
-msgctxt "view:product.uom:0"
+msgctxt "view:product.uom:"
msgid "Unit of Measure"
msgstr "Meeteenheid"
-msgctxt "view:product.uom:0"
+msgctxt "view:product.uom:"
msgid "Units of Measure"
msgstr "Meeteenheden"
diff --git a/locale/ru_RU.po b/locale/ru_RU.po
index f4d3f81..643c62e 100644
--- a/locale/ru_RU.po
+++ b/locale/ru_RU.po
@@ -3,158 +3,266 @@ msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
#, fuzzy
-msgctxt "error:product.category:0"
+msgctxt "error:product.category:"
msgid "You can not create recursive categories!"
msgstr "Ð’Ñ‹ не можете Ñоздавать рекурÑивные категории!"
-msgctxt "error:product.uom:0"
+msgctxt "error:product.uom:"
msgid ""
"If the UOM is still not used, you can delete it otherwise you can deactivate"
" it and create a new one."
msgstr ""
-msgctxt "error:product.uom:0"
+msgctxt "error:product.uom:"
msgid "Invalid Factor and Rate values!"
msgstr "Ðе правильные Ð·Ð½Ð°Ñ‡ÐµÐ½Ð¸Ñ Ñ„Ð°ÐºÑ‚Ð¾Ñ€Ð° и курÑа"
-msgctxt "error:product.uom:0"
+msgctxt "error:product.uom:"
msgid "Rate and factor can not be both equal to zero."
msgstr "Ставка и фактор не могут быть одновременно равны нулю."
-msgctxt "error:product.uom:0"
+msgctxt "error:product.uom:"
msgid "You cannot change Rate, Factor or Category on a Unit of Measure. "
msgstr ""
"Ð’Ñ‹ не можете изменить КурÑ, фактор или категорию на единицу измерениÑ."
-msgctxt "field:product.category,childs:0"
+msgctxt "field:product.category,childs:"
msgid "Children"
msgstr "Подчиненый"
-msgctxt "field:product.category,name:0"
+msgctxt "field:product.category,create_date:"
+msgid "Create Date"
+msgstr ""
+
+msgctxt "field:product.category,create_uid:"
+msgid "Create User"
+msgstr ""
+
+msgctxt "field:product.category,id:"
+msgid "ID"
+msgstr ""
+
+msgctxt "field:product.category,name:"
msgid "Name"
msgstr "Ðаименование"
-msgctxt "field:product.category,parent:0"
+msgctxt "field:product.category,parent:"
msgid "Parent"
msgstr "ОÑновной"
-msgctxt "field:product.category,rec_name:0"
+msgctxt "field:product.category,rec_name:"
msgid "Name"
msgstr "Ðаименование"
-msgctxt "field:product.product,code:0"
+msgctxt "field:product.category,write_date:"
+msgid "Write Date"
+msgstr ""
+
+msgctxt "field:product.category,write_uid:"
+msgid "Write User"
+msgstr ""
+
+msgctxt "field:product.product,code:"
msgid "Code"
msgstr "Код"
-msgctxt "field:product.product,description:0"
+msgctxt "field:product.product,create_date:"
+msgid "Create Date"
+msgstr ""
+
+msgctxt "field:product.product,create_uid:"
+msgid "Create User"
+msgstr ""
+
+msgctxt "field:product.product,description:"
msgid "Description"
msgstr "ОпиÑание"
-msgctxt "field:product.product,rec_name:0"
+msgctxt "field:product.product,id:"
+msgid "ID"
+msgstr ""
+
+msgctxt "field:product.product,rec_name:"
msgid "Name"
msgstr "Ðаименование"
-msgctxt "field:product.product,template:0"
+msgctxt "field:product.product,template:"
msgid "Product Template"
msgstr "Шаблон Товара"
-msgctxt "field:product.template,active:0"
+msgctxt "field:product.product,write_date:"
+msgid "Write Date"
+msgstr ""
+
+msgctxt "field:product.product,write_uid:"
+msgid "Write User"
+msgstr ""
+
+msgctxt "field:product.template,active:"
msgid "Active"
msgstr "ДейÑтвительнный"
-msgctxt "field:product.template,category:0"
+msgctxt "field:product.template,category:"
msgid "Category"
msgstr "Категории"
-msgctxt "field:product.template,cost_price:0"
+msgctxt "field:product.template,consumable:"
+msgid "Consumable"
+msgstr ""
+
+msgctxt "field:product.template,cost_price:"
msgid "Cost Price"
msgstr "ÐŸÐ¾ÐºÑƒÐ¿Ð½Ð°Ñ Ñ†ÐµÐ½Ð°"
-msgctxt "field:product.template,cost_price_method:0"
+msgctxt "field:product.template,cost_price_method:"
msgid "Cost Method"
msgstr "Затратный метод"
-msgctxt "field:product.template,cost_price_uom:0"
+msgctxt "field:product.template,cost_price_uom:"
msgid "Cost Price"
msgstr "Цена за единицу"
-msgctxt "field:product.template,default_uom:0"
+msgctxt "field:product.template,create_date:"
+msgid "Create Date"
+msgstr ""
+
+msgctxt "field:product.template,create_uid:"
+msgid "Create User"
+msgstr ""
+
+msgctxt "field:product.template,default_uom:"
msgid "Default UOM"
msgstr "По умолчанию ед.измерениÑ"
-msgctxt "field:product.template,list_price:0"
+msgctxt "field:product.template,default_uom_category:"
+msgid "Default UOM Category"
+msgstr ""
+
+msgctxt "field:product.template,id:"
+msgid "ID"
+msgstr ""
+
+msgctxt "field:product.template,list_price:"
msgid "List Price"
msgstr "ПрайÑ-лиÑÑ‚"
-msgctxt "field:product.template,list_price_uom:0"
+msgctxt "field:product.template,list_price_uom:"
msgid "List Price"
msgstr "ПрайÑ-лиÑÑ‚"
-msgctxt "field:product.template,name:0"
+msgctxt "field:product.template,name:"
msgid "Name"
msgstr "Ðаименование"
-msgctxt "field:product.template,products:0"
+msgctxt "field:product.template,products:"
msgid "Products"
msgstr "ТМЦ"
-msgctxt "field:product.template,rec_name:0"
+msgctxt "field:product.template,rec_name:"
msgid "Name"
msgstr "Ðаименование"
-msgctxt "field:product.template,type:0"
+msgctxt "field:product.template,type:"
msgid "Type"
msgstr "Тип"
-msgctxt "field:product.uom,active:0"
+msgctxt "field:product.template,write_date:"
+msgid "Write Date"
+msgstr ""
+
+msgctxt "field:product.template,write_uid:"
+msgid "Write User"
+msgstr ""
+
+msgctxt "field:product.uom,active:"
msgid "Active"
msgstr "ДейÑтвительнный"
-msgctxt "field:product.uom,category:0"
+msgctxt "field:product.uom,category:"
msgid "UOM Category"
msgstr "ÐšÐ°Ñ‚ÐµÐ³Ð¾Ñ€Ð¸Ñ Ð•Ð´.изм."
-msgctxt "field:product.uom,digits:0"
+msgctxt "field:product.uom,create_date:"
+msgid "Create Date"
+msgstr ""
+
+msgctxt "field:product.uom,create_uid:"
+msgid "Create User"
+msgstr ""
+
+msgctxt "field:product.uom,digits:"
msgid "Display Digits"
msgstr "Кол-во знаков поÑле запÑтой"
-msgctxt "field:product.uom,factor:0"
+msgctxt "field:product.uom,factor:"
msgid "Factor"
msgstr "КоÑффициент к оÑновной единице"
-msgctxt "field:product.uom,name:0"
+msgctxt "field:product.uom,id:"
+msgid "ID"
+msgstr ""
+
+msgctxt "field:product.uom,name:"
msgid "Name"
msgstr "Ðаименование"
-msgctxt "field:product.uom,rate:0"
+msgctxt "field:product.uom,rate:"
msgid "Rate"
msgstr "КоÑфициент оÑновной единицы"
-msgctxt "field:product.uom,rec_name:0"
+msgctxt "field:product.uom,rec_name:"
msgid "Name"
msgstr "Ðаименование"
-msgctxt "field:product.uom,rounding:0"
+msgctxt "field:product.uom,rounding:"
msgid "Rounding Precision"
msgstr "ТочноÑÑ‚ÑŒ округлениÑ"
-msgctxt "field:product.uom,symbol:0"
+msgctxt "field:product.uom,symbol:"
msgid "Symbol"
msgstr "УÑловное обозначение"
-msgctxt "field:product.uom.category,name:0"
+msgctxt "field:product.uom,write_date:"
+msgid "Write Date"
+msgstr ""
+
+msgctxt "field:product.uom,write_uid:"
+msgid "Write User"
+msgstr ""
+
+msgctxt "field:product.uom.category,create_date:"
+msgid "Create Date"
+msgstr ""
+
+msgctxt "field:product.uom.category,create_uid:"
+msgid "Create User"
+msgstr ""
+
+msgctxt "field:product.uom.category,id:"
+msgid "ID"
+msgstr ""
+
+msgctxt "field:product.uom.category,name:"
msgid "Name"
msgstr "Ðаименование"
-msgctxt "field:product.uom.category,rec_name:0"
+msgctxt "field:product.uom.category,rec_name:"
msgid "Name"
msgstr "Ðаименование"
-msgctxt "field:product.uom.category,uoms:0"
+msgctxt "field:product.uom.category,uoms:"
msgid "Unit of Measures"
msgstr "Единица измерений"
-msgctxt "help:product.uom,factor:0"
+msgctxt "field:product.uom.category,write_date:"
+msgid "Write Date"
+msgstr ""
+
+msgctxt "field:product.uom.category,write_uid:"
+msgid "Write User"
+msgstr ""
+
+msgctxt "help:product.uom,factor:"
msgid ""
"The coefficient for the formula:\n"
"coef (base unit) = 1 (this unit)"
@@ -162,7 +270,7 @@ msgstr ""
"КоÑффициент по формуле:\n"
"коÑффициент в Ñтом поле (Ð±Ð°Ð·Ð¾Ð²Ð°Ñ ÐµÐ´Ð¸Ð½Ð¸Ñ†Ð°) = 1 (Ñтой ед. измерениÑ)"
-msgctxt "help:product.uom,rate:0"
+msgctxt "help:product.uom,rate:"
msgid ""
"The coefficient for the formula:\n"
"1 (base unit) = coef (this unit)"
@@ -220,19 +328,19 @@ msgctxt "model:ir.ui.menu,name:menu_uom_form"
msgid "Units of Measure"
msgstr "Единицы измерениÑ"
-msgctxt "model:product.category,name:0"
+msgctxt "model:product.category,name:"
msgid "Product Category"
msgstr "ÐšÐ°Ñ‚ÐµÐ³Ð¾Ñ€Ð¸Ñ Ð¢ÐœÐ¦"
-msgctxt "model:product.product,name:0"
+msgctxt "model:product.product,name:"
msgid "Product"
msgstr "ТМЦ"
-msgctxt "model:product.template,name:0"
+msgctxt "model:product.template,name:"
msgid "Product Template"
msgstr "Шаблон ТМЦ"
-msgctxt "model:product.uom,name:0"
+msgctxt "model:product.uom,name:"
msgid "Unit of measure"
msgstr "Единица измерениÑ"
@@ -492,7 +600,7 @@ msgctxt "model:product.uom,symbol:uom_yard"
msgid "yd"
msgstr ""
-msgctxt "model:product.uom.category,name:0"
+msgctxt "model:product.uom.category,name:"
msgid "Product uom category"
msgstr "ÐšÐ°Ñ‚ÐµÐ³Ð¾Ñ€Ð¸Ñ ÐµÐ´. Ð¸Ð·Ð¼ÐµÑ€ÐµÐ½Ð¸Ñ Ð¢ÐœÐ¦"
@@ -524,66 +632,66 @@ msgctxt "model:res.group,name:group_product_admin"
msgid "Product Administration"
msgstr "Управление ТМЦ"
-msgctxt "selection:product.template,cost_price_method:0"
+msgctxt "selection:product.template,cost_price_method:"
msgid "Average"
msgstr "СреднÑÑ Ñ†ÐµÐ½Ð°"
-msgctxt "selection:product.template,cost_price_method:0"
+msgctxt "selection:product.template,cost_price_method:"
msgid "Fixed"
msgstr "ФикÑированнаÑ"
-msgctxt "selection:product.template,type:0"
-msgid "Consumable"
-msgstr "РаÑходные"
+msgctxt "selection:product.template,type:"
+msgid "Assets"
+msgstr ""
-msgctxt "selection:product.template,type:0"
+msgctxt "selection:product.template,type:"
+msgid "Goods"
+msgstr ""
+
+msgctxt "selection:product.template,type:"
msgid "Service"
msgstr "УÑлуги"
-msgctxt "selection:product.template,type:0"
-msgid "Stockable"
-msgstr "Можно хранить"
-
-msgctxt "view:product.category:0"
+msgctxt "view:product.category:"
msgid "Children"
msgstr "Подчиненый"
-msgctxt "view:product.category:0"
+msgctxt "view:product.category:"
msgid "Product Categories"
msgstr "ÐšÐ°Ñ‚ÐµÐ³Ð¾Ñ€Ð¸Ñ Ð¢ÐœÐ¦"
-msgctxt "view:product.category:0"
+msgctxt "view:product.category:"
msgid "Product Category"
msgstr "Категории ТМЦ"
-msgctxt "view:product.product:0"
+msgctxt "view:product.product:"
msgid "Products"
msgstr "ТМЦ"
-msgctxt "view:product.template:0"
+msgctxt "view:product.template:"
msgid "General"
msgstr "ОÑновной"
-msgctxt "view:product.template:0"
+msgctxt "view:product.template:"
msgid "Product Template"
msgstr "Шаблон Товара"
-msgctxt "view:product.template:0"
+msgctxt "view:product.template:"
msgid "Product Templates"
msgstr "Шаблоны Товара"
-msgctxt "view:product.uom.category:0"
+msgctxt "view:product.uom.category:"
msgid "Categories of Unit of Measure"
msgstr "ÐšÐ°Ñ‚ÐµÐ³Ð¾Ñ€Ð¸Ñ ÐµÐ´.измерениÑ"
-msgctxt "view:product.uom.category:0"
+msgctxt "view:product.uom.category:"
msgid "Category of Unit of Measure"
msgstr "Категории ед.измерениÑ"
-msgctxt "view:product.uom:0"
+msgctxt "view:product.uom:"
msgid "Unit of Measure"
msgstr "Единица измерениÑ"
-msgctxt "view:product.uom:0"
+msgctxt "view:product.uom:"
msgid "Units of Measure"
msgstr "Единицы измерениÑ"
diff --git a/product.py b/product.py
index ee3eac2..088d186 100644
--- a/product.py
+++ b/product.py
@@ -4,6 +4,7 @@ from trytond.model import ModelView, ModelSQL, fields
from trytond.pyson import Eval
from trytond.transaction import Transaction
from trytond.pool import Pool
+from trytond.backend import TableHandler
STATES = {
'readonly': ~Eval('active', True),
@@ -17,20 +18,26 @@ class Template(ModelSQL, ModelView):
_description = __doc__
name = fields.Char('Name', size=None, required=True, translate=True,
- select=1, states=STATES, depends=DEPENDS)
+ select=True, states=STATES, depends=DEPENDS)
type = fields.Selection([
- ('stockable', 'Stockable'),
- ('consumable', 'Consumable'),
+ ('goods', 'Goods'),
+ ('assets', 'Assets'),
('service', 'Service')
], 'Type', required=True, states=STATES, depends=DEPENDS)
- category = fields.Many2One('product.category', 'Category', required=True,
+ consumable = fields.Boolean('Consumable',
+ states={
+ 'readonly': ~Eval('active', True),
+ 'invisible': Eval('type', 'goods') != 'goods',
+ },
+ depends=['active', 'type'])
+ category = fields.Many2One('product.category', 'Category',
states=STATES, depends=DEPENDS)
list_price = fields.Property(fields.Numeric('List Price', states=STATES,
- digits=(16, 4), depends=DEPENDS))
+ digits=(16, 4), depends=DEPENDS, required=True))
list_price_uom = fields.Function(fields.Numeric('List Price',
digits=(16, 4)), 'get_price_uom')
cost_price = fields.Property(fields.Numeric('Cost Price',
- states=STATES, digits=(16, 4), depends=DEPENDS))
+ states=STATES, digits=(16, 4), depends=DEPENDS, required=True))
cost_price_uom = fields.Function(fields.Numeric('Cost Price',
digits=(16, 4)), 'get_price_uom')
cost_price_method = fields.Property(fields.Selection([
@@ -40,19 +47,52 @@ class Template(ModelSQL, ModelView):
depends=DEPENDS))
default_uom = fields.Many2One('product.uom', 'Default UOM', required=True,
states=STATES, depends=DEPENDS)
- active = fields.Boolean('Active', select=1)
+ default_uom_category = fields.Function(
+ fields.Many2One('product.uom.category', 'Default UOM Category',
+ on_change_with=['default_uom']),
+ 'get_default_uom_category')
+ active = fields.Boolean('Active', select=True)
products = fields.One2Many('product.product', 'template', 'Products',
states=STATES, depends=DEPENDS)
+ def init(self, module_name):
+ cursor = Transaction().cursor
+
+ super(Template, self).init(module_name)
+
+ table = TableHandler(cursor, self, module_name)
+ # Migration from 2.2: category is no more required
+ table.not_null_action('category', 'remove')
+
+ # Migration from 2.2: new types
+ cursor.execute('UPDATE "' + self._table + '" '
+ 'SET consumable = %s WHERE type = %s', (True, 'consumable'))
+ cursor.execute('UPDATE "' + self._table + '" '
+ 'SET type = %s WHERE type IN (%s, %s)',
+ ('goods', 'stockable', 'consumable'))
+
def default_active(self):
return True
def default_type(self):
- return 'stockable'
+ return 'goods'
def default_cost_price_method(self):
return 'fixed'
+ def on_change_with_default_uom_category(self, values):
+ pool = Pool()
+ uom_obj = pool.get('product.uom')
+ if values.get('default_uom'):
+ uom = uom_obj.browse(values['default_uom'])
+ return uom.category.id
+
+ def get_default_uom_category(self, ids, name):
+ categories = {}
+ for template in self.browse(ids):
+ categories[template.id] = template.default_uom.category.id
+ return categories
+
def get_price_uom(self, ids, name):
product_uom_obj = Pool().get('product.uom')
res = {}
@@ -72,7 +112,7 @@ class Template(ModelSQL, ModelView):
if default is None:
default = {}
default = default.copy()
- default['products'] = False
+ default['products'] = None
return super(Template, self).copy(ids, default=default)
Template()
@@ -85,8 +125,8 @@ class Product(ModelSQL, ModelView):
_inherits = {'product.template': 'template'}
template = fields.Many2One('product.template', 'Product Template',
- required=True, ondelete='CASCADE', select=1)
- code = fields.Char("Code", size=None, select=1)
+ required=True, ondelete='CASCADE', select=True)
+ code = fields.Char("Code", size=None, select=True)
description = fields.Text("Description", translate=True)
def get_rec_name(self, ids, name):
@@ -138,7 +178,7 @@ class Product(ModelSQL, ModelView):
if default is None:
default = {}
default = default.copy()
- default['products'] = False
+ default['products'] = None
new_ids = []
for product in self.browse(ids):
default['template'] = template_obj.copy(product.template.id)
diff --git a/product.xml b/product.xml
index fe87c30..f726a0a 100644
--- a/product.xml
+++ b/product.xml
@@ -46,16 +46,17 @@ this repository contains the full copyright notices and license terms. -->
<field name="type">form</field>
<field name="arch" type="xml">
<![CDATA[
- <form string="Product Template">
+ <form string="Product Template" col="6">
<label name="name"/>
<field name="name" xexpand="1"/>
<label name="active"/>
<field name="active" xexpand="0" width="100"/>
- <notebook colspan="4">
+ <notebook colspan="6">
<page string="General" id="general">
<label name="type"/>
<field name="type"/>
- <newline/>
+ <label name="consumable"/>
+ <field name="consumable"/>
<label name="category"/>
<field name="category" />
<label name="default_uom"/>
@@ -109,8 +110,8 @@ this repository contains the full copyright notices and license terms. -->
<form string="Products"/>
</xpath>
<xpath
- expr="/form/notebook/page[@id="general"]/label[@name="type"]"
- position="before">
+ expr="/form/field[@name='name']"
+ position="after">
<label name="code"/>
<field name="code"/>
</xpath>
@@ -202,7 +203,6 @@ this repository contains the full copyright notices and license terms. -->
</record>
<record model="ir.property" id="property_product_cost_price_method">
- <field name="name">cost_price_method</field>
<field name="field"
search="[('model.model', '=', 'product.template'), ('name', '=', 'cost_price_method')]"/>
<field name="value">,fixed</field>
diff --git a/setup.py b/setup.py
index fb25563..e0ad0c0 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/tests/__init__.py b/tests/__init__.py
index da4d4ce..e00cc8d 100644
--- a/tests/__init__.py
+++ b/tests/__init__.py
@@ -1,4 +1,4 @@
#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 test_product import suite
+from .test_product import suite
diff --git a/tests/test_product.py b/tests/test_product.py
index 753e24d..748f853 100644
--- a/tests/test_product.py
+++ b/tests/test_product.py
@@ -2,7 +2,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.
-import sys, os
+import sys
+import os
DIR = os.path.abspath(os.path.normpath(os.path.join(__file__,
'..', '..', '..', '..', '..', 'trytond')))
if os.path.isdir(DIR):
@@ -15,6 +16,7 @@ from trytond.tests.test_tryton import POOL, DB_NAME, USER, CONTEXT, test_view,\
test_depends
from trytond.transaction import Transaction
+
class ProductTestCase(unittest.TestCase):
'''
Test Product module.
@@ -55,7 +57,7 @@ class ProductTestCase(unittest.TestCase):
})
transaction.cursor.rollback()
- uom_id = self.uom.create({
+ self.uom.create({
'name': 'Test',
'symbol': 'T',
'category': category_id,
@@ -133,7 +135,6 @@ class ProductTestCase(unittest.TestCase):
uom = self.uom.browse(uom_id)
self.assert_(result == self.uom.select_accurate_field(uom))
-
def test0040uom_compute_qty(self):
'''
Test uom compute_qty function.
@@ -188,9 +189,10 @@ class ProductTestCase(unittest.TestCase):
[
('name', '=', to_name),
], limit=1)[0])
- self.assert_(result == self.uom.compute_price(from_uom,
+ self.assert_(result == self.uom.compute_price(from_uom,
price, to_uom))
+
def suite():
suite = trytond.tests.test_tryton.suite()
suite.addTests(unittest.TestLoader().loadTestsFromTestCase(
diff --git a/trytond_product.egg-info/PKG-INFO b/trytond_product.egg-info/PKG-INFO
index 530b678..ea3f75f 100644
--- a/trytond_product.egg-info/PKG-INFO
+++ b/trytond_product.egg-info/PKG-INFO
@@ -1,12 +1,12 @@
-Metadata-Version: 1.1
+Metadata-Version: 1.0
Name: trytond-product
-Version: 2.2.1
+Version: 2.4.0
Summary: Define products, categories of product, units of measure, categories of units of measure.
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.egg-info/SOURCES.txt b/trytond_product.egg-info/SOURCES.txt
index 675589a..3d9c60a 100644
--- a/trytond_product.egg-info/SOURCES.txt
+++ b/trytond_product.egg-info/SOURCES.txt
@@ -18,8 +18,10 @@ uom.xml
doc/index.rst
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_ES.po
locale/fr_FR.po
diff --git a/trytond_product.egg-info/requires.txt b/trytond_product.egg-info/requires.txt
index 8f8cc44..62c6315 100644
--- a/trytond_product.egg-info/requires.txt
+++ b/trytond_product.egg-info/requires.txt
@@ -1 +1 @@
-trytond >= 2.2, < 2.3
\ No newline at end of file
+trytond >= 2.4, < 2.5
\ No newline at end of file
diff --git a/uom.py b/uom.py
index 9d6d957..04501a3 100644
--- a/uom.py
+++ b/uom.py
@@ -2,16 +2,15 @@
#this repository contains the full copyright notices and license terms.
from decimal import Decimal
from trytond.model import ModelView, ModelSQL, fields
-from trytond.model.modelstorage import OPERATORS
from trytond.pyson import Eval
from trytond.transaction import Transaction
-from trytond.pool import Pool
STATES = {
'readonly': ~Eval('active', True),
}
DEPENDS = ['active']
+
class UomCategory(ModelSQL, ModelView):
'Product uom category'
_name = 'product.uom.category'
@@ -46,7 +45,7 @@ class Uom(ModelSQL, ModelView):
'coef (base unit) = 1 (this unit)')
rounding = fields.Float('Rounding Precision', digits=(12, 12),
required=True, states=STATES, depends=DEPENDS)
- digits = fields.Integer('Display Digits')
+ digits = fields.Integer('Display Digits', required=True)
active = fields.Boolean('Active')
def init(self, module_name):
@@ -86,7 +85,7 @@ class Uom(ModelSQL, ModelView):
return 1.0
def default_active(self):
- return 1
+ return True
def default_rounding(self):
return 0.01
@@ -94,27 +93,6 @@ class Uom(ModelSQL, ModelView):
def default_digits(self):
return 2
- def default_category(self):
- category_obj = Pool().get('product.uom.category')
- product_obj = Pool().get('product.product')
- context = Transaction().context
- if 'category' in context:
- if isinstance(context['category'], (tuple, list)) \
- and len(context['category']) > 1 \
- and context['category'][1] in ('uom.category',
- 'product.default_uom.category'):
- if context['category'][1] == 'uom.category':
- if not context['category'][0]:
- return False
- uom = self.browse(context['category'][0])
- return uom.category.id
- else:
- if not context['category'][0]:
- return False
- product = product_obj.browse(context['category'][0])
- return product.default_uom.category.id
- return False
-
def on_change_factor(self, value):
if value.get('factor', 0.0) == 0.0:
return {'rate': 0.0}
@@ -221,7 +199,7 @@ class Uom(ModelSQL, ModelView):
amount = self.round(amount, to_uom.rounding)
return amount
- def compute_price(self, from_uom, price, to_uom=False):
+ def compute_price(self, from_uom, price, to_uom=None):
"""
Convert price for given uom's.
@@ -249,38 +227,4 @@ class Uom(ModelSQL, ModelView):
return new_price
- def search(self, args, offset=0, limit=None, order=None,
- count=False, query_string=False):
- product_obj = Pool().get('product.product')
- args = args[:]
- def process_args(args):
- i = 0
- while i < len(args):
- #add test for xmlrpc that doesn't handle tuple
- if (isinstance(args[i], tuple) \
- or (isinstance(args[i], list) and len(args[i]) > 2 \
- and args[i][1] in OPERATORS)) \
- and args[i][0] == 'category' \
- and isinstance(args[i][2], (list, tuple)) \
- and len(args[i][2]) == 2 \
- and args[i][2][1] in ('product.default_uom.category',
- 'uom.category'):
- if not args[i][2][0]:
- args[i] = ('id', '!=', '0')
- else:
- if args[i][2][1] == 'product.default_uom.category':
- product = product_obj.browse(args[i][2][0])
- category_id = product.default_uom.category.id
- else:
- uom = self.browse(args[i][2][0])
- category_id = uom.category.id
- args[i] = (args[i][0], args[i][1], category_id)
- elif isinstance(args[i], list):
- process_args(args[i])
- i += 1
- process_args(args)
- return super(Uom, self).search(args, offset=offset, limit=limit,
- order=order, count=count,
- query_string=query_string)
-
Uom()
commit d55441ce568f3df212cddbad978f7ab39975f72a
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Sun Mar 25 15:28:18 2012 +0200
Adding Format header for DEP5.
diff --git a/debian/copyright b/debian/copyright
index 7f8e218..165d163 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,3 +1,5 @@
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+
Files: *
Copyright:
(C) 2004-2008 Tiny SPRL
commit 6091899b834593eacd74ab972d43058fef233d07
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Fri Feb 24 14:01:03 2012 +0100
Updating year in copyright.
diff --git a/debian/copyright b/debian/copyright
index 20d8070..7f8e218 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -12,8 +12,8 @@ License: public-domain
Files: debian/*
Copyright:
- (C) 2009-2011 Daniel Baumann <daniel at debian.org>
- (C) 2011 Mathias Behrle <mathiasb at m9s.biz>
+ (C) 2009-2012 Daniel Baumann <daniel at debian.org>
+ (C) 2011-2012 Mathias Behrle <mathiasb at m9s.biz>
License: GPL-3+
License: GPL-3+
commit 69b0003c7a836d0dac15c82843a3460a86407c7e
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Fri Feb 24 13:47:02 2012 +0100
Updating to Standards-Version: 3.9.3, no changes needed.
diff --git a/debian/control b/debian/control
index fbd4777..102f846 100644
--- a/debian/control
+++ b/debian/control
@@ -5,7 +5,7 @@ Maintainer: Debian Tryton Maintainers <tryton at lists.debian-maintainers.org>
Uploaders: Daniel Baumann <daniel at debian.org>, Mathias Behrle <mathiasb at m9s.biz>
Dm-Upload-Allowed: yes
Build-Depends: debhelper (>= 8), python (>= 2.6.6-3~), python-setuptools
-Standards-Version: 3.9.2
+Standards-Version: 3.9.3
Homepage: http://www.tryton.org/
Vcs-Browser: http://git.debian-maintainers.org/?p=tryton/tryton-modules-product.git
Vcs-Git: git://git.debian-maintainers.org/git/tryton/tryton-modules-product.git
commit 263709b0fece3f387636a613e8156fd44ac279fe
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Mon Dec 26 18:09:14 2011 +0100
Releasing debian version 2.2.1-1.
diff --git a/debian/changelog b/debian/changelog
index c3181c3..912c690 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,18 @@
+tryton-modules-product (2.2.1-1) unstable; urgency=low
+
+ * Merging upstream version 2.2.1.
+ * Bumping X-Python-Version to >=2.6.
+ * Updating versioned tryton depends to 2.2.
+ * Updating copyright.
+ * Removing 01-dfsg-icons patch, patch went upstream.
+ * Merging upstream version 2.2.0.
+ * Removing tango-icon-theme from Depends.
+ * Adding Bug URL to dfsg-icons patch.
+ * Rediffing dfsg-icons patch.
+ * Reordering anf fixing license for public-domain.
+
+ -- Mathias Behrle <mathiasb at m9s.biz> Mon, 26 Dec 2011 13:55:30 +0100
+
tryton-modules-product (2.0.1+dfsg-3) unstable; urgency=low
* Removing deprecated XB-Python-Version for dh_python2.
commit 275805c0ce31be954e1d5434f5c2d9c3d0d071d2
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Mon Dec 26 13:35:52 2011 +0100
Merging upstream version 2.2.1.
diff --git a/CHANGELOG b/CHANGELOG
index 1ddd554..3ac4344 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 2.2.1 - 2011-12-26
+* Bug fixes (see mercurial logs for details)
+
Version 2.2.0 - 2011-10-24
* Bug fixes (see mercurial logs for details)
diff --git a/PKG-INFO b/PKG-INFO
index 40c9909..61b54f3 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
-Metadata-Version: 1.0
+Metadata-Version: 1.1
Name: trytond_product
-Version: 2.2.0
+Version: 2.2.1
Summary: Define products, categories of product, units of measure, categories of units of measure.
Home-page: http://www.tryton.org/
Author: B2CK
diff --git a/__tryton__.py b/__tryton__.py
index 18dfb70..94e1f65 100644
--- a/__tryton__.py
+++ b/__tryton__.py
@@ -10,7 +10,7 @@
'name_fr_FR': 'Produit',
'name_nl_NL': 'Producten',
'name_ru_RU': 'ТМЦ',
- 'version' : '2.2.0',
+ 'version' : '2.2.1',
'author' : 'B2CK',
'email': 'info at b2ck.com',
'website': 'http://www.tryton.org/',
diff --git a/tests/test_product.py b/tests/test_product.py
index 63c7ade..753e24d 100644
--- a/tests/test_product.py
+++ b/tests/test_product.py
@@ -41,7 +41,8 @@ class ProductTestCase(unittest.TestCase):
'''
Test uom non_zero_rate_factor constraint.
'''
- with Transaction().start(DB_NAME, USER, CONTEXT) as transaction:
+ with Transaction().start(DB_NAME, USER,
+ context=CONTEXT) as transaction:
category_id = self.uom_category.create({'name': 'Test'})
transaction.cursor.commit()
@@ -83,7 +84,8 @@ class ProductTestCase(unittest.TestCase):
'''
Test uom check_factor_and_rate constraint.
'''
- with Transaction().start(DB_NAME, USER, CONTEXT) as transaction:
+ with Transaction().start(DB_NAME, USER,
+ context=CONTEXT) as transaction:
category_id = self.uom_category.search([
('name', '=', 'Test'),
], limit=1)[0]
@@ -123,7 +125,7 @@ class ProductTestCase(unittest.TestCase):
('centimeter', 'rate'),
('Foot', 'factor'),
]
- with Transaction().start(DB_NAME, USER, CONTEXT) as transaction:
+ with Transaction().start(DB_NAME, USER, context=CONTEXT):
for name, result in tests:
uom_id = self.uom.search([
('name', '=', name),
@@ -143,7 +145,7 @@ class ProductTestCase(unittest.TestCase):
('Second', 25, 'Hour', 0.0069444444444444441, 0.01),
('Millimeter', 3, 'Inch', 0.11811023622047245, 0.12),
]
- with Transaction().start(DB_NAME, USER, CONTEXT) as transaction:
+ with Transaction().start(DB_NAME, USER, context=CONTEXT):
for from_name, qty, to_name, result, rounded_result in tests:
from_uom = self.uom.browse(self.uom.search(
[
@@ -176,7 +178,7 @@ class ProductTestCase(unittest.TestCase):
('Second', Decimal('25'), 'Hour', Decimal('90000')),
('Millimeter', Decimal('3'), 'Inch', Decimal('76.2')),
]
- with Transaction().start(DB_NAME, USER, CONTEXT) as transaction:
+ with Transaction().start(DB_NAME, USER, context=CONTEXT):
for from_name, price, to_name, result in tests:
from_uom = self.uom.browse(self.uom.search(
[
diff --git a/trytond_product.egg-info/PKG-INFO b/trytond_product.egg-info/PKG-INFO
index d4e40e5..530b678 100644
--- a/trytond_product.egg-info/PKG-INFO
+++ b/trytond_product.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
-Metadata-Version: 1.0
+Metadata-Version: 1.1
Name: trytond-product
-Version: 2.2.0
+Version: 2.2.1
Summary: Define products, categories of product, units of measure, categories of units of measure.
Home-page: http://www.tryton.org/
Author: B2CK
commit 57779f828fcf70f7568f93968397a9e49dd5c458
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Sat Dec 17 13:59:43 2011 +0100
Bumping X-Python-Version to >=2.6.
diff --git a/debian/control b/debian/control
index aa4de1b..fbd4777 100644
--- a/debian/control
+++ b/debian/control
@@ -9,7 +9,7 @@ Standards-Version: 3.9.2
Homepage: http://www.tryton.org/
Vcs-Browser: http://git.debian-maintainers.org/?p=tryton/tryton-modules-product.git
Vcs-Git: git://git.debian-maintainers.org/git/tryton/tryton-modules-product.git
-X-Python-Version: >= 2.5
+X-Python-Version: >= 2.6
Package: tryton-modules-product
Architecture: all
commit a80749003f58a566f14f86db7fa7ba12e136f45a
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Tue Nov 1 15:19:31 2011 +0100
Updating versioned tryton depends to 2.2.
diff --git a/debian/control b/debian/control
index fa6b7df..aa4de1b 100644
--- a/debian/control
+++ b/debian/control
@@ -14,7 +14,7 @@ X-Python-Version: >= 2.5
Package: tryton-modules-product
Architecture: all
Depends:
- ${misc:Depends}, ${python:Depends}, tryton-server (>= 2.0),
+ ${misc:Depends}, ${python:Depends}, tryton-server (>= 2.2),
python-pkg-resources
Description: Tryton Application Platform (Product Module)
Tryton is a high-level general purpose application platform written in Python
commit 490f6f7a064bcca586b52e9d16f22edcf263914e
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Tue Nov 1 15:03:56 2011 +0100
Updating copyright.
diff --git a/debian/copyright b/debian/copyright
index f9e9ef6..20d8070 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -34,8 +34,8 @@ License: GPL-3+
can be found in /usr/share/common-licenses/GPL-3 file.
License: public-domain
- The icons used to replace the original not DFSG compatible icons are taken
- from http://tango.freedesktop.org/releases/tango-icon-theme-0.8.90.tar.gz
+ The icons used are generally taken from
+ http://tango.freedesktop.org/releases/tango-icon-theme-0.8.90.tar.gz
.
Upstream Authors: 2005-2009
.
commit 4d4abad2dc0c2d5e56d9bfe9166fb4e09c43cae5
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Tue Nov 1 15:02:34 2011 +0100
Removing 01-dfsg-icons patch, patch went upstream.
diff --git a/debian/patches/01-dfsg-icons b/debian/patches/01-dfsg-icons
deleted file mode 100644
index e574306..0000000
--- a/debian/patches/01-dfsg-icons
+++ /dev/null
@@ -1,491 +0,0 @@
-Author: Mathias Behrle <mathiasb at m9s.biz>
-Description: Add DFSG compatible icon as a replacement for the original icon.
-Bug: http://bugs.tryton.org/roundup/issue1996
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ tryton-modules-product/icons/tryton-product.svg 2011-08-07 14:10:25.886041278 +0200
-@@ -0,0 +1,485 @@
-+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-+<!-- Created with Inkscape (http://www.inkscape.org/) -->
-+<svg
-+ xmlns:dc="http://purl.org/dc/elements/1.1/"
-+ xmlns:cc="http://creativecommons.org/ns#"
-+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-+ xmlns:svg="http://www.w3.org/2000/svg"
-+ xmlns="http://www.w3.org/2000/svg"
-+ xmlns:xlink="http://www.w3.org/1999/xlink"
-+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-+ sodipodi:docname="package-x-generic.svg"
-+ sodipodi:docbase="/home/jimmac/src/cvs/tango-icon-theme/scalable/mimetypes"
-+ inkscape:version="0.46"
-+ sodipodi:version="0.32"
-+ id="svg2963"
-+ height="48px"
-+ width="48px"
-+ inkscape:output_extension="org.inkscape.output.svg.inkscape">
-+ <defs
-+ id="defs3">
-+ <inkscape:perspective
-+ sodipodi:type="inkscape:persp3d"
-+ inkscape:vp_x="0 : 24 : 1"
-+ inkscape:vp_y="0 : 1000 : 0"
-+ inkscape:vp_z="48 : 24 : 1"
-+ inkscape:persp3d-origin="24 : 16 : 1"
-+ id="perspective77" />
-+ <radialGradient
-+ inkscape:collect="always"
-+ xlink:href="#linearGradient5060"
-+ id="radialGradient6719"
-+ gradientUnits="userSpaceOnUse"
-+ gradientTransform="matrix(-2.774389,0,0,1.969706,112.7623,-872.8854)"
-+ cx="605.71429"
-+ cy="486.64789"
-+ fx="605.71429"
-+ fy="486.64789"
-+ r="117.14286" />
-+ <linearGradient
-+ inkscape:collect="always"
-+ id="linearGradient5060">
-+ <stop
-+ style="stop-color:black;stop-opacity:1;"
-+ offset="0"
-+ id="stop5062" />
-+ <stop
-+ style="stop-color:black;stop-opacity:0;"
-+ offset="1"
-+ id="stop5064" />
-+ </linearGradient>
-+ <radialGradient
-+ inkscape:collect="always"
-+ xlink:href="#linearGradient5060"
-+ id="radialGradient6717"
-+ gradientUnits="userSpaceOnUse"
-+ gradientTransform="matrix(2.774389,0,0,1.969706,-1891.633,-872.8854)"
-+ cx="605.71429"
-+ cy="486.64789"
-+ fx="605.71429"
-+ fy="486.64789"
-+ r="117.14286" />
-+ <linearGradient
-+ id="linearGradient5048">
-+ <stop
-+ style="stop-color:black;stop-opacity:0;"
-+ offset="0"
-+ id="stop5050" />
-+ <stop
-+ id="stop5056"
-+ offset="0.5"
-+ style="stop-color:black;stop-opacity:1;" />
-+ <stop
-+ style="stop-color:black;stop-opacity:0;"
-+ offset="1"
-+ id="stop5052" />
-+ </linearGradient>
-+ <linearGradient
-+ inkscape:collect="always"
-+ xlink:href="#linearGradient5048"
-+ id="linearGradient6715"
-+ gradientUnits="userSpaceOnUse"
-+ gradientTransform="matrix(2.774389,0,0,1.969706,-1892.179,-872.8854)"
-+ x1="302.85715"
-+ y1="366.64789"
-+ x2="302.85715"
-+ y2="609.50507" />
-+ <linearGradient
-+ inkscape:collect="always"
-+ id="linearGradient2884">
-+ <stop
-+ style="stop-color:#000000;stop-opacity:1;"
-+ offset="0"
-+ id="stop2886" />
-+ <stop
-+ style="stop-color:#000000;stop-opacity:0;"
-+ offset="1"
-+ id="stop2888" />
-+ </linearGradient>
-+ <linearGradient
-+ id="linearGradient2869">
-+ <stop
-+ style="stop-color:#ffffff;stop-opacity:1;"
-+ offset="0"
-+ id="stop2871" />
-+ <stop
-+ style="stop-color:#cccccc;stop-opacity:1.0000000;"
-+ offset="1.0000000"
-+ id="stop2873" />
-+ </linearGradient>
-+ <linearGradient
-+ id="linearGradient4995">
-+ <stop
-+ id="stop4997"
-+ offset="0"
-+ style="stop-color:#de9523;stop-opacity:1;" />
-+ <stop
-+ id="stop4999"
-+ offset="1.0000000"
-+ style="stop-color:#a36d18;stop-opacity:1.0000000;" />
-+ </linearGradient>
-+ <linearGradient
-+ id="linearGradient4987"
-+ inkscape:collect="always">
-+ <stop
-+ id="stop4989"
-+ offset="0"
-+ style="stop-color:#a0670c;stop-opacity:1;" />
-+ <stop
-+ id="stop4991"
-+ offset="1"
-+ style="stop-color:#a0670c;stop-opacity:0;" />
-+ </linearGradient>
-+ <linearGradient
-+ id="linearGradient4979">
-+ <stop
-+ id="stop4981"
-+ offset="0.0000000"
-+ style="stop-color:#fbf0e0;stop-opacity:1.0000000;" />
-+ <stop
-+ id="stop4983"
-+ offset="1.0000000"
-+ style="stop-color:#f0ce99;stop-opacity:1.0000000;" />
-+ </linearGradient>
-+ <linearGradient
-+ id="linearGradient4946"
-+ inkscape:collect="always">
-+ <stop
-+ id="stop4948"
-+ offset="0"
-+ style="stop-color:#000000;stop-opacity:1;" />
-+ <stop
-+ id="stop4950"
-+ offset="1"
-+ style="stop-color:#000000;stop-opacity:0;" />
-+ </linearGradient>
-+ <linearGradient
-+ id="linearGradient4222">
-+ <stop
-+ id="stop4224"
-+ offset="0"
-+ style="stop-color:#ffffff;stop-opacity:1;" />
-+ <stop
-+ id="stop4226"
-+ offset="1.0000000"
-+ style="stop-color:#ffffff;stop-opacity:0.68639052;" />
-+ </linearGradient>
-+ <linearGradient
-+ id="linearGradient4210">
-+ <stop
-+ id="stop4212"
-+ offset="0.0000000"
-+ style="stop-color:#eaba6f;stop-opacity:1.0000000;" />
-+ <stop
-+ id="stop4214"
-+ offset="1.0000000"
-+ style="stop-color:#b97a1b;stop-opacity:1.0000000;" />
-+ </linearGradient>
-+ <linearGradient
-+ id="linearGradient4192">
-+ <stop
-+ id="stop4194"
-+ offset="0"
-+ style="stop-color:#e9b96e;stop-opacity:1;" />
-+ <stop
-+ id="stop4196"
-+ offset="1.0000000"
-+ style="stop-color:#f1d19e;stop-opacity:1.0000000;" />
-+ </linearGradient>
-+ <linearGradient
-+ id="linearGradient4182">
-+ <stop
-+ id="stop4184"
-+ offset="0.0000000"
-+ style="stop-color:#a36d18;stop-opacity:1.0000000;" />
-+ <stop
-+ id="stop4186"
-+ offset="1.0000000"
-+ style="stop-color:#d79020;stop-opacity:1.0000000;" />
-+ </linearGradient>
-+ <radialGradient
-+ inkscape:collect="always"
-+ xlink:href="#linearGradient4946"
-+ id="radialGradient2252"
-+ gradientUnits="userSpaceOnUse"
-+ gradientTransform="matrix(1.000000,0.000000,0.000000,0.333333,2.658463e-16,23.58206)"
-+ cx="22.930462"
-+ cy="35.373093"
-+ fx="22.930462"
-+ fy="35.373093"
-+ r="17.576654" />
-+ <linearGradient
-+ inkscape:collect="always"
-+ xlink:href="#linearGradient4979"
-+ id="linearGradient2269"
-+ gradientUnits="userSpaceOnUse"
-+ x1="30.062469"
-+ y1="13.444801"
-+ x2="17.696169"
-+ y2="12.333632" />
-+ <linearGradient
-+ inkscape:collect="always"
-+ xlink:href="#linearGradient4995"
-+ id="linearGradient2274"
-+ gradientUnits="userSpaceOnUse"
-+ x1="36.288929"
-+ y1="14.661557"
-+ x2="47.065835"
-+ y2="15.267649" />
-+ <linearGradient
-+ inkscape:collect="always"
-+ xlink:href="#linearGradient4192"
-+ id="linearGradient2277"
-+ gradientUnits="userSpaceOnUse"
-+ gradientTransform="matrix(1.000000,0.000000,0.000000,0.986355,0.000000,0.316638)"
-+ x1="25.381256"
-+ y1="24.720648"
-+ x2="24.119167"
-+ y2="16.170370" />
-+ <linearGradient
-+ inkscape:collect="always"
-+ xlink:href="#linearGradient4182"
-+ id="linearGradient2280"
-+ gradientUnits="userSpaceOnUse"
-+ gradientTransform="matrix(1.000000,0.000000,0.000000,1.039184,0.000000,-4.057054e-2)"
-+ x1="16.148972"
-+ y1="12.636667"
-+ x2="34.193642"
-+ y2="12.636667" />
-+ <linearGradient
-+ inkscape:collect="always"
-+ xlink:href="#linearGradient4987"
-+ id="linearGradient2282"
-+ gradientUnits="userSpaceOnUse"
-+ x1="21.906841"
-+ y1="9.7577486"
-+ x2="22.071806"
-+ y2="16.020695" />
-+ <linearGradient
-+ inkscape:collect="always"
-+ xlink:href="#linearGradient4222"
-+ id="linearGradient2285"
-+ gradientUnits="userSpaceOnUse"
-+ x1="18.706615"
-+ y1="19.912336"
-+ x2="30.014812"
-+ y2="47.388485" />
-+ <linearGradient
-+ inkscape:collect="always"
-+ xlink:href="#linearGradient4210"
-+ id="linearGradient2288"
-+ gradientUnits="userSpaceOnUse"
-+ x1="24.990499"
-+ y1="34.004856"
-+ x2="24.990499"
-+ y2="22.585211" />
-+ <radialGradient
-+ inkscape:collect="always"
-+ xlink:href="#linearGradient2884"
-+ id="radialGradient2896"
-+ gradientUnits="userSpaceOnUse"
-+ gradientTransform="matrix(1.353283,5.468101e-16,-1.144754e-13,0.635968,-8.458890,3.413470)"
-+ cx="23.943670"
-+ cy="20.800287"
-+ fx="23.943670"
-+ fy="20.800287"
-+ r="6.4286140" />
-+ <radialGradient
-+ inkscape:collect="always"
-+ xlink:href="#linearGradient2869"
-+ id="radialGradient2898"
-+ gradientUnits="userSpaceOnUse"
-+ gradientTransform="matrix(0.749420,0.000000,0.000000,0.394055,6.226925,10.09253)"
-+ cx="21.578989"
-+ cy="9.0255041"
-+ fx="21.578989"
-+ fy="9.0255041"
-+ r="9.5862970" />
-+ <radialGradient
-+ inkscape:collect="always"
-+ xlink:href="#linearGradient2884"
-+ id="radialGradient2906"
-+ gradientUnits="userSpaceOnUse"
-+ gradientTransform="matrix(1.353283,5.468101e-16,-1.144754e-13,0.635968,-8.458890,3.413470)"
-+ cx="23.943670"
-+ cy="20.800287"
-+ fx="23.943670"
-+ fy="20.800287"
-+ r="6.4286140" />
-+ <radialGradient
-+ inkscape:collect="always"
-+ xlink:href="#linearGradient2869"
-+ id="radialGradient2908"
-+ gradientUnits="userSpaceOnUse"
-+ gradientTransform="matrix(0.749420,0.000000,0.000000,0.394055,6.226925,10.09253)"
-+ cx="21.578989"
-+ cy="9.8105707"
-+ fx="21.578989"
-+ fy="9.8105707"
-+ r="9.5862970" />
-+ </defs>
-+ <sodipodi:namedview
-+ inkscape:window-y="142"
-+ inkscape:window-x="392"
-+ inkscape:window-height="706"
-+ inkscape:window-width="872"
-+ stroke="#c17d11"
-+ fill="#e9b96e"
-+ inkscape:showpageshadow="false"
-+ inkscape:document-units="px"
-+ inkscape:grid-bbox="true"
-+ showgrid="false"
-+ inkscape:current-layer="layer1"
-+ inkscape:cy="39.004018"
-+ inkscape:cx="74.637005"
-+ inkscape:zoom="1"
-+ inkscape:pageshadow="2"
-+ inkscape:pageopacity="0.0"
-+ borderopacity="0.16470588"
-+ bordercolor="#666666"
-+ pagecolor="#ffffff"
-+ id="base" />
-+ <metadata
-+ id="metadata4">
-+ <rdf:RDF>
-+ <cc:Work
-+ rdf:about="">
-+ <dc:format>image/svg+xml</dc:format>
-+ <dc:type
-+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-+ <dc:title>Package</dc:title>
-+ <dc:creator>
-+ <cc:Agent>
-+ <dc:title>Jakub Steiner</dc:title>
-+ </cc:Agent>
-+ </dc:creator>
-+ <dc:source>http://jimmac.musichall.cz/</dc:source>
-+ <dc:subject>
-+ <rdf:Bag>
-+ <rdf:li>package</rdf:li>
-+ <rdf:li>archive</rdf:li>
-+ <rdf:li>tarball</rdf:li>
-+ <rdf:li>tar</rdf:li>
-+ <rdf:li>bzip</rdf:li>
-+ <rdf:li>gzip</rdf:li>
-+ <rdf:li>zip</rdf:li>
-+ <rdf:li>arj</rdf:li>
-+ <rdf:li>tar</rdf:li>
-+ <rdf:li>jar</rdf:li>
-+ </rdf:Bag>
-+ </dc:subject>
-+ <cc:license
-+ rdf:resource="http://creativecommons.org/licenses/publicdomain/" />
-+ </cc:Work>
-+ <cc:License
-+ rdf:about="http://creativecommons.org/licenses/publicdomain/">
-+ <cc:permits
-+ rdf:resource="http://creativecommons.org/ns#Reproduction" />
-+ <cc:permits
-+ rdf:resource="http://creativecommons.org/ns#Distribution" />
-+ <cc:permits
-+ rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
-+ </cc:License>
-+ </rdf:RDF>
-+ </metadata>
-+ <g
-+ inkscape:groupmode="layer"
-+ inkscape:label="Layer 1"
-+ id="layer1">
-+ <g
-+ style="display:inline"
-+ transform="matrix(2.105461e-2,0,0,2.086758e-2,42.60172,35.4036)"
-+ id="g6707">
-+ <rect
-+ style="opacity:0.40206185;color:black;fill:url(#linearGradient6715);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-+ id="rect6709"
-+ width="1339.6335"
-+ height="478.35718"
-+ x="-1559.2523"
-+ y="-150.69685" />
-+ <path
-+ style="opacity:0.40206185;color:black;fill:url(#radialGradient6717);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-+ d="M -219.61876,-150.68038 C -219.61876,-150.68038 -219.61876,327.65041 -219.61876,327.65041 C -76.744594,328.55086 125.78146,220.48075 125.78138,88.454235 C 125.78138,-43.572302 -33.655436,-150.68036 -219.61876,-150.68038 z "
-+ id="path6711"
-+ sodipodi:nodetypes="cccc" />
-+ <path
-+ sodipodi:nodetypes="cccc"
-+ id="path6713"
-+ d="M -1559.2523,-150.68038 C -1559.2523,-150.68038 -1559.2523,327.65041 -1559.2523,327.65041 C -1702.1265,328.55086 -1904.6525,220.48075 -1904.6525,88.454235 C -1904.6525,-43.572302 -1745.2157,-150.68036 -1559.2523,-150.68038 z "
-+ style="opacity:0.40206185;color:black;fill:url(#radialGradient6719);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
-+ </g>
-+ <rect
-+ ry="2.3944440"
-+ rx="2.4241352"
-+ y="15.275433"
-+ x="7.4623847"
-+ height="23.112879"
-+ width="31.978371"
-+ id="rect3115"
-+ style="opacity:1.0000000;color:#000000;fill:url(#linearGradient2288);fill-opacity:1.0000000;fill-rule:nonzero;stroke:#a0670c;stroke-width:1.0000007;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4.0000000;stroke-dasharray:none;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000;visibility:visible;display:block;overflow:visible" />
-+ <rect
-+ style="opacity:0.48101267;color:#000000;fill:none;fill-opacity:1.0000000;fill-rule:nonzero;stroke:url(#linearGradient2285);stroke-width:1.0000011;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4.0000000;stroke-dasharray:none;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000;visibility:visible;display:block;overflow:visible"
-+ id="rect4220"
-+ width="29.804138"
-+ height="21.075352"
-+ x="8.4989996"
-+ y="16.243698"
-+ rx="1.2846882"
-+ ry="1.2846882" />
-+ <path
-+ sodipodi:nodetypes="ccccc"
-+ id="path4162"
-+ d="M 8.7697819,16.547178 L 13.819731,9.7363408 L 32.615291,9.6353255 L 37.835264,16.408941 L 8.7697819,16.547178 z "
-+ style="fill:url(#linearGradient2280);fill-opacity:1.0000000;fill-rule:evenodd;stroke:url(#linearGradient2282);stroke-width:1.0000008;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4.0000000;stroke-dasharray:none;stroke-opacity:1.0000000" />
-+ <path
-+ sodipodi:nodetypes="ccccc"
-+ id="path4164"
-+ d="M 38.276321,16.325703 L 43.469269,23.520364 L 3.9609455,23.520364 L 8.6250143,16.320763 L 38.276321,16.325703 z "
-+ style="opacity:1.0000000;color:#000000;fill:url(#linearGradient2277);fill-opacity:1.0000000;fill-rule:nonzero;stroke:#a0670c;stroke-width:1.0000005;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4.0000000;stroke-dasharray:none;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000;visibility:visible;display:block;overflow:visible" />
-+ <path
-+ sodipodi:nodetypes="ccccc"
-+ id="path4178"
-+ d="M 32.849333,9.6141009 L 37.532219,16.536370 L 46.565835,20.921197 L 38.451329,12.008545 L 32.849333,9.6141009 z "
-+ style="opacity:1.0000000;color:#000000;fill:url(#linearGradient2274);fill-opacity:1.0000000;fill-rule:nonzero;stroke:#a0670c;stroke-width:1.0000005;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4.0000000;stroke-dasharray:none;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000;visibility:visible;display:block;overflow:visible" />
-+ <path
-+ sodipodi:nodetypes="ccccc"
-+ style="opacity:1.0000000;color:#000000;fill:#f8e8cf;fill-opacity:1.0000000;fill-rule:nonzero;stroke:#a0670c;stroke-width:1.0000000;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4.0000000;stroke-dasharray:none;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000;visibility:visible;display:block;overflow:visible"
-+ d="M 13.617702,9.7151161 L 9.6419233,16.435355 L 0.50729183,20.820182 L 8.6217973,11.907530 L 13.617702,9.7151161 z "
-+ id="path4180" />
-+ <path
-+ style="opacity:1.0000000;color:#000000;fill:none;fill-opacity:1.0000000;fill-rule:nonzero;stroke:#f4e3ca;stroke-width:1.0000000;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4.0000000;stroke-dasharray:none;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000;visibility:visible;display:block;overflow:visible"
-+ d="M 37.024959,16.436050 L 41.478871,22.493011 L 5.6482792,22.493011 L 9.7892982,16.312694 L 37.024959,16.436050 z "
-+ id="path4954"
-+ sodipodi:nodetypes="ccccc" />
-+ <g
-+ id="g2892"
-+ transform="matrix(0.676538,0.000000,0.000000,1.000000,3.994869,0.000000)">
-+ <path
-+ style="opacity:1.0000000;color:#000000;fill:url(#radialGradient2896);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:2.0000000;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4.0000000;stroke-dasharray:none;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000;visibility:visible;display:inline;overflow:visible"
-+ d="M 23.926073,12.101621 C 18.588065,12.101621 14.282569,14.129809 14.282569,16.641813 L 33.604773,16.641813 C 33.604773,14.129809 29.264081,12.101621 23.926073,12.101621 z "
-+ id="path2882" />
-+ <path
-+ id="path2141"
-+ d="M 23.931961,12.861168 C 20.379986,12.861168 17.515057,14.210748 17.515057,15.882266 L 30.372285,15.882266 C 30.372285,14.210748 27.483936,12.861168 23.931961,12.861168 z "
-+ style="opacity:1.0000000;color:#000000;fill:url(#radialGradient2898);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:2.0000000;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4.0000000;stroke-dasharray:none;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000;visibility:visible;display:inline;overflow:visible" />
-+ </g>
-+ <g
-+ transform="matrix(0.676538,0.000000,0.000000,1.000000,10.49487,0.000000)"
-+ id="g2900">
-+ <path
-+ id="path2902"
-+ d="M 23.926073,12.101621 C 18.588065,12.101621 14.282569,14.129809 14.282569,16.641813 L 33.604773,16.641813 C 33.604773,14.129809 29.264081,12.101621 23.926073,12.101621 z "
-+ style="opacity:1.0000000;color:#000000;fill:url(#radialGradient2906);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:2.0000000;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4.0000000;stroke-dasharray:none;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000;visibility:visible;display:inline;overflow:visible" />
-+ <path
-+ style="opacity:1.0000000;color:#000000;fill:url(#radialGradient2908);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:2.0000000;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4.0000000;stroke-dasharray:none;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000;visibility:visible;display:inline;overflow:visible"
-+ d="M 23.931961,12.861168 C 20.379986,12.861168 17.515057,14.210748 17.515057,15.882266 L 30.372285,15.882266 C 30.372285,14.210748 27.483936,12.861168 23.931961,12.861168 z "
-+ id="path2904" />
-+ </g>
-+ <path
-+ style="opacity:0.87974685;fill:none;fill-opacity:1.0000000;fill-rule:evenodd;stroke:url(#linearGradient2269);stroke-width:1.0000000;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4.0000000;stroke-dasharray:none;stroke-opacity:1.0000000"
-+ d="M 9.6523127,16.371803 L 13.036643,10.593020 L 33.514841,10.517799 L 37.356782,16.369880 L 9.6523127,16.371803 z "
-+ id="path4966"
-+ sodipodi:nodetypes="ccccc" />
-+ </g>
-+</svg>
diff --git a/debian/patches/series b/debian/patches/series
index a127545..e69de29 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +0,0 @@
-01-dfsg-icons
commit e200f2e6288b7c8251625185c7410e108e2069ec
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Mon Oct 31 16:20:59 2011 +0100
Merging upstream version 2.2.0.
diff --git a/CHANGELOG b/CHANGELOG
index faf7afc..1ddd554 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,5 +1,5 @@
-Version 2.0.1 - 2011-04-26
-* Add missing icons
+Version 2.2.0 - 2011-10-24
+* Bug fixes (see mercurial logs for details)
Version 2.0.0 - 2011-04-26
* Bug fixes (see mercurial logs for details)
diff --git a/MANIFEST.in b/MANIFEST.in
index 47da692..44a0685 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -6,6 +6,6 @@ include CHANGELOG
include LICENSE
include *.xml
include *.odt
-include *.csv
+include locale/*.po
include doc/*
include icons/*
diff --git a/PKG-INFO b/PKG-INFO
index 05e328b..40c9909 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,22 +1,24 @@
Metadata-Version: 1.0
Name: trytond_product
-Version: 2.0.1
+Version: 2.2.0
Summary: Define products, categories of product, units of measure, categories of units of measure.
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
@@ -24,7 +26,6 @@ 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 bc8039e..18dfb70 100644
--- a/__tryton__.py
+++ b/__tryton__.py
@@ -10,7 +10,7 @@
'name_fr_FR': 'Produit',
'name_nl_NL': 'Producten',
'name_ru_RU': 'ТМЦ',
- 'version' : '2.0.1',
+ 'version' : '2.2.0',
'author' : 'B2CK',
'email': 'info at b2ck.com',
'website': 'http://www.tryton.org/',
@@ -38,13 +38,14 @@
'uom.xml',
],
'translation': [
- 'bg_BG.csv',
- 'de_DE.csv',
- 'es_CO.csv',
- 'es_ES.csv',
- 'fr_FR.csv',
- 'nl_NL.csv',
- 'ru_RU.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 9dc81b0..0000000
--- a/bg_BG.csv
+++ /dev/null
@@ -1,155 +0,0 @@
-type,name,res_id,src,value,fuzzy
-error,product.uom,0,"If the UOM is still not used, you can delete it otherwise you can deactivate it and create a new one.","Ðко мер. ед. вÑе още не Ñе ползват може да Ñ Ð¸Ð·Ñ‚Ñ€Ð¸ÐµÑ‚Ðµ, в противен Ñлучай може да Ñ Ð´ÐµÐºÐ°Ñ‚Ð¸Ð²Ð¸Ñ€Ð°Ñ‚Ðµ и Ñъздадете нова.",0
-error,product.uom,0,Invalid Factor and Rate values!,Ðевалиден ÑтойноÑти за фактор и отношение!,0
-error,product.uom,0,Rate and factor can not be both equal to zero.,КурÑа и коефициента не може едновременно да Ñа нула.,0
-error,product.uom,0,"You cannot change Rate, Factor or Category on a Unit of Measure. ","За мерна единица не може да променате отношение, коефициент или категориÑ.",0
-field,"product.category,childs",0,Children,Деца,0
-field,"product.category,name",0,Name,Име,0
-field,"product.category,parent",0,Parent,Родител,0
-field,"product.category,rec_name",0,Name,Име,0
-field,"product.product,code",0,Code,Код,0
-field,"product.product,description",0,Description,ОпиÑание,0
-field,"product.product,rec_name",0,Name,Име,0
-field,"product.product,template",0,Product Template,Щаблон за продукт,0
-field,"product.template,active",0,Active,Ðктивен,0
-field,"product.template,category",0,Category,КатегориÑ,0
-field,"product.template,cost_price",0,Cost Price,Фабрична цена,0
-field,"product.template,cost_price_method",0,Cost Method,Ðачин на оÑтойноÑÑ‚Ñване,0
-field,"product.template,cost_price_uom",0,Cost Price,Фабрична цена,0
-field,"product.template,default_uom",0,Default UOM,Мер. ед. по подрабиране,0
-field,"product.template,list_price",0,List Price,Каталожна цена,0
-field,"product.template,list_price_uom",0,List Price,Каталожна цена,0
-field,"product.template,name",0,Name,Име,0
-field,"product.template,products",0,Products,Продукти,0
-field,"product.template,rec_name",0,Name,Име,0
-field,"product.template,type",0,Type,Вид,0
-field,"product.uom,active",0,Active,Ðктивен,0
-field,"product.uom,category",0,UOM Category,ÐšÐ°Ñ‚ÐµÐ³Ð¾Ñ€Ð¸Ñ Ð¼ÐµÑ€. ед.,0
-field,"product.uom,digits",0,Display Digits,Цифри за показване,0
-field,"product.uom,factor",0,Factor,Коефициент,0
-field,"product.uom,name",0,Name,Име,0
-field,"product.uom,rate",0,Rate,Отношение,0
-field,"product.uom,rec_name",0,Name,Име,0
-field,"product.uom,rounding",0,Rounding Precision,ТочноÑÑ‚ на закръгление,0
-field,"product.uom,symbol",0,Symbol,Символ,0
-field,"product.uom.category,name",0,Name,Име,0
-field,"product.uom.category,rec_name",0,Name,Име,0
-field,"product.uom.category,uoms",0,Unit of Measures,Мерни единици,0
-help,"product.uom,factor",0,"The coefficient for the formula:
-coef (base unit) = 1 (this unit)","Коефициент в тази формула:
-1 (баз. единица) = коеф. (тази единица)",0
-help,"product.uom,rate",0,"The coefficient for the formula:
-1 (base unit) = coef (this unit)","Коефициент в тази формула:
-1 (баз. единица) = коеф. (тази единица)",0
-model,"ir.action,name",,Product Categories,Категории продукти,0
-model,"ir.action,name",act_category_form,Product Categories,Категории продукти,0
-model,"ir.action,name",act_category_tree,Categories,Категории,0
-model,"ir.action,name",act_product_by_category,Product by Category,Продукт по категориÑ,0
-model,"ir.action,name",act_product_form,Products,Продукти,0
-model,"ir.action,name",act_product_form2,Products,Продукти,0
-model,"ir.action,name",act_uom_category_form,Categories of Unit of Measure,Категории мер. ед.,0
-model,"ir.action,name",act_uom_category_form2,Categories of Unit of Measure,Категории мер. ед.,0
-model,"ir.action,name",act_uom_form,Units of Measure,Мерни едниници,0
-model,"ir.action,name",act_uom_form2,Units of Measure,Мерни едниници,0
-model,"ir.ui.menu,name",,Categories,Категории,0
-model,"ir.ui.menu,name",menu_category_form_new,New Category,Ðова категориÑ,0
-model,"ir.ui.menu,name",menu_category_tree,Categories,Категории,0
-model,"ir.ui.menu,name",menu_main_product,Product,Продукт,0
-model,"ir.ui.menu,name",menu_product_product,Products,Продукти,0
-model,"ir.ui.menu,name",menu_product_product_new,New Product,Продукти,0
-model,"ir.ui.menu,name",menu_uom_category_form,Categories,Категории,0
-model,"ir.ui.menu,name",menu_uom_category_form_new,New Category,Ðова категориÑ,0
-model,"ir.ui.menu,name",menu_uom_form,Units of Measure,Мерни едниници,0
-model,"ir.ui.menu,name",menu_uom_form2,New Unit of Measure,Ðова мерна единица,0
-model,"product.category,name",0,Product Category,ÐšÐ°Ñ‚ÐµÐ³Ð¾Ñ€Ð¸Ñ Ð½Ð° продукт,0
-model,"product.product,name",0,Product,Продукт,0
-model,"product.template,name",0,Product Template,Щаблон за продукт,0
-model,"product.uom,name",0,Unit of measure,Мерна единица,0
-model,"product.uom,name",uom_are,Are,Хектар,0
-model,"product.uom,name",uom_carat,Carat,Карат,0
-model,"product.uom,name",uom_centimeter,centimeter,Ñантиметър,0
-model,"product.uom,name",uom_cubic_centimeter,Cubic centimeter,Кубичен Ñантиметър,0
-model,"product.uom,name",uom_cubic_foot,Cubic foot,Кубичен фут,0
-model,"product.uom,name",uom_cubic_inch,Cubic inch,Кубичен инч,0
-model,"product.uom,name",uom_cubic_meter,Cubic meter,Кубичен метър,0
-model,"product.uom,name",uom_day,Day,Ден,0
-model,"product.uom,name",uom_foot,Foot,Фут,0
-model,"product.uom,name",uom_gallon,Gallon,Галон,0
-model,"product.uom,name",uom_gram,Gram,Грам,0
-model,"product.uom,name",uom_hectare,Hectare,Хектар,0
-model,"product.uom,name",uom_hour,Hour,ЧаÑ,0
-model,"product.uom,name",uom_inch,Inch,Инч,0
-model,"product.uom,name",uom_kilogram,Kilogram,Килограм,0
-model,"product.uom,name",uom_kilometer,Kilometer,Километър,0
-model,"product.uom,name",uom_liter,Liter,Литър,0
-model,"product.uom,name",uom_meter,Meter,Метър,0
-model,"product.uom,name",uom_mile,Mile,МилÑ,0
-model,"product.uom,name",uom_millimeter,Millimeter,Милиметър,0
-model,"product.uom,name",uom_minute,Minute,Минута,0
-model,"product.uom,name",uom_ounce,Ounce,УнциÑ,0
-model,"product.uom,name",uom_pound,Pound,Лира,0
-model,"product.uom,name",uom_second,Second,Секунда,0
-model,"product.uom,name",uom_square_centimeter,Square centimeter,Квадратен Ñантиметър,0
-model,"product.uom,name",uom_square_foot,Square foot,Квадратен фут,0
-model,"product.uom,name",uom_square_inch,Square inch,Квадратен инч,0
-model,"product.uom,name",uom_square_meter,Square meter,Квадратен метър,0
-model,"product.uom,name",uom_square_yard,Square yard,Квадратен Ñрд,0
-model,"product.uom,name",uom_unit,Unit,Единица,0
-model,"product.uom,name",uom_work_day,Work Day,Работен ден,0
-model,"product.uom,name",uom_yard,Yard,Ярд,0
-model,"product.uom,symbol",uom_are,a,a,0
-model,"product.uom,symbol",uom_carat,c,c,0
-model,"product.uom,symbol",uom_centimeter,cm,cm,0
-model,"product.uom,symbol",uom_cubic_centimeter,cm³,cm³,0
-model,"product.uom,symbol",uom_cubic_foot,ft³,ft³,0
-model,"product.uom,symbol",uom_cubic_inch,in³,in³,0
-model,"product.uom,symbol",uom_cubic_meter,m³,m³,0
-model,"product.uom,symbol",uom_day,d,d,0
-model,"product.uom,symbol",uom_foot,ft,ft,0
-model,"product.uom,symbol",uom_gallon,gal,gal,0
-model,"product.uom,symbol",uom_gram,g,g,0
-model,"product.uom,symbol",uom_hectare,ha,ha,0
-model,"product.uom,symbol",uom_hour,h,h,0
-model,"product.uom,symbol",uom_inch,in,in,0
-model,"product.uom,symbol",uom_kilogram,kg,kg,0
-model,"product.uom,symbol",uom_kilometer,km,km,0
-model,"product.uom,symbol",uom_liter,l,l,0
-model,"product.uom,symbol",uom_meter,m,m,0
-model,"product.uom,symbol",uom_mile,mi,mi,0
-model,"product.uom,symbol",uom_millimeter,mm,mm,0
-model,"product.uom,symbol",uom_minute,min,min,0
-model,"product.uom,symbol",uom_ounce,oz,oz,0
-model,"product.uom,symbol",uom_pound,lbs,lbs,0
-model,"product.uom,symbol",uom_second,s,s,0
-model,"product.uom,symbol",uom_square_centimeter,cm²,cm²,0
-model,"product.uom,symbol",uom_square_foot,ft²,ft²,0
-model,"product.uom,symbol",uom_square_inch,in²,in²,0
-model,"product.uom,symbol",uom_square_meter,m²,m²,0
-model,"product.uom,symbol",uom_square_yard,yd²,yd²,0
-model,"product.uom,symbol",uom_unit,u,u,0
-model,"product.uom,symbol",uom_work_day,wd,wd,0
-model,"product.uom,symbol",uom_yard,yd,yd,0
-model,"product.uom.category,name",0,Product uom category,ÐšÐ°Ñ‚ÐµÐ³Ð¾Ñ€Ð¸Ñ Ð¼ÐµÑ€. ед. на продукт,0
-model,"product.uom.category,name",uom_cat_length,Length,Дължина,0
-model,"product.uom.category,name",uom_cat_surface,Surface,ПовърхноÑÑ‚,0
-model,"product.uom.category,name",uom_cat_time,Time,Време,0
-model,"product.uom.category,name",uom_cat_unit,Units,Единици,0
-model,"product.uom.category,name",uom_cat_volume,Volume,Обем,0
-model,"product.uom.category,name",uom_cat_weight,Weight,Тегло,0
-model,"res.group,name",group_product_admin,Product Administration,Управление на продукти,0
-selection,"product.template,cost_price_method",0,Average,Средна,0
-selection,"product.template,cost_price_method",0,Fixed,ФикÑирана,0
-selection,"product.template,type",0,Consumable,КонÑуматив,0
-selection,"product.template,type",0,Service,УÑлуга,0
-selection,"product.template,type",0,Stockable,Складируем,0
-view,product.category,0,Children,Деца,0
-view,product.category,0,Product Categories,Категории продукти,0
-view,product.category,0,Product Category,ÐšÐ°Ñ‚ÐµÐ³Ð¾Ñ€Ð¸Ñ Ð½Ð° продукт,0
-view,product.product,0,Products,Продукти,0
-view,product.template,0,General,ОÑновен,0
-view,product.template,0,Product Template,Щаблон за продукт,0
-view,product.template,0,Product Templates,Шаблони на продукти,0
-view,product.uom,0,Unit of Measure,Мерни единици,0
-view,product.uom,0,Units of Measure,Мерни едниници,0
-view,product.uom.category,0,Categories of Unit of Measure,Категории мер. ед.,0
-view,product.uom.category,0,Category of Unit of Measure,ÐšÐ°Ñ‚ÐµÐ³Ð¾Ñ€Ð¸Ñ Ð¼ÐµÑ€Ð½Ð¸ единици,0
diff --git a/category.xml b/category.xml
index e34c746..2895eab 100644
--- a/category.xml
+++ b/category.xml
@@ -10,7 +10,7 @@ this repository contains the full copyright notices and license terms. -->
<field name="arch" type="xml">
<![CDATA[
<tree string="Product Categories">
- <field name="name" select="1"/>
+ <field name="name"/>
<field name="rec_name"/>
</tree>
]]>
@@ -24,7 +24,7 @@ this repository contains the full copyright notices and license terms. -->
<field name="arch" type="xml">
<![CDATA[
<tree string="Product Categories" keyword_open="1">
- <field name="name" select="1"/>
+ <field name="name"/>
<field name="parent" tree_invisible="1"/>
<field name="childs" tree_invisible="1"/>
</tree>
@@ -90,24 +90,6 @@ this repository contains the full copyright notices and license terms. -->
sequence="10" id="menu_category_list"
action="act_category_list"/>
- <record model="ir.action.act_window" id="act_category_form">
- <field name="name">Product Categories</field>
- <field name="res_model">product.category</field>
- </record>
- <record model="ir.action.act_window.view" id="act_category_form_view1">
- <field name="sequence" eval="10"/>
- <field name="view" ref="category_view_form"/>
- <field name="act_window" ref="act_category_form"/>
- </record>
- <record model="ir.action.act_window.view" id="act_category_form_view2">
- <field name="sequence" eval="20"/>
- <field name="view" ref="category_view_list"/>
- <field name="act_window" ref="act_category_form"/>
- </record>
- <menuitem name="New Category" parent="menu_category_tree"
- sequence="20" id="menu_category_form_new"
- action="act_category_form"/>
-
<record model="ir.model.access" id="access_product_category">
<field name="model" search="[('model', '=', 'product.category')]"/>
<field name="perm_read" eval="True"/>
diff --git a/de_DE.csv b/de_DE.csv
deleted file mode 100644
index 92dcc40..0000000
--- a/de_DE.csv
+++ /dev/null
@@ -1,190 +0,0 @@
-type,name,res_id,src,value,fuzzy
-error,product.category,0,You can not create recursive categories!,Kategorien können nicht rekursiv angelegt werden!,0
-error,product.template,0,You cannot change the default uom for a product which is associated to stock moves.,"Die Standardmaßeinheit kann nicht für einen Artikel geändert werden, der Lagerbewegungen zugeordnet ist.",0
-error,product.uom,0,"If the UOM is still not used, you can delete it otherwise you can deactivate it and create a new one.","Wenn die Maßeinheit noch nicht verwendet wurde, kann sie gelöscht werden.
-Andernfalls kann sie nur deaktiviert und eine andere neue erstellt werden.",0
-error,product.uom,0,Invalid Factor and Rate values!,Ungültige Werte für Faktor und Kehrwert!,0
-error,product.uom,0,Rate and factor can not be both equal to zero.,Faktor und Kehrwert Faktor können beide nicht 0 sein,0
-error,product.uom,0,"You cannot change Rate, Factor or Category on a Unit of Measure. ","Faktor, Faktorkehrwert oder Kategorie einer Maßeinheit können nicht geändert werden.",0
-field,"product.category,childs",0,Children,Untergeordnet (Kategorien),0
-field,"product.category,create_date",0,Creation date,Erstellungsdatum,0
-field,"product.category,create_uid",0,Creation user,Ersteller,0
-field,"product.category,id",0,ID,ID,0
-field,"product.category,name",0,Name,Name,0
-field,"product.category,parent",0,Parent,Ãœbergeordnet (Kategorie),0
-field,"product.category,rec_name",0,Name,Name,0
-field,"product.category,write_date",0,Last modification date,Zuletzt geändert am,0
-field,"product.category,write_uid",0,Last modification by,Zuletzt geändert von,0
-field,"product.product,code",0,Code,Artikelnummer,0
-field,"product.product,create_date",0,Creation date,Erstellungsdatum,0
-field,"product.product,create_uid",0,Creation user,Ersteller,0
-field,"product.product,description",0,Description,Beschreibung,0
-field,"product.product,id",0,ID,ID,0
-field,"product.product,rec_name",0,Name,Name,0
-field,"product.product,template",0,Product Template,Artikelvorlage,0
-field,"product.product,write_date",0,Last modification date,Zuletzt geändert am,0
-field,"product.product,write_uid",0,Last modification by,Zuletzt geändert von,0
-field,"product.template,active",0,Active,Aktiv,0
-field,"product.template,category",0,Category,Artikelkategorie,0
-field,"product.template,cost_price",0,Cost Price,Einkaufspreis,0
-field,"product.template,cost_price_method",0,Cost Method,Kostenermittlung,0
-field,"product.template,cost_price_uom",0,Cost Price,Einkaufspreis,0
-field,"product.template,create_date",0,Creation date,Erstellungsdatum,0
-field,"product.template,create_uid",0,Creation user,Ersteller,0
-field,"product.template,default_uom",0,Default UOM,Standardeinheit,0
-field,"product.template,id",0,ID,ID,0
-field,"product.template,list_price",0,List Price,Listenpreis,0
-field,"product.template,list_price_uom",0,List Price,Listenpreis,0
-field,"product.template,name",0,Name,Name,0
-field,"product.template,products",0,Products,Artikel,0
-field,"product.template,rec_name",0,Name,Name,0
-field,"product.template,type",0,Type,Typ,0
-field,"product.template,write_date",0,Last modification date,Zuletzt geändert am,0
-field,"product.template,write_uid",0,Last modification by,Zuletzt geändert von,0
-field,"product.uom,active",0,Active,Aktiv,0
-field,"product.uom,category",0,UOM Category,Kategorie Maßeinheit,0
-field,"product.uom,create_date",0,Creation date,Erstellungsdatum,0
-field,"product.uom,create_uid",0,Creation user,Ersteller,0
-field,"product.uom,digits",0,Display Digits,Angezeigte Stellen,0
-field,"product.uom,factor",0,Factor,Faktor,0
-field,"product.uom,id",0,ID,ID,0
-field,"product.uom,name",0,Name,Name,0
-field,"product.uom,rate",0,Rate,Kehrwert Faktor,0
-field,"product.uom,rec_name",0,Name,Name,0
-field,"product.uom,rounding",0,Rounding Precision,Rundungsgenauigkeit,0
-field,"product.uom,symbol",0,Symbol,Symbol,0
-field,"product.uom,write_date",0,Last modification date,Zuletzt geändert am,0
-field,"product.uom,write_uid",0,Last modification by,Zuletzt geändert von,0
-field,"product.uom.category,create_date",0,Creation date,Erstellungsdatum,0
-field,"product.uom.category,create_uid",0,Creation user,Ersteller,0
-field,"product.uom.category,id",0,ID,ID,0
-field,"product.uom.category,name",0,Name,Name,0
-field,"product.uom.category,rec_name",0,Name,Name,0
-field,"product.uom.category,uoms",0,Unit of Measures,Maßeinheiten,0
-field,"product.uom.category,write_date",0,Last modification date,Zuletzt geändert am,0
-field,"product.uom.category,write_uid",0,Last modification by,Zuletzt geändert von,0
-help,"product.uom,factor",0,"The coefficient for the formula:
-coef (base unit) = 1 (this unit)","Der Faktor der Basiseinheit für eine Maßeinheit ist immer 1.
-Formel: diese Einheit = Faktor * Basiseinheit
-Das Feld Kehrwert Faktor wird automatisch aus dem hier eingetragenen Wert ermittelt.",0
-help,"product.uom,rate",0,"The coefficient for the formula:
-1 (base unit) = coef (this unit)","Der Kehrwert des Faktors der Basiseinheit für eine Maßeinheit ist immer 1.
-Formel: Basiseinheit = Kehrwert * diese Einheit
-Das Feld Faktor wird automatisch aus dem hier eingetragenen Wert ermittelt.",0
-model,"ir.action,name",act_category_form,Product Categories,Artikelkategorien,0
-model,"ir.action,name",act_category_list,Categories,Kategorien,0
-model,"ir.action,name",act_category_tree,Categories,Artikelkategorien,0
-model,"ir.action,name",act_product_by_category,Product by Category,Artikel nach Kategorie,0
-model,"ir.action,name",act_product_form,Products,Artikel,0
-model,"ir.action,name",act_product_form2,Products,Artikel,0
-model,"ir.action,name",act_uom_category_form,Categories of Unit of Measure,Kategorien Maßeinheiten,0
-model,"ir.action,name",act_uom_category_form2,Categories of Unit of Measure,Kategorien Maßeinheiten,0
-model,"ir.action,name",act_uom_form,Units of Measure,Maßeinheiten,0
-model,"ir.action,name",act_uom_form2,Units of Measure,Maßeinheiten,0
-model,"ir.ui.menu,name",menu_category_form_new,New Category,Neue Artikelkategorie,0
-model,"ir.ui.menu,name",menu_category_list,Categories,Kategorien,0
-model,"ir.ui.menu,name",menu_category_tree,Categories,Artikelkategorien,0
-model,"ir.ui.menu,name",menu_main_product,Product,Artikel,0
-model,"ir.ui.menu,name",menu_product_product,Products,Artikel,0
-model,"ir.ui.menu,name",menu_product_product_new,New Product,Neuer Artikel,0
-model,"ir.ui.menu,name",menu_uom_category_form,Categories,Kategorien für Maßeinheiten,0
-model,"ir.ui.menu,name",menu_uom_category_form_new,New Category,Neue Kategorie für Maßeinheit,0
-model,"ir.ui.menu,name",menu_uom_form,Units of Measure,Maßeinheiten,0
-model,"ir.ui.menu,name",menu_uom_form2,New Unit of Measure,Neue Maßeinheit,0
-model,"product.category,name",0,Product Category,Artikel Kategorie,0
-model,"product.product,name",0,Product,Artikel,0
-model,"product.template,name",0,Product Template,Artikel Vorlage,0
-model,"product.uom,name",0,Unit of measure,Maßeinheit,0
-model,"product.uom,name",uom_are,Are,Ar,0
-model,"product.uom,name",uom_carat,Carat,Karat,0
-model,"product.uom,name",uom_centimeter,centimeter,Zentimeter,0
-model,"product.uom,name",uom_cubic_centimeter,Cubic centimeter,Kubikzentimeter,0
-model,"product.uom,name",uom_cubic_foot,Cubic foot,Kubikfuß,0
-model,"product.uom,name",uom_cubic_inch,Cubic inch,Kubikzoll,0
-model,"product.uom,name",uom_cubic_meter,Cubic meter,Kubikmeter,0
-model,"product.uom,name",uom_day,Day,Tag(e),0
-model,"product.uom,name",uom_foot,Foot,Fuß,0
-model,"product.uom,name",uom_gallon,Gallon,Gallone(n),0
-model,"product.uom,name",uom_gram,Gram,Gramm,0
-model,"product.uom,name",uom_hectare,Hectare,Hektar,0
-model,"product.uom,name",uom_hour,Hour,Stunde(n),0
-model,"product.uom,name",uom_inch,Inch,Zoll,0
-model,"product.uom,name",uom_kilogram,Kilogram,Kilogramm,0
-model,"product.uom,name",uom_kilometer,Kilometer,Kilometer,0
-model,"product.uom,name",uom_liter,Liter,Liter,0
-model,"product.uom,name",uom_meter,Meter,Meter,0
-model,"product.uom,name",uom_mile,Mile,Meile(n),0
-model,"product.uom,name",uom_millimeter,Millimeter,Millimeter,0
-model,"product.uom,name",uom_minute,Minute,Minute(n),0
-model,"product.uom,name",uom_ounce,Ounce,Unze(n),0
-model,"product.uom,name",uom_pound,Pound,Pfund,0
-model,"product.uom,name",uom_second,Second,Sekunde(n),0
-model,"product.uom,name",uom_square_centimeter,Square centimeter,Quadratzentimeter,0
-model,"product.uom,name",uom_square_foot,Square foot,Quadratfuß,0
-model,"product.uom,name",uom_square_inch,Square inch,Quadratzoll,0
-model,"product.uom,name",uom_square_meter,Square meter,Quadratmeter,0
-model,"product.uom,name",uom_square_yard,Square yard,Quadratyard(s),0
-model,"product.uom,name",uom_unit,Unit,Stück,0
-model,"product.uom,name",uom_work_day,Work Day,Personentag(e),0
-model,"product.uom,name",uom_yard,Yard,Yard(s),0
-model,"product.uom,symbol",uom_are,a,a,0
-model,"product.uom,symbol",uom_carat,c,c,0
-model,"product.uom,symbol",uom_centimeter,cm,cm,0
-model,"product.uom,symbol",uom_cubic_centimeter,cm³,cm³,0
-model,"product.uom,symbol",uom_cubic_foot,ft³,ft³,0
-model,"product.uom,symbol",uom_cubic_inch,in³,in³,0
-model,"product.uom,symbol",uom_cubic_meter,m³,m³,0
-model,"product.uom,symbol",uom_day,d,d,0
-model,"product.uom,symbol",uom_foot,ft,ft,0
-model,"product.uom,symbol",uom_gallon,gal,gal,0
-model,"product.uom,symbol",uom_gram,g,g,0
-model,"product.uom,symbol",uom_hectare,ha,ha,0
-model,"product.uom,symbol",uom_hour,h,h,0
-model,"product.uom,symbol",uom_inch,in,in,0
-model,"product.uom,symbol",uom_kilogram,kg,kg,0
-model,"product.uom,symbol",uom_kilometer,km,km,0
-model,"product.uom,symbol",uom_liter,l,l,0
-model,"product.uom,symbol",uom_meter,m,m,0
-model,"product.uom,symbol",uom_mile,mi,mi,0
-model,"product.uom,symbol",uom_millimeter,mm,mm,0
-model,"product.uom,symbol",uom_minute,min,min,0
-model,"product.uom,symbol",uom_ounce,oz,oz,0
-model,"product.uom,symbol",uom_pound,lbs,lbs,0
-model,"product.uom,symbol",uom_second,s,s,0
-model,"product.uom,symbol",uom_square_centimeter,cm²,cm²,0
-model,"product.uom,symbol",uom_square_foot,ft²,ft²,0
-model,"product.uom,symbol",uom_square_inch,in²,in²,0
-model,"product.uom,symbol",uom_square_meter,m²,m²,0
-model,"product.uom,symbol",uom_square_yard,yd²,yd²,0
-model,"product.uom,symbol",uom_unit,u,St.,0
-model,"product.uom,symbol",uom_work_day,wd,PT,0
-model,"product.uom,symbol",uom_yard,yd,yd,0
-model,"product.uom.category,name",0,Product uom category,Artikel Maßeinheit Kategorie,0
-model,"product.uom.category,name",uom_cat_length,Length,Länge,0
-model,"product.uom.category,name",uom_cat_surface,Surface,Fläche,0
-model,"product.uom.category,name",uom_cat_time,Time,Zeit,0
-model,"product.uom.category,name",uom_cat_unit,Units,Stückzahl,0
-model,"product.uom.category,name",uom_cat_volume,Volume,Volumen,0
-model,"product.uom.category,name",uom_cat_weight,Weight,Gewicht,0
-model,"res.group,name",group_product_admin,Product Administration,Artikel Administration,0
-selection,"product.template,cost_price_method",0,Average,Durchschnitt,0
-selection,"product.template,cost_price_method",0,Fixed,Fix,0
-selection,"product.template,type",0,Consumable,Verbrauchsmaterial,0
-selection,"product.template,type",0,Service,Dienstleistung,0
-selection,"product.template,type",0,Stockable,Lagerware,0
-view,product.category,0,Children,Untergeordnet (Kategorien),0
-view,product.category,0,Product Categories,Artikelkategorien,0
-view,product.category,0,Product Category,Artikelkategorie,0
-view,product.product,0,General,Allgemein,0
-view,product.product,0,Product,Artikel,0
-view,product.product,0,Product Suppliers,Lieferanten,0
-view,product.product,0,Products,Artikel,0
-view,product.template,0,General,Allgemein,0
-view,product.template,0,Product,Artikel,0
-view,product.template,0,Product Template,Artikelvorlage,0
-view,product.template,0,Product Templates,Artikelvorlagen,0
-view,product.template,0,Products,Artikel,0
-view,product.uom,0,Unit of Measure,Maßeinheit,0
-view,product.uom,0,Units of Measure,Maßeinheiten,0
-view,product.uom.category,0,Categories of Unit of Measure,Kategorien Maßeinheiten,0
-view,product.uom.category,0,Category of Unit of Measure,Kategorie Maßeinheit,0
diff --git a/es_CO.csv b/es_CO.csv
deleted file mode 100644
index 4234286..0000000
--- a/es_CO.csv
+++ /dev/null
@@ -1,158 +0,0 @@
-type,name,res_id,src,value,fuzzy
-error,product.template,0,You cannot change the default uom for a product which is associated to stock moves.,No puede cambiar la UdM predeterminada para un producto asociado con movimientos de inventario.,0
-error,product.uom,0,"If the UOM is still not used, you can delete it otherwise you can deactivate it and create a new one.","Si no se ha usado la UdM, puede eliminar, de otra forma puede desactivarla y crear una nueva.",0
-error,product.uom,0,Invalid Factor and Rate values!,¡Factor y valores de tasa de cambio inválidas!,0
-error,product.uom,0,Rate and factor can not be both equal to zero.,Tasa de cambio y factor no pueden ser cero simultáneamente.,0
-error,product.uom,0,"You cannot change Rate, Factor or Category on a Unit of Measure. ","No puede cambiar la Rata, el Factor o la CategorÃa de una Unidad de Medida.",0
-field,"product.category,childs",0,Children,Hij at s,0
-field,"product.category,name",0,Name,Nombre,0
-field,"product.category,parent",0,Parent,Padre,0
-field,"product.category,rec_name",0,Name,Nombre,0
-field,"product.product,code",0,Code,Código,0
-field,"product.product,description",0,Description,Descripción,0
-field,"product.product,rec_name",0,Name,Nombre,0
-field,"product.product,template",0,Product Template,Plantilla de Producto,0
-field,"product.template,active",0,Active,Activo,0
-field,"product.template,category",0,Category,CategorÃa,0
-field,"product.template,cost_price",0,Cost Price,Método de Precio,0
-field,"product.template,cost_price_method",0,Cost Method,Método de Coste,0
-field,"product.template,cost_price_uom",0,Cost Price,Método de Precio,0
-field,"product.template,default_uom",0,Default UOM,UdM Predeterminado,0
-field,"product.template,list_price",0,List Price,Precio de Lista,0
-field,"product.template,list_price_uom",0,List Price,Precio de Lista,0
-field,"product.template,name",0,Name,Nombre,0
-field,"product.template,products",0,Products,Productos,0
-field,"product.template,rec_name",0,Name,Nombre,0
-field,"product.template,type",0,Type,Tipo,0
-field,"product.uom,active",0,Active,Activo,0
-field,"product.uom,category",0,UOM Category,CategorÃa UDM,0
-field,"product.uom.category,name",0,Name,Nombre,0
-field,"product.uom.category,rec_name",0,Name,Nombre,0
-field,"product.uom.category,uoms",0,Unit of Measures,Unidad de Medidas,0
-field,"product.uom,digits",0,Display Digits,Mostrar DÃgitos,0
-field,"product.uom,factor",0,Factor,Factor,0
-field,"product.uom,name",0,Name,Nombre,0
-field,"product.uom,rate",0,Rate,Tasa de Cambio,0
-field,"product.uom,rec_name",0,Name,Nombre,0
-field,"product.uom,rounding",0,Rounding Precision,Precisión de Redondeo,0
-field,"product.uom,symbol",0,Symbol,SÃmbolo,0
-help,"product.uom,factor",0,"The coefficient for the formula:
-coef (base unit) = 1 (this unit)",El coeficiente para la fórmula:,0
-help,"product.uom,rate",0,"The coefficient for the formula:
-1 (base unit) = coef (this unit)",El coeficiente para la fórmula:,0
-model,"ir.action,name",act_category_tree,Categories,CategorÃas,0
-model,"ir.action,name",act_uom_category_form,Categories of Unit of Measure,CategorÃas de Unidad de Medida,0
-model,"ir.action,name",act_uom_category_form2,Categories of Unit of Measure,CategorÃas de Unidad de Medida,1
-model,"ir.action,name",act_product_by_category,Product by Category,Producto por CategorÃa,0
-model,"ir.action,name",act_category_form,Product Categories,CategorÃas de Producto,0
-model,"ir.action,name",act_category_form2,Product Categories,CategorÃas de Producto,1
-model,"ir.action,name",act_product_form,Products,Productos,0
-model,"ir.action,name",act_product_form2,Products,Productos,0
-model,"ir.action,name",act_uom_form,Units of Measure,Unidades de Medida,0
-model,"ir.action,name",act_uom_form2,Units of Measure,Unidades de Medida,0
-model,"ir.ui.menu,name",menu_category_tree,Categories,CategorÃas,0
-model,"ir.ui.menu,name",menu_category_form,Categories,Editar CategorÃas,1
-model,"ir.ui.menu,name",menu_uom_category_form,Categories,CategorÃas,0
-model,"ir.ui.menu,name",menu_category_form_new,New Category,Nueva CategorÃa,0
-model,"ir.ui.menu,name",menu_uom_category_form_new,New Category,Nueva CategorÃa,0
-model,"ir.ui.menu,name",menu_product_product_new,New Product,Nuevo Producto,0
-model,"ir.ui.menu,name",menu_uom_form2,New Unit of Measure,Nueva Unidad de Mesura,0
-model,"ir.ui.menu,name",menu_main_product,Product,Producto,0
-model,"ir.ui.menu,name",menu_product_product,Products,Productos,0
-model,"ir.ui.menu,name",menu_uom_form,Units of Measure,Unidades de Medida,0
-model,"product.category,name",0,Product Category,CategorÃa de Producto,0
-model,"product.product,name",0,Product,Producto,0
-model,"product.template,name",0,Product Template,Plantilla de Producto,0
-model,"product.uom.category,name",uom_cat_length,Length,Longitud,0
-model,"product.uom.category,name",0,Product uom category,CategorÃa de udm de Producto,0
-model,"product.uom.category,name",uom_cat_surface,Surface,Superficie,0
-model,"product.uom.category,name",uom_cat_time,Time,Tiempo,0
-model,"product.uom.category,name",uom_cat_unit,Units,Unidades,0
-model,"product.uom.category,name",uom_cat_volume,Volume,Volumen,0
-model,"product.uom.category,name",uom_cat_weight,Weight,Peso,0
-model,"product.uom,name",uom_are,Are,Son,0
-model,"product.uom,name",uom_carat,Carat,Carat,0
-model,"product.uom,name",uom_centimeter,centimeter,centÃmetro,0
-model,"product.uom,name",uom_cubic_centimeter,Cubic centimeter,CentÃmetro Cúbico,0
-model,"product.uom,name",uom_cubic_foot,Cubic foot,Pie Cúbico,0
-model,"product.uom,name",uom_cubic_inch,Cubic inch,Pulgada Cúbica,0
-model,"product.uom,name",uom_cubic_meter,Cubic meter,Metro Cúbico,0
-model,"product.uom,name",uom_day,Day,DÃa,0
-model,"product.uom,name",uom_foot,Foot,Pie,0
-model,"product.uom,name",uom_gallon,Gallon,Galón,0
-model,"product.uom,name",uom_gram,Gram,Gram,0
-model,"product.uom,name",uom_hectare,Hectare,Hectárea,0
-model,"product.uom,name",uom_hour,Hour,Hora,0
-model,"product.uom,name",uom_inch,Inch,Pulgada,0
-model,"product.uom,name",uom_kilogram,Kilogram,Kilogramo,0
-model,"product.uom,name",uom_kilometer,Kilometer,Kilómetro,0
-model,"product.uom,name",uom_liter,Liter,Litro,0
-model,"product.uom,name",uom_meter,Meter,Metro,0
-model,"product.uom,name",uom_mile,Mile,Milla,0
-model,"product.uom,name",uom_millimeter,Millimeter,MilÃmetro,0
-model,"product.uom,name",uom_minute,Minute,Minuto,0
-model,"product.uom,name",uom_ounce,Ounce,Onza,0
-model,"product.uom,name",uom_pound,Pound,Libra,0
-model,"product.uom,name",uom_second,Second,Segundo,0
-model,"product.uom,name",uom_square_centimeter,Square centimeter,CentÃmetro Cuadrado,0
-model,"product.uom,name",uom_square_foot,Square foot,Pie Cuadrado,0
-model,"product.uom,name",uom_square_inch,Square inch,Pulgada Cuadrada,0
-model,"product.uom,name",uom_square_meter,Square meter,Metro Cuadrado,0
-model,"product.uom,name",uom_square_yard,Square yard,Yarda Cuadrada,0
-model,"product.uom,name",uom_unit,Unit,Unidad,0
-model,"product.uom,name",0,Unit of measure,Unidad de medida,0
-model,"product.uom,name",uom_work_day,Work Day,DÃa de Trabajo,0
-model,"product.uom,name",uom_yard,Yard,Yarda,0
-model,"product.uom,symbol",uom_are,a,a,0
-model,"product.uom,symbol",uom_carat,c,c,0
-model,"product.uom,symbol",uom_centimeter,cm,cm,0
-model,"product.uom,symbol",uom_square_centimeter,cm²,cm²,0
-model,"product.uom,symbol",uom_cubic_centimeter,cm³,cm³,0
-model,"product.uom,symbol",uom_day,d,d,0
-model,"product.uom,symbol",uom_foot,ft,pie,0
-model,"product.uom,symbol",uom_square_foot,ft²,pie²,0
-model,"product.uom,symbol",uom_cubic_foot,ft³,pie³,0
-model,"product.uom,symbol",uom_gram,g,g,0
-model,"product.uom,symbol",uom_gallon,gal,gal,0
-model,"product.uom,symbol",uom_hour,h,h,0
-model,"product.uom,symbol",uom_hectare,ha,ha,0
-model,"product.uom,symbol",uom_inch,in,en,0
-model,"product.uom,symbol",uom_square_inch,in²,pul²,0
-model,"product.uom,symbol",uom_cubic_inch,in³,pul³,0
-model,"product.uom,symbol",uom_kilogram,kg,kg,0
-model,"product.uom,symbol",uom_kilometer,km,km,0
-model,"product.uom,symbol",uom_liter,l,l,0
-model,"product.uom,symbol",uom_pound,lbs,lbs,0
-model,"product.uom,symbol",uom_meter,m,m,0
-model,"product.uom,symbol",uom_square_meter,m²,m²,0
-model,"product.uom,symbol",uom_cubic_meter,m³,m³,0
-model,"product.uom,symbol",uom_mile,mi,mi,0
-model,"product.uom,symbol",uom_minute,min,min,0
-model,"product.uom,symbol",uom_millimeter,mm,mm,0
-model,"product.uom,symbol",uom_ounce,oz,oz,0
-model,"product.uom,symbol",uom_second,s,s,0
-model,"product.uom,symbol",uom_unit,u,u,0
-model,"product.uom,symbol",uom_work_day,wd,wd,0
-model,"product.uom,symbol",uom_yard,yd,yd,0
-model,"product.uom,symbol",uom_square_yard,yd²,yd²,0
-model,"res.group,name",group_product_admin,Product Administration,Productos,0
-selection,"product.template,cost_price_method",0,Average,Promedio,0
-selection,"product.template,cost_price_method",0,FIFO,FIFO,0
-selection,"product.template,cost_price_method",0,Fixed,Fijo,0
-selection,"product.template,type",0,Consumable,Consumible,0
-selection,"product.template,type",0,Service,Servicios,0
-selection,"product.template,type",0,Stockable,Almacenable,0
-view,product.category,0,Children,Hij at s,0
-view,product.category,0,Product Categories,CategorÃas de Producto,0
-view,product.category,0,Product Category,CategorÃa de Producto,0
-view,product.product,0,General,General,0
-view,product.product,0,Product,Producto,0
-view,product.product,0,Products,Productos,0
-view,product.product,0,Product Suppliers,Proveedores de Productos,0
-view,product.template,0,General,General,0
-view,product.template,0,Product Template,Plantilla de Producto,0
-view,product.template,0,Product Templates,Plantillas de Producto,0
-view,product.uom,0,Unit of Measure,Unidad de Medida,0
-view,product.uom,0,Units of Measure,Unidades de Medida,0
-view,product.uom.category,0,Categories of Unit of Measure,CategorÃas de Unidad de Medida,0
-view,product.uom.category,0,Category of Unit of Measure,CategorÃa de unidad de Medida,0
diff --git a/es_ES.csv b/es_ES.csv
deleted file mode 100644
index 28af914..0000000
--- a/es_ES.csv
+++ /dev/null
@@ -1,153 +0,0 @@
-type,name,res_id,src,value,fuzzy
-error,product.uom,0,"If the UOM is still not used, you can delete it otherwise you can deactivate it and create a new one.","Si no se ha usado la UdM, puede borrarla, en caso contrario, puede desactivarla y crear una nueva.",0
-error,product.uom,0,Rate and factor can not be both equal to zero.,Conversión y factor no pueden ser cero simultáneamente.,0
-error,product.uom,0,"You cannot change Rate, Factor or Category on a Unit of Measure. ","No puede cambiar la conversión, el factor o la categorÃa de una unidad de medida.",0
-field,"product.category,childs",0,Children,Hijos,0
-field,"product.category,name",0,Name,Nombre,0
-field,"product.category,parent",0,Parent,Padre,0
-field,"product.category,rec_name",0,Name,Nombre,0
-field,"product.product,code",0,Code,Código,0
-field,"product.product,description",0,Description,Descripción,0
-field,"product.product,rec_name",0,Name,Nombre,0
-field,"product.product,template",0,Product Template,Plantilla de producto,0
-field,"product.template,active",0,Active,Activo,0
-field,"product.template,category",0,Category,CategorÃa,0
-field,"product.template,cost_price",0,Cost Price,Precio de coste,0
-field,"product.template,cost_price_method",0,Cost Method,Método de coste,0
-field,"product.template,cost_price_uom",0,Cost Price,Precio de coste,0
-field,"product.template,default_uom",0,Default UOM,UdM predeterminada,0
-field,"product.template,list_price",0,List Price,Precio de lista,0
-field,"product.template,list_price_uom",0,List Price,Precio de lista,0
-field,"product.template,name",0,Name,Nombre,0
-field,"product.template,products",0,Products,Productos,0
-field,"product.template,rec_name",0,Name,Nombre,0
-field,"product.template,type",0,Type,Tipo,0
-field,"product.uom,active",0,Active,Activo,0
-field,"product.uom,category",0,UOM Category,CategorÃa de UdM,0
-field,"product.uom.category,name",0,Name,Nombre,0
-field,"product.uom.category,rec_name",0,Name,Nombre,0
-field,"product.uom.category,uoms",0,Unit of Measures,Unidades de medidas,0
-field,"product.uom,digits",0,Display Digits,Decimales a mostrar,0
-field,"product.uom,factor",0,Factor,Factor,0
-field,"product.uom,name",0,Name,Nombre,0
-field,"product.uom,rate",0,Rate,Conversión,0
-field,"product.uom,rec_name",0,Name,Nombre,0
-field,"product.uom,rounding",0,Rounding Precision,Precisión de redondeo,0
-field,"product.uom,symbol",0,Symbol,SÃmbolo,0
-help,"product.uom,factor",0,"The coefficient for the formula:
-coef (base unit) = 1 (this unit)","El coeficiente de la fórmula:
-coeficiente (unidad base) = 1 (esta unidad)",0
-help,"product.uom,rate",0,"The coefficient for the formula:
-1 (base unit) = coef (this unit)","El coeficiente de la fórmula:
-1 (unidad base) = coeficiente (esta unidad)",0
-model,"ir.action,name",act_category_tree,Categories,CategorÃas,0
-model,"ir.action,name",act_uom_category_form,Categories of Unit of Measure,CategorÃas de la unidad de medida,0
-model,"ir.action,name",act_product_by_category,Product by Category,Producto por categorÃa,0
-model,"ir.action,name",act_category_form,Product Categories,CategorÃas de producto,0
-model,"ir.action,name",act_product_form,Products,Productos,0
-model,"ir.action,name",act_product_form2,Products,Productos,0
-model,"ir.action,name",act_uom_form,Units of Measure,Unidades de medida,0
-model,"ir.action,name",act_uom_form2,Units of Measure,Unidades de medida,0
-model,"ir.ui.menu,name",menu_category_tree,Categories,CategorÃas,0
-model,"ir.ui.menu,name",menu_uom_category_form,Categories,CategorÃas,0
-model,"ir.ui.menu,name",menu_category_form,Edit Categories,Editar categorÃas,0
-model,"ir.ui.menu,name",menu_product_product_new,New Product,Nuevo producto,0
-model,"ir.ui.menu,name",menu_uom_form2,New Unit of Measure,Nueva unidad de medida,0
-model,"ir.ui.menu,name",menu_main_product,Product,Producto,0
-model,"ir.ui.menu,name",menu_product_product,Products,Productos,0
-model,"ir.ui.menu,name",menu_uom_form,Units of Measure,Unidades de medida,0
-model,"product.category,name",0,Product Category,CategorÃa de producto,0
-model,"product.product,name",0,Product,Producto,0
-model,"product.template,name",0,Product Template,Plantilla de producto,0
-model,"product.uom.category,name",uom_cat_length,Length,Longitud,0
-model,"product.uom.category,name",0,Product uom category,CategorÃa de UdM de producto,0
-model,"product.uom.category,name",uom_cat_surface,Surface,Superficie,0
-model,"product.uom.category,name",uom_cat_time,Time,Tiempo,0
-model,"product.uom.category,name",uom_cat_unit,Units,Unidades,0
-model,"product.uom.category,name",uom_cat_volume,Volume,Volumen,0
-model,"product.uom.category,name",uom_cat_weight,Weight,Peso,0
-model,"product.uom,name",uom_are,Are,Ãrea,0
-model,"product.uom,name",uom_carat,Carat,Quilate,0
-model,"product.uom,name",uom_centimeter,centimeter,centÃmetro,0
-model,"product.uom,name",uom_cubic_centimeter,Cubic centimeter,CentÃmetro cúbico,0
-model,"product.uom,name",uom_cubic_foot,Cubic foot,Pie cúbico,0
-model,"product.uom,name",uom_cubic_inch,Cubic inch,Pulgada cúbica,0
-model,"product.uom,name",uom_cubic_meter,Cubic meter,Metro cúbico,0
-model,"product.uom,name",uom_day,Day,DÃa,0
-model,"product.uom,name",uom_foot,Foot,Pie,0
-model,"product.uom,name",uom_gallon,Gallon,Galón,0
-model,"product.uom,name",uom_gram,Gram,Gramo,0
-model,"product.uom,name",uom_hectare,Hectare,Hectárea,0
-model,"product.uom,name",uom_hour,Hour,Hora,0
-model,"product.uom,name",uom_inch,Inch,Pulgada,0
-model,"product.uom,name",uom_kilogram,Kilogram,Kilogramo,0
-model,"product.uom,name",uom_kilometer,Kilometer,Kilómetro,0
-model,"product.uom,name",uom_liter,Liter,Litro,0
-model,"product.uom,name",uom_meter,Meter,Metro,0
-model,"product.uom,name",uom_mile,Mile,Milla,0
-model,"product.uom,name",uom_millimeter,Millimeter,MilÃmetro,0
-model,"product.uom,name",uom_minute,Minute,Minuto,0
-model,"product.uom,name",uom_ounce,Ounce,Onza,0
-model,"product.uom,name",uom_pound,Pound,Libra,0
-model,"product.uom,name",uom_second,Second,Segundo,0
-model,"product.uom,name",uom_square_centimeter,Square centimeter,CentÃmetro cuadrado,0
-model,"product.uom,name",uom_square_foot,Square foot,Pie cuadrado,0
-model,"product.uom,name",uom_square_inch,Square inch,Pulgada cuadrada,0
-model,"product.uom,name",uom_square_meter,Square meter,Metro cuadrado,0
-model,"product.uom,name",uom_square_yard,Square yard,Yarda cuadrada,0
-model,"product.uom,name",uom_unit,Unit,Unidad,0
-model,"product.uom,name",0,Unit of measure,Unidad de medida,0
-model,"product.uom,name",uom_work_day,Work Day,DÃa de trabajo,0
-model,"product.uom,name",uom_yard,Yard,Yarda,0
-model,"product.uom,symbol",uom_are,a,a,0
-model,"product.uom,symbol",uom_carat,c,c,0
-model,"product.uom,symbol",uom_centimeter,cm,cm,0
-model,"product.uom,symbol",uom_square_centimeter,cm²,cm²,0
-model,"product.uom,symbol",uom_cubic_centimeter,cm³,cm³,0
-model,"product.uom,symbol",uom_day,d,d,0
-model,"product.uom,symbol",uom_foot,ft,pie,0
-model,"product.uom,symbol",uom_square_foot,ft²,pie²,0
-model,"product.uom,symbol",uom_cubic_foot,ft³,pie³,0
-model,"product.uom,symbol",uom_gram,g,g,0
-model,"product.uom,symbol",uom_gallon,gal,gal,0
-model,"product.uom,symbol",uom_hour,h,h,0
-model,"product.uom,symbol",uom_hectare,ha,ha,0
-model,"product.uom,symbol",uom_inch,in,pul,0
-model,"product.uom,symbol",uom_square_inch,in²,pul²,0
-model,"product.uom,symbol",uom_cubic_inch,in³,pul³,0
-model,"product.uom,symbol",uom_kilogram,kg,kg,0
-model,"product.uom,symbol",uom_kilometer,km,km,0
-model,"product.uom,symbol",uom_liter,l,l,0
-model,"product.uom,symbol",uom_pound,lbs,lbs,0
-model,"product.uom,symbol",uom_meter,m,m,0
-model,"product.uom,symbol",uom_square_meter,m²,m²,0
-model,"product.uom,symbol",uom_cubic_meter,m³,m³,0
-model,"product.uom,symbol",uom_mile,mi,mi,0
-model,"product.uom,symbol",uom_minute,min,min,0
-model,"product.uom,symbol",uom_millimeter,mm,mm,0
-model,"product.uom,symbol",uom_ounce,oz,oz,0
-model,"product.uom,symbol",uom_second,s,s,0
-model,"product.uom,symbol",uom_unit,u,u,0
-model,"product.uom,symbol",uom_work_day,wd,wd,0
-model,"product.uom,symbol",uom_yard,yd,yd,0
-model,"product.uom,symbol",uom_square_yard,yd²,yd²,0
-model,"res.group,name",group_product_admin,Product Administration,Administración de productos,0
-selection,"product.template,cost_price_method",0,Average,Promedio,0
-selection,"product.template,cost_price_method",0,Fixed,Fijo,0
-selection,"product.template,type",0,Consumable,Consumible,0
-selection,"product.template,type",0,Service,Servicio,0
-selection,"product.template,type",0,Stockable,Almacenable,0
-view,product.category,0,Children,Hijos,0
-view,product.category,0,Product Categories,CategorÃas de producto,0
-view,product.category,0,Product Category,CategorÃa de producto,0
-view,product.product,0,General,General,0
-view,product.product,0,Product,Producto,0
-view,product.product,0,Products,Productos,0
-view,product.product,0,Product Suppliers,Proveedores de productos,0
-view,product.template,0,General,General,0
-view,product.template,0,Product Template,Plantilla de producto,0
-view,product.template,0,Product Templates,Plantillas de producto,0
-view,product.uom,0,Unit of Measure,Unidad de medida,0
-view,product.uom,0,Units of Measure,Unidades de medida,0
-view,product.uom.category,0,Categories of Unit of Measure,CategorÃas de unidades de medida,0
-view,product.uom.category,0,Category of Unit of Measure,CategorÃa de unidad de medida,0
diff --git a/fr_FR.csv b/fr_FR.csv
deleted file mode 100644
index c431e59..0000000
--- a/fr_FR.csv
+++ /dev/null
@@ -1,161 +0,0 @@
-type,name,res_id,src,value,fuzzy
-error,product.category,0,You can not create recursive categories!,Vous ne pouvez pas créer des catégories récursives !,1
-error,product.template,0,You cannot change the default uom for a product which is associated to stock moves.,Vous ne pouvez pas changer l'UDM par défaut pour un produit qui a déjà fait l'objet de mouvements de stock,0
-error,product.uom,0,"If the UOM is still not used, you can delete it otherwise you can deactivate it and create a new one.","Si l'UDM n'est pas utilisée, vous pouvez la supprimer, sinon vous pouvez la désactiver et en créer une nouvelle.",0
-error,product.uom,0,Invalid Factor and Rate values!,valeurs de facteur et de taux invalides !,0
-error,product.uom,0,Rate and factor can not be both equal to zero.,Le taux et le facteur ne peuvent pas être égaux à zéro.,0
-error,product.uom,0,"You cannot change Rate, Factor or Category on a Unit of Measure. ","Vous ne pouvez pas changer le taux, le facteur ou la catégorie d'une unité de mesure.",0
-field,"product.category,childs",0,Children,Enfants,0
-field,"product.category,name",0,Name,Nom,0
-field,"product.category,parent",0,Parent,Parent,0
-field,"product.category,rec_name",0,Name,Nom,0
-field,"product.product,code",0,Code,Code,0
-field,"product.product,description",0,Description,Description,0
-field,"product.product,rec_name",0,Name,Nom,0
-field,"product.product,template",0,Product Template,Modèle produit,0
-field,"product.template,active",0,Active,Actif,0
-field,"product.template,category",0,Category,Catégorie,0
-field,"product.template,cost_price",0,Cost Price,Prix de revient,0
-field,"product.template,cost_price_method",0,Cost Method,Méthode de coût,0
-field,"product.template,cost_price_uom",0,Cost Price,Prix de revient,0
-field,"product.template,default_uom",0,Default UOM,UDM par défaut,0
-field,"product.template,list_price",0,List Price,Prix listé,0
-field,"product.template,list_price_uom",0,List Price,Prix listé,0
-field,"product.template,name",0,Name,Nom,0
-field,"product.template,products",0,Products,Produits,0
-field,"product.template,rec_name",0,Name,Nom,0
-field,"product.template,type",0,Type,Type,0
-field,"product.uom,active",0,Active,Actif,0
-field,"product.uom,category",0,UOM Category,Catégorie d'UDM,0
-field,"product.uom,digits",0,Display Digits,Décimales affichées,0
-field,"product.uom,factor",0,Factor,Facteur,0
-field,"product.uom,name",0,Name,Nom,0
-field,"product.uom,rate",0,Rate,Taux,0
-field,"product.uom,rec_name",0,Name,Nom,0
-field,"product.uom,rounding",0,Rounding Precision,Précision d'arrondi,0
-field,"product.uom,symbol",0,Symbol,Symbole,0
-field,"product.uom.category,name",0,Name,Nom,0
-field,"product.uom.category,rec_name",0,Name,Nom,0
-field,"product.uom.category,uoms",0,Unit of Measures,Unité de mesure,0
-help,"product.uom,factor",0,"The coefficient for the formula:
-coef (base unit) = 1 (this unit)","Le coefficient pour la formule:
-coef (unité de base) = 1 (cette unité)",0
-help,"product.uom,rate",0,"The coefficient for the formula:
-1 (base unit) = coef (this unit)","Le coefficient pour la formule:
-1 (unité de base) = coef (cette unité)",0
-model,"ir.action,name",act_category_form,Product Categories,Catégories de produit,0
-model,"ir.action,name",act_category_list,Categories,Catégories,1
-model,"ir.action,name",act_category_tree,Categories,Catégories,0
-model,"ir.action,name",act_product_by_category,Product by Category,Produits par catégories,0
-model,"ir.action,name",act_product_form,Products,Produits,0
-model,"ir.action,name",act_product_form2,Products,Produits,0
-model,"ir.action,name",act_uom_category_form,Categories of Unit of Measure,Catégories d'unité de mesure,0
-model,"ir.action,name",act_uom_category_form2,Categories of Unit of Measure,Catégories d'Unité de mesure,0
-model,"ir.action,name",act_uom_form,Units of Measure,Unités de mesure,0
-model,"ir.action,name",act_uom_form2,Units of Measure,Unités de mesure,0
-model,"ir.ui.menu,name",menu_category_form_new,New Category,Nouvelle catégorie,0
-model,"ir.ui.menu,name",menu_category_list,Categories,Catégories,1
-model,"ir.ui.menu,name",menu_category_tree,Categories,Catégories,0
-model,"ir.ui.menu,name",menu_main_product,Product,Produit,0
-model,"ir.ui.menu,name",menu_product_product,Products,Produits,0
-model,"ir.ui.menu,name",menu_product_product_new,New Product,Nouveau produit,0
-model,"ir.ui.menu,name",menu_uom_category_form,Categories,Catégories,0
-model,"ir.ui.menu,name",menu_uom_category_form_new,New Category,Nouvelle catégorie,0
-model,"ir.ui.menu,name",menu_uom_form,Units of Measure,Unités de mesure,0
-model,"ir.ui.menu,name",menu_uom_form2,New Unit of Measure,Nouvelle unité de mesure,0
-model,"product.category,name",0,Product Category,Catégorie de produit,0
-model,"product.product,name",0,Product,Produit,0
-model,"product.template,name",0,Product Template,Modèle produit,0
-model,"product.uom,name",0,Unit of measure,Unité de mesure,0
-model,"product.uom,name",uom_are,Are,Are,0
-model,"product.uom,name",uom_carat,Carat,Carat,0
-model,"product.uom,name",uom_centimeter,centimeter,Centimètre,0
-model,"product.uom,name",uom_cubic_centimeter,Cubic centimeter,Centimètre cube,0
-model,"product.uom,name",uom_cubic_foot,Cubic foot,Pied cubique,0
-model,"product.uom,name",uom_cubic_inch,Cubic inch,Pouce cubique,0
-model,"product.uom,name",uom_cubic_meter,Cubic meter,Mètre cube,0
-model,"product.uom,name",uom_day,Day,Jour,0
-model,"product.uom,name",uom_foot,Foot,Pied,0
-model,"product.uom,name",uom_gallon,Gallon,Gallon,0
-model,"product.uom,name",uom_gram,Gram,Gram,0
-model,"product.uom,name",uom_hectare,Hectare,Hectare,0
-model,"product.uom,name",uom_hour,Hour,Heure,0
-model,"product.uom,name",uom_inch,Inch,Pouce,0
-model,"product.uom,name",uom_kilogram,Kilogram,Kilogramme,0
-model,"product.uom,name",uom_kilometer,Kilometer,Kilomètre,0
-model,"product.uom,name",uom_liter,Liter,Litre,0
-model,"product.uom,name",uom_meter,Meter,Mètre,0
-model,"product.uom,name",uom_mile,Mile,Mille,0
-model,"product.uom,name",uom_millimeter,Millimeter,Millimètre,0
-model,"product.uom,name",uom_minute,Minute,Minute,0
-model,"product.uom,name",uom_ounce,Ounce,Once,0
-model,"product.uom,name",uom_pound,Pound,Livre,0
-model,"product.uom,name",uom_second,Second,Seconde,0
-model,"product.uom,name",uom_square_centimeter,Square centimeter,Centimètre carré,0
-model,"product.uom,name",uom_square_foot,Square foot,Pied carré,0
-model,"product.uom,name",uom_square_inch,Square inch,Pouce carré,0
-model,"product.uom,name",uom_square_meter,Square meter,Mètre carré,0
-model,"product.uom,name",uom_square_yard,Square yard,Yard carré,0
-model,"product.uom,name",uom_unit,Unit,Unité,0
-model,"product.uom,name",uom_work_day,Work Day,Jour de travail,0
-model,"product.uom,name",uom_yard,Yard,Yard,0
-model,"product.uom,symbol",uom_are,a,un,0
-model,"product.uom,symbol",uom_carat,c,c,0
-model,"product.uom,symbol",uom_centimeter,cm,cm,0
-model,"product.uom,symbol",uom_cubic_centimeter,cm³,cm ³,0
-model,"product.uom,symbol",uom_cubic_foot,ft³,ft ³,0
-model,"product.uom,symbol",uom_cubic_inch,in³,in ³,0
-model,"product.uom,symbol",uom_cubic_meter,m³,m³,0
-model,"product.uom,symbol",uom_day,d,d,0
-model,"product.uom,symbol",uom_foot,ft,p,0
-model,"product.uom,symbol",uom_gallon,gal,gal,0
-model,"product.uom,symbol",uom_gram,g,g,0
-model,"product.uom,symbol",uom_hectare,ha,ha,0
-model,"product.uom,symbol",uom_hour,h,h,0
-model,"product.uom,symbol",uom_inch,in,in,0
-model,"product.uom,symbol",uom_kilogram,kg,kg,0
-model,"product.uom,symbol",uom_kilometer,km,km,0
-model,"product.uom,symbol",uom_liter,l,l,0
-model,"product.uom,symbol",uom_meter,m,m,0
-model,"product.uom,symbol",uom_mile,mi,mi,0
-model,"product.uom,symbol",uom_millimeter,mm,mm,0
-model,"product.uom,symbol",uom_minute,min,min,0
-model,"product.uom,symbol",uom_ounce,oz,oz,0
-model,"product.uom,symbol",uom_pound,lbs,lbs,0
-model,"product.uom,symbol",uom_second,s,s,0
-model,"product.uom,symbol",uom_square_centimeter,cm²,cm ²,0
-model,"product.uom,symbol",uom_square_foot,ft²,pi ²,0
-model,"product.uom,symbol",uom_square_inch,in²,in ²,0
-model,"product.uom,symbol",uom_square_meter,m²,m²,0
-model,"product.uom,symbol",uom_square_yard,yd²,yd ²,0
-model,"product.uom,symbol",uom_unit,u,u,0
-model,"product.uom,symbol",uom_work_day,wd,wd,0
-model,"product.uom,symbol",uom_yard,yd,yd,0
-model,"product.uom.category,name",0,Product uom category,Catégorie d'UDM de produit,0
-model,"product.uom.category,name",uom_cat_length,Length,Longueur,0
-model,"product.uom.category,name",uom_cat_surface,Surface,Surface,0
-model,"product.uom.category,name",uom_cat_time,Time,Heure,0
-model,"product.uom.category,name",uom_cat_unit,Units,Unités,0
-model,"product.uom.category,name",uom_cat_volume,Volume,Volume,0
-model,"product.uom.category,name",uom_cat_weight,Weight,Poids,0
-model,"res.group,name",group_product_admin,Product Administration,Administration de produits,0
-selection,"product.template,cost_price_method",0,Average,Moyen,0
-selection,"product.template,cost_price_method",0,Fixed,Fixe,0
-selection,"product.template,type",0,Consumable,Consommable,0
-selection,"product.template,type",0,Service,Service,0
-selection,"product.template,type",0,Stockable,Stockable,0
-view,product.category,0,Children,Enfants,0
-view,product.category,0,Product Categories,Catégories de produit,0
-view,product.category,0,Product Category,Catégorie de produit,0
-view,product.category,0,Properties,Propriétés,0
-view,product.product,0,General,Général,0
-view,product.product,0,Product,Produit,0
-view,product.product,0,Products,Produits,0
-view,product.product,0,Properties,Propriétés,0
-view,product.template,0,General,Général,0
-view,product.template,0,Product Template,Modèle produit,0
-view,product.template,0,Product Templates,Modèles de produit,0
-view,product.uom,0,Unit of Measure,Unité de mesure,0
-view,product.uom,0,Units of Measure,Unités de mesure,0
-view,product.uom.category,0,Categories of Unit of Measure,Catégories d'Unité de mesure,0
-view,product.uom.category,0,Category of Unit of Measure,Catégorie d'unité de mesure,0
diff --git a/icons/__init__.py b/icons/__init__.py
deleted file mode 100644
index e69de29..0000000
diff --git a/icons/tryton-product.svg b/icons/tryton-product.svg
new file mode 100644
index 0000000..47beed7
--- /dev/null
+++ b/icons/tryton-product.svg
@@ -0,0 +1,485 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:cc="http://creativecommons.org/ns#"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:xlink="http://www.w3.org/1999/xlink"
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ sodipodi:docname="package-x-generic.svg"
+ sodipodi:docbase="/home/jimmac/src/cvs/tango-icon-theme/scalable/mimetypes"
+ inkscape:version="0.46"
+ sodipodi:version="0.32"
+ id="svg2963"
+ height="48px"
+ width="48px"
+ inkscape:output_extension="org.inkscape.output.svg.inkscape">
+ <defs
+ id="defs3">
+ <inkscape:perspective
+ sodipodi:type="inkscape:persp3d"
+ inkscape:vp_x="0 : 24 : 1"
+ inkscape:vp_y="0 : 1000 : 0"
+ inkscape:vp_z="48 : 24 : 1"
+ inkscape:persp3d-origin="24 : 16 : 1"
+ id="perspective77" />
+ <radialGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient5060"
+ id="radialGradient6719"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(-2.774389,0,0,1.969706,112.7623,-872.8854)"
+ cx="605.71429"
+ cy="486.64789"
+ fx="605.71429"
+ fy="486.64789"
+ r="117.14286" />
+ <linearGradient
+ inkscape:collect="always"
+ id="linearGradient5060">
+ <stop
+ style="stop-color:black;stop-opacity:1;"
+ offset="0"
+ id="stop5062" />
+ <stop
+ style="stop-color:black;stop-opacity:0;"
+ offset="1"
+ id="stop5064" />
+ </linearGradient>
+ <radialGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient5060"
+ id="radialGradient6717"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(2.774389,0,0,1.969706,-1891.633,-872.8854)"
+ cx="605.71429"
+ cy="486.64789"
+ fx="605.71429"
+ fy="486.64789"
+ r="117.14286" />
+ <linearGradient
+ id="linearGradient5048">
+ <stop
+ style="stop-color:black;stop-opacity:0;"
+ offset="0"
+ id="stop5050" />
+ <stop
+ id="stop5056"
+ offset="0.5"
+ style="stop-color:black;stop-opacity:1;" />
+ <stop
+ style="stop-color:black;stop-opacity:0;"
+ offset="1"
+ id="stop5052" />
+ </linearGradient>
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient5048"
+ id="linearGradient6715"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(2.774389,0,0,1.969706,-1892.179,-872.8854)"
+ x1="302.85715"
+ y1="366.64789"
+ x2="302.85715"
+ y2="609.50507" />
+ <linearGradient
+ inkscape:collect="always"
+ id="linearGradient2884">
+ <stop
+ style="stop-color:#000000;stop-opacity:1;"
+ offset="0"
+ id="stop2886" />
+ <stop
+ style="stop-color:#000000;stop-opacity:0;"
+ offset="1"
+ id="stop2888" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient2869">
+ <stop
+ style="stop-color:#ffffff;stop-opacity:1;"
+ offset="0"
+ id="stop2871" />
+ <stop
+ style="stop-color:#cccccc;stop-opacity:1.0000000;"
+ offset="1.0000000"
+ id="stop2873" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient4995">
+ <stop
+ id="stop4997"
+ offset="0"
+ style="stop-color:#de9523;stop-opacity:1;" />
+ <stop
+ id="stop4999"
+ offset="1.0000000"
+ style="stop-color:#a36d18;stop-opacity:1.0000000;" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient4987"
+ inkscape:collect="always">
+ <stop
+ id="stop4989"
+ offset="0"
+ style="stop-color:#a0670c;stop-opacity:1;" />
+ <stop
+ id="stop4991"
+ offset="1"
+ style="stop-color:#a0670c;stop-opacity:0;" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient4979">
+ <stop
+ id="stop4981"
+ offset="0.0000000"
+ style="stop-color:#fbf0e0;stop-opacity:1.0000000;" />
+ <stop
+ id="stop4983"
+ offset="1.0000000"
+ style="stop-color:#f0ce99;stop-opacity:1.0000000;" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient4946"
+ inkscape:collect="always">
+ <stop
+ id="stop4948"
+ offset="0"
+ style="stop-color:#000000;stop-opacity:1;" />
+ <stop
+ id="stop4950"
+ offset="1"
+ style="stop-color:#000000;stop-opacity:0;" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient4222">
+ <stop
+ id="stop4224"
+ offset="0"
+ style="stop-color:#ffffff;stop-opacity:1;" />
+ <stop
+ id="stop4226"
+ offset="1.0000000"
+ style="stop-color:#ffffff;stop-opacity:0.68639052;" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient4210">
+ <stop
+ id="stop4212"
+ offset="0.0000000"
+ style="stop-color:#eaba6f;stop-opacity:1.0000000;" />
+ <stop
+ id="stop4214"
+ offset="1.0000000"
+ style="stop-color:#b97a1b;stop-opacity:1.0000000;" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient4192">
+ <stop
+ id="stop4194"
+ offset="0"
+ style="stop-color:#e9b96e;stop-opacity:1;" />
+ <stop
+ id="stop4196"
+ offset="1.0000000"
+ style="stop-color:#f1d19e;stop-opacity:1.0000000;" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient4182">
+ <stop
+ id="stop4184"
+ offset="0.0000000"
+ style="stop-color:#a36d18;stop-opacity:1.0000000;" />
+ <stop
+ id="stop4186"
+ offset="1.0000000"
+ style="stop-color:#d79020;stop-opacity:1.0000000;" />
+ </linearGradient>
+ <radialGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient4946"
+ id="radialGradient2252"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(1.000000,0.000000,0.000000,0.333333,2.658463e-16,23.58206)"
+ cx="22.930462"
+ cy="35.373093"
+ fx="22.930462"
+ fy="35.373093"
+ r="17.576654" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient4979"
+ id="linearGradient2269"
+ gradientUnits="userSpaceOnUse"
+ x1="30.062469"
+ y1="13.444801"
+ x2="17.696169"
+ y2="12.333632" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient4995"
+ id="linearGradient2274"
+ gradientUnits="userSpaceOnUse"
+ x1="36.288929"
+ y1="14.661557"
+ x2="47.065835"
+ y2="15.267649" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient4192"
+ id="linearGradient2277"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(1.000000,0.000000,0.000000,0.986355,0.000000,0.316638)"
+ x1="25.381256"
+ y1="24.720648"
+ x2="24.119167"
+ y2="16.170370" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient4182"
+ id="linearGradient2280"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(1.000000,0.000000,0.000000,1.039184,0.000000,-4.057054e-2)"
+ x1="16.148972"
+ y1="12.636667"
+ x2="34.193642"
+ y2="12.636667" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient4987"
+ id="linearGradient2282"
+ gradientUnits="userSpaceOnUse"
+ x1="21.906841"
+ y1="9.7577486"
+ x2="22.071806"
+ y2="16.020695" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient4222"
+ id="linearGradient2285"
+ gradientUnits="userSpaceOnUse"
+ x1="18.706615"
+ y1="19.912336"
+ x2="30.014812"
+ y2="47.388485" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient4210"
+ id="linearGradient2288"
+ gradientUnits="userSpaceOnUse"
+ x1="24.990499"
+ y1="34.004856"
+ x2="24.990499"
+ y2="22.585211" />
+ <radialGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient2884"
+ id="radialGradient2896"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(1.353283,5.468101e-16,-1.144754e-13,0.635968,-8.458890,3.413470)"
+ cx="23.943670"
+ cy="20.800287"
+ fx="23.943670"
+ fy="20.800287"
+ r="6.4286140" />
+ <radialGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient2869"
+ id="radialGradient2898"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0.749420,0.000000,0.000000,0.394055,6.226925,10.09253)"
+ cx="21.578989"
+ cy="9.0255041"
+ fx="21.578989"
+ fy="9.0255041"
+ r="9.5862970" />
+ <radialGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient2884"
+ id="radialGradient2906"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(1.353283,5.468101e-16,-1.144754e-13,0.635968,-8.458890,3.413470)"
+ cx="23.943670"
+ cy="20.800287"
+ fx="23.943670"
+ fy="20.800287"
+ r="6.4286140" />
+ <radialGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient2869"
+ id="radialGradient2908"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0.749420,0.000000,0.000000,0.394055,6.226925,10.09253)"
+ cx="21.578989"
+ cy="9.8105707"
+ fx="21.578989"
+ fy="9.8105707"
+ r="9.5862970" />
+ </defs>
+ <sodipodi:namedview
+ inkscape:window-y="142"
+ inkscape:window-x="392"
+ inkscape:window-height="706"
+ inkscape:window-width="872"
+ stroke="#c17d11"
+ fill="#e9b96e"
+ inkscape:showpageshadow="false"
+ inkscape:document-units="px"
+ inkscape:grid-bbox="true"
+ showgrid="false"
+ inkscape:current-layer="layer1"
+ inkscape:cy="39.004018"
+ inkscape:cx="74.637005"
+ inkscape:zoom="1"
+ inkscape:pageshadow="2"
+ inkscape:pageopacity="0.0"
+ borderopacity="0.16470588"
+ bordercolor="#666666"
+ pagecolor="#ffffff"
+ id="base" />
+ <metadata
+ id="metadata4">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+ <dc:title>Package</dc:title>
+ <dc:creator>
+ <cc:Agent>
+ <dc:title>Jakub Steiner</dc:title>
+ </cc:Agent>
+ </dc:creator>
+ <dc:source>http://jimmac.musichall.cz/</dc:source>
+ <dc:subject>
+ <rdf:Bag>
+ <rdf:li>package</rdf:li>
+ <rdf:li>archive</rdf:li>
+ <rdf:li>tarball</rdf:li>
+ <rdf:li>tar</rdf:li>
+ <rdf:li>bzip</rdf:li>
+ <rdf:li>gzip</rdf:li>
+ <rdf:li>zip</rdf:li>
+ <rdf:li>arj</rdf:li>
+ <rdf:li>tar</rdf:li>
+ <rdf:li>jar</rdf:li>
+ </rdf:Bag>
+ </dc:subject>
+ <cc:license
+ rdf:resource="http://creativecommons.org/licenses/publicdomain/" />
+ </cc:Work>
+ <cc:License
+ rdf:about="http://creativecommons.org/licenses/publicdomain/">
+ <cc:permits
+ rdf:resource="http://creativecommons.org/ns#Reproduction" />
+ <cc:permits
+ rdf:resource="http://creativecommons.org/ns#Distribution" />
+ <cc:permits
+ rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+ </cc:License>
+ </rdf:RDF>
+ </metadata>
+ <g
+ inkscape:groupmode="layer"
+ inkscape:label="Layer 1"
+ id="layer1">
+ <g
+ style="display:inline"
+ transform="matrix(2.105461e-2,0,0,2.086758e-2,42.60172,35.4036)"
+ id="g6707">
+ <rect
+ style="opacity:0.40206185;color:black;fill:url(#linearGradient6715);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+ id="rect6709"
+ width="1339.6335"
+ height="478.35718"
+ x="-1559.2523"
+ y="-150.69685" />
+ <path
+ style="opacity:0.40206185;color:black;fill:url(#radialGradient6717);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+ d="M -219.61876,-150.68038 C -219.61876,-150.68038 -219.61876,327.65041 -219.61876,327.65041 C -76.744594,328.55086 125.78146,220.48075 125.78138,88.454235 C 125.78138,-43.572302 -33.655436,-150.68036 -219.61876,-150.68038 z "
+ id="path6711"
+ sodipodi:nodetypes="cccc" />
+ <path
+ sodipodi:nodetypes="cccc"
+ id="path6713"
+ d="M -1559.2523,-150.68038 C -1559.2523,-150.68038 -1559.2523,327.65041 -1559.2523,327.65041 C -1702.1265,328.55086 -1904.6525,220.48075 -1904.6525,88.454235 C -1904.6525,-43.572302 -1745.2157,-150.68036 -1559.2523,-150.68038 z "
+ style="opacity:0.40206185;color:black;fill:url(#radialGradient6719);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
+ </g>
+ <rect
+ ry="2.3944440"
+ rx="2.4241352"
+ y="15.275433"
+ x="7.4623847"
+ height="23.112879"
+ width="31.978371"
+ id="rect3115"
+ style="opacity:1.0000000;color:#000000;fill:url(#linearGradient2288);fill-opacity:1.0000000;fill-rule:nonzero;stroke:#a0670c;stroke-width:1.0000007;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4.0000000;stroke-dasharray:none;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000;visibility:visible;display:block;overflow:visible" />
+ <rect
+ style="opacity:0.48101267;color:#000000;fill:none;fill-opacity:1.0000000;fill-rule:nonzero;stroke:url(#linearGradient2285);stroke-width:1.0000011;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4.0000000;stroke-dasharray:none;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000;visibility:visible;display:block;overflow:visible"
+ id="rect4220"
+ width="29.804138"
+ height="21.075352"
+ x="8.4989996"
+ y="16.243698"
+ rx="1.2846882"
+ ry="1.2846882" />
+ <path
+ sodipodi:nodetypes="ccccc"
+ id="path4162"
+ d="M 8.7697819,16.547178 L 13.819731,9.7363408 L 32.615291,9.6353255 L 37.835264,16.408941 L 8.7697819,16.547178 z "
+ style="fill:url(#linearGradient2280);fill-opacity:1.0000000;fill-rule:evenodd;stroke:url(#linearGradient2282);stroke-width:1.0000008;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4.0000000;stroke-dasharray:none;stroke-opacity:1.0000000" />
+ <path
+ sodipodi:nodetypes="ccccc"
+ id="path4164"
+ d="M 38.276321,16.325703 L 43.469269,23.520364 L 3.9609455,23.520364 L 8.6250143,16.320763 L 38.276321,16.325703 z "
+ style="opacity:1.0000000;color:#000000;fill:url(#linearGradient2277);fill-opacity:1.0000000;fill-rule:nonzero;stroke:#a0670c;stroke-width:1.0000005;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4.0000000;stroke-dasharray:none;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000;visibility:visible;display:block;overflow:visible" />
+ <path
+ sodipodi:nodetypes="ccccc"
+ id="path4178"
+ d="M 32.849333,9.6141009 L 37.532219,16.536370 L 46.565835,20.921197 L 38.451329,12.008545 L 32.849333,9.6141009 z "
+ style="opacity:1.0000000;color:#000000;fill:url(#linearGradient2274);fill-opacity:1.0000000;fill-rule:nonzero;stroke:#a0670c;stroke-width:1.0000005;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4.0000000;stroke-dasharray:none;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000;visibility:visible;display:block;overflow:visible" />
+ <path
+ sodipodi:nodetypes="ccccc"
+ style="opacity:1.0000000;color:#000000;fill:#f8e8cf;fill-opacity:1.0000000;fill-rule:nonzero;stroke:#a0670c;stroke-width:1.0000000;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4.0000000;stroke-dasharray:none;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000;visibility:visible;display:block;overflow:visible"
+ d="M 13.617702,9.7151161 L 9.6419233,16.435355 L 0.50729183,20.820182 L 8.6217973,11.907530 L 13.617702,9.7151161 z "
+ id="path4180" />
+ <path
+ style="opacity:1.0000000;color:#000000;fill:none;fill-opacity:1.0000000;fill-rule:nonzero;stroke:#f4e3ca;stroke-width:1.0000000;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4.0000000;stroke-dasharray:none;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000;visibility:visible;display:block;overflow:visible"
+ d="M 37.024959,16.436050 L 41.478871,22.493011 L 5.6482792,22.493011 L 9.7892982,16.312694 L 37.024959,16.436050 z "
+ id="path4954"
+ sodipodi:nodetypes="ccccc" />
+ <g
+ id="g2892"
+ transform="matrix(0.676538,0.000000,0.000000,1.000000,3.994869,0.000000)">
+ <path
+ style="opacity:1.0000000;color:#000000;fill:url(#radialGradient2896);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:2.0000000;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4.0000000;stroke-dasharray:none;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000;visibility:visible;display:inline;overflow:visible"
+ d="M 23.926073,12.101621 C 18.588065,12.101621 14.282569,14.129809 14.282569,16.641813 L 33.604773,16.641813 C 33.604773,14.129809 29.264081,12.101621 23.926073,12.101621 z "
+ id="path2882" />
+ <path
+ id="path2141"
+ d="M 23.931961,12.861168 C 20.379986,12.861168 17.515057,14.210748 17.515057,15.882266 L 30.372285,15.882266 C 30.372285,14.210748 27.483936,12.861168 23.931961,12.861168 z "
+ style="opacity:1.0000000;color:#000000;fill:url(#radialGradient2898);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:2.0000000;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4.0000000;stroke-dasharray:none;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000;visibility:visible;display:inline;overflow:visible" />
+ </g>
+ <g
+ transform="matrix(0.676538,0.000000,0.000000,1.000000,10.49487,0.000000)"
+ id="g2900">
+ <path
+ id="path2902"
+ d="M 23.926073,12.101621 C 18.588065,12.101621 14.282569,14.129809 14.282569,16.641813 L 33.604773,16.641813 C 33.604773,14.129809 29.264081,12.101621 23.926073,12.101621 z "
+ style="opacity:1.0000000;color:#000000;fill:url(#radialGradient2906);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:2.0000000;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4.0000000;stroke-dasharray:none;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000;visibility:visible;display:inline;overflow:visible" />
+ <path
+ style="opacity:1.0000000;color:#000000;fill:url(#radialGradient2908);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:2.0000000;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4.0000000;stroke-dasharray:none;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000;visibility:visible;display:inline;overflow:visible"
+ d="M 23.931961,12.861168 C 20.379986,12.861168 17.515057,14.210748 17.515057,15.882266 L 30.372285,15.882266 C 30.372285,14.210748 27.483936,12.861168 23.931961,12.861168 z "
+ id="path2904" />
+ </g>
+ <path
+ style="opacity:0.87974685;fill:none;fill-opacity:1.0000000;fill-rule:evenodd;stroke:url(#linearGradient2269);stroke-width:1.0000000;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4.0000000;stroke-dasharray:none;stroke-opacity:1.0000000"
+ d="M 9.6523127,16.371803 L 13.036643,10.593020 L 33.514841,10.517799 L 37.356782,16.369880 L 9.6523127,16.371803 z "
+ id="path4966"
+ sodipodi:nodetypes="ccccc" />
+ </g>
+</svg>
diff --git a/locale/bg_BG.po b/locale/bg_BG.po
new file mode 100644
index 0000000..541d061
--- /dev/null
+++ b/locale/bg_BG.po
@@ -0,0 +1,591 @@
+#
+msgid ""
+msgstr "Content-Type: text/plain; charset=utf-8\n"
+
+#, fuzzy
+msgctxt "error:product.category:0"
+msgid "You can not create recursive categories!"
+msgstr "Ðе може да Ñъздавате взаимно вложени категории!"
+
+msgctxt "error:product.uom:0"
+msgid ""
+"If the UOM is still not used, you can delete it otherwise you can deactivate"
+" it and create a new one."
+msgstr ""
+"Ðко мер. ед. вÑе още не Ñе ползват може да Ñ Ð¸Ð·Ñ‚Ñ€Ð¸ÐµÑ‚Ðµ, в противен Ñлучай "
+"може да Ñ Ð´ÐµÐºÐ°Ñ‚Ð¸Ð²Ð¸Ñ€Ð°Ñ‚Ðµ и Ñъздадете нова."
+
+msgctxt "error:product.uom:0"
+msgid "Invalid Factor and Rate values!"
+msgstr "Ðевалиден ÑтойноÑти за фактор и отношение!"
+
+msgctxt "error:product.uom:0"
+msgid "Rate and factor can not be both equal to zero."
+msgstr "КурÑа и коефициента не може едновременно да Ñа нула."
+
+msgctxt "error:product.uom:0"
+msgid "You cannot change Rate, Factor or Category on a Unit of Measure. "
+msgstr ""
+"За мерна единица не може да променате отношение, коефициент или категориÑ."
+
+msgctxt "field:product.category,childs:0"
+msgid "Children"
+msgstr "Деца"
+
+msgctxt "field:product.category,name:0"
+msgid "Name"
+msgstr "Име"
+
+msgctxt "field:product.category,parent:0"
+msgid "Parent"
+msgstr "Родител"
+
+msgctxt "field:product.category,rec_name:0"
+msgid "Name"
+msgstr "Име"
+
+msgctxt "field:product.product,code:0"
+msgid "Code"
+msgstr "Код"
+
+msgctxt "field:product.product,description:0"
+msgid "Description"
+msgstr "ОпиÑание"
+
+msgctxt "field:product.product,rec_name:0"
+msgid "Name"
+msgstr "Име"
+
+msgctxt "field:product.product,template:0"
+msgid "Product Template"
+msgstr "Щаблон за продукт"
+
+msgctxt "field:product.template,active:0"
+msgid "Active"
+msgstr "Ðктивен"
+
+msgctxt "field:product.template,category:0"
+msgid "Category"
+msgstr "КатегориÑ"
+
+msgctxt "field:product.template,cost_price:0"
+msgid "Cost Price"
+msgstr "Фабрична цена"
+
+msgctxt "field:product.template,cost_price_method:0"
+msgid "Cost Method"
+msgstr "Ðачин на оÑтойноÑÑ‚Ñване"
+
+msgctxt "field:product.template,cost_price_uom:0"
+msgid "Cost Price"
+msgstr "Фабрична цена"
+
+msgctxt "field:product.template,default_uom:0"
+msgid "Default UOM"
+msgstr "Мер. ед. по подрабиране"
+
+msgctxt "field:product.template,list_price:0"
+msgid "List Price"
+msgstr "Каталожна цена"
+
+msgctxt "field:product.template,list_price_uom:0"
+msgid "List Price"
+msgstr "Каталожна цена"
+
+msgctxt "field:product.template,name:0"
+msgid "Name"
+msgstr "Име"
+
+msgctxt "field:product.template,products:0"
+msgid "Products"
+msgstr "Продукти"
+
+msgctxt "field:product.template,rec_name:0"
+msgid "Name"
+msgstr "Име"
+
+msgctxt "field:product.template,type:0"
+msgid "Type"
+msgstr "Вид"
+
+msgctxt "field:product.uom,active:0"
+msgid "Active"
+msgstr "Ðктивен"
+
+msgctxt "field:product.uom,category:0"
+msgid "UOM Category"
+msgstr "ÐšÐ°Ñ‚ÐµÐ³Ð¾Ñ€Ð¸Ñ Ð¼ÐµÑ€. ед."
+
+msgctxt "field:product.uom,digits:0"
+msgid "Display Digits"
+msgstr "Цифри за показване"
+
+msgctxt "field:product.uom,factor:0"
+msgid "Factor"
+msgstr "Коефициент"
+
+msgctxt "field:product.uom,name:0"
+msgid "Name"
+msgstr "Име"
+
+msgctxt "field:product.uom,rate:0"
+msgid "Rate"
+msgstr "Отношение"
+
+msgctxt "field:product.uom,rec_name:0"
+msgid "Name"
+msgstr "Име"
+
+msgctxt "field:product.uom,rounding:0"
+msgid "Rounding Precision"
+msgstr "ТочноÑÑ‚ на закръгление"
+
+msgctxt "field:product.uom,symbol:0"
+msgid "Symbol"
+msgstr "Символ"
+
+msgctxt "field:product.uom.category,name:0"
+msgid "Name"
+msgstr "Име"
+
+msgctxt "field:product.uom.category,rec_name:0"
+msgid "Name"
+msgstr "Име"
+
+msgctxt "field:product.uom.category,uoms:0"
+msgid "Unit of Measures"
+msgstr "Мерни единици"
+
+msgctxt "help:product.uom,factor:0"
+msgid ""
+"The coefficient for the formula:\n"
+"coef (base unit) = 1 (this unit)"
+msgstr ""
+"Коефициент в тази формула:\n"
+"1 (баз. единица) = коеф. (тази единица)"
+
+msgctxt "help:product.uom,rate:0"
+msgid ""
+"The coefficient for the formula:\n"
+"1 (base unit) = coef (this unit)"
+msgstr ""
+"Коефициент в тази формула:\n"
+"1 (баз. единица) = коеф. (тази единица)"
+
+#, fuzzy
+msgctxt "model:ir.action,name:act_category_list"
+msgid "Categories"
+msgstr "Категории"
+
+msgctxt "model:ir.action,name:act_category_tree"
+msgid "Categories"
+msgstr "Категории"
+
+msgctxt "model:ir.action,name:act_product_by_category"
+msgid "Product by Category"
+msgstr "Продукт по категориÑ"
+
+msgctxt "model:ir.action,name:act_product_form"
+msgid "Products"
+msgstr "Продукти"
+
+msgctxt "model:ir.action,name:act_uom_category_form"
+msgid "Categories of Unit of Measure"
+msgstr "Категории мер. ед."
+
+msgctxt "model:ir.action,name:act_uom_form"
+msgid "Units of Measure"
+msgstr "Мерни едниници"
+
+#, fuzzy
+msgctxt "model:ir.ui.menu,name:menu_category_list"
+msgid "Categories"
+msgstr "Категории"
+
+msgctxt "model:ir.ui.menu,name:menu_category_tree"
+msgid "Categories"
+msgstr "Категории"
+
+msgctxt "model:ir.ui.menu,name:menu_main_product"
+msgid "Product"
+msgstr "Продукт"
+
+msgctxt "model:ir.ui.menu,name:menu_product_product"
+msgid "Products"
+msgstr "Продукти"
+
+msgctxt "model:ir.ui.menu,name:menu_uom_category_form"
+msgid "Categories"
+msgstr "Категории"
+
+msgctxt "model:ir.ui.menu,name:menu_uom_form"
+msgid "Units of Measure"
+msgstr "Мерни едниници"
+
+msgctxt "model:product.category,name:0"
+msgid "Product Category"
+msgstr "ÐšÐ°Ñ‚ÐµÐ³Ð¾Ñ€Ð¸Ñ Ð½Ð° продукт"
+
+msgctxt "model:product.product,name:0"
+msgid "Product"
+msgstr "Продукт"
+
+msgctxt "model:product.template,name:0"
+msgid "Product Template"
+msgstr "Щаблон за продукт"
+
+msgctxt "model:product.uom,name:0"
+msgid "Unit of measure"
+msgstr "Мерна единица"
+
+msgctxt "model:product.uom,name:uom_are"
+msgid "Are"
+msgstr "Хектар"
+
+msgctxt "model:product.uom,name:uom_carat"
+msgid "Carat"
+msgstr "Карат"
+
+msgctxt "model:product.uom,name:uom_centimeter"
+msgid "centimeter"
+msgstr "Ñантиметър"
+
+msgctxt "model:product.uom,name:uom_cubic_centimeter"
+msgid "Cubic centimeter"
+msgstr "Кубичен Ñантиметър"
+
+msgctxt "model:product.uom,name:uom_cubic_foot"
+msgid "Cubic foot"
+msgstr "Кубичен фут"
+
+msgctxt "model:product.uom,name:uom_cubic_inch"
+msgid "Cubic inch"
+msgstr "Кубичен инч"
+
+msgctxt "model:product.uom,name:uom_cubic_meter"
+msgid "Cubic meter"
+msgstr "Кубичен метър"
+
+msgctxt "model:product.uom,name:uom_day"
+msgid "Day"
+msgstr "Ден"
+
+msgctxt "model:product.uom,name:uom_foot"
+msgid "Foot"
+msgstr "Фут"
+
+msgctxt "model:product.uom,name:uom_gallon"
+msgid "Gallon"
+msgstr "Галон"
+
+msgctxt "model:product.uom,name:uom_gram"
+msgid "Gram"
+msgstr "Грам"
+
+msgctxt "model:product.uom,name:uom_hectare"
+msgid "Hectare"
+msgstr "Хектар"
+
+msgctxt "model:product.uom,name:uom_hour"
+msgid "Hour"
+msgstr "ЧаÑ"
+
+msgctxt "model:product.uom,name:uom_inch"
+msgid "Inch"
+msgstr "Инч"
+
+msgctxt "model:product.uom,name:uom_kilogram"
+msgid "Kilogram"
+msgstr "Килограм"
+
+msgctxt "model:product.uom,name:uom_kilometer"
+msgid "Kilometer"
+msgstr "Километър"
+
+msgctxt "model:product.uom,name:uom_liter"
+msgid "Liter"
+msgstr "Литър"
+
+msgctxt "model:product.uom,name:uom_meter"
+msgid "Meter"
+msgstr "Метър"
+
+msgctxt "model:product.uom,name:uom_mile"
+msgid "Mile"
+msgstr "МилÑ"
+
+msgctxt "model:product.uom,name:uom_millimeter"
+msgid "Millimeter"
+msgstr "Милиметър"
+
+msgctxt "model:product.uom,name:uom_minute"
+msgid "Minute"
+msgstr "Минута"
+
+msgctxt "model:product.uom,name:uom_ounce"
+msgid "Ounce"
+msgstr "УнциÑ"
+
+msgctxt "model:product.uom,name:uom_pound"
+msgid "Pound"
+msgstr "Лира"
+
+msgctxt "model:product.uom,name:uom_second"
+msgid "Second"
+msgstr "Секунда"
+
+msgctxt "model:product.uom,name:uom_square_centimeter"
+msgid "Square centimeter"
+msgstr "Квадратен Ñантиметър"
+
+msgctxt "model:product.uom,name:uom_square_foot"
+msgid "Square foot"
+msgstr "Квадратен фут"
+
+msgctxt "model:product.uom,name:uom_square_inch"
+msgid "Square inch"
+msgstr "Квадратен инч"
+
+msgctxt "model:product.uom,name:uom_square_meter"
+msgid "Square meter"
+msgstr "Квадратен метър"
+
+msgctxt "model:product.uom,name:uom_square_yard"
+msgid "Square yard"
+msgstr "Квадратен Ñрд"
+
+msgctxt "model:product.uom,name:uom_unit"
+msgid "Unit"
+msgstr "Единица"
+
+msgctxt "model:product.uom,name:uom_work_day"
+msgid "Work Day"
+msgstr "Работен ден"
+
+msgctxt "model:product.uom,name:uom_yard"
+msgid "Yard"
+msgstr "Ярд"
+
+msgctxt "model:product.uom,symbol:uom_are"
+msgid "a"
+msgstr "a"
+
+msgctxt "model:product.uom,symbol:uom_carat"
+msgid "c"
+msgstr "c"
+
+msgctxt "model:product.uom,symbol:uom_centimeter"
+msgid "cm"
+msgstr "cm"
+
+msgctxt "model:product.uom,symbol:uom_cubic_centimeter"
+msgid "cm³"
+msgstr "cm³"
+
+msgctxt "model:product.uom,symbol:uom_cubic_foot"
+msgid "ft³"
+msgstr "ft³"
+
+msgctxt "model:product.uom,symbol:uom_cubic_inch"
+msgid "in³"
+msgstr "in³"
+
+msgctxt "model:product.uom,symbol:uom_cubic_meter"
+msgid "m³"
+msgstr "m³"
+
+msgctxt "model:product.uom,symbol:uom_day"
+msgid "d"
+msgstr "d"
+
+msgctxt "model:product.uom,symbol:uom_foot"
+msgid "ft"
+msgstr "ft"
+
+msgctxt "model:product.uom,symbol:uom_gallon"
+msgid "gal"
+msgstr "gal"
+
+msgctxt "model:product.uom,symbol:uom_gram"
+msgid "g"
+msgstr "g"
+
+msgctxt "model:product.uom,symbol:uom_hectare"
+msgid "ha"
+msgstr "ha"
+
+msgctxt "model:product.uom,symbol:uom_hour"
+msgid "h"
+msgstr "h"
+
+msgctxt "model:product.uom,symbol:uom_inch"
+msgid "in"
+msgstr "in"
+
+msgctxt "model:product.uom,symbol:uom_kilogram"
+msgid "kg"
+msgstr "kg"
+
+msgctxt "model:product.uom,symbol:uom_kilometer"
+msgid "km"
+msgstr "km"
+
+msgctxt "model:product.uom,symbol:uom_liter"
+msgid "l"
+msgstr "l"
+
+msgctxt "model:product.uom,symbol:uom_meter"
+msgid "m"
+msgstr "m"
+
+msgctxt "model:product.uom,symbol:uom_mile"
+msgid "mi"
+msgstr "mi"
+
+msgctxt "model:product.uom,symbol:uom_millimeter"
+msgid "mm"
+msgstr "mm"
+
+msgctxt "model:product.uom,symbol:uom_minute"
+msgid "min"
+msgstr "min"
+
+msgctxt "model:product.uom,symbol:uom_ounce"
+msgid "oz"
+msgstr "oz"
+
+msgctxt "model:product.uom,symbol:uom_pound"
+msgid "lbs"
+msgstr "lbs"
+
+msgctxt "model:product.uom,symbol:uom_second"
+msgid "s"
+msgstr "s"
+
+msgctxt "model:product.uom,symbol:uom_square_centimeter"
+msgid "cm²"
+msgstr "cm²"
+
+msgctxt "model:product.uom,symbol:uom_square_foot"
+msgid "ft²"
+msgstr "ft²"
+
+msgctxt "model:product.uom,symbol:uom_square_inch"
+msgid "in²"
+msgstr "in²"
+
+msgctxt "model:product.uom,symbol:uom_square_meter"
+msgid "m²"
+msgstr "m²"
+
+msgctxt "model:product.uom,symbol:uom_square_yard"
+msgid "yd²"
+msgstr "yd²"
+
+msgctxt "model:product.uom,symbol:uom_unit"
+msgid "u"
+msgstr "u"
+
+msgctxt "model:product.uom,symbol:uom_work_day"
+msgid "wd"
+msgstr "wd"
+
+msgctxt "model:product.uom,symbol:uom_yard"
+msgid "yd"
+msgstr "yd"
+
+msgctxt "model:product.uom.category,name:0"
+msgid "Product uom category"
+msgstr "ÐšÐ°Ñ‚ÐµÐ³Ð¾Ñ€Ð¸Ñ Ð¼ÐµÑ€. ед. на продукт"
+
+msgctxt "model:product.uom.category,name:uom_cat_length"
+msgid "Length"
+msgstr "Дължина"
+
+msgctxt "model:product.uom.category,name:uom_cat_surface"
+msgid "Surface"
+msgstr "ПовърхноÑÑ‚"
+
+msgctxt "model:product.uom.category,name:uom_cat_time"
+msgid "Time"
+msgstr "Време"
+
+msgctxt "model:product.uom.category,name:uom_cat_unit"
+msgid "Units"
+msgstr "Единици"
+
+msgctxt "model:product.uom.category,name:uom_cat_volume"
+msgid "Volume"
+msgstr "Обем"
+
+msgctxt "model:product.uom.category,name:uom_cat_weight"
+msgid "Weight"
+msgstr "Тегло"
+
+msgctxt "model:res.group,name:group_product_admin"
+msgid "Product Administration"
+msgstr "Управление на продукти"
+
+msgctxt "selection:product.template,cost_price_method:0"
+msgid "Average"
+msgstr "Средна"
+
+msgctxt "selection:product.template,cost_price_method:0"
+msgid "Fixed"
+msgstr "ФикÑирана"
+
+msgctxt "selection:product.template,type:0"
+msgid "Consumable"
+msgstr "КонÑуматив"
+
+msgctxt "selection:product.template,type:0"
+msgid "Service"
+msgstr "УÑлуга"
+
+msgctxt "selection:product.template,type:0"
+msgid "Stockable"
+msgstr "Складируем"
+
+msgctxt "view:product.category:0"
+msgid "Children"
+msgstr "Деца"
+
+msgctxt "view:product.category:0"
+msgid "Product Categories"
+msgstr "Категории продукти"
+
+msgctxt "view:product.category:0"
+msgid "Product Category"
+msgstr "ÐšÐ°Ñ‚ÐµÐ³Ð¾Ñ€Ð¸Ñ Ð½Ð° продукт"
+
+msgctxt "view:product.product:0"
+msgid "Products"
+msgstr "Продукти"
+
+msgctxt "view:product.template:0"
+msgid "General"
+msgstr "ОÑновен"
+
+msgctxt "view:product.template:0"
+msgid "Product Template"
+msgstr "Щаблон за продукт"
+
+msgctxt "view:product.template:0"
+msgid "Product Templates"
+msgstr "Шаблони на продукти"
+
+msgctxt "view:product.uom.category:0"
+msgid "Categories of Unit of Measure"
+msgstr "Категории мер. ед."
+
+msgctxt "view:product.uom.category:0"
+msgid "Category of Unit of Measure"
+msgstr "ÐšÐ°Ñ‚ÐµÐ³Ð¾Ñ€Ð¸Ñ Ð¼ÐµÑ€Ð½Ð¸ единици"
+
+msgctxt "view:product.uom:0"
+msgid "Unit of Measure"
+msgstr "Мерни единици"
+
+msgctxt "view:product.uom:0"
+msgid "Units of Measure"
+msgstr "Мерни едниници"
diff --git a/locale/cs_CZ.po b/locale/cs_CZ.po
new file mode 100644
index 0000000..7fd07b2
--- /dev/null
+++ b/locale/cs_CZ.po
@@ -0,0 +1,581 @@
+#
+msgid ""
+msgstr "Content-Type: text/plain; charset=utf-8\n"
+
+msgctxt "error:product.category:0"
+msgid "You can not create recursive categories!"
+msgstr ""
+
+msgctxt "error:product.uom:0"
+msgid ""
+"If the UOM is still not used, you can delete it otherwise you can deactivate"
+" it and create a new one."
+msgstr ""
+
+msgctxt "error:product.uom:0"
+msgid "Invalid Factor and Rate values!"
+msgstr ""
+
+msgctxt "error:product.uom:0"
+msgid "Rate and factor can not be both equal to zero."
+msgstr ""
+
+msgctxt "error:product.uom:0"
+msgid "You cannot change Rate, Factor or Category on a Unit of Measure. "
+msgstr ""
+
+msgctxt "field:product.category,childs:0"
+msgid "Children"
+msgstr ""
+
+msgctxt "field:product.category,name:0"
+msgid "Name"
+msgstr ""
+
+msgctxt "field:product.category,parent:0"
+msgid "Parent"
+msgstr ""
+
+msgctxt "field:product.category,rec_name:0"
+msgid "Name"
+msgstr ""
+
+msgctxt "field:product.product,code:0"
+msgid "Code"
+msgstr ""
+
+msgctxt "field:product.product,description:0"
+msgid "Description"
+msgstr ""
+
+msgctxt "field:product.product,rec_name:0"
+msgid "Name"
+msgstr ""
+
+msgctxt "field:product.product,template:0"
+msgid "Product Template"
+msgstr ""
+
+msgctxt "field:product.template,active:0"
+msgid "Active"
+msgstr ""
+
+msgctxt "field:product.template,category:0"
+msgid "Category"
+msgstr ""
+
+msgctxt "field:product.template,cost_price:0"
+msgid "Cost Price"
+msgstr ""
+
+msgctxt "field:product.template,cost_price_method:0"
+msgid "Cost Method"
+msgstr ""
+
+msgctxt "field:product.template,cost_price_uom:0"
+msgid "Cost Price"
+msgstr ""
+
+msgctxt "field:product.template,default_uom:0"
+msgid "Default UOM"
+msgstr ""
+
+msgctxt "field:product.template,list_price:0"
+msgid "List Price"
+msgstr ""
+
+msgctxt "field:product.template,list_price_uom:0"
+msgid "List Price"
+msgstr ""
+
+msgctxt "field:product.template,name:0"
+msgid "Name"
+msgstr ""
+
+msgctxt "field:product.template,products:0"
+msgid "Products"
+msgstr ""
+
+msgctxt "field:product.template,rec_name:0"
+msgid "Name"
+msgstr ""
+
+msgctxt "field:product.template,type:0"
+msgid "Type"
+msgstr ""
+
+msgctxt "field:product.uom,active:0"
+msgid "Active"
+msgstr ""
+
+msgctxt "field:product.uom,category:0"
+msgid "UOM Category"
+msgstr ""
+
+msgctxt "field:product.uom,digits:0"
+msgid "Display Digits"
+msgstr ""
+
+msgctxt "field:product.uom,factor:0"
+msgid "Factor"
+msgstr ""
+
+msgctxt "field:product.uom,name:0"
+msgid "Name"
+msgstr ""
+
+msgctxt "field:product.uom,rate:0"
+msgid "Rate"
+msgstr ""
+
+msgctxt "field:product.uom,rec_name:0"
+msgid "Name"
+msgstr ""
+
+msgctxt "field:product.uom,rounding:0"
+msgid "Rounding Precision"
+msgstr ""
+
+msgctxt "field:product.uom,symbol:0"
+msgid "Symbol"
+msgstr ""
+
+msgctxt "field:product.uom.category,name:0"
+msgid "Name"
+msgstr ""
+
+msgctxt "field:product.uom.category,rec_name:0"
+msgid "Name"
+msgstr ""
+
+msgctxt "field:product.uom.category,uoms:0"
+msgid "Unit of Measures"
+msgstr ""
+
+msgctxt "help:product.uom,factor:0"
+msgid ""
+"The coefficient for the formula:\n"
+"coef (base unit) = 1 (this unit)"
+msgstr ""
+
+msgctxt "help:product.uom,rate:0"
+msgid ""
+"The coefficient for the formula:\n"
+"1 (base unit) = coef (this unit)"
+msgstr ""
+
+msgctxt "model:ir.action,name:act_category_list"
+msgid "Categories"
+msgstr ""
+
+msgctxt "model:ir.action,name:act_category_tree"
+msgid "Categories"
+msgstr ""
+
+msgctxt "model:ir.action,name:act_product_by_category"
+msgid "Product by Category"
+msgstr ""
+
+msgctxt "model:ir.action,name:act_product_form"
+msgid "Products"
+msgstr ""
+
+msgctxt "model:ir.action,name:act_uom_category_form"
+msgid "Categories of Unit of Measure"
+msgstr ""
+
+msgctxt "model:ir.action,name:act_uom_form"
+msgid "Units of Measure"
+msgstr ""
+
+msgctxt "model:ir.ui.menu,name:menu_category_list"
+msgid "Categories"
+msgstr ""
+
+msgctxt "model:ir.ui.menu,name:menu_category_tree"
+msgid "Categories"
+msgstr ""
+
+msgctxt "model:ir.ui.menu,name:menu_main_product"
+msgid "Product"
+msgstr ""
+
+msgctxt "model:ir.ui.menu,name:menu_product_product"
+msgid "Products"
+msgstr ""
+
+msgctxt "model:ir.ui.menu,name:menu_uom_category_form"
+msgid "Categories"
+msgstr ""
+
+msgctxt "model:ir.ui.menu,name:menu_uom_form"
+msgid "Units of Measure"
+msgstr ""
+
+msgctxt "model:product.category,name:0"
+msgid "Product Category"
+msgstr ""
+
+msgctxt "model:product.product,name:0"
+msgid "Product"
+msgstr ""
+
+msgctxt "model:product.template,name:0"
+msgid "Product Template"
+msgstr ""
+
+msgctxt "model:product.uom,name:0"
+msgid "Unit of measure"
+msgstr ""
+
+msgctxt "model:product.uom,name:uom_are"
+msgid "Are"
+msgstr ""
+
+msgctxt "model:product.uom,name:uom_carat"
+msgid "Carat"
+msgstr ""
+
+msgctxt "model:product.uom,name:uom_centimeter"
+msgid "centimeter"
+msgstr ""
+
+msgctxt "model:product.uom,name:uom_cubic_centimeter"
+msgid "Cubic centimeter"
+msgstr ""
+
+msgctxt "model:product.uom,name:uom_cubic_foot"
+msgid "Cubic foot"
+msgstr ""
+
+msgctxt "model:product.uom,name:uom_cubic_inch"
+msgid "Cubic inch"
+msgstr ""
+
+msgctxt "model:product.uom,name:uom_cubic_meter"
+msgid "Cubic meter"
+msgstr ""
+
+msgctxt "model:product.uom,name:uom_day"
+msgid "Day"
+msgstr ""
+
+msgctxt "model:product.uom,name:uom_foot"
+msgid "Foot"
+msgstr ""
+
+msgctxt "model:product.uom,name:uom_gallon"
+msgid "Gallon"
+msgstr ""
+
+msgctxt "model:product.uom,name:uom_gram"
+msgid "Gram"
+msgstr ""
+
+msgctxt "model:product.uom,name:uom_hectare"
+msgid "Hectare"
+msgstr ""
+
+msgctxt "model:product.uom,name:uom_hour"
+msgid "Hour"
+msgstr ""
+
+msgctxt "model:product.uom,name:uom_inch"
+msgid "Inch"
+msgstr ""
+
+msgctxt "model:product.uom,name:uom_kilogram"
+msgid "Kilogram"
+msgstr ""
+
+msgctxt "model:product.uom,name:uom_kilometer"
+msgid "Kilometer"
+msgstr ""
+
+msgctxt "model:product.uom,name:uom_liter"
+msgid "Liter"
+msgstr ""
+
+msgctxt "model:product.uom,name:uom_meter"
+msgid "Meter"
+msgstr ""
+
+msgctxt "model:product.uom,name:uom_mile"
+msgid "Mile"
+msgstr ""
+
+msgctxt "model:product.uom,name:uom_millimeter"
+msgid "Millimeter"
+msgstr ""
+
+msgctxt "model:product.uom,name:uom_minute"
+msgid "Minute"
+msgstr ""
+
+msgctxt "model:product.uom,name:uom_ounce"
+msgid "Ounce"
+msgstr ""
+
+msgctxt "model:product.uom,name:uom_pound"
+msgid "Pound"
+msgstr ""
+
+msgctxt "model:product.uom,name:uom_second"
+msgid "Second"
+msgstr ""
+
+msgctxt "model:product.uom,name:uom_square_centimeter"
+msgid "Square centimeter"
+msgstr ""
+
+msgctxt "model:product.uom,name:uom_square_foot"
+msgid "Square foot"
+msgstr ""
+
+msgctxt "model:product.uom,name:uom_square_inch"
+msgid "Square inch"
+msgstr ""
+
+msgctxt "model:product.uom,name:uom_square_meter"
+msgid "Square meter"
+msgstr ""
+
+msgctxt "model:product.uom,name:uom_square_yard"
+msgid "Square yard"
+msgstr ""
+
+msgctxt "model:product.uom,name:uom_unit"
+msgid "Unit"
+msgstr ""
+
+msgctxt "model:product.uom,name:uom_work_day"
+msgid "Work Day"
+msgstr ""
+
+msgctxt "model:product.uom,name:uom_yard"
+msgid "Yard"
+msgstr ""
+
+msgctxt "model:product.uom,symbol:uom_are"
+msgid "a"
+msgstr ""
+
+msgctxt "model:product.uom,symbol:uom_carat"
+msgid "c"
+msgstr ""
+
+msgctxt "model:product.uom,symbol:uom_centimeter"
+msgid "cm"
+msgstr ""
+
+msgctxt "model:product.uom,symbol:uom_cubic_centimeter"
+msgid "cm³"
+msgstr ""
+
+msgctxt "model:product.uom,symbol:uom_cubic_foot"
+msgid "ft³"
+msgstr ""
+
+msgctxt "model:product.uom,symbol:uom_cubic_inch"
+msgid "in³"
+msgstr ""
+
+msgctxt "model:product.uom,symbol:uom_cubic_meter"
+msgid "m³"
+msgstr ""
+
+msgctxt "model:product.uom,symbol:uom_day"
+msgid "d"
+msgstr ""
+
+msgctxt "model:product.uom,symbol:uom_foot"
+msgid "ft"
+msgstr ""
+
+msgctxt "model:product.uom,symbol:uom_gallon"
+msgid "gal"
+msgstr ""
+
+msgctxt "model:product.uom,symbol:uom_gram"
+msgid "g"
+msgstr ""
+
+msgctxt "model:product.uom,symbol:uom_hectare"
+msgid "ha"
+msgstr ""
+
+msgctxt "model:product.uom,symbol:uom_hour"
+msgid "h"
+msgstr ""
+
+msgctxt "model:product.uom,symbol:uom_inch"
+msgid "in"
+msgstr ""
+
+msgctxt "model:product.uom,symbol:uom_kilogram"
+msgid "kg"
+msgstr ""
+
+msgctxt "model:product.uom,symbol:uom_kilometer"
+msgid "km"
+msgstr ""
+
+msgctxt "model:product.uom,symbol:uom_liter"
+msgid "l"
+msgstr ""
+
+msgctxt "model:product.uom,symbol:uom_meter"
+msgid "m"
+msgstr ""
+
+msgctxt "model:product.uom,symbol:uom_mile"
+msgid "mi"
+msgstr ""
+
+msgctxt "model:product.uom,symbol:uom_millimeter"
+msgid "mm"
+msgstr ""
+
+msgctxt "model:product.uom,symbol:uom_minute"
+msgid "min"
+msgstr ""
+
+msgctxt "model:product.uom,symbol:uom_ounce"
+msgid "oz"
+msgstr ""
+
+msgctxt "model:product.uom,symbol:uom_pound"
+msgid "lbs"
+msgstr ""
+
+msgctxt "model:product.uom,symbol:uom_second"
+msgid "s"
+msgstr ""
+
+msgctxt "model:product.uom,symbol:uom_square_centimeter"
+msgid "cm²"
+msgstr ""
+
+msgctxt "model:product.uom,symbol:uom_square_foot"
+msgid "ft²"
+msgstr ""
+
+msgctxt "model:product.uom,symbol:uom_square_inch"
+msgid "in²"
+msgstr ""
+
+msgctxt "model:product.uom,symbol:uom_square_meter"
+msgid "m²"
+msgstr ""
+
+msgctxt "model:product.uom,symbol:uom_square_yard"
+msgid "yd²"
+msgstr ""
+
+msgctxt "model:product.uom,symbol:uom_unit"
+msgid "u"
+msgstr ""
+
+msgctxt "model:product.uom,symbol:uom_work_day"
+msgid "wd"
+msgstr ""
+
+msgctxt "model:product.uom,symbol:uom_yard"
+msgid "yd"
+msgstr ""
+
+msgctxt "model:product.uom.category,name:0"
+msgid "Product uom category"
+msgstr ""
+
+msgctxt "model:product.uom.category,name:uom_cat_length"
+msgid "Length"
+msgstr ""
+
+msgctxt "model:product.uom.category,name:uom_cat_surface"
+msgid "Surface"
+msgstr ""
+
+msgctxt "model:product.uom.category,name:uom_cat_time"
+msgid "Time"
+msgstr ""
+
+msgctxt "model:product.uom.category,name:uom_cat_unit"
+msgid "Units"
+msgstr ""
+
+msgctxt "model:product.uom.category,name:uom_cat_volume"
+msgid "Volume"
+msgstr ""
+
+msgctxt "model:product.uom.category,name:uom_cat_weight"
+msgid "Weight"
+msgstr ""
+
+msgctxt "model:res.group,name:group_product_admin"
+msgid "Product Administration"
+msgstr ""
+
+msgctxt "selection:product.template,cost_price_method:0"
+msgid "Average"
+msgstr ""
+
+msgctxt "selection:product.template,cost_price_method:0"
+msgid "Fixed"
+msgstr ""
+
+msgctxt "selection:product.template,type:0"
+msgid "Consumable"
+msgstr ""
+
+msgctxt "selection:product.template,type:0"
+msgid "Service"
+msgstr ""
+
+msgctxt "selection:product.template,type:0"
+msgid "Stockable"
+msgstr ""
+
+msgctxt "view:product.category:0"
+msgid "Children"
+msgstr ""
+
+msgctxt "view:product.category:0"
+msgid "Product Categories"
+msgstr ""
+
+msgctxt "view:product.category:0"
+msgid "Product Category"
+msgstr ""
+
+msgctxt "view:product.product:0"
+msgid "Products"
+msgstr ""
+
+msgctxt "view:product.template:0"
+msgid "General"
+msgstr ""
+
+msgctxt "view:product.template:0"
+msgid "Product Template"
+msgstr ""
+
+msgctxt "view:product.template:0"
+msgid "Product Templates"
+msgstr ""
+
+msgctxt "view:product.uom.category:0"
+msgid "Categories of Unit of Measure"
+msgstr ""
+
+msgctxt "view:product.uom.category:0"
+msgid "Category of Unit of Measure"
+msgstr ""
+
+msgctxt "view:product.uom:0"
+msgid "Unit of Measure"
+msgstr ""
+
+msgctxt "view:product.uom:0"
+msgid "Units of Measure"
+msgstr ""
diff --git a/locale/de_DE.po b/locale/de_DE.po
new file mode 100644
index 0000000..ce8a503
--- /dev/null
+++ b/locale/de_DE.po
@@ -0,0 +1,719 @@
+#
+msgid ""
+msgstr "Content-Type: text/plain; charset=utf-8\n"
+
+msgctxt "error:product.category:0"
+msgid "You can not create recursive categories!"
+msgstr "Kategorien können nicht rekursiv angelegt werden!"
+
+msgctxt "error:product.template:0"
+msgid ""
+"You cannot change the default uom for a product which is associated to stock"
+" moves."
+msgstr ""
+"Die Standardmaßeinheit kann nicht für einen Artikel geändert werden, der "
+"Lagerbewegungen zugeordnet ist."
+
+msgctxt "error:product.uom:0"
+msgid ""
+"If the UOM is still not used, you can delete it otherwise you can deactivate"
+" it and create a new one."
+msgstr ""
+"Wenn die Maßeinheit noch nicht verwendet wurde, kann sie gelöscht werden.\n"
+"Andernfalls kann sie nur deaktiviert und eine andere neue erstellt werden."
+
+msgctxt "error:product.uom:0"
+msgid "Invalid Factor and Rate values!"
+msgstr "Ungültige Werte für Faktor und Kehrwert!"
+
+msgctxt "error:product.uom:0"
+msgid "Rate and factor can not be both equal to zero."
+msgstr "Faktor und Kehrwert Faktor können beide nicht 0 sein"
+
+msgctxt "error:product.uom:0"
+msgid "You cannot change Rate, Factor or Category on a Unit of Measure. "
+msgstr ""
+"Faktor, Faktorkehrwert oder Kategorie einer Maßeinheit können nicht geändert"
+" werden."
+
+msgctxt "field:product.category,childs:0"
+msgid "Children"
+msgstr "Untergeordnet (Kategorien)"
+
+msgctxt "field:product.category,create_date:0"
+msgid "Creation date"
+msgstr "Erstellungsdatum"
+
+msgctxt "field:product.category,create_uid:0"
+msgid "Creation user"
+msgstr "Ersteller"
+
+msgctxt "field:product.category,id:0"
+msgid "ID"
+msgstr "ID"
+
+msgctxt "field:product.category,name:0"
+msgid "Name"
+msgstr "Name"
+
+msgctxt "field:product.category,parent:0"
+msgid "Parent"
+msgstr "Ãœbergeordnet (Kategorie)"
+
+msgctxt "field:product.category,rec_name:0"
+msgid "Name"
+msgstr "Name"
+
+msgctxt "field:product.category,write_date:0"
+msgid "Last modification date"
+msgstr "Zuletzt geändert am"
+
+msgctxt "field:product.category,write_uid:0"
+msgid "Last modification by"
+msgstr "Zuletzt geändert von"
+
+msgctxt "field:product.product,code:0"
+msgid "Code"
+msgstr "Artikelnummer"
+
+msgctxt "field:product.product,create_date:0"
+msgid "Creation date"
+msgstr "Erstellungsdatum"
+
+msgctxt "field:product.product,create_uid:0"
+msgid "Creation user"
+msgstr "Ersteller"
+
+msgctxt "field:product.product,description:0"
+msgid "Description"
+msgstr "Beschreibung"
+
+msgctxt "field:product.product,id:0"
+msgid "ID"
+msgstr "ID"
+
+msgctxt "field:product.product,rec_name:0"
+msgid "Name"
+msgstr "Name"
+
+msgctxt "field:product.product,template:0"
+msgid "Product Template"
+msgstr "Artikelvorlage"
+
+msgctxt "field:product.product,write_date:0"
+msgid "Last modification date"
+msgstr "Zuletzt geändert am"
+
+msgctxt "field:product.product,write_uid:0"
+msgid "Last modification by"
+msgstr "Zuletzt geändert von"
+
+msgctxt "field:product.template,active:0"
+msgid "Active"
+msgstr "Aktiv"
+
+msgctxt "field:product.template,category:0"
+msgid "Category"
+msgstr "Artikelkategorie"
+
+msgctxt "field:product.template,cost_price:0"
+msgid "Cost Price"
+msgstr "Einkaufspreis"
+
+msgctxt "field:product.template,cost_price_method:0"
+msgid "Cost Method"
+msgstr "Kostenmethode"
+
+msgctxt "field:product.template,cost_price_uom:0"
+msgid "Cost Price"
+msgstr "Einkaufspreis"
+
+msgctxt "field:product.template,create_date:0"
+msgid "Creation date"
+msgstr "Erstellungsdatum"
+
+msgctxt "field:product.template,create_uid:0"
+msgid "Creation user"
+msgstr "Ersteller"
+
+msgctxt "field:product.template,default_uom:0"
+msgid "Default UOM"
+msgstr "Standardeinheit"
+
+msgctxt "field:product.template,id:0"
+msgid "ID"
+msgstr "ID"
+
+msgctxt "field:product.template,list_price:0"
+msgid "List Price"
+msgstr "Listenpreis"
+
+msgctxt "field:product.template,list_price_uom:0"
+msgid "List Price"
+msgstr "Listenpreis"
+
+msgctxt "field:product.template,name:0"
+msgid "Name"
+msgstr "Name"
+
+msgctxt "field:product.template,products:0"
+msgid "Products"
+msgstr "Artikel"
+
+msgctxt "field:product.template,rec_name:0"
+msgid "Name"
+msgstr "Name"
+
+msgctxt "field:product.template,type:0"
+msgid "Type"
+msgstr "Typ"
+
+msgctxt "field:product.template,write_date:0"
+msgid "Last modification date"
+msgstr "Zuletzt geändert am"
+
+msgctxt "field:product.template,write_uid:0"
+msgid "Last modification by"
+msgstr "Zuletzt geändert von"
+
+msgctxt "field:product.uom,active:0"
+msgid "Active"
+msgstr "Aktiv"
+
+msgctxt "field:product.uom,category:0"
+msgid "UOM Category"
+msgstr "Kategorie Maßeinheit"
+
+msgctxt "field:product.uom,create_date:0"
+msgid "Creation date"
+msgstr "Erstellungsdatum"
+
+msgctxt "field:product.uom,create_uid:0"
+msgid "Creation user"
+msgstr "Ersteller"
+
+msgctxt "field:product.uom,digits:0"
+msgid "Display Digits"
+msgstr "Angezeigte Stellen"
+
+msgctxt "field:product.uom,factor:0"
+msgid "Factor"
+msgstr "Faktor"
+
+msgctxt "field:product.uom,id:0"
+msgid "ID"
+msgstr "ID"
+
+msgctxt "field:product.uom,name:0"
+msgid "Name"
+msgstr "Name"
+
+msgctxt "field:product.uom,rate:0"
+msgid "Rate"
+msgstr "Kehrwert Faktor"
+
+msgctxt "field:product.uom,rec_name:0"
+msgid "Name"
+msgstr "Name"
+
+msgctxt "field:product.uom,rounding:0"
+msgid "Rounding Precision"
+msgstr "Rundungsgenauigkeit"
+
+msgctxt "field:product.uom,symbol:0"
+msgid "Symbol"
+msgstr "Symbol"
+
+msgctxt "field:product.uom,write_date:0"
+msgid "Last modification date"
+msgstr "Zuletzt geändert am"
+
+msgctxt "field:product.uom,write_uid:0"
+msgid "Last modification by"
+msgstr "Zuletzt geändert von"
+
+msgctxt "field:product.uom.category,create_date:0"
+msgid "Creation date"
+msgstr "Erstellungsdatum"
+
+msgctxt "field:product.uom.category,create_uid:0"
+msgid "Creation user"
+msgstr "Ersteller"
+
+msgctxt "field:product.uom.category,id:0"
+msgid "ID"
+msgstr "ID"
+
+msgctxt "field:product.uom.category,name:0"
+msgid "Name"
+msgstr "Name"
+
+msgctxt "field:product.uom.category,rec_name:0"
+msgid "Name"
+msgstr "Name"
+
+msgctxt "field:product.uom.category,uoms:0"
+msgid "Unit of Measures"
+msgstr "Maßeinheiten"
+
+msgctxt "field:product.uom.category,write_date:0"
+msgid "Last modification date"
+msgstr "Zuletzt geändert am"
+
+msgctxt "field:product.uom.category,write_uid:0"
+msgid "Last modification by"
+msgstr "Zuletzt geändert von"
+
+msgctxt "help:product.uom,factor:0"
+msgid ""
+"The coefficient for the formula:\n"
+"coef (base unit) = 1 (this unit)"
+msgstr ""
+"Der Faktor der Basiseinheit für eine Maßeinheit ist immer 1.\n"
+"Formel: diese Einheit = Faktor * Basiseinheit\n"
+"Das Feld Kehrwert Faktor wird automatisch aus dem hier eingetragenen Wert ermittelt."
+
+msgctxt "help:product.uom,rate:0"
+msgid ""
+"The coefficient for the formula:\n"
+"1 (base unit) = coef (this unit)"
+msgstr ""
+"Der Kehrwert des Faktors der Basiseinheit für eine Maßeinheit ist immer 1.\n"
+"Formel: Basiseinheit = Kehrwert * diese Einheit\n"
+"Das Feld Faktor wird automatisch aus dem hier eingetragenen Wert ermittelt."
+
+msgctxt "model:ir.action,name:act_category_list"
+msgid "Categories"
+msgstr "Kategorien"
+
+msgctxt "model:ir.action,name:act_category_tree"
+msgid "Categories"
+msgstr "Artikelkategorien"
+
+msgctxt "model:ir.action,name:act_product_by_category"
+msgid "Product by Category"
+msgstr "Artikel nach Kategorie"
+
+msgctxt "model:ir.action,name:act_product_form"
+msgid "Products"
+msgstr "Artikel"
+
+msgctxt "model:ir.action,name:act_uom_category_form"
+msgid "Categories of Unit of Measure"
+msgstr "Kategorien Maßeinheiten"
+
+msgctxt "model:ir.action,name:act_uom_form"
+msgid "Units of Measure"
+msgstr "Maßeinheiten"
+
+msgctxt "model:ir.ui.menu,name:menu_category_list"
+msgid "Categories"
+msgstr "Kategorien"
+
+msgctxt "model:ir.ui.menu,name:menu_category_tree"
+msgid "Categories"
+msgstr "Artikelkategorien"
+
+msgctxt "model:ir.ui.menu,name:menu_main_product"
+msgid "Product"
+msgstr "Artikel"
+
+msgctxt "model:ir.ui.menu,name:menu_product_product"
+msgid "Products"
+msgstr "Artikel"
+
+msgctxt "model:ir.ui.menu,name:menu_uom_category_form"
+msgid "Categories"
+msgstr "Kategorien für Maßeinheiten"
+
+msgctxt "model:ir.ui.menu,name:menu_uom_form"
+msgid "Units of Measure"
+msgstr "Maßeinheiten"
+
+msgctxt "model:product.category,name:0"
+msgid "Product Category"
+msgstr "Artikel Kategorie"
+
+msgctxt "model:product.product,name:0"
+msgid "Product"
+msgstr "Artikel"
+
+msgctxt "model:product.template,name:0"
+msgid "Product Template"
+msgstr "Artikel Vorlage"
+
+msgctxt "model:product.uom,name:0"
+msgid "Unit of measure"
+msgstr "Maßeinheit"
+
+msgctxt "model:product.uom,name:uom_are"
+msgid "Are"
+msgstr "Ar"
+
+msgctxt "model:product.uom,name:uom_carat"
+msgid "Carat"
+msgstr "Karat"
+
+msgctxt "model:product.uom,name:uom_centimeter"
+msgid "centimeter"
+msgstr "Zentimeter"
+
+msgctxt "model:product.uom,name:uom_cubic_centimeter"
+msgid "Cubic centimeter"
+msgstr "Kubikzentimeter"
+
+msgctxt "model:product.uom,name:uom_cubic_foot"
+msgid "Cubic foot"
+msgstr "Kubikfuß"
+
+msgctxt "model:product.uom,name:uom_cubic_inch"
+msgid "Cubic inch"
+msgstr "Kubikzoll"
+
+msgctxt "model:product.uom,name:uom_cubic_meter"
+msgid "Cubic meter"
+msgstr "Kubikmeter"
+
+msgctxt "model:product.uom,name:uom_day"
+msgid "Day"
+msgstr "Tag(e)"
+
+msgctxt "model:product.uom,name:uom_foot"
+msgid "Foot"
+msgstr "Fuß"
+
+msgctxt "model:product.uom,name:uom_gallon"
+msgid "Gallon"
+msgstr "Gallone(n)"
+
+msgctxt "model:product.uom,name:uom_gram"
+msgid "Gram"
+msgstr "Gramm"
+
+msgctxt "model:product.uom,name:uom_hectare"
+msgid "Hectare"
+msgstr "Hektar"
+
+msgctxt "model:product.uom,name:uom_hour"
+msgid "Hour"
+msgstr "Stunde(n)"
+
+msgctxt "model:product.uom,name:uom_inch"
+msgid "Inch"
+msgstr "Zoll"
+
+msgctxt "model:product.uom,name:uom_kilogram"
+msgid "Kilogram"
+msgstr "Kilogramm"
+
+msgctxt "model:product.uom,name:uom_kilometer"
+msgid "Kilometer"
+msgstr "Kilometer"
+
+msgctxt "model:product.uom,name:uom_liter"
+msgid "Liter"
+msgstr "Liter"
+
+msgctxt "model:product.uom,name:uom_meter"
+msgid "Meter"
+msgstr "Meter"
+
+msgctxt "model:product.uom,name:uom_mile"
+msgid "Mile"
+msgstr "Meile(n)"
+
+msgctxt "model:product.uom,name:uom_millimeter"
+msgid "Millimeter"
+msgstr "Millimeter"
+
+msgctxt "model:product.uom,name:uom_minute"
+msgid "Minute"
+msgstr "Minute(n)"
+
+msgctxt "model:product.uom,name:uom_ounce"
+msgid "Ounce"
+msgstr "Unze(n)"
+
+msgctxt "model:product.uom,name:uom_pound"
+msgid "Pound"
+msgstr "Pfund"
+
+msgctxt "model:product.uom,name:uom_second"
+msgid "Second"
+msgstr "Sekunde(n)"
+
+msgctxt "model:product.uom,name:uom_square_centimeter"
+msgid "Square centimeter"
+msgstr "Quadratzentimeter"
+
+msgctxt "model:product.uom,name:uom_square_foot"
+msgid "Square foot"
+msgstr "Quadratfuß"
+
+msgctxt "model:product.uom,name:uom_square_inch"
+msgid "Square inch"
+msgstr "Quadratzoll"
+
+msgctxt "model:product.uom,name:uom_square_meter"
+msgid "Square meter"
+msgstr "Quadratmeter"
+
+msgctxt "model:product.uom,name:uom_square_yard"
+msgid "Square yard"
+msgstr "Quadratyard(s)"
+
+msgctxt "model:product.uom,name:uom_unit"
+msgid "Unit"
+msgstr "Stück"
+
+msgctxt "model:product.uom,name:uom_work_day"
+msgid "Work Day"
+msgstr "Personentag(e)"
+
+msgctxt "model:product.uom,name:uom_yard"
+msgid "Yard"
+msgstr "Yard(s)"
+
+msgctxt "model:product.uom,symbol:uom_are"
+msgid "a"
+msgstr "a"
+
+msgctxt "model:product.uom,symbol:uom_carat"
+msgid "c"
+msgstr "c"
+
+msgctxt "model:product.uom,symbol:uom_centimeter"
+msgid "cm"
+msgstr "cm"
+
+msgctxt "model:product.uom,symbol:uom_cubic_centimeter"
+msgid "cm³"
+msgstr "cm³"
+
+msgctxt "model:product.uom,symbol:uom_cubic_foot"
+msgid "ft³"
+msgstr "ft³"
+
+msgctxt "model:product.uom,symbol:uom_cubic_inch"
+msgid "in³"
+msgstr "in³"
+
+msgctxt "model:product.uom,symbol:uom_cubic_meter"
+msgid "m³"
+msgstr "m³"
+
+msgctxt "model:product.uom,symbol:uom_day"
+msgid "d"
+msgstr "d"
+
+msgctxt "model:product.uom,symbol:uom_foot"
+msgid "ft"
+msgstr "ft"
+
+msgctxt "model:product.uom,symbol:uom_gallon"
+msgid "gal"
+msgstr "gal"
+
+msgctxt "model:product.uom,symbol:uom_gram"
+msgid "g"
+msgstr "g"
+
+msgctxt "model:product.uom,symbol:uom_hectare"
+msgid "ha"
+msgstr "ha"
+
+msgctxt "model:product.uom,symbol:uom_hour"
+msgid "h"
+msgstr "h"
+
+msgctxt "model:product.uom,symbol:uom_inch"
+msgid "in"
+msgstr "in"
+
+msgctxt "model:product.uom,symbol:uom_kilogram"
+msgid "kg"
+msgstr "kg"
+
+msgctxt "model:product.uom,symbol:uom_kilometer"
+msgid "km"
+msgstr "km"
+
+msgctxt "model:product.uom,symbol:uom_liter"
+msgid "l"
+msgstr "l"
+
+msgctxt "model:product.uom,symbol:uom_meter"
+msgid "m"
+msgstr "m"
+
+msgctxt "model:product.uom,symbol:uom_mile"
+msgid "mi"
+msgstr "mi"
+
+msgctxt "model:product.uom,symbol:uom_millimeter"
+msgid "mm"
+msgstr "mm"
+
+msgctxt "model:product.uom,symbol:uom_minute"
+msgid "min"
+msgstr "min"
+
+msgctxt "model:product.uom,symbol:uom_ounce"
+msgid "oz"
+msgstr "oz"
+
+msgctxt "model:product.uom,symbol:uom_pound"
+msgid "lbs"
+msgstr "lbs"
+
+msgctxt "model:product.uom,symbol:uom_second"
+msgid "s"
+msgstr "s"
+
+msgctxt "model:product.uom,symbol:uom_square_centimeter"
+msgid "cm²"
+msgstr "cm²"
+
+msgctxt "model:product.uom,symbol:uom_square_foot"
+msgid "ft²"
+msgstr "ft²"
+
+msgctxt "model:product.uom,symbol:uom_square_inch"
+msgid "in²"
+msgstr "in²"
+
+msgctxt "model:product.uom,symbol:uom_square_meter"
+msgid "m²"
+msgstr "m²"
+
+msgctxt "model:product.uom,symbol:uom_square_yard"
+msgid "yd²"
+msgstr "yd²"
+
+msgctxt "model:product.uom,symbol:uom_unit"
+msgid "u"
+msgstr "St."
+
+msgctxt "model:product.uom,symbol:uom_work_day"
+msgid "wd"
+msgstr "PT"
+
+msgctxt "model:product.uom,symbol:uom_yard"
+msgid "yd"
+msgstr "yd"
+
+msgctxt "model:product.uom.category,name:0"
+msgid "Product uom category"
+msgstr "Artikel Maßeinheit Kategorie"
+
+msgctxt "model:product.uom.category,name:uom_cat_length"
+msgid "Length"
+msgstr "Länge"
+
+msgctxt "model:product.uom.category,name:uom_cat_surface"
+msgid "Surface"
+msgstr "Fläche"
+
+msgctxt "model:product.uom.category,name:uom_cat_time"
+msgid "Time"
+msgstr "Zeit"
+
+msgctxt "model:product.uom.category,name:uom_cat_unit"
+msgid "Units"
+msgstr "Stückzahl"
+
+msgctxt "model:product.uom.category,name:uom_cat_volume"
+msgid "Volume"
+msgstr "Volumen"
+
+msgctxt "model:product.uom.category,name:uom_cat_weight"
+msgid "Weight"
+msgstr "Gewicht"
+
+msgctxt "model:res.group,name:group_product_admin"
+msgid "Product Administration"
+msgstr "Artikel Administration"
+
+msgctxt "selection:product.template,cost_price_method:0"
+msgid "Average"
+msgstr "Durchschnitt"
+
+msgctxt "selection:product.template,cost_price_method:0"
+msgid "Fixed"
+msgstr "Fix"
+
+msgctxt "selection:product.template,type:0"
+msgid "Consumable"
+msgstr "Verbrauchsmaterial"
+
+msgctxt "selection:product.template,type:0"
+msgid "Service"
+msgstr "Dienstleistung"
+
+msgctxt "selection:product.template,type:0"
+msgid "Stockable"
+msgstr "Lagerware"
+
+msgctxt "view:product.category:0"
+msgid "Children"
+msgstr "Untergeordnet (Kategorien)"
+
+msgctxt "view:product.category:0"
+msgid "Product Categories"
+msgstr "Artikelkategorien"
+
+msgctxt "view:product.category:0"
+msgid "Product Category"
+msgstr "Artikelkategorie"
+
+msgctxt "view:product.product:0"
+msgid "General"
+msgstr "Allgemein"
+
+msgctxt "view:product.product:0"
+msgid "Product"
+msgstr "Artikel"
+
+msgctxt "view:product.product:0"
+msgid "Product Suppliers"
+msgstr "Lieferanten"
+
+msgctxt "view:product.product:0"
+msgid "Products"
+msgstr "Artikel"
+
+msgctxt "view:product.template:0"
+msgid "General"
+msgstr "Allgemein"
+
+msgctxt "view:product.template:0"
+msgid "Product"
+msgstr "Artikel"
+
+msgctxt "view:product.template:0"
+msgid "Product Template"
+msgstr "Artikelvorlage"
+
+msgctxt "view:product.template:0"
+msgid "Product Templates"
+msgstr "Artikelvorlagen"
+
+msgctxt "view:product.template:0"
+msgid "Products"
+msgstr "Artikel"
+
+msgctxt "view:product.uom.category:0"
+msgid "Categories of Unit of Measure"
+msgstr "Kategorien Maßeinheiten"
+
+msgctxt "view:product.uom.category:0"
+msgid "Category of Unit of Measure"
+msgstr "Kategorie Maßeinheit"
+
+msgctxt "view:product.uom:0"
+msgid "Unit of Measure"
+msgstr "Maßeinheit"
+
+msgctxt "view:product.uom:0"
+msgid "Units of Measure"
+msgstr "Maßeinheiten"
diff --git a/locale/es_CO.po b/locale/es_CO.po
new file mode 100644
index 0000000..70684e3
--- /dev/null
+++ b/locale/es_CO.po
@@ -0,0 +1,611 @@
+#
+msgid ""
+msgstr "Content-Type: text/plain; charset=utf-8\n"
+
+#, fuzzy
+msgctxt "error:product.category:0"
+msgid "You can not create recursive categories!"
+msgstr "No puede crear categorÃas recursivas!"
+
+msgctxt "error:product.template:0"
+msgid ""
+"You cannot change the default uom for a product which is associated to stock"
+" moves."
+msgstr ""
+"No puede cambiar la UdM predeterminada para un producto asociado con "
+"movimientos de inventario."
+
+msgctxt "error:product.uom:0"
+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 eliminar, de otra forma puede desactivarla y"
+" crear una nueva."
+
+msgctxt "error:product.uom:0"
+msgid "Invalid Factor and Rate values!"
+msgstr "¡Factor y valores de tasa de cambio inválidas!"
+
+msgctxt "error:product.uom:0"
+msgid "Rate and factor can not be both equal to zero."
+msgstr "Tasa de cambio y factor no pueden ser cero simultáneamente."
+
+msgctxt "error:product.uom:0"
+msgid "You cannot change Rate, Factor or Category on a Unit of Measure. "
+msgstr ""
+"No puede cambiar la Rata, el Factor o la CategorÃa de una Unidad de Medida."
+
+msgctxt "field:product.category,childs:0"
+msgid "Children"
+msgstr "Hij at s"
+
+msgctxt "field:product.category,name:0"
+msgid "Name"
+msgstr "Nombre"
+
+msgctxt "field:product.category,parent:0"
+msgid "Parent"
+msgstr "Padre"
+
+msgctxt "field:product.category,rec_name:0"
+msgid "Name"
+msgstr "Nombre"
+
+msgctxt "field:product.product,code:0"
+msgid "Code"
+msgstr "Código"
+
+msgctxt "field:product.product,description:0"
+msgid "Description"
+msgstr "Descripción"
+
+msgctxt "field:product.product,rec_name:0"
+msgid "Name"
+msgstr "Nombre"
+
+msgctxt "field:product.product,template:0"
+msgid "Product Template"
+msgstr "Plantilla de Producto"
+
+msgctxt "field:product.template,active:0"
+msgid "Active"
+msgstr "Activo"
+
+msgctxt "field:product.template,category:0"
+msgid "Category"
+msgstr "CategorÃa"
+
+msgctxt "field:product.template,cost_price:0"
+msgid "Cost Price"
+msgstr "Método de Precio"
+
+msgctxt "field:product.template,cost_price_method:0"
+msgid "Cost Method"
+msgstr "Método de Coste"
+
+msgctxt "field:product.template,cost_price_uom:0"
+msgid "Cost Price"
+msgstr "Método de Precio"
+
+msgctxt "field:product.template,default_uom:0"
+msgid "Default UOM"
+msgstr "UdM Predeterminado"
+
+msgctxt "field:product.template,list_price:0"
+msgid "List Price"
+msgstr "Precio de Lista"
+
+msgctxt "field:product.template,list_price_uom:0"
+msgid "List Price"
+msgstr "Precio de Lista"
+
+msgctxt "field:product.template,name:0"
+msgid "Name"
+msgstr "Nombre"
+
+msgctxt "field:product.template,products:0"
+msgid "Products"
+msgstr "Productos"
+
+msgctxt "field:product.template,rec_name:0"
+msgid "Name"
+msgstr "Nombre"
+
+msgctxt "field:product.template,type:0"
+msgid "Type"
+msgstr "Tipo"
+
+msgctxt "field:product.uom,active:0"
+msgid "Active"
+msgstr "Activo"
+
+msgctxt "field:product.uom,category:0"
+msgid "UOM Category"
+msgstr "CategorÃa UDM"
+
+msgctxt "field:product.uom,digits:0"
+msgid "Display Digits"
+msgstr "Mostrar DÃgitos"
+
+msgctxt "field:product.uom,factor:0"
+msgid "Factor"
+msgstr "Factor"
+
+msgctxt "field:product.uom,name:0"
+msgid "Name"
+msgstr "Nombre"
+
+msgctxt "field:product.uom,rate:0"
+msgid "Rate"
+msgstr "Tasa de Cambio"
+
+msgctxt "field:product.uom,rec_name:0"
+msgid "Name"
+msgstr "Nombre"
+
+msgctxt "field:product.uom,rounding:0"
+msgid "Rounding Precision"
+msgstr "Precisión de Redondeo"
+
+msgctxt "field:product.uom,symbol:0"
+msgid "Symbol"
+msgstr "SÃmbolo"
+
+msgctxt "field:product.uom.category,name:0"
+msgid "Name"
+msgstr "Nombre"
+
+msgctxt "field:product.uom.category,rec_name:0"
+msgid "Name"
+msgstr "Nombre"
+
+msgctxt "field:product.uom.category,uoms:0"
+msgid "Unit of Measures"
+msgstr "Unidad de Medidas"
+
+msgctxt "help:product.uom,factor:0"
+msgid ""
+"The coefficient for the formula:\n"
+"coef (base unit) = 1 (this unit)"
+msgstr "El coeficiente para la fórmula:"
+
+msgctxt "help:product.uom,rate:0"
+msgid ""
+"The coefficient for the formula:\n"
+"1 (base unit) = coef (this unit)"
+msgstr "El coeficiente para la fórmula:"
+
+#, fuzzy
+msgctxt "model:ir.action,name:act_category_list"
+msgid "Categories"
+msgstr "CategorÃas"
+
+msgctxt "model:ir.action,name:act_category_tree"
+msgid "Categories"
+msgstr "CategorÃas"
+
+msgctxt "model:ir.action,name:act_product_by_category"
+msgid "Product by Category"
+msgstr "Producto por CategorÃa"
+
+msgctxt "model:ir.action,name:act_product_form"
+msgid "Products"
+msgstr "Productos"
+
+msgctxt "model:ir.action,name:act_uom_category_form"
+msgid "Categories of Unit of Measure"
+msgstr "CategorÃas de Unidad de Medida"
+
+msgctxt "model:ir.action,name:act_uom_form"
+msgid "Units of Measure"
+msgstr "Unidades de Medida"
+
+#, fuzzy
+msgctxt "model:ir.ui.menu,name:menu_category_list"
+msgid "Categories"
+msgstr "CategorÃas"
+
+msgctxt "model:ir.ui.menu,name:menu_category_tree"
+msgid "Categories"
+msgstr "CategorÃas"
+
+msgctxt "model:ir.ui.menu,name:menu_main_product"
+msgid "Product"
+msgstr "Producto"
+
+msgctxt "model:ir.ui.menu,name:menu_product_product"
+msgid "Products"
+msgstr "Productos"
+
+msgctxt "model:ir.ui.menu,name:menu_uom_category_form"
+msgid "Categories"
+msgstr "CategorÃas"
+
+msgctxt "model:ir.ui.menu,name:menu_uom_form"
+msgid "Units of Measure"
+msgstr "Unidades de Medida"
+
+msgctxt "model:product.category,name:0"
+msgid "Product Category"
+msgstr "CategorÃa de Producto"
+
+msgctxt "model:product.product,name:0"
+msgid "Product"
+msgstr "Producto"
+
+msgctxt "model:product.template,name:0"
+msgid "Product Template"
+msgstr "Plantilla de Producto"
+
+msgctxt "model:product.uom,name:0"
+msgid "Unit of measure"
+msgstr "Unidad de medida"
+
+msgctxt "model:product.uom,name:uom_are"
+msgid "Are"
+msgstr "Son"
+
+msgctxt "model:product.uom,name:uom_carat"
+msgid "Carat"
+msgstr "Carat"
+
+msgctxt "model:product.uom,name:uom_centimeter"
+msgid "centimeter"
+msgstr "centÃmetro"
+
+msgctxt "model:product.uom,name:uom_cubic_centimeter"
+msgid "Cubic centimeter"
+msgstr "CentÃmetro Cúbico"
+
+msgctxt "model:product.uom,name:uom_cubic_foot"
+msgid "Cubic foot"
+msgstr "Pie Cúbico"
+
+msgctxt "model:product.uom,name:uom_cubic_inch"
+msgid "Cubic inch"
+msgstr "Pulgada Cúbica"
+
+msgctxt "model:product.uom,name:uom_cubic_meter"
+msgid "Cubic meter"
+msgstr "Metro Cúbico"
+
+msgctxt "model:product.uom,name:uom_day"
+msgid "Day"
+msgstr "DÃa"
+
+msgctxt "model:product.uom,name:uom_foot"
+msgid "Foot"
+msgstr "Pie"
+
+msgctxt "model:product.uom,name:uom_gallon"
+msgid "Gallon"
+msgstr "Galón"
+
+msgctxt "model:product.uom,name:uom_gram"
+msgid "Gram"
+msgstr "Gram"
+
+msgctxt "model:product.uom,name:uom_hectare"
+msgid "Hectare"
+msgstr "Hectárea"
+
+msgctxt "model:product.uom,name:uom_hour"
+msgid "Hour"
+msgstr "Hora"
+
+msgctxt "model:product.uom,name:uom_inch"
+msgid "Inch"
+msgstr "Pulgada"
+
+msgctxt "model:product.uom,name:uom_kilogram"
+msgid "Kilogram"
+msgstr "Kilogramo"
+
+msgctxt "model:product.uom,name:uom_kilometer"
+msgid "Kilometer"
+msgstr "Kilómetro"
+
+msgctxt "model:product.uom,name:uom_liter"
+msgid "Liter"
+msgstr "Litro"
+
+msgctxt "model:product.uom,name:uom_meter"
+msgid "Meter"
+msgstr "Metro"
+
+msgctxt "model:product.uom,name:uom_mile"
+msgid "Mile"
+msgstr "Milla"
+
+msgctxt "model:product.uom,name:uom_millimeter"
+msgid "Millimeter"
+msgstr "MilÃmetro"
+
+msgctxt "model:product.uom,name:uom_minute"
+msgid "Minute"
+msgstr "Minuto"
+
+msgctxt "model:product.uom,name:uom_ounce"
+msgid "Ounce"
+msgstr "Onza"
+
+msgctxt "model:product.uom,name:uom_pound"
+msgid "Pound"
+msgstr "Libra"
+
+msgctxt "model:product.uom,name:uom_second"
+msgid "Second"
+msgstr "Segundo"
+
+msgctxt "model:product.uom,name:uom_square_centimeter"
+msgid "Square centimeter"
+msgstr "CentÃmetro Cuadrado"
+
+msgctxt "model:product.uom,name:uom_square_foot"
+msgid "Square foot"
+msgstr "Pie Cuadrado"
+
+msgctxt "model:product.uom,name:uom_square_inch"
+msgid "Square inch"
+msgstr "Pulgada Cuadrada"
+
+msgctxt "model:product.uom,name:uom_square_meter"
+msgid "Square meter"
+msgstr "Metro Cuadrado"
+
+msgctxt "model:product.uom,name:uom_square_yard"
+msgid "Square yard"
+msgstr "Yarda Cuadrada"
+
+msgctxt "model:product.uom,name:uom_unit"
+msgid "Unit"
+msgstr "Unidad"
+
+msgctxt "model:product.uom,name:uom_work_day"
+msgid "Work Day"
+msgstr "DÃa de Trabajo"
+
+msgctxt "model:product.uom,name:uom_yard"
+msgid "Yard"
+msgstr "Yarda"
+
+msgctxt "model:product.uom,symbol:uom_are"
+msgid "a"
+msgstr "a"
+
+msgctxt "model:product.uom,symbol:uom_carat"
+msgid "c"
+msgstr "c"
+
+msgctxt "model:product.uom,symbol:uom_centimeter"
+msgid "cm"
+msgstr "cm"
+
+msgctxt "model:product.uom,symbol:uom_cubic_centimeter"
+msgid "cm³"
+msgstr "cm³"
+
+msgctxt "model:product.uom,symbol:uom_cubic_foot"
+msgid "ft³"
+msgstr "pie³"
+
+msgctxt "model:product.uom,symbol:uom_cubic_inch"
+msgid "in³"
+msgstr "pul³"
+
+msgctxt "model:product.uom,symbol:uom_cubic_meter"
+msgid "m³"
+msgstr "m³"
+
+msgctxt "model:product.uom,symbol:uom_day"
+msgid "d"
+msgstr "d"
+
+msgctxt "model:product.uom,symbol:uom_foot"
+msgid "ft"
+msgstr "pie"
+
+msgctxt "model:product.uom,symbol:uom_gallon"
+msgid "gal"
+msgstr "gal"
+
+msgctxt "model:product.uom,symbol:uom_gram"
+msgid "g"
+msgstr "g"
+
+msgctxt "model:product.uom,symbol:uom_hectare"
+msgid "ha"
+msgstr "ha"
+
+msgctxt "model:product.uom,symbol:uom_hour"
+msgid "h"
+msgstr "h"
+
+msgctxt "model:product.uom,symbol:uom_inch"
+msgid "in"
+msgstr "en"
+
+msgctxt "model:product.uom,symbol:uom_kilogram"
+msgid "kg"
+msgstr "kg"
+
+msgctxt "model:product.uom,symbol:uom_kilometer"
+msgid "km"
+msgstr "km"
+
+msgctxt "model:product.uom,symbol:uom_liter"
+msgid "l"
+msgstr "l"
+
+msgctxt "model:product.uom,symbol:uom_meter"
+msgid "m"
+msgstr "m"
+
+msgctxt "model:product.uom,symbol:uom_mile"
+msgid "mi"
+msgstr "mi"
+
+msgctxt "model:product.uom,symbol:uom_millimeter"
+msgid "mm"
+msgstr "mm"
+
+msgctxt "model:product.uom,symbol:uom_minute"
+msgid "min"
+msgstr "min"
+
+msgctxt "model:product.uom,symbol:uom_ounce"
+msgid "oz"
+msgstr "oz"
+
+msgctxt "model:product.uom,symbol:uom_pound"
+msgid "lbs"
+msgstr "lbs"
+
+msgctxt "model:product.uom,symbol:uom_second"
+msgid "s"
+msgstr "s"
+
+msgctxt "model:product.uom,symbol:uom_square_centimeter"
+msgid "cm²"
+msgstr "cm²"
+
+msgctxt "model:product.uom,symbol:uom_square_foot"
+msgid "ft²"
+msgstr "pie²"
+
+msgctxt "model:product.uom,symbol:uom_square_inch"
+msgid "in²"
+msgstr "pul²"
+
+msgctxt "model:product.uom,symbol:uom_square_meter"
+msgid "m²"
+msgstr "m²"
+
+msgctxt "model:product.uom,symbol:uom_square_yard"
+msgid "yd²"
+msgstr "yd²"
+
+msgctxt "model:product.uom,symbol:uom_unit"
+msgid "u"
+msgstr "u"
+
+msgctxt "model:product.uom,symbol:uom_work_day"
+msgid "wd"
+msgstr "wd"
+
+msgctxt "model:product.uom,symbol:uom_yard"
+msgid "yd"
+msgstr "yd"
+
+msgctxt "model:product.uom.category,name:0"
+msgid "Product uom category"
+msgstr "CategorÃa de udm de Producto"
+
+msgctxt "model:product.uom.category,name:uom_cat_length"
+msgid "Length"
+msgstr "Longitud"
+
+msgctxt "model:product.uom.category,name:uom_cat_surface"
+msgid "Surface"
+msgstr "Superficie"
+
+msgctxt "model:product.uom.category,name:uom_cat_time"
+msgid "Time"
+msgstr "Tiempo"
+
+msgctxt "model:product.uom.category,name:uom_cat_unit"
+msgid "Units"
+msgstr "Unidades"
+
+msgctxt "model:product.uom.category,name:uom_cat_volume"
+msgid "Volume"
+msgstr "Volumen"
+
+msgctxt "model:product.uom.category,name:uom_cat_weight"
+msgid "Weight"
+msgstr "Peso"
+
+msgctxt "model:res.group,name:group_product_admin"
+msgid "Product Administration"
+msgstr "Productos"
+
+msgctxt "selection:product.template,cost_price_method:0"
+msgid "Average"
+msgstr "Promedio"
+
+msgctxt "selection:product.template,cost_price_method:0"
+msgid "FIFO"
+msgstr "FIFO"
+
+msgctxt "selection:product.template,cost_price_method:0"
+msgid "Fixed"
+msgstr "Fijo"
+
+msgctxt "selection:product.template,type:0"
+msgid "Consumable"
+msgstr "Consumible"
+
+msgctxt "selection:product.template,type:0"
+msgid "Service"
+msgstr "Servicios"
+
+msgctxt "selection:product.template,type:0"
+msgid "Stockable"
+msgstr "Almacenable"
+
+msgctxt "view:product.category:0"
+msgid "Children"
+msgstr "Hij at s"
+
+msgctxt "view:product.category:0"
+msgid "Product Categories"
+msgstr "CategorÃas de Producto"
+
+msgctxt "view:product.category:0"
+msgid "Product Category"
+msgstr "CategorÃa de Producto"
+
+msgctxt "view:product.product:0"
+msgid "General"
+msgstr "General"
+
+msgctxt "view:product.product:0"
+msgid "Product"
+msgstr "Producto"
+
+msgctxt "view:product.product:0"
+msgid "Product Suppliers"
+msgstr "Proveedores de Productos"
+
+msgctxt "view:product.product:0"
+msgid "Products"
+msgstr "Productos"
+
+msgctxt "view:product.template:0"
+msgid "General"
+msgstr "General"
+
+msgctxt "view:product.template:0"
+msgid "Product Template"
+msgstr "Plantilla de Producto"
+
+msgctxt "view:product.template:0"
+msgid "Product Templates"
+msgstr "Plantillas de Producto"
+
+msgctxt "view:product.uom.category:0"
+msgid "Categories of Unit of Measure"
+msgstr "CategorÃas de Unidad de Medida"
+
+msgctxt "view:product.uom.category:0"
+msgid "Category of Unit of Measure"
+msgstr "CategorÃa de unidad de Medida"
+
+msgctxt "view:product.uom:0"
+msgid "Unit of Measure"
+msgstr "Unidad de Medida"
+
+msgctxt "view:product.uom:0"
+msgid "Units of Measure"
+msgstr "Unidades de Medida"
diff --git a/locale/es_ES.po b/locale/es_ES.po
new file mode 100644
index 0000000..c32bb98
--- /dev/null
+++ b/locale/es_ES.po
@@ -0,0 +1,604 @@
+#
+msgid ""
+msgstr "Content-Type: text/plain; charset=utf-8\n"
+
+#, fuzzy
+msgctxt "error:product.category:0"
+msgid "You can not create recursive categories!"
+msgstr "No puede crear categorÃas recursivas"
+
+msgctxt "error:product.uom:0"
+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 "
+"desactivarla y crear una nueva."
+
+msgctxt "error:product.uom:0"
+msgid "Invalid Factor and Rate values!"
+msgstr ""
+
+msgctxt "error:product.uom:0"
+msgid "Rate and factor can not be both equal to zero."
+msgstr "Conversión y factor no pueden ser cero simultáneamente."
+
+msgctxt "error:product.uom:0"
+msgid "You cannot change Rate, Factor or Category on a Unit of Measure. "
+msgstr ""
+"No puede cambiar la conversión, el factor o la categorÃa de una unidad de "
+"medida."
+
+msgctxt "field:product.category,childs:0"
+msgid "Children"
+msgstr "Hijos"
+
+msgctxt "field:product.category,name:0"
+msgid "Name"
+msgstr "Nombre"
+
+msgctxt "field:product.category,parent:0"
+msgid "Parent"
+msgstr "Padre"
+
+msgctxt "field:product.category,rec_name:0"
+msgid "Name"
+msgstr "Nombre"
+
+msgctxt "field:product.product,code:0"
+msgid "Code"
+msgstr "Código"
+
+msgctxt "field:product.product,description:0"
+msgid "Description"
+msgstr "Descripción"
+
+msgctxt "field:product.product,rec_name:0"
+msgid "Name"
+msgstr "Nombre"
+
+msgctxt "field:product.product,template:0"
+msgid "Product Template"
+msgstr "Plantilla de producto"
+
+msgctxt "field:product.template,active:0"
+msgid "Active"
+msgstr "Activo"
+
+msgctxt "field:product.template,category:0"
+msgid "Category"
+msgstr "CategorÃa"
+
+msgctxt "field:product.template,cost_price:0"
+msgid "Cost Price"
+msgstr "Precio de coste"
+
+msgctxt "field:product.template,cost_price_method:0"
+msgid "Cost Method"
+msgstr "Método de coste"
+
+msgctxt "field:product.template,cost_price_uom:0"
+msgid "Cost Price"
+msgstr "Precio de coste"
+
+msgctxt "field:product.template,default_uom:0"
+msgid "Default UOM"
+msgstr "UdM predeterminada"
+
+msgctxt "field:product.template,list_price:0"
+msgid "List Price"
+msgstr "Precio de lista"
+
+msgctxt "field:product.template,list_price_uom:0"
+msgid "List Price"
+msgstr "Precio de lista"
+
+msgctxt "field:product.template,name:0"
+msgid "Name"
+msgstr "Nombre"
+
+msgctxt "field:product.template,products:0"
+msgid "Products"
+msgstr "Productos"
+
+msgctxt "field:product.template,rec_name:0"
+msgid "Name"
+msgstr "Nombre"
+
+msgctxt "field:product.template,type:0"
+msgid "Type"
+msgstr "Tipo"
+
+msgctxt "field:product.uom,active:0"
+msgid "Active"
+msgstr "Activo"
+
+msgctxt "field:product.uom,category:0"
+msgid "UOM Category"
+msgstr "CategorÃa de UdM"
+
+msgctxt "field:product.uom,digits:0"
+msgid "Display Digits"
+msgstr "Decimales a mostrar"
+
+msgctxt "field:product.uom,factor:0"
+msgid "Factor"
+msgstr "Factor"
+
+msgctxt "field:product.uom,name:0"
+msgid "Name"
+msgstr "Nombre"
+
+msgctxt "field:product.uom,rate:0"
+msgid "Rate"
+msgstr "Conversión"
+
+msgctxt "field:product.uom,rec_name:0"
+msgid "Name"
+msgstr "Nombre"
+
+msgctxt "field:product.uom,rounding:0"
+msgid "Rounding Precision"
+msgstr "Precisión de redondeo"
+
+msgctxt "field:product.uom,symbol:0"
+msgid "Symbol"
+msgstr "SÃmbolo"
+
+msgctxt "field:product.uom.category,name:0"
+msgid "Name"
+msgstr "Nombre"
+
+msgctxt "field:product.uom.category,rec_name:0"
+msgid "Name"
+msgstr "Nombre"
+
+msgctxt "field:product.uom.category,uoms:0"
+msgid "Unit of Measures"
+msgstr "Unidades de medidas"
+
+msgctxt "help:product.uom,factor:0"
+msgid ""
+"The coefficient for the formula:\n"
+"coef (base unit) = 1 (this unit)"
+msgstr ""
+"El coeficiente de la fórmula:\n"
+"coeficiente (unidad base) = 1 (esta unidad)"
+
+msgctxt "help:product.uom,rate:0"
+msgid ""
+"The coefficient for the formula:\n"
+"1 (base unit) = coef (this unit)"
+msgstr ""
+"El coeficiente de la fórmula:\n"
+"1 (unidad base) = coeficiente (esta unidad)"
+
+#, fuzzy
+msgctxt "model:ir.action,name:act_category_list"
+msgid "Categories"
+msgstr "CategorÃas"
+
+msgctxt "model:ir.action,name:act_category_tree"
+msgid "Categories"
+msgstr "CategorÃas"
+
+msgctxt "model:ir.action,name:act_product_by_category"
+msgid "Product by Category"
+msgstr "Producto por categorÃa"
+
+msgctxt "model:ir.action,name:act_product_form"
+msgid "Products"
+msgstr "Productos"
+
+msgctxt "model:ir.action,name:act_uom_category_form"
+msgid "Categories of Unit of Measure"
+msgstr "CategorÃas de la unidad de medida"
+
+msgctxt "model:ir.action,name:act_uom_form"
+msgid "Units of Measure"
+msgstr "Unidades de medida"
+
+#, fuzzy
+msgctxt "model:ir.ui.menu,name:menu_category_list"
+msgid "Categories"
+msgstr "CategorÃas"
+
+msgctxt "model:ir.ui.menu,name:menu_category_tree"
+msgid "Categories"
+msgstr "CategorÃas"
+
+msgctxt "model:ir.ui.menu,name:menu_main_product"
+msgid "Product"
+msgstr "Producto"
+
+msgctxt "model:ir.ui.menu,name:menu_product_product"
+msgid "Products"
+msgstr "Productos"
+
+msgctxt "model:ir.ui.menu,name:menu_uom_category_form"
+msgid "Categories"
+msgstr "CategorÃas"
+
+msgctxt "model:ir.ui.menu,name:menu_uom_form"
+msgid "Units of Measure"
+msgstr "Unidades de medida"
+
+msgctxt "model:product.category,name:0"
+msgid "Product Category"
+msgstr "CategorÃa de producto"
+
+msgctxt "model:product.product,name:0"
+msgid "Product"
+msgstr "Producto"
+
+msgctxt "model:product.template,name:0"
+msgid "Product Template"
+msgstr "Plantilla de producto"
+
+msgctxt "model:product.uom,name:0"
+msgid "Unit of measure"
+msgstr "Unidad de medida"
+
+msgctxt "model:product.uom,name:uom_are"
+msgid "Are"
+msgstr "Ãrea"
+
+msgctxt "model:product.uom,name:uom_carat"
+msgid "Carat"
+msgstr "Quilate"
+
+msgctxt "model:product.uom,name:uom_centimeter"
+msgid "centimeter"
+msgstr "centÃmetro"
+
+msgctxt "model:product.uom,name:uom_cubic_centimeter"
+msgid "Cubic centimeter"
+msgstr "CentÃmetro cúbico"
+
+msgctxt "model:product.uom,name:uom_cubic_foot"
+msgid "Cubic foot"
+msgstr "Pie cúbico"
+
+msgctxt "model:product.uom,name:uom_cubic_inch"
+msgid "Cubic inch"
+msgstr "Pulgada cúbica"
+
+msgctxt "model:product.uom,name:uom_cubic_meter"
+msgid "Cubic meter"
+msgstr "Metro cúbico"
+
+msgctxt "model:product.uom,name:uom_day"
+msgid "Day"
+msgstr "DÃa"
+
+msgctxt "model:product.uom,name:uom_foot"
+msgid "Foot"
+msgstr "Pie"
+
+msgctxt "model:product.uom,name:uom_gallon"
+msgid "Gallon"
+msgstr "Galón"
+
+msgctxt "model:product.uom,name:uom_gram"
+msgid "Gram"
+msgstr "Gramo"
+
+msgctxt "model:product.uom,name:uom_hectare"
+msgid "Hectare"
+msgstr "Hectárea"
+
+msgctxt "model:product.uom,name:uom_hour"
+msgid "Hour"
+msgstr "Hora"
+
+msgctxt "model:product.uom,name:uom_inch"
+msgid "Inch"
+msgstr "Pulgada"
+
+msgctxt "model:product.uom,name:uom_kilogram"
+msgid "Kilogram"
+msgstr "Kilogramo"
+
+msgctxt "model:product.uom,name:uom_kilometer"
+msgid "Kilometer"
+msgstr "Kilómetro"
+
+msgctxt "model:product.uom,name:uom_liter"
+msgid "Liter"
+msgstr "Litro"
+
+msgctxt "model:product.uom,name:uom_meter"
+msgid "Meter"
+msgstr "Metro"
+
+msgctxt "model:product.uom,name:uom_mile"
+msgid "Mile"
+msgstr "Milla"
+
+msgctxt "model:product.uom,name:uom_millimeter"
+msgid "Millimeter"
+msgstr "MilÃmetro"
+
+msgctxt "model:product.uom,name:uom_minute"
+msgid "Minute"
+msgstr "Minuto"
+
+msgctxt "model:product.uom,name:uom_ounce"
+msgid "Ounce"
+msgstr "Onza"
+
+msgctxt "model:product.uom,name:uom_pound"
+msgid "Pound"
+msgstr "Libra"
+
+msgctxt "model:product.uom,name:uom_second"
+msgid "Second"
+msgstr "Segundo"
+
+msgctxt "model:product.uom,name:uom_square_centimeter"
+msgid "Square centimeter"
+msgstr "CentÃmetro cuadrado"
+
+msgctxt "model:product.uom,name:uom_square_foot"
+msgid "Square foot"
+msgstr "Pie cuadrado"
+
+msgctxt "model:product.uom,name:uom_square_inch"
+msgid "Square inch"
+msgstr "Pulgada cuadrada"
+
+msgctxt "model:product.uom,name:uom_square_meter"
+msgid "Square meter"
+msgstr "Metro cuadrado"
+
+msgctxt "model:product.uom,name:uom_square_yard"
+msgid "Square yard"
+msgstr "Yarda cuadrada"
+
+msgctxt "model:product.uom,name:uom_unit"
+msgid "Unit"
+msgstr "Unidad"
+
+msgctxt "model:product.uom,name:uom_work_day"
+msgid "Work Day"
+msgstr "DÃa de trabajo"
+
+msgctxt "model:product.uom,name:uom_yard"
+msgid "Yard"
+msgstr "Yarda"
+
+msgctxt "model:product.uom,symbol:uom_are"
+msgid "a"
+msgstr "a"
+
+msgctxt "model:product.uom,symbol:uom_carat"
+msgid "c"
+msgstr "c"
+
+msgctxt "model:product.uom,symbol:uom_centimeter"
+msgid "cm"
+msgstr "cm"
+
+msgctxt "model:product.uom,symbol:uom_cubic_centimeter"
+msgid "cm³"
+msgstr "cm³"
+
+msgctxt "model:product.uom,symbol:uom_cubic_foot"
+msgid "ft³"
+msgstr "pie³"
+
+msgctxt "model:product.uom,symbol:uom_cubic_inch"
+msgid "in³"
+msgstr "pul³"
+
+msgctxt "model:product.uom,symbol:uom_cubic_meter"
+msgid "m³"
+msgstr "m³"
+
+msgctxt "model:product.uom,symbol:uom_day"
+msgid "d"
+msgstr "d"
+
+msgctxt "model:product.uom,symbol:uom_foot"
+msgid "ft"
+msgstr "pie"
+
+msgctxt "model:product.uom,symbol:uom_gallon"
+msgid "gal"
+msgstr "gal"
+
+msgctxt "model:product.uom,symbol:uom_gram"
+msgid "g"
+msgstr "g"
+
+msgctxt "model:product.uom,symbol:uom_hectare"
+msgid "ha"
+msgstr "ha"
+
+msgctxt "model:product.uom,symbol:uom_hour"
+msgid "h"
+msgstr "h"
+
+msgctxt "model:product.uom,symbol:uom_inch"
+msgid "in"
+msgstr "pul"
+
+msgctxt "model:product.uom,symbol:uom_kilogram"
+msgid "kg"
+msgstr "kg"
+
+msgctxt "model:product.uom,symbol:uom_kilometer"
+msgid "km"
+msgstr "km"
+
+msgctxt "model:product.uom,symbol:uom_liter"
+msgid "l"
+msgstr "l"
+
+msgctxt "model:product.uom,symbol:uom_meter"
+msgid "m"
+msgstr "m"
+
+msgctxt "model:product.uom,symbol:uom_mile"
+msgid "mi"
+msgstr "mi"
+
+msgctxt "model:product.uom,symbol:uom_millimeter"
+msgid "mm"
+msgstr "mm"
+
+msgctxt "model:product.uom,symbol:uom_minute"
+msgid "min"
+msgstr "min"
+
+msgctxt "model:product.uom,symbol:uom_ounce"
+msgid "oz"
+msgstr "oz"
+
+msgctxt "model:product.uom,symbol:uom_pound"
+msgid "lbs"
+msgstr "lbs"
+
+msgctxt "model:product.uom,symbol:uom_second"
+msgid "s"
+msgstr "s"
+
+msgctxt "model:product.uom,symbol:uom_square_centimeter"
+msgid "cm²"
+msgstr "cm²"
+
+msgctxt "model:product.uom,symbol:uom_square_foot"
+msgid "ft²"
+msgstr "pie²"
+
+msgctxt "model:product.uom,symbol:uom_square_inch"
+msgid "in²"
+msgstr "pul²"
+
+msgctxt "model:product.uom,symbol:uom_square_meter"
+msgid "m²"
+msgstr "m²"
+
+msgctxt "model:product.uom,symbol:uom_square_yard"
+msgid "yd²"
+msgstr "yd²"
+
+msgctxt "model:product.uom,symbol:uom_unit"
+msgid "u"
+msgstr "u"
+
+msgctxt "model:product.uom,symbol:uom_work_day"
+msgid "wd"
+msgstr "wd"
+
+msgctxt "model:product.uom,symbol:uom_yard"
+msgid "yd"
+msgstr "yd"
+
+msgctxt "model:product.uom.category,name:0"
+msgid "Product uom category"
+msgstr "CategorÃa de UdM de producto"
+
+msgctxt "model:product.uom.category,name:uom_cat_length"
+msgid "Length"
+msgstr "Longitud"
+
+msgctxt "model:product.uom.category,name:uom_cat_surface"
+msgid "Surface"
+msgstr "Superficie"
+
+msgctxt "model:product.uom.category,name:uom_cat_time"
+msgid "Time"
+msgstr "Tiempo"
+
+msgctxt "model:product.uom.category,name:uom_cat_unit"
+msgid "Units"
+msgstr "Unidades"
+
+msgctxt "model:product.uom.category,name:uom_cat_volume"
+msgid "Volume"
+msgstr "Volumen"
+
+msgctxt "model:product.uom.category,name:uom_cat_weight"
+msgid "Weight"
+msgstr "Peso"
+
+msgctxt "model:res.group,name:group_product_admin"
+msgid "Product Administration"
+msgstr "Administración de productos"
+
+msgctxt "selection:product.template,cost_price_method:0"
+msgid "Average"
+msgstr "Promedio"
+
+msgctxt "selection:product.template,cost_price_method:0"
+msgid "Fixed"
+msgstr "Fijo"
+
+msgctxt "selection:product.template,type:0"
+msgid "Consumable"
+msgstr "Consumible"
+
+msgctxt "selection:product.template,type:0"
+msgid "Service"
+msgstr "Servicio"
+
+msgctxt "selection:product.template,type:0"
+msgid "Stockable"
+msgstr "Almacenable"
+
+msgctxt "view:product.category:0"
+msgid "Children"
+msgstr "Hijos"
+
+msgctxt "view:product.category:0"
+msgid "Product Categories"
+msgstr "CategorÃas de producto"
+
+msgctxt "view:product.category:0"
+msgid "Product Category"
+msgstr "CategorÃa de producto"
+
+msgctxt "view:product.product:0"
+msgid "General"
+msgstr "General"
+
+msgctxt "view:product.product:0"
+msgid "Product"
+msgstr "Producto"
+
+msgctxt "view:product.product:0"
+msgid "Product Suppliers"
+msgstr "Proveedores de productos"
+
+msgctxt "view:product.product:0"
+msgid "Products"
+msgstr "Productos"
+
+msgctxt "view:product.template:0"
+msgid "General"
+msgstr "General"
+
+msgctxt "view:product.template:0"
+msgid "Product Template"
+msgstr "Plantilla de producto"
+
+msgctxt "view:product.template:0"
+msgid "Product Templates"
+msgstr "Plantillas de producto"
+
+msgctxt "view:product.uom.category:0"
+msgid "Categories of Unit of Measure"
+msgstr "CategorÃas de unidades de medida"
+
+msgctxt "view:product.uom.category:0"
+msgid "Category of Unit of Measure"
+msgstr "CategorÃa de unidad de medida"
+
+msgctxt "view:product.uom:0"
+msgid "Unit of Measure"
+msgstr "Unidad de medida"
+
+msgctxt "view:product.uom:0"
+msgid "Units of Measure"
+msgstr "Unidades de medida"
diff --git a/locale/fr_FR.po b/locale/fr_FR.po
new file mode 100644
index 0000000..56c2a80
--- /dev/null
+++ b/locale/fr_FR.po
@@ -0,0 +1,613 @@
+#
+msgid ""
+msgstr "Content-Type: text/plain; charset=utf-8\n"
+
+msgctxt "error:product.category:0"
+msgid "You can not create recursive categories!"
+msgstr "Vous ne pouvez pas créer des catégories récursives !"
+
+msgctxt "error:product.template:0"
+msgid ""
+"You cannot change the default uom for a product which is associated to stock"
+" moves."
+msgstr ""
+"Vous ne pouvez pas changer l'UDM par défaut pour un produit qui a déjà fait "
+"l'objet de mouvements de stock"
+
+msgctxt "error:product.uom:0"
+msgid ""
+"If the UOM is still not used, you can delete it otherwise you can deactivate"
+" it and create a new one."
+msgstr ""
+"Si l'UDM n'est pas utilisée, vous pouvez la supprimer, sinon vous pouvez la "
+"désactiver et en créer une nouvelle."
+
+msgctxt "error:product.uom:0"
+msgid "Invalid Factor and Rate values!"
+msgstr "Valeurs de facteur et de taux invalides !"
+
+msgctxt "error:product.uom:0"
+msgid "Rate and factor can not be both equal to zero."
+msgstr "Le taux et le facteur ne peuvent pas être égaux à zéro."
+
+msgctxt "error:product.uom:0"
+msgid "You cannot change Rate, Factor or Category on a Unit of Measure. "
+msgstr ""
+"Vous ne pouvez pas changer le taux, le facteur ou la catégorie d'une unité "
+"de mesure."
+
+msgctxt "field:product.category,childs:0"
+msgid "Children"
+msgstr "Enfants"
+
+msgctxt "field:product.category,name:0"
+msgid "Name"
+msgstr "Nom"
+
+msgctxt "field:product.category,parent:0"
+msgid "Parent"
+msgstr "Parent"
+
+msgctxt "field:product.category,rec_name:0"
+msgid "Name"
+msgstr "Nom"
+
+msgctxt "field:product.product,code:0"
+msgid "Code"
+msgstr "Code"
+
+msgctxt "field:product.product,description:0"
+msgid "Description"
+msgstr "Description"
+
+msgctxt "field:product.product,rec_name:0"
+msgid "Name"
+msgstr "Nom"
+
+msgctxt "field:product.product,template:0"
+msgid "Product Template"
+msgstr "Modèle produit"
+
+msgctxt "field:product.template,active:0"
+msgid "Active"
+msgstr "Actif"
+
+msgctxt "field:product.template,category:0"
+msgid "Category"
+msgstr "Catégorie"
+
+msgctxt "field:product.template,cost_price:0"
+msgid "Cost Price"
+msgstr "Prix de revient"
+
+msgctxt "field:product.template,cost_price_method:0"
+msgid "Cost Method"
+msgstr "Méthode de coût"
+
+msgctxt "field:product.template,cost_price_uom:0"
+msgid "Cost Price"
+msgstr "Prix de revient"
+
+msgctxt "field:product.template,default_uom:0"
+msgid "Default UOM"
+msgstr "UDM par défaut"
+
+msgctxt "field:product.template,list_price:0"
+msgid "List Price"
+msgstr "Prix listé"
+
+msgctxt "field:product.template,list_price_uom:0"
+msgid "List Price"
+msgstr "Prix listé"
+
+msgctxt "field:product.template,name:0"
+msgid "Name"
+msgstr "Nom"
+
+msgctxt "field:product.template,products:0"
+msgid "Products"
+msgstr "Produits"
+
+msgctxt "field:product.template,rec_name:0"
+msgid "Name"
+msgstr "Nom"
+
+msgctxt "field:product.template,type:0"
+msgid "Type"
+msgstr "Type"
+
+msgctxt "field:product.uom,active:0"
+msgid "Active"
+msgstr "Actif"
+
+msgctxt "field:product.uom,category:0"
+msgid "UOM Category"
+msgstr "Catégorie d'UDM"
+
+msgctxt "field:product.uom,digits:0"
+msgid "Display Digits"
+msgstr "Décimales affichées"
+
+msgctxt "field:product.uom,factor:0"
+msgid "Factor"
+msgstr "Facteur"
+
+msgctxt "field:product.uom,name:0"
+msgid "Name"
+msgstr "Nom"
+
+msgctxt "field:product.uom,rate:0"
+msgid "Rate"
+msgstr "Taux"
+
+msgctxt "field:product.uom,rec_name:0"
+msgid "Name"
+msgstr "Nom"
+
+msgctxt "field:product.uom,rounding:0"
+msgid "Rounding Precision"
+msgstr "Précision d'arrondi"
+
+msgctxt "field:product.uom,symbol:0"
+msgid "Symbol"
+msgstr "Symbole"
+
+msgctxt "field:product.uom.category,name:0"
+msgid "Name"
+msgstr "Nom"
+
+msgctxt "field:product.uom.category,rec_name:0"
+msgid "Name"
+msgstr "Nom"
+
+msgctxt "field:product.uom.category,uoms:0"
+msgid "Unit of Measures"
+msgstr "Unité de mesure"
+
+msgctxt "help:product.uom,factor:0"
+msgid ""
+"The coefficient for the formula:\n"
+"coef (base unit) = 1 (this unit)"
+msgstr ""
+"Le coefficient pour la formule:\n"
+"coef (unité de base) = 1 (cette unité)"
+
+msgctxt "help:product.uom,rate:0"
+msgid ""
+"The coefficient for the formula:\n"
+"1 (base unit) = coef (this unit)"
+msgstr ""
+"Le coefficient pour la formule:\n"
+"1 (unité de base) = coef (cette unité)"
+
+msgctxt "model:ir.action,name:act_category_list"
+msgid "Categories"
+msgstr "Catégories"
+
+msgctxt "model:ir.action,name:act_category_tree"
+msgid "Categories"
+msgstr "Catégories"
+
+msgctxt "model:ir.action,name:act_product_by_category"
+msgid "Product by Category"
+msgstr "Produits par catégories"
+
+msgctxt "model:ir.action,name:act_product_form"
+msgid "Products"
+msgstr "Produits"
+
+msgctxt "model:ir.action,name:act_uom_category_form"
+msgid "Categories of Unit of Measure"
+msgstr "Catégories d'unité de mesure"
+
+msgctxt "model:ir.action,name:act_uom_form"
+msgid "Units of Measure"
+msgstr "Unités de mesure"
+
+msgctxt "model:ir.ui.menu,name:menu_category_list"
+msgid "Categories"
+msgstr "Catégories"
+
+msgctxt "model:ir.ui.menu,name:menu_category_tree"
+msgid "Categories"
+msgstr "Catégories"
+
+msgctxt "model:ir.ui.menu,name:menu_main_product"
+msgid "Product"
+msgstr "Produit"
+
+msgctxt "model:ir.ui.menu,name:menu_product_product"
+msgid "Products"
+msgstr "Produits"
+
+msgctxt "model:ir.ui.menu,name:menu_uom_category_form"
+msgid "Categories"
+msgstr "Catégories"
+
+msgctxt "model:ir.ui.menu,name:menu_uom_form"
+msgid "Units of Measure"
+msgstr "Unités de mesure"
+
+msgctxt "model:product.category,name:0"
+msgid "Product Category"
+msgstr "Catégorie de produit"
+
+msgctxt "model:product.product,name:0"
+msgid "Product"
+msgstr "Produit"
+
+msgctxt "model:product.template,name:0"
+msgid "Product Template"
+msgstr "Modèle produit"
+
+msgctxt "model:product.uom,name:0"
+msgid "Unit of measure"
+msgstr "Unité de mesure"
+
+msgctxt "model:product.uom,name:uom_are"
+msgid "Are"
+msgstr "Are"
+
+msgctxt "model:product.uom,name:uom_carat"
+msgid "Carat"
+msgstr "Carat"
+
+msgctxt "model:product.uom,name:uom_centimeter"
+msgid "centimeter"
+msgstr "Centimètre"
+
+msgctxt "model:product.uom,name:uom_cubic_centimeter"
+msgid "Cubic centimeter"
+msgstr "Centimètre cube"
+
+msgctxt "model:product.uom,name:uom_cubic_foot"
+msgid "Cubic foot"
+msgstr "Pied cubique"
+
+msgctxt "model:product.uom,name:uom_cubic_inch"
+msgid "Cubic inch"
+msgstr "Pouce cubique"
+
+msgctxt "model:product.uom,name:uom_cubic_meter"
+msgid "Cubic meter"
+msgstr "Mètre cube"
+
+msgctxt "model:product.uom,name:uom_day"
+msgid "Day"
+msgstr "Jour"
+
+msgctxt "model:product.uom,name:uom_foot"
+msgid "Foot"
+msgstr "Pied"
+
+msgctxt "model:product.uom,name:uom_gallon"
+msgid "Gallon"
+msgstr "Gallon"
+
+msgctxt "model:product.uom,name:uom_gram"
+msgid "Gram"
+msgstr "Gram"
+
+msgctxt "model:product.uom,name:uom_hectare"
+msgid "Hectare"
+msgstr "Hectare"
+
+msgctxt "model:product.uom,name:uom_hour"
+msgid "Hour"
+msgstr "Heure"
+
+msgctxt "model:product.uom,name:uom_inch"
+msgid "Inch"
+msgstr "Pouce"
+
+msgctxt "model:product.uom,name:uom_kilogram"
+msgid "Kilogram"
+msgstr "Kilogramme"
+
+msgctxt "model:product.uom,name:uom_kilometer"
+msgid "Kilometer"
+msgstr "Kilomètre"
+
+msgctxt "model:product.uom,name:uom_liter"
+msgid "Liter"
+msgstr "Litre"
+
+msgctxt "model:product.uom,name:uom_meter"
+msgid "Meter"
+msgstr "Mètre"
+
+msgctxt "model:product.uom,name:uom_mile"
+msgid "Mile"
+msgstr "Mille"
+
+msgctxt "model:product.uom,name:uom_millimeter"
+msgid "Millimeter"
+msgstr "Millimètre"
+
+msgctxt "model:product.uom,name:uom_minute"
+msgid "Minute"
+msgstr "Minute"
+
+msgctxt "model:product.uom,name:uom_ounce"
+msgid "Ounce"
+msgstr "Once"
+
+msgctxt "model:product.uom,name:uom_pound"
+msgid "Pound"
+msgstr "Livre"
+
+msgctxt "model:product.uom,name:uom_second"
+msgid "Second"
+msgstr "Seconde"
+
+msgctxt "model:product.uom,name:uom_square_centimeter"
+msgid "Square centimeter"
+msgstr "Centimètre carré"
+
+msgctxt "model:product.uom,name:uom_square_foot"
+msgid "Square foot"
+msgstr "Pied carré"
+
+msgctxt "model:product.uom,name:uom_square_inch"
+msgid "Square inch"
+msgstr "Pouce carré"
+
+msgctxt "model:product.uom,name:uom_square_meter"
+msgid "Square meter"
+msgstr "Mètre carré"
+
+msgctxt "model:product.uom,name:uom_square_yard"
+msgid "Square yard"
+msgstr "Yard carré"
+
+msgctxt "model:product.uom,name:uom_unit"
+msgid "Unit"
+msgstr "Unité"
+
+msgctxt "model:product.uom,name:uom_work_day"
+msgid "Work Day"
+msgstr "Jour de travail"
+
+msgctxt "model:product.uom,name:uom_yard"
+msgid "Yard"
+msgstr "Yard"
+
+msgctxt "model:product.uom,symbol:uom_are"
+msgid "a"
+msgstr "un"
+
+msgctxt "model:product.uom,symbol:uom_carat"
+msgid "c"
+msgstr "c"
+
+msgctxt "model:product.uom,symbol:uom_centimeter"
+msgid "cm"
+msgstr "cm"
+
+msgctxt "model:product.uom,symbol:uom_cubic_centimeter"
+msgid "cm³"
+msgstr "cm ³"
+
+msgctxt "model:product.uom,symbol:uom_cubic_foot"
+msgid "ft³"
+msgstr "ft ³"
+
+msgctxt "model:product.uom,symbol:uom_cubic_inch"
+msgid "in³"
+msgstr "in ³"
+
+msgctxt "model:product.uom,symbol:uom_cubic_meter"
+msgid "m³"
+msgstr "m³"
+
+msgctxt "model:product.uom,symbol:uom_day"
+msgid "d"
+msgstr "d"
+
+msgctxt "model:product.uom,symbol:uom_foot"
+msgid "ft"
+msgstr "p"
+
+msgctxt "model:product.uom,symbol:uom_gallon"
+msgid "gal"
+msgstr "gal"
+
+msgctxt "model:product.uom,symbol:uom_gram"
+msgid "g"
+msgstr "g"
+
+msgctxt "model:product.uom,symbol:uom_hectare"
+msgid "ha"
+msgstr "ha"
+
+msgctxt "model:product.uom,symbol:uom_hour"
+msgid "h"
+msgstr "h"
+
+msgctxt "model:product.uom,symbol:uom_inch"
+msgid "in"
+msgstr "in"
+
+msgctxt "model:product.uom,symbol:uom_kilogram"
+msgid "kg"
+msgstr "kg"
+
+msgctxt "model:product.uom,symbol:uom_kilometer"
+msgid "km"
+msgstr "km"
+
+msgctxt "model:product.uom,symbol:uom_liter"
+msgid "l"
+msgstr "l"
+
+msgctxt "model:product.uom,symbol:uom_meter"
+msgid "m"
+msgstr "m"
+
+msgctxt "model:product.uom,symbol:uom_mile"
+msgid "mi"
+msgstr "mi"
+
+msgctxt "model:product.uom,symbol:uom_millimeter"
+msgid "mm"
+msgstr "mm"
+
+msgctxt "model:product.uom,symbol:uom_minute"
+msgid "min"
+msgstr "min"
+
+msgctxt "model:product.uom,symbol:uom_ounce"
+msgid "oz"
+msgstr "oz"
+
+msgctxt "model:product.uom,symbol:uom_pound"
+msgid "lbs"
+msgstr "lbs"
+
+msgctxt "model:product.uom,symbol:uom_second"
+msgid "s"
+msgstr "s"
+
+msgctxt "model:product.uom,symbol:uom_square_centimeter"
+msgid "cm²"
+msgstr "cm ²"
+
+msgctxt "model:product.uom,symbol:uom_square_foot"
+msgid "ft²"
+msgstr "pi ²"
+
+msgctxt "model:product.uom,symbol:uom_square_inch"
+msgid "in²"
+msgstr "in ²"
+
+msgctxt "model:product.uom,symbol:uom_square_meter"
+msgid "m²"
+msgstr "m²"
+
+msgctxt "model:product.uom,symbol:uom_square_yard"
+msgid "yd²"
+msgstr "yd ²"
+
+msgctxt "model:product.uom,symbol:uom_unit"
+msgid "u"
+msgstr "u"
+
+msgctxt "model:product.uom,symbol:uom_work_day"
+msgid "wd"
+msgstr "wd"
+
+msgctxt "model:product.uom,symbol:uom_yard"
+msgid "yd"
+msgstr "yd"
+
+msgctxt "model:product.uom.category,name:0"
+msgid "Product uom category"
+msgstr "Catégorie d'UDM de produit"
+
+msgctxt "model:product.uom.category,name:uom_cat_length"
+msgid "Length"
+msgstr "Longueur"
+
+msgctxt "model:product.uom.category,name:uom_cat_surface"
+msgid "Surface"
+msgstr "Surface"
+
+msgctxt "model:product.uom.category,name:uom_cat_time"
+msgid "Time"
+msgstr "Heure"
+
+msgctxt "model:product.uom.category,name:uom_cat_unit"
+msgid "Units"
+msgstr "Unités"
+
+msgctxt "model:product.uom.category,name:uom_cat_volume"
+msgid "Volume"
+msgstr "Volume"
+
+msgctxt "model:product.uom.category,name:uom_cat_weight"
+msgid "Weight"
+msgstr "Poids"
+
+msgctxt "model:res.group,name:group_product_admin"
+msgid "Product Administration"
+msgstr "Administration de produits"
+
+msgctxt "selection:product.template,cost_price_method:0"
+msgid "Average"
+msgstr "Moyen"
+
+msgctxt "selection:product.template,cost_price_method:0"
+msgid "Fixed"
+msgstr "Fixe"
+
+msgctxt "selection:product.template,type:0"
+msgid "Consumable"
+msgstr "Consommable"
+
+msgctxt "selection:product.template,type:0"
+msgid "Service"
+msgstr "Service"
+
+msgctxt "selection:product.template,type:0"
+msgid "Stockable"
+msgstr "Stockable"
+
+msgctxt "view:product.category:0"
+msgid "Children"
+msgstr "Enfants"
+
+msgctxt "view:product.category:0"
+msgid "Product Categories"
+msgstr "Catégories de produit"
+
+msgctxt "view:product.category:0"
+msgid "Product Category"
+msgstr "Catégorie de produit"
+
+msgctxt "view:product.category:0"
+msgid "Properties"
+msgstr "Propriétés"
+
+msgctxt "view:product.product:0"
+msgid "General"
+msgstr "Général"
+
+msgctxt "view:product.product:0"
+msgid "Product"
+msgstr "Produit"
+
+msgctxt "view:product.product:0"
+msgid "Products"
+msgstr "Produits"
+
+msgctxt "view:product.product:0"
+msgid "Properties"
+msgstr "Propriétés"
+
+msgctxt "view:product.template:0"
+msgid "General"
+msgstr "Général"
+
+msgctxt "view:product.template:0"
+msgid "Product Template"
+msgstr "Modèle produit"
+
+msgctxt "view:product.template:0"
+msgid "Product Templates"
+msgstr "Modèles de produit"
+
+msgctxt "view:product.uom.category:0"
+msgid "Categories of Unit of Measure"
+msgstr "Catégories d'Unité de mesure"
+
+msgctxt "view:product.uom.category:0"
+msgid "Category of Unit of Measure"
+msgstr "Catégorie d'unité de mesure"
+
+msgctxt "view:product.uom:0"
+msgid "Unit of Measure"
+msgstr "Unité de mesure"
+
+msgctxt "view:product.uom:0"
+msgid "Units of Measure"
+msgstr "Unités de mesure"
diff --git a/locale/nl_NL.po b/locale/nl_NL.po
new file mode 100644
index 0000000..97a5410
--- /dev/null
+++ b/locale/nl_NL.po
@@ -0,0 +1,746 @@
+#
+msgid ""
+msgstr "Content-Type: text/plain; charset=utf-8\n"
+
+#, fuzzy
+msgctxt "error:product.category:0"
+msgid "You can not create recursive categories!"
+msgstr "U kunt geen recursieve categorieën aanmaken!"
+
+msgctxt "error:product.template:0"
+msgid "There is no account expense/revenue defined on the product %s (%d)"
+msgstr ""
+"Er is geen kosten-/opbrengstenrekening gedefinieerd voor product %s (%d)"
+
+msgctxt "error:product.uom:0"
+msgid ""
+"If the UOM is still not used, you can delete it otherwise you can deactivate"
+" it and create a new one."
+msgstr ""
+"Als de maateenheid nog niet is gebruikt kan je hem verwijderen, anders kan "
+"je hem deactiveren en een nieuwe aanmaken."
+
+msgctxt "error:product.uom:0"
+msgid "Invalid Factor and Rate values!"
+msgstr "Ongeldige factor en verhouding waarden"
+
+msgctxt "error:product.uom:0"
+msgid "Rate and factor can not be both equal to zero."
+msgstr "Verhouding en factor kunnen niet beiden nul zijn! "
+
+msgctxt "error:product.uom:0"
+msgid "You cannot change Rate, Factor or Category on a Unit of Measure. "
+msgstr ""
+"U kunt Verhouding, Factor of Categorie van een maateenheid niet wijzigen."
+
+msgctxt "field:product.category,account_expense:0"
+msgid "Account Expense"
+msgstr "Kostenrekening"
+
+msgctxt "field:product.category,account_revenue:0"
+msgid "Account Revenue"
+msgstr "Opbrengstrekening"
+
+msgctxt "field:product.category,childs:0"
+msgid "Children"
+msgstr "Onderliggende niveaus"
+
+msgctxt "field:product.category,customer_taxes:0"
+msgid "Customer Taxes"
+msgstr "Belasting klanten"
+
+msgctxt "field:product.category,name:0"
+msgid "Name"
+msgstr "Naam"
+
+msgctxt "field:product.category,parent:0"
+msgid "Parent"
+msgstr "Bovenliggend niveau"
+
+msgctxt "field:product.category,rec_name:0"
+msgid "Name"
+msgstr "Naam"
+
+msgctxt "field:product.category,supplier_taxes:0"
+msgid "Supplier Taxes"
+msgstr "Belastingen inkoop"
+
+msgctxt "field:product.category-customer-account.tax,category:0"
+msgid "Category"
+msgstr "Categorie"
+
+msgctxt "field:product.category-customer-account.tax,rec_name:0"
+msgid "Name"
+msgstr "Naam"
+
+msgctxt "field:product.category-customer-account.tax,tax:0"
+msgid "Tax"
+msgstr "Belasting"
+
+msgctxt "field:product.category-supplier-account.tax,category:0"
+msgid "Category"
+msgstr "Categorie"
+
+msgctxt "field:product.category-supplier-account.tax,rec_name:0"
+msgid "Name"
+msgstr "Naam"
+
+msgctxt "field:product.category-supplier-account.tax,tax:0"
+msgid "Tax"
+msgstr "Belasting"
+
+msgctxt "field:product.product,code:0"
+msgid "Code"
+msgstr "Code"
+
+msgctxt "field:product.product,description:0"
+msgid "Description"
+msgstr "Omschrijving"
+
+msgctxt "field:product.product,rec_name:0"
+msgid "Name"
+msgstr "Naam"
+
+msgctxt "field:product.product,template:0"
+msgid "Product Template"
+msgstr "Productsjabloon"
+
+msgctxt "field:product.template,account_category:0"
+msgid "Use Category's accounts"
+msgstr "Gebruik de rekeningen van de categorie"
+
+msgctxt "field:product.template,account_expense:0"
+msgid "Account Expense"
+msgstr "Kostenrekening"
+
+msgctxt "field:product.template,account_expense_used:0"
+msgid "Account Expense Used"
+msgstr "Gebruikte kostenrekening"
+
+msgctxt "field:product.template,account_revenue:0"
+msgid "Account Revenue"
+msgstr "Opbrengstrekening"
+
+msgctxt "field:product.template,account_revenue_used:0"
+msgid "Account Revenue Used"
+msgstr "Opbrengstrekening gebruikt"
+
+msgctxt "field:product.template,active:0"
+msgid "Active"
+msgstr "Actief"
+
+msgctxt "field:product.template,category:0"
+msgid "Category"
+msgstr "Categorie"
+
+msgctxt "field:product.template,cost_price:0"
+msgid "Cost Price"
+msgstr "Kostprijs"
+
+msgctxt "field:product.template,cost_price_method:0"
+msgid "Cost Method"
+msgstr "Kostprijsmethode"
+
+msgctxt "field:product.template,cost_price_uom:0"
+msgid "Cost Price"
+msgstr "Kostprijs"
+
+msgctxt "field:product.template,customer_taxes:0"
+msgid "Customer Taxes"
+msgstr "Belasting klanten"
+
+msgctxt "field:product.template,customer_taxes_used:0"
+msgid "Customer Taxes Used"
+msgstr "Belasting klanten gebruikt"
+
+msgctxt "field:product.template,default_uom:0"
+msgid "Default UOM"
+msgstr "Standaard ME"
+
+msgctxt "field:product.template,list_price:0"
+msgid "List Price"
+msgstr "Catalogusprijs"
+
+msgctxt "field:product.template,list_price_uom:0"
+msgid "List Price"
+msgstr "Catalogusprijs"
+
+msgctxt "field:product.template,name:0"
+msgid "Name"
+msgstr "Naam"
+
+msgctxt "field:product.template,products:0"
+msgid "Products"
+msgstr "Producten"
+
+msgctxt "field:product.template,rec_name:0"
+msgid "Name"
+msgstr "Naam"
+
+msgctxt "field:product.template,supplier_taxes:0"
+msgid "Supplier Taxes"
+msgstr "Belastingen inkoop"
+
+msgctxt "field:product.template,supplier_taxes_used:0"
+msgid "Customer Taxes Used"
+msgstr "Belasting klanten gebruikt"
+
+msgctxt "field:product.template,taxes_category:0"
+msgid "Use Category's Taxes"
+msgstr "Gebruik de belastingen van de categorie"
+
+msgctxt "field:product.template,type:0"
+msgid "Type"
+msgstr "Type"
+
+msgctxt "field:product.template-customer-account.tax,product:0"
+msgid "Product Template"
+msgstr "Productsjabloon"
+
+msgctxt "field:product.template-customer-account.tax,rec_name:0"
+msgid "Name"
+msgstr "Naam"
+
+msgctxt "field:product.template-customer-account.tax,tax:0"
+msgid "Tax"
+msgstr "Belasting"
+
+msgctxt "field:product.template-supplier-account.tax,product:0"
+msgid "Product Template"
+msgstr "Productsjabloon"
+
+msgctxt "field:product.template-supplier-account.tax,rec_name:0"
+msgid "Name"
+msgstr "Naam"
+
+msgctxt "field:product.template-supplier-account.tax,tax:0"
+msgid "Tax"
+msgstr "Belasting"
+
+msgctxt "field:product.uom,active:0"
+msgid "Active"
+msgstr "Actief"
+
+msgctxt "field:product.uom,category:0"
+msgid "UOM Category"
+msgstr "ME categorie"
+
+msgctxt "field:product.uom,digits:0"
+msgid "Display Digits"
+msgstr "Zichtbare decimalen"
+
+msgctxt "field:product.uom,factor:0"
+msgid "Factor"
+msgstr "Faktor"
+
+msgctxt "field:product.uom,name:0"
+msgid "Name"
+msgstr "Naam"
+
+msgctxt "field:product.uom,rate:0"
+msgid "Rate"
+msgstr "Verhouding"
+
+msgctxt "field:product.uom,rec_name:0"
+msgid "Name"
+msgstr "Naam"
+
+msgctxt "field:product.uom,rounding:0"
+msgid "Rounding Precision"
+msgstr "Afronding"
+
+msgctxt "field:product.uom,symbol:0"
+msgid "Symbol"
+msgstr "Symbool"
+
+msgctxt "field:product.uom.category,name:0"
+msgid "Name"
+msgstr "Naam"
+
+msgctxt "field:product.uom.category,rec_name:0"
+msgid "Name"
+msgstr "Naam"
+
+msgctxt "field:product.uom.category,uoms:0"
+msgid "Unit of Measures"
+msgstr "Meeteenheid"
+
+msgctxt "help:product.template,account_category:0"
+msgid "Use the accounts defined on the category"
+msgstr "Gebruik de rekeningen van de categorie"
+
+msgctxt "help:product.template,account_expense:0"
+msgid "This account will be used instead of the one defined on the category."
+msgstr ""
+"Deze rekening zal gebruikt worden in de plaats van die van de categorie."
+
+msgctxt "help:product.template,account_revenue:0"
+msgid "This account will be used instead of the one defined on the category."
+msgstr ""
+"Deze rekening zal gebruikt worden in de plaats van die van de categorie."
+
+msgctxt "help:product.template,taxes_category:0"
+msgid "Use the taxes defined on the category"
+msgstr "Gebruik de belastingen van de categorie"
+
+msgctxt "help:product.uom,factor:0"
+msgid ""
+"The coefficient for the formula:\n"
+"coef (base unit) = 1 (this unit)"
+msgstr ""
+"De coëfficiënt voor deze formule:\n"
+"coëf (basiseenheid) = 1 (deze eenheid)"
+
+msgctxt "help:product.uom,rate:0"
+msgid ""
+"The coefficient for the formula:\n"
+"1 (base unit) = coef (this unit)"
+msgstr ""
+"De coëfficiënt voor deze formule:\n"
+"1(basiseenheid) = coëf (deze eenheid)"
+
+#, fuzzy
+msgctxt "model:ir.action,name:act_category_list"
+msgid "Categories"
+msgstr "Categorieën"
+
+msgctxt "model:ir.action,name:act_category_tree"
+msgid "Categories"
+msgstr "Categorieën"
+
+msgctxt "model:ir.action,name:act_product_by_category"
+msgid "Product by Category"
+msgstr "Product per categorie"
+
+msgctxt "model:ir.action,name:act_product_form"
+msgid "Products"
+msgstr "Producten"
+
+msgctxt "model:ir.action,name:act_uom_category_form"
+msgid "Categories of Unit of Measure"
+msgstr "Categorieën van meeteenheden"
+
+msgctxt "model:ir.action,name:act_uom_form"
+msgid "Units of Measure"
+msgstr "Meeteenheden"
+
+#, fuzzy
+msgctxt "model:ir.ui.menu,name:menu_category_list"
+msgid "Categories"
+msgstr "Categorieën"
+
+msgctxt "model:ir.ui.menu,name:menu_category_tree"
+msgid "Categories"
+msgstr "Categorieën"
+
+msgctxt "model:ir.ui.menu,name:menu_main_product"
+msgid "Product"
+msgstr "Productbeheer"
+
+msgctxt "model:ir.ui.menu,name:menu_product_product"
+msgid "Products"
+msgstr "Producten"
+
+msgctxt "model:ir.ui.menu,name:menu_uom_category_form"
+msgid "Categories"
+msgstr "Categorieën"
+
+msgctxt "model:ir.ui.menu,name:menu_uom_form"
+msgid "Units of Measure"
+msgstr "Meeteenheden"
+
+msgctxt "model:product.category,name:0"
+msgid "Product Category"
+msgstr "Product categorie"
+
+msgctxt "model:product.category-customer-account.tax,name:0"
+msgid "Category - Customer Tax"
+msgstr "Categorie - belasting klant"
+
+msgctxt "model:product.category-supplier-account.tax,name:0"
+msgid "Category - Supplier Tax"
+msgstr "Categorie - belasting leverancier"
+
+msgctxt "model:product.product,name:0"
+msgid "Product"
+msgstr "Product"
+
+msgctxt "model:product.template,name:0"
+msgid "Product Template"
+msgstr "Productsjabloon"
+
+msgctxt "model:product.template-customer-account.tax,name:0"
+msgid "Product Template - Customer Tax"
+msgstr "Productsjabloon - Belasting verkoop"
+
+msgctxt "model:product.template-supplier-account.tax,name:0"
+msgid "Product Template - Supplier Tax"
+msgstr "Productsjabloon - Belasting inkoop"
+
+msgctxt "model:product.uom,name:0"
+msgid "Unit of measure"
+msgstr "Meeteenheid"
+
+msgctxt "model:product.uom,name:uom_are"
+msgid "Are"
+msgstr "Are"
+
+msgctxt "model:product.uom,name:uom_carat"
+msgid "Carat"
+msgstr "Karaat"
+
+msgctxt "model:product.uom,name:uom_centimeter"
+msgid "centimeter"
+msgstr "centimeter"
+
+msgctxt "model:product.uom,name:uom_cubic_centimeter"
+msgid "Cubic centimeter"
+msgstr "Kubieke centimeter"
+
+msgctxt "model:product.uom,name:uom_cubic_foot"
+msgid "Cubic foot"
+msgstr ""
+
+msgctxt "model:product.uom,name:uom_cubic_inch"
+msgid "Cubic inch"
+msgstr ""
+
+msgctxt "model:product.uom,name:uom_cubic_meter"
+msgid "Cubic meter"
+msgstr "Kubieke meter"
+
+msgctxt "model:product.uom,name:uom_day"
+msgid "Day"
+msgstr "Dag"
+
+msgctxt "model:product.uom,name:uom_foot"
+msgid "Foot"
+msgstr "Voet"
+
+msgctxt "model:product.uom,name:uom_gallon"
+msgid "Gallon"
+msgstr ""
+
+msgctxt "model:product.uom,name:uom_gram"
+msgid "Gram"
+msgstr "Gram"
+
+msgctxt "model:product.uom,name:uom_hectare"
+msgid "Hectare"
+msgstr "Hectare"
+
+msgctxt "model:product.uom,name:uom_hour"
+msgid "Hour"
+msgstr "Uur"
+
+msgctxt "model:product.uom,name:uom_inch"
+msgid "Inch"
+msgstr ""
+
+msgctxt "model:product.uom,name:uom_kilogram"
+msgid "Kilogram"
+msgstr "Kilogram"
+
+msgctxt "model:product.uom,name:uom_kilometer"
+msgid "Kilometer"
+msgstr "Kilometer"
+
+msgctxt "model:product.uom,name:uom_liter"
+msgid "Liter"
+msgstr "Liter"
+
+msgctxt "model:product.uom,name:uom_meter"
+msgid "Meter"
+msgstr "Meter"
+
+msgctxt "model:product.uom,name:uom_mile"
+msgid "Mile"
+msgstr "Mijl"
+
+msgctxt "model:product.uom,name:uom_millimeter"
+msgid "Millimeter"
+msgstr "Milimeter"
+
+msgctxt "model:product.uom,name:uom_minute"
+msgid "Minute"
+msgstr "Minute"
+
+msgctxt "model:product.uom,name:uom_ounce"
+msgid "Ounce"
+msgstr "Ons"
+
+msgctxt "model:product.uom,name:uom_pound"
+msgid "Pound"
+msgstr "Pond"
+
+msgctxt "model:product.uom,name:uom_second"
+msgid "Second"
+msgstr "Seconde"
+
+msgctxt "model:product.uom,name:uom_square_centimeter"
+msgid "Square centimeter"
+msgstr "Vierkante centimeter"
+
+msgctxt "model:product.uom,name:uom_square_foot"
+msgid "Square foot"
+msgstr ""
+
+msgctxt "model:product.uom,name:uom_square_inch"
+msgid "Square inch"
+msgstr ""
+
+msgctxt "model:product.uom,name:uom_square_meter"
+msgid "Square meter"
+msgstr "Vierkante meter"
+
+msgctxt "model:product.uom,name:uom_square_yard"
+msgid "Square yard"
+msgstr ""
+
+msgctxt "model:product.uom,name:uom_unit"
+msgid "Unit"
+msgstr "Eenheid"
+
+msgctxt "model:product.uom,name:uom_work_day"
+msgid "Work Day"
+msgstr "Werkdag"
+
+msgctxt "model:product.uom,name:uom_yard"
+msgid "Yard"
+msgstr ""
+
+msgctxt "model:product.uom,symbol:uom_are"
+msgid "a"
+msgstr ""
+
+msgctxt "model:product.uom,symbol:uom_carat"
+msgid "c"
+msgstr ""
+
+msgctxt "model:product.uom,symbol:uom_centimeter"
+msgid "cm"
+msgstr "cm."
+
+msgctxt "model:product.uom,symbol:uom_cubic_centimeter"
+msgid "cm³"
+msgstr "cm³"
+
+msgctxt "model:product.uom,symbol:uom_cubic_foot"
+msgid "ft³"
+msgstr ""
+
+msgctxt "model:product.uom,symbol:uom_cubic_inch"
+msgid "in³"
+msgstr ""
+
+msgctxt "model:product.uom,symbol:uom_cubic_meter"
+msgid "m³"
+msgstr "m³"
+
+msgctxt "model:product.uom,symbol:uom_day"
+msgid "d"
+msgstr ""
+
+msgctxt "model:product.uom,symbol:uom_foot"
+msgid "ft"
+msgstr ""
+
+msgctxt "model:product.uom,symbol:uom_gallon"
+msgid "gal"
+msgstr ""
+
+msgctxt "model:product.uom,symbol:uom_gram"
+msgid "g"
+msgstr ""
+
+msgctxt "model:product.uom,symbol:uom_hectare"
+msgid "ha"
+msgstr "ha."
+
+msgctxt "model:product.uom,symbol:uom_hour"
+msgid "h"
+msgstr "uur"
+
+msgctxt "model:product.uom,symbol:uom_inch"
+msgid "in"
+msgstr ""
+
+msgctxt "model:product.uom,symbol:uom_kilogram"
+msgid "kg"
+msgstr "kg."
+
+msgctxt "model:product.uom,symbol:uom_kilometer"
+msgid "km"
+msgstr "km."
+
+msgctxt "model:product.uom,symbol:uom_liter"
+msgid "l"
+msgstr ""
+
+msgctxt "model:product.uom,symbol:uom_meter"
+msgid "m"
+msgstr "m."
+
+msgctxt "model:product.uom,symbol:uom_mile"
+msgid "mi"
+msgstr ""
+
+msgctxt "model:product.uom,symbol:uom_millimeter"
+msgid "mm"
+msgstr "mm."
+
+msgctxt "model:product.uom,symbol:uom_minute"
+msgid "min"
+msgstr "min."
+
+msgctxt "model:product.uom,symbol:uom_ounce"
+msgid "oz"
+msgstr ""
+
+msgctxt "model:product.uom,symbol:uom_pound"
+msgid "lbs"
+msgstr ""
+
+msgctxt "model:product.uom,symbol:uom_second"
+msgid "s"
+msgstr ""
+
+msgctxt "model:product.uom,symbol:uom_square_centimeter"
+msgid "cm²"
+msgstr "cm²"
+
+msgctxt "model:product.uom,symbol:uom_square_foot"
+msgid "ft²"
+msgstr ""
+
+msgctxt "model:product.uom,symbol:uom_square_inch"
+msgid "in²"
+msgstr ""
+
+msgctxt "model:product.uom,symbol:uom_square_meter"
+msgid "m²"
+msgstr "m²"
+
+msgctxt "model:product.uom,symbol:uom_square_yard"
+msgid "yd²"
+msgstr ""
+
+msgctxt "model:product.uom,symbol:uom_unit"
+msgid "u"
+msgstr ""
+
+msgctxt "model:product.uom,symbol:uom_work_day"
+msgid "wd"
+msgstr ""
+
+msgctxt "model:product.uom,symbol:uom_yard"
+msgid "yd"
+msgstr ""
+
+msgctxt "model:product.uom.category,name:0"
+msgid "Product uom category"
+msgstr "Product ME catergorie"
+
+msgctxt "model:product.uom.category,name:uom_cat_length"
+msgid "Length"
+msgstr "Lengte"
+
+msgctxt "model:product.uom.category,name:uom_cat_surface"
+msgid "Surface"
+msgstr "Oppervlak"
+
+msgctxt "model:product.uom.category,name:uom_cat_time"
+msgid "Time"
+msgstr "Tijd"
+
+msgctxt "model:product.uom.category,name:uom_cat_unit"
+msgid "Units"
+msgstr "Eenheden"
+
+msgctxt "model:product.uom.category,name:uom_cat_volume"
+msgid "Volume"
+msgstr "Volume"
+
+msgctxt "model:product.uom.category,name:uom_cat_weight"
+msgid "Weight"
+msgstr "Gewicht"
+
+msgctxt "model:res.group,name:group_product_admin"
+msgid "Product Administration"
+msgstr "Productregistratie"
+
+msgctxt "selection:product.template,cost_price_method:0"
+msgid "Average"
+msgstr "Gemiddeld"
+
+msgctxt "selection:product.template,cost_price_method:0"
+msgid "Fixed"
+msgstr "Vast"
+
+msgctxt "selection:product.template,type:0"
+msgid "Consumable"
+msgstr "Verbruik"
+
+msgctxt "selection:product.template,type:0"
+msgid "Service"
+msgstr "Service"
+
+msgctxt "selection:product.template,type:0"
+msgid "Stockable"
+msgstr "Op voorraad"
+
+msgctxt "view:product.category:0"
+msgid "Children"
+msgstr "Onderliggende niveaus"
+
+msgctxt "view:product.category:0"
+msgid "Product Categories"
+msgstr "Product categorieën"
+
+msgctxt "view:product.category:0"
+msgid "Product Category"
+msgstr "Product categorie"
+
+msgctxt "view:product.product:0"
+msgid "Products"
+msgstr "Producten"
+
+msgctxt "view:product.template:0"
+msgid "Accounting"
+msgstr "Boekhouden"
+
+msgctxt "view:product.template:0"
+msgid "Accounts"
+msgstr "Rekeningen"
+
+msgctxt "view:product.template:0"
+msgid "General"
+msgstr "Algemeen"
+
+msgctxt "view:product.template:0"
+msgid "Product Template"
+msgstr "Productsjabloon"
+
+msgctxt "view:product.template:0"
+msgid "Product Templates"
+msgstr "Productsjabloon"
+
+msgctxt "view:product.template:0"
+msgid "Taxes"
+msgstr "Belastingen"
+
+msgctxt "view:product.uom.category:0"
+msgid "Categories of Unit of Measure"
+msgstr "Categorieën van meeteenheden"
+
+msgctxt "view:product.uom.category:0"
+msgid "Category of Unit of Measure"
+msgstr "Categorie van meeteenheden"
+
+msgctxt "view:product.uom:0"
+msgid "Unit of Measure"
+msgstr "Meeteenheid"
+
+msgctxt "view:product.uom:0"
+msgid "Units of Measure"
+msgstr "Meeteenheden"
diff --git a/locale/ru_RU.po b/locale/ru_RU.po
new file mode 100644
index 0000000..f4d3f81
--- /dev/null
+++ b/locale/ru_RU.po
@@ -0,0 +1,589 @@
+#
+msgid ""
+msgstr "Content-Type: text/plain; charset=utf-8\n"
+
+#, fuzzy
+msgctxt "error:product.category:0"
+msgid "You can not create recursive categories!"
+msgstr "Ð’Ñ‹ не можете Ñоздавать рекурÑивные категории!"
+
+msgctxt "error:product.uom:0"
+msgid ""
+"If the UOM is still not used, you can delete it otherwise you can deactivate"
+" it and create a new one."
+msgstr ""
+
+msgctxt "error:product.uom:0"
+msgid "Invalid Factor and Rate values!"
+msgstr "Ðе правильные Ð·Ð½Ð°Ñ‡ÐµÐ½Ð¸Ñ Ñ„Ð°ÐºÑ‚Ð¾Ñ€Ð° и курÑа"
+
+msgctxt "error:product.uom:0"
+msgid "Rate and factor can not be both equal to zero."
+msgstr "Ставка и фактор не могут быть одновременно равны нулю."
+
+msgctxt "error:product.uom:0"
+msgid "You cannot change Rate, Factor or Category on a Unit of Measure. "
+msgstr ""
+"Ð’Ñ‹ не можете изменить КурÑ, фактор или категорию на единицу измерениÑ."
+
+msgctxt "field:product.category,childs:0"
+msgid "Children"
+msgstr "Подчиненый"
+
+msgctxt "field:product.category,name:0"
+msgid "Name"
+msgstr "Ðаименование"
+
+msgctxt "field:product.category,parent:0"
+msgid "Parent"
+msgstr "ОÑновной"
+
+msgctxt "field:product.category,rec_name:0"
+msgid "Name"
+msgstr "Ðаименование"
+
+msgctxt "field:product.product,code:0"
+msgid "Code"
+msgstr "Код"
+
+msgctxt "field:product.product,description:0"
+msgid "Description"
+msgstr "ОпиÑание"
+
+msgctxt "field:product.product,rec_name:0"
+msgid "Name"
+msgstr "Ðаименование"
+
+msgctxt "field:product.product,template:0"
+msgid "Product Template"
+msgstr "Шаблон Товара"
+
+msgctxt "field:product.template,active:0"
+msgid "Active"
+msgstr "ДейÑтвительнный"
+
+msgctxt "field:product.template,category:0"
+msgid "Category"
+msgstr "Категории"
+
+msgctxt "field:product.template,cost_price:0"
+msgid "Cost Price"
+msgstr "ÐŸÐ¾ÐºÑƒÐ¿Ð½Ð°Ñ Ñ†ÐµÐ½Ð°"
+
+msgctxt "field:product.template,cost_price_method:0"
+msgid "Cost Method"
+msgstr "Затратный метод"
+
+msgctxt "field:product.template,cost_price_uom:0"
+msgid "Cost Price"
+msgstr "Цена за единицу"
+
+msgctxt "field:product.template,default_uom:0"
+msgid "Default UOM"
+msgstr "По умолчанию ед.измерениÑ"
+
+msgctxt "field:product.template,list_price:0"
+msgid "List Price"
+msgstr "ПрайÑ-лиÑÑ‚"
+
+msgctxt "field:product.template,list_price_uom:0"
+msgid "List Price"
+msgstr "ПрайÑ-лиÑÑ‚"
+
+msgctxt "field:product.template,name:0"
+msgid "Name"
+msgstr "Ðаименование"
+
+msgctxt "field:product.template,products:0"
+msgid "Products"
+msgstr "ТМЦ"
+
+msgctxt "field:product.template,rec_name:0"
+msgid "Name"
+msgstr "Ðаименование"
+
+msgctxt "field:product.template,type:0"
+msgid "Type"
+msgstr "Тип"
+
+msgctxt "field:product.uom,active:0"
+msgid "Active"
+msgstr "ДейÑтвительнный"
+
+msgctxt "field:product.uom,category:0"
+msgid "UOM Category"
+msgstr "ÐšÐ°Ñ‚ÐµÐ³Ð¾Ñ€Ð¸Ñ Ð•Ð´.изм."
+
+msgctxt "field:product.uom,digits:0"
+msgid "Display Digits"
+msgstr "Кол-во знаков поÑле запÑтой"
+
+msgctxt "field:product.uom,factor:0"
+msgid "Factor"
+msgstr "КоÑффициент к оÑновной единице"
+
+msgctxt "field:product.uom,name:0"
+msgid "Name"
+msgstr "Ðаименование"
+
+msgctxt "field:product.uom,rate:0"
+msgid "Rate"
+msgstr "КоÑфициент оÑновной единицы"
+
+msgctxt "field:product.uom,rec_name:0"
+msgid "Name"
+msgstr "Ðаименование"
+
+msgctxt "field:product.uom,rounding:0"
+msgid "Rounding Precision"
+msgstr "ТочноÑÑ‚ÑŒ округлениÑ"
+
+msgctxt "field:product.uom,symbol:0"
+msgid "Symbol"
+msgstr "УÑловное обозначение"
+
+msgctxt "field:product.uom.category,name:0"
+msgid "Name"
+msgstr "Ðаименование"
+
+msgctxt "field:product.uom.category,rec_name:0"
+msgid "Name"
+msgstr "Ðаименование"
+
+msgctxt "field:product.uom.category,uoms:0"
+msgid "Unit of Measures"
+msgstr "Единица измерений"
+
+msgctxt "help:product.uom,factor:0"
+msgid ""
+"The coefficient for the formula:\n"
+"coef (base unit) = 1 (this unit)"
+msgstr ""
+"КоÑффициент по формуле:\n"
+"коÑффициент в Ñтом поле (Ð±Ð°Ð·Ð¾Ð²Ð°Ñ ÐµÐ´Ð¸Ð½Ð¸Ñ†Ð°) = 1 (Ñтой ед. измерениÑ)"
+
+msgctxt "help:product.uom,rate:0"
+msgid ""
+"The coefficient for the formula:\n"
+"1 (base unit) = coef (this unit)"
+msgstr ""
+"КоÑффициент по формуле:\n"
+"1 (Ð±Ð°Ð·Ð¾Ð²Ð°Ñ ÐµÐ´Ð¸Ð½Ð¸Ñ†Ð°) = коÑффициенту (Ñтой ед.измерениÑ)"
+
+#, fuzzy
+msgctxt "model:ir.action,name:act_category_list"
+msgid "Categories"
+msgstr "КатегориÑ"
+
+msgctxt "model:ir.action,name:act_category_tree"
+msgid "Categories"
+msgstr "КатегориÑ"
+
+msgctxt "model:ir.action,name:act_product_by_category"
+msgid "Product by Category"
+msgstr "ТМЦ по категориÑм"
+
+msgctxt "model:ir.action,name:act_product_form"
+msgid "Products"
+msgstr "ТМЦ"
+
+msgctxt "model:ir.action,name:act_uom_category_form"
+msgid "Categories of Unit of Measure"
+msgstr "ÐšÐ°Ñ‚ÐµÐ³Ð¾Ñ€Ð¸Ñ ÐµÐ´.измерениÑ"
+
+msgctxt "model:ir.action,name:act_uom_form"
+msgid "Units of Measure"
+msgstr "Единицы измерениÑ"
+
+#, fuzzy
+msgctxt "model:ir.ui.menu,name:menu_category_list"
+msgid "Categories"
+msgstr "КатегориÑ"
+
+msgctxt "model:ir.ui.menu,name:menu_category_tree"
+msgid "Categories"
+msgstr "КатегориÑ"
+
+msgctxt "model:ir.ui.menu,name:menu_main_product"
+msgid "Product"
+msgstr "Товарно материальные ценноÑти (ТМЦ)"
+
+msgctxt "model:ir.ui.menu,name:menu_product_product"
+msgid "Products"
+msgstr "ТМЦ"
+
+msgctxt "model:ir.ui.menu,name:menu_uom_category_form"
+msgid "Categories"
+msgstr "КатегориÑ"
+
+msgctxt "model:ir.ui.menu,name:menu_uom_form"
+msgid "Units of Measure"
+msgstr "Единицы измерениÑ"
+
+msgctxt "model:product.category,name:0"
+msgid "Product Category"
+msgstr "ÐšÐ°Ñ‚ÐµÐ³Ð¾Ñ€Ð¸Ñ Ð¢ÐœÐ¦"
+
+msgctxt "model:product.product,name:0"
+msgid "Product"
+msgstr "ТМЦ"
+
+msgctxt "model:product.template,name:0"
+msgid "Product Template"
+msgstr "Шаблон ТМЦ"
+
+msgctxt "model:product.uom,name:0"
+msgid "Unit of measure"
+msgstr "Единица измерениÑ"
+
+msgctxt "model:product.uom,name:uom_are"
+msgid "Are"
+msgstr ""
+
+msgctxt "model:product.uom,name:uom_carat"
+msgid "Carat"
+msgstr "Карат"
+
+msgctxt "model:product.uom,name:uom_centimeter"
+msgid "centimeter"
+msgstr "Ñантиметр"
+
+msgctxt "model:product.uom,name:uom_cubic_centimeter"
+msgid "Cubic centimeter"
+msgstr "КубичеÑкий Ñантиметр"
+
+msgctxt "model:product.uom,name:uom_cubic_foot"
+msgid "Cubic foot"
+msgstr "КубичеÑкий фут"
+
+msgctxt "model:product.uom,name:uom_cubic_inch"
+msgid "Cubic inch"
+msgstr "КубичеÑкий дюйм"
+
+msgctxt "model:product.uom,name:uom_cubic_meter"
+msgid "Cubic meter"
+msgstr "КубичеÑкий метр"
+
+msgctxt "model:product.uom,name:uom_day"
+msgid "Day"
+msgstr "День"
+
+msgctxt "model:product.uom,name:uom_foot"
+msgid "Foot"
+msgstr "Фут"
+
+msgctxt "model:product.uom,name:uom_gallon"
+msgid "Gallon"
+msgstr "Галлон"
+
+msgctxt "model:product.uom,name:uom_gram"
+msgid "Gram"
+msgstr "Грамм"
+
+msgctxt "model:product.uom,name:uom_hectare"
+msgid "Hectare"
+msgstr "Гектар"
+
+msgctxt "model:product.uom,name:uom_hour"
+msgid "Hour"
+msgstr "ЧаÑ"
+
+msgctxt "model:product.uom,name:uom_inch"
+msgid "Inch"
+msgstr "Дюйм"
+
+msgctxt "model:product.uom,name:uom_kilogram"
+msgid "Kilogram"
+msgstr "Килограмм"
+
+msgctxt "model:product.uom,name:uom_kilometer"
+msgid "Kilometer"
+msgstr "Километр"
+
+msgctxt "model:product.uom,name:uom_liter"
+msgid "Liter"
+msgstr "Литр"
+
+msgctxt "model:product.uom,name:uom_meter"
+msgid "Meter"
+msgstr "Метр"
+
+msgctxt "model:product.uom,name:uom_mile"
+msgid "Mile"
+msgstr "МилÑ"
+
+msgctxt "model:product.uom,name:uom_millimeter"
+msgid "Millimeter"
+msgstr "Миллиметр"
+
+msgctxt "model:product.uom,name:uom_minute"
+msgid "Minute"
+msgstr "Минута"
+
+msgctxt "model:product.uom,name:uom_ounce"
+msgid "Ounce"
+msgstr "УнциÑ"
+
+msgctxt "model:product.uom,name:uom_pound"
+msgid "Pound"
+msgstr "Фунт"
+
+msgctxt "model:product.uom,name:uom_second"
+msgid "Second"
+msgstr "Секунда"
+
+msgctxt "model:product.uom,name:uom_square_centimeter"
+msgid "Square centimeter"
+msgstr "Квадратный Ñантиметр"
+
+msgctxt "model:product.uom,name:uom_square_foot"
+msgid "Square foot"
+msgstr "Квадратный фут"
+
+msgctxt "model:product.uom,name:uom_square_inch"
+msgid "Square inch"
+msgstr "Квадратный дюйм"
+
+msgctxt "model:product.uom,name:uom_square_meter"
+msgid "Square meter"
+msgstr "Квадратный метр"
+
+msgctxt "model:product.uom,name:uom_square_yard"
+msgid "Square yard"
+msgstr "Квадратный Ñрд"
+
+msgctxt "model:product.uom,name:uom_unit"
+msgid "Unit"
+msgstr "Штука"
+
+msgctxt "model:product.uom,name:uom_work_day"
+msgid "Work Day"
+msgstr "Рабочий день"
+
+msgctxt "model:product.uom,name:uom_yard"
+msgid "Yard"
+msgstr "Ярд"
+
+msgctxt "model:product.uom,symbol:uom_are"
+msgid "a"
+msgstr ""
+
+msgctxt "model:product.uom,symbol:uom_carat"
+msgid "c"
+msgstr ""
+
+msgctxt "model:product.uom,symbol:uom_centimeter"
+msgid "cm"
+msgstr ""
+
+msgctxt "model:product.uom,symbol:uom_cubic_centimeter"
+msgid "cm³"
+msgstr ""
+
+msgctxt "model:product.uom,symbol:uom_cubic_foot"
+msgid "ft³"
+msgstr ""
+
+msgctxt "model:product.uom,symbol:uom_cubic_inch"
+msgid "in³"
+msgstr ""
+
+msgctxt "model:product.uom,symbol:uom_cubic_meter"
+msgid "m³"
+msgstr ""
+
+msgctxt "model:product.uom,symbol:uom_day"
+msgid "d"
+msgstr ""
+
+msgctxt "model:product.uom,symbol:uom_foot"
+msgid "ft"
+msgstr ""
+
+msgctxt "model:product.uom,symbol:uom_gallon"
+msgid "gal"
+msgstr ""
+
+msgctxt "model:product.uom,symbol:uom_gram"
+msgid "g"
+msgstr ""
+
+msgctxt "model:product.uom,symbol:uom_hectare"
+msgid "ha"
+msgstr ""
+
+msgctxt "model:product.uom,symbol:uom_hour"
+msgid "h"
+msgstr ""
+
+msgctxt "model:product.uom,symbol:uom_inch"
+msgid "in"
+msgstr ""
+
+msgctxt "model:product.uom,symbol:uom_kilogram"
+msgid "kg"
+msgstr ""
+
+msgctxt "model:product.uom,symbol:uom_kilometer"
+msgid "km"
+msgstr ""
+
+msgctxt "model:product.uom,symbol:uom_liter"
+msgid "l"
+msgstr ""
+
+msgctxt "model:product.uom,symbol:uom_meter"
+msgid "m"
+msgstr ""
+
+msgctxt "model:product.uom,symbol:uom_mile"
+msgid "mi"
+msgstr ""
+
+msgctxt "model:product.uom,symbol:uom_millimeter"
+msgid "mm"
+msgstr ""
+
+msgctxt "model:product.uom,symbol:uom_minute"
+msgid "min"
+msgstr ""
+
+msgctxt "model:product.uom,symbol:uom_ounce"
+msgid "oz"
+msgstr ""
+
+msgctxt "model:product.uom,symbol:uom_pound"
+msgid "lbs"
+msgstr ""
+
+msgctxt "model:product.uom,symbol:uom_second"
+msgid "s"
+msgstr ""
+
+msgctxt "model:product.uom,symbol:uom_square_centimeter"
+msgid "cm²"
+msgstr ""
+
+msgctxt "model:product.uom,symbol:uom_square_foot"
+msgid "ft²"
+msgstr ""
+
+msgctxt "model:product.uom,symbol:uom_square_inch"
+msgid "in²"
+msgstr ""
+
+msgctxt "model:product.uom,symbol:uom_square_meter"
+msgid "m²"
+msgstr ""
+
+msgctxt "model:product.uom,symbol:uom_square_yard"
+msgid "yd²"
+msgstr ""
+
+msgctxt "model:product.uom,symbol:uom_unit"
+msgid "u"
+msgstr ""
+
+msgctxt "model:product.uom,symbol:uom_work_day"
+msgid "wd"
+msgstr ""
+
+msgctxt "model:product.uom,symbol:uom_yard"
+msgid "yd"
+msgstr ""
+
+msgctxt "model:product.uom.category,name:0"
+msgid "Product uom category"
+msgstr "ÐšÐ°Ñ‚ÐµÐ³Ð¾Ñ€Ð¸Ñ ÐµÐ´. Ð¸Ð·Ð¼ÐµÑ€ÐµÐ½Ð¸Ñ Ð¢ÐœÐ¦"
+
+msgctxt "model:product.uom.category,name:uom_cat_length"
+msgid "Length"
+msgstr "Длина"
+
+msgctxt "model:product.uom.category,name:uom_cat_surface"
+msgid "Surface"
+msgstr "Площадь"
+
+msgctxt "model:product.uom.category,name:uom_cat_time"
+msgid "Time"
+msgstr "ВремÑ"
+
+msgctxt "model:product.uom.category,name:uom_cat_unit"
+msgid "Units"
+msgstr "Единицы"
+
+msgctxt "model:product.uom.category,name:uom_cat_volume"
+msgid "Volume"
+msgstr "Объем"
+
+msgctxt "model:product.uom.category,name:uom_cat_weight"
+msgid "Weight"
+msgstr "Ширина"
+
+msgctxt "model:res.group,name:group_product_admin"
+msgid "Product Administration"
+msgstr "Управление ТМЦ"
+
+msgctxt "selection:product.template,cost_price_method:0"
+msgid "Average"
+msgstr "СреднÑÑ Ñ†ÐµÐ½Ð°"
+
+msgctxt "selection:product.template,cost_price_method:0"
+msgid "Fixed"
+msgstr "ФикÑированнаÑ"
+
+msgctxt "selection:product.template,type:0"
+msgid "Consumable"
+msgstr "РаÑходные"
+
+msgctxt "selection:product.template,type:0"
+msgid "Service"
+msgstr "УÑлуги"
+
+msgctxt "selection:product.template,type:0"
+msgid "Stockable"
+msgstr "Можно хранить"
+
+msgctxt "view:product.category:0"
+msgid "Children"
+msgstr "Подчиненый"
+
+msgctxt "view:product.category:0"
+msgid "Product Categories"
+msgstr "ÐšÐ°Ñ‚ÐµÐ³Ð¾Ñ€Ð¸Ñ Ð¢ÐœÐ¦"
+
+msgctxt "view:product.category:0"
+msgid "Product Category"
+msgstr "Категории ТМЦ"
+
+msgctxt "view:product.product:0"
+msgid "Products"
+msgstr "ТМЦ"
+
+msgctxt "view:product.template:0"
+msgid "General"
+msgstr "ОÑновной"
+
+msgctxt "view:product.template:0"
+msgid "Product Template"
+msgstr "Шаблон Товара"
+
+msgctxt "view:product.template:0"
+msgid "Product Templates"
+msgstr "Шаблоны Товара"
+
+msgctxt "view:product.uom.category:0"
+msgid "Categories of Unit of Measure"
+msgstr "ÐšÐ°Ñ‚ÐµÐ³Ð¾Ñ€Ð¸Ñ ÐµÐ´.измерениÑ"
+
+msgctxt "view:product.uom.category:0"
+msgid "Category of Unit of Measure"
+msgstr "Категории ед.измерениÑ"
+
+msgctxt "view:product.uom:0"
+msgid "Unit of Measure"
+msgstr "Единица измерениÑ"
+
+msgctxt "view:product.uom:0"
+msgid "Units of Measure"
+msgstr "Единицы измерениÑ"
diff --git a/nl_NL.csv b/nl_NL.csv
deleted file mode 100644
index aa65b55..0000000
--- a/nl_NL.csv
+++ /dev/null
@@ -1,193 +0,0 @@
-type,name,res_id,src,value,fuzzy
-error,product.template,0,There is no account expense/revenue defined on the product %s (%d),Er is geen kosten-/opbrengstenrekening gedefinieerd voor product %s (%d),0
-error,product.uom,0,"If the UOM is still not used, you can delete it otherwise you can deactivate it and create a new one.","Als de maateenheid nog niet is gebruikt kan je hem verwijderen, anders kan je hem deactiveren en een nieuwe aanmaken.",0
-error,product.uom,0,Invalid Factor and Rate values!,Ongeldige factor en verhouding waarden,0
-error,product.uom,0,Rate and factor can not be both equal to zero.,Verhouding en factor kunnen niet beiden nul zijn! ,0
-error,product.uom,0,"You cannot change Rate, Factor or Category on a Unit of Measure. ","U kunt Verhouding, Factor of Categorie van een maateenheid niet wijzigen.",0
-field,"product.category,account_expense",0,Account Expense,Kostenrekening,0
-field,"product.category,account_revenue",0,Account Revenue,Opbrengstrekening,0
-field,"product.category,childs",0,Children,Onderliggende niveaus,0
-field,"product.category,customer_taxes",0,Customer Taxes,Belasting klanten,0
-field,"product.category,name",0,Name,Naam,0
-field,"product.category,parent",0,Parent,Bovenliggend niveau,0
-field,"product.category,rec_name",0,Name,Naam,0
-field,"product.category,supplier_taxes",0,Supplier Taxes,Belastingen inkoop,0
-field,"product.category-customer-account.tax,category",0,Category,Categorie,0
-field,"product.category-customer-account.tax,rec_name",0,Name,Naam,0
-field,"product.category-customer-account.tax,tax",0,Tax,Belasting,0
-field,"product.category-supplier-account.tax,category",0,Category,Categorie,0
-field,"product.category-supplier-account.tax,rec_name",0,Name,Naam,0
-field,"product.category-supplier-account.tax,tax",0,Tax,Belasting,0
-field,"product.product,code",0,Code,Code,0
-field,"product.product,description",0,Description,Omschrijving,0
-field,"product.product,rec_name",0,Name,Naam,0
-field,"product.product,template",0,Product Template,Productsjabloon,0
-field,"product.template,account_category",0,Use Category's accounts,Gebruik de rekeningen van de categorie,0
-field,"product.template,account_expense",0,Account Expense,Kostenrekening,0
-field,"product.template,account_expense_used",0,Account Expense Used,Gebruikte kostenrekening,0
-field,"product.template,account_revenue",0,Account Revenue,Opbrengstrekening,0
-field,"product.template,account_revenue_used",0,Account Revenue Used,Opbrengstrekening gebruikt,0
-field,"product.template,active",0,Active,Actief,0
-field,"product.template,category",0,Category,Categorie,0
-field,"product.template,cost_price",0,Cost Price,Kostprijs,0
-field,"product.template,cost_price_method",0,Cost Method,Kostprijsmethode,0
-field,"product.template,cost_price_uom",0,Cost Price,Kostprijs,0
-field,"product.template,customer_taxes",0,Customer Taxes,Belasting klanten,0
-field,"product.template,customer_taxes_used",0,Customer Taxes Used,Belasting klanten gebruikt,0
-field,"product.template,default_uom",0,Default UOM,Standaard ME,0
-field,"product.template,list_price",0,List Price,Catalogusprijs,0
-field,"product.template,list_price_uom",0,List Price,Catalogusprijs,0
-field,"product.template,name",0,Name,Naam,0
-field,"product.template,products",0,Products,Producten,0
-field,"product.template,rec_name",0,Name,Naam,0
-field,"product.template,supplier_taxes",0,Supplier Taxes,Belastingen inkoop,0
-field,"product.template,supplier_taxes_used",0,Customer Taxes Used,Belasting klanten gebruikt,0
-field,"product.template,taxes_category",0,Use Category's Taxes,Gebruik de belastingen van de categorie,0
-field,"product.template,type",0,Type,Type,0
-field,"product.template-customer-account.tax,product",0,Product Template,Productsjabloon,0
-field,"product.template-customer-account.tax,rec_name",0,Name,Naam,0
-field,"product.template-customer-account.tax,tax",0,Tax,Belasting,0
-field,"product.template-supplier-account.tax,product",0,Product Template,Productsjabloon,0
-field,"product.template-supplier-account.tax,rec_name",0,Name,Naam,0
-field,"product.template-supplier-account.tax,tax",0,Tax,Belasting,0
-field,"product.uom,active",0,Active,Actief,0
-field,"product.uom,category",0,UOM Category,ME categorie,0
-field,"product.uom,digits",0,Display Digits,Zichtbare decimalen,0
-field,"product.uom,factor",0,Factor,Faktor,0
-field,"product.uom,name",0,Name,Naam,0
-field,"product.uom,rate",0,Rate,Verhouding,0
-field,"product.uom,rec_name",0,Name,Naam,0
-field,"product.uom,rounding",0,Rounding Precision,Afronding,0
-field,"product.uom,symbol",0,Symbol,Symbool,0
-field,"product.uom.category,name",0,Name,Naam,0
-field,"product.uom.category,rec_name",0,Name,Naam,0
-field,"product.uom.category,uoms",0,Unit of Measures,Meeteenheid,0
-help,"product.template,account_category",0,Use the accounts defined on the category,Gebruik de rekeningen van de categorie,0
-help,"product.template,account_expense",0,This account will be used instead of the one defined on the category.,Deze rekening zal gebruikt worden in de plaats van die van de categorie.,0
-help,"product.template,account_revenue",0,This account will be used instead of the one defined on the category.,Deze rekening zal gebruikt worden in de plaats van die van de categorie.,0
-help,"product.template,taxes_category",0,Use the taxes defined on the category,Gebruik de belastingen van de categorie,0
-help,"product.uom,factor",0,"The coefficient for the formula:
-coef (base unit) = 1 (this unit)","De coëfficiënt voor deze formule:
-coëf (basiseenheid) = 1 (deze eenheid)",0
-help,"product.uom,rate",0,"The coefficient for the formula:
-1 (base unit) = coef (this unit)","De coëfficiënt voor deze formule:
-1(basiseenheid) = coëf (deze eenheid)",0
-model,"ir.action,name",act_category_form,Product Categories,Product categorieën,0
-model,"ir.action,name",act_category_form2,Product Categories,Product categorieën,0
-model,"ir.action,name",act_category_tree,Categories,Categorieën,0
-model,"ir.action,name",act_product_by_category,Product by Category,Product per categorie,0
-model,"ir.action,name",act_product_form,Products,Producten,0
-model,"ir.action,name",act_product_form2,Products,Producten,0
-model,"ir.action,name",act_uom_category_form,Categories of Unit of Measure,Categorieën van meeteenheden,0
-model,"ir.action,name",act_uom_category_form2,Categories of Unit of Measure,Categorieën van meeteenheden,0
-model,"ir.action,name",act_uom_form,Units of Measure,Meeteenheden,0
-model,"ir.action,name",act_uom_form2,Units of Measure,Meeteenheden,0
-model,"ir.ui.menu,name",menu_category_form,Categories,Categorieën,0
-model,"ir.ui.menu,name",menu_category_form_new,New Category,Nieuwe categorie,0
-model,"ir.ui.menu,name",menu_category_tree,Categories,Categorieën,0
-model,"ir.ui.menu,name",menu_main_product,Product,Productbeheer,0
-model,"ir.ui.menu,name",menu_product_product,Products,Producten,0
-model,"ir.ui.menu,name",menu_product_product_new,New Product,Nieuw product,0
-model,"ir.ui.menu,name",menu_uom_category_form,Categories,Categorieën,0
-model,"ir.ui.menu,name",menu_uom_category_form_new,New Category,Nieuwe categorie,0
-model,"ir.ui.menu,name",menu_uom_form,Units of Measure,Meeteenheden,0
-model,"ir.ui.menu,name",menu_uom_form2,New Unit of Measure,Nieuwe maateenheid,0
-model,"product.category,name",0,Product Category,Product categorie,0
-model,"product.category-customer-account.tax,name",0,Category - Customer Tax,Categorie - belasting klant,0
-model,"product.category-supplier-account.tax,name",0,Category - Supplier Tax,Categorie - belasting leverancier,0
-model,"product.product,name",0,Product,Product,0
-model,"product.template,name",0,Product Template,Productsjabloon,0
-model,"product.template-customer-account.tax,name",0,Product Template - Customer Tax,Productsjabloon - Belasting verkoop,0
-model,"product.template-supplier-account.tax,name",0,Product Template - Supplier Tax,Productsjabloon - Belasting inkoop,0
-model,"product.uom,name",0,Unit of measure,Meeteenheid,0
-model,"product.uom,name",uom_are,Are,Are,0
-model,"product.uom,name",uom_carat,Carat,Karaat,0
-model,"product.uom,name",uom_centimeter,centimeter,centimeter,0
-model,"product.uom,name",uom_cubic_centimeter,Cubic centimeter,Kubieke centimeter,0
-model,"product.uom,name",uom_cubic_foot,Cubic foot,,0
-model,"product.uom,name",uom_cubic_inch,Cubic inch,,0
-model,"product.uom,name",uom_cubic_meter,Cubic meter,Kubieke meter,0
-model,"product.uom,name",uom_day,Day,Dag,0
-model,"product.uom,name",uom_foot,Foot,Voet,0
-model,"product.uom,name",uom_gallon,Gallon,,0
-model,"product.uom,name",uom_gram,Gram,Gram,0
-model,"product.uom,name",uom_hectare,Hectare,Hectare,0
-model,"product.uom,name",uom_hour,Hour,Uur,0
-model,"product.uom,name",uom_inch,Inch,,0
-model,"product.uom,name",uom_kilogram,Kilogram,Kilogram,0
-model,"product.uom,name",uom_kilometer,Kilometer,Kilometer,0
-model,"product.uom,name",uom_liter,Liter,Liter,0
-model,"product.uom,name",uom_meter,Meter,Meter,0
-model,"product.uom,name",uom_mile,Mile,Mijl,0
-model,"product.uom,name",uom_millimeter,Millimeter,Milimeter,0
-model,"product.uom,name",uom_minute,Minute,Minute,0
-model,"product.uom,name",uom_ounce,Ounce,Ons,0
-model,"product.uom,name",uom_pound,Pound,Pond,0
-model,"product.uom,name",uom_second,Second,Seconde,0
-model,"product.uom,name",uom_square_centimeter,Square centimeter,Vierkante centimeter,0
-model,"product.uom,name",uom_square_foot,Square foot,,0
-model,"product.uom,name",uom_square_inch,Square inch,,0
-model,"product.uom,name",uom_square_meter,Square meter,Vierkante meter,0
-model,"product.uom,name",uom_square_yard,Square yard,,0
-model,"product.uom,name",uom_unit,Unit,Eenheid,0
-model,"product.uom,name",uom_work_day,Work Day,Werkdag,0
-model,"product.uom,name",uom_yard,Yard,,0
-model,"product.uom,symbol",uom_are,a,,0
-model,"product.uom,symbol",uom_carat,c,,0
-model,"product.uom,symbol",uom_centimeter,cm,cm.,0
-model,"product.uom,symbol",uom_cubic_centimeter,cm³,cm³,0
-model,"product.uom,symbol",uom_cubic_foot,ft³,,0
-model,"product.uom,symbol",uom_cubic_inch,in³,,0
-model,"product.uom,symbol",uom_cubic_meter,m³,m³,0
-model,"product.uom,symbol",uom_day,d,,0
-model,"product.uom,symbol",uom_foot,ft,,0
-model,"product.uom,symbol",uom_gallon,gal,,0
-model,"product.uom,symbol",uom_gram,g,,0
-model,"product.uom,symbol",uom_hectare,ha,ha.,0
-model,"product.uom,symbol",uom_hour,h,uur,0
-model,"product.uom,symbol",uom_inch,in,,0
-model,"product.uom,symbol",uom_kilogram,kg,kg.,0
-model,"product.uom,symbol",uom_kilometer,km,km.,0
-model,"product.uom,symbol",uom_liter,l,,0
-model,"product.uom,symbol",uom_meter,m,m.,0
-model,"product.uom,symbol",uom_mile,mi,,0
-model,"product.uom,symbol",uom_millimeter,mm,mm.,0
-model,"product.uom,symbol",uom_minute,min,min.,0
-model,"product.uom,symbol",uom_ounce,oz,,0
-model,"product.uom,symbol",uom_pound,lbs,,0
-model,"product.uom,symbol",uom_second,s,,0
-model,"product.uom,symbol",uom_square_centimeter,cm²,cm²,0
-model,"product.uom,symbol",uom_square_foot,ft²,,0
-model,"product.uom,symbol",uom_square_inch,in²,,0
-model,"product.uom,symbol",uom_square_meter,m²,m²,0
-model,"product.uom,symbol",uom_square_yard,yd²,,0
-model,"product.uom,symbol",uom_unit,u,,0
-model,"product.uom,symbol",uom_work_day,wd,,0
-model,"product.uom,symbol",uom_yard,yd,,0
-model,"product.uom.category,name",0,Product uom category,Product ME catergorie,0
-model,"product.uom.category,name",uom_cat_length,Length,Lengte,0
-model,"product.uom.category,name",uom_cat_surface,Surface,Oppervlak,0
-model,"product.uom.category,name",uom_cat_time,Time,Tijd,0
-model,"product.uom.category,name",uom_cat_unit,Units,Eenheden,0
-model,"product.uom.category,name",uom_cat_volume,Volume,Volume,0
-model,"product.uom.category,name",uom_cat_weight,Weight,Gewicht,0
-model,"res.group,name",group_product_admin,Product Administration,Productregistratie,0
-selection,"product.template,cost_price_method",0,Average,Gemiddeld,0
-selection,"product.template,cost_price_method",0,Fixed,Vast,0
-selection,"product.template,type",0,Consumable,Verbruik,0
-selection,"product.template,type",0,Service,Service,0
-selection,"product.template,type",0,Stockable,Op voorraad,0
-view,product.category,0,Children,Onderliggende niveaus,0
-view,product.category,0,Product Categories,Product categorieën,0
-view,product.category,0,Product Category,Product categorie,0
-view,product.product,0,Products,Producten,0
-view,product.template,0,Accounting,Boekhouden,0
-view,product.template,0,Accounts,Rekeningen,0
-view,product.template,0,General,Algemeen,0
-view,product.template,0,Product Template,Productsjabloon,0
-view,product.template,0,Product Templates,Productsjabloon,0
-view,product.template,0,Taxes,Belastingen,0
-view,product.uom,0,Unit of Measure,Meeteenheid,0
-view,product.uom,0,Units of Measure,Meeteenheden,0
-view,product.uom.category,0,Categories of Unit of Measure,Categorieën van meeteenheden,0
-view,product.uom.category,0,Category of Unit of Measure,Categorie van meeteenheden,0
diff --git a/product.py b/product.py
index 92fe4f5..ee3eac2 100644
--- a/product.py
+++ b/product.py
@@ -1,12 +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 Not, Bool, Eval
+from trytond.pyson import Eval
from trytond.transaction import Transaction
+from trytond.pool import Pool
STATES = {
- 'readonly': Not(Bool(Eval('active'))),
-}
+ 'readonly': ~Eval('active', True),
+ }
+DEPENDS = ['active']
class Template(ModelSQL, ModelView):
@@ -15,31 +17,32 @@ class Template(ModelSQL, ModelView):
_description = __doc__
name = fields.Char('Name', size=None, required=True, translate=True,
- select=1, states=STATES)
+ select=1, states=STATES, depends=DEPENDS)
type = fields.Selection([
- ('stockable', 'Stockable'),
- ('consumable', 'Consumable'),
- ('service', 'Service')
- ], 'Type', required=True, states=STATES)
+ ('stockable', 'Stockable'),
+ ('consumable', 'Consumable'),
+ ('service', 'Service')
+ ], 'Type', required=True, states=STATES, depends=DEPENDS)
category = fields.Many2One('product.category', 'Category', required=True,
- states=STATES)
+ states=STATES, depends=DEPENDS)
list_price = fields.Property(fields.Numeric('List Price', states=STATES,
- digits=(16, 4)))
+ digits=(16, 4), depends=DEPENDS))
list_price_uom = fields.Function(fields.Numeric('List Price',
digits=(16, 4)), 'get_price_uom')
cost_price = fields.Property(fields.Numeric('Cost Price',
- states=STATES, digits=(16, 4)))
+ states=STATES, digits=(16, 4), depends=DEPENDS))
cost_price_uom = fields.Function(fields.Numeric('Cost Price',
digits=(16, 4)), 'get_price_uom')
cost_price_method = fields.Property(fields.Selection([
- ("fixed", "Fixed"),
- ("average", "Average")
- ], 'Cost Method', required=True, states=STATES))
+ ("fixed", "Fixed"),
+ ("average", "Average")
+ ], 'Cost Method', required=True, states=STATES,
+ depends=DEPENDS))
default_uom = fields.Many2One('product.uom', 'Default UOM', required=True,
- states=STATES)
+ states=STATES, depends=DEPENDS)
active = fields.Boolean('Active', select=1)
products = fields.One2Many('product.product', 'template', 'Products',
- states=STATES)
+ states=STATES, depends=DEPENDS)
def default_active(self):
return True
@@ -51,11 +54,11 @@ class Template(ModelSQL, ModelView):
return 'fixed'
def get_price_uom(self, ids, name):
- product_uom_obj = self.pool.get('product.uom')
+ product_uom_obj = Pool().get('product.uom')
res = {}
field = name[:-4]
if Transaction().context.get('uom'):
- to_uom = self.pool.get('product.uom').browse(
+ to_uom = product_uom_obj.browse(
Transaction().context['uom'])
for product in self.browse(ids):
res[product.id] = product_uom_obj.compute_price(
@@ -105,7 +108,7 @@ class Product(ModelSQL, ModelView):
return [('name',) + clause[1:]]
def delete(self, ids):
- template_obj = self.pool.get('product.template')
+ template_obj = Pool().get('product.template')
if isinstance(ids, (int, long)):
ids = [ids]
@@ -126,7 +129,7 @@ class Product(ModelSQL, ModelView):
return res
def copy(self, ids, default=None):
- template_obj = self.pool.get('product.template')
+ template_obj = Pool().get('product.template')
int_id = False
if isinstance(ids, (int, long)):
diff --git a/product.xml b/product.xml
index ea34399..fe87c30 100644
--- a/product.xml
+++ b/product.xml
@@ -7,11 +7,13 @@ this repository contains the full copyright notices and license terms. -->
<record model="res.group" id="group_product_admin">
<field name="name">Product Administration</field>
</record>
- <record model="res.user" id="res.user_admin">
- <field name="groups" eval="[('add', ref('group_product_admin'))]"/>
+ <record model="res.user-res.group" id="user_admin_group_product_admin">
+ <field name="user" ref="res.user_admin"/>
+ <field name="group" ref="group_product_admin"/>
</record>
- <record model="res.user" id="res.user_trigger">
- <field name="groups" eval="[('add', ref('group_product_admin'))]"/>
+ <record model="res.user-res.group" id="user_trigger_group_product_admin">
+ <field name="user" ref="res.user_trigger"/>
+ <field name="group" ref="group_product_admin"/>
</record>
<record model="ir.ui.icon" id="product_icon">
@@ -27,13 +29,13 @@ this repository contains the full copyright notices and license terms. -->
<field name="arch" type="xml">
<![CDATA[
<tree string="Product Templates">
- <field name="name" select="1"/>
- <field name="list_price_uom" select="2"/>
- <field name="cost_price_uom" select="2"/>
- <field name="type" select="2"/>
- <field name="category" select="1"/>
- <field name="default_uom" select="2"/>
- <field name="active" select="2" tree_invisible="1"/>
+ <field name="name"/>
+ <field name="list_price_uom"/>
+ <field name="cost_price_uom"/>
+ <field name="type"/>
+ <field name="category"/>
+ <field name="default_uom"/>
+ <field name="active" tree_invisible="1"/>
</tree>
]]>
</field>
@@ -87,7 +89,7 @@ this repository contains the full copyright notices and license terms. -->
<xpath
expr="/tree/field[@name="name"]"
position="after">
- <field name="code" select="1"/>
+ <field name="code"/>
</xpath>
</data>
]]>
@@ -145,27 +147,6 @@ this repository contains the full copyright notices and license terms. -->
sequence="1" id="menu_product_product"
action="act_product_form"/>
- <record model="ir.action.act_window" id="act_product_form2">
- <field name="name">Products</field>
- <field name="res_model">product.product</field>
- </record>
-
- <record model="ir.action.act_window.view" id="act_product_list_view2">
- <field name="sequence" eval="20"/>
- <field name="view" ref="product_view_tree"/>
- <field name="act_window" ref="act_product_form2"/>
- </record>
-
- <record model="ir.action.act_window.view" id="act_product_form_view2">
- <field name="sequence" eval="10"/>
- <field name="view" ref="product_view_form"/>
- <field name="act_window" ref="act_product_form2"/>
- </record>
-
- <menuitem name="New Product" parent="menu_product_product"
- sequence="1" id="menu_product_product_new"
- action="act_product_form2" groups="group_product_admin"/>
-
<record model="ir.action.act_window" id="act_product_by_category">
<field name="name">Product by Category</field>
<field name="res_model">product.product</field>
@@ -184,7 +165,7 @@ this repository contains the full copyright notices and license terms. -->
</record>
<record model="ir.action.keyword" id="act_product_by_category_keyword1">
<field name="keyword">tree_open</field>
- <field name="model">product.category,0</field>
+ <field name="model">product.category,-1</field>
<field name="action" ref="act_product_by_category"/>
</record>
diff --git a/ru_RU.csv b/ru_RU.csv
deleted file mode 100644
index 46a18a5..0000000
--- a/ru_RU.csv
+++ /dev/null
@@ -1,155 +0,0 @@
-type,name,res_id,src,value,fuzzy
-error,product.uom,0,"If the UOM is still not used, you can delete it ortherwise you can deactivate it and create a new one.","ЕÑли Ед.Ð¸Ð·Ð¼ÐµÑ€ÐµÐ½Ð¸Ñ ÐµÑ‰Ðµ не иÑпользуетÑÑ, его можно удалить или вы можете отключить его и Ñоздать новую.",0
-error,product.uom,0,Invalid Factor and Rate values!,Ðе правильные Ð·Ð½Ð°Ñ‡ÐµÐ½Ð¸Ñ Ñ„Ð°ÐºÑ‚Ð¾Ñ€Ð° и курÑа,0
-error,product.uom,0,Rate and factor can not be both equal to zero.,Ставка и фактор не могут быть одновременно равны нулю.,0
-error,product.uom,0,"You cannot change Rate, Factor or Category on a Unit of Measure. ","Ð’Ñ‹ не можете изменить КурÑ, фактор или категорию на единицу измерениÑ.",0
-field,"product.category,childs",0,Children,Подчиненый,0
-field,"product.category,name",0,Name,Ðаименование,0
-field,"product.category,parent",0,Parent,ОÑновной,0
-field,"product.category,rec_name",0,Name,Ðаименование,0
-field,"product.product,code",0,Code,Код,0
-field,"product.product,description",0,Description,ОпиÑание,0
-field,"product.product,rec_name",0,Name,Ðаименование,0
-field,"product.product,template",0,Product Template,Шаблон Товара,0
-field,"product.template,active",0,Active,ДейÑтвительнный,0
-field,"product.template,category",0,Category,Категории,0
-field,"product.template,cost_price",0,Cost Price,ÐŸÐ¾ÐºÑƒÐ¿Ð½Ð°Ñ Ñ†ÐµÐ½Ð°,0
-field,"product.template,cost_price_method",0,Cost Method,Затратный метод,0
-field,"product.template,cost_price_uom",0,Cost Price,Цена за единицу,0
-field,"product.template,default_uom",0,Default UOM,По умолчанию ед.измерениÑ,0
-field,"product.template,list_price",0,List Price,ПрайÑ-лиÑÑ‚,0
-field,"product.template,list_price_uom",0,List Price,ПрайÑ-лиÑÑ‚,0
-field,"product.template,name",0,Name,Ðаименование,0
-field,"product.template,products",0,Products,ТМЦ,0
-field,"product.template,rec_name",0,Name,Ðаименование,0
-field,"product.template,type",0,Type,Тип,0
-field,"product.uom,active",0,Active,ДейÑтвительнный,0
-field,"product.uom,category",0,UOM Category,ÐšÐ°Ñ‚ÐµÐ³Ð¾Ñ€Ð¸Ñ Ð•Ð´.изм.,0
-field,"product.uom,digits",0,Display Digits,Кол-во знаков поÑле запÑтой,0
-field,"product.uom,factor",0,Factor,КоÑффициент к оÑновной единице,0
-field,"product.uom,name",0,Name,Ðаименование,0
-field,"product.uom,rate",0,Rate,КоÑфициент оÑновной единицы,0
-field,"product.uom,rec_name",0,Name,Ðаименование,0
-field,"product.uom,rounding",0,Rounding Precision,ТочноÑÑ‚ÑŒ округлениÑ,0
-field,"product.uom,symbol",0,Symbol,УÑловное обозначение,0
-field,"product.uom.category,name",0,Name,Ðаименование,0
-field,"product.uom.category,rec_name",0,Name,Ðаименование,0
-field,"product.uom.category,uoms",0,Unit of Measures,Единица измерений,0
-help,"product.uom,factor",0,"The coefficient for the formula:
-coef (base unit) = 1 (this unit)","КоÑффициент по формуле:
-коÑффициент в Ñтом поле (Ð±Ð°Ð·Ð¾Ð²Ð°Ñ ÐµÐ´Ð¸Ð½Ð¸Ñ†Ð°) = 1 (Ñтой ед. измерениÑ)",0
-help,"product.uom,rate",0,"The coefficient for the formula:
-1 (base unit) = coef (this unit)","КоÑффициент по формуле:
-1 (Ð±Ð°Ð·Ð¾Ð²Ð°Ñ ÐµÐ´Ð¸Ð½Ð¸Ñ†Ð°) = коÑффициенту (Ñтой ед.измерениÑ)",0
-model,"ir.action,name",act_category_form,Product Categories,ÐšÐ°Ñ‚ÐµÐ³Ð¾Ñ€Ð¸Ñ Ð¢ÐœÐ¦,0
-model,"ir.action,name",act_category_form2,Product Categories,ÐšÐ°Ñ‚ÐµÐ³Ð¾Ñ€Ð¸Ñ Ð¢ÐœÐ¦,0
-model,"ir.action,name",act_category_tree,Categories,КатегориÑ,0
-model,"ir.action,name",act_product_by_category,Product by Category,ТМЦ по категориÑм,0
-model,"ir.action,name",act_product_form,Products,ТМЦ,0
-model,"ir.action,name",act_product_form2,Products,ТМЦ,0
-model,"ir.action,name",act_uom_category_form,Categories of Unit of Measure,ÐšÐ°Ñ‚ÐµÐ³Ð¾Ñ€Ð¸Ñ ÐµÐ´.измерениÑ,0
-model,"ir.action,name",act_uom_category_form2,Categories of Unit of Measure,ÐšÐ°Ñ‚ÐµÐ³Ð¾Ñ€Ð¸Ñ ÐµÐ´.измерениÑ,0
-model,"ir.action,name",act_uom_form,Units of Measure,Единицы измерениÑ,0
-model,"ir.action,name",act_uom_form2,Units of Measure,Единицы измерениÑ,0
-model,"ir.ui.menu,name",menu_category_form,Categories,КатегориÑ,0
-model,"ir.ui.menu,name",menu_category_form_new,New Category,ÐÐ¾Ð²Ð°Ñ ÐºÐ°Ñ‚ÐµÐ³Ð¾Ñ€Ð¸Ñ,0
-model,"ir.ui.menu,name",menu_category_tree,Categories,КатегориÑ,0
-model,"ir.ui.menu,name",menu_main_product,Product,Товарно материальные ценноÑти (ТМЦ),0
-model,"ir.ui.menu,name",menu_product_product,Products,ТМЦ,0
-model,"ir.ui.menu,name",menu_product_product_new,New Product,Ðовый ТМЦ,0
-model,"ir.ui.menu,name",menu_uom_category_form,Categories,КатегориÑ,0
-model,"ir.ui.menu,name",menu_uom_category_form_new,New Category,ÐÐ¾Ð²Ð°Ñ ÐºÐ°Ñ‚ÐµÐ³Ð¾Ñ€Ð¸Ñ,0
-model,"ir.ui.menu,name",menu_uom_form,Units of Measure,Единицы измерениÑ,0
-model,"ir.ui.menu,name",menu_uom_form2,New Unit of Measure,ÐÐ¾Ð²Ð°Ñ ÐµÐ´Ð¸Ð½Ð¸Ñ†Ð° измерениÑ,0
-model,"product.category,name",0,Product Category,ÐšÐ°Ñ‚ÐµÐ³Ð¾Ñ€Ð¸Ñ Ð¢ÐœÐ¦,0
-model,"product.product,name",0,Product,ТМЦ,0
-model,"product.template,name",0,Product Template,Шаблон ТМЦ,0
-model,"product.uom,name",0,Unit of measure,Единица измерениÑ,0
-model,"product.uom,name",uom_are,Are,,0
-model,"product.uom,name",uom_carat,Carat,Карат,0
-model,"product.uom,name",uom_centimeter,centimeter,Ñантиметр,0
-model,"product.uom,name",uom_cubic_centimeter,Cubic centimeter,КубичеÑкий Ñантиметр,0
-model,"product.uom,name",uom_cubic_foot,Cubic foot,КубичеÑкий фут,0
-model,"product.uom,name",uom_cubic_inch,Cubic inch,КубичеÑкий дюйм,0
-model,"product.uom,name",uom_cubic_meter,Cubic meter,КубичеÑкий метр,0
-model,"product.uom,name",uom_day,Day,День,0
-model,"product.uom,name",uom_foot,Foot,Фут,0
-model,"product.uom,name",uom_gallon,Gallon,Галлон,0
-model,"product.uom,name",uom_gram,Gram,Грамм,0
-model,"product.uom,name",uom_hectare,Hectare,Гектар,0
-model,"product.uom,name",uom_hour,Hour,ЧаÑ,0
-model,"product.uom,name",uom_inch,Inch,Дюйм,0
-model,"product.uom,name",uom_kilogram,Kilogram,Килограмм,0
-model,"product.uom,name",uom_kilometer,Kilometer,Километр,0
-model,"product.uom,name",uom_liter,Liter,Литр,0
-model,"product.uom,name",uom_meter,Meter,Метр,0
-model,"product.uom,name",uom_mile,Mile,МилÑ,0
-model,"product.uom,name",uom_millimeter,Millimeter,Миллиметр,0
-model,"product.uom,name",uom_minute,Minute,Минута,0
-model,"product.uom,name",uom_ounce,Ounce,УнциÑ,0
-model,"product.uom,name",uom_pound,Pound,Фунт,0
-model,"product.uom,name",uom_second,Second,Секунда,0
-model,"product.uom,name",uom_square_centimeter,Square centimeter,Квадратный Ñантиметр,0
-model,"product.uom,name",uom_square_foot,Square foot,Квадратный фут,0
-model,"product.uom,name",uom_square_inch,Square inch,Квадратный дюйм,0
-model,"product.uom,name",uom_square_meter,Square meter,Квадратный метр,0
-model,"product.uom,name",uom_square_yard,Square yard,Квадратный Ñрд,0
-model,"product.uom,name",uom_unit,Unit,Штука,0
-model,"product.uom,name",uom_work_day,Work Day,Рабочий день,0
-model,"product.uom,name",uom_yard,Yard,Ярд,0
-model,"product.uom,symbol",uom_are,a,,0
-model,"product.uom,symbol",uom_carat,c,,0
-model,"product.uom,symbol",uom_centimeter,cm,,0
-model,"product.uom,symbol",uom_cubic_centimeter,cm³,,0
-model,"product.uom,symbol",uom_cubic_foot,ft³,,0
-model,"product.uom,symbol",uom_cubic_inch,in³,,0
-model,"product.uom,symbol",uom_cubic_meter,m³,,0
-model,"product.uom,symbol",uom_day,d,,0
-model,"product.uom,symbol",uom_foot,ft,,0
-model,"product.uom,symbol",uom_gallon,gal,,0
-model,"product.uom,symbol",uom_gram,g,,0
-model,"product.uom,symbol",uom_hectare,ha,,0
-model,"product.uom,symbol",uom_hour,h,,0
-model,"product.uom,symbol",uom_inch,in,,0
-model,"product.uom,symbol",uom_kilogram,kg,,0
-model,"product.uom,symbol",uom_kilometer,km,,0
-model,"product.uom,symbol",uom_liter,l,,0
-model,"product.uom,symbol",uom_meter,m,,0
-model,"product.uom,symbol",uom_mile,mi,,0
-model,"product.uom,symbol",uom_millimeter,mm,,0
-model,"product.uom,symbol",uom_minute,min,,0
-model,"product.uom,symbol",uom_ounce,oz,,0
-model,"product.uom,symbol",uom_pound,lbs,,0
-model,"product.uom,symbol",uom_second,s,,0
-model,"product.uom,symbol",uom_square_centimeter,cm²,,0
-model,"product.uom,symbol",uom_square_foot,ft²,,0
-model,"product.uom,symbol",uom_square_inch,in²,,0
-model,"product.uom,symbol",uom_square_meter,m²,,0
-model,"product.uom,symbol",uom_square_yard,yd²,,0
-model,"product.uom,symbol",uom_unit,u,,0
-model,"product.uom,symbol",uom_work_day,wd,,0
-model,"product.uom,symbol",uom_yard,yd,,0
-model,"product.uom.category,name",0,Product uom category,ÐšÐ°Ñ‚ÐµÐ³Ð¾Ñ€Ð¸Ñ ÐµÐ´. Ð¸Ð·Ð¼ÐµÑ€ÐµÐ½Ð¸Ñ Ð¢ÐœÐ¦,0
-model,"product.uom.category,name",uom_cat_length,Length,Длина,0
-model,"product.uom.category,name",uom_cat_surface,Surface,Площадь,0
-model,"product.uom.category,name",uom_cat_time,Time,ВремÑ,0
-model,"product.uom.category,name",uom_cat_unit,Units,Единицы,0
-model,"product.uom.category,name",uom_cat_volume,Volume,Объем,0
-model,"product.uom.category,name",uom_cat_weight,Weight,Ширина,0
-model,"res.group,name",group_product_admin,Product Administration,Управление ТМЦ,0
-selection,"product.template,cost_price_method",0,Average,СреднÑÑ Ñ†ÐµÐ½Ð°,0
-selection,"product.template,cost_price_method",0,Fixed,ФикÑированнаÑ,0
-selection,"product.template,type",0,Consumable,РаÑходные,0
-selection,"product.template,type",0,Service,УÑлуги,0
-selection,"product.template,type",0,Stockable,Можно хранить,0
-view,product.category,0,Children,Подчиненый,0
-view,product.category,0,Product Categories,ÐšÐ°Ñ‚ÐµÐ³Ð¾Ñ€Ð¸Ñ Ð¢ÐœÐ¦,0
-view,product.category,0,Product Category,Категории ТМЦ,0
-view,product.product,0,Products,ТМЦ,0
-view,product.template,0,General,ОÑновной,0
-view,product.template,0,Product Template,Шаблон Товара,0
-view,product.template,0,Product Templates,Шаблоны Товара,0
-view,product.uom,0,Unit of Measure,Единица измерениÑ,0
-view,product.uom,0,Units of Measure,Единицы измерениÑ,0
-view,product.uom.category,0,Categories of Unit of Measure,ÐšÐ°Ñ‚ÐµÐ³Ð¾Ñ€Ð¸Ñ ÐµÐ´.измерениÑ,0
-view,product.uom.category,0,Category of Unit of Measure,Категории ед.измерениÑ,0
diff --git a/setup.py b/setup.py
index f8f3f08..fb25563 100644
--- a/setup.py
+++ b/setup.py
@@ -31,22 +31,23 @@ setup(name='trytond_product',
packages=[
'trytond.modules.product',
'trytond.modules.product.tests',
- 'trytond.modules.product.icons',
],
package_data={
'trytond.modules.product': info.get('xml', []) \
- + info.get('translation', []),
- 'trytond.modules.product.icons': ['tryton-product.svg'],
+ + info.get('translation', []) \
+ + ['icons/*.svg'],
},
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',
@@ -54,7 +55,6 @@ setup(name='trytond_product',
'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',
diff --git a/tests/test_product.py b/tests/test_product.py
index fad01cc..63c7ade 100644
--- a/tests/test_product.py
+++ b/tests/test_product.py
@@ -2,7 +2,6 @@
#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 sys, os
DIR = os.path.abspath(os.path.normpath(os.path.join(__file__,
'..', '..', '..', '..', '..', 'trytond')))
@@ -12,7 +11,8 @@ if os.path.isdir(DIR):
import unittest
from decimal import Decimal
import trytond.tests.test_tryton
-from trytond.tests.test_tryton import POOL, DB_NAME, USER, CONTEXT, test_view
+from trytond.tests.test_tryton import POOL, DB_NAME, USER, CONTEXT, test_view,\
+ test_depends
from trytond.transaction import Transaction
class ProductTestCase(unittest.TestCase):
@@ -31,6 +31,12 @@ class ProductTestCase(unittest.TestCase):
'''
test_view('product')
+ def test0006depends(self):
+ '''
+ Test depends.
+ '''
+ test_depends()
+
def test0010uom_non_zero_rate_factor(self):
'''
Test uom non_zero_rate_factor constraint.
diff --git a/trytond_product.egg-info/PKG-INFO b/trytond_product.egg-info/PKG-INFO
index fdc62ea..d4e40e5 100644
--- a/trytond_product.egg-info/PKG-INFO
+++ b/trytond_product.egg-info/PKG-INFO
@@ -1,22 +1,24 @@
Metadata-Version: 1.0
Name: trytond-product
-Version: 2.0.1
+Version: 2.2.0
Summary: Define products, categories of product, units of measure, categories of units of measure.
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
@@ -24,7 +26,6 @@ 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.egg-info/SOURCES.txt b/trytond_product.egg-info/SOURCES.txt
index 5f50ccb..675589a 100644
--- a/trytond_product.egg-info/SOURCES.txt
+++ b/trytond_product.egg-info/SOURCES.txt
@@ -4,15 +4,8 @@ INSTALL
LICENSE
MANIFEST.in
README
-bg_BG.csv
category.xml
-de_DE.csv
-es_CO.csv
-es_ES.csv
-fr_FR.csv
-nl_NL.csv
product.xml
-ru_RU.csv
setup.py
uom.xml
./__init__.py
@@ -20,13 +13,18 @@ uom.xml
./category.py
./product.py
./uom.py
-./icons/__init__.py
./tests/__init__.py
./tests/test_product.py
doc/index.rst
-icons/LICENSE
-icons/__init__.py
icons/tryton-product.svg
+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.egg-info/PKG-INFO
trytond_product.egg-info/SOURCES.txt
trytond_product.egg-info/dependency_links.txt
diff --git a/trytond_product.egg-info/requires.txt b/trytond_product.egg-info/requires.txt
index 820b8fc..8f8cc44 100644
--- a/trytond_product.egg-info/requires.txt
+++ b/trytond_product.egg-info/requires.txt
@@ -1 +1 @@
-trytond >= 2.0, < 2.1
\ No newline at end of file
+trytond >= 2.2, < 2.3
\ No newline at end of file
diff --git a/uom.py b/uom.py
index a530902..9d6d957 100644
--- a/uom.py
+++ b/uom.py
@@ -3,12 +3,14 @@
from decimal import Decimal
from trytond.model import ModelView, ModelSQL, fields
from trytond.model.modelstorage import OPERATORS
-from trytond.pyson import Not, Bool, Eval
+from trytond.pyson import Eval
from trytond.transaction import Transaction
+from trytond.pool import Pool
STATES = {
- 'readonly': Not(Bool(Eval('active'))),
-}
+ 'readonly': ~Eval('active', True),
+ }
+DEPENDS = ['active']
class UomCategory(ModelSQL, ModelView):
'Product uom category'
@@ -29,21 +31,21 @@ class Uom(ModelSQL, ModelView):
_name = 'product.uom'
_description = __doc__
name = fields.Char('Name', size=None, required=True, states=STATES,
- translate=True)
+ translate=True, depends=DEPENDS)
symbol = fields.Char('Symbol', size=10, required=True, states=STATES,
- translate=True)
+ translate=True, depends=DEPENDS)
category = fields.Many2One('product.uom.category', 'UOM Category',
- required=True, ondelete='RESTRICT', states=STATES)
+ required=True, ondelete='RESTRICT', states=STATES, depends=DEPENDS)
rate = fields.Float('Rate', digits=(12, 12), required=True,
- on_change=['rate'], states=STATES,
- help='The coefficient for the formula:\n' \
- '1 (base unit) = coef (this unit)')
+ on_change=['rate'], states=STATES, depends=DEPENDS,
+ help='The coefficient for the formula:\n' \
+ '1 (base unit) = coef (this unit)')
factor = fields.Float('Factor', digits=(12, 12), states=STATES,
- on_change=['factor'], required=True,
- help='The coefficient for the formula:\n' \
- 'coef (base unit) = 1 (this unit)')
+ on_change=['factor'], required=True, depends=DEPENDS,
+ help='The coefficient for the formula:\n' \
+ 'coef (base unit) = 1 (this unit)')
rounding = fields.Float('Rounding Precision', digits=(12, 12),
- required=True, states=STATES)
+ required=True, states=STATES, depends=DEPENDS)
digits = fields.Integer('Display Digits')
active = fields.Boolean('Active')
@@ -93,8 +95,8 @@ class Uom(ModelSQL, ModelView):
return 2
def default_category(self):
- category_obj = self.pool.get('product.uom.category')
- product_obj = self.pool.get('product.product')
+ category_obj = Pool().get('product.uom.category')
+ product_obj = Pool().get('product.product')
context = Transaction().context
if 'category' in context:
if isinstance(context['category'], (tuple, list)) \
@@ -249,7 +251,7 @@ class Uom(ModelSQL, ModelView):
def search(self, args, offset=0, limit=None, order=None,
count=False, query_string=False):
- product_obj = self.pool.get('product.product')
+ product_obj = Pool().get('product.product')
args = args[:]
def process_args(args):
i = 0
diff --git a/uom.xml b/uom.xml
index 4430b7d..48ea756 100644
--- a/uom.xml
+++ b/uom.xml
@@ -9,13 +9,13 @@ this repository contains the full copyright notices and license terms. -->
<field name="arch" type="xml">
<![CDATA[
<tree string="Units of Measure">
- <field name="name" select="1"/>
- <field name="symbol" select="2"/>
- <field name="category" select="1"/>
- <field name="factor" select="2"/>
- <field name="rate" select="2"/>
- <field name="rounding" select="2"/>
- <field name="active" select="2" tree_invisible="1"/>
+ <field name="name"/>
+ <field name="symbol"/>
+ <field name="category"/>
+ <field name="factor"/>
+ <field name="rate"/>
+ <field name="rounding"/>
+ <field name="active" tree_invisible="1"/>
</tree>
]]>
</field>
@@ -62,23 +62,6 @@ this repository contains the full copyright notices and license terms. -->
</record>
<menuitem name="Units of Measure" parent="menu_main_product"
sequence="3" id="menu_uom_form" action="act_uom_form"/>
- <record model="ir.action.act_window" id="act_uom_form2">
- <field name="name">Units of Measure</field>
- <field name="res_model">product.uom</field>
- </record>
- <record model="ir.action.act_window.view" id="act_uom_form2_view1">
- <field name="sequence" eval="10"/>
- <field name="view" ref="uom_view_form"/>
- <field name="act_window" ref="act_uom_form2"/>
- </record>
- <record model="ir.action.act_window.view" id="act_uom_form2_view2">
- <field name="sequence" eval="20"/>
- <field name="view" ref="uom_view_tree"/>
- <field name="act_window" ref="act_uom_form2"/>
- </record>
- <menuitem name="New Unit of Measure" id="menu_uom_form2"
- parent="menu_uom_form" sequence="1" action="act_uom_form2"
- groups="group_product_admin"/>
<record model="ir.ui.view" id="uom_category_view_tree">
<field name="model">product.uom.category</field>
@@ -86,7 +69,7 @@ this repository contains the full copyright notices and license terms. -->
<field name="arch" type="xml">
<![CDATA[
<tree string="Categories of Unit of Measure">
- <field name="name" select="1"/>
+ <field name="name"/>
</tree>
]]>
</field>
@@ -123,24 +106,6 @@ this repository contains the full copyright notices and license terms. -->
id="menu_uom_category_form"
action="act_uom_category_form"/>
- <record model="ir.action.act_window" id="act_uom_category_form2">
- <field name="name">Categories of Unit of Measure</field>
- <field name="res_model">product.uom.category</field>
- </record>
- <record model="ir.action.act_window.view" id="act_uom_category_form2_view1">
- <field name="sequence" eval="10"/>
- <field name="view" ref="uom_category_view_form"/>
- <field name="act_window" ref="act_uom_category_form2"/>
- </record>
- <record model="ir.action.act_window.view" id="act_uom_category_form2_view2">
- <field name="sequence" eval="20"/>
- <field name="view" ref="uom_category_view_tree"/>
- <field name="act_window" ref="act_uom_category_form2"/>
- </record>
- <menuitem name="New Category" parent="menu_uom_category_form" sequence="10"
- id="menu_uom_category_form_new"
- action="act_uom_category_form2"/>
-
<record model="product.uom.category" id="uom_cat_unit">
<field name="name">Units</field>
</record>
commit 44fadb05174e86247f70cc234a5a59d33a12d24d
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Sun Aug 7 14:11:49 2011 +0200
Removing tango-icon-theme from Depends.
diff --git a/debian/control b/debian/control
index 9e77bf7..fa6b7df 100644
--- a/debian/control
+++ b/debian/control
@@ -15,7 +15,7 @@ Package: tryton-modules-product
Architecture: all
Depends:
${misc:Depends}, ${python:Depends}, tryton-server (>= 2.0),
- python-pkg-resources, tango-icon-theme
+ python-pkg-resources
Description: Tryton Application Platform (Product Module)
Tryton is a high-level general purpose application platform written in Python
and using PostgreSQL as database engine. It is the core base of a complete
commit 3763ae4232aeaf9b1bc90437f9f45d82a0fbadb4
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Sun Aug 7 14:11:25 2011 +0200
Adding Bug URL to dfsg-icons patch.
diff --git a/debian/patches/01-dfsg-icons b/debian/patches/01-dfsg-icons
index b6a6dda..e574306 100644
--- a/debian/patches/01-dfsg-icons
+++ b/debian/patches/01-dfsg-icons
@@ -1,5 +1,6 @@
Author: Mathias Behrle <mathiasb at m9s.biz>
Description: Add DFSG compatible icon as a replacement for the original icon.
+Bug: http://bugs.tryton.org/roundup/issue1996
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
+++ tryton-modules-product/icons/tryton-product.svg 2011-08-07 14:10:25.886041278 +0200
@@ -0,0 +1,485 @@
commit cf13f2dee3a12315af26dad005fd3843687f9cf6
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Sun Aug 7 14:10:45 2011 +0200
Rediffing dfsg-icons patch.
diff --git a/debian/patches/01-dfsg-icons b/debian/patches/01-dfsg-icons
index 677afc3..b6a6dda 100644
--- a/debian/patches/01-dfsg-icons
+++ b/debian/patches/01-dfsg-icons
@@ -1,7 +1,7 @@
Author: Mathias Behrle <mathiasb at m9s.biz>
Description: Add DFSG compatible icon as a replacement for the original icon.
---- /dev/null
-+++ b/icons/tryton-product.svg
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ tryton-modules-product/icons/tryton-product.svg 2011-08-07 14:10:25.886041278 +0200
@@ -0,0 +1,485 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
commit 517973dd0165aac58803174d75bce3854597d054
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Wed Jul 27 13:21:24 2011 +0200
Reordering anf fixing license for public-domain.
diff --git a/debian/copyright b/debian/copyright
index 4b9648c..f9e9ef6 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -8,69 +8,7 @@ License: GPL-3+
Files: icons/*
Copyright: not applicable
-License: public domain
-
-The icons used to replace the original not DFSG compatible icons are taken
-from http://tango.freedesktop.org/releases/tango-icon-theme-0.8.90.tar.gz
-
-Upstream Authors: 2005-2009
-
- Ulisse Perusin <uli.peru at gmail.com>
- Steven Garrity <sgarrity at silverorange.com>
- Lapo Calamandrei <calamandrei at gmail.com>
- Ryan Collier <rcollier at novell.com>
- Rodney Dawes <dobey at novell.com>
- Andreas Nilsson <nisses.mail at home.se>
- Tuomas Kuosmanen <tigert at tigert.com>
- Garrett LeSage <garrett at novell.com>
- Jakub Steiner <jimmac at novell.com>
-
- In the preparation of the 0.8.90 release Novell took care of tracking
- down all the contributors to get them to relicense their artwork
- into Public Domain.
-
- The COPYING file of the tarball states the following:
- | The icons in this repository are herefore released into the Public Domain.
-
- Additionally the copyright status of the files was tracked in the CVS and the
- rdf properties of the SVGs adjusted for all files that were put into Public
- Domain (see rdf:about and rdf:resource). Both fields contain a link to the
- Creative Commons Public Domain Dediciation[0] as reproduced below:
- | Public Domain Dedication
- |
- | Copyright-Only Dedication (based on United States law) or Public Domain
- | Certification
- |
- | The person or persons who have associated work with this document (the
- | "Dedicator" or "Certifier") hereby either (a) certifies that, to the best
- | of his knowledge, the work of authorship identified is in the public
- | domain of the country from which the work is published, or (b)
- | hereby dedicates whatever copyright the dedicators holds in the work
- | of authorship identified below (the "Work") to the public domain. A
- | certifier, moreover, dedicates any copyright interest he may have in
- | the associated work, and for these purposes, is described as a
- | "dedicator" below.
- |
- | A certifier has taken reasonable steps to verify the copyright
- | status of this work. Certifier recognizes that his good faith efforts
- | may not shield him from liability if in fact the work certified is not
- | in the public domain.
- |
- | Dedicator makes this dedication for the benefit of the public at
- | large and to the detriment of the Dedicator's heirs and successors.
- | Dedicator intends this dedication to be an overt act of relinquishment
- | in perpetuity of all present and future rights under copyright law,
- | whether vested or contingent, in the Work. Dedicator understands that
- | such relinquishment of all rights includes the relinquishment of all
- | rights to enforce (by lawsuit or otherwise) those copyrights in the
- | Work.
- |
- | Dedicator recognizes that, once placed in the public domain, the Work
- | may be freely reproduced, distributed, transmitted, used, modified,
- | built upon, or otherwise exploited by anyone for any purpose, commercial
- | or non-commercial, and in any way, including by methods that have not
- | yet been invented or conceived.
- [0] http://creativecommons.org/licenses/publicdomain/
+License: public-domain
Files: debian/*
Copyright:
@@ -94,3 +32,66 @@ License: GPL-3+
.
The complete text of the GNU General Public License
can be found in /usr/share/common-licenses/GPL-3 file.
+
+License: public-domain
+ The icons used to replace the original not DFSG compatible icons are taken
+ from http://tango.freedesktop.org/releases/tango-icon-theme-0.8.90.tar.gz
+ .
+ Upstream Authors: 2005-2009
+ .
+ Ulisse Perusin <uli.peru at gmail.com>
+ Steven Garrity <sgarrity at silverorange.com>
+ Lapo Calamandrei <calamandrei at gmail.com>
+ Ryan Collier <rcollier at novell.com>
+ Rodney Dawes <dobey at novell.com>
+ Andreas Nilsson <nisses.mail at home.se>
+ Tuomas Kuosmanen <tigert at tigert.com>
+ Garrett LeSage <garrett at novell.com>
+ Jakub Steiner <jimmac at novell.com>
+ .
+ In the preparation of the 0.8.90 release Novell took care of tracking
+ down all the contributors to get them to relicense their artwork
+ into Public Domain.
+ .
+ The COPYING file of the tarball states the following:
+ | The icons in this repository are herefore released into the Public Domain.
+ .
+ Additionally the copyright status of the files was tracked in the CVS and the
+ rdf properties of the SVGs adjusted for all files that were put into Public
+ Domain (see rdf:about and rdf:resource). Both fields contain a link to the
+ Creative Commons Public Domain Dediciation[0] as reproduced below:
+ | Public Domain Dedication
+ |
+ | Copyright-Only Dedication (based on United States law) or Public Domain
+ | Certification
+ |
+ | The person or persons who have associated work with this document (the
+ | "Dedicator" or "Certifier") hereby either (a) certifies that, to the best
+ | of his knowledge, the work of authorship identified is in the public
+ | domain of the country from which the work is published, or (b)
+ | hereby dedicates whatever copyright the dedicators holds in the work
+ | of authorship identified below (the "Work") to the public domain. A
+ | certifier, moreover, dedicates any copyright interest he may have in
+ | the associated work, and for these purposes, is described as a
+ | "dedicator" below.
+ |
+ | A certifier has taken reasonable steps to verify the copyright
+ | status of this work. Certifier recognizes that his good faith efforts
+ | may not shield him from liability if in fact the work certified is not
+ | in the public domain.
+ |
+ | Dedicator makes this dedication for the benefit of the public at
+ | large and to the detriment of the Dedicator's heirs and successors.
+ | Dedicator intends this dedication to be an overt act of relinquishment
+ | in perpetuity of all present and future rights under copyright law,
+ | whether vested or contingent, in the Work. Dedicator understands that
+ | such relinquishment of all rights includes the relinquishment of all
+ | rights to enforce (by lawsuit or otherwise) those copyrights in the
+ | Work.
+ |
+ | Dedicator recognizes that, once placed in the public domain, the Work
+ | may be freely reproduced, distributed, transmitted, used, modified,
+ | built upon, or otherwise exploited by anyone for any purpose, commercial
+ | or non-commercial, and in any way, including by methods that have not
+ | yet been invented or conceived.
+ 0] http://creativecommons.org/licenses/publicdomain/
commit fc786015029c1ccc21d8fbbc5c9fbdf55e939fac
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Fri Jul 22 13:50:41 2011 +0200
Releasing debian version 2.0.1+dfsg-3.
diff --git a/debian/changelog b/debian/changelog
index db1d1ea..c3181c3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+tryton-modules-product (2.0.1+dfsg-3) unstable; urgency=low
+
+ * Removing deprecated XB-Python-Version for dh_python2.
+ * Adding license for icons taken from tango project.
+ * Adding myself to debian copyright.
+
+ -- Mathias Behrle <mathiasb at m9s.biz> Fri, 22 Jul 2011 13:50:34 +0200
+
tryton-modules-product (2.0.1+dfsg-2) unstable; urgency=low
* Patching in DFSG compatible icons instead of linking to them,
commit 8ee88cfe6dbe8c55bfc9c08e8a7653731bac0b23
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Fri Jul 22 13:16:25 2011 +0200
Adding myself to debian copyright.
diff --git a/debian/copyright b/debian/copyright
index 0897635..4b9648c 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -73,7 +73,9 @@ Upstream Authors: 2005-2009
[0] http://creativecommons.org/licenses/publicdomain/
Files: debian/*
-Copyright: (C) 2009-2011 Daniel Baumann <daniel at debian.org>
+Copyright:
+ (C) 2009-2011 Daniel Baumann <daniel at debian.org>
+ (C) 2011 Mathias Behrle <mathiasb at m9s.biz>
License: GPL-3+
License: GPL-3+
commit 4eb586b73ab5021c059b4dbc203d103518cd33d0
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Fri Jul 22 13:03:48 2011 +0200
Adding license for icons taken from tango project.
diff --git a/debian/copyright b/debian/copyright
index b2d5d1a..0897635 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -6,6 +6,72 @@ Copyright:
(C) 2008-2011 B2CK SPRL
License: GPL-3+
+Files: icons/*
+Copyright: not applicable
+License: public domain
+
+The icons used to replace the original not DFSG compatible icons are taken
+from http://tango.freedesktop.org/releases/tango-icon-theme-0.8.90.tar.gz
+
+Upstream Authors: 2005-2009
+
+ Ulisse Perusin <uli.peru at gmail.com>
+ Steven Garrity <sgarrity at silverorange.com>
+ Lapo Calamandrei <calamandrei at gmail.com>
+ Ryan Collier <rcollier at novell.com>
+ Rodney Dawes <dobey at novell.com>
+ Andreas Nilsson <nisses.mail at home.se>
+ Tuomas Kuosmanen <tigert at tigert.com>
+ Garrett LeSage <garrett at novell.com>
+ Jakub Steiner <jimmac at novell.com>
+
+ In the preparation of the 0.8.90 release Novell took care of tracking
+ down all the contributors to get them to relicense their artwork
+ into Public Domain.
+
+ The COPYING file of the tarball states the following:
+ | The icons in this repository are herefore released into the Public Domain.
+
+ Additionally the copyright status of the files was tracked in the CVS and the
+ rdf properties of the SVGs adjusted for all files that were put into Public
+ Domain (see rdf:about and rdf:resource). Both fields contain a link to the
+ Creative Commons Public Domain Dediciation[0] as reproduced below:
+ | Public Domain Dedication
+ |
+ | Copyright-Only Dedication (based on United States law) or Public Domain
+ | Certification
+ |
+ | The person or persons who have associated work with this document (the
+ | "Dedicator" or "Certifier") hereby either (a) certifies that, to the best
+ | of his knowledge, the work of authorship identified is in the public
+ | domain of the country from which the work is published, or (b)
+ | hereby dedicates whatever copyright the dedicators holds in the work
+ | of authorship identified below (the "Work") to the public domain. A
+ | certifier, moreover, dedicates any copyright interest he may have in
+ | the associated work, and for these purposes, is described as a
+ | "dedicator" below.
+ |
+ | A certifier has taken reasonable steps to verify the copyright
+ | status of this work. Certifier recognizes that his good faith efforts
+ | may not shield him from liability if in fact the work certified is not
+ | in the public domain.
+ |
+ | Dedicator makes this dedication for the benefit of the public at
+ | large and to the detriment of the Dedicator's heirs and successors.
+ | Dedicator intends this dedication to be an overt act of relinquishment
+ | in perpetuity of all present and future rights under copyright law,
+ | whether vested or contingent, in the Work. Dedicator understands that
+ | such relinquishment of all rights includes the relinquishment of all
+ | rights to enforce (by lawsuit or otherwise) those copyrights in the
+ | Work.
+ |
+ | Dedicator recognizes that, once placed in the public domain, the Work
+ | may be freely reproduced, distributed, transmitted, used, modified,
+ | built upon, or otherwise exploited by anyone for any purpose, commercial
+ | or non-commercial, and in any way, including by methods that have not
+ | yet been invented or conceived.
+ [0] http://creativecommons.org/licenses/publicdomain/
+
Files: debian/*
Copyright: (C) 2009-2011 Daniel Baumann <daniel at debian.org>
License: GPL-3+
commit dd60b0982094644d90d736b05530146459de783a
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Fri Jul 22 12:26:59 2011 +0200
Removing deprecated XB-Python-Version for dh_python2.
diff --git a/debian/control b/debian/control
index 1bea7db..9e77bf7 100644
--- a/debian/control
+++ b/debian/control
@@ -16,7 +16,6 @@ Architecture: all
Depends:
${misc:Depends}, ${python:Depends}, tryton-server (>= 2.0),
python-pkg-resources, tango-icon-theme
-XB-Python-Version: ${python:Versions}
Description: Tryton Application Platform (Product Module)
Tryton is a high-level general purpose application platform written in Python
and using PostgreSQL as database engine. It is the core base of a complete
commit a6d9b04d9dada5719af972b886e56ff3aee9fd62
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Sat Jul 16 23:34:43 2011 +0200
Releasing debian version 2.0.1+dfsg-2.
diff --git a/.pc/.quilt_patches b/.pc/.quilt_patches
new file mode 100644
index 0000000..6857a8d
--- /dev/null
+++ b/.pc/.quilt_patches
@@ -0,0 +1 @@
+debian/patches
diff --git a/.pc/.quilt_series b/.pc/.quilt_series
new file mode 100644
index 0000000..c206706
--- /dev/null
+++ b/.pc/.quilt_series
@@ -0,0 +1 @@
+series
diff --git a/.pc/.version b/.pc/.version
new file mode 100644
index 0000000..0cfbf08
--- /dev/null
+++ b/.pc/.version
@@ -0,0 +1 @@
+2
diff --git a/debian/changelog b/debian/changelog
index 40c577c..db1d1ea 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+tryton-modules-product (2.0.1+dfsg-2) unstable; urgency=low
+
+ * Patching in DFSG compatible icons instead of linking to them,
+ setup.py needs to find them.
+
+ -- Mathias Behrle <mathiasb at m9s.biz> Sat, 16 Jul 2011 23:31:21 +0200
+
tryton-modules-product (2.0.1+dfsg-1) unstable; urgency=low
[ Daniel Baumann ]
commit 71e82335b752717a370b99ab309cb97b1d0338fd
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Sat Jul 16 23:27:27 2011 +0200
Patching in DFSG compatible icons instead of linking to them, setup.py needs to find them.
diff --git a/debian/patches/01-dfsg-icons b/debian/patches/01-dfsg-icons
new file mode 100644
index 0000000..677afc3
--- /dev/null
+++ b/debian/patches/01-dfsg-icons
@@ -0,0 +1,490 @@
+Author: Mathias Behrle <mathiasb at m9s.biz>
+Description: Add DFSG compatible icon as a replacement for the original icon.
+--- /dev/null
++++ b/icons/tryton-product.svg
+@@ -0,0 +1,485 @@
++<?xml version="1.0" encoding="UTF-8" standalone="no"?>
++<!-- Created with Inkscape (http://www.inkscape.org/) -->
++<svg
++ xmlns:dc="http://purl.org/dc/elements/1.1/"
++ xmlns:cc="http://creativecommons.org/ns#"
++ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
++ xmlns:svg="http://www.w3.org/2000/svg"
++ xmlns="http://www.w3.org/2000/svg"
++ xmlns:xlink="http://www.w3.org/1999/xlink"
++ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
++ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
++ sodipodi:docname="package-x-generic.svg"
++ sodipodi:docbase="/home/jimmac/src/cvs/tango-icon-theme/scalable/mimetypes"
++ inkscape:version="0.46"
++ sodipodi:version="0.32"
++ id="svg2963"
++ height="48px"
++ width="48px"
++ inkscape:output_extension="org.inkscape.output.svg.inkscape">
++ <defs
++ id="defs3">
++ <inkscape:perspective
++ sodipodi:type="inkscape:persp3d"
++ inkscape:vp_x="0 : 24 : 1"
++ inkscape:vp_y="0 : 1000 : 0"
++ inkscape:vp_z="48 : 24 : 1"
++ inkscape:persp3d-origin="24 : 16 : 1"
++ id="perspective77" />
++ <radialGradient
++ inkscape:collect="always"
++ xlink:href="#linearGradient5060"
++ id="radialGradient6719"
++ gradientUnits="userSpaceOnUse"
++ gradientTransform="matrix(-2.774389,0,0,1.969706,112.7623,-872.8854)"
++ cx="605.71429"
++ cy="486.64789"
++ fx="605.71429"
++ fy="486.64789"
++ r="117.14286" />
++ <linearGradient
++ inkscape:collect="always"
++ id="linearGradient5060">
++ <stop
++ style="stop-color:black;stop-opacity:1;"
++ offset="0"
++ id="stop5062" />
++ <stop
++ style="stop-color:black;stop-opacity:0;"
++ offset="1"
++ id="stop5064" />
++ </linearGradient>
++ <radialGradient
++ inkscape:collect="always"
++ xlink:href="#linearGradient5060"
++ id="radialGradient6717"
++ gradientUnits="userSpaceOnUse"
++ gradientTransform="matrix(2.774389,0,0,1.969706,-1891.633,-872.8854)"
++ cx="605.71429"
++ cy="486.64789"
++ fx="605.71429"
++ fy="486.64789"
++ r="117.14286" />
++ <linearGradient
++ id="linearGradient5048">
++ <stop
++ style="stop-color:black;stop-opacity:0;"
++ offset="0"
++ id="stop5050" />
++ <stop
++ id="stop5056"
++ offset="0.5"
++ style="stop-color:black;stop-opacity:1;" />
++ <stop
++ style="stop-color:black;stop-opacity:0;"
++ offset="1"
++ id="stop5052" />
++ </linearGradient>
++ <linearGradient
++ inkscape:collect="always"
++ xlink:href="#linearGradient5048"
++ id="linearGradient6715"
++ gradientUnits="userSpaceOnUse"
++ gradientTransform="matrix(2.774389,0,0,1.969706,-1892.179,-872.8854)"
++ x1="302.85715"
++ y1="366.64789"
++ x2="302.85715"
++ y2="609.50507" />
++ <linearGradient
++ inkscape:collect="always"
++ id="linearGradient2884">
++ <stop
++ style="stop-color:#000000;stop-opacity:1;"
++ offset="0"
++ id="stop2886" />
++ <stop
++ style="stop-color:#000000;stop-opacity:0;"
++ offset="1"
++ id="stop2888" />
++ </linearGradient>
++ <linearGradient
++ id="linearGradient2869">
++ <stop
++ style="stop-color:#ffffff;stop-opacity:1;"
++ offset="0"
++ id="stop2871" />
++ <stop
++ style="stop-color:#cccccc;stop-opacity:1.0000000;"
++ offset="1.0000000"
++ id="stop2873" />
++ </linearGradient>
++ <linearGradient
++ id="linearGradient4995">
++ <stop
++ id="stop4997"
++ offset="0"
++ style="stop-color:#de9523;stop-opacity:1;" />
++ <stop
++ id="stop4999"
++ offset="1.0000000"
++ style="stop-color:#a36d18;stop-opacity:1.0000000;" />
++ </linearGradient>
++ <linearGradient
++ id="linearGradient4987"
++ inkscape:collect="always">
++ <stop
++ id="stop4989"
++ offset="0"
++ style="stop-color:#a0670c;stop-opacity:1;" />
++ <stop
++ id="stop4991"
++ offset="1"
++ style="stop-color:#a0670c;stop-opacity:0;" />
++ </linearGradient>
++ <linearGradient
++ id="linearGradient4979">
++ <stop
++ id="stop4981"
++ offset="0.0000000"
++ style="stop-color:#fbf0e0;stop-opacity:1.0000000;" />
++ <stop
++ id="stop4983"
++ offset="1.0000000"
++ style="stop-color:#f0ce99;stop-opacity:1.0000000;" />
++ </linearGradient>
++ <linearGradient
++ id="linearGradient4946"
++ inkscape:collect="always">
++ <stop
++ id="stop4948"
++ offset="0"
++ style="stop-color:#000000;stop-opacity:1;" />
++ <stop
++ id="stop4950"
++ offset="1"
++ style="stop-color:#000000;stop-opacity:0;" />
++ </linearGradient>
++ <linearGradient
++ id="linearGradient4222">
++ <stop
++ id="stop4224"
++ offset="0"
++ style="stop-color:#ffffff;stop-opacity:1;" />
++ <stop
++ id="stop4226"
++ offset="1.0000000"
++ style="stop-color:#ffffff;stop-opacity:0.68639052;" />
++ </linearGradient>
++ <linearGradient
++ id="linearGradient4210">
++ <stop
++ id="stop4212"
++ offset="0.0000000"
++ style="stop-color:#eaba6f;stop-opacity:1.0000000;" />
++ <stop
++ id="stop4214"
++ offset="1.0000000"
++ style="stop-color:#b97a1b;stop-opacity:1.0000000;" />
++ </linearGradient>
++ <linearGradient
++ id="linearGradient4192">
++ <stop
++ id="stop4194"
++ offset="0"
++ style="stop-color:#e9b96e;stop-opacity:1;" />
++ <stop
++ id="stop4196"
++ offset="1.0000000"
++ style="stop-color:#f1d19e;stop-opacity:1.0000000;" />
++ </linearGradient>
++ <linearGradient
++ id="linearGradient4182">
++ <stop
++ id="stop4184"
++ offset="0.0000000"
++ style="stop-color:#a36d18;stop-opacity:1.0000000;" />
++ <stop
++ id="stop4186"
++ offset="1.0000000"
++ style="stop-color:#d79020;stop-opacity:1.0000000;" />
++ </linearGradient>
++ <radialGradient
++ inkscape:collect="always"
++ xlink:href="#linearGradient4946"
++ id="radialGradient2252"
++ gradientUnits="userSpaceOnUse"
++ gradientTransform="matrix(1.000000,0.000000,0.000000,0.333333,2.658463e-16,23.58206)"
++ cx="22.930462"
++ cy="35.373093"
++ fx="22.930462"
++ fy="35.373093"
++ r="17.576654" />
++ <linearGradient
++ inkscape:collect="always"
++ xlink:href="#linearGradient4979"
++ id="linearGradient2269"
++ gradientUnits="userSpaceOnUse"
++ x1="30.062469"
++ y1="13.444801"
++ x2="17.696169"
++ y2="12.333632" />
++ <linearGradient
++ inkscape:collect="always"
++ xlink:href="#linearGradient4995"
++ id="linearGradient2274"
++ gradientUnits="userSpaceOnUse"
++ x1="36.288929"
++ y1="14.661557"
++ x2="47.065835"
++ y2="15.267649" />
++ <linearGradient
++ inkscape:collect="always"
++ xlink:href="#linearGradient4192"
++ id="linearGradient2277"
++ gradientUnits="userSpaceOnUse"
++ gradientTransform="matrix(1.000000,0.000000,0.000000,0.986355,0.000000,0.316638)"
++ x1="25.381256"
++ y1="24.720648"
++ x2="24.119167"
++ y2="16.170370" />
++ <linearGradient
++ inkscape:collect="always"
++ xlink:href="#linearGradient4182"
++ id="linearGradient2280"
++ gradientUnits="userSpaceOnUse"
++ gradientTransform="matrix(1.000000,0.000000,0.000000,1.039184,0.000000,-4.057054e-2)"
++ x1="16.148972"
++ y1="12.636667"
++ x2="34.193642"
++ y2="12.636667" />
++ <linearGradient
++ inkscape:collect="always"
++ xlink:href="#linearGradient4987"
++ id="linearGradient2282"
++ gradientUnits="userSpaceOnUse"
++ x1="21.906841"
++ y1="9.7577486"
++ x2="22.071806"
++ y2="16.020695" />
++ <linearGradient
++ inkscape:collect="always"
++ xlink:href="#linearGradient4222"
++ id="linearGradient2285"
++ gradientUnits="userSpaceOnUse"
++ x1="18.706615"
++ y1="19.912336"
++ x2="30.014812"
++ y2="47.388485" />
++ <linearGradient
++ inkscape:collect="always"
++ xlink:href="#linearGradient4210"
++ id="linearGradient2288"
++ gradientUnits="userSpaceOnUse"
++ x1="24.990499"
++ y1="34.004856"
++ x2="24.990499"
++ y2="22.585211" />
++ <radialGradient
++ inkscape:collect="always"
++ xlink:href="#linearGradient2884"
++ id="radialGradient2896"
++ gradientUnits="userSpaceOnUse"
++ gradientTransform="matrix(1.353283,5.468101e-16,-1.144754e-13,0.635968,-8.458890,3.413470)"
++ cx="23.943670"
++ cy="20.800287"
++ fx="23.943670"
++ fy="20.800287"
++ r="6.4286140" />
++ <radialGradient
++ inkscape:collect="always"
++ xlink:href="#linearGradient2869"
++ id="radialGradient2898"
++ gradientUnits="userSpaceOnUse"
++ gradientTransform="matrix(0.749420,0.000000,0.000000,0.394055,6.226925,10.09253)"
++ cx="21.578989"
++ cy="9.0255041"
++ fx="21.578989"
++ fy="9.0255041"
++ r="9.5862970" />
++ <radialGradient
++ inkscape:collect="always"
++ xlink:href="#linearGradient2884"
++ id="radialGradient2906"
++ gradientUnits="userSpaceOnUse"
++ gradientTransform="matrix(1.353283,5.468101e-16,-1.144754e-13,0.635968,-8.458890,3.413470)"
++ cx="23.943670"
++ cy="20.800287"
++ fx="23.943670"
++ fy="20.800287"
++ r="6.4286140" />
++ <radialGradient
++ inkscape:collect="always"
++ xlink:href="#linearGradient2869"
++ id="radialGradient2908"
++ gradientUnits="userSpaceOnUse"
++ gradientTransform="matrix(0.749420,0.000000,0.000000,0.394055,6.226925,10.09253)"
++ cx="21.578989"
++ cy="9.8105707"
++ fx="21.578989"
++ fy="9.8105707"
++ r="9.5862970" />
++ </defs>
++ <sodipodi:namedview
++ inkscape:window-y="142"
++ inkscape:window-x="392"
++ inkscape:window-height="706"
++ inkscape:window-width="872"
++ stroke="#c17d11"
++ fill="#e9b96e"
++ inkscape:showpageshadow="false"
++ inkscape:document-units="px"
++ inkscape:grid-bbox="true"
++ showgrid="false"
++ inkscape:current-layer="layer1"
++ inkscape:cy="39.004018"
++ inkscape:cx="74.637005"
++ inkscape:zoom="1"
++ inkscape:pageshadow="2"
++ inkscape:pageopacity="0.0"
++ borderopacity="0.16470588"
++ bordercolor="#666666"
++ pagecolor="#ffffff"
++ id="base" />
++ <metadata
++ id="metadata4">
++ <rdf:RDF>
++ <cc:Work
++ rdf:about="">
++ <dc:format>image/svg+xml</dc:format>
++ <dc:type
++ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
++ <dc:title>Package</dc:title>
++ <dc:creator>
++ <cc:Agent>
++ <dc:title>Jakub Steiner</dc:title>
++ </cc:Agent>
++ </dc:creator>
++ <dc:source>http://jimmac.musichall.cz/</dc:source>
++ <dc:subject>
++ <rdf:Bag>
++ <rdf:li>package</rdf:li>
++ <rdf:li>archive</rdf:li>
++ <rdf:li>tarball</rdf:li>
++ <rdf:li>tar</rdf:li>
++ <rdf:li>bzip</rdf:li>
++ <rdf:li>gzip</rdf:li>
++ <rdf:li>zip</rdf:li>
++ <rdf:li>arj</rdf:li>
++ <rdf:li>tar</rdf:li>
++ <rdf:li>jar</rdf:li>
++ </rdf:Bag>
++ </dc:subject>
++ <cc:license
++ rdf:resource="http://creativecommons.org/licenses/publicdomain/" />
++ </cc:Work>
++ <cc:License
++ rdf:about="http://creativecommons.org/licenses/publicdomain/">
++ <cc:permits
++ rdf:resource="http://creativecommons.org/ns#Reproduction" />
++ <cc:permits
++ rdf:resource="http://creativecommons.org/ns#Distribution" />
++ <cc:permits
++ rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
++ </cc:License>
++ </rdf:RDF>
++ </metadata>
++ <g
++ inkscape:groupmode="layer"
++ inkscape:label="Layer 1"
++ id="layer1">
++ <g
++ style="display:inline"
++ transform="matrix(2.105461e-2,0,0,2.086758e-2,42.60172,35.4036)"
++ id="g6707">
++ <rect
++ style="opacity:0.40206185;color:black;fill:url(#linearGradient6715);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
++ id="rect6709"
++ width="1339.6335"
++ height="478.35718"
++ x="-1559.2523"
++ y="-150.69685" />
++ <path
++ style="opacity:0.40206185;color:black;fill:url(#radialGradient6717);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
++ d="M -219.61876,-150.68038 C -219.61876,-150.68038 -219.61876,327.65041 -219.61876,327.65041 C -76.744594,328.55086 125.78146,220.48075 125.78138,88.454235 C 125.78138,-43.572302 -33.655436,-150.68036 -219.61876,-150.68038 z "
++ id="path6711"
++ sodipodi:nodetypes="cccc" />
++ <path
++ sodipodi:nodetypes="cccc"
++ id="path6713"
++ d="M -1559.2523,-150.68038 C -1559.2523,-150.68038 -1559.2523,327.65041 -1559.2523,327.65041 C -1702.1265,328.55086 -1904.6525,220.48075 -1904.6525,88.454235 C -1904.6525,-43.572302 -1745.2157,-150.68036 -1559.2523,-150.68038 z "
++ style="opacity:0.40206185;color:black;fill:url(#radialGradient6719);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
++ </g>
++ <rect
++ ry="2.3944440"
++ rx="2.4241352"
++ y="15.275433"
++ x="7.4623847"
++ height="23.112879"
++ width="31.978371"
++ id="rect3115"
++ style="opacity:1.0000000;color:#000000;fill:url(#linearGradient2288);fill-opacity:1.0000000;fill-rule:nonzero;stroke:#a0670c;stroke-width:1.0000007;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4.0000000;stroke-dasharray:none;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000;visibility:visible;display:block;overflow:visible" />
++ <rect
++ style="opacity:0.48101267;color:#000000;fill:none;fill-opacity:1.0000000;fill-rule:nonzero;stroke:url(#linearGradient2285);stroke-width:1.0000011;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4.0000000;stroke-dasharray:none;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000;visibility:visible;display:block;overflow:visible"
++ id="rect4220"
++ width="29.804138"
++ height="21.075352"
++ x="8.4989996"
++ y="16.243698"
++ rx="1.2846882"
++ ry="1.2846882" />
++ <path
++ sodipodi:nodetypes="ccccc"
++ id="path4162"
++ d="M 8.7697819,16.547178 L 13.819731,9.7363408 L 32.615291,9.6353255 L 37.835264,16.408941 L 8.7697819,16.547178 z "
++ style="fill:url(#linearGradient2280);fill-opacity:1.0000000;fill-rule:evenodd;stroke:url(#linearGradient2282);stroke-width:1.0000008;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4.0000000;stroke-dasharray:none;stroke-opacity:1.0000000" />
++ <path
++ sodipodi:nodetypes="ccccc"
++ id="path4164"
++ d="M 38.276321,16.325703 L 43.469269,23.520364 L 3.9609455,23.520364 L 8.6250143,16.320763 L 38.276321,16.325703 z "
++ style="opacity:1.0000000;color:#000000;fill:url(#linearGradient2277);fill-opacity:1.0000000;fill-rule:nonzero;stroke:#a0670c;stroke-width:1.0000005;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4.0000000;stroke-dasharray:none;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000;visibility:visible;display:block;overflow:visible" />
++ <path
++ sodipodi:nodetypes="ccccc"
++ id="path4178"
++ d="M 32.849333,9.6141009 L 37.532219,16.536370 L 46.565835,20.921197 L 38.451329,12.008545 L 32.849333,9.6141009 z "
++ style="opacity:1.0000000;color:#000000;fill:url(#linearGradient2274);fill-opacity:1.0000000;fill-rule:nonzero;stroke:#a0670c;stroke-width:1.0000005;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4.0000000;stroke-dasharray:none;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000;visibility:visible;display:block;overflow:visible" />
++ <path
++ sodipodi:nodetypes="ccccc"
++ style="opacity:1.0000000;color:#000000;fill:#f8e8cf;fill-opacity:1.0000000;fill-rule:nonzero;stroke:#a0670c;stroke-width:1.0000000;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4.0000000;stroke-dasharray:none;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000;visibility:visible;display:block;overflow:visible"
++ d="M 13.617702,9.7151161 L 9.6419233,16.435355 L 0.50729183,20.820182 L 8.6217973,11.907530 L 13.617702,9.7151161 z "
++ id="path4180" />
++ <path
++ style="opacity:1.0000000;color:#000000;fill:none;fill-opacity:1.0000000;fill-rule:nonzero;stroke:#f4e3ca;stroke-width:1.0000000;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4.0000000;stroke-dasharray:none;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000;visibility:visible;display:block;overflow:visible"
++ d="M 37.024959,16.436050 L 41.478871,22.493011 L 5.6482792,22.493011 L 9.7892982,16.312694 L 37.024959,16.436050 z "
++ id="path4954"
++ sodipodi:nodetypes="ccccc" />
++ <g
++ id="g2892"
++ transform="matrix(0.676538,0.000000,0.000000,1.000000,3.994869,0.000000)">
++ <path
++ style="opacity:1.0000000;color:#000000;fill:url(#radialGradient2896);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:2.0000000;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4.0000000;stroke-dasharray:none;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000;visibility:visible;display:inline;overflow:visible"
++ d="M 23.926073,12.101621 C 18.588065,12.101621 14.282569,14.129809 14.282569,16.641813 L 33.604773,16.641813 C 33.604773,14.129809 29.264081,12.101621 23.926073,12.101621 z "
++ id="path2882" />
++ <path
++ id="path2141"
++ d="M 23.931961,12.861168 C 20.379986,12.861168 17.515057,14.210748 17.515057,15.882266 L 30.372285,15.882266 C 30.372285,14.210748 27.483936,12.861168 23.931961,12.861168 z "
++ style="opacity:1.0000000;color:#000000;fill:url(#radialGradient2898);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:2.0000000;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4.0000000;stroke-dasharray:none;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000;visibility:visible;display:inline;overflow:visible" />
++ </g>
++ <g
++ transform="matrix(0.676538,0.000000,0.000000,1.000000,10.49487,0.000000)"
++ id="g2900">
++ <path
++ id="path2902"
++ d="M 23.926073,12.101621 C 18.588065,12.101621 14.282569,14.129809 14.282569,16.641813 L 33.604773,16.641813 C 33.604773,14.129809 29.264081,12.101621 23.926073,12.101621 z "
++ style="opacity:1.0000000;color:#000000;fill:url(#radialGradient2906);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:2.0000000;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4.0000000;stroke-dasharray:none;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000;visibility:visible;display:inline;overflow:visible" />
++ <path
++ style="opacity:1.0000000;color:#000000;fill:url(#radialGradient2908);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:2.0000000;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4.0000000;stroke-dasharray:none;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000;visibility:visible;display:inline;overflow:visible"
++ d="M 23.931961,12.861168 C 20.379986,12.861168 17.515057,14.210748 17.515057,15.882266 L 30.372285,15.882266 C 30.372285,14.210748 27.483936,12.861168 23.931961,12.861168 z "
++ id="path2904" />
++ </g>
++ <path
++ style="opacity:0.87974685;fill:none;fill-opacity:1.0000000;fill-rule:evenodd;stroke:url(#linearGradient2269);stroke-width:1.0000000;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4.0000000;stroke-dasharray:none;stroke-opacity:1.0000000"
++ d="M 9.6523127,16.371803 L 13.036643,10.593020 L 33.514841,10.517799 L 37.356782,16.369880 L 9.6523127,16.371803 z "
++ id="path4966"
++ sodipodi:nodetypes="ccccc" />
++ </g>
++</svg>
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..a127545
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+01-dfsg-icons
diff --git a/debian/tryton-modules-product.links b/debian/tryton-modules-product.links
deleted file mode 100644
index 8f8f6db..0000000
--- a/debian/tryton-modules-product.links
+++ /dev/null
@@ -1 +0,0 @@
-/usr/share/icons/Tango/scalable/mimetypes/package-x-generic.svg /usr/share/pyshared/trytond/modules/product/icons/tryton-product.svg
commit 30a1b24b81d77a59e8653ed73e94424b2b199549
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Thu Jul 14 01:20:11 2011 +0200
Releasing debian version 2.0.1+dfsg-1.
diff --git a/debian/changelog b/debian/changelog
index 2d0654f..40c577c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,19 @@
+tryton-modules-product (2.0.1+dfsg-1) unstable; urgency=low
+
+ [ Daniel Baumann ]
+ * Removing for new source package version obsoleted README.source file.
+ * Adding options for source package.
+ * Compacting copyright file.
+ * Not wrapping uploaders field, it does not exceed 80 chars.
+
+ [ Mathias Behrle ]
+ * Merging upstream version 2.0.1+dfsg.
+ * Replacing non-DFSG compliant graphics by linking to tango-icon-theme.
+ * Moving from deprecated python-support to dh_python2, thanks to
+ Charlie Smotherman <cjsmo at cableone.net> (Closes: #632894).
+
+ -- Mathias Behrle <mathiasb at m9s.biz> Thu, 14 Jul 2011 01:19:37 +0200
+
tryton-modules-product (2.0.1-1) unstable; urgency=low
* Updating to standards version 3.9.2.
commit 7dd19b2a0e92df0409dd5a4cf8180d8cf4b2840c
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Wed Jul 13 19:09:27 2011 +0200
Moving from deprecated python-support to dh_python2, thanks to Charlie Smotherman <cjsmo at cableone.net> (Closes: #632894).
diff --git a/debian/control b/debian/control
index 68e9416..1bea7db 100644
--- a/debian/control
+++ b/debian/control
@@ -4,11 +4,12 @@ Priority: optional
Maintainer: Debian Tryton Maintainers <tryton at lists.debian-maintainers.org>
Uploaders: Daniel Baumann <daniel at debian.org>, Mathias Behrle <mathiasb at m9s.biz>
Dm-Upload-Allowed: yes
-Build-Depends: debhelper (>= 8), python, python-setuptools, python-support
+Build-Depends: debhelper (>= 8), python (>= 2.6.6-3~), python-setuptools
Standards-Version: 3.9.2
Homepage: http://www.tryton.org/
Vcs-Browser: http://git.debian-maintainers.org/?p=tryton/tryton-modules-product.git
Vcs-Git: git://git.debian-maintainers.org/git/tryton/tryton-modules-product.git
+X-Python-Version: >= 2.5
Package: tryton-modules-product
Architecture: all
diff --git a/debian/pycompat b/debian/pycompat
deleted file mode 100644
index 0cfbf08..0000000
--- a/debian/pycompat
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/debian/pyversions b/debian/pyversions
deleted file mode 100644
index b3dc41e..0000000
--- a/debian/pyversions
+++ /dev/null
@@ -1 +0,0 @@
-2.5-
diff --git a/debian/rules b/debian/rules
index 000210b..e32b791 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,4 +1,9 @@
#!/usr/bin/make -f
%:
- dh ${@}
+ dh ${@} --with python2
+
+override_dh_auto_clean:
+ dh_auto_clean
+
+ rm -rf *.egg-info
commit 5586139b425c314f5e16d1f9babb5acad57cf985
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Wed Jul 13 13:49:13 2011 +0200
Replacing non-DFSG compliant graphics by linking to tango-icon-theme.
diff --git a/debian/control b/debian/control
index 44e1953..68e9416 100644
--- a/debian/control
+++ b/debian/control
@@ -14,7 +14,7 @@ Package: tryton-modules-product
Architecture: all
Depends:
${misc:Depends}, ${python:Depends}, tryton-server (>= 2.0),
- python-pkg-resources
+ python-pkg-resources, tango-icon-theme
XB-Python-Version: ${python:Versions}
Description: Tryton Application Platform (Product Module)
Tryton is a high-level general purpose application platform written in Python
diff --git a/debian/tryton-modules-product.links b/debian/tryton-modules-product.links
new file mode 100644
index 0000000..8f8f6db
--- /dev/null
+++ b/debian/tryton-modules-product.links
@@ -0,0 +1 @@
+/usr/share/icons/Tango/scalable/mimetypes/package-x-generic.svg /usr/share/pyshared/trytond/modules/product/icons/tryton-product.svg
commit bff3ab3a6532507e96b8a57db87f1ce558d08444
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Tue Jul 12 16:47:19 2011 +0200
Merging upstream version 2.0.1+dfsg.
diff --git a/icons/LICENSE b/icons/LICENSE
deleted file mode 100644
index 11782c0..0000000
--- a/icons/LICENSE
+++ /dev/null
@@ -1,264 +0,0 @@
- [1]Creative Commons
-
- Creative Commons Legal Code
-
- Attribution-ShareAlike 2.0
- CREATIVE COMMONS CORPORATION IS NOT A LAW FIRM AND DOES NOT PROVIDE
- LEGAL SERVICES. DISTRIBUTION OF THIS LICENSE DOES NOT CREATE AN
- ATTORNEY-CLIENT RELATIONSHIP. CREATIVE COMMONS PROVIDES THIS
- INFORMATION ON AN "AS-IS" BASIS. CREATIVE COMMONS MAKES NO WARRANTIES
- REGARDING THE INFORMATION PROVIDED, AND DISCLAIMS LIABILITY FOR
- DAMAGES RESULTING FROM ITS USE.
-
- License
-
- THE WORK (AS DEFINED BELOW) IS PROVIDED UNDER THE TERMS OF THIS
- CREATIVE COMMONS PUBLIC LICENSE ("CCPL" OR "LICENSE"). THE WORK IS
- PROTECTED BY COPYRIGHT AND/OR OTHER APPLICABLE LAW. ANY USE OF THE
- WORK OTHER THAN AS AUTHORIZED UNDER THIS LICENSE OR COPYRIGHT LAW IS
- PROHIBITED.
-
- BY EXERCISING ANY RIGHTS TO THE WORK PROVIDED HERE, YOU ACCEPT AND
- AGREE TO BE BOUND BY THE TERMS OF THIS LICENSE. THE LICENSOR GRANTS
- YOU THE RIGHTS CONTAINED HERE IN CONSIDERATION OF YOUR ACCEPTANCE OF
- SUCH TERMS AND CONDITIONS.
-
- 1. Definitions
- a. "Collective Work" means a work, such as a periodical issue,
- anthology or encyclopedia, in which the Work in its entirety in
- unmodified form, along with a number of other contributions,
- constituting separate and independent works in themselves, are
- assembled into a collective whole. A work that constitutes a
- Collective Work will not be considered a Derivative Work (as
- defined below) for the purposes of this License.
- b. "Derivative Work" means a work based upon the Work or upon the
- Work and other pre-existing works, such as a translation, musical
- arrangement, dramatization, fictionalization, motion picture
- version, sound recording, art reproduction, abridgment,
- condensation, or any other form in which the Work may be recast,
- transformed, or adapted, except that a work that constitutes a
- Collective Work will not be considered a Derivative Work for the
- purpose of this License. For the avoidance of doubt, where the
- Work is a musical composition or sound recording, the
- synchronization of the Work in timed-relation with a moving image
- ("synching") will be considered a Derivative Work for the purpose
- of this License.
- c. "Licensor" means the individual or entity that offers the Work
- under the terms of this License.
- d. "Original Author" means the individual or entity who created the
- Work.
- e. "Work" means the copyrightable work of authorship offered under
- the terms of this License.
- f. "You" means an individual or entity exercising rights under this
- License who has not previously violated the terms of this License
- with respect to the Work, or who has received express permission
- from the Licensor to exercise rights under this License despite a
- previous violation.
- g. "License Elements" means the following high-level license
- attributes as selected by Licensor and indicated in the title of
- this License: Attribution, ShareAlike.
-
- 2. Fair Use Rights. Nothing in this license is intended to reduce,
- limit, or restrict any rights arising from fair use, first sale or
- other limitations on the exclusive rights of the copyright owner under
- copyright law or other applicable laws.
-
- 3. License Grant. Subject to the terms and conditions of this License,
- Licensor hereby grants You a worldwide, royalty-free, non-exclusive,
- perpetual (for the duration of the applicable copyright) license to
- exercise the rights in the Work as stated below:
- a. to reproduce the Work, to incorporate the Work into one or more
- Collective Works, and to reproduce the Work as incorporated in the
- Collective Works;
- b. to create and reproduce Derivative Works;
- c. to distribute copies or phonorecords of, display publicly, perform
- publicly, and perform publicly by means of a digital audio
- transmission the Work including as incorporated in Collective
- Works;
- d. to distribute copies or phonorecords of, display publicly, perform
- publicly, and perform publicly by means of a digital audio
- transmission Derivative Works.
- e. For the avoidance of doubt, where the work is a musical
- composition:
- i. Performance Royalties Under Blanket Licenses. Licensor waives
- the exclusive right to collect, whether individually or via a
- performance rights society (e.g. ASCAP, BMI, SESAC),
- royalties for the public performance or public digital
- performance (e.g. webcast) of the Work.
- ii. Mechanical Rights and Statutory Royalties. Licensor waives
- the exclusive right to collect, whether individually or via a
- music rights society or designated agent (e.g. Harry Fox
- Agency), royalties for any phonorecord You create from the
- Work ("cover version") and distribute, subject to the
- compulsory license created by 17 USC Section 115 of the US
- Copyright Act (or the equivalent in other jurisdictions).
- f. Webcasting Rights and Statutory Royalties. For the avoidance of
- doubt, where the Work is a sound recording, Licensor waives the
- exclusive right to collect, whether individually or via a
- performance-rights society (e.g. SoundExchange), royalties for the
- public digital performance (e.g. webcast) of the Work, subject to
- the compulsory license created by 17 USC Section 114 of the US
- Copyright Act (or the equivalent in other jurisdictions).
-
- The above rights may be exercised in all media and formats whether now
- known or hereafter devised. The above rights include the right to make
- such modifications as are technically necessary to exercise the rights
- in other media and formats. All rights not expressly granted by
- Licensor are hereby reserved.
-
- 4. Restrictions.The license granted in Section 3 above is expressly
- made subject to and limited by the following restrictions:
- a. You may distribute, publicly display, publicly perform, or
- publicly digitally perform the Work only under the terms of this
- License, and You must include a copy of, or the Uniform Resource
- Identifier for, this License with every copy or phonorecord of the
- Work You distribute, publicly display, publicly perform, or
- publicly digitally perform. You may not offer or impose any terms
- on the Work that alter or restrict the terms of this License or
- the recipients' exercise of the rights granted hereunder. You may
- not sublicense the Work. You must keep intact all notices that
- refer to this License and to the disclaimer of warranties. You may
- not distribute, publicly display, publicly perform, or publicly
- digitally perform the Work with any technological measures that
- control access or use of the Work in a manner inconsistent with
- the terms of this License Agreement. The above applies to the Work
- as incorporated in a Collective Work, but this does not require
- the Collective Work apart from the Work itself to be made subject
- to the terms of this License. If You create a Collective Work,
- upon notice from any Licensor You must, to the extent practicable,
- remove from the Collective Work any reference to such Licensor or
- the Original Author, as requested. If You create a Derivative
- Work, upon notice from any Licensor You must, to the extent
- practicable, remove from the Derivative Work any reference to such
- Licensor or the Original Author, as requested.
- b. You may distribute, publicly display, publicly perform, or
- publicly digitally perform a Derivative Work only under the terms
- of this License, a later version of this License with the same
- License Elements as this License, or a Creative Commons iCommons
- license that contains the same License Elements as this License
- (e.g. Attribution-ShareAlike 2.0 Japan). You must include a copy
- of, or the Uniform Resource Identifier for, this License or other
- license specified in the previous sentence with every copy or
- phonorecord of each Derivative Work You distribute, publicly
- display, publicly perform, or publicly digitally perform. You may
- not offer or impose any terms on the Derivative Works that alter
- or restrict the terms of this License or the recipients' exercise
- of the rights granted hereunder, and You must keep intact all
- notices that refer to this License and to the disclaimer of
- warranties. You may not distribute, publicly display, publicly
- perform, or publicly digitally perform the Derivative Work with
- any technological measures that control access or use of the Work
- in a manner inconsistent with the terms of this License Agreement.
- The above applies to the Derivative Work as incorporated in a
- Collective Work, but this does not require the Collective Work
- apart from the Derivative Work itself to be made subject to the
- terms of this License.
- c. If you distribute, publicly display, publicly perform, or publicly
- digitally perform the Work or any Derivative Works or Collective
- Works, You must keep intact all copyright notices for the Work and
- give the Original Author credit reasonable to the medium or means
- You are utilizing by conveying the name (or pseudonym if
- applicable) of the Original Author if supplied; the title of the
- Work if supplied; to the extent reasonably practicable, the
- Uniform Resource Identifier, if any, that Licensor specifies to be
- associated with the Work, unless such URI does not refer to the
- copyright notice or licensing information for the Work; and in the
- case of a Derivative Work, a credit identifying the use of the
- Work in the Derivative Work (e.g., "French translation of the Work
- by Original Author," or "Screenplay based on original Work by
- Original Author"). Such credit may be implemented in any
- reasonable manner; provided, however, that in the case of a
- Derivative Work or Collective Work, at a minimum such credit will
- appear where any other comparable authorship credit appears and in
- a manner at least as prominent as such other comparable authorship
- credit.
-
- 5. Representations, Warranties and Disclaimer
-
- UNLESS OTHERWISE AGREED TO BY THE PARTIES IN WRITING, LICENSOR OFFERS
- THE WORK AS-IS AND MAKES NO REPRESENTATIONS OR WARRANTIES OF ANY KIND
- CONCERNING THE MATERIALS, EXPRESS, IMPLIED, STATUTORY OR OTHERWISE,
- INCLUDING, WITHOUT LIMITATION, WARRANTIES OF TITLE, MERCHANTIBILITY,
- FITNESS FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR THE ABSENCE OF
- LATENT OR OTHER DEFECTS, ACCURACY, OR THE PRESENCE OF ABSENCE OF
- ERRORS, WHETHER OR NOT DISCOVERABLE. SOME JURISDICTIONS DO NOT ALLOW
- THE EXCLUSION OF IMPLIED WARRANTIES, SO SUCH EXCLUSION MAY NOT APPLY
- TO YOU.
-
- 6. Limitation on Liability. EXCEPT TO THE EXTENT REQUIRED BY
- APPLICABLE LAW, IN NO EVENT WILL LICENSOR BE LIABLE TO YOU ON ANY
- LEGAL THEORY FOR ANY SPECIAL, INCIDENTAL, CONSEQUENTIAL, PUNITIVE OR
- EXEMPLARY DAMAGES ARISING OUT OF THIS LICENSE OR THE USE OF THE WORK,
- EVEN IF LICENSOR HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
- 7. Termination
- a. This License and the rights granted hereunder will terminate
- automatically upon any breach by You of the terms of this License.
- Individuals or entities who have received Derivative Works or
- Collective Works from You under this License, however, will not
- have their licenses terminated provided such individuals or
- entities remain in full compliance with those licenses. Sections
- 1, 2, 5, 6, 7, and 8 will survive any termination of this License.
- b. Subject to the above terms and conditions, the license granted
- here is perpetual (for the duration of the applicable copyright in
- the Work). Notwithstanding the above, Licensor reserves the right
- to release the Work under different license terms or to stop
- distributing the Work at any time; provided, however that any such
- election will not serve to withdraw this License (or any other
- license that has been, or is required to be, granted under the
- terms of this License), and this License will continue in full
- force and effect unless terminated as stated above.
-
- 8. Miscellaneous
- a. Each time You distribute or publicly digitally perform the Work or
- a Collective Work, the Licensor offers to the recipient a license
- to the Work on the same terms and conditions as the license
- granted to You under this License.
- b. Each time You distribute or publicly digitally perform a
- Derivative Work, Licensor offers to the recipient a license to the
- original Work on the same terms and conditions as the license
- granted to You under this License.
- c. If any provision of this License is invalid or unenforceable under
- applicable law, it shall not affect the validity or enforceability
- of the remainder of the terms of this License, and without further
- action by the parties to this agreement, such provision shall be
- reformed to the minimum extent necessary to make such provision
- valid and enforceable.
- d. No term or provision of this License shall be deemed waived and no
- breach consented to unless such waiver or consent shall be in
- writing and signed by the party to be charged with such waiver or
- consent.
- e. This License constitutes the entire agreement between the parties
- with respect to the Work licensed here. There are no
- understandings, agreements or representations with respect to the
- Work not specified here. Licensor shall not be bound by any
- additional provisions that may appear in any communication from
- You. This License may not be modified without the mutual written
- agreement of the Licensor and You.
-
- Creative Commons is not a party to this License, and makes no warranty
- whatsoever in connection with the Work. Creative Commons will not be
- liable to You or any party on any legal theory for any damages
- whatsoever, including without limitation any general, special,
- incidental or consequential damages arising in connection to this
- license. Notwithstanding the foregoing two (2) sentences, if Creative
- Commons has expressly identified itself as the Licensor hereunder, it
- shall have all rights and obligations of Licensor.
-
- Except for the limited purpose of indicating to the public that the
- Work is licensed under the CCPL, neither party will use the trademark
- "Creative Commons" or any related trademark or logo of Creative
- Commons without the prior written consent of Creative Commons. Any
- permitted use will be in compliance with Creative Commons'
- then-current trademark usage guidelines, as may be published on its
- website or otherwise made available upon request from time to time.
-
- Creative Commons may be contacted at [2]http://creativecommons.org/.
-
- [3]« Back to Commons Deed
-
-References
-
- 1. http://creativecommons.org/
- 2. http://creativecommons.org/
- 3. http://creativecommons.org/licenses/by-sa/2.0/
diff --git a/icons/tryton-product.svg b/icons/tryton-product.svg
deleted file mode 100644
index dced3c4..0000000
--- a/icons/tryton-product.svg
+++ /dev/null
@@ -1,483 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg
- xmlns:dc="http://purl.org/dc/elements/1.1/"
- xmlns:cc="http://web.resource.org/cc/"
- xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:svg="http://www.w3.org/2000/svg"
- xmlns="http://www.w3.org/2000/svg"
- xmlns:xlink="http://www.w3.org/1999/xlink"
- xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
- xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
- sodipodi:docname="package-x-generic.svg"
- sodipodi:docbase="/home/jimmac/src/cvs/tango-icon-theme/scalable/mimetypes"
- inkscape:version="0.43+devel"
- sodipodi:version="0.32"
- id="svg2963"
- height="48px"
- width="48px">
- <defs
- id="defs3">
- <radialGradient
- inkscape:collect="always"
- xlink:href="#linearGradient5060"
- id="radialGradient6719"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(-2.774389,0,0,1.969706,112.7623,-872.8854)"
- cx="605.71429"
- cy="486.64789"
- fx="605.71429"
- fy="486.64789"
- r="117.14286" />
- <linearGradient
- inkscape:collect="always"
- id="linearGradient5060">
- <stop
- style="stop-color:black;stop-opacity:1;"
- offset="0"
- id="stop5062" />
- <stop
- style="stop-color:black;stop-opacity:0;"
- offset="1"
- id="stop5064" />
- </linearGradient>
- <radialGradient
- inkscape:collect="always"
- xlink:href="#linearGradient5060"
- id="radialGradient6717"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(2.774389,0,0,1.969706,-1891.633,-872.8854)"
- cx="605.71429"
- cy="486.64789"
- fx="605.71429"
- fy="486.64789"
- r="117.14286" />
- <linearGradient
- id="linearGradient5048">
- <stop
- style="stop-color:black;stop-opacity:0;"
- offset="0"
- id="stop5050" />
- <stop
- id="stop5056"
- offset="0.5"
- style="stop-color:black;stop-opacity:1;" />
- <stop
- style="stop-color:black;stop-opacity:0;"
- offset="1"
- id="stop5052" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient5048"
- id="linearGradient6715"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(2.774389,0,0,1.969706,-1892.179,-872.8854)"
- x1="302.85715"
- y1="366.64789"
- x2="302.85715"
- y2="609.50507" />
- <linearGradient
- inkscape:collect="always"
- id="linearGradient2884">
- <stop
- style="stop-color:#000000;stop-opacity:1;"
- offset="0"
- id="stop2886" />
- <stop
- style="stop-color:#000000;stop-opacity:0;"
- offset="1"
- id="stop2888" />
- </linearGradient>
- <linearGradient
- id="linearGradient2869">
- <stop
- style="stop-color:#ffffff;stop-opacity:1;"
- offset="0"
- id="stop2871" />
- <stop
- style="stop-color:#cccccc;stop-opacity:1.0000000;"
- offset="1.0000000"
- id="stop2873" />
- </linearGradient>
- <linearGradient
- id="linearGradient4995">
- <stop
- id="stop4997"
- offset="0"
- style="stop-color:#de9523;stop-opacity:1;" />
- <stop
- id="stop4999"
- offset="1.0000000"
- style="stop-color:#a36d18;stop-opacity:1.0000000;" />
- </linearGradient>
- <linearGradient
- id="linearGradient4987"
- inkscape:collect="always">
- <stop
- id="stop4989"
- offset="0"
- style="stop-color:#a0670c;stop-opacity:1;" />
- <stop
- id="stop4991"
- offset="1"
- style="stop-color:#a0670c;stop-opacity:0;" />
- </linearGradient>
- <linearGradient
- id="linearGradient4979">
- <stop
- id="stop4981"
- offset="0.0000000"
- style="stop-color:#fbf0e0;stop-opacity:1.0000000;" />
- <stop
- id="stop4983"
- offset="1.0000000"
- style="stop-color:#f0ce99;stop-opacity:1.0000000;" />
- </linearGradient>
- <linearGradient
- id="linearGradient4946"
- inkscape:collect="always">
- <stop
- id="stop4948"
- offset="0"
- style="stop-color:#000000;stop-opacity:1;" />
- <stop
- id="stop4950"
- offset="1"
- style="stop-color:#000000;stop-opacity:0;" />
- </linearGradient>
- <linearGradient
- id="linearGradient4222">
- <stop
- id="stop4224"
- offset="0"
- style="stop-color:#ffffff;stop-opacity:1;" />
- <stop
- id="stop4226"
- offset="1.0000000"
- style="stop-color:#ffffff;stop-opacity:0.68639052;" />
- </linearGradient>
- <linearGradient
- id="linearGradient4210">
- <stop
- id="stop4212"
- offset="0.0000000"
- style="stop-color:#eaba6f;stop-opacity:1.0000000;" />
- <stop
- id="stop4214"
- offset="1.0000000"
- style="stop-color:#b97a1b;stop-opacity:1.0000000;" />
- </linearGradient>
- <linearGradient
- id="linearGradient4192">
- <stop
- id="stop4194"
- offset="0"
- style="stop-color:#e9b96e;stop-opacity:1;" />
- <stop
- id="stop4196"
- offset="1.0000000"
- style="stop-color:#f1d19e;stop-opacity:1.0000000;" />
- </linearGradient>
- <linearGradient
- id="linearGradient4182">
- <stop
- id="stop4184"
- offset="0.0000000"
- style="stop-color:#a36d18;stop-opacity:1.0000000;" />
- <stop
- id="stop4186"
- offset="1.0000000"
- style="stop-color:#d79020;stop-opacity:1.0000000;" />
- </linearGradient>
- <radialGradient
- inkscape:collect="always"
- xlink:href="#linearGradient4946"
- id="radialGradient2252"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(1.000000,0.000000,0.000000,0.333333,2.658463e-16,23.58206)"
- cx="22.930462"
- cy="35.373093"
- fx="22.930462"
- fy="35.373093"
- r="17.576654" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient4979"
- id="linearGradient2269"
- gradientUnits="userSpaceOnUse"
- x1="30.062469"
- y1="13.444801"
- x2="17.696169"
- y2="12.333632" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient4995"
- id="linearGradient2274"
- gradientUnits="userSpaceOnUse"
- x1="36.288929"
- y1="14.661557"
- x2="47.065835"
- y2="15.267649" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient4192"
- id="linearGradient2277"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(1.000000,0.000000,0.000000,0.986355,0.000000,0.316638)"
- x1="25.381256"
- y1="24.720648"
- x2="24.119167"
- y2="16.170370" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient4182"
- id="linearGradient2280"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(1.000000,0.000000,0.000000,1.039184,0.000000,-4.057054e-2)"
- x1="16.148972"
- y1="12.636667"
- x2="34.193642"
- y2="12.636667" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient4987"
- id="linearGradient2282"
- gradientUnits="userSpaceOnUse"
- x1="21.906841"
- y1="9.7577486"
- x2="22.071806"
- y2="16.020695" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient4222"
- id="linearGradient2285"
- gradientUnits="userSpaceOnUse"
- x1="18.706615"
- y1="19.912336"
- x2="30.014812"
- y2="47.388485" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient4210"
- id="linearGradient2288"
- gradientUnits="userSpaceOnUse"
- x1="24.990499"
- y1="34.004856"
- x2="24.990499"
- y2="22.585211" />
- <radialGradient
- inkscape:collect="always"
- xlink:href="#linearGradient2884"
- id="radialGradient2896"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(1.353283,5.468101e-16,-1.144754e-13,0.635968,-8.458890,3.413470)"
- cx="23.943670"
- cy="20.800287"
- fx="23.943670"
- fy="20.800287"
- r="6.4286140" />
- <radialGradient
- inkscape:collect="always"
- xlink:href="#linearGradient2869"
- id="radialGradient2898"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.749420,0.000000,0.000000,0.394055,6.226925,10.09253)"
- cx="21.578989"
- cy="9.0255041"
- fx="21.578989"
- fy="9.0255041"
- r="9.5862970" />
- <radialGradient
- inkscape:collect="always"
- xlink:href="#linearGradient2884"
- id="radialGradient2906"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(1.353283,5.468101e-16,-1.144754e-13,0.635968,-8.458890,3.413470)"
- cx="23.943670"
- cy="20.800287"
- fx="23.943670"
- fy="20.800287"
- r="6.4286140" />
- <radialGradient
- inkscape:collect="always"
- xlink:href="#linearGradient2869"
- id="radialGradient2908"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.749420,0.000000,0.000000,0.394055,6.226925,10.09253)"
- cx="21.578989"
- cy="9.8105707"
- fx="21.578989"
- fy="9.8105707"
- r="9.5862970" />
- </defs>
- <sodipodi:namedview
- inkscape:window-y="242"
- inkscape:window-x="392"
- inkscape:window-height="706"
- inkscape:window-width="872"
- stroke="#c17d11"
- fill="#e9b96e"
- inkscape:showpageshadow="false"
- inkscape:document-units="px"
- inkscape:grid-bbox="true"
- showgrid="false"
- inkscape:current-layer="layer1"
- inkscape:cy="39.004018"
- inkscape:cx="74.637005"
- inkscape:zoom="1"
- inkscape:pageshadow="2"
- inkscape:pageopacity="0.0"
- borderopacity="0.16470588"
- bordercolor="#666666"
- pagecolor="#ffffff"
- id="base" />
- <metadata
- id="metadata4">
- <rdf:RDF>
- <cc:Work
- rdf:about="">
- <dc:format>image/svg+xml</dc:format>
- <dc:type
- rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
- <dc:title>Package</dc:title>
- <dc:creator>
- <cc:Agent>
- <dc:title>Jakub Steiner</dc:title>
- </cc:Agent>
- </dc:creator>
- <dc:source>http://jimmac.musichall.cz/</dc:source>
- <dc:subject>
- <rdf:Bag>
- <rdf:li>package</rdf:li>
- <rdf:li>archive</rdf:li>
- <rdf:li>tarball</rdf:li>
- <rdf:li>tar</rdf:li>
- <rdf:li>bzip</rdf:li>
- <rdf:li>gzip</rdf:li>
- <rdf:li>zip</rdf:li>
- <rdf:li>arj</rdf:li>
- <rdf:li>tar</rdf:li>
- <rdf:li>jar</rdf:li>
- </rdf:Bag>
- </dc:subject>
- <cc:license
- rdf:resource="http://creativecommons.org/licenses/by-sa/2.0/" />
- </cc:Work>
- <cc:License
- rdf:about="http://creativecommons.org/licenses/by-sa/2.0/">
- <cc:permits
- rdf:resource="http://web.resource.org/cc/Reproduction" />
- <cc:permits
- rdf:resource="http://web.resource.org/cc/Distribution" />
- <cc:requires
- rdf:resource="http://web.resource.org/cc/Notice" />
- <cc:requires
- rdf:resource="http://web.resource.org/cc/Attribution" />
- <cc:permits
- rdf:resource="http://web.resource.org/cc/DerivativeWorks" />
- <cc:requires
- rdf:resource="http://web.resource.org/cc/ShareAlike" />
- </cc:License>
- </rdf:RDF>
- </metadata>
- <g
- inkscape:groupmode="layer"
- inkscape:label="Layer 1"
- id="layer1">
- <g
- style="display:inline"
- transform="matrix(2.105461e-2,0,0,2.086758e-2,42.60172,35.4036)"
- id="g6707">
- <rect
- style="opacity:0.40206185;color:black;fill:url(#linearGradient6715);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
- id="rect6709"
- width="1339.6335"
- height="478.35718"
- x="-1559.2523"
- y="-150.69685" />
- <path
- style="opacity:0.40206185;color:black;fill:url(#radialGradient6717);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
- d="M -219.61876,-150.68038 C -219.61876,-150.68038 -219.61876,327.65041 -219.61876,327.65041 C -76.744594,328.55086 125.78146,220.48075 125.78138,88.454235 C 125.78138,-43.572302 -33.655436,-150.68036 -219.61876,-150.68038 z "
- id="path6711"
- sodipodi:nodetypes="cccc" />
- <path
- sodipodi:nodetypes="cccc"
- id="path6713"
- d="M -1559.2523,-150.68038 C -1559.2523,-150.68038 -1559.2523,327.65041 -1559.2523,327.65041 C -1702.1265,328.55086 -1904.6525,220.48075 -1904.6525,88.454235 C -1904.6525,-43.572302 -1745.2157,-150.68036 -1559.2523,-150.68038 z "
- style="opacity:0.40206185;color:black;fill:url(#radialGradient6719);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
- </g>
- <rect
- ry="2.3944440"
- rx="2.4241352"
- y="15.275433"
- x="7.4623847"
- height="23.112879"
- width="31.978371"
- id="rect3115"
- style="opacity:1.0000000;color:#000000;fill:url(#linearGradient2288);fill-opacity:1.0000000;fill-rule:nonzero;stroke:#a0670c;stroke-width:1.0000007;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4.0000000;stroke-dasharray:none;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000;visibility:visible;display:block;overflow:visible" />
- <rect
- style="opacity:0.48101267;color:#000000;fill:none;fill-opacity:1.0000000;fill-rule:nonzero;stroke:url(#linearGradient2285);stroke-width:1.0000011;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4.0000000;stroke-dasharray:none;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000;visibility:visible;display:block;overflow:visible"
- id="rect4220"
- width="29.804138"
- height="21.075352"
- x="8.4989996"
- y="16.243698"
- rx="1.2846882"
- ry="1.2846882" />
- <path
- sodipodi:nodetypes="ccccc"
- id="path4162"
- d="M 8.7697819,16.547178 L 13.819731,9.7363408 L 32.615291,9.6353255 L 37.835264,16.408941 L 8.7697819,16.547178 z "
- style="fill:url(#linearGradient2280);fill-opacity:1.0000000;fill-rule:evenodd;stroke:url(#linearGradient2282);stroke-width:1.0000008;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4.0000000;stroke-dasharray:none;stroke-opacity:1.0000000" />
- <path
- sodipodi:nodetypes="ccccc"
- id="path4164"
- d="M 38.276321,16.325703 L 43.469269,23.520364 L 3.9609455,23.520364 L 8.6250143,16.320763 L 38.276321,16.325703 z "
- style="opacity:1.0000000;color:#000000;fill:url(#linearGradient2277);fill-opacity:1.0000000;fill-rule:nonzero;stroke:#a0670c;stroke-width:1.0000005;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4.0000000;stroke-dasharray:none;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000;visibility:visible;display:block;overflow:visible" />
- <path
- sodipodi:nodetypes="ccccc"
- id="path4178"
- d="M 32.849333,9.6141009 L 37.532219,16.536370 L 46.565835,20.921197 L 38.451329,12.008545 L 32.849333,9.6141009 z "
- style="opacity:1.0000000;color:#000000;fill:url(#linearGradient2274);fill-opacity:1.0000000;fill-rule:nonzero;stroke:#a0670c;stroke-width:1.0000005;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4.0000000;stroke-dasharray:none;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000;visibility:visible;display:block;overflow:visible" />
- <path
- sodipodi:nodetypes="ccccc"
- style="opacity:1.0000000;color:#000000;fill:#f8e8cf;fill-opacity:1.0000000;fill-rule:nonzero;stroke:#a0670c;stroke-width:1.0000000;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4.0000000;stroke-dasharray:none;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000;visibility:visible;display:block;overflow:visible"
- d="M 13.617702,9.7151161 L 9.6419233,16.435355 L 0.50729183,20.820182 L 8.6217973,11.907530 L 13.617702,9.7151161 z "
- id="path4180" />
- <path
- style="opacity:1.0000000;color:#000000;fill:none;fill-opacity:1.0000000;fill-rule:nonzero;stroke:#f4e3ca;stroke-width:1.0000000;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4.0000000;stroke-dasharray:none;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000;visibility:visible;display:block;overflow:visible"
- d="M 37.024959,16.436050 L 41.478871,22.493011 L 5.6482792,22.493011 L 9.7892982,16.312694 L 37.024959,16.436050 z "
- id="path4954"
- sodipodi:nodetypes="ccccc" />
- <g
- id="g2892"
- transform="matrix(0.676538,0.000000,0.000000,1.000000,3.994869,0.000000)">
- <path
- style="opacity:1.0000000;color:#000000;fill:url(#radialGradient2896);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:2.0000000;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4.0000000;stroke-dasharray:none;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000;visibility:visible;display:inline;overflow:visible"
- d="M 23.926073,12.101621 C 18.588065,12.101621 14.282569,14.129809 14.282569,16.641813 L 33.604773,16.641813 C 33.604773,14.129809 29.264081,12.101621 23.926073,12.101621 z "
- id="path2882" />
- <path
- id="path2141"
- d="M 23.931961,12.861168 C 20.379986,12.861168 17.515057,14.210748 17.515057,15.882266 L 30.372285,15.882266 C 30.372285,14.210748 27.483936,12.861168 23.931961,12.861168 z "
- style="opacity:1.0000000;color:#000000;fill:url(#radialGradient2898);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:2.0000000;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4.0000000;stroke-dasharray:none;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000;visibility:visible;display:inline;overflow:visible" />
- </g>
- <g
- transform="matrix(0.676538,0.000000,0.000000,1.000000,10.49487,0.000000)"
- id="g2900">
- <path
- id="path2902"
- d="M 23.926073,12.101621 C 18.588065,12.101621 14.282569,14.129809 14.282569,16.641813 L 33.604773,16.641813 C 33.604773,14.129809 29.264081,12.101621 23.926073,12.101621 z "
- style="opacity:1.0000000;color:#000000;fill:url(#radialGradient2906);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:2.0000000;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4.0000000;stroke-dasharray:none;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000;visibility:visible;display:inline;overflow:visible" />
- <path
- style="opacity:1.0000000;color:#000000;fill:url(#radialGradient2908);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:2.0000000;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4.0000000;stroke-dasharray:none;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000;visibility:visible;display:inline;overflow:visible"
- d="M 23.931961,12.861168 C 20.379986,12.861168 17.515057,14.210748 17.515057,15.882266 L 30.372285,15.882266 C 30.372285,14.210748 27.483936,12.861168 23.931961,12.861168 z "
- id="path2904" />
- </g>
- <path
- style="opacity:0.87974685;fill:none;fill-opacity:1.0000000;fill-rule:evenodd;stroke:url(#linearGradient2269);stroke-width:1.0000000;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4.0000000;stroke-dasharray:none;stroke-opacity:1.0000000"
- d="M 9.6523127,16.371803 L 13.036643,10.593020 L 33.514841,10.517799 L 37.356782,16.369880 L 9.6523127,16.371803 z "
- id="path4966"
- sodipodi:nodetypes="ccccc" />
- </g>
-</svg>
commit f50f24c6e5e1f82b1f074d7c525122c80f04aca6
Author: Daniel Baumann <daniel at debian.org>
Date: Sun Jul 10 16:01:11 2011 +0200
Not wrapping uploaders field, it does not exceed 80 chars.
diff --git a/debian/control b/debian/control
index 57bd23d..44e1953 100644
--- a/debian/control
+++ b/debian/control
@@ -2,9 +2,7 @@ Source: tryton-modules-product
Section: python
Priority: optional
Maintainer: Debian Tryton Maintainers <tryton at lists.debian-maintainers.org>
-Uploaders:
- Daniel Baumann <daniel at debian.org>,
- Mathias Behrle <mathiasb at m9s.biz>
+Uploaders: Daniel Baumann <daniel at debian.org>, Mathias Behrle <mathiasb at m9s.biz>
Dm-Upload-Allowed: yes
Build-Depends: debhelper (>= 8), python, python-setuptools, python-support
Standards-Version: 3.9.2
commit 9fec201e542686a63afe8b389530dcdccf22476f
Author: Daniel Baumann <daniel at debian.org>
Date: Sun Jul 10 15:54:40 2011 +0200
Compacting copyright file.
diff --git a/debian/copyright b/debian/copyright
index fc13eeb..b2d5d1a 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,8 +1,3 @@
-Upstream-Contact: Tryton project <tryton at googlegroups.com>
-Upstream-Homepage: http://downloads.tryton.org/
-Maintainer-Contact: Debian Tryton Maintainers <tryton at lists.debian-maintainers.org>
-Maintainer-Homepage: http://tryton.debian-maintainers.org/
-
Files: *
Copyright:
(C) 2004-2008 Tiny SPRL
@@ -10,25 +5,12 @@ Copyright:
(C) 2008-2011 Bertrand Chenal
(C) 2008-2011 B2CK SPRL
License: GPL-3+
- 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/>.
- .
- On Debian systems, the complete text of the GNU General Public License
- can be found in /usr/share/common-licenses/GPL-3 file.
Files: debian/*
Copyright: (C) 2009-2011 Daniel Baumann <daniel at debian.org>
License: GPL-3+
+
+License: GPL-3+
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
@@ -42,5 +24,5 @@ License: GPL-3+
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
.
- On Debian systems, the complete text of the GNU General Public License
+ The complete text of the GNU General Public License
can be found in /usr/share/common-licenses/GPL-3 file.
commit ae3e79db1328cc00d5a884b1739d89ba12db13c4
Author: Daniel Baumann <daniel at debian.org>
Date: Sun Jul 10 15:38:55 2011 +0200
Adding options for source package.
diff --git a/debian/source/options b/debian/source/options
new file mode 100644
index 0000000..d053b65
--- /dev/null
+++ b/debian/source/options
@@ -0,0 +1,2 @@
+compression = gzip
+compression-level = 9
commit d5ab1543e1d8a048e731b5536501f64d14fc9e5e
Author: Daniel Baumann <daniel at debian.org>
Date: Sun Jul 10 15:38:02 2011 +0200
Removing for new source package version obsoleted README.source file.
diff --git a/debian/README.source b/debian/README.source
deleted file mode 100644
index 18b6b24..0000000
--- a/debian/README.source
+++ /dev/null
@@ -1,37 +0,0 @@
-Package Repositories
---------------------
-
-Backports for the current stable debian distribution as well as snapshots of
-unreleased versions may be available in repositories listed on the maintainers
-homepage. The current URL of the maintainer homepage can be seen in
-debian/copyright.
-
-
-Source Access
--------------
-
-You can obtain the sources of this package with:
-
- $ apt-get source ${PACKAGE}
-
-whereas '${PACKAGE}' has to be replaced with the actual name of the package.
-
-This package is maintained with the Git version control system. The current git
-source tree can be obtained with:
-
- $ git clone ${GIT_URI}
-
-whereas '${GIT_URI}' has to be replaced with the actual URI for the Git
-repository. The current Git URI can be seen in debian/control in the extracted
-package sources.
-
-More information about Git can be found in the git-core package.
-
-This package may use the Quilt patch system to manage all modifications to the
-upstream source. Changes, if any, are stored in the source package as diffs in
-debian/diff and are applied during the build. Current modifications can be
-applied to the source tree with:
-
- $ QUILT_PATCHES=debian/patches quilt push -a
-
-More information about Quilt can be found in the quilt package.
commit 67d08c62ac9e4dfe414d78a89c1fff9ee61b91de
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Tue May 24 21:40:04 2011 +0200
Releasing debian version 2.0.1-1.
diff --git a/debian/changelog b/debian/changelog
index 6767ab6..2d0654f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+tryton-modules-product (2.0.1-1) unstable; urgency=low
+
+ * Updating to standards version 3.9.2.
+ * Merging upstream version 2.0.0.
+ * Merging upstream version 2.0.1.
+ * Updating Copyright.
+ * Updating versioned tryton depends to 2.0.
+
+ -- Mathias Behrle <mathiasb at m9s.biz> Tue, 24 May 2011 21:34:58 +0200
+
tryton-modules-product (1.8.0-2) unstable; urgency=low
* Changing my email address.
commit b1d818a8e27574933cdca9f95547f9ba60476ec4
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Tue May 24 21:21:34 2011 +0200
Updating versioned tryton depends to 2.0.
diff --git a/debian/control b/debian/control
index 1c7ed7a..57bd23d 100644
--- a/debian/control
+++ b/debian/control
@@ -15,7 +15,7 @@ Vcs-Git: git://git.debian-maintainers.org/git/tryton/tryton-modules-product.git
Package: tryton-modules-product
Architecture: all
Depends:
- ${misc:Depends}, ${python:Depends}, tryton-server (>= 1.8),
+ ${misc:Depends}, ${python:Depends}, tryton-server (>= 2.0),
python-pkg-resources
XB-Python-Version: ${python:Versions}
Description: Tryton Application Platform (Product Module)
commit 00db446174b8870ea200cbb41f29dda49d5b7c11
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Tue May 24 20:40:04 2011 +0200
Updating Copyright.
diff --git a/debian/copyright b/debian/copyright
index bf68e1b..fc13eeb 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -6,9 +6,9 @@ Maintainer-Homepage: http://tryton.debian-maintainers.org/
Files: *
Copyright:
(C) 2004-2008 Tiny SPRL
- (C) 2008-2010 Cedric Krier
- (C) 2008-2010 Bertrand Chenal
- (C) 2008-2010 B2CK SPRL
+ (C) 2008-2011 Cedric Krier
+ (C) 2008-2011 Bertrand Chenal
+ (C) 2008-2011 B2CK SPRL
License: GPL-3+
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
commit 33cc2b25b9441b280157b0151c319a4b3cb19d60
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Tue May 24 19:16:52 2011 +0200
Merging upstream version 2.0.1.
diff --git a/CHANGELOG b/CHANGELOG
index 755dd5b..faf7afc 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 2.0.1 - 2011-04-26
+* Add missing icons
+
Version 2.0.0 - 2011-04-26
* Bug fixes (see mercurial logs for details)
diff --git a/PKG-INFO b/PKG-INFO
index 398e8bf..05e328b 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.0
Name: trytond_product
-Version: 2.0.0
+Version: 2.0.1
Summary: Define products, categories of product, units of measure, categories of units of measure.
Home-page: http://www.tryton.org/
Author: B2CK
diff --git a/__tryton__.py b/__tryton__.py
index 7f693be..bc8039e 100644
--- a/__tryton__.py
+++ b/__tryton__.py
@@ -10,7 +10,7 @@
'name_fr_FR': 'Produit',
'name_nl_NL': 'Producten',
'name_ru_RU': 'ТМЦ',
- 'version' : '2.0.0',
+ 'version' : '2.0.1',
'author' : 'B2CK',
'email': 'info at b2ck.com',
'website': 'http://www.tryton.org/',
diff --git a/icons/__init__.py b/icons/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/setup.py b/setup.py
index afc69b8..f8f3f08 100644
--- a/setup.py
+++ b/setup.py
@@ -31,10 +31,12 @@ setup(name='trytond_product',
packages=[
'trytond.modules.product',
'trytond.modules.product.tests',
+ 'trytond.modules.product.icons',
],
package_data={
'trytond.modules.product': info.get('xml', []) \
+ info.get('translation', []),
+ 'trytond.modules.product.icons': ['tryton-product.svg'],
},
classifiers=[
'Development Status :: 5 - Production/Stable',
diff --git a/tests/__init__.pyc b/tests/__init__.pyc
deleted file mode 100644
index c5cfa32..0000000
Binary files a/tests/__init__.pyc and /dev/null differ
diff --git a/tests/test_product.pyc b/tests/test_product.pyc
deleted file mode 100644
index 5e6ceaf..0000000
Binary files a/tests/test_product.pyc and /dev/null differ
diff --git a/trytond_product.egg-info/PKG-INFO b/trytond_product.egg-info/PKG-INFO
index 753cfff..fdc62ea 100644
--- a/trytond_product.egg-info/PKG-INFO
+++ b/trytond_product.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.0
Name: trytond-product
-Version: 2.0.0
+Version: 2.0.1
Summary: Define products, categories of product, units of measure, categories of units of measure.
Home-page: http://www.tryton.org/
Author: B2CK
diff --git a/trytond_product.egg-info/SOURCES.txt b/trytond_product.egg-info/SOURCES.txt
index 869fc3f..5f50ccb 100644
--- a/trytond_product.egg-info/SOURCES.txt
+++ b/trytond_product.egg-info/SOURCES.txt
@@ -20,15 +20,13 @@ uom.xml
./category.py
./product.py
./uom.py
+./icons/__init__.py
./tests/__init__.py
./tests/test_product.py
doc/index.rst
icons/LICENSE
+icons/__init__.py
icons/tryton-product.svg
-tests/__init__.py
-tests/__init__.pyc
-tests/test_product.py
-tests/test_product.pyc
trytond_product.egg-info/PKG-INFO
trytond_product.egg-info/SOURCES.txt
trytond_product.egg-info/dependency_links.txt
commit e494ceb8038db04805840e28c0a489b41c8a040d
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Tue May 24 19:12:55 2011 +0200
Merging upstream version 2.0.0.
diff --git a/CHANGELOG b/CHANGELOG
index b6bb2d4..755dd5b 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 2.0.0 - 2011-04-26
+* 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 94a43fb..a9feb41 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -1,7 +1,7 @@
+Copyright (C) 2008-2011 Cédric Krier.
+Copyright (C) 2008-2011 Bertrand Chenal.
+Copyright (C) 2008-2011 B2CK SPRL.
Copyright (C) 2004-2008 Tiny 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/MANIFEST.in b/MANIFEST.in
index dcb2afa..47da692 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -8,3 +8,4 @@ include *.xml
include *.odt
include *.csv
include doc/*
+include icons/*
diff --git a/PKG-INFO b/PKG-INFO
index 90a4ee3..398e8bf 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,12 +1,12 @@
Metadata-Version: 1.0
Name: trytond_product
-Version: 1.8.0
+Version: 2.0.0
Summary: Define products, categories of product, units of measure, categories of units of measure.
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
@@ -16,10 +16,15 @@ 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 :: 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
+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 8aa55d4..7f693be 100644
--- a/__tryton__.py
+++ b/__tryton__.py
@@ -1,17 +1,22 @@
+# -*- coding: utf-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.
{
'name' : 'Product',
+ 'name_bg_BG': 'Продукт',
'name_de_DE': 'Artikel',
'name_es_CO': 'Productos',
'name_es_ES': 'Producto',
'name_fr_FR': 'Produit',
- 'version' : '1.8.0',
+ 'name_nl_NL': 'Producten',
+ 'name_ru_RU': 'ТМЦ',
+ 'version' : '2.0.0',
'author' : 'B2CK',
'email': 'info at b2ck.com',
'website': 'http://www.tryton.org/',
'description': 'Define products, categories of product, units ' \
'of measure, categories of units of measure.',
+ 'description_bg_BG': 'Задаване на продукти, категории продукти, мерни единици, категории мерни единици.',
'description_de_DE': 'Dient der Erstellung von Artikeln, Artikelkategorien, Maßeinheiten und Kategorien für Maßeinheiten.',
'description_es_CO': 'Definición de productos, categorÃas de producto unidades de medida y categorÃas de unidades de medida',
'description_es_ES': 'Define productos, categorÃas de producto, unidades de medida y categorÃas de unidades de medida',
@@ -21,6 +26,8 @@
- Unité de mesure
- Catégorie d'unité de mesure
''',
+ 'description_nl_NL': 'Definieert producten, productcategorieën, meeteenheden en categorieën van meeteenheden.',
+ 'description_ru_RU': 'Определение ТМЦ, категорий ТМЦ, единиц измерениÑ, категорий единиц измерениÑ.',
'depends' : [
'ir',
'res',
@@ -31,10 +38,13 @@
'uom.xml',
],
'translation': [
+ 'bg_BG.csv',
'de_DE.csv',
'es_CO.csv',
'es_ES.csv',
'fr_FR.csv',
+ 'nl_NL.csv',
+ 'ru_RU.csv',
]
}
diff --git a/bg_BG.csv b/bg_BG.csv
new file mode 100644
index 0000000..9dc81b0
--- /dev/null
+++ b/bg_BG.csv
@@ -0,0 +1,155 @@
+type,name,res_id,src,value,fuzzy
+error,product.uom,0,"If the UOM is still not used, you can delete it otherwise you can deactivate it and create a new one.","Ðко мер. ед. вÑе още не Ñе ползват може да Ñ Ð¸Ð·Ñ‚Ñ€Ð¸ÐµÑ‚Ðµ, в противен Ñлучай може да Ñ Ð´ÐµÐºÐ°Ñ‚Ð¸Ð²Ð¸Ñ€Ð°Ñ‚Ðµ и Ñъздадете нова.",0
+error,product.uom,0,Invalid Factor and Rate values!,Ðевалиден ÑтойноÑти за фактор и отношение!,0
+error,product.uom,0,Rate and factor can not be both equal to zero.,КурÑа и коефициента не може едновременно да Ñа нула.,0
+error,product.uom,0,"You cannot change Rate, Factor or Category on a Unit of Measure. ","За мерна единица не може да променате отношение, коефициент или категориÑ.",0
+field,"product.category,childs",0,Children,Деца,0
+field,"product.category,name",0,Name,Име,0
+field,"product.category,parent",0,Parent,Родител,0
+field,"product.category,rec_name",0,Name,Име,0
+field,"product.product,code",0,Code,Код,0
+field,"product.product,description",0,Description,ОпиÑание,0
+field,"product.product,rec_name",0,Name,Име,0
+field,"product.product,template",0,Product Template,Щаблон за продукт,0
+field,"product.template,active",0,Active,Ðктивен,0
+field,"product.template,category",0,Category,КатегориÑ,0
+field,"product.template,cost_price",0,Cost Price,Фабрична цена,0
+field,"product.template,cost_price_method",0,Cost Method,Ðачин на оÑтойноÑÑ‚Ñване,0
+field,"product.template,cost_price_uom",0,Cost Price,Фабрична цена,0
+field,"product.template,default_uom",0,Default UOM,Мер. ед. по подрабиране,0
+field,"product.template,list_price",0,List Price,Каталожна цена,0
+field,"product.template,list_price_uom",0,List Price,Каталожна цена,0
+field,"product.template,name",0,Name,Име,0
+field,"product.template,products",0,Products,Продукти,0
+field,"product.template,rec_name",0,Name,Име,0
+field,"product.template,type",0,Type,Вид,0
+field,"product.uom,active",0,Active,Ðктивен,0
+field,"product.uom,category",0,UOM Category,ÐšÐ°Ñ‚ÐµÐ³Ð¾Ñ€Ð¸Ñ Ð¼ÐµÑ€. ед.,0
+field,"product.uom,digits",0,Display Digits,Цифри за показване,0
+field,"product.uom,factor",0,Factor,Коефициент,0
+field,"product.uom,name",0,Name,Име,0
+field,"product.uom,rate",0,Rate,Отношение,0
+field,"product.uom,rec_name",0,Name,Име,0
+field,"product.uom,rounding",0,Rounding Precision,ТочноÑÑ‚ на закръгление,0
+field,"product.uom,symbol",0,Symbol,Символ,0
+field,"product.uom.category,name",0,Name,Име,0
+field,"product.uom.category,rec_name",0,Name,Име,0
+field,"product.uom.category,uoms",0,Unit of Measures,Мерни единици,0
+help,"product.uom,factor",0,"The coefficient for the formula:
+coef (base unit) = 1 (this unit)","Коефициент в тази формула:
+1 (баз. единица) = коеф. (тази единица)",0
+help,"product.uom,rate",0,"The coefficient for the formula:
+1 (base unit) = coef (this unit)","Коефициент в тази формула:
+1 (баз. единица) = коеф. (тази единица)",0
+model,"ir.action,name",,Product Categories,Категории продукти,0
+model,"ir.action,name",act_category_form,Product Categories,Категории продукти,0
+model,"ir.action,name",act_category_tree,Categories,Категории,0
+model,"ir.action,name",act_product_by_category,Product by Category,Продукт по категориÑ,0
+model,"ir.action,name",act_product_form,Products,Продукти,0
+model,"ir.action,name",act_product_form2,Products,Продукти,0
+model,"ir.action,name",act_uom_category_form,Categories of Unit of Measure,Категории мер. ед.,0
+model,"ir.action,name",act_uom_category_form2,Categories of Unit of Measure,Категории мер. ед.,0
+model,"ir.action,name",act_uom_form,Units of Measure,Мерни едниници,0
+model,"ir.action,name",act_uom_form2,Units of Measure,Мерни едниници,0
+model,"ir.ui.menu,name",,Categories,Категории,0
+model,"ir.ui.menu,name",menu_category_form_new,New Category,Ðова категориÑ,0
+model,"ir.ui.menu,name",menu_category_tree,Categories,Категории,0
+model,"ir.ui.menu,name",menu_main_product,Product,Продукт,0
+model,"ir.ui.menu,name",menu_product_product,Products,Продукти,0
+model,"ir.ui.menu,name",menu_product_product_new,New Product,Продукти,0
+model,"ir.ui.menu,name",menu_uom_category_form,Categories,Категории,0
+model,"ir.ui.menu,name",menu_uom_category_form_new,New Category,Ðова категориÑ,0
+model,"ir.ui.menu,name",menu_uom_form,Units of Measure,Мерни едниници,0
+model,"ir.ui.menu,name",menu_uom_form2,New Unit of Measure,Ðова мерна единица,0
+model,"product.category,name",0,Product Category,ÐšÐ°Ñ‚ÐµÐ³Ð¾Ñ€Ð¸Ñ Ð½Ð° продукт,0
+model,"product.product,name",0,Product,Продукт,0
+model,"product.template,name",0,Product Template,Щаблон за продукт,0
+model,"product.uom,name",0,Unit of measure,Мерна единица,0
+model,"product.uom,name",uom_are,Are,Хектар,0
+model,"product.uom,name",uom_carat,Carat,Карат,0
+model,"product.uom,name",uom_centimeter,centimeter,Ñантиметър,0
+model,"product.uom,name",uom_cubic_centimeter,Cubic centimeter,Кубичен Ñантиметър,0
+model,"product.uom,name",uom_cubic_foot,Cubic foot,Кубичен фут,0
+model,"product.uom,name",uom_cubic_inch,Cubic inch,Кубичен инч,0
+model,"product.uom,name",uom_cubic_meter,Cubic meter,Кубичен метър,0
+model,"product.uom,name",uom_day,Day,Ден,0
+model,"product.uom,name",uom_foot,Foot,Фут,0
+model,"product.uom,name",uom_gallon,Gallon,Галон,0
+model,"product.uom,name",uom_gram,Gram,Грам,0
+model,"product.uom,name",uom_hectare,Hectare,Хектар,0
+model,"product.uom,name",uom_hour,Hour,ЧаÑ,0
+model,"product.uom,name",uom_inch,Inch,Инч,0
+model,"product.uom,name",uom_kilogram,Kilogram,Килограм,0
+model,"product.uom,name",uom_kilometer,Kilometer,Километър,0
+model,"product.uom,name",uom_liter,Liter,Литър,0
+model,"product.uom,name",uom_meter,Meter,Метър,0
+model,"product.uom,name",uom_mile,Mile,МилÑ,0
+model,"product.uom,name",uom_millimeter,Millimeter,Милиметър,0
+model,"product.uom,name",uom_minute,Minute,Минута,0
+model,"product.uom,name",uom_ounce,Ounce,УнциÑ,0
+model,"product.uom,name",uom_pound,Pound,Лира,0
+model,"product.uom,name",uom_second,Second,Секунда,0
+model,"product.uom,name",uom_square_centimeter,Square centimeter,Квадратен Ñантиметър,0
+model,"product.uom,name",uom_square_foot,Square foot,Квадратен фут,0
+model,"product.uom,name",uom_square_inch,Square inch,Квадратен инч,0
+model,"product.uom,name",uom_square_meter,Square meter,Квадратен метър,0
+model,"product.uom,name",uom_square_yard,Square yard,Квадратен Ñрд,0
+model,"product.uom,name",uom_unit,Unit,Единица,0
+model,"product.uom,name",uom_work_day,Work Day,Работен ден,0
+model,"product.uom,name",uom_yard,Yard,Ярд,0
+model,"product.uom,symbol",uom_are,a,a,0
+model,"product.uom,symbol",uom_carat,c,c,0
+model,"product.uom,symbol",uom_centimeter,cm,cm,0
+model,"product.uom,symbol",uom_cubic_centimeter,cm³,cm³,0
+model,"product.uom,symbol",uom_cubic_foot,ft³,ft³,0
+model,"product.uom,symbol",uom_cubic_inch,in³,in³,0
+model,"product.uom,symbol",uom_cubic_meter,m³,m³,0
+model,"product.uom,symbol",uom_day,d,d,0
+model,"product.uom,symbol",uom_foot,ft,ft,0
+model,"product.uom,symbol",uom_gallon,gal,gal,0
+model,"product.uom,symbol",uom_gram,g,g,0
+model,"product.uom,symbol",uom_hectare,ha,ha,0
+model,"product.uom,symbol",uom_hour,h,h,0
+model,"product.uom,symbol",uom_inch,in,in,0
+model,"product.uom,symbol",uom_kilogram,kg,kg,0
+model,"product.uom,symbol",uom_kilometer,km,km,0
+model,"product.uom,symbol",uom_liter,l,l,0
+model,"product.uom,symbol",uom_meter,m,m,0
+model,"product.uom,symbol",uom_mile,mi,mi,0
+model,"product.uom,symbol",uom_millimeter,mm,mm,0
+model,"product.uom,symbol",uom_minute,min,min,0
+model,"product.uom,symbol",uom_ounce,oz,oz,0
+model,"product.uom,symbol",uom_pound,lbs,lbs,0
+model,"product.uom,symbol",uom_second,s,s,0
+model,"product.uom,symbol",uom_square_centimeter,cm²,cm²,0
+model,"product.uom,symbol",uom_square_foot,ft²,ft²,0
+model,"product.uom,symbol",uom_square_inch,in²,in²,0
+model,"product.uom,symbol",uom_square_meter,m²,m²,0
+model,"product.uom,symbol",uom_square_yard,yd²,yd²,0
+model,"product.uom,symbol",uom_unit,u,u,0
+model,"product.uom,symbol",uom_work_day,wd,wd,0
+model,"product.uom,symbol",uom_yard,yd,yd,0
+model,"product.uom.category,name",0,Product uom category,ÐšÐ°Ñ‚ÐµÐ³Ð¾Ñ€Ð¸Ñ Ð¼ÐµÑ€. ед. на продукт,0
+model,"product.uom.category,name",uom_cat_length,Length,Дължина,0
+model,"product.uom.category,name",uom_cat_surface,Surface,ПовърхноÑÑ‚,0
+model,"product.uom.category,name",uom_cat_time,Time,Време,0
+model,"product.uom.category,name",uom_cat_unit,Units,Единици,0
+model,"product.uom.category,name",uom_cat_volume,Volume,Обем,0
+model,"product.uom.category,name",uom_cat_weight,Weight,Тегло,0
+model,"res.group,name",group_product_admin,Product Administration,Управление на продукти,0
+selection,"product.template,cost_price_method",0,Average,Средна,0
+selection,"product.template,cost_price_method",0,Fixed,ФикÑирана,0
+selection,"product.template,type",0,Consumable,КонÑуматив,0
+selection,"product.template,type",0,Service,УÑлуга,0
+selection,"product.template,type",0,Stockable,Складируем,0
+view,product.category,0,Children,Деца,0
+view,product.category,0,Product Categories,Категории продукти,0
+view,product.category,0,Product Category,ÐšÐ°Ñ‚ÐµÐ³Ð¾Ñ€Ð¸Ñ Ð½Ð° продукт,0
+view,product.product,0,Products,Продукти,0
+view,product.template,0,General,ОÑновен,0
+view,product.template,0,Product Template,Щаблон за продукт,0
+view,product.template,0,Product Templates,Шаблони на продукти,0
+view,product.uom,0,Unit of Measure,Мерни единици,0
+view,product.uom,0,Units of Measure,Мерни едниници,0
+view,product.uom.category,0,Categories of Unit of Measure,Категории мер. ед.,0
+view,product.uom.category,0,Category of Unit of Measure,ÐšÐ°Ñ‚ÐµÐ³Ð¾Ñ€Ð¸Ñ Ð¼ÐµÑ€Ð½Ð¸ единици,0
diff --git a/category.py b/category.py
index 9e36daf..db5df4c 100644
--- a/category.py
+++ b/category.py
@@ -17,6 +17,13 @@ class Category(ModelSQL, ModelView):
super(Category, self).__init__()
self._order.insert(0, ('name', 'ASC'))
+ self._constraints += [
+ ('check_recursion', 'recursive_categories'),
+ ]
+ self._error_messages.update({
+ 'recursive_categories': 'You can not create recursive categories!',
+ })
+
def get_rec_name(self, ids, name):
if not ids:
return {}
diff --git a/category.xml b/category.xml
index 3f32f1c..e34c746 100644
--- a/category.xml
+++ b/category.xml
@@ -3,7 +3,7 @@
this repository contains the full copyright notices and license terms. -->
<tryton>
<data>
- <record model="ir.ui.view" id="category_view_tree">
+ <record model="ir.ui.view" id="category_view_list">
<field name="model">product.category</field>
<field name="type">tree</field>
<field name="priority">10</field>
@@ -16,15 +16,17 @@ this repository contains the full copyright notices and license terms. -->
]]>
</field>
</record>
- <record model="ir.ui.view" id="category_view_tree2">
+ <record model="ir.ui.view" id="category_view_tree">
<field name="model">product.category</field>
<field name="type">tree</field>
<field name="priority">20</field>
<field name="field_childs">childs</field>
<field name="arch" type="xml">
<![CDATA[
- <tree string="Product Categories">
- <field name="name"/>
+ <tree string="Product Categories" keyword_open="1">
+ <field name="name" select="1"/>
+ <field name="parent" tree_invisible="1"/>
+ <field name="childs" tree_invisible="1"/>
</tree>
]]>
</field>
@@ -54,54 +56,57 @@ this repository contains the full copyright notices and license terms. -->
<record model="ir.action.act_window" id="act_category_tree">
<field name="name">Categories</field>
<field name="res_model">product.category</field>
- <field name="view_type">tree</field>
<field name="domain">[('parent', '=', False)]</field>
</record>
<record model="ir.action.act_window.view" id="act_category_tree_view1">
<field name="sequence" eval="10"/>
- <field name="view" ref="category_view_tree2"/>
+ <field name="view" ref="category_view_tree"/>
+ <field name="act_window" ref="act_category_tree"/>
+ </record>
+ <record model="ir.action.act_window.view" id="act_category_tree_view2">
+ <field name="sequence" eval="20"/>
+ <field name="view" ref="category_view_form"/>
<field name="act_window" ref="act_category_tree"/>
</record>
+
<menuitem parent="menu_main_product" sequence="2"
action="act_category_tree" id="menu_category_tree"/>
- <record model="ir.action.act_window" id="act_category_form">
- <field name="name">Product Categories</field>
+ <record model="ir.action.act_window" id="act_category_list">
+ <field name="name">Categories</field>
<field name="res_model">product.category</field>
- <field name="view_type">form</field>
</record>
- <record model="ir.action.act_window.view" id="act_category_form_view1">
+ <record model="ir.action.act_window.view" id="act_category_list_view1">
<field name="sequence" eval="10"/>
- <field name="view" ref="category_view_tree"/>
- <field name="act_window" ref="act_category_form"/>
+ <field name="view" ref="category_view_list"/>
+ <field name="act_window" ref="act_category_list"/>
</record>
- <record model="ir.action.act_window.view" id="act_category_form_view2">
+ <record model="ir.action.act_window.view" id="act_category_list_view2">
<field name="sequence" eval="20"/>
<field name="view" ref="category_view_form"/>
- <field name="act_window" ref="act_category_form"/>
+ <field name="act_window" ref="act_category_list"/>
</record>
- <menuitem name="Categories" parent="menu_category_tree"
- sequence="2" id="menu_category_form"
- action="act_category_form"/>
+ <menuitem parent="menu_category_tree"
+ sequence="10" id="menu_category_list"
+ action="act_category_list"/>
- <record model="ir.action.act_window" id="act_category_form2">
+ <record model="ir.action.act_window" id="act_category_form">
<field name="name">Product Categories</field>
<field name="res_model">product.category</field>
- <field name="view_type">form</field>
</record>
- <record model="ir.action.act_window.view" id="act_category_form2_view1">
+ <record model="ir.action.act_window.view" id="act_category_form_view1">
<field name="sequence" eval="10"/>
<field name="view" ref="category_view_form"/>
- <field name="act_window" ref="act_category_form2"/>
+ <field name="act_window" ref="act_category_form"/>
</record>
- <record model="ir.action.act_window.view" id="act_category_form2_view2">
+ <record model="ir.action.act_window.view" id="act_category_form_view2">
<field name="sequence" eval="20"/>
- <field name="view" ref="category_view_tree"/>
- <field name="act_window" ref="act_category_form2"/>
+ <field name="view" ref="category_view_list"/>
+ <field name="act_window" ref="act_category_form"/>
</record>
- <menuitem name="New Category" parent="menu_category_form"
- sequence="10" id="menu_category_form_new"
- action="act_category_form2"/>
+ <menuitem name="New Category" parent="menu_category_tree"
+ sequence="20" id="menu_category_form_new"
+ action="act_category_form"/>
<record model="ir.model.access" id="access_product_category">
<field name="model" search="[('model', '=', 'product.category')]"/>
diff --git a/de_DE.csv b/de_DE.csv
index 23877b8..92dcc40 100644
--- a/de_DE.csv
+++ b/de_DE.csv
@@ -1,4 +1,5 @@
type,name,res_id,src,value,fuzzy
+error,product.category,0,You can not create recursive categories!,Kategorien können nicht rekursiv angelegt werden!,0
error,product.template,0,You cannot change the default uom for a product which is associated to stock moves.,"Die Standardmaßeinheit kann nicht für einen Artikel geändert werden, der Lagerbewegungen zugeordnet ist.",0
error,product.uom,0,"If the UOM is still not used, you can delete it otherwise you can deactivate it and create a new one.","Wenn die Maßeinheit noch nicht verwendet wurde, kann sie gelöscht werden.
Andernfalls kann sie nur deaktiviert und eine andere neue erstellt werden.",0
@@ -71,7 +72,7 @@ help,"product.uom,rate",0,"The coefficient for the formula:
Formel: Basiseinheit = Kehrwert * diese Einheit
Das Feld Faktor wird automatisch aus dem hier eingetragenen Wert ermittelt.",0
model,"ir.action,name",act_category_form,Product Categories,Artikelkategorien,0
-model,"ir.action,name",act_category_form2,Product Categories,Artikelkategorien,0
+model,"ir.action,name",act_category_list,Categories,Kategorien,0
model,"ir.action,name",act_category_tree,Categories,Artikelkategorien,0
model,"ir.action,name",act_product_by_category,Product by Category,Artikel nach Kategorie,0
model,"ir.action,name",act_product_form,Products,Artikel,0
@@ -80,8 +81,8 @@ model,"ir.action,name",act_uom_category_form,Categories of Unit of Measure,Kateg
model,"ir.action,name",act_uom_category_form2,Categories of Unit of Measure,Kategorien Maßeinheiten,0
model,"ir.action,name",act_uom_form,Units of Measure,Maßeinheiten,0
model,"ir.action,name",act_uom_form2,Units of Measure,Maßeinheiten,0
-model,"ir.ui.menu,name",menu_category_form,Categories,Artikelkategorien,0
model,"ir.ui.menu,name",menu_category_form_new,New Category,Neue Artikelkategorie,0
+model,"ir.ui.menu,name",menu_category_list,Categories,Kategorien,0
model,"ir.ui.menu,name",menu_category_tree,Categories,Artikelkategorien,0
model,"ir.ui.menu,name",menu_main_product,Product,Artikel,0
model,"ir.ui.menu,name",menu_product_product,Products,Artikel,0
diff --git a/fr_FR.csv b/fr_FR.csv
index d27363f..c431e59 100644
--- a/fr_FR.csv
+++ b/fr_FR.csv
@@ -1,4 +1,5 @@
type,name,res_id,src,value,fuzzy
+error,product.category,0,You can not create recursive categories!,Vous ne pouvez pas créer des catégories récursives !,1
error,product.template,0,You cannot change the default uom for a product which is associated to stock moves.,Vous ne pouvez pas changer l'UDM par défaut pour un produit qui a déjà fait l'objet de mouvements de stock,0
error,product.uom,0,"If the UOM is still not used, you can delete it otherwise you can deactivate it and create a new one.","Si l'UDM n'est pas utilisée, vous pouvez la supprimer, sinon vous pouvez la désactiver et en créer une nouvelle.",0
error,product.uom,0,Invalid Factor and Rate values!,valeurs de facteur et de taux invalides !,0
@@ -43,7 +44,7 @@ help,"product.uom,rate",0,"The coefficient for the formula:
1 (base unit) = coef (this unit)","Le coefficient pour la formule:
1 (unité de base) = coef (cette unité)",0
model,"ir.action,name",act_category_form,Product Categories,Catégories de produit,0
-model,"ir.action,name",act_category_form2,Product Categories,Catégories de produit,0
+model,"ir.action,name",act_category_list,Categories,Catégories,1
model,"ir.action,name",act_category_tree,Categories,Catégories,0
model,"ir.action,name",act_product_by_category,Product by Category,Produits par catégories,0
model,"ir.action,name",act_product_form,Products,Produits,0
@@ -52,8 +53,8 @@ model,"ir.action,name",act_uom_category_form,Categories of Unit of Measure,Caté
model,"ir.action,name",act_uom_category_form2,Categories of Unit of Measure,Catégories d'Unité de mesure,0
model,"ir.action,name",act_uom_form,Units of Measure,Unités de mesure,0
model,"ir.action,name",act_uom_form2,Units of Measure,Unités de mesure,0
-model,"ir.ui.menu,name",menu_category_form,Categories,Éditer les catégories,0
model,"ir.ui.menu,name",menu_category_form_new,New Category,Nouvelle catégorie,0
+model,"ir.ui.menu,name",menu_category_list,Categories,Catégories,1
model,"ir.ui.menu,name",menu_category_tree,Categories,Catégories,0
model,"ir.ui.menu,name",menu_main_product,Product,Produit,0
model,"ir.ui.menu,name",menu_product_product,Products,Produits,0
diff --git a/icons/LICENSE b/icons/LICENSE
new file mode 100644
index 0000000..11782c0
--- /dev/null
+++ b/icons/LICENSE
@@ -0,0 +1,264 @@
+ [1]Creative Commons
+
+ Creative Commons Legal Code
+
+ Attribution-ShareAlike 2.0
+ CREATIVE COMMONS CORPORATION IS NOT A LAW FIRM AND DOES NOT PROVIDE
+ LEGAL SERVICES. DISTRIBUTION OF THIS LICENSE DOES NOT CREATE AN
+ ATTORNEY-CLIENT RELATIONSHIP. CREATIVE COMMONS PROVIDES THIS
+ INFORMATION ON AN "AS-IS" BASIS. CREATIVE COMMONS MAKES NO WARRANTIES
+ REGARDING THE INFORMATION PROVIDED, AND DISCLAIMS LIABILITY FOR
+ DAMAGES RESULTING FROM ITS USE.
+
+ License
+
+ THE WORK (AS DEFINED BELOW) IS PROVIDED UNDER THE TERMS OF THIS
+ CREATIVE COMMONS PUBLIC LICENSE ("CCPL" OR "LICENSE"). THE WORK IS
+ PROTECTED BY COPYRIGHT AND/OR OTHER APPLICABLE LAW. ANY USE OF THE
+ WORK OTHER THAN AS AUTHORIZED UNDER THIS LICENSE OR COPYRIGHT LAW IS
+ PROHIBITED.
+
+ BY EXERCISING ANY RIGHTS TO THE WORK PROVIDED HERE, YOU ACCEPT AND
+ AGREE TO BE BOUND BY THE TERMS OF THIS LICENSE. THE LICENSOR GRANTS
+ YOU THE RIGHTS CONTAINED HERE IN CONSIDERATION OF YOUR ACCEPTANCE OF
+ SUCH TERMS AND CONDITIONS.
+
+ 1. Definitions
+ a. "Collective Work" means a work, such as a periodical issue,
+ anthology or encyclopedia, in which the Work in its entirety in
+ unmodified form, along with a number of other contributions,
+ constituting separate and independent works in themselves, are
+ assembled into a collective whole. A work that constitutes a
+ Collective Work will not be considered a Derivative Work (as
+ defined below) for the purposes of this License.
+ b. "Derivative Work" means a work based upon the Work or upon the
+ Work and other pre-existing works, such as a translation, musical
+ arrangement, dramatization, fictionalization, motion picture
+ version, sound recording, art reproduction, abridgment,
+ condensation, or any other form in which the Work may be recast,
+ transformed, or adapted, except that a work that constitutes a
+ Collective Work will not be considered a Derivative Work for the
+ purpose of this License. For the avoidance of doubt, where the
+ Work is a musical composition or sound recording, the
+ synchronization of the Work in timed-relation with a moving image
+ ("synching") will be considered a Derivative Work for the purpose
+ of this License.
+ c. "Licensor" means the individual or entity that offers the Work
+ under the terms of this License.
+ d. "Original Author" means the individual or entity who created the
+ Work.
+ e. "Work" means the copyrightable work of authorship offered under
+ the terms of this License.
+ f. "You" means an individual or entity exercising rights under this
+ License who has not previously violated the terms of this License
+ with respect to the Work, or who has received express permission
+ from the Licensor to exercise rights under this License despite a
+ previous violation.
+ g. "License Elements" means the following high-level license
+ attributes as selected by Licensor and indicated in the title of
+ this License: Attribution, ShareAlike.
+
+ 2. Fair Use Rights. Nothing in this license is intended to reduce,
+ limit, or restrict any rights arising from fair use, first sale or
+ other limitations on the exclusive rights of the copyright owner under
+ copyright law or other applicable laws.
+
+ 3. License Grant. Subject to the terms and conditions of this License,
+ Licensor hereby grants You a worldwide, royalty-free, non-exclusive,
+ perpetual (for the duration of the applicable copyright) license to
+ exercise the rights in the Work as stated below:
+ a. to reproduce the Work, to incorporate the Work into one or more
+ Collective Works, and to reproduce the Work as incorporated in the
+ Collective Works;
+ b. to create and reproduce Derivative Works;
+ c. to distribute copies or phonorecords of, display publicly, perform
+ publicly, and perform publicly by means of a digital audio
+ transmission the Work including as incorporated in Collective
+ Works;
+ d. to distribute copies or phonorecords of, display publicly, perform
+ publicly, and perform publicly by means of a digital audio
+ transmission Derivative Works.
+ e. For the avoidance of doubt, where the work is a musical
+ composition:
+ i. Performance Royalties Under Blanket Licenses. Licensor waives
+ the exclusive right to collect, whether individually or via a
+ performance rights society (e.g. ASCAP, BMI, SESAC),
+ royalties for the public performance or public digital
+ performance (e.g. webcast) of the Work.
+ ii. Mechanical Rights and Statutory Royalties. Licensor waives
+ the exclusive right to collect, whether individually or via a
+ music rights society or designated agent (e.g. Harry Fox
+ Agency), royalties for any phonorecord You create from the
+ Work ("cover version") and distribute, subject to the
+ compulsory license created by 17 USC Section 115 of the US
+ Copyright Act (or the equivalent in other jurisdictions).
+ f. Webcasting Rights and Statutory Royalties. For the avoidance of
+ doubt, where the Work is a sound recording, Licensor waives the
+ exclusive right to collect, whether individually or via a
+ performance-rights society (e.g. SoundExchange), royalties for the
+ public digital performance (e.g. webcast) of the Work, subject to
+ the compulsory license created by 17 USC Section 114 of the US
+ Copyright Act (or the equivalent in other jurisdictions).
+
+ The above rights may be exercised in all media and formats whether now
+ known or hereafter devised. The above rights include the right to make
+ such modifications as are technically necessary to exercise the rights
+ in other media and formats. All rights not expressly granted by
+ Licensor are hereby reserved.
+
+ 4. Restrictions.The license granted in Section 3 above is expressly
+ made subject to and limited by the following restrictions:
+ a. You may distribute, publicly display, publicly perform, or
+ publicly digitally perform the Work only under the terms of this
+ License, and You must include a copy of, or the Uniform Resource
+ Identifier for, this License with every copy or phonorecord of the
+ Work You distribute, publicly display, publicly perform, or
+ publicly digitally perform. You may not offer or impose any terms
+ on the Work that alter or restrict the terms of this License or
+ the recipients' exercise of the rights granted hereunder. You may
+ not sublicense the Work. You must keep intact all notices that
+ refer to this License and to the disclaimer of warranties. You may
+ not distribute, publicly display, publicly perform, or publicly
+ digitally perform the Work with any technological measures that
+ control access or use of the Work in a manner inconsistent with
+ the terms of this License Agreement. The above applies to the Work
+ as incorporated in a Collective Work, but this does not require
+ the Collective Work apart from the Work itself to be made subject
+ to the terms of this License. If You create a Collective Work,
+ upon notice from any Licensor You must, to the extent practicable,
+ remove from the Collective Work any reference to such Licensor or
+ the Original Author, as requested. If You create a Derivative
+ Work, upon notice from any Licensor You must, to the extent
+ practicable, remove from the Derivative Work any reference to such
+ Licensor or the Original Author, as requested.
+ b. You may distribute, publicly display, publicly perform, or
+ publicly digitally perform a Derivative Work only under the terms
+ of this License, a later version of this License with the same
+ License Elements as this License, or a Creative Commons iCommons
+ license that contains the same License Elements as this License
+ (e.g. Attribution-ShareAlike 2.0 Japan). You must include a copy
+ of, or the Uniform Resource Identifier for, this License or other
+ license specified in the previous sentence with every copy or
+ phonorecord of each Derivative Work You distribute, publicly
+ display, publicly perform, or publicly digitally perform. You may
+ not offer or impose any terms on the Derivative Works that alter
+ or restrict the terms of this License or the recipients' exercise
+ of the rights granted hereunder, and You must keep intact all
+ notices that refer to this License and to the disclaimer of
+ warranties. You may not distribute, publicly display, publicly
+ perform, or publicly digitally perform the Derivative Work with
+ any technological measures that control access or use of the Work
+ in a manner inconsistent with the terms of this License Agreement.
+ The above applies to the Derivative Work as incorporated in a
+ Collective Work, but this does not require the Collective Work
+ apart from the Derivative Work itself to be made subject to the
+ terms of this License.
+ c. If you distribute, publicly display, publicly perform, or publicly
+ digitally perform the Work or any Derivative Works or Collective
+ Works, You must keep intact all copyright notices for the Work and
+ give the Original Author credit reasonable to the medium or means
+ You are utilizing by conveying the name (or pseudonym if
+ applicable) of the Original Author if supplied; the title of the
+ Work if supplied; to the extent reasonably practicable, the
+ Uniform Resource Identifier, if any, that Licensor specifies to be
+ associated with the Work, unless such URI does not refer to the
+ copyright notice or licensing information for the Work; and in the
+ case of a Derivative Work, a credit identifying the use of the
+ Work in the Derivative Work (e.g., "French translation of the Work
+ by Original Author," or "Screenplay based on original Work by
+ Original Author"). Such credit may be implemented in any
+ reasonable manner; provided, however, that in the case of a
+ Derivative Work or Collective Work, at a minimum such credit will
+ appear where any other comparable authorship credit appears and in
+ a manner at least as prominent as such other comparable authorship
+ credit.
+
+ 5. Representations, Warranties and Disclaimer
+
+ UNLESS OTHERWISE AGREED TO BY THE PARTIES IN WRITING, LICENSOR OFFERS
+ THE WORK AS-IS AND MAKES NO REPRESENTATIONS OR WARRANTIES OF ANY KIND
+ CONCERNING THE MATERIALS, EXPRESS, IMPLIED, STATUTORY OR OTHERWISE,
+ INCLUDING, WITHOUT LIMITATION, WARRANTIES OF TITLE, MERCHANTIBILITY,
+ FITNESS FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR THE ABSENCE OF
+ LATENT OR OTHER DEFECTS, ACCURACY, OR THE PRESENCE OF ABSENCE OF
+ ERRORS, WHETHER OR NOT DISCOVERABLE. SOME JURISDICTIONS DO NOT ALLOW
+ THE EXCLUSION OF IMPLIED WARRANTIES, SO SUCH EXCLUSION MAY NOT APPLY
+ TO YOU.
+
+ 6. Limitation on Liability. EXCEPT TO THE EXTENT REQUIRED BY
+ APPLICABLE LAW, IN NO EVENT WILL LICENSOR BE LIABLE TO YOU ON ANY
+ LEGAL THEORY FOR ANY SPECIAL, INCIDENTAL, CONSEQUENTIAL, PUNITIVE OR
+ EXEMPLARY DAMAGES ARISING OUT OF THIS LICENSE OR THE USE OF THE WORK,
+ EVEN IF LICENSOR HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+
+ 7. Termination
+ a. This License and the rights granted hereunder will terminate
+ automatically upon any breach by You of the terms of this License.
+ Individuals or entities who have received Derivative Works or
+ Collective Works from You under this License, however, will not
+ have their licenses terminated provided such individuals or
+ entities remain in full compliance with those licenses. Sections
+ 1, 2, 5, 6, 7, and 8 will survive any termination of this License.
+ b. Subject to the above terms and conditions, the license granted
+ here is perpetual (for the duration of the applicable copyright in
+ the Work). Notwithstanding the above, Licensor reserves the right
+ to release the Work under different license terms or to stop
+ distributing the Work at any time; provided, however that any such
+ election will not serve to withdraw this License (or any other
+ license that has been, or is required to be, granted under the
+ terms of this License), and this License will continue in full
+ force and effect unless terminated as stated above.
+
+ 8. Miscellaneous
+ a. Each time You distribute or publicly digitally perform the Work or
+ a Collective Work, the Licensor offers to the recipient a license
+ to the Work on the same terms and conditions as the license
+ granted to You under this License.
+ b. Each time You distribute or publicly digitally perform a
+ Derivative Work, Licensor offers to the recipient a license to the
+ original Work on the same terms and conditions as the license
+ granted to You under this License.
+ c. If any provision of this License is invalid or unenforceable under
+ applicable law, it shall not affect the validity or enforceability
+ of the remainder of the terms of this License, and without further
+ action by the parties to this agreement, such provision shall be
+ reformed to the minimum extent necessary to make such provision
+ valid and enforceable.
+ d. No term or provision of this License shall be deemed waived and no
+ breach consented to unless such waiver or consent shall be in
+ writing and signed by the party to be charged with such waiver or
+ consent.
+ e. This License constitutes the entire agreement between the parties
+ with respect to the Work licensed here. There are no
+ understandings, agreements or representations with respect to the
+ Work not specified here. Licensor shall not be bound by any
+ additional provisions that may appear in any communication from
+ You. This License may not be modified without the mutual written
+ agreement of the Licensor and You.
+
+ Creative Commons is not a party to this License, and makes no warranty
+ whatsoever in connection with the Work. Creative Commons will not be
+ liable to You or any party on any legal theory for any damages
+ whatsoever, including without limitation any general, special,
+ incidental or consequential damages arising in connection to this
+ license. Notwithstanding the foregoing two (2) sentences, if Creative
+ Commons has expressly identified itself as the Licensor hereunder, it
+ shall have all rights and obligations of Licensor.
+
+ Except for the limited purpose of indicating to the public that the
+ Work is licensed under the CCPL, neither party will use the trademark
+ "Creative Commons" or any related trademark or logo of Creative
+ Commons without the prior written consent of Creative Commons. Any
+ permitted use will be in compliance with Creative Commons'
+ then-current trademark usage guidelines, as may be published on its
+ website or otherwise made available upon request from time to time.
+
+ Creative Commons may be contacted at [2]http://creativecommons.org/.
+
+ [3]« Back to Commons Deed
+
+References
+
+ 1. http://creativecommons.org/
+ 2. http://creativecommons.org/
+ 3. http://creativecommons.org/licenses/by-sa/2.0/
diff --git a/icons/tryton-product.svg b/icons/tryton-product.svg
new file mode 100644
index 0000000..dced3c4
--- /dev/null
+++ b/icons/tryton-product.svg
@@ -0,0 +1,483 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:cc="http://web.resource.org/cc/"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:xlink="http://www.w3.org/1999/xlink"
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ sodipodi:docname="package-x-generic.svg"
+ sodipodi:docbase="/home/jimmac/src/cvs/tango-icon-theme/scalable/mimetypes"
+ inkscape:version="0.43+devel"
+ sodipodi:version="0.32"
+ id="svg2963"
+ height="48px"
+ width="48px">
+ <defs
+ id="defs3">
+ <radialGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient5060"
+ id="radialGradient6719"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(-2.774389,0,0,1.969706,112.7623,-872.8854)"
+ cx="605.71429"
+ cy="486.64789"
+ fx="605.71429"
+ fy="486.64789"
+ r="117.14286" />
+ <linearGradient
+ inkscape:collect="always"
+ id="linearGradient5060">
+ <stop
+ style="stop-color:black;stop-opacity:1;"
+ offset="0"
+ id="stop5062" />
+ <stop
+ style="stop-color:black;stop-opacity:0;"
+ offset="1"
+ id="stop5064" />
+ </linearGradient>
+ <radialGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient5060"
+ id="radialGradient6717"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(2.774389,0,0,1.969706,-1891.633,-872.8854)"
+ cx="605.71429"
+ cy="486.64789"
+ fx="605.71429"
+ fy="486.64789"
+ r="117.14286" />
+ <linearGradient
+ id="linearGradient5048">
+ <stop
+ style="stop-color:black;stop-opacity:0;"
+ offset="0"
+ id="stop5050" />
+ <stop
+ id="stop5056"
+ offset="0.5"
+ style="stop-color:black;stop-opacity:1;" />
+ <stop
+ style="stop-color:black;stop-opacity:0;"
+ offset="1"
+ id="stop5052" />
+ </linearGradient>
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient5048"
+ id="linearGradient6715"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(2.774389,0,0,1.969706,-1892.179,-872.8854)"
+ x1="302.85715"
+ y1="366.64789"
+ x2="302.85715"
+ y2="609.50507" />
+ <linearGradient
+ inkscape:collect="always"
+ id="linearGradient2884">
+ <stop
+ style="stop-color:#000000;stop-opacity:1;"
+ offset="0"
+ id="stop2886" />
+ <stop
+ style="stop-color:#000000;stop-opacity:0;"
+ offset="1"
+ id="stop2888" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient2869">
+ <stop
+ style="stop-color:#ffffff;stop-opacity:1;"
+ offset="0"
+ id="stop2871" />
+ <stop
+ style="stop-color:#cccccc;stop-opacity:1.0000000;"
+ offset="1.0000000"
+ id="stop2873" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient4995">
+ <stop
+ id="stop4997"
+ offset="0"
+ style="stop-color:#de9523;stop-opacity:1;" />
+ <stop
+ id="stop4999"
+ offset="1.0000000"
+ style="stop-color:#a36d18;stop-opacity:1.0000000;" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient4987"
+ inkscape:collect="always">
+ <stop
+ id="stop4989"
+ offset="0"
+ style="stop-color:#a0670c;stop-opacity:1;" />
+ <stop
+ id="stop4991"
+ offset="1"
+ style="stop-color:#a0670c;stop-opacity:0;" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient4979">
+ <stop
+ id="stop4981"
+ offset="0.0000000"
+ style="stop-color:#fbf0e0;stop-opacity:1.0000000;" />
+ <stop
+ id="stop4983"
+ offset="1.0000000"
+ style="stop-color:#f0ce99;stop-opacity:1.0000000;" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient4946"
+ inkscape:collect="always">
+ <stop
+ id="stop4948"
+ offset="0"
+ style="stop-color:#000000;stop-opacity:1;" />
+ <stop
+ id="stop4950"
+ offset="1"
+ style="stop-color:#000000;stop-opacity:0;" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient4222">
+ <stop
+ id="stop4224"
+ offset="0"
+ style="stop-color:#ffffff;stop-opacity:1;" />
+ <stop
+ id="stop4226"
+ offset="1.0000000"
+ style="stop-color:#ffffff;stop-opacity:0.68639052;" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient4210">
+ <stop
+ id="stop4212"
+ offset="0.0000000"
+ style="stop-color:#eaba6f;stop-opacity:1.0000000;" />
+ <stop
+ id="stop4214"
+ offset="1.0000000"
+ style="stop-color:#b97a1b;stop-opacity:1.0000000;" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient4192">
+ <stop
+ id="stop4194"
+ offset="0"
+ style="stop-color:#e9b96e;stop-opacity:1;" />
+ <stop
+ id="stop4196"
+ offset="1.0000000"
+ style="stop-color:#f1d19e;stop-opacity:1.0000000;" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient4182">
+ <stop
+ id="stop4184"
+ offset="0.0000000"
+ style="stop-color:#a36d18;stop-opacity:1.0000000;" />
+ <stop
+ id="stop4186"
+ offset="1.0000000"
+ style="stop-color:#d79020;stop-opacity:1.0000000;" />
+ </linearGradient>
+ <radialGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient4946"
+ id="radialGradient2252"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(1.000000,0.000000,0.000000,0.333333,2.658463e-16,23.58206)"
+ cx="22.930462"
+ cy="35.373093"
+ fx="22.930462"
+ fy="35.373093"
+ r="17.576654" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient4979"
+ id="linearGradient2269"
+ gradientUnits="userSpaceOnUse"
+ x1="30.062469"
+ y1="13.444801"
+ x2="17.696169"
+ y2="12.333632" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient4995"
+ id="linearGradient2274"
+ gradientUnits="userSpaceOnUse"
+ x1="36.288929"
+ y1="14.661557"
+ x2="47.065835"
+ y2="15.267649" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient4192"
+ id="linearGradient2277"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(1.000000,0.000000,0.000000,0.986355,0.000000,0.316638)"
+ x1="25.381256"
+ y1="24.720648"
+ x2="24.119167"
+ y2="16.170370" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient4182"
+ id="linearGradient2280"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(1.000000,0.000000,0.000000,1.039184,0.000000,-4.057054e-2)"
+ x1="16.148972"
+ y1="12.636667"
+ x2="34.193642"
+ y2="12.636667" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient4987"
+ id="linearGradient2282"
+ gradientUnits="userSpaceOnUse"
+ x1="21.906841"
+ y1="9.7577486"
+ x2="22.071806"
+ y2="16.020695" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient4222"
+ id="linearGradient2285"
+ gradientUnits="userSpaceOnUse"
+ x1="18.706615"
+ y1="19.912336"
+ x2="30.014812"
+ y2="47.388485" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient4210"
+ id="linearGradient2288"
+ gradientUnits="userSpaceOnUse"
+ x1="24.990499"
+ y1="34.004856"
+ x2="24.990499"
+ y2="22.585211" />
+ <radialGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient2884"
+ id="radialGradient2896"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(1.353283,5.468101e-16,-1.144754e-13,0.635968,-8.458890,3.413470)"
+ cx="23.943670"
+ cy="20.800287"
+ fx="23.943670"
+ fy="20.800287"
+ r="6.4286140" />
+ <radialGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient2869"
+ id="radialGradient2898"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0.749420,0.000000,0.000000,0.394055,6.226925,10.09253)"
+ cx="21.578989"
+ cy="9.0255041"
+ fx="21.578989"
+ fy="9.0255041"
+ r="9.5862970" />
+ <radialGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient2884"
+ id="radialGradient2906"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(1.353283,5.468101e-16,-1.144754e-13,0.635968,-8.458890,3.413470)"
+ cx="23.943670"
+ cy="20.800287"
+ fx="23.943670"
+ fy="20.800287"
+ r="6.4286140" />
+ <radialGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient2869"
+ id="radialGradient2908"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0.749420,0.000000,0.000000,0.394055,6.226925,10.09253)"
+ cx="21.578989"
+ cy="9.8105707"
+ fx="21.578989"
+ fy="9.8105707"
+ r="9.5862970" />
+ </defs>
+ <sodipodi:namedview
+ inkscape:window-y="242"
+ inkscape:window-x="392"
+ inkscape:window-height="706"
+ inkscape:window-width="872"
+ stroke="#c17d11"
+ fill="#e9b96e"
+ inkscape:showpageshadow="false"
+ inkscape:document-units="px"
+ inkscape:grid-bbox="true"
+ showgrid="false"
+ inkscape:current-layer="layer1"
+ inkscape:cy="39.004018"
+ inkscape:cx="74.637005"
+ inkscape:zoom="1"
+ inkscape:pageshadow="2"
+ inkscape:pageopacity="0.0"
+ borderopacity="0.16470588"
+ bordercolor="#666666"
+ pagecolor="#ffffff"
+ id="base" />
+ <metadata
+ id="metadata4">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+ <dc:title>Package</dc:title>
+ <dc:creator>
+ <cc:Agent>
+ <dc:title>Jakub Steiner</dc:title>
+ </cc:Agent>
+ </dc:creator>
+ <dc:source>http://jimmac.musichall.cz/</dc:source>
+ <dc:subject>
+ <rdf:Bag>
+ <rdf:li>package</rdf:li>
+ <rdf:li>archive</rdf:li>
+ <rdf:li>tarball</rdf:li>
+ <rdf:li>tar</rdf:li>
+ <rdf:li>bzip</rdf:li>
+ <rdf:li>gzip</rdf:li>
+ <rdf:li>zip</rdf:li>
+ <rdf:li>arj</rdf:li>
+ <rdf:li>tar</rdf:li>
+ <rdf:li>jar</rdf:li>
+ </rdf:Bag>
+ </dc:subject>
+ <cc:license
+ rdf:resource="http://creativecommons.org/licenses/by-sa/2.0/" />
+ </cc:Work>
+ <cc:License
+ rdf:about="http://creativecommons.org/licenses/by-sa/2.0/">
+ <cc:permits
+ rdf:resource="http://web.resource.org/cc/Reproduction" />
+ <cc:permits
+ rdf:resource="http://web.resource.org/cc/Distribution" />
+ <cc:requires
+ rdf:resource="http://web.resource.org/cc/Notice" />
+ <cc:requires
+ rdf:resource="http://web.resource.org/cc/Attribution" />
+ <cc:permits
+ rdf:resource="http://web.resource.org/cc/DerivativeWorks" />
+ <cc:requires
+ rdf:resource="http://web.resource.org/cc/ShareAlike" />
+ </cc:License>
+ </rdf:RDF>
+ </metadata>
+ <g
+ inkscape:groupmode="layer"
+ inkscape:label="Layer 1"
+ id="layer1">
+ <g
+ style="display:inline"
+ transform="matrix(2.105461e-2,0,0,2.086758e-2,42.60172,35.4036)"
+ id="g6707">
+ <rect
+ style="opacity:0.40206185;color:black;fill:url(#linearGradient6715);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+ id="rect6709"
+ width="1339.6335"
+ height="478.35718"
+ x="-1559.2523"
+ y="-150.69685" />
+ <path
+ style="opacity:0.40206185;color:black;fill:url(#radialGradient6717);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+ d="M -219.61876,-150.68038 C -219.61876,-150.68038 -219.61876,327.65041 -219.61876,327.65041 C -76.744594,328.55086 125.78146,220.48075 125.78138,88.454235 C 125.78138,-43.572302 -33.655436,-150.68036 -219.61876,-150.68038 z "
+ id="path6711"
+ sodipodi:nodetypes="cccc" />
+ <path
+ sodipodi:nodetypes="cccc"
+ id="path6713"
+ d="M -1559.2523,-150.68038 C -1559.2523,-150.68038 -1559.2523,327.65041 -1559.2523,327.65041 C -1702.1265,328.55086 -1904.6525,220.48075 -1904.6525,88.454235 C -1904.6525,-43.572302 -1745.2157,-150.68036 -1559.2523,-150.68038 z "
+ style="opacity:0.40206185;color:black;fill:url(#radialGradient6719);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
+ </g>
+ <rect
+ ry="2.3944440"
+ rx="2.4241352"
+ y="15.275433"
+ x="7.4623847"
+ height="23.112879"
+ width="31.978371"
+ id="rect3115"
+ style="opacity:1.0000000;color:#000000;fill:url(#linearGradient2288);fill-opacity:1.0000000;fill-rule:nonzero;stroke:#a0670c;stroke-width:1.0000007;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4.0000000;stroke-dasharray:none;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000;visibility:visible;display:block;overflow:visible" />
+ <rect
+ style="opacity:0.48101267;color:#000000;fill:none;fill-opacity:1.0000000;fill-rule:nonzero;stroke:url(#linearGradient2285);stroke-width:1.0000011;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4.0000000;stroke-dasharray:none;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000;visibility:visible;display:block;overflow:visible"
+ id="rect4220"
+ width="29.804138"
+ height="21.075352"
+ x="8.4989996"
+ y="16.243698"
+ rx="1.2846882"
+ ry="1.2846882" />
+ <path
+ sodipodi:nodetypes="ccccc"
+ id="path4162"
+ d="M 8.7697819,16.547178 L 13.819731,9.7363408 L 32.615291,9.6353255 L 37.835264,16.408941 L 8.7697819,16.547178 z "
+ style="fill:url(#linearGradient2280);fill-opacity:1.0000000;fill-rule:evenodd;stroke:url(#linearGradient2282);stroke-width:1.0000008;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4.0000000;stroke-dasharray:none;stroke-opacity:1.0000000" />
+ <path
+ sodipodi:nodetypes="ccccc"
+ id="path4164"
+ d="M 38.276321,16.325703 L 43.469269,23.520364 L 3.9609455,23.520364 L 8.6250143,16.320763 L 38.276321,16.325703 z "
+ style="opacity:1.0000000;color:#000000;fill:url(#linearGradient2277);fill-opacity:1.0000000;fill-rule:nonzero;stroke:#a0670c;stroke-width:1.0000005;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4.0000000;stroke-dasharray:none;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000;visibility:visible;display:block;overflow:visible" />
+ <path
+ sodipodi:nodetypes="ccccc"
+ id="path4178"
+ d="M 32.849333,9.6141009 L 37.532219,16.536370 L 46.565835,20.921197 L 38.451329,12.008545 L 32.849333,9.6141009 z "
+ style="opacity:1.0000000;color:#000000;fill:url(#linearGradient2274);fill-opacity:1.0000000;fill-rule:nonzero;stroke:#a0670c;stroke-width:1.0000005;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4.0000000;stroke-dasharray:none;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000;visibility:visible;display:block;overflow:visible" />
+ <path
+ sodipodi:nodetypes="ccccc"
+ style="opacity:1.0000000;color:#000000;fill:#f8e8cf;fill-opacity:1.0000000;fill-rule:nonzero;stroke:#a0670c;stroke-width:1.0000000;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4.0000000;stroke-dasharray:none;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000;visibility:visible;display:block;overflow:visible"
+ d="M 13.617702,9.7151161 L 9.6419233,16.435355 L 0.50729183,20.820182 L 8.6217973,11.907530 L 13.617702,9.7151161 z "
+ id="path4180" />
+ <path
+ style="opacity:1.0000000;color:#000000;fill:none;fill-opacity:1.0000000;fill-rule:nonzero;stroke:#f4e3ca;stroke-width:1.0000000;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4.0000000;stroke-dasharray:none;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000;visibility:visible;display:block;overflow:visible"
+ d="M 37.024959,16.436050 L 41.478871,22.493011 L 5.6482792,22.493011 L 9.7892982,16.312694 L 37.024959,16.436050 z "
+ id="path4954"
+ sodipodi:nodetypes="ccccc" />
+ <g
+ id="g2892"
+ transform="matrix(0.676538,0.000000,0.000000,1.000000,3.994869,0.000000)">
+ <path
+ style="opacity:1.0000000;color:#000000;fill:url(#radialGradient2896);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:2.0000000;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4.0000000;stroke-dasharray:none;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000;visibility:visible;display:inline;overflow:visible"
+ d="M 23.926073,12.101621 C 18.588065,12.101621 14.282569,14.129809 14.282569,16.641813 L 33.604773,16.641813 C 33.604773,14.129809 29.264081,12.101621 23.926073,12.101621 z "
+ id="path2882" />
+ <path
+ id="path2141"
+ d="M 23.931961,12.861168 C 20.379986,12.861168 17.515057,14.210748 17.515057,15.882266 L 30.372285,15.882266 C 30.372285,14.210748 27.483936,12.861168 23.931961,12.861168 z "
+ style="opacity:1.0000000;color:#000000;fill:url(#radialGradient2898);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:2.0000000;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4.0000000;stroke-dasharray:none;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000;visibility:visible;display:inline;overflow:visible" />
+ </g>
+ <g
+ transform="matrix(0.676538,0.000000,0.000000,1.000000,10.49487,0.000000)"
+ id="g2900">
+ <path
+ id="path2902"
+ d="M 23.926073,12.101621 C 18.588065,12.101621 14.282569,14.129809 14.282569,16.641813 L 33.604773,16.641813 C 33.604773,14.129809 29.264081,12.101621 23.926073,12.101621 z "
+ style="opacity:1.0000000;color:#000000;fill:url(#radialGradient2906);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:2.0000000;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4.0000000;stroke-dasharray:none;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000;visibility:visible;display:inline;overflow:visible" />
+ <path
+ style="opacity:1.0000000;color:#000000;fill:url(#radialGradient2908);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:2.0000000;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4.0000000;stroke-dasharray:none;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000;visibility:visible;display:inline;overflow:visible"
+ d="M 23.931961,12.861168 C 20.379986,12.861168 17.515057,14.210748 17.515057,15.882266 L 30.372285,15.882266 C 30.372285,14.210748 27.483936,12.861168 23.931961,12.861168 z "
+ id="path2904" />
+ </g>
+ <path
+ style="opacity:0.87974685;fill:none;fill-opacity:1.0000000;fill-rule:evenodd;stroke:url(#linearGradient2269);stroke-width:1.0000000;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4.0000000;stroke-dasharray:none;stroke-opacity:1.0000000"
+ d="M 9.6523127,16.371803 L 13.036643,10.593020 L 33.514841,10.517799 L 37.356782,16.369880 L 9.6523127,16.371803 z "
+ id="path4966"
+ sodipodi:nodetypes="ccccc" />
+ </g>
+</svg>
diff --git a/nl_NL.csv b/nl_NL.csv
new file mode 100644
index 0000000..aa65b55
--- /dev/null
+++ b/nl_NL.csv
@@ -0,0 +1,193 @@
+type,name,res_id,src,value,fuzzy
+error,product.template,0,There is no account expense/revenue defined on the product %s (%d),Er is geen kosten-/opbrengstenrekening gedefinieerd voor product %s (%d),0
+error,product.uom,0,"If the UOM is still not used, you can delete it otherwise you can deactivate it and create a new one.","Als de maateenheid nog niet is gebruikt kan je hem verwijderen, anders kan je hem deactiveren en een nieuwe aanmaken.",0
+error,product.uom,0,Invalid Factor and Rate values!,Ongeldige factor en verhouding waarden,0
+error,product.uom,0,Rate and factor can not be both equal to zero.,Verhouding en factor kunnen niet beiden nul zijn! ,0
+error,product.uom,0,"You cannot change Rate, Factor or Category on a Unit of Measure. ","U kunt Verhouding, Factor of Categorie van een maateenheid niet wijzigen.",0
+field,"product.category,account_expense",0,Account Expense,Kostenrekening,0
+field,"product.category,account_revenue",0,Account Revenue,Opbrengstrekening,0
+field,"product.category,childs",0,Children,Onderliggende niveaus,0
+field,"product.category,customer_taxes",0,Customer Taxes,Belasting klanten,0
+field,"product.category,name",0,Name,Naam,0
+field,"product.category,parent",0,Parent,Bovenliggend niveau,0
+field,"product.category,rec_name",0,Name,Naam,0
+field,"product.category,supplier_taxes",0,Supplier Taxes,Belastingen inkoop,0
+field,"product.category-customer-account.tax,category",0,Category,Categorie,0
+field,"product.category-customer-account.tax,rec_name",0,Name,Naam,0
+field,"product.category-customer-account.tax,tax",0,Tax,Belasting,0
+field,"product.category-supplier-account.tax,category",0,Category,Categorie,0
+field,"product.category-supplier-account.tax,rec_name",0,Name,Naam,0
+field,"product.category-supplier-account.tax,tax",0,Tax,Belasting,0
+field,"product.product,code",0,Code,Code,0
+field,"product.product,description",0,Description,Omschrijving,0
+field,"product.product,rec_name",0,Name,Naam,0
+field,"product.product,template",0,Product Template,Productsjabloon,0
+field,"product.template,account_category",0,Use Category's accounts,Gebruik de rekeningen van de categorie,0
+field,"product.template,account_expense",0,Account Expense,Kostenrekening,0
+field,"product.template,account_expense_used",0,Account Expense Used,Gebruikte kostenrekening,0
+field,"product.template,account_revenue",0,Account Revenue,Opbrengstrekening,0
+field,"product.template,account_revenue_used",0,Account Revenue Used,Opbrengstrekening gebruikt,0
+field,"product.template,active",0,Active,Actief,0
+field,"product.template,category",0,Category,Categorie,0
+field,"product.template,cost_price",0,Cost Price,Kostprijs,0
+field,"product.template,cost_price_method",0,Cost Method,Kostprijsmethode,0
+field,"product.template,cost_price_uom",0,Cost Price,Kostprijs,0
+field,"product.template,customer_taxes",0,Customer Taxes,Belasting klanten,0
+field,"product.template,customer_taxes_used",0,Customer Taxes Used,Belasting klanten gebruikt,0
+field,"product.template,default_uom",0,Default UOM,Standaard ME,0
+field,"product.template,list_price",0,List Price,Catalogusprijs,0
+field,"product.template,list_price_uom",0,List Price,Catalogusprijs,0
+field,"product.template,name",0,Name,Naam,0
+field,"product.template,products",0,Products,Producten,0
+field,"product.template,rec_name",0,Name,Naam,0
+field,"product.template,supplier_taxes",0,Supplier Taxes,Belastingen inkoop,0
+field,"product.template,supplier_taxes_used",0,Customer Taxes Used,Belasting klanten gebruikt,0
+field,"product.template,taxes_category",0,Use Category's Taxes,Gebruik de belastingen van de categorie,0
+field,"product.template,type",0,Type,Type,0
+field,"product.template-customer-account.tax,product",0,Product Template,Productsjabloon,0
+field,"product.template-customer-account.tax,rec_name",0,Name,Naam,0
+field,"product.template-customer-account.tax,tax",0,Tax,Belasting,0
+field,"product.template-supplier-account.tax,product",0,Product Template,Productsjabloon,0
+field,"product.template-supplier-account.tax,rec_name",0,Name,Naam,0
+field,"product.template-supplier-account.tax,tax",0,Tax,Belasting,0
+field,"product.uom,active",0,Active,Actief,0
+field,"product.uom,category",0,UOM Category,ME categorie,0
+field,"product.uom,digits",0,Display Digits,Zichtbare decimalen,0
+field,"product.uom,factor",0,Factor,Faktor,0
+field,"product.uom,name",0,Name,Naam,0
+field,"product.uom,rate",0,Rate,Verhouding,0
+field,"product.uom,rec_name",0,Name,Naam,0
+field,"product.uom,rounding",0,Rounding Precision,Afronding,0
+field,"product.uom,symbol",0,Symbol,Symbool,0
+field,"product.uom.category,name",0,Name,Naam,0
+field,"product.uom.category,rec_name",0,Name,Naam,0
+field,"product.uom.category,uoms",0,Unit of Measures,Meeteenheid,0
+help,"product.template,account_category",0,Use the accounts defined on the category,Gebruik de rekeningen van de categorie,0
+help,"product.template,account_expense",0,This account will be used instead of the one defined on the category.,Deze rekening zal gebruikt worden in de plaats van die van de categorie.,0
+help,"product.template,account_revenue",0,This account will be used instead of the one defined on the category.,Deze rekening zal gebruikt worden in de plaats van die van de categorie.,0
+help,"product.template,taxes_category",0,Use the taxes defined on the category,Gebruik de belastingen van de categorie,0
+help,"product.uom,factor",0,"The coefficient for the formula:
+coef (base unit) = 1 (this unit)","De coëfficiënt voor deze formule:
+coëf (basiseenheid) = 1 (deze eenheid)",0
+help,"product.uom,rate",0,"The coefficient for the formula:
+1 (base unit) = coef (this unit)","De coëfficiënt voor deze formule:
+1(basiseenheid) = coëf (deze eenheid)",0
+model,"ir.action,name",act_category_form,Product Categories,Product categorieën,0
+model,"ir.action,name",act_category_form2,Product Categories,Product categorieën,0
+model,"ir.action,name",act_category_tree,Categories,Categorieën,0
+model,"ir.action,name",act_product_by_category,Product by Category,Product per categorie,0
+model,"ir.action,name",act_product_form,Products,Producten,0
+model,"ir.action,name",act_product_form2,Products,Producten,0
+model,"ir.action,name",act_uom_category_form,Categories of Unit of Measure,Categorieën van meeteenheden,0
+model,"ir.action,name",act_uom_category_form2,Categories of Unit of Measure,Categorieën van meeteenheden,0
+model,"ir.action,name",act_uom_form,Units of Measure,Meeteenheden,0
+model,"ir.action,name",act_uom_form2,Units of Measure,Meeteenheden,0
+model,"ir.ui.menu,name",menu_category_form,Categories,Categorieën,0
+model,"ir.ui.menu,name",menu_category_form_new,New Category,Nieuwe categorie,0
+model,"ir.ui.menu,name",menu_category_tree,Categories,Categorieën,0
+model,"ir.ui.menu,name",menu_main_product,Product,Productbeheer,0
+model,"ir.ui.menu,name",menu_product_product,Products,Producten,0
+model,"ir.ui.menu,name",menu_product_product_new,New Product,Nieuw product,0
+model,"ir.ui.menu,name",menu_uom_category_form,Categories,Categorieën,0
+model,"ir.ui.menu,name",menu_uom_category_form_new,New Category,Nieuwe categorie,0
+model,"ir.ui.menu,name",menu_uom_form,Units of Measure,Meeteenheden,0
+model,"ir.ui.menu,name",menu_uom_form2,New Unit of Measure,Nieuwe maateenheid,0
+model,"product.category,name",0,Product Category,Product categorie,0
+model,"product.category-customer-account.tax,name",0,Category - Customer Tax,Categorie - belasting klant,0
+model,"product.category-supplier-account.tax,name",0,Category - Supplier Tax,Categorie - belasting leverancier,0
+model,"product.product,name",0,Product,Product,0
+model,"product.template,name",0,Product Template,Productsjabloon,0
+model,"product.template-customer-account.tax,name",0,Product Template - Customer Tax,Productsjabloon - Belasting verkoop,0
+model,"product.template-supplier-account.tax,name",0,Product Template - Supplier Tax,Productsjabloon - Belasting inkoop,0
+model,"product.uom,name",0,Unit of measure,Meeteenheid,0
+model,"product.uom,name",uom_are,Are,Are,0
+model,"product.uom,name",uom_carat,Carat,Karaat,0
+model,"product.uom,name",uom_centimeter,centimeter,centimeter,0
+model,"product.uom,name",uom_cubic_centimeter,Cubic centimeter,Kubieke centimeter,0
+model,"product.uom,name",uom_cubic_foot,Cubic foot,,0
+model,"product.uom,name",uom_cubic_inch,Cubic inch,,0
+model,"product.uom,name",uom_cubic_meter,Cubic meter,Kubieke meter,0
+model,"product.uom,name",uom_day,Day,Dag,0
+model,"product.uom,name",uom_foot,Foot,Voet,0
+model,"product.uom,name",uom_gallon,Gallon,,0
+model,"product.uom,name",uom_gram,Gram,Gram,0
+model,"product.uom,name",uom_hectare,Hectare,Hectare,0
+model,"product.uom,name",uom_hour,Hour,Uur,0
+model,"product.uom,name",uom_inch,Inch,,0
+model,"product.uom,name",uom_kilogram,Kilogram,Kilogram,0
+model,"product.uom,name",uom_kilometer,Kilometer,Kilometer,0
+model,"product.uom,name",uom_liter,Liter,Liter,0
+model,"product.uom,name",uom_meter,Meter,Meter,0
+model,"product.uom,name",uom_mile,Mile,Mijl,0
+model,"product.uom,name",uom_millimeter,Millimeter,Milimeter,0
+model,"product.uom,name",uom_minute,Minute,Minute,0
+model,"product.uom,name",uom_ounce,Ounce,Ons,0
+model,"product.uom,name",uom_pound,Pound,Pond,0
+model,"product.uom,name",uom_second,Second,Seconde,0
+model,"product.uom,name",uom_square_centimeter,Square centimeter,Vierkante centimeter,0
+model,"product.uom,name",uom_square_foot,Square foot,,0
+model,"product.uom,name",uom_square_inch,Square inch,,0
+model,"product.uom,name",uom_square_meter,Square meter,Vierkante meter,0
+model,"product.uom,name",uom_square_yard,Square yard,,0
+model,"product.uom,name",uom_unit,Unit,Eenheid,0
+model,"product.uom,name",uom_work_day,Work Day,Werkdag,0
+model,"product.uom,name",uom_yard,Yard,,0
+model,"product.uom,symbol",uom_are,a,,0
+model,"product.uom,symbol",uom_carat,c,,0
+model,"product.uom,symbol",uom_centimeter,cm,cm.,0
+model,"product.uom,symbol",uom_cubic_centimeter,cm³,cm³,0
+model,"product.uom,symbol",uom_cubic_foot,ft³,,0
+model,"product.uom,symbol",uom_cubic_inch,in³,,0
+model,"product.uom,symbol",uom_cubic_meter,m³,m³,0
+model,"product.uom,symbol",uom_day,d,,0
+model,"product.uom,symbol",uom_foot,ft,,0
+model,"product.uom,symbol",uom_gallon,gal,,0
+model,"product.uom,symbol",uom_gram,g,,0
+model,"product.uom,symbol",uom_hectare,ha,ha.,0
+model,"product.uom,symbol",uom_hour,h,uur,0
+model,"product.uom,symbol",uom_inch,in,,0
+model,"product.uom,symbol",uom_kilogram,kg,kg.,0
+model,"product.uom,symbol",uom_kilometer,km,km.,0
+model,"product.uom,symbol",uom_liter,l,,0
+model,"product.uom,symbol",uom_meter,m,m.,0
+model,"product.uom,symbol",uom_mile,mi,,0
+model,"product.uom,symbol",uom_millimeter,mm,mm.,0
+model,"product.uom,symbol",uom_minute,min,min.,0
+model,"product.uom,symbol",uom_ounce,oz,,0
+model,"product.uom,symbol",uom_pound,lbs,,0
+model,"product.uom,symbol",uom_second,s,,0
+model,"product.uom,symbol",uom_square_centimeter,cm²,cm²,0
+model,"product.uom,symbol",uom_square_foot,ft²,,0
+model,"product.uom,symbol",uom_square_inch,in²,,0
+model,"product.uom,symbol",uom_square_meter,m²,m²,0
+model,"product.uom,symbol",uom_square_yard,yd²,,0
+model,"product.uom,symbol",uom_unit,u,,0
+model,"product.uom,symbol",uom_work_day,wd,,0
+model,"product.uom,symbol",uom_yard,yd,,0
+model,"product.uom.category,name",0,Product uom category,Product ME catergorie,0
+model,"product.uom.category,name",uom_cat_length,Length,Lengte,0
+model,"product.uom.category,name",uom_cat_surface,Surface,Oppervlak,0
+model,"product.uom.category,name",uom_cat_time,Time,Tijd,0
+model,"product.uom.category,name",uom_cat_unit,Units,Eenheden,0
+model,"product.uom.category,name",uom_cat_volume,Volume,Volume,0
+model,"product.uom.category,name",uom_cat_weight,Weight,Gewicht,0
+model,"res.group,name",group_product_admin,Product Administration,Productregistratie,0
+selection,"product.template,cost_price_method",0,Average,Gemiddeld,0
+selection,"product.template,cost_price_method",0,Fixed,Vast,0
+selection,"product.template,type",0,Consumable,Verbruik,0
+selection,"product.template,type",0,Service,Service,0
+selection,"product.template,type",0,Stockable,Op voorraad,0
+view,product.category,0,Children,Onderliggende niveaus,0
+view,product.category,0,Product Categories,Product categorieën,0
+view,product.category,0,Product Category,Product categorie,0
+view,product.product,0,Products,Producten,0
+view,product.template,0,Accounting,Boekhouden,0
+view,product.template,0,Accounts,Rekeningen,0
+view,product.template,0,General,Algemeen,0
+view,product.template,0,Product Template,Productsjabloon,0
+view,product.template,0,Product Templates,Productsjabloon,0
+view,product.template,0,Taxes,Belastingen,0
+view,product.uom,0,Unit of Measure,Meeteenheid,0
+view,product.uom,0,Units of Measure,Meeteenheden,0
+view,product.uom.category,0,Categories of Unit of Measure,Categorieën van meeteenheden,0
+view,product.uom.category,0,Category of Unit of Measure,Categorie van meeteenheden,0
diff --git a/product.xml b/product.xml
index e9f34f3..ea34399 100644
--- a/product.xml
+++ b/product.xml
@@ -14,8 +14,12 @@ this repository contains the full copyright notices and license terms. -->
<field name="groups" eval="[('add', ref('group_product_admin'))]"/>
</record>
+ <record model="ir.ui.icon" id="product_icon">
+ <field name="name">tryton-product</field>
+ <field name="path">icons/tryton-product.svg</field>
+ </record>
<menuitem name="Product" id="menu_main_product" sequence="1"
- icon="tryton-package"/>
+ icon="tryton-product"/>
<record model="ir.ui.view" id="template_view_tree">
<field name="model">product.template</field>
@@ -122,7 +126,6 @@ this repository contains the full copyright notices and license terms. -->
<record model="ir.action.act_window" id="act_product_form">
<field name="name">Products</field>
<field name="res_model">product.product</field>
- <field name="view_type">form</field>
</record>
@@ -145,7 +148,6 @@ this repository contains the full copyright notices and license terms. -->
<record model="ir.action.act_window" id="act_product_form2">
<field name="name">Products</field>
<field name="res_model">product.product</field>
- <field name="view_type">form</field>
</record>
<record model="ir.action.act_window.view" id="act_product_list_view2">
@@ -167,7 +169,6 @@ this repository contains the full copyright notices and license terms. -->
<record model="ir.action.act_window" id="act_product_by_category">
<field name="name">Product by Category</field>
<field name="res_model">product.product</field>
- <field name="view_type">form</field>
<field name="context">{'categories': [Eval('active_id')]}</field>
<field name="domain">[('category','child_of', [Eval('active_id')], 'parent')]</field>
</record>
diff --git a/ru_RU.csv b/ru_RU.csv
new file mode 100644
index 0000000..46a18a5
--- /dev/null
+++ b/ru_RU.csv
@@ -0,0 +1,155 @@
+type,name,res_id,src,value,fuzzy
+error,product.uom,0,"If the UOM is still not used, you can delete it ortherwise you can deactivate it and create a new one.","ЕÑли Ед.Ð¸Ð·Ð¼ÐµÑ€ÐµÐ½Ð¸Ñ ÐµÑ‰Ðµ не иÑпользуетÑÑ, его можно удалить или вы можете отключить его и Ñоздать новую.",0
+error,product.uom,0,Invalid Factor and Rate values!,Ðе правильные Ð·Ð½Ð°Ñ‡ÐµÐ½Ð¸Ñ Ñ„Ð°ÐºÑ‚Ð¾Ñ€Ð° и курÑа,0
+error,product.uom,0,Rate and factor can not be both equal to zero.,Ставка и фактор не могут быть одновременно равны нулю.,0
+error,product.uom,0,"You cannot change Rate, Factor or Category on a Unit of Measure. ","Ð’Ñ‹ не можете изменить КурÑ, фактор или категорию на единицу измерениÑ.",0
+field,"product.category,childs",0,Children,Подчиненый,0
+field,"product.category,name",0,Name,Ðаименование,0
+field,"product.category,parent",0,Parent,ОÑновной,0
+field,"product.category,rec_name",0,Name,Ðаименование,0
+field,"product.product,code",0,Code,Код,0
+field,"product.product,description",0,Description,ОпиÑание,0
+field,"product.product,rec_name",0,Name,Ðаименование,0
+field,"product.product,template",0,Product Template,Шаблон Товара,0
+field,"product.template,active",0,Active,ДейÑтвительнный,0
+field,"product.template,category",0,Category,Категории,0
+field,"product.template,cost_price",0,Cost Price,ÐŸÐ¾ÐºÑƒÐ¿Ð½Ð°Ñ Ñ†ÐµÐ½Ð°,0
+field,"product.template,cost_price_method",0,Cost Method,Затратный метод,0
+field,"product.template,cost_price_uom",0,Cost Price,Цена за единицу,0
+field,"product.template,default_uom",0,Default UOM,По умолчанию ед.измерениÑ,0
+field,"product.template,list_price",0,List Price,ПрайÑ-лиÑÑ‚,0
+field,"product.template,list_price_uom",0,List Price,ПрайÑ-лиÑÑ‚,0
+field,"product.template,name",0,Name,Ðаименование,0
+field,"product.template,products",0,Products,ТМЦ,0
+field,"product.template,rec_name",0,Name,Ðаименование,0
+field,"product.template,type",0,Type,Тип,0
+field,"product.uom,active",0,Active,ДейÑтвительнный,0
+field,"product.uom,category",0,UOM Category,ÐšÐ°Ñ‚ÐµÐ³Ð¾Ñ€Ð¸Ñ Ð•Ð´.изм.,0
+field,"product.uom,digits",0,Display Digits,Кол-во знаков поÑле запÑтой,0
+field,"product.uom,factor",0,Factor,КоÑффициент к оÑновной единице,0
+field,"product.uom,name",0,Name,Ðаименование,0
+field,"product.uom,rate",0,Rate,КоÑфициент оÑновной единицы,0
+field,"product.uom,rec_name",0,Name,Ðаименование,0
+field,"product.uom,rounding",0,Rounding Precision,ТочноÑÑ‚ÑŒ округлениÑ,0
+field,"product.uom,symbol",0,Symbol,УÑловное обозначение,0
+field,"product.uom.category,name",0,Name,Ðаименование,0
+field,"product.uom.category,rec_name",0,Name,Ðаименование,0
+field,"product.uom.category,uoms",0,Unit of Measures,Единица измерений,0
+help,"product.uom,factor",0,"The coefficient for the formula:
+coef (base unit) = 1 (this unit)","КоÑффициент по формуле:
+коÑффициент в Ñтом поле (Ð±Ð°Ð·Ð¾Ð²Ð°Ñ ÐµÐ´Ð¸Ð½Ð¸Ñ†Ð°) = 1 (Ñтой ед. измерениÑ)",0
+help,"product.uom,rate",0,"The coefficient for the formula:
+1 (base unit) = coef (this unit)","КоÑффициент по формуле:
+1 (Ð±Ð°Ð·Ð¾Ð²Ð°Ñ ÐµÐ´Ð¸Ð½Ð¸Ñ†Ð°) = коÑффициенту (Ñтой ед.измерениÑ)",0
+model,"ir.action,name",act_category_form,Product Categories,ÐšÐ°Ñ‚ÐµÐ³Ð¾Ñ€Ð¸Ñ Ð¢ÐœÐ¦,0
+model,"ir.action,name",act_category_form2,Product Categories,ÐšÐ°Ñ‚ÐµÐ³Ð¾Ñ€Ð¸Ñ Ð¢ÐœÐ¦,0
+model,"ir.action,name",act_category_tree,Categories,КатегориÑ,0
+model,"ir.action,name",act_product_by_category,Product by Category,ТМЦ по категориÑм,0
+model,"ir.action,name",act_product_form,Products,ТМЦ,0
+model,"ir.action,name",act_product_form2,Products,ТМЦ,0
+model,"ir.action,name",act_uom_category_form,Categories of Unit of Measure,ÐšÐ°Ñ‚ÐµÐ³Ð¾Ñ€Ð¸Ñ ÐµÐ´.измерениÑ,0
+model,"ir.action,name",act_uom_category_form2,Categories of Unit of Measure,ÐšÐ°Ñ‚ÐµÐ³Ð¾Ñ€Ð¸Ñ ÐµÐ´.измерениÑ,0
+model,"ir.action,name",act_uom_form,Units of Measure,Единицы измерениÑ,0
+model,"ir.action,name",act_uom_form2,Units of Measure,Единицы измерениÑ,0
+model,"ir.ui.menu,name",menu_category_form,Categories,КатегориÑ,0
+model,"ir.ui.menu,name",menu_category_form_new,New Category,ÐÐ¾Ð²Ð°Ñ ÐºÐ°Ñ‚ÐµÐ³Ð¾Ñ€Ð¸Ñ,0
+model,"ir.ui.menu,name",menu_category_tree,Categories,КатегориÑ,0
+model,"ir.ui.menu,name",menu_main_product,Product,Товарно материальные ценноÑти (ТМЦ),0
+model,"ir.ui.menu,name",menu_product_product,Products,ТМЦ,0
+model,"ir.ui.menu,name",menu_product_product_new,New Product,Ðовый ТМЦ,0
+model,"ir.ui.menu,name",menu_uom_category_form,Categories,КатегориÑ,0
+model,"ir.ui.menu,name",menu_uom_category_form_new,New Category,ÐÐ¾Ð²Ð°Ñ ÐºÐ°Ñ‚ÐµÐ³Ð¾Ñ€Ð¸Ñ,0
+model,"ir.ui.menu,name",menu_uom_form,Units of Measure,Единицы измерениÑ,0
+model,"ir.ui.menu,name",menu_uom_form2,New Unit of Measure,ÐÐ¾Ð²Ð°Ñ ÐµÐ´Ð¸Ð½Ð¸Ñ†Ð° измерениÑ,0
+model,"product.category,name",0,Product Category,ÐšÐ°Ñ‚ÐµÐ³Ð¾Ñ€Ð¸Ñ Ð¢ÐœÐ¦,0
+model,"product.product,name",0,Product,ТМЦ,0
+model,"product.template,name",0,Product Template,Шаблон ТМЦ,0
+model,"product.uom,name",0,Unit of measure,Единица измерениÑ,0
+model,"product.uom,name",uom_are,Are,,0
+model,"product.uom,name",uom_carat,Carat,Карат,0
+model,"product.uom,name",uom_centimeter,centimeter,Ñантиметр,0
+model,"product.uom,name",uom_cubic_centimeter,Cubic centimeter,КубичеÑкий Ñантиметр,0
+model,"product.uom,name",uom_cubic_foot,Cubic foot,КубичеÑкий фут,0
+model,"product.uom,name",uom_cubic_inch,Cubic inch,КубичеÑкий дюйм,0
+model,"product.uom,name",uom_cubic_meter,Cubic meter,КубичеÑкий метр,0
+model,"product.uom,name",uom_day,Day,День,0
+model,"product.uom,name",uom_foot,Foot,Фут,0
+model,"product.uom,name",uom_gallon,Gallon,Галлон,0
+model,"product.uom,name",uom_gram,Gram,Грамм,0
+model,"product.uom,name",uom_hectare,Hectare,Гектар,0
+model,"product.uom,name",uom_hour,Hour,ЧаÑ,0
+model,"product.uom,name",uom_inch,Inch,Дюйм,0
+model,"product.uom,name",uom_kilogram,Kilogram,Килограмм,0
+model,"product.uom,name",uom_kilometer,Kilometer,Километр,0
+model,"product.uom,name",uom_liter,Liter,Литр,0
+model,"product.uom,name",uom_meter,Meter,Метр,0
+model,"product.uom,name",uom_mile,Mile,МилÑ,0
+model,"product.uom,name",uom_millimeter,Millimeter,Миллиметр,0
+model,"product.uom,name",uom_minute,Minute,Минута,0
+model,"product.uom,name",uom_ounce,Ounce,УнциÑ,0
+model,"product.uom,name",uom_pound,Pound,Фунт,0
+model,"product.uom,name",uom_second,Second,Секунда,0
+model,"product.uom,name",uom_square_centimeter,Square centimeter,Квадратный Ñантиметр,0
+model,"product.uom,name",uom_square_foot,Square foot,Квадратный фут,0
+model,"product.uom,name",uom_square_inch,Square inch,Квадратный дюйм,0
+model,"product.uom,name",uom_square_meter,Square meter,Квадратный метр,0
+model,"product.uom,name",uom_square_yard,Square yard,Квадратный Ñрд,0
+model,"product.uom,name",uom_unit,Unit,Штука,0
+model,"product.uom,name",uom_work_day,Work Day,Рабочий день,0
+model,"product.uom,name",uom_yard,Yard,Ярд,0
+model,"product.uom,symbol",uom_are,a,,0
+model,"product.uom,symbol",uom_carat,c,,0
+model,"product.uom,symbol",uom_centimeter,cm,,0
+model,"product.uom,symbol",uom_cubic_centimeter,cm³,,0
+model,"product.uom,symbol",uom_cubic_foot,ft³,,0
+model,"product.uom,symbol",uom_cubic_inch,in³,,0
+model,"product.uom,symbol",uom_cubic_meter,m³,,0
+model,"product.uom,symbol",uom_day,d,,0
+model,"product.uom,symbol",uom_foot,ft,,0
+model,"product.uom,symbol",uom_gallon,gal,,0
+model,"product.uom,symbol",uom_gram,g,,0
+model,"product.uom,symbol",uom_hectare,ha,,0
+model,"product.uom,symbol",uom_hour,h,,0
+model,"product.uom,symbol",uom_inch,in,,0
+model,"product.uom,symbol",uom_kilogram,kg,,0
+model,"product.uom,symbol",uom_kilometer,km,,0
+model,"product.uom,symbol",uom_liter,l,,0
+model,"product.uom,symbol",uom_meter,m,,0
+model,"product.uom,symbol",uom_mile,mi,,0
+model,"product.uom,symbol",uom_millimeter,mm,,0
+model,"product.uom,symbol",uom_minute,min,,0
+model,"product.uom,symbol",uom_ounce,oz,,0
+model,"product.uom,symbol",uom_pound,lbs,,0
+model,"product.uom,symbol",uom_second,s,,0
+model,"product.uom,symbol",uom_square_centimeter,cm²,,0
+model,"product.uom,symbol",uom_square_foot,ft²,,0
+model,"product.uom,symbol",uom_square_inch,in²,,0
+model,"product.uom,symbol",uom_square_meter,m²,,0
+model,"product.uom,symbol",uom_square_yard,yd²,,0
+model,"product.uom,symbol",uom_unit,u,,0
+model,"product.uom,symbol",uom_work_day,wd,,0
+model,"product.uom,symbol",uom_yard,yd,,0
+model,"product.uom.category,name",0,Product uom category,ÐšÐ°Ñ‚ÐµÐ³Ð¾Ñ€Ð¸Ñ ÐµÐ´. Ð¸Ð·Ð¼ÐµÑ€ÐµÐ½Ð¸Ñ Ð¢ÐœÐ¦,0
+model,"product.uom.category,name",uom_cat_length,Length,Длина,0
+model,"product.uom.category,name",uom_cat_surface,Surface,Площадь,0
+model,"product.uom.category,name",uom_cat_time,Time,ВремÑ,0
+model,"product.uom.category,name",uom_cat_unit,Units,Единицы,0
+model,"product.uom.category,name",uom_cat_volume,Volume,Объем,0
+model,"product.uom.category,name",uom_cat_weight,Weight,Ширина,0
+model,"res.group,name",group_product_admin,Product Administration,Управление ТМЦ,0
+selection,"product.template,cost_price_method",0,Average,СреднÑÑ Ñ†ÐµÐ½Ð°,0
+selection,"product.template,cost_price_method",0,Fixed,ФикÑированнаÑ,0
+selection,"product.template,type",0,Consumable,РаÑходные,0
+selection,"product.template,type",0,Service,УÑлуги,0
+selection,"product.template,type",0,Stockable,Можно хранить,0
+view,product.category,0,Children,Подчиненый,0
+view,product.category,0,Product Categories,ÐšÐ°Ñ‚ÐµÐ³Ð¾Ñ€Ð¸Ñ Ð¢ÐœÐ¦,0
+view,product.category,0,Product Category,Категории ТМЦ,0
+view,product.product,0,Products,ТМЦ,0
+view,product.template,0,General,ОÑновной,0
+view,product.template,0,Product Template,Шаблон Товара,0
+view,product.template,0,Product Templates,Шаблоны Товара,0
+view,product.uom,0,Unit of Measure,Единица измерениÑ,0
+view,product.uom,0,Units of Measure,Единицы измерениÑ,0
+view,product.uom.category,0,Categories of Unit of Measure,ÐšÐ°Ñ‚ÐµÐ³Ð¾Ñ€Ð¸Ñ ÐµÐ´.измерениÑ,0
+view,product.uom.category,0,Category of Unit of Measure,Категории ед.измерениÑ,0
diff --git a/setup.py b/setup.py
index 6947226..afc69b8 100644
--- a/setup.py
+++ b/setup.py
@@ -44,12 +44,17 @@ setup(name='trytond_product',
'Intended Audience :: Legal Industry',
'Intended Audience :: Manufacturing',
'License :: OSI Approved :: GNU General Public License (GPL)',
+ 'Natural Language :: Bulgarian',
+ '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',
+ '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.egg-info/PKG-INFO b/trytond_product.egg-info/PKG-INFO
index e4417e4..753cfff 100644
--- a/trytond_product.egg-info/PKG-INFO
+++ b/trytond_product.egg-info/PKG-INFO
@@ -1,12 +1,12 @@
Metadata-Version: 1.0
Name: trytond-product
-Version: 1.8.0
+Version: 2.0.0
Summary: Define products, categories of product, units of measure, categories of units of measure.
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
@@ -16,10 +16,15 @@ 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 :: 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
+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.egg-info/SOURCES.txt b/trytond_product.egg-info/SOURCES.txt
index 1f426a0..869fc3f 100644
--- a/trytond_product.egg-info/SOURCES.txt
+++ b/trytond_product.egg-info/SOURCES.txt
@@ -4,12 +4,15 @@ INSTALL
LICENSE
MANIFEST.in
README
+bg_BG.csv
category.xml
de_DE.csv
es_CO.csv
es_ES.csv
fr_FR.csv
+nl_NL.csv
product.xml
+ru_RU.csv
setup.py
uom.xml
./__init__.py
@@ -20,6 +23,8 @@ uom.xml
./tests/__init__.py
./tests/test_product.py
doc/index.rst
+icons/LICENSE
+icons/tryton-product.svg
tests/__init__.py
tests/__init__.pyc
tests/test_product.py
diff --git a/trytond_product.egg-info/requires.txt b/trytond_product.egg-info/requires.txt
index 3127597..820b8fc 100644
--- a/trytond_product.egg-info/requires.txt
+++ b/trytond_product.egg-info/requires.txt
@@ -1 +1 @@
-trytond >= 1.8, < 1.9
\ No newline at end of file
+trytond >= 2.0, < 2.1
\ No newline at end of file
diff --git a/uom.xml b/uom.xml
index 8d215fd..4430b7d 100644
--- a/uom.xml
+++ b/uom.xml
@@ -49,7 +49,6 @@ this repository contains the full copyright notices and license terms. -->
<record model="ir.action.act_window" id="act_uom_form">
<field name="name">Units of Measure</field>
<field name="res_model">product.uom</field>
- <field name="view_type">form</field>
</record>
<record model="ir.action.act_window.view" id="act_uom_form_view1">
<field name="sequence" eval="10"/>
@@ -66,7 +65,6 @@ this repository contains the full copyright notices and license terms. -->
<record model="ir.action.act_window" id="act_uom_form2">
<field name="name">Units of Measure</field>
<field name="res_model">product.uom</field>
- <field name="view_type">form</field>
</record>
<record model="ir.action.act_window.view" id="act_uom_form2_view1">
<field name="sequence" eval="10"/>
@@ -110,7 +108,6 @@ this repository contains the full copyright notices and license terms. -->
<record model="ir.action.act_window" id="act_uom_category_form">
<field name="name">Categories of Unit of Measure</field>
<field name="res_model">product.uom.category</field>
- <field name="view_type">form</field>
</record>
<record model="ir.action.act_window.view" id="act_uom_category_form_view1">
<field name="sequence" eval="10"/>
@@ -129,7 +126,6 @@ this repository contains the full copyright notices and license terms. -->
<record model="ir.action.act_window" id="act_uom_category_form2">
<field name="name">Categories of Unit of Measure</field>
<field name="res_model">product.uom.category</field>
- <field name="view_type">form</field>
</record>
<record model="ir.action.act_window.view" id="act_uom_category_form2_view1">
<field name="sequence" eval="10"/>
commit b6981374d2a72657b1a3ab6cba03bd747cd1bcbd
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Tue Apr 26 21:08:54 2011 +0200
Updating to standards version 3.9.2.
diff --git a/debian/control b/debian/control
index 336c64e..1c7ed7a 100644
--- a/debian/control
+++ b/debian/control
@@ -7,7 +7,7 @@ Uploaders:
Mathias Behrle <mathiasb at m9s.biz>
Dm-Upload-Allowed: yes
Build-Depends: debhelper (>= 8), python, python-setuptools, python-support
-Standards-Version: 3.9.1
+Standards-Version: 3.9.2
Homepage: http://www.tryton.org/
Vcs-Browser: http://git.debian-maintainers.org/?p=tryton/tryton-modules-product.git
Vcs-Git: git://git.debian-maintainers.org/git/tryton/tryton-modules-product.git
commit 1ee2a0dbd9dcaee30a1c41fbc0aa30f7ff2a160e
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Tue Feb 15 13:12:03 2011 +0100
Releasing debian version 1.8.0-2.
diff --git a/debian/changelog b/debian/changelog
index b1ee863..6767ab6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+tryton-modules-product (1.8.0-2) unstable; urgency=low
+
+ * Changing my email address.
+ * Setting minimal Python version to 2.5.
+ * Updating Copyright.
+
+ -- Mathias Behrle <mathiasb at m9s.biz> Tue, 15 Feb 2011 13:11:53 +0100
+
tryton-modules-product (1.8.0-1) experimental; urgency=low
* Updating standards version to 3.9.0.
commit 087b523dab90574726e396eb130346bf3951209f
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Tue Feb 15 12:38:44 2011 +0100
Updating Copyright.
diff --git a/debian/copyright b/debian/copyright
index 6146982..bf68e1b 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -27,7 +27,7 @@ License: GPL-3+
can be found in /usr/share/common-licenses/GPL-3 file.
Files: debian/*
-Copyright: (C) 2009-2010 Daniel Baumann <daniel at debian.org>
+Copyright: (C) 2009-2011 Daniel Baumann <daniel at debian.org>
License: GPL-3+
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
commit 1c3ed3f5c6ab85be8d90f906a011730596f5a8c0
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Sat Jan 15 17:27:19 2011 +0100
Setting minimal Python version to 2.5.
diff --git a/debian/pyversions b/debian/pyversions
index 8b253bc..b3dc41e 100644
--- a/debian/pyversions
+++ b/debian/pyversions
@@ -1 +1 @@
-2.4-
+2.5-
commit 53d204f4a82f30069290d42f0985f17793297e22
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Sat Nov 20 11:48:55 2010 +0100
Changing my email address.
diff --git a/debian/control b/debian/control
index bf9504f..336c64e 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: optional
Maintainer: Debian Tryton Maintainers <tryton at lists.debian-maintainers.org>
Uploaders:
Daniel Baumann <daniel at debian.org>,
- Mathias Behrle <mathiasb at mbsolutions.selfip.biz>
+ Mathias Behrle <mathiasb at m9s.biz>
Dm-Upload-Allowed: yes
Build-Depends: debhelper (>= 8), python, python-setuptools, python-support
Standards-Version: 3.9.1
commit 76b96a219df03ddad76dca00a6f078046853abf2
Author: Daniel Baumann <daniel at debian.org>
Date: Fri Nov 12 13:05:43 2010 +0100
Releasing debian version 1.8.0-1.
diff --git a/debian/changelog b/debian/changelog
index 44983e0..b1ee863 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+tryton-modules-product (1.8.0-1) experimental; urgency=low
+
+ * Updating standards version to 3.9.0.
+ * Updating to debhelper version 8.
+ * Updating to standards version 3.9.1.
+ * Switching to source format 3.0 (quilt).
+ * Merging upstream version 1.8.0.
+ * Updating versioned tryton depends to 1.8.
+
+ -- Daniel Baumann <daniel at debian.org> Fri, 12 Nov 2010 13:05:40 +0100
+
tryton-modules-product (1.6.0-1) unstable; urgency=low
[ Daniel Baumann ]
commit 1c32508330384c3b6491f72be56be2e61db0e4a8
Author: Daniel Baumann <daniel at debian.org>
Date: Thu Nov 4 20:16:01 2010 +0100
Updating versioned tryton depends to 1.8.
diff --git a/debian/control b/debian/control
index 530dd2d..bf9504f 100644
--- a/debian/control
+++ b/debian/control
@@ -15,7 +15,7 @@ Vcs-Git: git://git.debian-maintainers.org/git/tryton/tryton-modules-product.git
Package: tryton-modules-product
Architecture: all
Depends:
- ${misc:Depends}, ${python:Depends}, tryton-server (>= 1.6),
+ ${misc:Depends}, ${python:Depends}, tryton-server (>= 1.8),
python-pkg-resources
XB-Python-Version: ${python:Versions}
Description: Tryton Application Platform (Product Module)
commit 946d54fdd7bcde05645165f648cdd2188ad10374
Author: Daniel Baumann <daniel at debian.org>
Date: Thu Nov 4 20:13:25 2010 +0100
Merging upstream version 1.8.0.
diff --git a/CHANGELOG b/CHANGELOG
index 7847ea6..b6bb2d4 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-09
* Bug fixes (see mercurial logs for details)
* Improve computation precision of UOM convertion
diff --git a/INSTALL b/INSTALL
index 1e6e3ad..851d837 100644
--- a/INSTALL
+++ b/INSTALL
@@ -4,7 +4,7 @@ Installing trytond_product
Prerequisites
-------------
- * Python 2.4 or later (http://www.python.org/)
+ * Python 2.5 or later (http://www.python.org/)
* trytond (http://www.tryton.org/)
Installation
diff --git a/MANIFEST.in b/MANIFEST.in
index b2a140e..dcb2afa 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -7,5 +7,4 @@ include LICENSE
include *.xml
include *.odt
include *.csv
-include tests/*
include doc/*
diff --git a/PKG-INFO b/PKG-INFO
index ad680d1..90a4ee3 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,12 +1,12 @@
Metadata-Version: 1.0
Name: trytond_product
-Version: 1.6.0
+Version: 1.8.0
Summary: Define products, categories of product, units of measure, categories of units of measure.
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 ea1f076..8aa55d4 100644
--- a/__tryton__.py
+++ b/__tryton__.py
@@ -6,7 +6,7 @@
'name_es_CO': 'Productos',
'name_es_ES': 'Producto',
'name_fr_FR': 'Produit',
- 'version' : '1.6.0',
+ 'version' : '1.8.0',
'author' : 'B2CK',
'email': 'info at b2ck.com',
'website': 'http://www.tryton.org/',
diff --git a/category.py b/category.py
index 89b7544..9e36daf 100644
--- a/category.py
+++ b/category.py
@@ -17,7 +17,7 @@ class Category(ModelSQL, ModelView):
super(Category, self).__init__()
self._order.insert(0, ('name', 'ASC'))
- def get_rec_name(self, cursor, user, ids, name, context=None):
+ def get_rec_name(self, ids, name):
if not ids:
return {}
res = {}
@@ -28,7 +28,7 @@ class Category(ModelSQL, ModelView):
return _name(category.parent) + ' / ' + category.name
else:
return category.name
- for category in self.browse(cursor, user, ids, context=context):
+ for category in self.browse(ids):
res[category.id] = _name(category)
return res
diff --git a/de_DE.csv b/de_DE.csv
index dc97996..23877b8 100644
--- a/de_DE.csv
+++ b/de_DE.csv
@@ -42,14 +42,6 @@ field,"product.template,write_date",0,Last modification date,Zuletzt geändert a
field,"product.template,write_uid",0,Last modification by,Zuletzt geändert von,0
field,"product.uom,active",0,Active,Aktiv,0
field,"product.uom,category",0,UOM Category,Kategorie Maßeinheit,0
-field,"product.uom.category,create_date",0,Creation date,Erstellungsdatum,0
-field,"product.uom.category,create_uid",0,Creation user,Ersteller,0
-field,"product.uom.category,id",0,ID,ID,0
-field,"product.uom.category,name",0,Name,Name,0
-field,"product.uom.category,rec_name",0,Name,Name,0
-field,"product.uom.category,uoms",0,Unit of Measures,Maßeinheiten,0
-field,"product.uom.category,write_date",0,Last modification date,Zuletzt geändert am,0
-field,"product.uom.category,write_uid",0,Last modification by,Zuletzt geändert von,0
field,"product.uom,create_date",0,Creation date,Erstellungsdatum,0
field,"product.uom,create_uid",0,Creation user,Ersteller,0
field,"product.uom,digits",0,Display Digits,Angezeigte Stellen,0
@@ -62,6 +54,14 @@ field,"product.uom,rounding",0,Rounding Precision,Rundungsgenauigkeit,0
field,"product.uom,symbol",0,Symbol,Symbol,0
field,"product.uom,write_date",0,Last modification date,Zuletzt geändert am,0
field,"product.uom,write_uid",0,Last modification by,Zuletzt geändert von,0
+field,"product.uom.category,create_date",0,Creation date,Erstellungsdatum,0
+field,"product.uom.category,create_uid",0,Creation user,Ersteller,0
+field,"product.uom.category,id",0,ID,ID,0
+field,"product.uom.category,name",0,Name,Name,0
+field,"product.uom.category,rec_name",0,Name,Name,0
+field,"product.uom.category,uoms",0,Unit of Measures,Maßeinheiten,0
+field,"product.uom.category,write_date",0,Last modification date,Zuletzt geändert am,0
+field,"product.uom.category,write_uid",0,Last modification by,Zuletzt geändert von,0
help,"product.uom,factor",0,"The coefficient for the formula:
coef (base unit) = 1 (this unit)","Der Faktor der Basiseinheit für eine Maßeinheit ist immer 1.
Formel: diese Einheit = Faktor * Basiseinheit
@@ -70,36 +70,30 @@ help,"product.uom,rate",0,"The coefficient for the formula:
1 (base unit) = coef (this unit)","Der Kehrwert des Faktors der Basiseinheit für eine Maßeinheit ist immer 1.
Formel: Basiseinheit = Kehrwert * diese Einheit
Das Feld Faktor wird automatisch aus dem hier eingetragenen Wert ermittelt.",0
-model,"ir.action,name",act_category_tree,Categories,Artikelkategorien,0
-model,"ir.action,name",act_uom_category_form,Categories of Unit of Measure,Kategorien Maßeinheiten,0
-model,"ir.action,name",act_uom_category_form2,Categories of Unit of Measure,Kategorien Maßeinheiten,0
-model,"ir.action,name",act_product_by_category,Product by Category,Artikel nach Kategorie,0
model,"ir.action,name",act_category_form,Product Categories,Artikelkategorien,0
model,"ir.action,name",act_category_form2,Product Categories,Artikelkategorien,0
+model,"ir.action,name",act_category_tree,Categories,Artikelkategorien,0
+model,"ir.action,name",act_product_by_category,Product by Category,Artikel nach Kategorie,0
model,"ir.action,name",act_product_form,Products,Artikel,0
model,"ir.action,name",act_product_form2,Products,Artikel,0
+model,"ir.action,name",act_uom_category_form,Categories of Unit of Measure,Kategorien Maßeinheiten,0
+model,"ir.action,name",act_uom_category_form2,Categories of Unit of Measure,Kategorien Maßeinheiten,0
model,"ir.action,name",act_uom_form,Units of Measure,Maßeinheiten,0
model,"ir.action,name",act_uom_form2,Units of Measure,Maßeinheiten,0
-model,"ir.ui.menu,name",menu_category_tree,Categories,Artikelkategorien,0
model,"ir.ui.menu,name",menu_category_form,Categories,Artikelkategorien,0
-model,"ir.ui.menu,name",menu_uom_category_form,Categories,Kategorien für Maßeinheiten,0
model,"ir.ui.menu,name",menu_category_form_new,New Category,Neue Artikelkategorie,0
-model,"ir.ui.menu,name",menu_uom_category_form_new,New Category,Neue Kategorie für Maßeinheit,0
-model,"ir.ui.menu,name",menu_product_product_new,New Product,Neuer Artikel,0
-model,"ir.ui.menu,name",menu_uom_form2,New Unit of Measure,Neue Maßeinheit,0
+model,"ir.ui.menu,name",menu_category_tree,Categories,Artikelkategorien,0
model,"ir.ui.menu,name",menu_main_product,Product,Artikel,0
model,"ir.ui.menu,name",menu_product_product,Products,Artikel,0
+model,"ir.ui.menu,name",menu_product_product_new,New Product,Neuer Artikel,0
+model,"ir.ui.menu,name",menu_uom_category_form,Categories,Kategorien für Maßeinheiten,0
+model,"ir.ui.menu,name",menu_uom_category_form_new,New Category,Neue Kategorie für Maßeinheit,0
model,"ir.ui.menu,name",menu_uom_form,Units of Measure,Maßeinheiten,0
+model,"ir.ui.menu,name",menu_uom_form2,New Unit of Measure,Neue Maßeinheit,0
model,"product.category,name",0,Product Category,Artikel Kategorie,0
model,"product.product,name",0,Product,Artikel,0
model,"product.template,name",0,Product Template,Artikel Vorlage,0
-model,"product.uom.category,name",uom_cat_length,Length,Länge,0
-model,"product.uom.category,name",0,Product uom category,Artikel Maßeinheit Kategorie,0
-model,"product.uom.category,name",uom_cat_surface,Surface,Fläche,0
-model,"product.uom.category,name",uom_cat_time,Time,Zeit,0
-model,"product.uom.category,name",uom_cat_unit,Units,Stückzahl,0
-model,"product.uom.category,name",uom_cat_volume,Volume,Volumen,0
-model,"product.uom.category,name",uom_cat_weight,Weight,Gewicht,0
+model,"product.uom,name",0,Unit of measure,Maßeinheit,0
model,"product.uom,name",uom_are,Are,Ar,0
model,"product.uom,name",uom_carat,Carat,Karat,0
model,"product.uom,name",uom_centimeter,centimeter,Zentimeter,0
@@ -121,7 +115,7 @@ model,"product.uom,name",uom_meter,Meter,Meter,0
model,"product.uom,name",uom_mile,Mile,Meile(n),0
model,"product.uom,name",uom_millimeter,Millimeter,Millimeter,0
model,"product.uom,name",uom_minute,Minute,Minute(n),0
-model,"product.uom,name",uom_once,Ounce,Unze(n),0
+model,"product.uom,name",uom_ounce,Ounce,Unze(n),0
model,"product.uom,name",uom_pound,Pound,Pfund,0
model,"product.uom,name",uom_second,Second,Sekunde(n),0
model,"product.uom,name",uom_square_centimeter,Square centimeter,Quadratzentimeter,0
@@ -130,41 +124,47 @@ model,"product.uom,name",uom_square_inch,Square inch,Quadratzoll,0
model,"product.uom,name",uom_square_meter,Square meter,Quadratmeter,0
model,"product.uom,name",uom_square_yard,Square yard,Quadratyard(s),0
model,"product.uom,name",uom_unit,Unit,Stück,0
-model,"product.uom,name",0,Unit of measure,Maßeinheit,0
model,"product.uom,name",uom_work_day,Work Day,Personentag(e),0
model,"product.uom,name",uom_yard,Yard,Yard(s),0
model,"product.uom,symbol",uom_are,a,a,0
model,"product.uom,symbol",uom_carat,c,c,0
model,"product.uom,symbol",uom_centimeter,cm,cm,0
-model,"product.uom,symbol",uom_square_centimeter,cm²,cm²,0
model,"product.uom,symbol",uom_cubic_centimeter,cm³,cm³,0
+model,"product.uom,symbol",uom_cubic_foot,ft³,ft³,0
+model,"product.uom,symbol",uom_cubic_inch,in³,in³,0
+model,"product.uom,symbol",uom_cubic_meter,m³,m³,0
model,"product.uom,symbol",uom_day,d,d,0
model,"product.uom,symbol",uom_foot,ft,ft,0
-model,"product.uom,symbol",uom_square_foot,ft²,ft²,0
-model,"product.uom,symbol",uom_cubic_foot,ft³,ft³,0
-model,"product.uom,symbol",uom_gram,g,g,0
model,"product.uom,symbol",uom_gallon,gal,gal,0
-model,"product.uom,symbol",uom_hour,h,h,0
+model,"product.uom,symbol",uom_gram,g,g,0
model,"product.uom,symbol",uom_hectare,ha,ha,0
+model,"product.uom,symbol",uom_hour,h,h,0
model,"product.uom,symbol",uom_inch,in,in,0
-model,"product.uom,symbol",uom_square_inch,in²,in²,0
-model,"product.uom,symbol",uom_cubic_inch,in³,in³,0
model,"product.uom,symbol",uom_kilogram,kg,kg,0
model,"product.uom,symbol",uom_kilometer,km,km,0
model,"product.uom,symbol",uom_liter,l,l,0
-model,"product.uom,symbol",uom_pound,lbs,lbs,0
model,"product.uom,symbol",uom_meter,m,m,0
-model,"product.uom,symbol",uom_square_meter,m²,m²,0
-model,"product.uom,symbol",uom_cubic_meter,m³,m³,0
model,"product.uom,symbol",uom_mile,mi,mi,0
-model,"product.uom,symbol",uom_minute,min,min,0
model,"product.uom,symbol",uom_millimeter,mm,mm,0
-model,"product.uom,symbol",uom_once,oz,oz,0
+model,"product.uom,symbol",uom_minute,min,min,0
+model,"product.uom,symbol",uom_ounce,oz,oz,0
+model,"product.uom,symbol",uom_pound,lbs,lbs,0
model,"product.uom,symbol",uom_second,s,s,0
+model,"product.uom,symbol",uom_square_centimeter,cm²,cm²,0
+model,"product.uom,symbol",uom_square_foot,ft²,ft²,0
+model,"product.uom,symbol",uom_square_inch,in²,in²,0
+model,"product.uom,symbol",uom_square_meter,m²,m²,0
+model,"product.uom,symbol",uom_square_yard,yd²,yd²,0
model,"product.uom,symbol",uom_unit,u,St.,0
model,"product.uom,symbol",uom_work_day,wd,PT,0
model,"product.uom,symbol",uom_yard,yd,yd,0
-model,"product.uom,symbol",uom_square_yard,yd²,yd²,0
+model,"product.uom.category,name",0,Product uom category,Artikel Maßeinheit Kategorie,0
+model,"product.uom.category,name",uom_cat_length,Length,Länge,0
+model,"product.uom.category,name",uom_cat_surface,Surface,Fläche,0
+model,"product.uom.category,name",uom_cat_time,Time,Zeit,0
+model,"product.uom.category,name",uom_cat_unit,Units,Stückzahl,0
+model,"product.uom.category,name",uom_cat_volume,Volume,Volumen,0
+model,"product.uom.category,name",uom_cat_weight,Weight,Gewicht,0
model,"res.group,name",group_product_admin,Product Administration,Artikel Administration,0
selection,"product.template,cost_price_method",0,Average,Durchschnitt,0
selection,"product.template,cost_price_method",0,Fixed,Fix,0
@@ -176,13 +176,13 @@ view,product.category,0,Product Categories,Artikelkategorien,0
view,product.category,0,Product Category,Artikelkategorie,0
view,product.product,0,General,Allgemein,0
view,product.product,0,Product,Artikel,0
-view,product.product,0,Products,Artikel,0
view,product.product,0,Product Suppliers,Lieferanten,0
+view,product.product,0,Products,Artikel,0
view,product.template,0,General,Allgemein,0
view,product.template,0,Product,Artikel,0
-view,product.template,0,Products,Artikel,0
view,product.template,0,Product Template,Artikelvorlage,0
view,product.template,0,Product Templates,Artikelvorlagen,0
+view,product.template,0,Products,Artikel,0
view,product.uom,0,Unit of Measure,Maßeinheit,0
view,product.uom,0,Units of Measure,Maßeinheiten,0
view,product.uom.category,0,Categories of Unit of Measure,Kategorien Maßeinheiten,0
diff --git a/es_CO.csv b/es_CO.csv
index 6cd09c3..4234286 100644
--- a/es_CO.csv
+++ b/es_CO.csv
@@ -91,7 +91,7 @@ model,"product.uom,name",uom_meter,Meter,Metro,0
model,"product.uom,name",uom_mile,Mile,Milla,0
model,"product.uom,name",uom_millimeter,Millimeter,MilÃmetro,0
model,"product.uom,name",uom_minute,Minute,Minuto,0
-model,"product.uom,name",uom_once,Ounce,Onza,0
+model,"product.uom,name",uom_ounce,Ounce,Onza,0
model,"product.uom,name",uom_pound,Pound,Libra,0
model,"product.uom,name",uom_second,Second,Segundo,0
model,"product.uom,name",uom_square_centimeter,Square centimeter,CentÃmetro Cuadrado,0
@@ -129,7 +129,7 @@ model,"product.uom,symbol",uom_cubic_meter,m³,m³,0
model,"product.uom,symbol",uom_mile,mi,mi,0
model,"product.uom,symbol",uom_minute,min,min,0
model,"product.uom,symbol",uom_millimeter,mm,mm,0
-model,"product.uom,symbol",uom_once,oz,oz,0
+model,"product.uom,symbol",uom_ounce,oz,oz,0
model,"product.uom,symbol",uom_second,s,s,0
model,"product.uom,symbol",uom_unit,u,u,0
model,"product.uom,symbol",uom_work_day,wd,wd,0
diff --git a/es_ES.csv b/es_ES.csv
index dd4a36e..28af914 100644
--- a/es_ES.csv
+++ b/es_ES.csv
@@ -87,7 +87,7 @@ model,"product.uom,name",uom_meter,Meter,Metro,0
model,"product.uom,name",uom_mile,Mile,Milla,0
model,"product.uom,name",uom_millimeter,Millimeter,MilÃmetro,0
model,"product.uom,name",uom_minute,Minute,Minuto,0
-model,"product.uom,name",uom_once,Ounce,Onza,0
+model,"product.uom,name",uom_ounce,Ounce,Onza,0
model,"product.uom,name",uom_pound,Pound,Libra,0
model,"product.uom,name",uom_second,Second,Segundo,0
model,"product.uom,name",uom_square_centimeter,Square centimeter,CentÃmetro cuadrado,0
@@ -125,7 +125,7 @@ model,"product.uom,symbol",uom_cubic_meter,m³,m³,0
model,"product.uom,symbol",uom_mile,mi,mi,0
model,"product.uom,symbol",uom_minute,min,min,0
model,"product.uom,symbol",uom_millimeter,mm,mm,0
-model,"product.uom,symbol",uom_once,oz,oz,0
+model,"product.uom,symbol",uom_ounce,oz,oz,0
model,"product.uom,symbol",uom_second,s,s,0
model,"product.uom,symbol",uom_unit,u,u,0
model,"product.uom,symbol",uom_work_day,wd,wd,0
diff --git a/fr_FR.csv b/fr_FR.csv
index 7480d47..d27363f 100644
--- a/fr_FR.csv
+++ b/fr_FR.csv
@@ -26,9 +26,6 @@ field,"product.template,rec_name",0,Name,Nom,0
field,"product.template,type",0,Type,Type,0
field,"product.uom,active",0,Active,Actif,0
field,"product.uom,category",0,UOM Category,Catégorie d'UDM,0
-field,"product.uom.category,name",0,Name,Nom,0
-field,"product.uom.category,rec_name",0,Name,Nom,0
-field,"product.uom.category,uoms",0,Unit of Measures,Unité de mesure,0
field,"product.uom,digits",0,Display Digits,Décimales affichées,0
field,"product.uom,factor",0,Factor,Facteur,0
field,"product.uom,name",0,Name,Nom,0
@@ -36,42 +33,39 @@ field,"product.uom,rate",0,Rate,Taux,0
field,"product.uom,rec_name",0,Name,Nom,0
field,"product.uom,rounding",0,Rounding Precision,Précision d'arrondi,0
field,"product.uom,symbol",0,Symbol,Symbole,0
+field,"product.uom.category,name",0,Name,Nom,0
+field,"product.uom.category,rec_name",0,Name,Nom,0
+field,"product.uom.category,uoms",0,Unit of Measures,Unité de mesure,0
help,"product.uom,factor",0,"The coefficient for the formula:
coef (base unit) = 1 (this unit)","Le coefficient pour la formule:
coef (unité de base) = 1 (cette unité)",0
help,"product.uom,rate",0,"The coefficient for the formula:
1 (base unit) = coef (this unit)","Le coefficient pour la formule:
1 (unité de base) = coef (cette unité)",0
-model,"ir.action,name",act_category_tree,Categories,Catégories,0
-model,"ir.action,name",act_uom_category_form,Categories of Unit of Measure,Catégories d'unité de mesure,0
-model,"ir.action,name",act_uom_category_form2,Categories of Unit of Measure,Catégories d'Unité de mesure,0
-model,"ir.action,name",act_product_by_category,Product by Category,Produits par catégories,0
model,"ir.action,name",act_category_form,Product Categories,Catégories de produit,0
model,"ir.action,name",act_category_form2,Product Categories,Catégories de produit,0
+model,"ir.action,name",act_category_tree,Categories,Catégories,0
+model,"ir.action,name",act_product_by_category,Product by Category,Produits par catégories,0
model,"ir.action,name",act_product_form,Products,Produits,0
model,"ir.action,name",act_product_form2,Products,Produits,0
+model,"ir.action,name",act_uom_category_form,Categories of Unit of Measure,Catégories d'unité de mesure,0
+model,"ir.action,name",act_uom_category_form2,Categories of Unit of Measure,Catégories d'Unité de mesure,0
model,"ir.action,name",act_uom_form,Units of Measure,Unités de mesure,0
model,"ir.action,name",act_uom_form2,Units of Measure,Unités de mesure,0
-model,"ir.ui.menu,name",menu_category_tree,Categories,Catégories,0
model,"ir.ui.menu,name",menu_category_form,Categories,Éditer les catégories,0
-model,"ir.ui.menu,name",menu_uom_category_form,Categories,Catégories,0
model,"ir.ui.menu,name",menu_category_form_new,New Category,Nouvelle catégorie,0
-model,"ir.ui.menu,name",menu_uom_category_form_new,New Category,Nouvelle catégorie,0
-model,"ir.ui.menu,name",menu_product_product_new,New Product,Nouveau produit,0
-model,"ir.ui.menu,name",menu_uom_form2,New Unit of Measure,Nouvelle unité de mesure,0
+model,"ir.ui.menu,name",menu_category_tree,Categories,Catégories,0
model,"ir.ui.menu,name",menu_main_product,Product,Produit,0
model,"ir.ui.menu,name",menu_product_product,Products,Produits,0
+model,"ir.ui.menu,name",menu_product_product_new,New Product,Nouveau produit,0
+model,"ir.ui.menu,name",menu_uom_category_form,Categories,Catégories,0
+model,"ir.ui.menu,name",menu_uom_category_form_new,New Category,Nouvelle catégorie,0
model,"ir.ui.menu,name",menu_uom_form,Units of Measure,Unités de mesure,0
+model,"ir.ui.menu,name",menu_uom_form2,New Unit of Measure,Nouvelle unité de mesure,0
model,"product.category,name",0,Product Category,Catégorie de produit,0
model,"product.product,name",0,Product,Produit,0
model,"product.template,name",0,Product Template,Modèle produit,0
-model,"product.uom.category,name",uom_cat_length,Length,Longueur,0
-model,"product.uom.category,name",0,Product uom category,Catégorie d'UDM de produit,0
-model,"product.uom.category,name",uom_cat_surface,Surface,Surface,0
-model,"product.uom.category,name",uom_cat_time,Time,Heure,0
-model,"product.uom.category,name",uom_cat_unit,Units,Unités,0
-model,"product.uom.category,name",uom_cat_volume,Volume,Volume,0
-model,"product.uom.category,name",uom_cat_weight,Weight,Poids,0
+model,"product.uom,name",0,Unit of measure,Unité de mesure,0
model,"product.uom,name",uom_are,Are,Are,0
model,"product.uom,name",uom_carat,Carat,Carat,0
model,"product.uom,name",uom_centimeter,centimeter,Centimètre,0
@@ -93,7 +87,7 @@ model,"product.uom,name",uom_meter,Meter,Mètre,0
model,"product.uom,name",uom_mile,Mile,Mille,0
model,"product.uom,name",uom_millimeter,Millimeter,Millimètre,0
model,"product.uom,name",uom_minute,Minute,Minute,0
-model,"product.uom,name",uom_once,Ounce,Once,0
+model,"product.uom,name",uom_ounce,Ounce,Once,0
model,"product.uom,name",uom_pound,Pound,Livre,0
model,"product.uom,name",uom_second,Second,Seconde,0
model,"product.uom,name",uom_square_centimeter,Square centimeter,Centimètre carré,0
@@ -102,41 +96,47 @@ model,"product.uom,name",uom_square_inch,Square inch,Pouce carré,0
model,"product.uom,name",uom_square_meter,Square meter,Mètre carré,0
model,"product.uom,name",uom_square_yard,Square yard,Yard carré,0
model,"product.uom,name",uom_unit,Unit,Unité,0
-model,"product.uom,name",0,Unit of measure,Unité de mesure,0
model,"product.uom,name",uom_work_day,Work Day,Jour de travail,0
model,"product.uom,name",uom_yard,Yard,Yard,0
model,"product.uom,symbol",uom_are,a,un,0
model,"product.uom,symbol",uom_carat,c,c,0
model,"product.uom,symbol",uom_centimeter,cm,cm,0
-model,"product.uom,symbol",uom_square_centimeter,cm²,cm ²,0
model,"product.uom,symbol",uom_cubic_centimeter,cm³,cm ³,0
+model,"product.uom,symbol",uom_cubic_foot,ft³,ft ³,0
+model,"product.uom,symbol",uom_cubic_inch,in³,in ³,0
+model,"product.uom,symbol",uom_cubic_meter,m³,m³,0
model,"product.uom,symbol",uom_day,d,d,0
model,"product.uom,symbol",uom_foot,ft,p,0
-model,"product.uom,symbol",uom_square_foot,ft²,pi ²,0
-model,"product.uom,symbol",uom_cubic_foot,ft³,ft ³,0
-model,"product.uom,symbol",uom_gram,g,g,0
model,"product.uom,symbol",uom_gallon,gal,gal,0
-model,"product.uom,symbol",uom_hour,h,h,0
+model,"product.uom,symbol",uom_gram,g,g,0
model,"product.uom,symbol",uom_hectare,ha,ha,0
+model,"product.uom,symbol",uom_hour,h,h,0
model,"product.uom,symbol",uom_inch,in,in,0
-model,"product.uom,symbol",uom_square_inch,in²,in ²,0
-model,"product.uom,symbol",uom_cubic_inch,in³,in ³,0
model,"product.uom,symbol",uom_kilogram,kg,kg,0
model,"product.uom,symbol",uom_kilometer,km,km,0
model,"product.uom,symbol",uom_liter,l,l,0
-model,"product.uom,symbol",uom_pound,lbs,lbs,0
model,"product.uom,symbol",uom_meter,m,m,0
-model,"product.uom,symbol",uom_square_meter,m²,m²,0
-model,"product.uom,symbol",uom_cubic_meter,m³,m³,0
model,"product.uom,symbol",uom_mile,mi,mi,0
-model,"product.uom,symbol",uom_minute,min,min,0
model,"product.uom,symbol",uom_millimeter,mm,mm,0
-model,"product.uom,symbol",uom_once,oz,oz,0
+model,"product.uom,symbol",uom_minute,min,min,0
+model,"product.uom,symbol",uom_ounce,oz,oz,0
+model,"product.uom,symbol",uom_pound,lbs,lbs,0
model,"product.uom,symbol",uom_second,s,s,0
+model,"product.uom,symbol",uom_square_centimeter,cm²,cm ²,0
+model,"product.uom,symbol",uom_square_foot,ft²,pi ²,0
+model,"product.uom,symbol",uom_square_inch,in²,in ²,0
+model,"product.uom,symbol",uom_square_meter,m²,m²,0
+model,"product.uom,symbol",uom_square_yard,yd²,yd ²,0
model,"product.uom,symbol",uom_unit,u,u,0
model,"product.uom,symbol",uom_work_day,wd,wd,0
model,"product.uom,symbol",uom_yard,yd,yd,0
-model,"product.uom,symbol",uom_square_yard,yd²,yd ²,0
+model,"product.uom.category,name",0,Product uom category,Catégorie d'UDM de produit,0
+model,"product.uom.category,name",uom_cat_length,Length,Longueur,0
+model,"product.uom.category,name",uom_cat_surface,Surface,Surface,0
+model,"product.uom.category,name",uom_cat_time,Time,Heure,0
+model,"product.uom.category,name",uom_cat_unit,Units,Unités,0
+model,"product.uom.category,name",uom_cat_volume,Volume,Volume,0
+model,"product.uom.category,name",uom_cat_weight,Weight,Poids,0
model,"res.group,name",group_product_admin,Product Administration,Administration de produits,0
selection,"product.template,cost_price_method",0,Average,Moyen,0
selection,"product.template,cost_price_method",0,Fixed,Fixe,0
diff --git a/product.py b/product.py
index 5a0e48d..92fe4f5 100644
--- a/product.py
+++ b/product.py
@@ -2,6 +2,7 @@
#this repository contains the full copyright notices and license terms.
from trytond.model import ModelView, ModelSQL, fields
from trytond.pyson import Not, Bool, Eval
+from trytond.transaction import Transaction
STATES = {
'readonly': Not(Bool(Eval('active'))),
@@ -20,7 +21,7 @@ class Template(ModelSQL, ModelView):
('consumable', 'Consumable'),
('service', 'Service')
], 'Type', required=True, states=STATES)
- category = fields.Many2One('product.category','Category', required=True,
+ category = fields.Many2One('product.category', 'Category', required=True,
states=STATES)
list_price = fields.Property(fields.Numeric('List Price', states=STATES,
digits=(16, 4)))
@@ -40,40 +41,36 @@ class Template(ModelSQL, ModelView):
products = fields.One2Many('product.product', 'template', 'Products',
states=STATES)
- def default_active(self, cursor, user, context=None):
+ def default_active(self):
return True
- def default_type(self, cursor, user, context=None):
+ def default_type(self):
return 'stockable'
- def default_cost_price_method(self, cursor, user, context=None):
+ def default_cost_price_method(self):
return 'fixed'
- def get_price_uom(self, cursor, user, ids, name, context=None):
+ def get_price_uom(self, ids, name):
product_uom_obj = self.pool.get('product.uom')
res = {}
- if context is None:
- context = {}
field = name[:-4]
- if context.get('uom'):
+ if Transaction().context.get('uom'):
to_uom = self.pool.get('product.uom').browse(
- cursor, user, context['uom'], context=context)
- for product in self.browse(cursor, user, ids, context=context):
+ Transaction().context['uom'])
+ for product in self.browse(ids):
res[product.id] = product_uom_obj.compute_price(
- cursor, user, product.default_uom, product[field],
- to_uom, context=context)
+ product.default_uom, product[field], to_uom)
else:
- for product in self.browse(cursor, user, ids, context=context):
+ for product in self.browse(ids):
res[product.id] = product[field]
return res
- def copy(self, cursor, user, ids, default=None, context=None):
+ def copy(self, ids, default=None):
if default is None:
default = {}
default = default.copy()
default['products'] = False
- return super(Template, self).copy(cursor, user, ids, default=default,
- context=context)
+ return super(Template, self).copy(ids, default=default)
Template()
@@ -89,50 +86,46 @@ class Product(ModelSQL, ModelView):
code = fields.Char("Code", size=None, select=1)
description = fields.Text("Description", translate=True)
- def get_rec_name(self, cursor, user, ids, name, context=None):
+ def get_rec_name(self, ids, name):
if not ids:
return {}
res = {}
- for product in self.browse(cursor, user, ids, context=context):
+ for product in self.browse(ids):
name = product.name
if product.code:
name = '[' + product.code + '] ' + product.name
res[product.id] = name
return res
- def search_rec_name(self, cursor, user, name, clause, context=None):
- ids = self.search(cursor, user, [('code',) + clause[1:]],
- order=[], context=context)
+ def search_rec_name(self, name, clause):
+ ids = self.search([('code',) + clause[1:]], order=[])
if ids:
- ids += self.search(cursor, user, [('name',) + clause[1:]],
- order=[], context=context)
+ ids += self.search([('name',) + clause[1:]], order=[])
return [('id', 'in', ids)]
return [('name',) + clause[1:]]
- def delete(self, cursor, user, ids, context=None):
+ def delete(self, ids):
template_obj = self.pool.get('product.template')
if isinstance(ids, (int, long)):
ids = [ids]
# Get the templates before we delete the products.
- products = self.browse(cursor, user, ids, context=context)
+ products = self.browse(ids)
template_ids = [product.template.id for product in products]
- res = super(Product, self).delete(cursor, user, ids, context=context)
+ res = super(Product, self).delete(ids)
# Get templates that are still linked after delete.
- templates = template_obj.browse(cursor, user, template_ids,
- context=context)
+ templates = template_obj.browse(template_ids)
unlinked_template_ids = [template.id for template in templates \
if not template.products]
if unlinked_template_ids:
- template_obj.delete(cursor, user, unlinked_template_ids,
- context=context)
+ template_obj.delete(unlinked_template_ids)
return res
- def copy(self, cursor, user, ids, default=None, context=None):
+ def copy(self, ids, default=None):
template_obj = self.pool.get('product.template')
int_id = False
@@ -144,11 +137,9 @@ class Product(ModelSQL, ModelView):
default = default.copy()
default['products'] = False
new_ids = []
- for product in self.browse(cursor, user, ids, context=context):
- default['template'] = template_obj.copy(cursor, user,
- product.template.id, context=context)
- new_id = super(Product, self).copy(cursor, user, product.id,
- default=default, context=context)
+ for product in self.browse(ids):
+ default['template'] = template_obj.copy(product.template.id)
+ new_id = super(Product, self).copy(product.id, default=default)
new_ids.append(new_id)
if int_id:
diff --git a/product.xml b/product.xml
index 76788f4..e9f34f3 100644
--- a/product.xml
+++ b/product.xml
@@ -10,6 +10,9 @@ this repository contains the full copyright notices and license terms. -->
<record model="res.user" id="res.user_admin">
<field name="groups" eval="[('add', ref('group_product_admin'))]"/>
</record>
+ <record model="res.user" id="res.user_trigger">
+ <field name="groups" eval="[('add', ref('group_product_admin'))]"/>
+ </record>
<menuitem name="Product" id="menu_main_product" sequence="1"
icon="tryton-package"/>
diff --git a/tests/test_product.py b/tests/test_product.py
index 5bd986b..fad01cc 100644
--- a/tests/test_product.py
+++ b/tests/test_product.py
@@ -2,6 +2,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 __future__ import with_statement
import sys, os
DIR = os.path.abspath(os.path.normpath(os.path.join(__file__,
'..', '..', '..', '..', '..', 'trytond')))
@@ -11,8 +12,8 @@ if os.path.isdir(DIR):
import unittest
from decimal import Decimal
import trytond.tests.test_tryton
-from trytond.tests.test_tryton import POOL, DB, USER, test_view
-
+from trytond.tests.test_tryton import POOL, DB_NAME, USER, CONTEXT, test_view
+from trytond.transaction import Transaction
class ProductTestCase(unittest.TestCase):
'''
@@ -28,91 +29,83 @@ class ProductTestCase(unittest.TestCase):
'''
Test views.
'''
- self.assertRaises(Exception, test_view('product'))
+ test_view('product')
def test0010uom_non_zero_rate_factor(self):
'''
Test uom non_zero_rate_factor constraint.
'''
- cursor = DB.cursor()
-
- category_id = self.uom_category.create(cursor, USER, {
- 'name': 'Test',
- })
- cursor.commit()
-
- self.failUnlessRaises(Exception, self.uom.create, cursor, USER, {
- 'name': 'Test',
- 'symbol': 'T',
- 'category': category_id,
- 'rate': 0,
- 'factor': 0,
- })
- cursor.rollback()
-
- uom_id = self.uom.create(cursor, USER, {
- 'name': 'Test',
- 'symbol': 'T',
- 'category': category_id,
- 'rate': 1.0,
- 'factor': 1.0,
- })
- cursor.commit()
-
- self.failUnlessRaises(Exception, self.uom.write, cursor, USER, {
- 'rate': 0.0,
- })
- cursor.rollback()
-
- self.failUnlessRaises(Exception, self.uom.write, cursor, USER, {
- 'factor': 0.0,
- })
- cursor.rollback()
-
- self.failUnlessRaises(Exception, self.uom.write, cursor, USER, {
- 'rate': 0.0,
- 'factor': 0.0,
- })
- cursor.rollback()
-
- cursor.close()
+ with Transaction().start(DB_NAME, USER, CONTEXT) as transaction:
+ category_id = self.uom_category.create({'name': 'Test'})
+ transaction.cursor.commit()
+
+ self.failUnlessRaises(Exception, self.uom.create, {
+ 'name': 'Test',
+ 'symbol': 'T',
+ 'category': category_id,
+ 'rate': 0,
+ 'factor': 0,
+ })
+ transaction.cursor.rollback()
+
+ uom_id = self.uom.create({
+ 'name': 'Test',
+ 'symbol': 'T',
+ 'category': category_id,
+ 'rate': 1.0,
+ 'factor': 1.0,
+ })
+ transaction.cursor.commit()
+
+ self.failUnlessRaises(Exception, self.uom.write, {
+ 'rate': 0.0,
+ })
+ transaction.cursor.rollback()
+
+ self.failUnlessRaises(Exception, self.uom.write, {
+ 'factor': 0.0,
+ })
+ transaction.cursor.rollback()
+
+ self.failUnlessRaises(Exception, self.uom.write, {
+ 'rate': 0.0,
+ 'factor': 0.0,
+ })
+ transaction.cursor.rollback()
def test0020uom_check_factor_and_rate(self):
'''
Test uom check_factor_and_rate constraint.
'''
- cursor = DB.cursor()
-
- category_id = self.uom_category.search(cursor, USER, [
- ('name', '=', 'Test'),
- ], limit=1)[0]
-
- self.failUnlessRaises(Exception, self.uom.create, cursor, USER, {
- 'name': 'Test',
- 'symbol': 'T',
- 'category': category_id,
- 'rate': 2,
- 'factor': 2,
- })
- cursor.rollback()
-
- uom_id = self.uom.search(cursor, USER, [
- ('name', '=', 'Test'),
- ], limit=1)[0]
-
- self.failUnlessRaises(Exception, self.uom.write, cursor, USER, uom_id,
- {
- 'rate': 2.0,
- })
- cursor.rollback()
-
- self.failUnlessRaises(Exception, self.uom.write, cursor, USER, uom_id,
- {
- 'factor': 2.0,
- })
- cursor.rollback()
-
- cursor.close()
+ with Transaction().start(DB_NAME, USER, CONTEXT) as transaction:
+ category_id = self.uom_category.search([
+ ('name', '=', 'Test'),
+ ], limit=1)[0]
+
+ self.failUnlessRaises(Exception, self.uom.create, {
+ 'name': 'Test',
+ 'symbol': 'T',
+ 'category': category_id,
+ 'rate': 2,
+ 'factor': 2,
+ })
+ transaction.cursor.rollback()
+
+ uom_id = self.uom.search([
+ ('name', '=', 'Test'),
+ ], limit=1)[0]
+
+ self.failUnlessRaises(Exception, self.uom.write, uom_id,
+ {
+ 'rate': 2.0,
+ })
+ transaction.cursor.rollback()
+
+ self.failUnlessRaises(Exception, self.uom.write, uom_id,
+ {
+ 'factor': 2.0,
+ })
+ transaction.cursor.rollback()
def test0030uom_select_accurate_field(self):
'''
@@ -124,15 +117,14 @@ class ProductTestCase(unittest.TestCase):
('centimeter', 'rate'),
('Foot', 'factor'),
]
- cursor = DB.cursor()
- for name, result in tests:
- uom_id = self.uom.search(cursor, USER, [
- ('name', '=', name),
- ], limit=1)[0]
- uom = self.uom.browse(cursor, USER, uom_id)
- self.assert_(result == self.uom.select_accurate_field(uom))
+ with Transaction().start(DB_NAME, USER, CONTEXT) as transaction:
+ for name, result in tests:
+ uom_id = self.uom.search([
+ ('name', '=', name),
+ ], limit=1)[0]
+ uom = self.uom.browse(uom_id)
+ self.assert_(result == self.uom.select_accurate_field(uom))
- cursor.close()
def test0040uom_compute_qty(self):
'''
@@ -145,35 +137,27 @@ class ProductTestCase(unittest.TestCase):
('Second', 25, 'Hour', 0.0069444444444444441, 0.01),
('Millimeter', 3, 'Inch', 0.11811023622047245, 0.12),
]
- cursor = DB.cursor()
- for from_name, qty, to_name, result, rounded_result in tests:
- from_uom = self.uom.browse(cursor, USER, self.uom.search(cursor,
- USER, [
- ('name', '=', from_name),
- ], limit=1)[0])
- to_uom = self.uom.browse(cursor, USER, self.uom.search(cursor,
- USER, [
- ('name', '=', to_name),
- ], limit=1)[0])
- self.assert_(result == self.uom.compute_qty(cursor, USER, from_uom,
- qty, to_uom, False))
- self.assert_(rounded_result == self.uom.compute_qty(cursor, USER,
- from_uom, qty, to_uom, True))
-
- self.assert_(10 == self.uom.compute_qty(cursor, USER,
- None, 10, to_uom))
- self.assert_(10 == self.uom.compute_qty(cursor, USER,
- None, 10, to_uom, True))
- self.assert_(0 == self.uom.compute_qty(cursor, USER,
- from_uom, 0, to_uom))
- self.assert_(0 == self.uom.compute_qty(cursor, USER,
- from_uom, 0, to_uom, True))
- self.assert_(10 == self.uom.compute_qty(cursor, USER,
- from_uom, 10, None))
- self.assert_(10 == self.uom.compute_qty(cursor, USER,
- from_uom, 10, None, True))
-
- cursor.close()
+ with Transaction().start(DB_NAME, USER, CONTEXT) as transaction:
+ for from_name, qty, to_name, result, rounded_result in tests:
+ from_uom = self.uom.browse(self.uom.search(
+ [
+ ('name', '=', from_name),
+ ], limit=1)[0])
+ to_uom = self.uom.browse(self.uom.search(
+ [
+ ('name', '=', to_name),
+ ], limit=1)[0])
+ self.assert_(result == self.uom.compute_qty(from_uom,
+ qty, to_uom, False))
+ self.assert_(rounded_result == self.uom.compute_qty(
+ from_uom, qty, to_uom, True))
+
+ self.assert_(10 == self.uom.compute_qty(None, 10, to_uom))
+ self.assert_(10 == self.uom.compute_qty(None, 10, to_uom, True))
+ self.assert_(0 == self.uom.compute_qty(from_uom, 0, to_uom))
+ self.assert_(0 == self.uom.compute_qty(from_uom, 0, to_uom, True))
+ self.assert_(10 == self.uom.compute_qty(from_uom, 10, None))
+ self.assert_(10 == self.uom.compute_qty(from_uom, 10, None, True))
def test0050uom_compute_price(self):
'''
@@ -186,19 +170,18 @@ class ProductTestCase(unittest.TestCase):
('Second', Decimal('25'), 'Hour', Decimal('90000')),
('Millimeter', Decimal('3'), 'Inch', Decimal('76.2')),
]
- cursor = DB.cursor()
- for from_name, price, to_name, result in tests:
- from_uom = self.uom.browse(cursor, USER, self.uom.search(cursor,
- USER, [
- ('name', '=', from_name),
- ], limit=1)[0])
- to_uom = self.uom.browse(cursor, USER, self.uom.search(cursor,
- USER, [
- ('name', '=', to_name),
- ], limit=1)[0])
- self.assert_(result == self.uom.compute_price(cursor, USER,
- from_uom, price, to_uom))
- cursor.close()
+ with Transaction().start(DB_NAME, USER, CONTEXT) as transaction:
+ for from_name, price, to_name, result in tests:
+ from_uom = self.uom.browse(self.uom.search(
+ [
+ ('name', '=', from_name),
+ ], limit=1)[0])
+ to_uom = self.uom.browse(self.uom.search(
+ [
+ ('name', '=', to_name),
+ ], limit=1)[0])
+ self.assert_(result == self.uom.compute_price(from_uom,
+ price, to_uom))
def suite():
suite = trytond.tests.test_tryton.suite()
diff --git a/tests/test_product.pyc b/tests/test_product.pyc
index 3c5400f..5e6ceaf 100644
Binary files a/tests/test_product.pyc and b/tests/test_product.pyc differ
diff --git a/trytond_product.egg-info/PKG-INFO b/trytond_product.egg-info/PKG-INFO
index 3eb867e..e4417e4 100644
--- a/trytond_product.egg-info/PKG-INFO
+++ b/trytond_product.egg-info/PKG-INFO
@@ -1,12 +1,12 @@
Metadata-Version: 1.0
Name: trytond-product
-Version: 1.6.0
+Version: 1.8.0
Summary: Define products, categories of product, units of measure, categories of units of measure.
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.egg-info/requires.txt b/trytond_product.egg-info/requires.txt
index 8c3b916..3127597 100644
--- a/trytond_product.egg-info/requires.txt
+++ b/trytond_product.egg-info/requires.txt
@@ -1 +1 @@
-trytond >= 1.6, < 1.7
\ No newline at end of file
+trytond >= 1.8, < 1.9
\ No newline at end of file
diff --git a/uom.py b/uom.py
index a5e3e6c..a530902 100644
--- a/uom.py
+++ b/uom.py
@@ -1,9 +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 decimal import Decimal
from trytond.model import ModelView, ModelSQL, fields
from trytond.model.modelstorage import OPERATORS
from trytond.pyson import Not, Bool, Eval
-from decimal import Decimal
+from trytond.transaction import Transaction
STATES = {
'readonly': Not(Bool(Eval('active'))),
@@ -46,6 +47,14 @@ class Uom(ModelSQL, ModelView):
digits = fields.Integer('Display Digits')
active = fields.Boolean('Active')
+ def init(self, module_name):
+ cursor = Transaction().cursor
+ # Migration from 1.6: corrected misspelling of ounce (was once)
+ cursor.execute("UPDATE ir_model_data "\
+ "SET fs_id = REPLACE(fs_id, 'uom_once', 'uom_ounce') "\
+ "WHERE fs_id = 'uom_once' AND module = 'product'")
+ super(Uom, self).init(module_name)
+
def __init__(self):
super(Uom, self).__init__()
self._sql_constraints += [
@@ -65,29 +74,28 @@ class Uom(ModelSQL, ModelView):
'invalid_factor_and_rate': 'Invalid Factor and Rate values!',
})
- def check_xml_record(self, cursor, user, ids, values, context=None):
+ def check_xml_record(self, ids, values):
return True
- def default_rate(self, cursor, user, context=None):
+ def default_rate(self):
return 1.0
- def default_factor(self, cursor, user, context=None):
+ def default_factor(self):
return 1.0
- def default_active(self, cursor, user, context=None):
+ def default_active(self):
return 1
- def default_rounding(self, cursor, user, context=None):
+ def default_rounding(self):
return 0.01
- def default_digits(self, cursor, user, context=None):
+ def default_digits(self):
return 2
- def default_category(self, cursor, user, context=None):
+ def default_category(self):
category_obj = self.pool.get('product.uom.category')
product_obj = self.pool.get('product.product')
- if context is None:
- context = {}
+ context = Transaction().context
if 'category' in context:
if isinstance(context['category'], (tuple, list)) \
and len(context['category']) > 1 \
@@ -96,41 +104,39 @@ class Uom(ModelSQL, ModelView):
if context['category'][1] == 'uom.category':
if not context['category'][0]:
return False
- uom = self.browse(cursor, user, context['category'][0],
- context=context)
+ uom = self.browse(context['category'][0])
return uom.category.id
else:
if not context['category'][0]:
return False
- product = product_obj.browse(cursor, user,
- context['category'][0], context=context)
+ product = product_obj.browse(context['category'][0])
return product.default_uom.category.id
return False
- def on_change_factor(self, cursor, user, value, context=None):
+ def on_change_factor(self, value):
if value.get('factor', 0.0) == 0.0:
return {'rate': 0.0}
return {'rate': round(1.0 / value['factor'], self.rate.digits[1])}
- def on_change_rate(self, cursor, user, value, context=None):
+ def on_change_rate(self, value):
if value.get('rate', 0.0) == 0.0:
return {'factor': 0.0}
return {'factor': round(1.0 / value['rate'], self.factor.digits[1])}
- def search_rec_name(self, cursor, user, name, clause, context=None):
- ids = self.search(cursor, user, ['OR',
+ def search_rec_name(self, name, clause):
+ ids = self.search(['OR',
(self._rec_name,) + clause[1:],
('symbol',) + clause[1:],
- ], order=[], context=context)
+ ], order=[])
return [('id', 'in', ids)]
@staticmethod
def round(number, precision=1.0):
return round(number / precision) * precision
- def check_factor_and_rate(self, cursor, user, ids):
+ def check_factor_and_rate(self, ids):
"Check coherence between factor and rate"
- for uom in self.browse(cursor, user, ids):
+ for uom in self.browse(ids):
if uom.rate == uom.factor == 0.0:
continue
if uom.rate != round(1.0 / uom.factor, self.rate.digits[1]) and \
@@ -138,30 +144,30 @@ class Uom(ModelSQL, ModelView):
return False
return True
- def write(self, cursor, user, ids, values, context=None):
- if user == 0:
- return super(Uom, self).write(cursor, user, ids, values, context)
+ def write(self, ids, values):
+ if Transaction().user == 0:
+ return super(Uom, self).write(ids, values)
if 'rate' not in values and 'factor' not in values \
and 'category' not in values:
- return super(Uom, self).write(cursor, user, ids, values, context)
+ return super(Uom, self).write(ids, values)
if isinstance(ids, (int, long)):
ids = [ids]
- uoms = self.browse(cursor, user, ids, context=context)
+ uoms = self.browse(ids)
old_uom = dict((uom.id, (uom.factor, uom.rate, uom.category.id)) \
for uom in uoms)
- res = super(Uom, self).write(cursor, user, ids, values, context)
- uoms = self.browse(cursor, user, ids, context=context)
+ res = super(Uom, self).write(ids, values)
+ uoms = self.browse(ids)
for uom in uoms:
if uom.factor != old_uom[uom.id][0] \
or uom.rate != old_uom[uom.id][1] \
or uom.category.id != old_uom[uom.id][2]:
- self.raise_user_error(cursor, 'change_uom_rate_title',
- error_description='change_uom_rate', context=context)
+ self.raise_user_error('change_uom_rate_title',
+ error_description='change_uom_rate')
return res
def select_accurate_field(self, uom):
@@ -186,18 +192,14 @@ class Uom(ModelSQL, ModelView):
else:
return 'rate'
- def compute_qty(self, cursor, user, from_uom, qty, to_uom=None,
- round=True, context=None):
+ def compute_qty(self, from_uom, qty, to_uom=None, round=True):
"""
Convert quantity for given uom's.
- :param cursor: the database cursor
- :param user: the user id
:param from_uom: a BrowseRecord of product.uom
:param qty: an int or long or float value
:param to_uom: a BrowseRecord of product.uom
:param round: a boolean to round or not the result
- :param context: the context
:return: the converted quantity
"""
if not from_uom or not qty or not to_uom:
@@ -217,17 +219,13 @@ class Uom(ModelSQL, ModelView):
amount = self.round(amount, to_uom.rounding)
return amount
- def compute_price(self, cursor, user, from_uom, price, to_uom=False,
- context=None):
+ def compute_price(self, from_uom, price, to_uom=False):
"""
Convert price for given uom's.
- :param cursor: the database cursor
- :param user: the user id
:param from_uom: a BrowseRecord of product.uom
:param price: a Decimal value
:param to_uom: a BrowseRecord of product.uom
- :param context: the context
:return: the converted price
"""
if not from_uom or not price or not to_uom:
@@ -249,8 +247,8 @@ class Uom(ModelSQL, ModelView):
return new_price
- def search(self, cursor, user, args, offset=0, limit=None, order=None,
- context=None, count=False, query_string=False):
+ def search(self, args, offset=0, limit=None, order=None,
+ count=False, query_string=False):
product_obj = self.pool.get('product.product')
args = args[:]
def process_args(args):
@@ -269,20 +267,18 @@ class Uom(ModelSQL, ModelView):
args[i] = ('id', '!=', '0')
else:
if args[i][2][1] == 'product.default_uom.category':
- product = product_obj.browse(cursor, user,
- args[i][2][0], context=context)
+ product = product_obj.browse(args[i][2][0])
category_id = product.default_uom.category.id
else:
- uom = self.browse(cursor, user, args[i][2][0],
- context=context)
+ uom = self.browse(args[i][2][0])
category_id = uom.category.id
args[i] = (args[i][0], args[i][1], category_id)
elif isinstance(args[i], list):
process_args(args[i])
i += 1
process_args(args)
- return super(Uom, self).search(cursor, user, args, offset=offset,
- limit=limit, order=order, context=context, count=count,
+ return super(Uom, self).search(args, offset=offset, limit=limit,
+ order=order, count=count,
query_string=query_string)
Uom()
diff --git a/uom.xml b/uom.xml
index 2d09ccc..8d215fd 100644
--- a/uom.xml
+++ b/uom.xml
@@ -189,7 +189,7 @@ this repository contains the full copyright notices and license terms. -->
<field name="factor" eval="0.45359237"/>
<field name="rate" eval="round(1.0 / 0.45359237, 12)"/>
</record>
- <record model="product.uom" id="uom_once">
+ <record model="product.uom" id="uom_ounce">
<field name="name">Ounce</field>
<field name="symbol">oz</field>
<field name="category" ref="uom_cat_weight"/>
commit 07d7abb5990d7e6a88e2ab4ab83cef5aa80835b7
Author: Daniel Baumann <daniel at debian.org>
Date: Tue Nov 2 14:27:02 2010 +0100
Switching to source format 3.0 (quilt).
diff --git a/debian/source/format b/debian/source/format
index d3827e7..163aaf8 100644
--- a/debian/source/format
+++ b/debian/source/format
@@ -1 +1 @@
-1.0
+3.0 (quilt)
commit deb8019c1686a587d933540f145fdfcb3a5742a7
Author: Daniel Baumann <daniel at debian.org>
Date: Thu Sep 30 01:05:32 2010 +0200
Updating to standards version 3.9.1.
diff --git a/debian/control b/debian/control
index 0708639..530dd2d 100644
--- a/debian/control
+++ b/debian/control
@@ -7,7 +7,7 @@ Uploaders:
Mathias Behrle <mathiasb at mbsolutions.selfip.biz>
Dm-Upload-Allowed: yes
Build-Depends: debhelper (>= 8), python, python-setuptools, python-support
-Standards-Version: 3.9.0
+Standards-Version: 3.9.1
Homepage: http://www.tryton.org/
Vcs-Browser: http://git.debian-maintainers.org/?p=tryton/tryton-modules-product.git
Vcs-Git: git://git.debian-maintainers.org/git/tryton/tryton-modules-product.git
commit f27ae42251ac83d757cce803e434d4dae5895c87
Author: Daniel Baumann <daniel at debian.org>
Date: Thu Sep 30 01:04:05 2010 +0200
Updating to debhelper version 8.
diff --git a/debian/compat b/debian/compat
index 7f8f011..45a4fb7 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-7
+8
diff --git a/debian/control b/debian/control
index 489b169..0708639 100644
--- a/debian/control
+++ b/debian/control
@@ -6,7 +6,7 @@ Uploaders:
Daniel Baumann <daniel at debian.org>,
Mathias Behrle <mathiasb at mbsolutions.selfip.biz>
Dm-Upload-Allowed: yes
-Build-Depends: debhelper (>= 7), python, python-setuptools, python-support
+Build-Depends: debhelper (>= 8), python, python-setuptools, python-support
Standards-Version: 3.9.0
Homepage: http://www.tryton.org/
Vcs-Browser: http://git.debian-maintainers.org/?p=tryton/tryton-modules-product.git
commit 6c8a284ee2929d9d22a5af071795a1c36003bf7b
Author: Daniel Baumann <daniel at debian.org>
Date: Mon Jun 28 20:35:30 2010 +0200
Updating standards version to 3.9.0.
diff --git a/debian/control b/debian/control
index 914182c..489b169 100644
--- a/debian/control
+++ b/debian/control
@@ -7,7 +7,7 @@ Uploaders:
Mathias Behrle <mathiasb at mbsolutions.selfip.biz>
Dm-Upload-Allowed: yes
Build-Depends: debhelper (>= 7), python, python-setuptools, python-support
-Standards-Version: 3.8.4
+Standards-Version: 3.9.0
Homepage: http://www.tryton.org/
Vcs-Browser: http://git.debian-maintainers.org/?p=tryton/tryton-modules-product.git
Vcs-Git: git://git.debian-maintainers.org/git/tryton/tryton-modules-product.git
commit 92f4e83efd95ff393973ab05b363ba3e4ea4b134
Author: Mathias Behrle <mathiasb at mbsolutions.selfip.biz>
Date: Tue May 11 00:02:50 2010 +0200
Releasing debian version 1.6.0-1.
diff --git a/debian/changelog b/debian/changelog
index d7ba638..44983e0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+tryton-modules-product (1.6.0-1) unstable; urgency=low
+
+ [ Daniel Baumann ]
+ * Adding Dm-Upload-Allowed in control in preparation for Mathias.
+
+ [ Mathias Behrle ]
+ * Merging upstream version 1.6.0.
+ * Updating copyright.
+ * Updating depends.
+
+ -- Mathias Behrle <mathiasb at mbsolutions.selfip.biz> Tue, 11 May 2010 00:02:21 +0200
+
tryton-modules-product (1.4.1-1) unstable; urgency=low
* Making depends versioned for tryton 1.4.
commit 42bd19065418d852cce14208fb176dd56f682946
Author: Mathias Behrle <mathiasb at mbsolutions.selfip.biz>
Date: Tue May 11 00:01:38 2010 +0200
Updating depends.
diff --git a/debian/control b/debian/control
index d72b407..914182c 100644
--- a/debian/control
+++ b/debian/control
@@ -15,7 +15,7 @@ Vcs-Git: git://git.debian-maintainers.org/git/tryton/tryton-modules-product.git
Package: tryton-modules-product
Architecture: all
Depends:
- ${misc:Depends}, ${python:Depends}, tryton-server (>= 1.4),
+ ${misc:Depends}, ${python:Depends}, tryton-server (>= 1.6),
python-pkg-resources
XB-Python-Version: ${python:Versions}
Description: Tryton Application Platform (Product Module)
commit 3cdf94508c728990809cf43455bc8d2fc634cd2f
Author: Mathias Behrle <mathiasb at mbsolutions.selfip.biz>
Date: Tue May 11 00:01:13 2010 +0200
Updating copyright.
diff --git a/debian/copyright b/debian/copyright
index 9d3eb14..6146982 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -6,9 +6,9 @@ Maintainer-Homepage: http://tryton.debian-maintainers.org/
Files: *
Copyright:
(C) 2004-2008 Tiny SPRL
- (C) 2008 Cedric Krier
- (C) 2008 Bertrand Chenal
- (C) 2008 B2CK SPRL
+ (C) 2008-2010 Cedric Krier
+ (C) 2008-2010 Bertrand Chenal
+ (C) 2008-2010 B2CK SPRL
License: GPL-3+
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
commit 0fda64d37c869665173a57f96a08ef1d320cb0c5
Author: Mathias Behrle <mathiasb at mbsolutions.selfip.biz>
Date: Tue May 11 00:00:22 2010 +0200
Merging upstream version 1.6.0.
diff --git a/CHANGELOG b/CHANGELOG
index d4fc896..7847ea6 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,5 +1,6 @@
-Version 1.4.1 - 2010-02-17
+Version 1.6.0 - 2010-05-09
* Bug fixes (see mercurial logs for details)
+* Improve computation precision of UOM convertion
Version 1.4.0 - 2009-10-19
* Bug fixes (see mercurial logs for details)
diff --git a/PKG-INFO b/PKG-INFO
index 8597c21..ad680d1 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,12 +1,12 @@
Metadata-Version: 1.0
Name: trytond_product
-Version: 1.4.1
+Version: 1.6.0
Summary: Define products, categories of product, units of measure, categories of units of measure.
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 76a8139..ea1f076 100644
--- a/__tryton__.py
+++ b/__tryton__.py
@@ -6,7 +6,7 @@
'name_es_CO': 'Productos',
'name_es_ES': 'Producto',
'name_fr_FR': 'Produit',
- 'version' : '1.4.1',
+ 'version' : '1.6.0',
'author' : 'B2CK',
'email': 'info at b2ck.com',
'website': 'http://www.tryton.org/',
diff --git a/category.py b/category.py
index 50ca8e5..89b7544 100644
--- a/category.py
+++ b/category.py
@@ -17,7 +17,7 @@ class Category(ModelSQL, ModelView):
super(Category, self).__init__()
self._order.insert(0, ('name', 'ASC'))
- def get_rec_name(self, cursor, user, ids, name, arg, context=None):
+ def get_rec_name(self, cursor, user, ids, name, context=None):
if not ids:
return {}
res = {}
diff --git a/category.xml b/category.xml
index d3fffb2..3f32f1c 100644
--- a/category.xml
+++ b/category.xml
@@ -80,10 +80,29 @@ this repository contains the full copyright notices and license terms. -->
<field name="view" ref="category_view_form"/>
<field name="act_window" ref="act_category_form"/>
</record>
- <menuitem name="Edit Categories" parent="menu_category_tree"
+ <menuitem name="Categories" parent="menu_category_tree"
sequence="2" id="menu_category_form"
action="act_category_form"/>
+ <record model="ir.action.act_window" id="act_category_form2">
+ <field name="name">Product Categories</field>
+ <field name="res_model">product.category</field>
+ <field name="view_type">form</field>
+ </record>
+ <record model="ir.action.act_window.view" id="act_category_form2_view1">
+ <field name="sequence" eval="10"/>
+ <field name="view" ref="category_view_form"/>
+ <field name="act_window" ref="act_category_form2"/>
+ </record>
+ <record model="ir.action.act_window.view" id="act_category_form2_view2">
+ <field name="sequence" eval="20"/>
+ <field name="view" ref="category_view_tree"/>
+ <field name="act_window" ref="act_category_form2"/>
+ </record>
+ <menuitem name="New Category" parent="menu_category_form"
+ sequence="10" id="menu_category_form_new"
+ action="act_category_form2"/>
+
<record model="ir.model.access" id="access_product_category">
<field name="model" search="[('model', '=', 'product.category')]"/>
<field name="perm_read" eval="True"/>
diff --git a/de_DE.csv b/de_DE.csv
index 6cc448a..dc97996 100644
--- a/de_DE.csv
+++ b/de_DE.csv
@@ -1,7 +1,8 @@
type,name,res_id,src,value,fuzzy
error,product.template,0,You cannot change the default uom for a product which is associated to stock moves.,"Die Standardmaßeinheit kann nicht für einen Artikel geändert werden, der Lagerbewegungen zugeordnet ist.",0
-error,product.uom,0,"If the UOM is still not used, you can delete it ortherwise you can deactivate it and create a new one.","Wenn die Maßeinheit noch nicht verwendet wurde, kann sie gelöscht werden.
+error,product.uom,0,"If the UOM is still not used, you can delete it otherwise you can deactivate it and create a new one.","Wenn die Maßeinheit noch nicht verwendet wurde, kann sie gelöscht werden.
Andernfalls kann sie nur deaktiviert und eine andere neue erstellt werden.",0
+error,product.uom,0,Invalid Factor and Rate values!,Ungültige Werte für Faktor und Kehrwert!,0
error,product.uom,0,Rate and factor can not be both equal to zero.,Faktor und Kehrwert Faktor können beide nicht 0 sein,0
error,product.uom,0,"You cannot change Rate, Factor or Category on a Unit of Measure. ","Faktor, Faktorkehrwert oder Kategorie einer Maßeinheit können nicht geändert werden.",0
field,"product.category,childs",0,Children,Untergeordnet (Kategorien),0
@@ -71,15 +72,19 @@ Formel: Basiseinheit = Kehrwert * diese Einheit
Das Feld Faktor wird automatisch aus dem hier eingetragenen Wert ermittelt.",0
model,"ir.action,name",act_category_tree,Categories,Artikelkategorien,0
model,"ir.action,name",act_uom_category_form,Categories of Unit of Measure,Kategorien Maßeinheiten,0
+model,"ir.action,name",act_uom_category_form2,Categories of Unit of Measure,Kategorien Maßeinheiten,0
model,"ir.action,name",act_product_by_category,Product by Category,Artikel nach Kategorie,0
model,"ir.action,name",act_category_form,Product Categories,Artikelkategorien,0
+model,"ir.action,name",act_category_form2,Product Categories,Artikelkategorien,0
model,"ir.action,name",act_product_form,Products,Artikel,0
model,"ir.action,name",act_product_form2,Products,Artikel,0
model,"ir.action,name",act_uom_form,Units of Measure,Maßeinheiten,0
model,"ir.action,name",act_uom_form2,Units of Measure,Maßeinheiten,0
model,"ir.ui.menu,name",menu_category_tree,Categories,Artikelkategorien,0
+model,"ir.ui.menu,name",menu_category_form,Categories,Artikelkategorien,0
model,"ir.ui.menu,name",menu_uom_category_form,Categories,Kategorien für Maßeinheiten,0
-model,"ir.ui.menu,name",menu_category_form,Edit Categories,Artikelkategorien bearbeiten,0
+model,"ir.ui.menu,name",menu_category_form_new,New Category,Neue Artikelkategorie,0
+model,"ir.ui.menu,name",menu_uom_category_form_new,New Category,Neue Kategorie für Maßeinheit,0
model,"ir.ui.menu,name",menu_product_product_new,New Product,Neuer Artikel,0
model,"ir.ui.menu,name",menu_uom_form2,New Unit of Measure,Neue Maßeinheit,0
model,"ir.ui.menu,name",menu_main_product,Product,Artikel,0
@@ -115,7 +120,7 @@ model,"product.uom,name",uom_liter,Liter,Liter,0
model,"product.uom,name",uom_meter,Meter,Meter,0
model,"product.uom,name",uom_mile,Mile,Meile(n),0
model,"product.uom,name",uom_millimeter,Millimeter,Millimeter,0
-model,"product.uom,name",uom_minute,Minute,Minuten(n),0
+model,"product.uom,name",uom_minute,Minute,Minute(n),0
model,"product.uom,name",uom_once,Ounce,Unze(n),0
model,"product.uom,name",uom_pound,Pound,Pfund,0
model,"product.uom,name",uom_second,Second,Sekunde(n),0
diff --git a/es_CO.csv b/es_CO.csv
index d656ecf..6cd09c3 100644
--- a/es_CO.csv
+++ b/es_CO.csv
@@ -1,6 +1,7 @@
type,name,res_id,src,value,fuzzy
error,product.template,0,You cannot change the default uom for a product which is associated to stock moves.,No puede cambiar la UdM predeterminada para un producto asociado con movimientos de inventario.,0
-error,product.uom,0,"If the UOM is still not used, you can delete it ortherwise you can deactivate it and create a new one.","Si no se ha usado la UdM, puede eliminar, de otra forma puede desactivarla y crear una nueva.",0
+error,product.uom,0,"If the UOM is still not used, you can delete it otherwise you can deactivate it and create a new one.","Si no se ha usado la UdM, puede eliminar, de otra forma puede desactivarla y crear una nueva.",0
+error,product.uom,0,Invalid Factor and Rate values!,¡Factor y valores de tasa de cambio inválidas!,0
error,product.uom,0,Rate and factor can not be both equal to zero.,Tasa de cambio y factor no pueden ser cero simultáneamente.,0
error,product.uom,0,"You cannot change Rate, Factor or Category on a Unit of Measure. ","No puede cambiar la Rata, el Factor o la CategorÃa de una Unidad de Medida.",0
field,"product.category,childs",0,Children,Hij at s,0
@@ -41,15 +42,19 @@ help,"product.uom,rate",0,"The coefficient for the formula:
1 (base unit) = coef (this unit)",El coeficiente para la fórmula:,0
model,"ir.action,name",act_category_tree,Categories,CategorÃas,0
model,"ir.action,name",act_uom_category_form,Categories of Unit of Measure,CategorÃas de Unidad de Medida,0
+model,"ir.action,name",act_uom_category_form2,Categories of Unit of Measure,CategorÃas de Unidad de Medida,1
model,"ir.action,name",act_product_by_category,Product by Category,Producto por CategorÃa,0
model,"ir.action,name",act_category_form,Product Categories,CategorÃas de Producto,0
+model,"ir.action,name",act_category_form2,Product Categories,CategorÃas de Producto,1
model,"ir.action,name",act_product_form,Products,Productos,0
model,"ir.action,name",act_product_form2,Products,Productos,0
model,"ir.action,name",act_uom_form,Units of Measure,Unidades de Medida,0
model,"ir.action,name",act_uom_form2,Units of Measure,Unidades de Medida,0
model,"ir.ui.menu,name",menu_category_tree,Categories,CategorÃas,0
+model,"ir.ui.menu,name",menu_category_form,Categories,Editar CategorÃas,1
model,"ir.ui.menu,name",menu_uom_category_form,Categories,CategorÃas,0
-model,"ir.ui.menu,name",menu_category_form,Edit Categories,Editar CategorÃas,0
+model,"ir.ui.menu,name",menu_category_form_new,New Category,Nueva CategorÃa,0
+model,"ir.ui.menu,name",menu_uom_category_form_new,New Category,Nueva CategorÃa,0
model,"ir.ui.menu,name",menu_product_product_new,New Product,Nuevo Producto,0
model,"ir.ui.menu,name",menu_uom_form2,New Unit of Measure,Nueva Unidad de Mesura,0
model,"ir.ui.menu,name",menu_main_product,Product,Producto,0
diff --git a/es_ES.csv b/es_ES.csv
index fe76364..dd4a36e 100644
--- a/es_ES.csv
+++ b/es_ES.csv
@@ -1,5 +1,5 @@
type,name,res_id,src,value,fuzzy
-error,product.uom,0,"If the UOM is still not used, you can delete it ortherwise you can deactivate it and create a new one.","Si no se ha usado la UdM, puede borrarla, en caso contrario, puede desactivarla y crear una nueva.",0
+error,product.uom,0,"If the UOM is still not used, you can delete it otherwise you can deactivate it and create a new one.","Si no se ha usado la UdM, puede borrarla, en caso contrario, puede desactivarla y crear una nueva.",0
error,product.uom,0,Rate and factor can not be both equal to zero.,Conversión y factor no pueden ser cero simultáneamente.,0
error,product.uom,0,"You cannot change Rate, Factor or Category on a Unit of Measure. ","No puede cambiar la conversión, el factor o la categorÃa de una unidad de medida.",0
field,"product.category,childs",0,Children,Hijos,0
diff --git a/fr_FR.csv b/fr_FR.csv
index 2da5db2..7480d47 100644
--- a/fr_FR.csv
+++ b/fr_FR.csv
@@ -1,6 +1,7 @@
type,name,res_id,src,value,fuzzy
error,product.template,0,You cannot change the default uom for a product which is associated to stock moves.,Vous ne pouvez pas changer l'UDM par défaut pour un produit qui a déjà fait l'objet de mouvements de stock,0
-error,product.uom,0,"If the UOM is still not used, you can delete it ortherwise you can deactivate it and create a new one.","Si l'UDM n'est pas utilisée, vous pouvez la supprimer, sinon vous pouvez la désactiver et en créer une nouvelle.",0
+error,product.uom,0,"If the UOM is still not used, you can delete it otherwise you can deactivate it and create a new one.","Si l'UDM n'est pas utilisée, vous pouvez la supprimer, sinon vous pouvez la désactiver et en créer une nouvelle.",0
+error,product.uom,0,Invalid Factor and Rate values!,valeurs de facteur et de taux invalides !,0
error,product.uom,0,Rate and factor can not be both equal to zero.,Le taux et le facteur ne peuvent pas être égaux à zéro.,0
error,product.uom,0,"You cannot change Rate, Factor or Category on a Unit of Measure. ","Vous ne pouvez pas changer le taux, le facteur ou la catégorie d'une unité de mesure.",0
field,"product.category,childs",0,Children,Enfants,0
@@ -43,15 +44,19 @@ help,"product.uom,rate",0,"The coefficient for the formula:
1 (unité de base) = coef (cette unité)",0
model,"ir.action,name",act_category_tree,Categories,Catégories,0
model,"ir.action,name",act_uom_category_form,Categories of Unit of Measure,Catégories d'unité de mesure,0
+model,"ir.action,name",act_uom_category_form2,Categories of Unit of Measure,Catégories d'Unité de mesure,0
model,"ir.action,name",act_product_by_category,Product by Category,Produits par catégories,0
model,"ir.action,name",act_category_form,Product Categories,Catégories de produit,0
+model,"ir.action,name",act_category_form2,Product Categories,Catégories de produit,0
model,"ir.action,name",act_product_form,Products,Produits,0
model,"ir.action,name",act_product_form2,Products,Produits,0
model,"ir.action,name",act_uom_form,Units of Measure,Unités de mesure,0
model,"ir.action,name",act_uom_form2,Units of Measure,Unités de mesure,0
model,"ir.ui.menu,name",menu_category_tree,Categories,Catégories,0
+model,"ir.ui.menu,name",menu_category_form,Categories,Éditer les catégories,0
model,"ir.ui.menu,name",menu_uom_category_form,Categories,Catégories,0
-model,"ir.ui.menu,name",menu_category_form,Edit Categories,Éditer les catégories,0
+model,"ir.ui.menu,name",menu_category_form_new,New Category,Nouvelle catégorie,0
+model,"ir.ui.menu,name",menu_uom_category_form_new,New Category,Nouvelle catégorie,0
model,"ir.ui.menu,name",menu_product_product_new,New Product,Nouveau produit,0
model,"ir.ui.menu,name",menu_uom_form2,New Unit of Measure,Nouvelle unité de mesure,0
model,"ir.ui.menu,name",menu_main_product,Product,Produit,0
diff --git a/product.py b/product.py
index c5db4f7..5a0e48d 100644
--- a/product.py
+++ b/product.py
@@ -1,9 +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 trytond.model import ModelView, ModelSQL, fields
+from trytond.pyson import Not, Bool, Eval
STATES = {
- 'readonly': "active == False",
+ 'readonly': Not(Bool(Eval('active'))),
}
@@ -21,18 +22,18 @@ class Template(ModelSQL, ModelView):
], 'Type', required=True, states=STATES)
category = fields.Many2One('product.category','Category', required=True,
states=STATES)
- list_price = fields.Property(type='numeric', string='List Price',
- states=STATES, digits=(16, 4))
- list_price_uom = fields.Function('get_price_uom', string='List Price',
- type="numeric", digits=(16, 4))
- cost_price = fields.Property(type='numeric', string='Cost Price',
- states=STATES, digits=(16, 4))
- cost_price_uom = fields.Function('get_price_uom', string='Cost Price',
- type="numeric", digits=(16, 4), states=STATES)
- cost_price_method = fields.Property(type='selection', selection=[
+ list_price = fields.Property(fields.Numeric('List Price', states=STATES,
+ digits=(16, 4)))
+ list_price_uom = fields.Function(fields.Numeric('List Price',
+ digits=(16, 4)), 'get_price_uom')
+ cost_price = fields.Property(fields.Numeric('Cost Price',
+ states=STATES, digits=(16, 4)))
+ cost_price_uom = fields.Function(fields.Numeric('Cost Price',
+ digits=(16, 4)), 'get_price_uom')
+ cost_price_method = fields.Property(fields.Selection([
("fixed", "Fixed"),
("average", "Average")
- ], string="Cost Method", required=True, states=STATES)
+ ], 'Cost Method', required=True, states=STATES))
default_uom = fields.Many2One('product.uom', 'Default UOM', required=True,
states=STATES)
active = fields.Boolean('Active', select=1)
@@ -48,7 +49,7 @@ class Template(ModelSQL, ModelView):
def default_cost_price_method(self, cursor, user, context=None):
return 'fixed'
- def get_price_uom(self, cursor, user, ids, name, arg, context=None):
+ def get_price_uom(self, cursor, user, ids, name, context=None):
product_uom_obj = self.pool.get('product.uom')
res = {}
if context is None:
@@ -88,7 +89,7 @@ class Product(ModelSQL, ModelView):
code = fields.Char("Code", size=None, select=1)
description = fields.Text("Description", translate=True)
- def get_rec_name(self, cursor, user, ids, name, arg, context=None):
+ def get_rec_name(self, cursor, user, ids, name, context=None):
if not ids:
return {}
res = {}
@@ -99,18 +100,14 @@ class Product(ModelSQL, ModelView):
res[product.id] = name
return res
- def search_rec_name(self, cursor, user, name, args, context=None):
- args2 = []
- i = 0
- while i < len(args):
- ids = self.search(cursor, user, [('code', args[i][1], args[i][2])],
- context=context)
- if ids:
- args2.append(('id', 'in', ids))
- else:
- args2.append(('name', args[i][1], args[i][2]))
- i += 1
- return args2
+ def search_rec_name(self, cursor, user, name, clause, context=None):
+ ids = self.search(cursor, user, [('code',) + clause[1:]],
+ order=[], context=context)
+ if ids:
+ ids += self.search(cursor, user, [('name',) + clause[1:]],
+ order=[], context=context)
+ return [('id', 'in', ids)]
+ return [('name',) + clause[1:]]
def delete(self, cursor, user, ids, context=None):
template_obj = self.pool.get('product.template')
diff --git a/product.xml b/product.xml
index 010ccdc..76788f4 100644
--- a/product.xml
+++ b/product.xml
@@ -165,8 +165,18 @@ this repository contains the full copyright notices and license terms. -->
<field name="name">Product by Category</field>
<field name="res_model">product.product</field>
<field name="view_type">form</field>
- <field name="context">{'categories': [active_id]}</field>
- <field name="domain">[('category','child_of', [active_id], 'parent')]</field>
+ <field name="context">{'categories': [Eval('active_id')]}</field>
+ <field name="domain">[('category','child_of', [Eval('active_id')], 'parent')]</field>
+ </record>
+ <record model="ir.action.act_window.view" id="act_product_by_category_view1">
+ <field name="sequence" eval="10"/>
+ <field name="view" ref="product_view_tree"/>
+ <field name="act_window" ref="act_product_by_category"/>
+ </record>
+ <record model="ir.action.act_window.view" id="act_product_by_category_view2">
+ <field name="sequence" eval="20"/>
+ <field name="view" ref="product_view_form"/>
+ <field name="act_window" ref="act_product_by_category"/>
</record>
<record model="ir.action.keyword" id="act_product_by_category_keyword1">
<field name="keyword">tree_open</field>
diff --git a/setup.py b/setup.py
index 9b13f57..6947226 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',
version=info.get('version', '0.0.1'),
@@ -27,6 +30,7 @@ setup(name='trytond_product',
package_dir={'trytond.modules.product': '.'},
packages=[
'trytond.modules.product',
+ 'trytond.modules.product.tests',
],
package_data={
'trytond.modules.product': info.get('xml', []) \
@@ -55,4 +59,6 @@ setup(name='trytond_product',
[trytond.modules]
product = trytond.modules.product
""",
+ test_suite='tests',
+ test_loader='trytond.test_loader:Loader',
)
diff --git a/tests/__init__.py b/tests/__init__.py
index b2bd1d5..da4d4ce 100644
--- a/tests/__init__.py
+++ b/tests/__init__.py
@@ -1,4 +1,4 @@
#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 test_product import *
+from test_product import suite
diff --git a/tests/__init__.pyc b/tests/__init__.pyc
new file mode 100644
index 0000000..c5cfa32
Binary files /dev/null and b/tests/__init__.pyc differ
diff --git a/tests/test_product.py b/tests/test_product.py
index 4f2bfe9..5bd986b 100644
--- a/tests/test_product.py
+++ b/tests/test_product.py
@@ -9,8 +9,9 @@ if os.path.isdir(DIR):
sys.path.insert(0, os.path.dirname(DIR))
import unittest
+from decimal import Decimal
import trytond.tests.test_tryton
-from trytond.tests.test_tryton import RPCProxy, CONTEXT, SOCK, test_view
+from trytond.tests.test_tryton import POOL, DB, USER, test_view
class ProductTestCase(unittest.TestCase):
@@ -20,6 +21,8 @@ class ProductTestCase(unittest.TestCase):
def setUp(self):
trytond.tests.test_tryton.install_module('product')
+ self.uom = POOL.get('product.uom')
+ self.uom_category = POOL.get('product.uom.category')
def test0005views(self):
'''
@@ -27,12 +30,181 @@ class ProductTestCase(unittest.TestCase):
'''
self.assertRaises(Exception, test_view('product'))
+ def test0010uom_non_zero_rate_factor(self):
+ '''
+ Test uom non_zero_rate_factor constraint.
+ '''
+ cursor = DB.cursor()
+
+ category_id = self.uom_category.create(cursor, USER, {
+ 'name': 'Test',
+ })
+ cursor.commit()
+
+ self.failUnlessRaises(Exception, self.uom.create, cursor, USER, {
+ 'name': 'Test',
+ 'symbol': 'T',
+ 'category': category_id,
+ 'rate': 0,
+ 'factor': 0,
+ })
+ cursor.rollback()
+
+ uom_id = self.uom.create(cursor, USER, {
+ 'name': 'Test',
+ 'symbol': 'T',
+ 'category': category_id,
+ 'rate': 1.0,
+ 'factor': 1.0,
+ })
+ cursor.commit()
+
+ self.failUnlessRaises(Exception, self.uom.write, cursor, USER, {
+ 'rate': 0.0,
+ })
+ cursor.rollback()
+
+ self.failUnlessRaises(Exception, self.uom.write, cursor, USER, {
+ 'factor': 0.0,
+ })
+ cursor.rollback()
+
+ self.failUnlessRaises(Exception, self.uom.write, cursor, USER, {
+ 'rate': 0.0,
+ 'factor': 0.0,
+ })
+ cursor.rollback()
+
+ cursor.close()
+
+ def test0020uom_check_factor_and_rate(self):
+ '''
+ Test uom check_factor_and_rate constraint.
+ '''
+ cursor = DB.cursor()
+
+ category_id = self.uom_category.search(cursor, USER, [
+ ('name', '=', 'Test'),
+ ], limit=1)[0]
+
+ self.failUnlessRaises(Exception, self.uom.create, cursor, USER, {
+ 'name': 'Test',
+ 'symbol': 'T',
+ 'category': category_id,
+ 'rate': 2,
+ 'factor': 2,
+ })
+ cursor.rollback()
+
+ uom_id = self.uom.search(cursor, USER, [
+ ('name', '=', 'Test'),
+ ], limit=1)[0]
+
+ self.failUnlessRaises(Exception, self.uom.write, cursor, USER, uom_id,
+ {
+ 'rate': 2.0,
+ })
+ cursor.rollback()
+
+ self.failUnlessRaises(Exception, self.uom.write, cursor, USER, uom_id,
+ {
+ 'factor': 2.0,
+ })
+ cursor.rollback()
+
+ cursor.close()
+
+ def test0030uom_select_accurate_field(self):
+ '''
+ Test uom select_accurate_field function.
+ '''
+ tests = [
+ ('Meter', 'factor'),
+ ('Kilometer', 'factor'),
+ ('centimeter', 'rate'),
+ ('Foot', 'factor'),
+ ]
+ cursor = DB.cursor()
+ for name, result in tests:
+ uom_id = self.uom.search(cursor, USER, [
+ ('name', '=', name),
+ ], limit=1)[0]
+ uom = self.uom.browse(cursor, USER, uom_id)
+ self.assert_(result == self.uom.select_accurate_field(uom))
+
+ cursor.close()
+
+ def test0040uom_compute_qty(self):
+ '''
+ Test uom compute_qty function.
+ '''
+ tests = [
+ ('Kilogram', 100, 'Gram', 100000, 100000),
+ ('Gram', 1, 'Pound', 0.0022046226218487759, 0.0),
+ ('Second', 5, 'Minute', 0.083333333333333343, 0.08),
+ ('Second', 25, 'Hour', 0.0069444444444444441, 0.01),
+ ('Millimeter', 3, 'Inch', 0.11811023622047245, 0.12),
+ ]
+ cursor = DB.cursor()
+ for from_name, qty, to_name, result, rounded_result in tests:
+ from_uom = self.uom.browse(cursor, USER, self.uom.search(cursor,
+ USER, [
+ ('name', '=', from_name),
+ ], limit=1)[0])
+ to_uom = self.uom.browse(cursor, USER, self.uom.search(cursor,
+ USER, [
+ ('name', '=', to_name),
+ ], limit=1)[0])
+ self.assert_(result == self.uom.compute_qty(cursor, USER, from_uom,
+ qty, to_uom, False))
+ self.assert_(rounded_result == self.uom.compute_qty(cursor, USER,
+ from_uom, qty, to_uom, True))
+
+ self.assert_(10 == self.uom.compute_qty(cursor, USER,
+ None, 10, to_uom))
+ self.assert_(10 == self.uom.compute_qty(cursor, USER,
+ None, 10, to_uom, True))
+ self.assert_(0 == self.uom.compute_qty(cursor, USER,
+ from_uom, 0, to_uom))
+ self.assert_(0 == self.uom.compute_qty(cursor, USER,
+ from_uom, 0, to_uom, True))
+ self.assert_(10 == self.uom.compute_qty(cursor, USER,
+ from_uom, 10, None))
+ self.assert_(10 == self.uom.compute_qty(cursor, USER,
+ from_uom, 10, None, True))
+
+ cursor.close()
+
+ def test0050uom_compute_price(self):
+ '''
+ Test uom compute_price function.
+ '''
+ tests = [
+ ('Kilogram', Decimal('100'), 'Gram', Decimal('0.1')),
+ ('Gram', Decimal('1'), 'Pound', Decimal('453.59237')),
+ ('Second', Decimal('5'), 'Minute', Decimal('300')),
+ ('Second', Decimal('25'), 'Hour', Decimal('90000')),
+ ('Millimeter', Decimal('3'), 'Inch', Decimal('76.2')),
+ ]
+ cursor = DB.cursor()
+ for from_name, price, to_name, result in tests:
+ from_uom = self.uom.browse(cursor, USER, self.uom.search(cursor,
+ USER, [
+ ('name', '=', from_name),
+ ], limit=1)[0])
+ to_uom = self.uom.browse(cursor, USER, self.uom.search(cursor,
+ USER, [
+ ('name', '=', to_name),
+ ], limit=1)[0])
+ self.assert_(result == self.uom.compute_price(cursor, USER,
+ from_uom, price, to_uom))
+ cursor.close()
+
def suite():
- return unittest.TestLoader().loadTestsFromTestCase(ProductTestCase)
+ suite = trytond.tests.test_tryton.suite()
+ suite.addTests(unittest.TestLoader().loadTestsFromTestCase(
+ ProductTestCase))
+ return suite
if __name__ == '__main__':
- suiteTrytond = trytond.tests.test_tryton.suite()
- suiteProduct = suite()
- alltests = unittest.TestSuite([suiteTrytond, suiteProduct])
- unittest.TextTestRunner(verbosity=2).run(alltests)
- SOCK.disconnect()
+ unittest.TextTestRunner(verbosity=2).run(suite())
diff --git a/tests/test_product.pyc b/tests/test_product.pyc
new file mode 100644
index 0000000..3c5400f
Binary files /dev/null and b/tests/test_product.pyc differ
diff --git a/trytond_product.egg-info/PKG-INFO b/trytond_product.egg-info/PKG-INFO
index 560ed42..3eb867e 100644
--- a/trytond_product.egg-info/PKG-INFO
+++ b/trytond_product.egg-info/PKG-INFO
@@ -1,12 +1,12 @@
Metadata-Version: 1.0
Name: trytond-product
-Version: 1.4.1
+Version: 1.6.0
Summary: Define products, categories of product, units of measure, categories of units of measure.
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.egg-info/SOURCES.txt b/trytond_product.egg-info/SOURCES.txt
index cc15b93..1f426a0 100644
--- a/trytond_product.egg-info/SOURCES.txt
+++ b/trytond_product.egg-info/SOURCES.txt
@@ -17,9 +17,13 @@ uom.xml
./category.py
./product.py
./uom.py
+./tests/__init__.py
+./tests/test_product.py
doc/index.rst
tests/__init__.py
+tests/__init__.pyc
tests/test_product.py
+tests/test_product.pyc
trytond_product.egg-info/PKG-INFO
trytond_product.egg-info/SOURCES.txt
trytond_product.egg-info/dependency_links.txt
diff --git a/trytond_product.egg-info/requires.txt b/trytond_product.egg-info/requires.txt
index 3ff8683..8c3b916 100644
--- a/trytond_product.egg-info/requires.txt
+++ b/trytond_product.egg-info/requires.txt
@@ -1,2 +1 @@
-trytond >= 1.4
-trytond < 1.5
\ No newline at end of file
+trytond >= 1.6, < 1.7
\ No newline at end of file
diff --git a/uom.py b/uom.py
index fd2dd91..a5e3e6c 100644
--- a/uom.py
+++ b/uom.py
@@ -2,10 +2,11 @@
#this repository contains the full copyright notices and license terms.
from trytond.model import ModelView, ModelSQL, fields
from trytond.model.modelstorage import OPERATORS
+from trytond.pyson import Not, Bool, Eval
from decimal import Decimal
STATES = {
- 'readonly': "(active == False)",
+ 'readonly': Not(Bool(Eval('active'))),
}
class UomCategory(ModelSQL, ModelView):
@@ -32,15 +33,15 @@ class Uom(ModelSQL, ModelView):
translate=True)
category = fields.Many2One('product.uom.category', 'UOM Category',
required=True, ondelete='RESTRICT', states=STATES)
- rate = fields.Float('Rate', digits=(12, 6), required=True,
+ rate = fields.Float('Rate', digits=(12, 12), required=True,
on_change=['rate'], states=STATES,
help='The coefficient for the formula:\n' \
'1 (base unit) = coef (this unit)')
- factor = fields.Float('Factor', digits=(12, 6), states=STATES,
+ factor = fields.Float('Factor', digits=(12, 12), states=STATES,
on_change=['factor'], required=True,
help='The coefficient for the formula:\n' \
'coef (base unit) = 1 (this unit)')
- rounding = fields.Float('Rounding Precision', digits=(12, 6),
+ rounding = fields.Float('Rounding Precision', digits=(12, 12),
required=True, states=STATES)
digits = fields.Integer('Display Digits')
active = fields.Boolean('Active')
@@ -51,12 +52,17 @@ class Uom(ModelSQL, ModelView):
('non_zero_rate_factor', 'CHECK((rate != 0.0) or (factor != 0.0))',
'Rate and factor can not be both equal to zero.')
]
+ self._constraints += [
+ ('check_factor_and_rate', 'invalid_factor_and_rate'),
+ ]
self._order.insert(0, ('name', 'ASC'))
self._error_messages.update({
- 'change_uom_rate_title':'You cannot change Rate, Factor or '\
+ 'change_uom_rate_title': 'You cannot change Rate, Factor or '
'Category on a Unit of Measure. ',
- 'change_uom_rate': 'If the UOM is still not used, you can '\
- 'delete it ortherwise you can deactivate it and create a new one.'
+ 'change_uom_rate': 'If the UOM is still not used, you can '
+ 'delete it otherwise you can deactivate it '
+ 'and create a new one.',
+ 'invalid_factor_and_rate': 'Invalid Factor and Rate values!',
})
def check_xml_record(self, cursor, user, ids, values, context=None):
@@ -101,52 +107,39 @@ class Uom(ModelSQL, ModelView):
return product.default_uom.category.id
return False
- def on_change_factor(self, cursor, user, ids, value, context=None):
+ def on_change_factor(self, cursor, user, value, context=None):
if value.get('factor', 0.0) == 0.0:
return {'rate': 0.0}
- return {'rate': round(1.0/value['factor'], 6)}
+ return {'rate': round(1.0 / value['factor'], self.rate.digits[1])}
- def on_change_rate(self, cursor, user, ids, value, context=None):
+ def on_change_rate(self, cursor, user, value, context=None):
if value.get('rate', 0.0) == 0.0:
return {'factor': 0.0}
- return {'factor': round(1.0/value['rate'], 6)}
-
- def search_rec_name(self, cursor, user, name, args, context=None):
- args2 = []
- i = 0
- while i < len(args):
- ids = self.search(cursor, user, ['OR',
- (self._rec_name, args[i][1], args[i][2]),
- ('symbol', args[i][1], args[i][2]),
- ], context=context)
- args2.append(('id', 'in', ids))
- i += 1
- return args2
+ return {'factor': round(1.0 / value['rate'], self.factor.digits[1])}
+
+ def search_rec_name(self, cursor, user, name, clause, context=None):
+ ids = self.search(cursor, user, ['OR',
+ (self._rec_name,) + clause[1:],
+ ('symbol',) + clause[1:],
+ ], order=[], context=context)
+ return [('id', 'in', ids)]
@staticmethod
def round(number, precision=1.0):
return round(number / precision) * precision
- @staticmethod
- def check_factor_and_rate(values):
-
- if values.get('factor', 0.0) == values.get('rate', 0.0) == 0.0:
- return values
-
- if abs(values.get('factor', 0.0)) > abs(values.get('rate', 0.0)):
- values['rate'] = 1.0 / values['factor']
- else:
- values['factor'] = 1.0 / values['rate']
-
- return values
-
- def create(self, cursor, user, values, context=None):
- values = self.check_factor_and_rate(values)
- return super(Uom, self).create(cursor, user, values, context)
+ def check_factor_and_rate(self, cursor, user, ids):
+ "Check coherence between factor and rate"
+ for uom in self.browse(cursor, user, ids):
+ if uom.rate == uom.factor == 0.0:
+ continue
+ if uom.rate != round(1.0 / uom.factor, self.rate.digits[1]) and \
+ uom.factor != round(1.0 / uom.rate, self.factor.digits[1]):
+ return False
+ return True
def write(self, cursor, user, ids, values, context=None):
if user == 0:
- values = self.check_factor_and_rate(values)
return super(Uom, self).write(cursor, user, ids, values, context)
if 'rate' not in values and 'factor' not in values \
and 'category' not in values:
@@ -159,7 +152,6 @@ class Uom(ModelSQL, ModelView):
old_uom = dict((uom.id, (uom.factor, uom.rate, uom.category.id)) \
for uom in uoms)
- values = self.check_factor_and_rate(values)
res = super(Uom, self).write(cursor, user, ids, values, context)
uoms = self.browse(cursor, user, ids, context=context)
@@ -172,22 +164,52 @@ class Uom(ModelSQL, ModelView):
error_description='change_uom_rate', context=context)
return res
- def compute_qty(self, cursor, user, from_uom, qty, to_uom=False,
- round=True, context=None):
+ def select_accurate_field(self, uom):
+ """
+ Select the more accurate field.
+ It chooses the field that has the least decimal.
+
+ :param uom: a BrowseRecord of UOM.
+ :return: 'factor' or 'rate'.
+ """
+ lengths = {}
+ for field in ('rate', 'factor'):
+ format = '%%.%df' % getattr(self, field).digits[1]
+ lengths[field] = len((format % getattr(uom,
+ field)).split('.')[1].rstrip('0'))
+ if lengths['rate'] < lengths['factor']:
+ return 'rate'
+ elif lengths['factor'] < lengths['rate']:
+ return 'factor'
+ elif uom.factor >= 1.0:
+ return 'factor'
+ else:
+ return 'rate'
+
+ def compute_qty(self, cursor, user, from_uom, qty, to_uom=None,
+ round=True, context=None):
"""
- Convert quantity for given uom's. from_uom and to_uom should
- be browse records.
+ Convert quantity for given uom's.
+
+ :param cursor: the database cursor
+ :param user: the user id
+ :param from_uom: a BrowseRecord of product.uom
+ :param qty: an int or long or float value
+ :param to_uom: a BrowseRecord of product.uom
+ :param round: a boolean to round or not the result
+ :param context: the context
+ :return: the converted quantity
"""
if not from_uom or not qty or not to_uom:
return qty
- if from_uom.category.id <> to_uom.category.id:
+ if from_uom.category.id != to_uom.category.id:
return qty
- if from_uom.factor >= 1.0: # Choose the more precise field.
+ if self.select_accurate_field(from_uom) == 'factor':
amount = qty * from_uom.factor
else:
amount = qty / from_uom.rate
- if to_uom:
- if to_uom.factor >= 1.0:
+ if to_uom is not None:
+ if self.select_accurate_field(to_uom) == 'factor':
amount = amount / to_uom.factor
else:
amount = amount * to_uom.rate
@@ -196,25 +218,34 @@ class Uom(ModelSQL, ModelView):
return amount
def compute_price(self, cursor, user, from_uom, price, to_uom=False,
- context=None):
+ context=None):
"""
- Convert price for given uom's. from_uom and to_uom should be
- browse records.
+ Convert price for given uom's.
+
+ :param cursor: the database cursor
+ :param user: the user id
+ :param from_uom: a BrowseRecord of product.uom
+ :param price: a Decimal value
+ :param to_uom: a BrowseRecord of product.uom
+ :param context: the context
+ :return: the converted price
"""
if not from_uom or not price or not to_uom:
return price
- if from_uom.category.id <> to_uom.category.id:
+ if from_uom.category.id != to_uom.category.id:
return price
+ factor_format = '%%.%df' % self.factor.digits[1]
+ rate_format = '%%.%df' % self.rate.digits[1]
- if from_uom.factor >= 1.0:
- new_price = price / Decimal(str(from_uom.factor))
+ if self.select_accurate_field(from_uom) == 'factor':
+ new_price = price / Decimal(factor_format % from_uom.factor)
else:
- new_price = price * Decimal(str(from_uom.rate))
+ new_price = price * Decimal(rate_format % from_uom.rate)
- if to_uom.factor >= 1.0:
- new_price = new_price * Decimal(str(to_uom.factor))
+ if self.select_accurate_field(to_uom) == 'factor':
+ new_price = new_price * Decimal(factor_format % to_uom.factor)
else:
- new_price = new_price / Decimal(str(to_uom.rate))
+ new_price = new_price / Decimal(rate_format % to_uom.rate)
return new_price
diff --git a/uom.xml b/uom.xml
index e824d3e..2d09ccc 100644
--- a/uom.xml
+++ b/uom.xml
@@ -126,6 +126,24 @@ this repository contains the full copyright notices and license terms. -->
id="menu_uom_category_form"
action="act_uom_category_form"/>
+ <record model="ir.action.act_window" id="act_uom_category_form2">
+ <field name="name">Categories of Unit of Measure</field>
+ <field name="res_model">product.uom.category</field>
+ <field name="view_type">form</field>
+ </record>
+ <record model="ir.action.act_window.view" id="act_uom_category_form2_view1">
+ <field name="sequence" eval="10"/>
+ <field name="view" ref="uom_category_view_form"/>
+ <field name="act_window" ref="act_uom_category_form2"/>
+ </record>
+ <record model="ir.action.act_window.view" id="act_uom_category_form2_view2">
+ <field name="sequence" eval="20"/>
+ <field name="view" ref="uom_category_view_tree"/>
+ <field name="act_window" ref="act_uom_category_form2"/>
+ </record>
+ <menuitem name="New Category" parent="menu_uom_category_form" sequence="10"
+ id="menu_uom_category_form_new"
+ action="act_uom_category_form2"/>
<record model="product.uom.category" id="uom_cat_unit">
<field name="name">Units</field>
@@ -147,36 +165,36 @@ this repository contains the full copyright notices and license terms. -->
<field name="name">Kilogram</field>
<field name="symbol">kg</field>
<field name="category" ref="uom_cat_weight"/>
- <field name="factor" eval="1000"/>
- <field name="rate" eval="0.001"/>
+ <field name="factor" eval="1"/>
+ <field name="rate" eval="1"/>
</record>
<record model="product.uom" id="uom_gram">
<field name="name">Gram</field>
<field name="symbol">g</field>
<field name="category" ref="uom_cat_weight"/>
- <field name="rate" eval="1"/>
- <field name="factor" eval="1"/>
+ <field name="factor" eval="0.001"/>
+ <field name="rate" eval="1000"/>
</record>
<record model="product.uom" id="uom_carat">
<field name="name">Carat</field>
<field name="symbol">c</field>
<field name="category" ref="uom_cat_weight"/>
- <field name="rate" eval="0.2"/>
- <field name="factor" eval="5"/>
+ <field name="factor" eval="5000"/>
+ <field name="rate" eval="0.0002"/>
</record>
<record model="product.uom" id="uom_pound">
<field name="name">Pound</field>
<field name="symbol">lbs</field>
<field name="category" ref="uom_cat_weight"/>
- <field name="factor" eval="453.592"/>
- <field name="rate" eval="0.002205"/>
+ <field name="factor" eval="0.45359237"/>
+ <field name="rate" eval="round(1.0 / 0.45359237, 12)"/>
</record>
<record model="product.uom" id="uom_once">
<field name="name">Ounce</field>
<field name="symbol">oz</field>
<field name="category" ref="uom_cat_weight"/>
- <field name="factor" eval="28.3495"/>
- <field name="rate" eval="0.0352740"/>
+ <field name="factor" eval="0.028349523125"/>
+ <field name="rate" eval="round(1.0 / 0.028349523125, 12)"/>
</record>
<record model="product.uom.category" id="uom_cat_time">
@@ -186,36 +204,36 @@ this repository contains the full copyright notices and license terms. -->
<field name="name">Second</field>
<field name="symbol">s</field>
<field name="category" ref="uom_cat_time"/>
+ <field name="factor" eval="round(1.0 / 3600, 12)"/>
<field name="rate" eval="3600"/>
- <field name="factor" eval="1.0/3600"/>
</record>
<record model="product.uom" id="uom_minute">
<field name="name">Minute</field>
<field name="symbol">min</field>
<field name="category" ref="uom_cat_time"/>
+ <field name="factor" eval="round(1.0 / 60, 12)"/>
<field name="rate" eval="60"/>
- <field name="factor" eval="1.0/60"/>
</record>
<record model="product.uom" id="uom_hour">
<field name="name">Hour</field>
<field name="symbol">h</field>
<field name="category" ref="uom_cat_time"/>
- <field name="rate" eval="1"/>
<field name="factor" eval="1"/>
+ <field name="rate" eval="1"/>
</record>
<record model="product.uom" id="uom_work_day">
<field name="name">Work Day</field>
<field name="symbol">wd</field>
<field name="category" ref="uom_cat_time"/>
- <field name="rate" eval="1.0/8"/>
<field name="factor" eval="8"/>
+ <field name="rate" eval="0.125"/>
</record>
<record model="product.uom" id="uom_day">
<field name="name">Day</field>
<field name="symbol">d</field>
<field name="category" ref="uom_cat_time"/>
- <field name="rate" eval="1.0/24"/>
<field name="factor" eval="24"/>
+ <field name="rate" eval="round(1.0 / 24, 12)"/>
</record>
@@ -226,8 +244,8 @@ this repository contains the full copyright notices and license terms. -->
<field name="name">Meter</field>
<field name="symbol">m</field>
<field name="category" ref="uom_cat_length"/>
- <field name="rate" eval="1"/>
<field name="factor" eval="1"/>
+ <field name="rate" eval="1"/>
</record>
<record model="product.uom" id="uom_kilometer">
<field name="name">Kilometer</field>
@@ -240,8 +258,8 @@ this repository contains the full copyright notices and license terms. -->
<field name="name">centimeter</field>
<field name="symbol">cm</field>
<field name="category" ref="uom_cat_length"/>
- <field name="rate" eval="100"/>
<field name="factor" eval="0.01"/>
+ <field name="rate" eval="100"/>
</record>
<record model="product.uom" id="uom_millimeter">
<field name="name">Millimeter</field>
@@ -254,29 +272,29 @@ this repository contains the full copyright notices and license terms. -->
<field name="name">Foot</field>
<field name="symbol">ft</field>
<field name="category" ref="uom_cat_length"/>
- <field name="rate" eval="3.28084"/>
- <field name="factor" eval="0.304800"/>
+ <field name="factor" eval="0.3048"/>
+ <field name="rate" eval="round(1.0 / 0.3048, 12)"/>
</record>
<record model="product.uom" id="uom_yard">
<field name="name">Yard</field>
<field name="symbol">yd</field>
<field name="category" ref="uom_cat_length"/>
- <field name="factor" eval="0.914400"/>
- <field name="rate" eval="1.093613"/>
+ <field name="factor" eval="0.9144"/>
+ <field name="rate" eval="round(1.0/ 0.9144, 12)"/>
</record>
<record model="product.uom" id="uom_inch">
<field name="name">Inch</field>
<field name="symbol">in</field>
<field name="category" ref="uom_cat_length"/>
- <field name="factor" eval="0.02540"/>
- <field name="rate" eval="39.3701"/>
+ <field name="factor" eval="0.0254"/>
+ <field name="rate" eval="round(1.0 / 0.0254, 12)"/>
</record>
<record model="product.uom" id="uom_mile">
<field name="name">Mile</field>
<field name="symbol">mi</field>
<field name="category" ref="uom_cat_length"/>
<field name="factor" eval="1609.344"/>
- <field name="rate" eval="0.000621"/>
+ <field name="rate" eval="round(1.0 / 1609.344, 12)"/>
</record>
<record model="product.uom.category" id="uom_cat_volume">
@@ -292,7 +310,7 @@ this repository contains the full copyright notices and license terms. -->
<record model="product.uom" id="uom_liter">
<field name="name">Liter</field>
<field name="symbol">l</field>
- <field name="category" ref="uom_cat_length"/>
+ <field name="category" ref="uom_cat_volume"/>
<field name="factor" eval="1"/>
<field name="rate" eval="1"/>
</record>
@@ -307,22 +325,22 @@ this repository contains the full copyright notices and license terms. -->
<field name="name">Cubic inch</field>
<field name="symbol">in³</field>
<field name="category" ref="uom_cat_volume"/>
- <field name="factor" eval="0.016387"/>
- <field name="rate" eval="61.023744"/>
+ <field name="factor" eval="0.016387064"/>
+ <field name="rate" eval="round(1.0 / 0.016387064, 12)"/>
</record>
<record model="product.uom" id="uom_cubic_foot">
<field name="name">Cubic foot</field>
<field name="symbol">ft³</field>
<field name="category" ref="uom_cat_volume"/>
- <field name="factor" eval="28.316847"/>
- <field name="rate" eval="0.035315"/>
+ <field name="factor" eval="28.316846592"/>
+ <field name="rate" eval="round(1.0 / 28.316846592, 12)"/>
</record>
<record model="product.uom" id="uom_gallon">
<field name="name">Gallon</field>
<field name="symbol">gal</field>
<field name="category" ref="uom_cat_volume"/>
- <field name="factor" eval="3.785412"/>
- <field name="rate" eval="0.264172"/>
+ <field name="factor" eval="3.785411784"/>
+ <field name="rate" eval="round(1.0 / 3.785411784, 12)"/>
</record>
<record model="product.uom.category" id="uom_cat_surface">
@@ -360,22 +378,22 @@ this repository contains the full copyright notices and license terms. -->
<field name="name">Square inch</field>
<field name="symbol">in²</field>
<field name="category" ref="uom_cat_surface"/>
- <field name="factor" eval="0.000645"/>
- <field name="rate" eval="1550.0"/>
+ <field name="factor" eval="0.00064516"/>
+ <field name="rate" eval="round(1.0 / 0.00064516, 12)"/>
</record>
<record model="product.uom" id="uom_square_foot">
<field name="name">Square foot</field>
<field name="symbol">ft²</field>
<field name="category" ref="uom_cat_surface"/>
- <field name="factor" eval="0.092903"/>
- <field name="rate" eval="10.7639"/>
+ <field name="factor" eval="0.09290304"/>
+ <field name="rate" eval="round(1.0 / 0.09290304, 12)"/>
</record>
<record model="product.uom" id="uom_square_yard">
<field name="name">Square yard</field>
<field name="symbol">yd²</field>
<field name="category" ref="uom_cat_surface"/>
- <field name="factor" eval="0.836127"/>
- <field name="rate" eval="1.19599"/>
+ <field name="factor" eval="0.83612736"/>
+ <field name="rate" eval="round(1.0 / 0.83612736, 12)"/>
</record>
commit 0919a67c86b7b2b737b5eb6b72ccab04ae7a7e36
Author: Daniel Baumann <daniel at debian.org>
Date: Fri Apr 9 14:31:33 2010 +0200
Adding Dm-Upload-Allowed in control in preparation for Mathias.
diff --git a/debian/control b/debian/control
index fd94abe..d72b407 100644
--- a/debian/control
+++ b/debian/control
@@ -5,6 +5,7 @@ Maintainer: Debian Tryton Maintainers <tryton at lists.debian-maintainers.org>
Uploaders:
Daniel Baumann <daniel at debian.org>,
Mathias Behrle <mathiasb at mbsolutions.selfip.biz>
+Dm-Upload-Allowed: yes
Build-Depends: debhelper (>= 7), python, python-setuptools, python-support
Standards-Version: 3.8.4
Homepage: http://www.tryton.org/
commit 6b88ceecfc8075cec23cc89ed65a0415e77731fb
Author: Daniel Baumann <daniel at debian.org>
Date: Sat Feb 20 10:41:07 2010 +0100
Releasing debian version 1.4.1-1.
diff --git a/debian/changelog b/debian/changelog
index 7a272cb..d7ba638 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+tryton-modules-product (1.4.1-1) unstable; urgency=low
+
+ * Making depends versioned for tryton 1.4.
+ * Adding explicit debian source version 1.0 until switch to 3.0.
+ * Updating year in copyright file.
+ * Removing unneeded python-all-dev from build-depends.
+ * Updating to standards 3.8.4.
+ * Merging upstream version 1.4.1.
+ * Updating README.source.
+
+ -- Daniel Baumann <daniel at debian.org> Sat, 20 Feb 2010 10:40:59 +0100
+
tryton-modules-product (1.4.0-1) unstable; urgency=low
* Merging upstream version 1.4.0.
commit 0c04a97a762b2780dd5703de4bce0d18c18991b3
Author: Daniel Baumann <daniel at debian.org>
Date: Sat Feb 20 10:40:40 2010 +0100
Updating README.source.
diff --git a/debian/README.source b/debian/README.source
index dcc7ba3..18b6b24 100644
--- a/debian/README.source
+++ b/debian/README.source
@@ -32,6 +32,6 @@ upstream source. Changes, if any, are stored in the source package as diffs in
debian/diff and are applied during the build. Current modifications can be
applied to the source tree with:
- $ quilt push -a
+ $ QUILT_PATCHES=debian/patches quilt push -a
More information about Quilt can be found in the quilt package.
commit 53f650ffc93f720a02bcff1bd2b82fd66a8ce576
Author: Daniel Baumann <daniel at debian.org>
Date: Sat Feb 20 10:40:33 2010 +0100
Merging upstream version 1.4.1.
diff --git a/CHANGELOG b/CHANGELOG
index b4765f1..d4fc896 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 1.4.1 - 2010-02-17
+* 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 37fef2d..94a43fb 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -1,7 +1,7 @@
Copyright (C) 2004-2008 Tiny SPRL.
-Copyright (C) 2008 Cédric Krier.
-Copyright (C) 2008 Bertrand Chenal.
-Copyright (C) 2008 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 e1c53e8..8597c21 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.0
Name: trytond_product
-Version: 1.4.0
+Version: 1.4.1
Summary: Define products, categories of product, units of measure, categories of units of measure.
Home-page: http://www.tryton.org/
Author: B2CK
diff --git a/__tryton__.py b/__tryton__.py
index 801dab7..76a8139 100644
--- a/__tryton__.py
+++ b/__tryton__.py
@@ -6,7 +6,7 @@
'name_es_CO': 'Productos',
'name_es_ES': 'Producto',
'name_fr_FR': 'Produit',
- 'version' : '1.4.0',
+ 'version' : '1.4.1',
'author' : 'B2CK',
'email': 'info at b2ck.com',
'website': 'http://www.tryton.org/',
diff --git a/trytond_product.egg-info/PKG-INFO b/trytond_product.egg-info/PKG-INFO
index 7f83838..560ed42 100644
--- a/trytond_product.egg-info/PKG-INFO
+++ b/trytond_product.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.0
Name: trytond-product
-Version: 1.4.0
+Version: 1.4.1
Summary: Define products, categories of product, units of measure, categories of units of measure.
Home-page: http://www.tryton.org/
Author: B2CK
diff --git a/uom.py b/uom.py
index ef9b58f..fd2dd91 100644
--- a/uom.py
+++ b/uom.py
@@ -169,7 +169,7 @@ class Uom(ModelSQL, ModelView):
or uom.category.id != old_uom[uom.id][2]:
self.raise_user_error(cursor, 'change_uom_rate_title',
- error_description='change_uom_rate')
+ error_description='change_uom_rate', context=context)
return res
def compute_qty(self, cursor, user, from_uom, qty, to_uom=False,
commit cc41834968e3650bbad760aa30ce58a5d3a769fe
Author: Daniel Baumann <daniel at debian.org>
Date: Thu Jan 28 07:53:21 2010 +0100
Updating to standards 3.8.4.
diff --git a/debian/control b/debian/control
index ac52334..fd94abe 100644
--- a/debian/control
+++ b/debian/control
@@ -6,7 +6,7 @@ Uploaders:
Daniel Baumann <daniel at debian.org>,
Mathias Behrle <mathiasb at mbsolutions.selfip.biz>
Build-Depends: debhelper (>= 7), python, python-setuptools, python-support
-Standards-Version: 3.8.3
+Standards-Version: 3.8.4
Homepage: http://www.tryton.org/
Vcs-Browser: http://git.debian-maintainers.org/?p=tryton/tryton-modules-product.git
Vcs-Git: git://git.debian-maintainers.org/git/tryton/tryton-modules-product.git
commit 89cd32704cfa198ded2d1f54e0fa661c39cbc0dd
Author: Daniel Baumann <daniel at debian.org>
Date: Mon Jan 25 10:12:28 2010 +0100
Removing unneeded python-all-dev from build-depends.
diff --git a/debian/control b/debian/control
index f147732..ac52334 100644
--- a/debian/control
+++ b/debian/control
@@ -5,8 +5,7 @@ Maintainer: Debian Tryton Maintainers <tryton at lists.debian-maintainers.org>
Uploaders:
Daniel Baumann <daniel at debian.org>,
Mathias Behrle <mathiasb at mbsolutions.selfip.biz>
-Build-Depends:
- debhelper (>= 7), python, python-all-dev, python-setuptools, python-support
+Build-Depends: debhelper (>= 7), python, python-setuptools, python-support
Standards-Version: 3.8.3
Homepage: http://www.tryton.org/
Vcs-Browser: http://git.debian-maintainers.org/?p=tryton/tryton-modules-product.git
commit a794c749c109f99eccbf4a20d98cda70b961ee81
Author: Daniel Baumann <daniel at debian.org>
Date: Sat Jan 2 11:35:26 2010 +0100
Updating year in copyright file.
diff --git a/debian/copyright b/debian/copyright
index 33c66f1..9d3eb14 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -27,7 +27,7 @@ License: GPL-3+
can be found in /usr/share/common-licenses/GPL-3 file.
Files: debian/*
-Copyright: (C) 2009 Daniel Baumann <daniel at debian.org>
+Copyright: (C) 2009-2010 Daniel Baumann <daniel at debian.org>
License: GPL-3+
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
commit df8489e2be4a4f99172b408bd759fcc421a557d9
Author: Daniel Baumann <daniel at debian.org>
Date: Sat Dec 12 10:06:32 2009 +0100
Adding explicit debian source version 1.0 until switch to 3.0.
diff --git a/debian/source/format b/debian/source/format
new file mode 100644
index 0000000..d3827e7
--- /dev/null
+++ b/debian/source/format
@@ -0,0 +1 @@
+1.0
commit 6dc89e06dc470a23b5e66e84da544d4967fbbef3
Author: Daniel Baumann <daniel at debian.org>
Date: Wed Nov 4 12:22:20 2009 +0100
Making depends versioned for tryton 1.4.
diff --git a/debian/control b/debian/control
index ada7f1e..f147732 100644
--- a/debian/control
+++ b/debian/control
@@ -14,7 +14,9 @@ Vcs-Git: git://git.debian-maintainers.org/git/tryton/tryton-modules-product.git
Package: tryton-modules-product
Architecture: all
-Depends: ${misc:Depends}, ${python:Depends}, tryton-server, python-pkg-resources
+Depends:
+ ${misc:Depends}, ${python:Depends}, tryton-server (>= 1.4),
+ python-pkg-resources
XB-Python-Version: ${python:Versions}
Description: Tryton Application Platform (Product Module)
Tryton is a high-level general purpose application platform written in Python
commit fbbe21590d5919058da38efe83a41c991b0a0cdf
Author: Daniel Baumann <daniel at debian.org>
Date: Mon Oct 19 22:15:31 2009 +0200
Releasing debian version 1.4.0-1.
diff --git a/debian/changelog b/debian/changelog
index 2851bae..7a272cb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+tryton-modules-product (1.4.0-1) unstable; urgency=low
+
+ * Merging upstream version 1.4.0.
+
+ -- Daniel Baumann <daniel at debian.org> Mon, 19 Oct 2009 22:15:24 +0200
+
tryton-modules-product (1.2.1-4) unstable; urgency=low
* Updating to standards version 3.8.3.
commit cb5ba25f6c175ace340a5c1395259ce4b9c38a8c
Author: Daniel Baumann <daniel at debian.org>
Date: Mon Oct 19 22:15:09 2009 +0200
Merging upstream version 1.4.0.
diff --git a/CHANGELOG b/CHANGELOG
index 796e645..b4765f1 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,5 +1,5 @@
-Version 1.2.1 - 2009-07-07
-* Some bug fixes (see mercurial logs for details)
+Version 1.4.0 - 2009-10-19
+* Bug fixes (see mercurial logs for details)
Version 1.2.0 - 2009-04-20
* Bug fixes (see mercurial logs for details)
diff --git a/INSTALL b/INSTALL
index 3e97432..1e6e3ad 100644
--- a/INSTALL
+++ b/INSTALL
@@ -5,7 +5,7 @@ Prerequisites
-------------
* Python 2.4 or later (http://www.python.org/)
- * trytond 1.1.x (http://www.tryton.org/)
+ * trytond (http://www.tryton.org/)
Installation
------------
diff --git a/MANIFEST.in b/MANIFEST.in
index 5343ad8..b2a140e 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -7,3 +7,5 @@ include LICENSE
include *.xml
include *.odt
include *.csv
+include tests/*
+include doc/*
diff --git a/PKG-INFO b/PKG-INFO
index 011612c..e1c53e8 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,12 +1,12 @@
Metadata-Version: 1.0
Name: trytond_product
-Version: 1.2.1
+Version: 1.4.0
Summary: Define products, categories of product, units of measure, categories of units of measure.
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/__init__.py b/__init__.py
index eb347ff..f07b229 100644
--- a/__init__.py
+++ b/__init__.py
@@ -1,4 +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.
+#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 uom import *
from category import *
diff --git a/__tryton__.py b/__tryton__.py
index d70ee11..801dab7 100644
--- a/__tryton__.py
+++ b/__tryton__.py
@@ -4,9 +4,9 @@
'name' : 'Product',
'name_de_DE': 'Artikel',
'name_es_CO': 'Productos',
- 'name_es_ES': 'Productos',
+ 'name_es_ES': 'Producto',
'name_fr_FR': 'Produit',
- 'version' : '1.2.1',
+ 'version' : '1.4.0',
'author' : 'B2CK',
'email': 'info at b2ck.com',
'website': 'http://www.tryton.org/',
@@ -14,7 +14,13 @@
'of measure, categories of units of measure.',
'description_de_DE': 'Dient der Erstellung von Artikeln, Artikelkategorien, Maßeinheiten und Kategorien für Maßeinheiten.',
'description_es_CO': 'Definición de productos, categorÃas de producto unidades de medida y categorÃas de unidades de medida',
- 'description_es_ES': 'Definición de productos, categorÃas de producto unidades de medida y categorÃas de unidades de medida',
+ 'description_es_ES': 'Define productos, categorÃas de producto, unidades de medida y categorÃas de unidades de medida',
+ 'description_fr_FR': '''Défini:
+ - Produit
+ - Catégorie de produit
+ - Unité de mesure
+ - Catégorie d'unité de mesure
+''',
'depends' : [
'ir',
'res',
diff --git a/category.py b/category.py
index 20197a5..50ca8e5 100644
--- a/category.py
+++ b/category.py
@@ -21,13 +21,15 @@ class Category(ModelSQL, ModelView):
if not ids:
return {}
res = {}
- categories = self.browse(cursor, user, ids, context=context)
- for category in categories:
- if category.parent:
- name = category.parent.name+' / '+ category.name
+ def _name(category):
+ if category.id in res:
+ return res[category.id]
+ elif category.parent:
+ return _name(category.parent) + ' / ' + category.name
else:
- name = category.name
- res[category.id] = name
+ return category.name
+ for category in self.browse(cursor, user, ids, context=context):
+ res[category.id] = _name(category)
return res
Category()
diff --git a/de_DE.csv b/de_DE.csv
index ce10599..6cc448a 100644
--- a/de_DE.csv
+++ b/de_DE.csv
@@ -126,7 +126,7 @@ model,"product.uom,name",uom_square_meter,Square meter,Quadratmeter,0
model,"product.uom,name",uom_square_yard,Square yard,Quadratyard(s),0
model,"product.uom,name",uom_unit,Unit,Stück,0
model,"product.uom,name",0,Unit of measure,Maßeinheit,0
-model,"product.uom,name",uom_work_day,Work Day,Arbeitstag(e),0
+model,"product.uom,name",uom_work_day,Work Day,Personentag(e),0
model,"product.uom,name",uom_yard,Yard,Yard(s),0
model,"product.uom,symbol",uom_are,a,a,0
model,"product.uom,symbol",uom_carat,c,c,0
@@ -157,10 +157,10 @@ model,"product.uom,symbol",uom_millimeter,mm,mm,0
model,"product.uom,symbol",uom_once,oz,oz,0
model,"product.uom,symbol",uom_second,s,s,0
model,"product.uom,symbol",uom_unit,u,St.,0
-model,"product.uom,symbol",uom_work_day,wd,wd,0
+model,"product.uom,symbol",uom_work_day,wd,PT,0
model,"product.uom,symbol",uom_yard,yd,yd,0
model,"product.uom,symbol",uom_square_yard,yd²,yd²,0
-model,"res.group,name",group_product_admin,Product Administration,Administration Artikel,0
+model,"res.group,name",group_product_admin,Product Administration,Artikel Administration,0
selection,"product.template,cost_price_method",0,Average,Durchschnitt,0
selection,"product.template,cost_price_method",0,Fixed,Fix,0
selection,"product.template,type",0,Consumable,Verbrauchsmaterial,0
diff --git a/doc/index.rst b/doc/index.rst
new file mode 100644
index 0000000..1df7b2a
--- /dev/null
+++ b/doc/index.rst
@@ -0,0 +1,63 @@
+Product Module
+##############
+
+The Product module defines the following models: Category of Unit of
+Measure, Unit of Measure, Product Template, Product and Product
+Category.
+
+
+Category of Unit of Measure
+***************************
+
+A Category of Unit of Measure is simply defined by a name.
+
+
+Unit of Measure
+***************
+
+A Unit of Measure is defined by:
+
+- Name.
+- Symbol.
+- UOM category.
+- Rate and a Factor (the later is the inverse of the former).
+- Rounding Precision and Display Digits, used to round and display
+ quantities expressed in the given UOM.
+- Active, allow to disable a UOM.
+
+
+Product category
+****************
+
+The Product Category Model is just composed of a name. Product
+Categories are organised in a tree structure.
+
+
+Product Template and Product
+****************************
+
+The product concept in Tryton is composed of two models: Product
+Template and Product.
+
+The Product Template model contains the following fields:
+
+- Name.
+- Type, whose value can be *Stockable*, *Consumable*, *Service*.
+- Category.
+- List Price, the default sale price expressed in the List Price UOM.
+ product.
+- List Price UOM.
+- Cost Price, the cost for one unit of this product expressed in the
+ Cost Price UOM.
+- Cost Price UOM.
+- Cost Price Method, which can be *Fixed* or *Average*. Defines how
+ the cost price should be updated. *Fixed* means that the cost price
+ stay unchanged. *Average* means that the cost price is the average
+ cost of all the items that are in stock.
+- Default UOM. The default UOM for this product. Used for example to
+ express stock levels.
+- Active, allow to disable a product.
+
+
+The Product model extend the Product Template with two fields: Code
+and Description.
diff --git a/es_CO.csv b/es_CO.csv
index caeb301..d656ecf 100644
--- a/es_CO.csv
+++ b/es_CO.csv
@@ -132,6 +132,7 @@ model,"product.uom,symbol",uom_yard,yd,yd,0
model,"product.uom,symbol",uom_square_yard,yd²,yd²,0
model,"res.group,name",group_product_admin,Product Administration,Productos,0
selection,"product.template,cost_price_method",0,Average,Promedio,0
+selection,"product.template,cost_price_method",0,FIFO,FIFO,0
selection,"product.template,cost_price_method",0,Fixed,Fijo,0
selection,"product.template,type",0,Consumable,Consumible,0
selection,"product.template,type",0,Service,Servicios,0
diff --git a/es_ES.csv b/es_ES.csv
index cd4f606..fe76364 100644
--- a/es_ES.csv
+++ b/es_ES.csv
@@ -1,8 +1,7 @@
type,name,res_id,src,value,fuzzy
-error,product.template,0,You cannot change the default uom for a product which is associated to stock moves.,No puede cambiar la UdM predeterminada para un producto asociado con movimientos de inventario.,0
-error,product.uom,0,"If the UOM is still not used, you can delete it ortherwise you can deactivate it and create a new one.","Si no se ha usado la UdM, puede eliminar, de otra forma puede desactivarla y crear una nueva.",0
-error,product.uom,0,Rate and factor can not be both equal to zero.,Tasa de cambio y factor no pueden ser cero simultáneamente.,0
-error,product.uom,0,"You cannot change Rate, Factor or Category on a Unit of Measure. ","No puede cambiar la tasa de cambio, el factor o la categorÃa de una Unidad de Medida.",0
+error,product.uom,0,"If the UOM is still not used, you can delete it ortherwise you can deactivate it and create a new one.","Si no se ha usado la UdM, puede borrarla, en caso contrario, puede desactivarla y crear una nueva.",0
+error,product.uom,0,Rate and factor can not be both equal to zero.,Conversión y factor no pueden ser cero simultáneamente.,0
+error,product.uom,0,"You cannot change Rate, Factor or Category on a Unit of Measure. ","No puede cambiar la conversión, el factor o la categorÃa de una unidad de medida.",0
field,"product.category,childs",0,Children,Hijos,0
field,"product.category,name",0,Name,Nombre,0
field,"product.category,parent",0,Parent,Padre,0
@@ -16,7 +15,7 @@ field,"product.template,category",0,Category,CategorÃa,0
field,"product.template,cost_price",0,Cost Price,Precio de coste,0
field,"product.template,cost_price_method",0,Cost Method,Método de coste,0
field,"product.template,cost_price_uom",0,Cost Price,Precio de coste,0
-field,"product.template,default_uom",0,Default UOM,UdM predeterminado,0
+field,"product.template,default_uom",0,Default UOM,UdM predeterminada,0
field,"product.template,list_price",0,List Price,Precio de lista,0
field,"product.template,list_price_uom",0,List Price,Precio de lista,0
field,"product.template,name",0,Name,Nombre,0
@@ -24,14 +23,14 @@ field,"product.template,products",0,Products,Productos,0
field,"product.template,rec_name",0,Name,Nombre,0
field,"product.template,type",0,Type,Tipo,0
field,"product.uom,active",0,Active,Activo,0
-field,"product.uom,category",0,UOM Category,CategorÃa UdM,0
+field,"product.uom,category",0,UOM Category,CategorÃa de UdM,0
field,"product.uom.category,name",0,Name,Nombre,0
field,"product.uom.category,rec_name",0,Name,Nombre,0
-field,"product.uom.category,uoms",0,Unit of Measures,Unidad de medidas,0
-field,"product.uom,digits",0,Display Digits,DÃgitos a mostrar,0
+field,"product.uom.category,uoms",0,Unit of Measures,Unidades de medidas,0
+field,"product.uom,digits",0,Display Digits,Decimales a mostrar,0
field,"product.uom,factor",0,Factor,Factor,0
field,"product.uom,name",0,Name,Nombre,0
-field,"product.uom,rate",0,Rate,Tasa de cambio,0
+field,"product.uom,rate",0,Rate,Conversión,0
field,"product.uom,rec_name",0,Name,Nombre,0
field,"product.uom,rounding",0,Rounding Precision,Precisión de redondeo,0
field,"product.uom,symbol",0,Symbol,SÃmbolo,0
@@ -136,7 +135,7 @@ model,"res.group,name",group_product_admin,Product Administration,Administració
selection,"product.template,cost_price_method",0,Average,Promedio,0
selection,"product.template,cost_price_method",0,Fixed,Fijo,0
selection,"product.template,type",0,Consumable,Consumible,0
-selection,"product.template,type",0,Service,Servicios,0
+selection,"product.template,type",0,Service,Servicio,0
selection,"product.template,type",0,Stockable,Almacenable,0
view,product.category,0,Children,Hijos,0
view,product.category,0,Product Categories,CategorÃas de producto,0
@@ -150,5 +149,5 @@ view,product.template,0,Product Template,Plantilla de producto,0
view,product.template,0,Product Templates,Plantillas de producto,0
view,product.uom,0,Unit of Measure,Unidad de medida,0
view,product.uom,0,Units of Measure,Unidades de medida,0
-view,product.uom.category,0,Categories of Unit of Measure,CategorÃas de la unidad de medida,0
-view,product.uom.category,0,Category of Unit of Measure,CategorÃa de la unidad de medida,0
+view,product.uom.category,0,Categories of Unit of Measure,CategorÃas de unidades de medida,0
+view,product.uom.category,0,Category of Unit of Measure,CategorÃa de unidad de medida,0
diff --git a/fr_FR.csv b/fr_FR.csv
index 91a0da8..2da5db2 100644
--- a/fr_FR.csv
+++ b/fr_FR.csv
@@ -1,7 +1,7 @@
type,name,res_id,src,value,fuzzy
error,product.template,0,You cannot change the default uom for a product which is associated to stock moves.,Vous ne pouvez pas changer l'UDM par défaut pour un produit qui a déjà fait l'objet de mouvements de stock,0
-error,product.uom,0,"If the UOM is still not used, you can delete it ortherwise you can deactivate it and create a new one.","Si l'UDM n'est pas utilisée, vous pouvez la supprimer, sinon vous pouvez la désactiver et en créer une noouvelle.",0
-error,product.uom,0,Rate and factor can not be both equal to zero.,Le taux et le facteur ne peuventt pas être égaux à zéro.,0
+error,product.uom,0,"If the UOM is still not used, you can delete it ortherwise you can deactivate it and create a new one.","Si l'UDM n'est pas utilisée, vous pouvez la supprimer, sinon vous pouvez la désactiver et en créer une nouvelle.",0
+error,product.uom,0,Rate and factor can not be both equal to zero.,Le taux et le facteur ne peuvent pas être égaux à zéro.,0
error,product.uom,0,"You cannot change Rate, Factor or Category on a Unit of Measure. ","Vous ne pouvez pas changer le taux, le facteur ou la catégorie d'une unité de mesure.",0
field,"product.category,childs",0,Children,Enfants,0
field,"product.category,name",0,Name,Nom,0
@@ -13,12 +13,12 @@ field,"product.product,rec_name",0,Name,Nom,0
field,"product.product,template",0,Product Template,Modèle produit,0
field,"product.template,active",0,Active,Actif,0
field,"product.template,category",0,Category,Catégorie,0
-field,"product.template,cost_price",0,Cost Price,Prix de Revient,0
-field,"product.template,cost_price_method",0,Cost Method,Méthode de Coût,0
-field,"product.template,cost_price_uom",0,Cost Price,Prix de Revient,0
-field,"product.template,default_uom",0,Default UOM,UDM par Défaut,0
-field,"product.template,list_price",0,List Price,Prix Listé,0
-field,"product.template,list_price_uom",0,List Price,Prix Listé,0
+field,"product.template,cost_price",0,Cost Price,Prix de revient,0
+field,"product.template,cost_price_method",0,Cost Method,Méthode de coût,0
+field,"product.template,cost_price_uom",0,Cost Price,Prix de revient,0
+field,"product.template,default_uom",0,Default UOM,UDM par défaut,0
+field,"product.template,list_price",0,List Price,Prix listé,0
+field,"product.template,list_price_uom",0,List Price,Prix listé,0
field,"product.template,name",0,Name,Nom,0
field,"product.template,products",0,Products,Produits,0
field,"product.template,rec_name",0,Name,Nom,0
@@ -27,13 +27,13 @@ field,"product.uom,active",0,Active,Actif,0
field,"product.uom,category",0,UOM Category,Catégorie d'UDM,0
field,"product.uom.category,name",0,Name,Nom,0
field,"product.uom.category,rec_name",0,Name,Nom,0
-field,"product.uom.category,uoms",0,Unit of Measures,Unité de Mesure,0
+field,"product.uom.category,uoms",0,Unit of Measures,Unité de mesure,0
field,"product.uom,digits",0,Display Digits,Décimales affichées,0
field,"product.uom,factor",0,Factor,Facteur,0
field,"product.uom,name",0,Name,Nom,0
field,"product.uom,rate",0,Rate,Taux,0
field,"product.uom,rec_name",0,Name,Nom,0
-field,"product.uom,rounding",0,Rounding Precision,Précision d'Arrondi,0
+field,"product.uom,rounding",0,Rounding Precision,Précision d'arrondi,0
field,"product.uom,symbol",0,Symbol,Symbole,0
help,"product.uom,factor",0,"The coefficient for the formula:
coef (base unit) = 1 (this unit)","Le coefficient pour la formule:
@@ -52,11 +52,11 @@ model,"ir.action,name",act_uom_form2,Units of Measure,Unités de mesure,0
model,"ir.ui.menu,name",menu_category_tree,Categories,Catégories,0
model,"ir.ui.menu,name",menu_uom_category_form,Categories,Catégories,0
model,"ir.ui.menu,name",menu_category_form,Edit Categories,Éditer les catégories,0
-model,"ir.ui.menu,name",menu_product_product_new,New Product,Nouveau Produit,0
-model,"ir.ui.menu,name",menu_uom_form2,New Unit of Measure,Nouvelle Unité de mesure,0
+model,"ir.ui.menu,name",menu_product_product_new,New Product,Nouveau produit,0
+model,"ir.ui.menu,name",menu_uom_form2,New Unit of Measure,Nouvelle unité de mesure,0
model,"ir.ui.menu,name",menu_main_product,Product,Produit,0
model,"ir.ui.menu,name",menu_product_product,Products,Produits,0
-model,"ir.ui.menu,name",menu_uom_form,Units of Measure,Unités de Mesure,0
+model,"ir.ui.menu,name",menu_uom_form,Units of Measure,Unités de mesure,0
model,"product.category,name",0,Product Category,Catégorie de produit,0
model,"product.product,name",0,Product,Produit,0
model,"product.template,name",0,Product Template,Modèle produit,0
@@ -69,7 +69,7 @@ model,"product.uom.category,name",uom_cat_volume,Volume,Volume,0
model,"product.uom.category,name",uom_cat_weight,Weight,Poids,0
model,"product.uom,name",uom_are,Are,Are,0
model,"product.uom,name",uom_carat,Carat,Carat,0
-model,"product.uom,name",uom_centimeter,centimeter,centimètre,0
+model,"product.uom,name",uom_centimeter,centimeter,Centimètre,0
model,"product.uom,name",uom_cubic_centimeter,Cubic centimeter,Centimètre cube,0
model,"product.uom,name",uom_cubic_foot,Cubic foot,Pied cubique,0
model,"product.uom,name",uom_cubic_inch,Cubic inch,Pouce cubique,0
diff --git a/setup.py b/setup.py
index f2c570c..9b13f57 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',
version=info.get('version', '0.0.1'),
diff --git a/tests/__init__.py b/tests/__init__.py
new file mode 100644
index 0000000..b2bd1d5
--- /dev/null
+++ b/tests/__init__.py
@@ -0,0 +1,4 @@
+#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 test_product import *
diff --git a/tests/test_product.py b/tests/test_product.py
new file mode 100644
index 0000000..4f2bfe9
--- /dev/null
+++ b/tests/test_product.py
@@ -0,0 +1,38 @@
+#!/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.
+
+import sys, os
+DIR = os.path.abspath(os.path.normpath(os.path.join(__file__,
+ '..', '..', '..', '..', '..', 'trytond')))
+if os.path.isdir(DIR):
+ sys.path.insert(0, os.path.dirname(DIR))
+
+import unittest
+import trytond.tests.test_tryton
+from trytond.tests.test_tryton import RPCProxy, CONTEXT, SOCK, test_view
+
+
+class ProductTestCase(unittest.TestCase):
+ '''
+ Test Product module.
+ '''
+
+ def setUp(self):
+ trytond.tests.test_tryton.install_module('product')
+
+ def test0005views(self):
+ '''
+ Test views.
+ '''
+ self.assertRaises(Exception, test_view('product'))
+
+def suite():
+ return unittest.TestLoader().loadTestsFromTestCase(ProductTestCase)
+
+if __name__ == '__main__':
+ suiteTrytond = trytond.tests.test_tryton.suite()
+ suiteProduct = suite()
+ alltests = unittest.TestSuite([suiteTrytond, suiteProduct])
+ unittest.TextTestRunner(verbosity=2).run(alltests)
+ SOCK.disconnect()
diff --git a/trytond_product.egg-info/PKG-INFO b/trytond_product.egg-info/PKG-INFO
index 3cdf538..7f83838 100644
--- a/trytond_product.egg-info/PKG-INFO
+++ b/trytond_product.egg-info/PKG-INFO
@@ -1,12 +1,12 @@
Metadata-Version: 1.0
Name: trytond-product
-Version: 1.2.1
+Version: 1.4.0
Summary: Define products, categories of product, units of measure, categories of units of measure.
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.egg-info/SOURCES.txt b/trytond_product.egg-info/SOURCES.txt
index 669003a..cc15b93 100644
--- a/trytond_product.egg-info/SOURCES.txt
+++ b/trytond_product.egg-info/SOURCES.txt
@@ -17,6 +17,9 @@ uom.xml
./category.py
./product.py
./uom.py
+doc/index.rst
+tests/__init__.py
+tests/test_product.py
trytond_product.egg-info/PKG-INFO
trytond_product.egg-info/SOURCES.txt
trytond_product.egg-info/dependency_links.txt
diff --git a/trytond_product.egg-info/requires.txt b/trytond_product.egg-info/requires.txt
index 77083b3..3ff8683 100644
--- a/trytond_product.egg-info/requires.txt
+++ b/trytond_product.egg-info/requires.txt
@@ -1,2 +1,2 @@
-trytond >= 1.2
-trytond < 1.3
\ No newline at end of file
+trytond >= 1.4
+trytond < 1.5
\ No newline at end of file
diff --git a/uom.py b/uom.py
index 2442929..ef9b58f 100644
--- a/uom.py
+++ b/uom.py
@@ -111,6 +111,18 @@ class Uom(ModelSQL, ModelView):
return {'factor': 0.0}
return {'factor': round(1.0/value['rate'], 6)}
+ def search_rec_name(self, cursor, user, name, args, context=None):
+ args2 = []
+ i = 0
+ while i < len(args):
+ ids = self.search(cursor, user, ['OR',
+ (self._rec_name, args[i][1], args[i][2]),
+ ('symbol', args[i][1], args[i][2]),
+ ], context=context)
+ args2.append(('id', 'in', ids))
+ i += 1
+ return args2
+
@staticmethod
def round(number, precision=1.0):
return round(number / precision) * precision
diff --git a/uom.xml b/uom.xml
index 3981007..e824d3e 100644
--- a/uom.xml
+++ b/uom.xml
@@ -1,5 +1,6 @@
<?xml version="1.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. -->
+<!-- This file is part of Tryton. The COPYRIGHT file at the top level of
+this repository contains the full copyright notices and license terms. -->
<tryton>
<data>
<record model="ir.ui.view" id="uom_view_tree">
commit fc0264c516bd31ce48320b888ffd911364eb47ae
Author: Daniel Baumann <daniel at debian.org>
Date: Sat Sep 5 09:42:06 2009 +0200
Releasing debian version 1.2.1-4.
diff --git a/debian/changelog b/debian/changelog
index bc07c16..2851bae 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+tryton-modules-product (1.2.1-4) unstable; urgency=low
+
+ * Updating to standards version 3.8.3.
+ * Adding maintainer homepage field to control.
+ * Adding README.source.
+ * Moving maintainer homepage field to copyright.
+ * Updating README.source.
+ * Using ascii only characters in copyright.
+
+ -- Daniel Baumann <daniel at debian.org> Sat, 05 Sep 2009 09:41:50 +0200
+
tryton-modules-product (1.2.1-3) unstable; urgency=low
* Updating maintainer field.
commit 6e305d45e178607d9124673695ad62b6c15002d6
Author: Daniel Baumann <daniel at debian.org>
Date: Sat Sep 5 09:34:33 2009 +0200
Using ascii only characters in copyright.
diff --git a/debian/copyright b/debian/copyright
index 9e6e660..33c66f1 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -6,7 +6,7 @@ Maintainer-Homepage: http://tryton.debian-maintainers.org/
Files: *
Copyright:
(C) 2004-2008 Tiny SPRL
- (C) 2008 Cédric Krier
+ (C) 2008 Cedric Krier
(C) 2008 Bertrand Chenal
(C) 2008 B2CK SPRL
License: GPL-3+
commit 5b3f8d220734fb7671e426bdd6f408033344f59d
Author: Daniel Baumann <daniel at debian.org>
Date: Sat Sep 5 09:31:18 2009 +0200
Updating README.source.
diff --git a/debian/README.source b/debian/README.source
index 259f923..dcc7ba3 100644
--- a/debian/README.source
+++ b/debian/README.source
@@ -4,7 +4,7 @@ Package Repositories
Backports for the current stable debian distribution as well as snapshots of
unreleased versions may be available in repositories listed on the maintainers
homepage. The current URL of the maintainer homepage can be seen in
-debian/control.
+debian/copyright.
Source Access
commit 0545383881a941cd3d7e87a832018e20b75aa52e
Author: Daniel Baumann <daniel at debian.org>
Date: Sat Sep 5 09:28:05 2009 +0200
Moving maintainer homepage field to copyright.
diff --git a/debian/control b/debian/control
index 2fec188..ada7f1e 100644
--- a/debian/control
+++ b/debian/control
@@ -11,7 +11,6 @@ Standards-Version: 3.8.3
Homepage: http://www.tryton.org/
Vcs-Browser: http://git.debian-maintainers.org/?p=tryton/tryton-modules-product.git
Vcs-Git: git://git.debian-maintainers.org/git/tryton/tryton-modules-product.git
-XSBC-Maintainer-Homepage: http://tryton.debian-maintainers.org/
Package: tryton-modules-product
Architecture: all
diff --git a/debian/copyright b/debian/copyright
index 799d455..9e6e660 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,5 +1,7 @@
-Author: Tryton Project <http://www.tryton.org/>
-Download: http://www.tryton.org/downloads.html
+Upstream-Contact: Tryton project <tryton at googlegroups.com>
+Upstream-Homepage: http://downloads.tryton.org/
+Maintainer-Contact: Debian Tryton Maintainers <tryton at lists.debian-maintainers.org>
+Maintainer-Homepage: http://tryton.debian-maintainers.org/
Files: *
Copyright:
commit faea43752ab0dc115328efb99726c0c1cfea83bd
Author: Daniel Baumann <daniel at debian.org>
Date: Tue Aug 25 08:18:30 2009 +0200
Adding README.source.
diff --git a/debian/README.source b/debian/README.source
new file mode 100644
index 0000000..259f923
--- /dev/null
+++ b/debian/README.source
@@ -0,0 +1,37 @@
+Package Repositories
+--------------------
+
+Backports for the current stable debian distribution as well as snapshots of
+unreleased versions may be available in repositories listed on the maintainers
+homepage. The current URL of the maintainer homepage can be seen in
+debian/control.
+
+
+Source Access
+-------------
+
+You can obtain the sources of this package with:
+
+ $ apt-get source ${PACKAGE}
+
+whereas '${PACKAGE}' has to be replaced with the actual name of the package.
+
+This package is maintained with the Git version control system. The current git
+source tree can be obtained with:
+
+ $ git clone ${GIT_URI}
+
+whereas '${GIT_URI}' has to be replaced with the actual URI for the Git
+repository. The current Git URI can be seen in debian/control in the extracted
+package sources.
+
+More information about Git can be found in the git-core package.
+
+This package may use the Quilt patch system to manage all modifications to the
+upstream source. Changes, if any, are stored in the source package as diffs in
+debian/diff and are applied during the build. Current modifications can be
+applied to the source tree with:
+
+ $ quilt push -a
+
+More information about Quilt can be found in the quilt package.
commit ef6b778e1b7f805131bb731a76ba846817d8812c
Author: Daniel Baumann <daniel at debian.org>
Date: Mon Aug 24 17:50:02 2009 +0200
Adding maintainer homepage field to control.
diff --git a/debian/control b/debian/control
index ada7f1e..2fec188 100644
--- a/debian/control
+++ b/debian/control
@@ -11,6 +11,7 @@ Standards-Version: 3.8.3
Homepage: http://www.tryton.org/
Vcs-Browser: http://git.debian-maintainers.org/?p=tryton/tryton-modules-product.git
Vcs-Git: git://git.debian-maintainers.org/git/tryton/tryton-modules-product.git
+XSBC-Maintainer-Homepage: http://tryton.debian-maintainers.org/
Package: tryton-modules-product
Architecture: all
commit fc8f27dfbe613fa3366062b8e1a60533a0f33879
Author: Daniel Baumann <daniel at debian.org>
Date: Sun Aug 16 10:13:22 2009 +0200
Updating to standards version 3.8.3.
diff --git a/debian/control b/debian/control
index a984425..ada7f1e 100644
--- a/debian/control
+++ b/debian/control
@@ -7,7 +7,7 @@ Uploaders:
Mathias Behrle <mathiasb at mbsolutions.selfip.biz>
Build-Depends:
debhelper (>= 7), python, python-all-dev, python-setuptools, python-support
-Standards-Version: 3.8.2
+Standards-Version: 3.8.3
Homepage: http://www.tryton.org/
Vcs-Browser: http://git.debian-maintainers.org/?p=tryton/tryton-modules-product.git
Vcs-Git: git://git.debian-maintainers.org/git/tryton/tryton-modules-product.git
commit 5ce2dd65a652460484c17e579756e6b2c10f2895
Author: Daniel Baumann <daniel at debian.org>
Date: Mon Aug 10 20:17:51 2009 +0200
Releasing debian version 1.2.1-3.
diff --git a/debian/changelog b/debian/changelog
index d0ae05a..bc07c16 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+tryton-modules-product (1.2.1-3) unstable; urgency=low
+
+ * Updating maintainer field.
+ * Updating vcs fields.
+ * Wrapping lines in control.
+
+ -- Daniel Baumann <daniel at debian.org> Mon, 10 Aug 2009 20:17:49 +0200
+
tryton-modules-product (1.2.1-2) unstable; urgency=low
* Minimizing rules file.
commit 89338491e48b5a0180660c442b4782f8763282b7
Author: Daniel Baumann <daniel at debian.org>
Date: Mon Aug 10 20:17:47 2009 +0200
Wrapping lines in control.
diff --git a/debian/control b/debian/control
index e0bf3c0..a984425 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,9 @@ Source: tryton-modules-product
Section: python
Priority: optional
Maintainer: Debian Tryton Maintainers <tryton at lists.debian-maintainers.org>
-Uploaders: Daniel Baumann <daniel at debian.org>, Mathias Behrle <mathiasb at mbsolutions.selfip.biz>
+Uploaders:
+ Daniel Baumann <daniel at debian.org>,
+ Mathias Behrle <mathiasb at mbsolutions.selfip.biz>
Build-Depends:
debhelper (>= 7), python, python-all-dev, python-setuptools, python-support
Standards-Version: 3.8.2
commit bcae8ddee505b8b676e41c0554e90e7c2fd18e14
Author: Daniel Baumann <daniel at debian.org>
Date: Sat Aug 8 23:26:50 2009 +0200
Updating vcs fields.
diff --git a/debian/control b/debian/control
index 78edbb3..e0bf3c0 100644
--- a/debian/control
+++ b/debian/control
@@ -7,8 +7,8 @@ Build-Depends:
debhelper (>= 7), python, python-all-dev, python-setuptools, python-support
Standards-Version: 3.8.2
Homepage: http://www.tryton.org/
-Vcs-Browser: http://git.debian.net/?p=debian/tryton-modules-product.git
-Vcs-Git: git://git.debian.net/git/debian/tryton-modules-product.git
+Vcs-Browser: http://git.debian-maintainers.org/?p=tryton/tryton-modules-product.git
+Vcs-Git: git://git.debian-maintainers.org/git/tryton/tryton-modules-product.git
Package: tryton-modules-product
Architecture: all
commit 62a289110981d2bdb3967a35ec0db39530357ebd
Author: Daniel Baumann <daniel at debian.org>
Date: Sat Aug 8 23:19:30 2009 +0200
Updating maintainer field.
diff --git a/debian/control b/debian/control
index 49ada9f..78edbb3 100644
--- a/debian/control
+++ b/debian/control
@@ -1,8 +1,8 @@
Source: tryton-modules-product
Section: python
Priority: optional
-Maintainer: Daniel Baumann <daniel at debian.org>
-Uploaders: Mathias Behrle <mathiasb at mbsolutions.selfip.biz>
+Maintainer: Debian Tryton Maintainers <tryton at lists.debian-maintainers.org>
+Uploaders: Daniel Baumann <daniel at debian.org>, Mathias Behrle <mathiasb at mbsolutions.selfip.biz>
Build-Depends:
debhelper (>= 7), python, python-all-dev, python-setuptools, python-support
Standards-Version: 3.8.2
commit 60b36fee295f7b22fcc29a8a23fcfbd65e71d8ca
Author: Daniel Baumann <daniel at debian.org>
Date: Sun Jul 26 20:42:51 2009 +0200
Releasing debian version 1.2.1-2.
diff --git a/debian/changelog b/debian/changelog
index fa9bae8..d0ae05a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+tryton-modules-product (1.2.1-2) unstable; urgency=low
+
+ * Minimizing rules file.
+
+ -- Daniel Baumann <daniel at debian.org> Sun, 26 Jul 2009 20:42:49 +0200
+
tryton-modules-product (1.2.1-1) unstable; urgency=low
* Updating package to standards version 3.8.2.
commit fc0dae87df5230b19d3d8e6bdf47e76664c84801
Author: Daniel Baumann <daniel at debian.org>
Date: Sun Jul 26 20:42:43 2009 +0200
Minimizing rules file.
diff --git a/debian/rules b/debian/rules
index bb4c5ce..000210b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,41 +1,4 @@
#!/usr/bin/make -f
-clean:
- dh_testdir
- dh_testroot
- rm -f build-stamp
-
- python setup.py clean
- rm -rf dist build trytond_product.egg-info
-
- dh_clean
-
-build:
-
-install:
- dh_testdir
- dh_testroot
- dh_prep
-
- python setup.py install --single-version-externally-managed --root=$(CURDIR)/debian/tryton-modules-product --install-lib /usr/share/python-support/tryton-modules-product
-
- find debian/tryton-modules-product -type f -name "*.pyc" | xargs rm -f
-
-binary: binary-indep
-
-binary-arch:
-
-binary-indep: install
- dh_testdir
- dh_testroot
- dh_installchangelogs CHANGELOG
- dh_installdocs
- dh_pysupport
- dh_compress
- dh_fixperms
- dh_installdeb
- dh_gencontrol
- dh_md5sums
- dh_builddeb
-
-.PHONY: clean build install binary binary-arch binary-indep
+%:
+ dh ${@}
commit cb8d943389b6f211b34ab30e63a3eb2dde5dfce2
Author: Daniel Baumann <daniel at debian.org>
Date: Fri Jul 10 14:16:42 2009 +0200
Releasing debian version 1.2.1-1.
diff --git a/debian/changelog b/debian/changelog
index 121e9c1..fa9bae8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+tryton-modules-product (1.2.1-1) unstable; urgency=low
+
+ * Updating package to standards version 3.8.2.
+ * Merging upstream version 1.2.1.
+
+ -- Daniel Baumann <daniel at debian.org> Fri, 10 Jul 2009 14:16:37 +0200
+
tryton-modules-product (1.2.0-1) unstable; urgency=low
[ Daniel Baumann ]
commit 0344a3835e071d0714b8cf1cdeb4759d05cf5ed5
Author: Daniel Baumann <daniel at debian.org>
Date: Fri Jul 10 14:16:24 2009 +0200
Merging upstream version 1.2.1.
diff --git a/CHANGELOG b/CHANGELOG
index d28f483..796e645 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 1.2.1 - 2009-07-07
+* Some bug fixes (see mercurial logs for details)
+
Version 1.2.0 - 2009-04-20
* Bug fixes (see mercurial logs for details)
* Allow egg installation
diff --git a/PKG-INFO b/PKG-INFO
index af03f07..011612c 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.0
Name: trytond_product
-Version: 1.2.0
+Version: 1.2.1
Summary: Define products, categories of product, units of measure, categories of units of measure.
Home-page: http://www.tryton.org/
Author: B2CK
diff --git a/__tryton__.py b/__tryton__.py
index 1aa7cc5..d70ee11 100644
--- a/__tryton__.py
+++ b/__tryton__.py
@@ -6,7 +6,7 @@
'name_es_CO': 'Productos',
'name_es_ES': 'Productos',
'name_fr_FR': 'Produit',
- 'version' : '1.2.0',
+ 'version' : '1.2.1',
'author' : 'B2CK',
'email': 'info at b2ck.com',
'website': 'http://www.tryton.org/',
diff --git a/product.py b/product.py
index 33c61a9..c5db4f7 100644
--- a/product.py
+++ b/product.py
@@ -39,13 +39,6 @@ class Template(ModelSQL, ModelView):
products = fields.One2Many('product.product', 'template', 'Products',
states=STATES)
- def __init__(self):
- super(Template, self).__init__()
- self._error_messages.update({
- 'change_default_uom': 'You cannot change the default uom for a '\
- 'product which is associated to stock moves.',
- })
-
def default_active(self, cursor, user, context=None):
return True
@@ -73,15 +66,6 @@ class Template(ModelSQL, ModelView):
res[product.id] = product[field]
return res
- def write(self, cursor, user, ids, vals, context=None):
- if vals.get("default_uom"):
- templates = self.browse(cursor, user, ids, context=context)
- for template in templates:
- if template.default_uom.id != vals.get("default_uom"):
- self.raise_user_error(cursor, 'change_default_uom')
-
- super(Template, self).write(cursor, user, ids, vals, context=context)
-
def copy(self, cursor, user, ids, default=None, context=None):
if default is None:
default = {}
diff --git a/trytond_product.egg-info/PKG-INFO b/trytond_product.egg-info/PKG-INFO
index a50aea3..3cdf538 100644
--- a/trytond_product.egg-info/PKG-INFO
+++ b/trytond_product.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.0
Name: trytond-product
-Version: 1.2.0
+Version: 1.2.1
Summary: Define products, categories of product, units of measure, categories of units of measure.
Home-page: http://www.tryton.org/
Author: B2CK
commit 48d1a52524c3f2765945c7febe22b2de9cd9280a
Author: Daniel Baumann <daniel at debian.org>
Date: Fri Jul 10 14:09:16 2009 +0200
Updating package to standards version 3.8.2.
diff --git a/debian/control b/debian/control
index a0a6f1f..49ada9f 100644
--- a/debian/control
+++ b/debian/control
@@ -5,7 +5,7 @@ Maintainer: Daniel Baumann <daniel at debian.org>
Uploaders: Mathias Behrle <mathiasb at mbsolutions.selfip.biz>
Build-Depends:
debhelper (>= 7), python, python-all-dev, python-setuptools, python-support
-Standards-Version: 3.8.1
+Standards-Version: 3.8.2
Homepage: http://www.tryton.org/
Vcs-Browser: http://git.debian.net/?p=debian/tryton-modules-product.git
Vcs-Git: git://git.debian.net/git/debian/tryton-modules-product.git
commit a80e628d9ac64cb6c0021a3ad83f3f5a422f661f
Author: Daniel Baumann <daniel at debian.org>
Date: Tue Apr 21 20:51:28 2009 +0200
Releasing debian version 1.2.0-1.
diff --git a/debian/changelog b/debian/changelog
index 843ab59..121e9c1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,18 @@
+tryton-modules-product (1.2.0-1) unstable; urgency=low
+
+ [ Daniel Baumann ]
+ * Merging upstream version 1.2.0.
+ * Tidy rules file.
+ * Updating copyright file for new upstream release.
+
+ [ Mathias Behrle ]
+ * Updating application and package description.
+
+ [ Daniel Baumann ]
+ * Correcting wrapping of control file.
+
+ -- Daniel Baumann <daniel at debian.org> Tue, 21 Apr 2009 20:51:00 +0200
+
tryton-modules-product (1.0.2-2) unstable; urgency=low
* Adding Mathias to uploaders.
commit 28e2cf95bddc5987148663bfde69706e904c1ae9
Author: Daniel Baumann <daniel at debian.org>
Date: Tue Apr 21 20:51:14 2009 +0200
Correcting wrapping of control file.
diff --git a/debian/control b/debian/control
index 0c8d7c0..a0a6f1f 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,8 @@ Section: python
Priority: optional
Maintainer: Daniel Baumann <daniel at debian.org>
Uploaders: Mathias Behrle <mathiasb at mbsolutions.selfip.biz>
-Build-Depends: debhelper (>= 7), python, python-all-dev, python-setuptools, python-support
+Build-Depends:
+ debhelper (>= 7), python, python-all-dev, python-setuptools, python-support
Standards-Version: 3.8.1
Homepage: http://www.tryton.org/
Vcs-Browser: http://git.debian.net/?p=debian/tryton-modules-product.git
@@ -15,7 +16,8 @@ Depends: ${misc:Depends}, ${python:Depends}, tryton-server, python-pkg-resources
XB-Python-Version: ${python:Versions}
Description: Tryton Application Platform (Product Module)
Tryton is a high-level general purpose application platform written in Python
- and using PostgreSQL as database engine. It is the core base of a complete business solution.
+ and using PostgreSQL as database engine. It is the core base of a complete
+ business solution.
.
This module adds the possibility to define products, categories of product,
units of measure and categories of units of measure.
commit abc2985566bac2d643a6ae77f928ead84ca36d9c
Author: Mathias Behrle <mathiasb at mbsolutions.selfip.biz>
Date: Tue Apr 21 17:34:36 2009 +0200
Updating application and package description.
diff --git a/debian/control b/debian/control
index 4d06848..0c8d7c0 100644
--- a/debian/control
+++ b/debian/control
@@ -15,7 +15,7 @@ Depends: ${misc:Depends}, ${python:Depends}, tryton-server, python-pkg-resources
XB-Python-Version: ${python:Versions}
Description: Tryton Application Platform (Product Module)
Tryton is a high-level general purpose application platform written in Python
- and using PostgreSQL as database engine. It is the core base of an ERP.
+ and using PostgreSQL as database engine. It is the core base of a complete business solution.
.
- This module defines products, categories of product, units of measure,
- categories of units of measure.
+ This module adds the possibility to define products, categories of product,
+ units of measure and categories of units of measure.
commit 3c11898ba90edba9e58f49e3c98bc62d5a959dfa
Author: Daniel Baumann <daniel at debian.org>
Date: Tue Apr 21 11:45:45 2009 +0200
Updating copyright file for new upstream release.
diff --git a/debian/copyright b/debian/copyright
index 0088eff..799d455 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -4,7 +4,7 @@ Download: http://www.tryton.org/downloads.html
Files: *
Copyright:
(C) 2004-2008 Tiny SPRL
- (C) 2008 Cedric Krier
+ (C) 2008 Cédric Krier
(C) 2008 Bertrand Chenal
(C) 2008 B2CK SPRL
License: GPL-3+
commit 92c67e1b980d95b28003379ab52f93fcf72c9476
Author: Daniel Baumann <daniel at debian.org>
Date: Tue Apr 21 11:35:52 2009 +0200
Tidy rules file.
diff --git a/debian/rules b/debian/rules
index bb21e73..bb4c5ce 100755
--- a/debian/rules
+++ b/debian/rules
@@ -16,7 +16,6 @@ install:
dh_testdir
dh_testroot
dh_prep
- dh_installdirs
python setup.py install --single-version-externally-managed --root=$(CURDIR)/debian/tryton-modules-product --install-lib /usr/share/python-support/tryton-modules-product
commit e44a16d00c039a8f081f973c21ab69a6c6d3d96b
Author: Daniel Baumann <daniel at debian.org>
Date: Tue Apr 21 10:44:39 2009 +0200
Merging upstream version 1.2.0.
diff --git a/CHANGELOG b/CHANGELOG
index 2521948..d28f483 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,7 +1,5 @@
-Version 1.0.2 - 2009-03-02
-* Some bug fixes (see mercurial logs for details)
-
-Version 1.0.1 - 2008-12-01
+Version 1.2.0 - 2009-04-20
+* Bug fixes (see mercurial logs for details)
* Allow egg installation
Version 1.0.0 - 2008-11-17
diff --git a/INSTALL b/INSTALL
index f2f99af..3e97432 100644
--- a/INSTALL
+++ b/INSTALL
@@ -5,12 +5,12 @@ Prerequisites
-------------
* Python 2.4 or later (http://www.python.org/)
- * trytond 0.0.x (http://www.tryton.org/)
+ * trytond 1.1.x (http://www.tryton.org/)
Installation
------------
-Once you've downloaded and unpacked a trytond_product source release, enter the
+Once you've downloaded and unpacked the trytond_product source release, enter the
directory where the archive was unpacked, and run:
python setup.py install
diff --git a/PKG-INFO b/PKG-INFO
index 37cc937..af03f07 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,12 +1,12 @@
Metadata-Version: 1.0
Name: trytond_product
-Version: 1.0.2
+Version: 1.2.0
Summary: Define products, categories of product, units of measure, categories of units of measure.
Home-page: http://www.tryton.org/
Author: B2CK
Author-email: info at b2ck.com
License: GPL-3
-Download-URL: http://downloads.tryton.org/1.0/
+Download-URL: http://downloads.tryton.org/1.2/
Description: UNKNOWN
Platform: UNKNOWN
Classifier: Development Status :: 5 - Production/Stable
diff --git a/__tryton__.py b/__tryton__.py
index 0a342b7..1aa7cc5 100644
--- a/__tryton__.py
+++ b/__tryton__.py
@@ -3,17 +3,18 @@
{
'name' : 'Product',
'name_de_DE': 'Artikel',
- 'name_fr_FR': 'Produit',
+ 'name_es_CO': 'Productos',
'name_es_ES': 'Productos',
- 'version' : '1.0.2',
+ 'name_fr_FR': 'Produit',
+ 'version' : '1.2.0',
'author' : 'B2CK',
'email': 'info at b2ck.com',
'website': 'http://www.tryton.org/',
'description': 'Define products, categories of product, units ' \
'of measure, categories of units of measure.',
'description_de_DE': 'Dient der Erstellung von Artikeln, Artikelkategorien, Maßeinheiten und Kategorien für Maßeinheiten.',
- 'description_es_ES': 'Definición de productos, categorÃas de producto '
- 'unidades de medida y categorÃas de unidades de medida',
+ 'description_es_CO': 'Definición de productos, categorÃas de producto unidades de medida y categorÃas de unidades de medida',
+ 'description_es_ES': 'Definición de productos, categorÃas de producto unidades de medida y categorÃas de unidades de medida',
'depends' : [
'ir',
'res',
@@ -24,9 +25,10 @@
'uom.xml',
],
'translation': [
- 'fr_FR.csv',
'de_DE.csv',
+ 'es_CO.csv',
'es_ES.csv',
+ 'fr_FR.csv',
]
}
diff --git a/category.py b/category.py
index 9960e76..20197a5 100644
--- a/category.py
+++ b/category.py
@@ -1,40 +1,33 @@
-#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.osv import fields, OSV
+#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
-class Category(OSV):
+class Category(ModelSQL, ModelView):
"Product Category"
_name = "product.category"
_description = __doc__
name = fields.Char('Name', required=True, translate=True)
- complete_name = fields.Function('get_complete_name', type="char",
- string='Complete Name')
parent = fields.Many2One('product.category','Parent', select=1)
childs = fields.One2Many('product.category', 'parent',
- string='Childs')
+ string='Children')
def __init__(self):
super(Category, self).__init__()
self._order.insert(0, ('name', 'ASC'))
- def get_complete_name(self, cursor, user, ids, name, arg, context=None):
- res = self.name_get(cursor, user, ids, context=context)
- return dict(res)
-
- def name_get(self, cursor, user, ids, context=None):
+ def get_rec_name(self, cursor, user, ids, name, arg, context=None):
if not ids:
- return []
- if isinstance(ids, (int, long)):
- ids = [ids]
+ return {}
+ res = {}
categories = self.browse(cursor, user, ids, context=context)
- res = []
for category in categories:
if category.parent:
name = category.parent.name+' / '+ category.name
else:
name = category.name
- res.append((category.id, name))
+ res[category.id] = name
return res
Category()
diff --git a/category.xml b/category.xml
index 70b4b6c..d3fffb2 100644
--- a/category.xml
+++ b/category.xml
@@ -1,5 +1,6 @@
<?xml version="1.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. -->
+<!-- This file is part of Tryton. The COPYRIGHT file at the top level of
+this repository contains the full copyright notices and license terms. -->
<tryton>
<data>
<record model="ir.ui.view" id="category_view_tree">
@@ -10,7 +11,7 @@
<![CDATA[
<tree string="Product Categories">
<field name="name" select="1"/>
- <field name="complete_name"/>
+ <field name="rec_name"/>
</tree>
]]>
</field>
@@ -38,10 +39,10 @@
<field name="name"/>
<label name="parent"/>
<field name="parent"/>
- <label name="complete_name"/>
- <field name="complete_name" colspan="3"/>
+ <label name="rec_name"/>
+ <field name="rec_name" colspan="3"/>
<notebook colspan="4">
- <page string="Childs" col="1">
+ <page string="Children" col="1" id="childs">
<field name="childs"/>
</page>
</notebook>
diff --git a/de_DE.csv b/de_DE.csv
index d9ca437..ce10599 100644
--- a/de_DE.csv
+++ b/de_DE.csv
@@ -1,12 +1,16 @@
type,name,res_id,src,value,fuzzy
+error,product.template,0,You cannot change the default uom for a product which is associated to stock moves.,"Die Standardmaßeinheit kann nicht für einen Artikel geändert werden, der Lagerbewegungen zugeordnet ist.",0
+error,product.uom,0,"If the UOM is still not used, you can delete it ortherwise you can deactivate it and create a new one.","Wenn die Maßeinheit noch nicht verwendet wurde, kann sie gelöscht werden.
+Andernfalls kann sie nur deaktiviert und eine andere neue erstellt werden.",0
error,product.uom,0,Rate and factor can not be both equal to zero.,Faktor und Kehrwert Faktor können beide nicht 0 sein,0
-field,"product.category,childs",0,Childs,Untergeordnet (Kategorien),0
-field,"product.category,complete_name",0,Complete Name,Vollständige Bezeichnung,0
+error,product.uom,0,"You cannot change Rate, Factor or Category on a Unit of Measure. ","Faktor, Faktorkehrwert oder Kategorie einer Maßeinheit können nicht geändert werden.",0
+field,"product.category,childs",0,Children,Untergeordnet (Kategorien),0
field,"product.category,create_date",0,Creation date,Erstellungsdatum,0
field,"product.category,create_uid",0,Creation user,Ersteller,0
field,"product.category,id",0,ID,ID,0
field,"product.category,name",0,Name,Name,0
field,"product.category,parent",0,Parent,Ãœbergeordnet (Kategorie),0
+field,"product.category,rec_name",0,Name,Name,0
field,"product.category,write_date",0,Last modification date,Zuletzt geändert am,0
field,"product.category,write_uid",0,Last modification by,Zuletzt geändert von,0
field,"product.product,code",0,Code,Artikelnummer,0
@@ -14,6 +18,7 @@ field,"product.product,create_date",0,Creation date,Erstellungsdatum,0
field,"product.product,create_uid",0,Creation user,Ersteller,0
field,"product.product,description",0,Description,Beschreibung,0
field,"product.product,id",0,ID,ID,0
+field,"product.product,rec_name",0,Name,Name,0
field,"product.product,template",0,Product Template,Artikelvorlage,0
field,"product.product,write_date",0,Last modification date,Zuletzt geändert am,0
field,"product.product,write_uid",0,Last modification by,Zuletzt geändert von,0
@@ -30,6 +35,7 @@ field,"product.template,list_price",0,List Price,Listenpreis,0
field,"product.template,list_price_uom",0,List Price,Listenpreis,0
field,"product.template,name",0,Name,Name,0
field,"product.template,products",0,Products,Artikel,0
+field,"product.template,rec_name",0,Name,Name,0
field,"product.template,type",0,Type,Typ,0
field,"product.template,write_date",0,Last modification date,Zuletzt geändert am,0
field,"product.template,write_uid",0,Last modification by,Zuletzt geändert von,0
@@ -39,6 +45,7 @@ field,"product.uom.category,create_date",0,Creation date,Erstellungsdatum,0
field,"product.uom.category,create_uid",0,Creation user,Ersteller,0
field,"product.uom.category,id",0,ID,ID,0
field,"product.uom.category,name",0,Name,Name,0
+field,"product.uom.category,rec_name",0,Name,Name,0
field,"product.uom.category,uoms",0,Unit of Measures,Maßeinheiten,0
field,"product.uom.category,write_date",0,Last modification date,Zuletzt geändert am,0
field,"product.uom.category,write_uid",0,Last modification by,Zuletzt geändert von,0
@@ -49,6 +56,7 @@ field,"product.uom,factor",0,Factor,Faktor,0
field,"product.uom,id",0,ID,ID,0
field,"product.uom,name",0,Name,Name,0
field,"product.uom,rate",0,Rate,Kehrwert Faktor,0
+field,"product.uom,rec_name",0,Name,Name,0
field,"product.uom,rounding",0,Rounding Precision,Rundungsgenauigkeit,0
field,"product.uom,symbol",0,Symbol,Symbol,0
field,"product.uom,write_date",0,Last modification date,Zuletzt geändert am,0
@@ -63,6 +71,7 @@ Formel: Basiseinheit = Kehrwert * diese Einheit
Das Feld Faktor wird automatisch aus dem hier eingetragenen Wert ermittelt.",0
model,"ir.action,name",act_category_tree,Categories,Artikelkategorien,0
model,"ir.action,name",act_uom_category_form,Categories of Unit of Measure,Kategorien Maßeinheiten,0
+model,"ir.action,name",act_product_by_category,Product by Category,Artikel nach Kategorie,0
model,"ir.action,name",act_category_form,Product Categories,Artikelkategorien,0
model,"ir.action,name",act_product_form,Products,Artikel,0
model,"ir.action,name",act_product_form2,Products,Artikel,0
@@ -76,7 +85,11 @@ model,"ir.ui.menu,name",menu_uom_form2,New Unit of Measure,Neue Maßeinheit,0
model,"ir.ui.menu,name",menu_main_product,Product,Artikel,0
model,"ir.ui.menu,name",menu_product_product,Products,Artikel,0
model,"ir.ui.menu,name",menu_uom_form,Units of Measure,Maßeinheiten,0
+model,"product.category,name",0,Product Category,Artikel Kategorie,0
+model,"product.product,name",0,Product,Artikel,0
+model,"product.template,name",0,Product Template,Artikel Vorlage,0
model,"product.uom.category,name",uom_cat_length,Length,Länge,0
+model,"product.uom.category,name",0,Product uom category,Artikel Maßeinheit Kategorie,0
model,"product.uom.category,name",uom_cat_surface,Surface,Fläche,0
model,"product.uom.category,name",uom_cat_time,Time,Zeit,0
model,"product.uom.category,name",uom_cat_unit,Units,Stückzahl,0
@@ -112,6 +125,7 @@ model,"product.uom,name",uom_square_inch,Square inch,Quadratzoll,0
model,"product.uom,name",uom_square_meter,Square meter,Quadratmeter,0
model,"product.uom,name",uom_square_yard,Square yard,Quadratyard(s),0
model,"product.uom,name",uom_unit,Unit,Stück,0
+model,"product.uom,name",0,Unit of measure,Maßeinheit,0
model,"product.uom,name",uom_work_day,Work Day,Arbeitstag(e),0
model,"product.uom,name",uom_yard,Yard,Yard(s),0
model,"product.uom,symbol",uom_are,a,a,0
@@ -142,7 +156,7 @@ model,"product.uom,symbol",uom_minute,min,min,0
model,"product.uom,symbol",uom_millimeter,mm,mm,0
model,"product.uom,symbol",uom_once,oz,oz,0
model,"product.uom,symbol",uom_second,s,s,0
-model,"product.uom,symbol",uom_unit,u,u,0
+model,"product.uom,symbol",uom_unit,u,St.,0
model,"product.uom,symbol",uom_work_day,wd,wd,0
model,"product.uom,symbol",uom_yard,yd,yd,0
model,"product.uom,symbol",uom_square_yard,yd²,yd²,0
@@ -152,13 +166,18 @@ selection,"product.template,cost_price_method",0,Fixed,Fix,0
selection,"product.template,type",0,Consumable,Verbrauchsmaterial,0
selection,"product.template,type",0,Service,Dienstleistung,0
selection,"product.template,type",0,Stockable,Lagerware,0
-view,product.category,0,Childs,Untergeordnet (Kategorien),0
+view,product.category,0,Children,Untergeordnet (Kategorien),0
view,product.category,0,Product Categories,Artikelkategorien,0
view,product.category,0,Product Category,Artikelkategorie,0
view,product.product,0,General,Allgemein,0
view,product.product,0,Product,Artikel,0
view,product.product,0,Products,Artikel,0
view,product.product,0,Product Suppliers,Lieferanten,0
+view,product.template,0,General,Allgemein,0
+view,product.template,0,Product,Artikel,0
+view,product.template,0,Products,Artikel,0
+view,product.template,0,Product Template,Artikelvorlage,0
+view,product.template,0,Product Templates,Artikelvorlagen,0
view,product.uom,0,Unit of Measure,Maßeinheit,0
view,product.uom,0,Units of Measure,Maßeinheiten,0
view,product.uom.category,0,Categories of Unit of Measure,Kategorien Maßeinheiten,0
diff --git a/es_ES.csv b/es_CO.csv
similarity index 82%
copy from es_ES.csv
copy to es_CO.csv
index abd7b69..caeb301 100644
--- a/es_ES.csv
+++ b/es_CO.csv
@@ -1,11 +1,15 @@
type,name,res_id,src,value,fuzzy
+error,product.template,0,You cannot change the default uom for a product which is associated to stock moves.,No puede cambiar la UdM predeterminada para un producto asociado con movimientos de inventario.,0
+error,product.uom,0,"If the UOM is still not used, you can delete it ortherwise you can deactivate it and create a new one.","Si no se ha usado la UdM, puede eliminar, de otra forma puede desactivarla y crear una nueva.",0
error,product.uom,0,Rate and factor can not be both equal to zero.,Tasa de cambio y factor no pueden ser cero simultáneamente.,0
-field,"product.category,childs",0,Childs,Hij at s,0
-field,"product.category,complete_name",0,Complete Name,Nombre Completo,0
+error,product.uom,0,"You cannot change Rate, Factor or Category on a Unit of Measure. ","No puede cambiar la Rata, el Factor o la CategorÃa de una Unidad de Medida.",0
+field,"product.category,childs",0,Children,Hij at s,0
field,"product.category,name",0,Name,Nombre,0
field,"product.category,parent",0,Parent,Padre,0
+field,"product.category,rec_name",0,Name,Nombre,0
field,"product.product,code",0,Code,Código,0
field,"product.product,description",0,Description,Descripción,0
+field,"product.product,rec_name",0,Name,Nombre,0
field,"product.product,template",0,Product Template,Plantilla de Producto,0
field,"product.template,active",0,Active,Activo,0
field,"product.template,category",0,Category,CategorÃa,0
@@ -17,15 +21,18 @@ field,"product.template,list_price",0,List Price,Precio de Lista,0
field,"product.template,list_price_uom",0,List Price,Precio de Lista,0
field,"product.template,name",0,Name,Nombre,0
field,"product.template,products",0,Products,Productos,0
+field,"product.template,rec_name",0,Name,Nombre,0
field,"product.template,type",0,Type,Tipo,0
field,"product.uom,active",0,Active,Activo,0
field,"product.uom,category",0,UOM Category,CategorÃa UDM,0
field,"product.uom.category,name",0,Name,Nombre,0
+field,"product.uom.category,rec_name",0,Name,Nombre,0
field,"product.uom.category,uoms",0,Unit of Measures,Unidad de Medidas,0
field,"product.uom,digits",0,Display Digits,Mostrar DÃgitos,0
field,"product.uom,factor",0,Factor,Factor,0
field,"product.uom,name",0,Name,Nombre,0
field,"product.uom,rate",0,Rate,Tasa de Cambio,0
+field,"product.uom,rec_name",0,Name,Nombre,0
field,"product.uom,rounding",0,Rounding Precision,Precisión de Redondeo,0
field,"product.uom,symbol",0,Symbol,SÃmbolo,0
help,"product.uom,factor",0,"The coefficient for the formula:
@@ -34,6 +41,7 @@ help,"product.uom,rate",0,"The coefficient for the formula:
1 (base unit) = coef (this unit)",El coeficiente para la fórmula:,0
model,"ir.action,name",act_category_tree,Categories,CategorÃas,0
model,"ir.action,name",act_uom_category_form,Categories of Unit of Measure,CategorÃas de Unidad de Medida,0
+model,"ir.action,name",act_product_by_category,Product by Category,Producto por CategorÃa,0
model,"ir.action,name",act_category_form,Product Categories,CategorÃas de Producto,0
model,"ir.action,name",act_product_form,Products,Productos,0
model,"ir.action,name",act_product_form2,Products,Productos,0
@@ -47,7 +55,11 @@ model,"ir.ui.menu,name",menu_uom_form2,New Unit of Measure,Nueva Unidad de Mesur
model,"ir.ui.menu,name",menu_main_product,Product,Producto,0
model,"ir.ui.menu,name",menu_product_product,Products,Productos,0
model,"ir.ui.menu,name",menu_uom_form,Units of Measure,Unidades de Medida,0
+model,"product.category,name",0,Product Category,CategorÃa de Producto,0
+model,"product.product,name",0,Product,Producto,0
+model,"product.template,name",0,Product Template,Plantilla de Producto,0
model,"product.uom.category,name",uom_cat_length,Length,Longitud,0
+model,"product.uom.category,name",0,Product uom category,CategorÃa de udm de Producto,0
model,"product.uom.category,name",uom_cat_surface,Surface,Superficie,0
model,"product.uom.category,name",uom_cat_time,Time,Tiempo,0
model,"product.uom.category,name",uom_cat_unit,Units,Unidades,0
@@ -83,6 +95,7 @@ model,"product.uom,name",uom_square_inch,Square inch,Pulgada Cuadrada,0
model,"product.uom,name",uom_square_meter,Square meter,Metro Cuadrado,0
model,"product.uom,name",uom_square_yard,Square yard,Yarda Cuadrada,0
model,"product.uom,name",uom_unit,Unit,Unidad,0
+model,"product.uom,name",0,Unit of measure,Unidad de medida,0
model,"product.uom,name",uom_work_day,Work Day,DÃa de Trabajo,0
model,"product.uom,name",uom_yard,Yard,Yarda,0
model,"product.uom,symbol",uom_are,a,a,0
@@ -117,17 +130,22 @@ model,"product.uom,symbol",uom_unit,u,u,0
model,"product.uom,symbol",uom_work_day,wd,wd,0
model,"product.uom,symbol",uom_yard,yd,yd,0
model,"product.uom,symbol",uom_square_yard,yd²,yd²,0
+model,"res.group,name",group_product_admin,Product Administration,Productos,0
selection,"product.template,cost_price_method",0,Average,Promedio,0
selection,"product.template,cost_price_method",0,Fixed,Fijo,0
selection,"product.template,type",0,Consumable,Consumible,0
selection,"product.template,type",0,Service,Servicios,0
selection,"product.template,type",0,Stockable,Almacenable,0
-view,product.category,0,Childs,Hij at s,0
+view,product.category,0,Children,Hij at s,0
view,product.category,0,Product Categories,CategorÃas de Producto,0
view,product.category,0,Product Category,CategorÃa de Producto,0
view,product.product,0,General,General,0
view,product.product,0,Product,Producto,0
+view,product.product,0,Products,Productos,0
view,product.product,0,Product Suppliers,Proveedores de Productos,0
+view,product.template,0,General,General,0
+view,product.template,0,Product Template,Plantilla de Producto,0
+view,product.template,0,Product Templates,Plantillas de Producto,0
view,product.uom,0,Unit of Measure,Unidad de Medida,0
view,product.uom,0,Units of Measure,Unidades de Medida,0
view,product.uom.category,0,Categories of Unit of Measure,CategorÃas de Unidad de Medida,0
diff --git a/es_ES.csv b/es_ES.csv
index abd7b69..cd4f606 100644
--- a/es_ES.csv
+++ b/es_ES.csv
@@ -1,69 +1,83 @@
type,name,res_id,src,value,fuzzy
+error,product.template,0,You cannot change the default uom for a product which is associated to stock moves.,No puede cambiar la UdM predeterminada para un producto asociado con movimientos de inventario.,0
+error,product.uom,0,"If the UOM is still not used, you can delete it ortherwise you can deactivate it and create a new one.","Si no se ha usado la UdM, puede eliminar, de otra forma puede desactivarla y crear una nueva.",0
error,product.uom,0,Rate and factor can not be both equal to zero.,Tasa de cambio y factor no pueden ser cero simultáneamente.,0
-field,"product.category,childs",0,Childs,Hij at s,0
-field,"product.category,complete_name",0,Complete Name,Nombre Completo,0
+error,product.uom,0,"You cannot change Rate, Factor or Category on a Unit of Measure. ","No puede cambiar la tasa de cambio, el factor o la categorÃa de una Unidad de Medida.",0
+field,"product.category,childs",0,Children,Hijos,0
field,"product.category,name",0,Name,Nombre,0
field,"product.category,parent",0,Parent,Padre,0
+field,"product.category,rec_name",0,Name,Nombre,0
field,"product.product,code",0,Code,Código,0
field,"product.product,description",0,Description,Descripción,0
-field,"product.product,template",0,Product Template,Plantilla de Producto,0
+field,"product.product,rec_name",0,Name,Nombre,0
+field,"product.product,template",0,Product Template,Plantilla de producto,0
field,"product.template,active",0,Active,Activo,0
field,"product.template,category",0,Category,CategorÃa,0
-field,"product.template,cost_price",0,Cost Price,Método de Precio,0
-field,"product.template,cost_price_method",0,Cost Method,Método de Coste,0
-field,"product.template,cost_price_uom",0,Cost Price,Método de Precio,0
-field,"product.template,default_uom",0,Default UOM,UdM Predeterminado,0
-field,"product.template,list_price",0,List Price,Precio de Lista,0
-field,"product.template,list_price_uom",0,List Price,Precio de Lista,0
+field,"product.template,cost_price",0,Cost Price,Precio de coste,0
+field,"product.template,cost_price_method",0,Cost Method,Método de coste,0
+field,"product.template,cost_price_uom",0,Cost Price,Precio de coste,0
+field,"product.template,default_uom",0,Default UOM,UdM predeterminado,0
+field,"product.template,list_price",0,List Price,Precio de lista,0
+field,"product.template,list_price_uom",0,List Price,Precio de lista,0
field,"product.template,name",0,Name,Nombre,0
field,"product.template,products",0,Products,Productos,0
+field,"product.template,rec_name",0,Name,Nombre,0
field,"product.template,type",0,Type,Tipo,0
field,"product.uom,active",0,Active,Activo,0
-field,"product.uom,category",0,UOM Category,CategorÃa UDM,0
+field,"product.uom,category",0,UOM Category,CategorÃa UdM,0
field,"product.uom.category,name",0,Name,Nombre,0
-field,"product.uom.category,uoms",0,Unit of Measures,Unidad de Medidas,0
-field,"product.uom,digits",0,Display Digits,Mostrar DÃgitos,0
+field,"product.uom.category,rec_name",0,Name,Nombre,0
+field,"product.uom.category,uoms",0,Unit of Measures,Unidad de medidas,0
+field,"product.uom,digits",0,Display Digits,DÃgitos a mostrar,0
field,"product.uom,factor",0,Factor,Factor,0
field,"product.uom,name",0,Name,Nombre,0
-field,"product.uom,rate",0,Rate,Tasa de Cambio,0
-field,"product.uom,rounding",0,Rounding Precision,Precisión de Redondeo,0
+field,"product.uom,rate",0,Rate,Tasa de cambio,0
+field,"product.uom,rec_name",0,Name,Nombre,0
+field,"product.uom,rounding",0,Rounding Precision,Precisión de redondeo,0
field,"product.uom,symbol",0,Symbol,SÃmbolo,0
help,"product.uom,factor",0,"The coefficient for the formula:
-coef (base unit) = 1 (this unit)",El coeficiente para la fórmula:,0
+coef (base unit) = 1 (this unit)","El coeficiente de la fórmula:
+coeficiente (unidad base) = 1 (esta unidad)",0
help,"product.uom,rate",0,"The coefficient for the formula:
-1 (base unit) = coef (this unit)",El coeficiente para la fórmula:,0
+1 (base unit) = coef (this unit)","El coeficiente de la fórmula:
+1 (unidad base) = coeficiente (esta unidad)",0
model,"ir.action,name",act_category_tree,Categories,CategorÃas,0
-model,"ir.action,name",act_uom_category_form,Categories of Unit of Measure,CategorÃas de Unidad de Medida,0
-model,"ir.action,name",act_category_form,Product Categories,CategorÃas de Producto,0
+model,"ir.action,name",act_uom_category_form,Categories of Unit of Measure,CategorÃas de la unidad de medida,0
+model,"ir.action,name",act_product_by_category,Product by Category,Producto por categorÃa,0
+model,"ir.action,name",act_category_form,Product Categories,CategorÃas de producto,0
model,"ir.action,name",act_product_form,Products,Productos,0
model,"ir.action,name",act_product_form2,Products,Productos,0
-model,"ir.action,name",act_uom_form,Units of Measure,Unidades de Medida,0
-model,"ir.action,name",act_uom_form2,Units of Measure,Unidades de Medida,0
+model,"ir.action,name",act_uom_form,Units of Measure,Unidades de medida,0
+model,"ir.action,name",act_uom_form2,Units of Measure,Unidades de medida,0
model,"ir.ui.menu,name",menu_category_tree,Categories,CategorÃas,0
model,"ir.ui.menu,name",menu_uom_category_form,Categories,CategorÃas,0
-model,"ir.ui.menu,name",menu_category_form,Edit Categories,Editar CategorÃas,0
-model,"ir.ui.menu,name",menu_product_product_new,New Product,Nuevo Producto,0
-model,"ir.ui.menu,name",menu_uom_form2,New Unit of Measure,Nueva Unidad de Mesura,0
+model,"ir.ui.menu,name",menu_category_form,Edit Categories,Editar categorÃas,0
+model,"ir.ui.menu,name",menu_product_product_new,New Product,Nuevo producto,0
+model,"ir.ui.menu,name",menu_uom_form2,New Unit of Measure,Nueva unidad de medida,0
model,"ir.ui.menu,name",menu_main_product,Product,Producto,0
model,"ir.ui.menu,name",menu_product_product,Products,Productos,0
-model,"ir.ui.menu,name",menu_uom_form,Units of Measure,Unidades de Medida,0
+model,"ir.ui.menu,name",menu_uom_form,Units of Measure,Unidades de medida,0
+model,"product.category,name",0,Product Category,CategorÃa de producto,0
+model,"product.product,name",0,Product,Producto,0
+model,"product.template,name",0,Product Template,Plantilla de producto,0
model,"product.uom.category,name",uom_cat_length,Length,Longitud,0
+model,"product.uom.category,name",0,Product uom category,CategorÃa de UdM de producto,0
model,"product.uom.category,name",uom_cat_surface,Surface,Superficie,0
model,"product.uom.category,name",uom_cat_time,Time,Tiempo,0
model,"product.uom.category,name",uom_cat_unit,Units,Unidades,0
model,"product.uom.category,name",uom_cat_volume,Volume,Volumen,0
model,"product.uom.category,name",uom_cat_weight,Weight,Peso,0
-model,"product.uom,name",uom_are,Are,Son,0
-model,"product.uom,name",uom_carat,Carat,Carat,0
+model,"product.uom,name",uom_are,Are,Ãrea,0
+model,"product.uom,name",uom_carat,Carat,Quilate,0
model,"product.uom,name",uom_centimeter,centimeter,centÃmetro,0
-model,"product.uom,name",uom_cubic_centimeter,Cubic centimeter,CentÃmetro Cúbico,0
-model,"product.uom,name",uom_cubic_foot,Cubic foot,Pie Cúbico,0
-model,"product.uom,name",uom_cubic_inch,Cubic inch,Pulgada Cúbica,0
-model,"product.uom,name",uom_cubic_meter,Cubic meter,Metro Cúbico,0
+model,"product.uom,name",uom_cubic_centimeter,Cubic centimeter,CentÃmetro cúbico,0
+model,"product.uom,name",uom_cubic_foot,Cubic foot,Pie cúbico,0
+model,"product.uom,name",uom_cubic_inch,Cubic inch,Pulgada cúbica,0
+model,"product.uom,name",uom_cubic_meter,Cubic meter,Metro cúbico,0
model,"product.uom,name",uom_day,Day,DÃa,0
model,"product.uom,name",uom_foot,Foot,Pie,0
model,"product.uom,name",uom_gallon,Gallon,Galón,0
-model,"product.uom,name",uom_gram,Gram,Gram,0
+model,"product.uom,name",uom_gram,Gram,Gramo,0
model,"product.uom,name",uom_hectare,Hectare,Hectárea,0
model,"product.uom,name",uom_hour,Hour,Hora,0
model,"product.uom,name",uom_inch,Inch,Pulgada,0
@@ -77,13 +91,14 @@ model,"product.uom,name",uom_minute,Minute,Minuto,0
model,"product.uom,name",uom_once,Ounce,Onza,0
model,"product.uom,name",uom_pound,Pound,Libra,0
model,"product.uom,name",uom_second,Second,Segundo,0
-model,"product.uom,name",uom_square_centimeter,Square centimeter,CentÃmetro Cuadrado,0
-model,"product.uom,name",uom_square_foot,Square foot,Pie Cuadrado,0
-model,"product.uom,name",uom_square_inch,Square inch,Pulgada Cuadrada,0
-model,"product.uom,name",uom_square_meter,Square meter,Metro Cuadrado,0
-model,"product.uom,name",uom_square_yard,Square yard,Yarda Cuadrada,0
+model,"product.uom,name",uom_square_centimeter,Square centimeter,CentÃmetro cuadrado,0
+model,"product.uom,name",uom_square_foot,Square foot,Pie cuadrado,0
+model,"product.uom,name",uom_square_inch,Square inch,Pulgada cuadrada,0
+model,"product.uom,name",uom_square_meter,Square meter,Metro cuadrado,0
+model,"product.uom,name",uom_square_yard,Square yard,Yarda cuadrada,0
model,"product.uom,name",uom_unit,Unit,Unidad,0
-model,"product.uom,name",uom_work_day,Work Day,DÃa de Trabajo,0
+model,"product.uom,name",0,Unit of measure,Unidad de medida,0
+model,"product.uom,name",uom_work_day,Work Day,DÃa de trabajo,0
model,"product.uom,name",uom_yard,Yard,Yarda,0
model,"product.uom,symbol",uom_are,a,a,0
model,"product.uom,symbol",uom_carat,c,c,0
@@ -98,7 +113,7 @@ model,"product.uom,symbol",uom_gram,g,g,0
model,"product.uom,symbol",uom_gallon,gal,gal,0
model,"product.uom,symbol",uom_hour,h,h,0
model,"product.uom,symbol",uom_hectare,ha,ha,0
-model,"product.uom,symbol",uom_inch,in,en,0
+model,"product.uom,symbol",uom_inch,in,pul,0
model,"product.uom,symbol",uom_square_inch,in²,pul²,0
model,"product.uom,symbol",uom_cubic_inch,in³,pul³,0
model,"product.uom,symbol",uom_kilogram,kg,kg,0
@@ -117,18 +132,23 @@ model,"product.uom,symbol",uom_unit,u,u,0
model,"product.uom,symbol",uom_work_day,wd,wd,0
model,"product.uom,symbol",uom_yard,yd,yd,0
model,"product.uom,symbol",uom_square_yard,yd²,yd²,0
+model,"res.group,name",group_product_admin,Product Administration,Administración de productos,0
selection,"product.template,cost_price_method",0,Average,Promedio,0
selection,"product.template,cost_price_method",0,Fixed,Fijo,0
selection,"product.template,type",0,Consumable,Consumible,0
selection,"product.template,type",0,Service,Servicios,0
selection,"product.template,type",0,Stockable,Almacenable,0
-view,product.category,0,Childs,Hij at s,0
-view,product.category,0,Product Categories,CategorÃas de Producto,0
-view,product.category,0,Product Category,CategorÃa de Producto,0
+view,product.category,0,Children,Hijos,0
+view,product.category,0,Product Categories,CategorÃas de producto,0
+view,product.category,0,Product Category,CategorÃa de producto,0
view,product.product,0,General,General,0
view,product.product,0,Product,Producto,0
-view,product.product,0,Product Suppliers,Proveedores de Productos,0
-view,product.uom,0,Unit of Measure,Unidad de Medida,0
-view,product.uom,0,Units of Measure,Unidades de Medida,0
-view,product.uom.category,0,Categories of Unit of Measure,CategorÃas de Unidad de Medida,0
-view,product.uom.category,0,Category of Unit of Measure,CategorÃa de unidad de Medida,0
+view,product.product,0,Products,Productos,0
+view,product.product,0,Product Suppliers,Proveedores de productos,0
+view,product.template,0,General,General,0
+view,product.template,0,Product Template,Plantilla de producto,0
+view,product.template,0,Product Templates,Plantillas de producto,0
+view,product.uom,0,Unit of Measure,Unidad de medida,0
+view,product.uom,0,Units of Measure,Unidades de medida,0
+view,product.uom.category,0,Categories of Unit of Measure,CategorÃas de la unidad de medida,0
+view,product.uom.category,0,Category of Unit of Measure,CategorÃa de la unidad de medida,0
diff --git a/fr_FR.csv b/fr_FR.csv
index ce7d3cb..91a0da8 100644
--- a/fr_FR.csv
+++ b/fr_FR.csv
@@ -1,11 +1,16 @@
type,name,res_id,src,value,fuzzy
-field,"product.category,childs",0,Childs,Enfants,0
-field,"product.category,complete_name",0,Complete Name,Nom Complet,0
+error,product.template,0,You cannot change the default uom for a product which is associated to stock moves.,Vous ne pouvez pas changer l'UDM par défaut pour un produit qui a déjà fait l'objet de mouvements de stock,0
+error,product.uom,0,"If the UOM is still not used, you can delete it ortherwise you can deactivate it and create a new one.","Si l'UDM n'est pas utilisée, vous pouvez la supprimer, sinon vous pouvez la désactiver et en créer une noouvelle.",0
+error,product.uom,0,Rate and factor can not be both equal to zero.,Le taux et le facteur ne peuventt pas être égaux à zéro.,0
+error,product.uom,0,"You cannot change Rate, Factor or Category on a Unit of Measure. ","Vous ne pouvez pas changer le taux, le facteur ou la catégorie d'une unité de mesure.",0
+field,"product.category,childs",0,Children,Enfants,0
field,"product.category,name",0,Name,Nom,0
field,"product.category,parent",0,Parent,Parent,0
+field,"product.category,rec_name",0,Name,Nom,0
field,"product.product,code",0,Code,Code,0
field,"product.product,description",0,Description,Description,0
-field,"product.product,template",0,Product Template,Modèle Produit,0
+field,"product.product,rec_name",0,Name,Nom,0
+field,"product.product,template",0,Product Template,Modèle produit,0
field,"product.template,active",0,Active,Actif,0
field,"product.template,category",0,Category,Catégorie,0
field,"product.template,cost_price",0,Cost Price,Prix de Revient,0
@@ -15,14 +20,19 @@ field,"product.template,default_uom",0,Default UOM,UDM par Défaut,0
field,"product.template,list_price",0,List Price,Prix Listé,0
field,"product.template,list_price_uom",0,List Price,Prix Listé,0
field,"product.template,name",0,Name,Nom,0
+field,"product.template,products",0,Products,Produits,0
+field,"product.template,rec_name",0,Name,Nom,0
field,"product.template,type",0,Type,Type,0
field,"product.uom,active",0,Active,Actif,0
field,"product.uom,category",0,UOM Category,Catégorie d'UDM,0
field,"product.uom.category,name",0,Name,Nom,0
-field,"product.uom.category,uoms",0,Unit of Measures,Unité de Mesures,0
+field,"product.uom.category,rec_name",0,Name,Nom,0
+field,"product.uom.category,uoms",0,Unit of Measures,Unité de Mesure,0
+field,"product.uom,digits",0,Display Digits,Décimales affichées,0
field,"product.uom,factor",0,Factor,Facteur,0
field,"product.uom,name",0,Name,Nom,0
field,"product.uom,rate",0,Rate,Taux,0
+field,"product.uom,rec_name",0,Name,Nom,0
field,"product.uom,rounding",0,Rounding Precision,Précision d'Arrondi,0
field,"product.uom,symbol",0,Symbol,Symbole,0
help,"product.uom,factor",0,"The coefficient for the formula:
@@ -31,28 +41,115 @@ coef (unité de base) = 1 (cette unité)",0
help,"product.uom,rate",0,"The coefficient for the formula:
1 (base unit) = coef (this unit)","Le coefficient pour la formule:
1 (unité de base) = coef (cette unité)",0
+model,"ir.action,name",act_category_tree,Categories,Catégories,0
+model,"ir.action,name",act_uom_category_form,Categories of Unit of Measure,Catégories d'unité de mesure,0
+model,"ir.action,name",act_product_by_category,Product by Category,Produits par catégories,0
+model,"ir.action,name",act_category_form,Product Categories,Catégories de produit,0
+model,"ir.action,name",act_product_form,Products,Produits,0
+model,"ir.action,name",act_product_form2,Products,Produits,0
+model,"ir.action,name",act_uom_form,Units of Measure,Unités de mesure,0
+model,"ir.action,name",act_uom_form2,Units of Measure,Unités de mesure,0
model,"ir.ui.menu,name",menu_category_tree,Categories,Catégories,0
model,"ir.ui.menu,name",menu_uom_category_form,Categories,Catégories,0
-model,"ir.ui.menu,name",menu_category_form,Edit Categories,Éditer les Catégories,0
+model,"ir.ui.menu,name",menu_category_form,Edit Categories,Éditer les catégories,0
model,"ir.ui.menu,name",menu_product_product_new,New Product,Nouveau Produit,0
-model,"ir.ui.menu,name",menu_uom_form2,New Unit of Measure,Nouvelle Unité de Mesure,0
+model,"ir.ui.menu,name",menu_uom_form2,New Unit of Measure,Nouvelle Unité de mesure,0
model,"ir.ui.menu,name",menu_main_product,Product,Produit,0
model,"ir.ui.menu,name",menu_product_product,Products,Produits,0
model,"ir.ui.menu,name",menu_uom_form,Units of Measure,Unités de Mesure,0
+model,"product.category,name",0,Product Category,Catégorie de produit,0
+model,"product.product,name",0,Product,Produit,0
+model,"product.template,name",0,Product Template,Modèle produit,0
+model,"product.uom.category,name",uom_cat_length,Length,Longueur,0
+model,"product.uom.category,name",0,Product uom category,Catégorie d'UDM de produit,0
+model,"product.uom.category,name",uom_cat_surface,Surface,Surface,0
+model,"product.uom.category,name",uom_cat_time,Time,Heure,0
+model,"product.uom.category,name",uom_cat_unit,Units,Unités,0
+model,"product.uom.category,name",uom_cat_volume,Volume,Volume,0
+model,"product.uom.category,name",uom_cat_weight,Weight,Poids,0
+model,"product.uom,name",uom_are,Are,Are,0
+model,"product.uom,name",uom_carat,Carat,Carat,0
+model,"product.uom,name",uom_centimeter,centimeter,centimètre,0
+model,"product.uom,name",uom_cubic_centimeter,Cubic centimeter,Centimètre cube,0
+model,"product.uom,name",uom_cubic_foot,Cubic foot,Pied cubique,0
+model,"product.uom,name",uom_cubic_inch,Cubic inch,Pouce cubique,0
+model,"product.uom,name",uom_cubic_meter,Cubic meter,Mètre cube,0
+model,"product.uom,name",uom_day,Day,Jour,0
+model,"product.uom,name",uom_foot,Foot,Pied,0
+model,"product.uom,name",uom_gallon,Gallon,Gallon,0
+model,"product.uom,name",uom_gram,Gram,Gram,0
+model,"product.uom,name",uom_hectare,Hectare,Hectare,0
+model,"product.uom,name",uom_hour,Hour,Heure,0
+model,"product.uom,name",uom_inch,Inch,Pouce,0
+model,"product.uom,name",uom_kilogram,Kilogram,Kilogramme,0
+model,"product.uom,name",uom_kilometer,Kilometer,Kilomètre,0
+model,"product.uom,name",uom_liter,Liter,Litre,0
+model,"product.uom,name",uom_meter,Meter,Mètre,0
+model,"product.uom,name",uom_mile,Mile,Mille,0
+model,"product.uom,name",uom_millimeter,Millimeter,Millimètre,0
+model,"product.uom,name",uom_minute,Minute,Minute,0
+model,"product.uom,name",uom_once,Ounce,Once,0
+model,"product.uom,name",uom_pound,Pound,Livre,0
+model,"product.uom,name",uom_second,Second,Seconde,0
+model,"product.uom,name",uom_square_centimeter,Square centimeter,Centimètre carré,0
+model,"product.uom,name",uom_square_foot,Square foot,Pied carré,0
+model,"product.uom,name",uom_square_inch,Square inch,Pouce carré,0
+model,"product.uom,name",uom_square_meter,Square meter,Mètre carré,0
+model,"product.uom,name",uom_square_yard,Square yard,Yard carré,0
+model,"product.uom,name",uom_unit,Unit,Unité,0
+model,"product.uom,name",0,Unit of measure,Unité de mesure,0
+model,"product.uom,name",uom_work_day,Work Day,Jour de travail,0
+model,"product.uom,name",uom_yard,Yard,Yard,0
+model,"product.uom,symbol",uom_are,a,un,0
+model,"product.uom,symbol",uom_carat,c,c,0
+model,"product.uom,symbol",uom_centimeter,cm,cm,0
+model,"product.uom,symbol",uom_square_centimeter,cm²,cm ²,0
+model,"product.uom,symbol",uom_cubic_centimeter,cm³,cm ³,0
+model,"product.uom,symbol",uom_day,d,d,0
+model,"product.uom,symbol",uom_foot,ft,p,0
+model,"product.uom,symbol",uom_square_foot,ft²,pi ²,0
+model,"product.uom,symbol",uom_cubic_foot,ft³,ft ³,0
+model,"product.uom,symbol",uom_gram,g,g,0
+model,"product.uom,symbol",uom_gallon,gal,gal,0
+model,"product.uom,symbol",uom_hour,h,h,0
+model,"product.uom,symbol",uom_hectare,ha,ha,0
+model,"product.uom,symbol",uom_inch,in,in,0
+model,"product.uom,symbol",uom_square_inch,in²,in ²,0
+model,"product.uom,symbol",uom_cubic_inch,in³,in ³,0
+model,"product.uom,symbol",uom_kilogram,kg,kg,0
+model,"product.uom,symbol",uom_kilometer,km,km,0
+model,"product.uom,symbol",uom_liter,l,l,0
+model,"product.uom,symbol",uom_pound,lbs,lbs,0
+model,"product.uom,symbol",uom_meter,m,m,0
+model,"product.uom,symbol",uom_square_meter,m²,m²,0
+model,"product.uom,symbol",uom_cubic_meter,m³,m³,0
+model,"product.uom,symbol",uom_mile,mi,mi,0
+model,"product.uom,symbol",uom_minute,min,min,0
+model,"product.uom,symbol",uom_millimeter,mm,mm,0
+model,"product.uom,symbol",uom_once,oz,oz,0
+model,"product.uom,symbol",uom_second,s,s,0
+model,"product.uom,symbol",uom_unit,u,u,0
+model,"product.uom,symbol",uom_work_day,wd,wd,0
+model,"product.uom,symbol",uom_yard,yd,yd,0
+model,"product.uom,symbol",uom_square_yard,yd²,yd ²,0
+model,"res.group,name",group_product_admin,Product Administration,Administration de produits,0
selection,"product.template,cost_price_method",0,Average,Moyen,0
selection,"product.template,cost_price_method",0,Fixed,Fixe,0
-selection,"product.template,type",0,Consumable,Consomable,0
-selection,"product.template,type",0,Service,Sevice,0
+selection,"product.template,type",0,Consumable,Consommable,0
+selection,"product.template,type",0,Service,Service,0
selection,"product.template,type",0,Stockable,Stockable,0
-view,product.category,0,Childs,Enfants,0
-view,product.category,0,Product Categories,Catégories de Produit,0
-view,product.category,0,Product Category,Catégorie de Produit,0
+view,product.category,0,Children,Enfants,0
+view,product.category,0,Product Categories,Catégories de produit,0
+view,product.category,0,Product Category,Catégorie de produit,0
view,product.category,0,Properties,Propriétés,0
view,product.product,0,General,Général,0
view,product.product,0,Product,Produit,0
view,product.product,0,Products,Produits,0
view,product.product,0,Properties,Propriétés,0
-view,product.uom,0,Unit of Measure,Unité de Mesure,0
-view,product.uom,0,Units of Measure,Unités de Mesure,0
-view,product.uom.category,0,Categories of Unit of Measure,Catégories d'Unité de Mesure,0
-view,product.uom.category,0,Category of Unit of Measure,Catégorie d'Unité de Mesure,0
+view,product.template,0,General,Général,0
+view,product.template,0,Product Template,Modèle produit,0
+view,product.template,0,Product Templates,Modèles de produit,0
+view,product.uom,0,Unit of Measure,Unité de mesure,0
+view,product.uom,0,Units of Measure,Unités de mesure,0
+view,product.uom.category,0,Categories of Unit of Measure,Catégories d'Unité de mesure,0
+view,product.uom.category,0,Category of Unit of Measure,Catégorie d'unité de mesure,0
diff --git a/product.py b/product.py
index e0d48b1..33c61a9 100644
--- a/product.py
+++ b/product.py
@@ -1,13 +1,13 @@
#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.osv import fields, OSV
+from trytond.model import ModelView, ModelSQL, fields
STATES = {
'readonly': "active == False",
}
-class Template(OSV):
+class Template(ModelSQL, ModelView):
"Product Template"
_name = "product.template"
_description = __doc__
@@ -35,10 +35,17 @@ class Template(OSV):
], string="Cost Method", required=True, states=STATES)
default_uom = fields.Many2One('product.uom', 'Default UOM', required=True,
states=STATES)
- active = fields.Boolean('Active')
+ active = fields.Boolean('Active', select=1)
products = fields.One2Many('product.product', 'template', 'Products',
states=STATES)
+ def __init__(self):
+ super(Template, self).__init__()
+ self._error_messages.update({
+ 'change_default_uom': 'You cannot change the default uom for a '\
+ 'product which is associated to stock moves.',
+ })
+
def default_active(self, cursor, user, context=None):
return True
@@ -66,43 +73,60 @@ class Template(OSV):
res[product.id] = product[field]
return res
+ def write(self, cursor, user, ids, vals, context=None):
+ if vals.get("default_uom"):
+ templates = self.browse(cursor, user, ids, context=context)
+ for template in templates:
+ if template.default_uom.id != vals.get("default_uom"):
+ self.raise_user_error(cursor, 'change_default_uom')
+
+ super(Template, self).write(cursor, user, ids, vals, context=context)
+
+ def copy(self, cursor, user, ids, default=None, context=None):
+ if default is None:
+ default = {}
+ default = default.copy()
+ default['products'] = False
+ return super(Template, self).copy(cursor, user, ids, default=default,
+ context=context)
+
Template()
-class Product(OSV):
+class Product(ModelSQL, ModelView):
"Product"
_name = "product.product"
_description = __doc__
_inherits = {'product.template': 'template'}
template = fields.Many2One('product.template', 'Product Template',
- required=True, ondelete='CASCADE')
- code = fields.Char("Code", size=None)
+ required=True, ondelete='CASCADE', select=1)
+ code = fields.Char("Code", size=None, select=1)
description = fields.Text("Description", translate=True)
- def name_get(self, cursor, user, ids, context=None):
+ def get_rec_name(self, cursor, user, ids, name, arg, context=None):
if not ids:
- return []
- if isinstance(ids, (int, long)):
- ids = [ids]
- res = []
+ return {}
+ res = {}
for product in self.browse(cursor, user, ids, context=context):
name = product.name
if product.code:
name = '[' + product.code + '] ' + product.name
- res.append((product.id, name))
+ res[product.id] = name
return res
- def name_search(self, cursor, user, name, args=None, operator='ilike',
- context=None, limit=None):
- if not args:
- args = []
- ids = self.search(cursor, user, [('code', '=', name)] + args,
- limit=limit, context=context)
- if ids:
- return self.name_get(cursor, user, ids, context=context)
- return super(Product, self).name_search(cursor, user, name,
- args=args, operator=operator, context=context, limit=limit)
+ def search_rec_name(self, cursor, user, name, args, context=None):
+ args2 = []
+ i = 0
+ while i < len(args):
+ ids = self.search(cursor, user, [('code', args[i][1], args[i][2])],
+ context=context)
+ if ids:
+ args2.append(('id', 'in', ids))
+ else:
+ args2.append(('name', args[i][1], args[i][2]))
+ i += 1
+ return args2
def delete(self, cursor, user, ids, context=None):
template_obj = self.pool.get('product.template')
@@ -127,12 +151,27 @@ class Product(OSV):
return res
- def copy(self, cursor, user, product_id, default=None, context=None):
+ def copy(self, cursor, user, ids, default=None, context=None):
+ template_obj = self.pool.get('product.template')
+
+ int_id = False
+ if isinstance(ids, (int, long)):
+ int_id = True
+ ids = [ids]
if default is None:
default = {}
default = default.copy()
default['products'] = False
- return super(Product, self).copy(cursor, user, product_id,
+ new_ids = []
+ for product in self.browse(cursor, user, ids, context=context):
+ default['template'] = template_obj.copy(cursor, user,
+ product.template.id, context=context)
+ new_id = super(Product, self).copy(cursor, user, product.id,
default=default, context=context)
+ new_ids.append(new_id)
+
+ if int_id:
+ return new_ids[0]
+ return new_ids
Product()
diff --git a/product.xml b/product.xml
index 7cd44b0..010ccdc 100644
--- a/product.xml
+++ b/product.xml
@@ -14,14 +14,13 @@ this repository contains the full copyright notices and license terms. -->
<menuitem name="Product" id="menu_main_product" sequence="1"
icon="tryton-package"/>
- <record model="ir.ui.view" id="product_view_tree">
- <field name="model">product.product</field>
+ <record model="ir.ui.view" id="template_view_tree">
+ <field name="model">product.template</field>
<field name="type">tree</field>
<field name="arch" type="xml">
<![CDATA[
- <tree string="Products">
+ <tree string="Product Templates">
<field name="name" select="1"/>
- <field name="code" select="1"/>
<field name="list_price_uom" select="2"/>
<field name="cost_price_uom" select="2"/>
<field name="type" select="2"/>
@@ -33,22 +32,21 @@ this repository contains the full copyright notices and license terms. -->
</field>
</record>
- <record model="ir.ui.view" id="product_view_form">
- <field name="model">product.product</field>
+ <record model="ir.ui.view" id="template_view_form">
+ <field name="model">product.template</field>
<field name="type">form</field>
<field name="arch" type="xml">
<![CDATA[
- <form string="Product">
+ <form string="Product Template">
<label name="name"/>
<field name="name" xexpand="1"/>
<label name="active"/>
<field name="active" xexpand="0" width="100"/>
<notebook colspan="4">
- <page string="General">
- <label name="code"/>
- <field name="code"/>
+ <page string="General" id="general">
<label name="type"/>
<field name="type"/>
+ <newline/>
<label name="category"/>
<field name="category" />
<label name="default_uom"/>
@@ -60,8 +58,6 @@ this repository contains the full copyright notices and license terms. -->
<field name="cost_price"/>
<label name="cost_price_method"/>
<field name="cost_price_method"/>
- <separator name="description" colspan="4"/>
- <field name="description" colspan="4"/>
</page>
</notebook>
</form>
@@ -69,6 +65,57 @@ this repository contains the full copyright notices and license terms. -->
</field>
</record>
+ <record model="ir.ui.view" id="product_view_tree">
+ <field name="model">product.product</field>
+ <field name="type">tree</field>
+ <field name="inherit" ref="template_view_tree"/>
+ <field name="arch" type="xml">
+ <![CDATA[
+ <data>
+ <xpath
+ expr="/tree"
+ position="replace_attributes">
+ <tree string="Products"/>
+ </xpath>
+ <xpath
+ expr="/tree/field[@name="name"]"
+ position="after">
+ <field name="code" select="1"/>
+ </xpath>
+ </data>
+ ]]>
+ </field>
+ </record>
+
+ <record model="ir.ui.view" id="product_view_form">
+ <field name="model">product.product</field>
+ <field name="type">form</field>
+ <field name="inherit" ref="template_view_form"/>
+ <field name="arch" type="xml">
+ <![CDATA[
+ <data>
+ <xpath
+ expr="/form"
+ position="replace_attributes">
+ <form string="Products"/>
+ </xpath>
+ <xpath
+ expr="/form/notebook/page[@id="general"]/label[@name="type"]"
+ position="before">
+ <label name="code"/>
+ <field name="code"/>
+ </xpath>
+ <xpath
+ expr="/form/notebook/page[@id="general"]"
+ position="inside">
+ <separator name="description" colspan="4"/>
+ <field name="description" colspan="4"/>
+ </xpath>
+ </data>
+ ]]>
+ </field>
+ </record>
+
<record model="ir.action.act_window" id="act_product_form">
<field name="name">Products</field>
<field name="res_model">product.product</field>
@@ -112,8 +159,20 @@ this repository contains the full copyright notices and license terms. -->
<menuitem name="New Product" parent="menu_product_product"
sequence="1" id="menu_product_product_new"
- action="act_product_form2"/>
+ action="act_product_form2" groups="group_product_admin"/>
+ <record model="ir.action.act_window" id="act_product_by_category">
+ <field name="name">Product by Category</field>
+ <field name="res_model">product.product</field>
+ <field name="view_type">form</field>
+ <field name="context">{'categories': [active_id]}</field>
+ <field name="domain">[('category','child_of', [active_id], 'parent')]</field>
+ </record>
+ <record model="ir.action.keyword" id="act_product_by_category_keyword1">
+ <field name="keyword">tree_open</field>
+ <field name="model">product.category,0</field>
+ <field name="action" ref="act_product_by_category"/>
+ </record>
<record model="ir.model.access" id="access_product">
<field name="model" search="[('model', '=', 'product.product')]"/>
diff --git a/trytond_product.egg-info/PKG-INFO b/trytond_product.egg-info/PKG-INFO
index 7b36e18..a50aea3 100644
--- a/trytond_product.egg-info/PKG-INFO
+++ b/trytond_product.egg-info/PKG-INFO
@@ -1,12 +1,12 @@
Metadata-Version: 1.0
Name: trytond-product
-Version: 1.0.2
+Version: 1.2.0
Summary: Define products, categories of product, units of measure, categories of units of measure.
Home-page: http://www.tryton.org/
Author: B2CK
Author-email: info at b2ck.com
License: GPL-3
-Download-URL: http://downloads.tryton.org/1.0/
+Download-URL: http://downloads.tryton.org/1.2/
Description: UNKNOWN
Platform: UNKNOWN
Classifier: Development Status :: 5 - Production/Stable
diff --git a/trytond_product.egg-info/SOURCES.txt b/trytond_product.egg-info/SOURCES.txt
index 20ba319..669003a 100644
--- a/trytond_product.egg-info/SOURCES.txt
+++ b/trytond_product.egg-info/SOURCES.txt
@@ -6,6 +6,7 @@ MANIFEST.in
README
category.xml
de_DE.csv
+es_CO.csv
es_ES.csv
fr_FR.csv
product.xml
diff --git a/trytond_product.egg-info/requires.txt b/trytond_product.egg-info/requires.txt
index e2ef220..77083b3 100644
--- a/trytond_product.egg-info/requires.txt
+++ b/trytond_product.egg-info/requires.txt
@@ -1,2 +1,2 @@
-trytond >= 1.0
-trytond < 1.1
\ No newline at end of file
+trytond >= 1.2
+trytond < 1.3
\ No newline at end of file
diff --git a/uom.py b/uom.py
index d2e2d48..2442929 100644
--- a/uom.py
+++ b/uom.py
@@ -1,12 +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.osv import fields, OSV, OPERATORS
+#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.model.modelstorage import OPERATORS
from decimal import Decimal
STATES = {
- 'readonly': "active == False",
+ 'readonly': "(active == False)",
}
-class UomCategory(OSV):
+class UomCategory(ModelSQL, ModelView):
'Product uom category'
_name = 'product.uom.category'
_description = __doc__
@@ -20,7 +22,7 @@ class UomCategory(OSV):
UomCategory()
-class Uom(OSV):
+class Uom(ModelSQL, ModelView):
'Unit of measure'
_name = 'product.uom'
_description = __doc__
@@ -29,7 +31,7 @@ class Uom(OSV):
symbol = fields.Char('Symbol', size=10, required=True, states=STATES,
translate=True)
category = fields.Many2One('product.uom.category', 'UOM Category',
- required=True, ondelete='cascade', states=STATES)
+ required=True, ondelete='RESTRICT', states=STATES)
rate = fields.Float('Rate', digits=(12, 6), required=True,
on_change=['rate'], states=STATES,
help='The coefficient for the formula:\n' \
@@ -45,7 +47,17 @@ class Uom(OSV):
def __init__(self):
super(Uom, self).__init__()
+ self._sql_constraints += [
+ ('non_zero_rate_factor', 'CHECK((rate != 0.0) or (factor != 0.0))',
+ 'Rate and factor can not be both equal to zero.')
+ ]
self._order.insert(0, ('name', 'ASC'))
+ self._error_messages.update({
+ 'change_uom_rate_title':'You cannot change Rate, Factor or '\
+ 'Category on a Unit of Measure. ',
+ 'change_uom_rate': 'If the UOM is still not used, you can '\
+ 'delete it ortherwise you can deactivate it and create a new one.'
+ })
def check_xml_record(self, cursor, user, ids, values, context=None):
return True
@@ -80,15 +92,13 @@ class Uom(OSV):
return False
uom = self.browse(cursor, user, context['category'][0],
context=context)
- return category_obj.name_get(cursor, user, uom.category.id,
- context=context)[0]
+ return uom.category.id
else:
if not context['category'][0]:
return False
product = product_obj.browse(cursor, user,
context['category'][0], context=context)
- return category_obj.name_get(cursor, user,
- product.default_uom.category.id, context=context)[0]
+ return product.default_uom.category.id
return False
def on_change_factor(self, cursor, user, ids, value, context=None):
@@ -101,58 +111,21 @@ class Uom(OSV):
return {'factor': 0.0}
return {'factor': round(1.0/value['rate'], 6)}
-
- def __init__(self):
- super(Uom, self).__init__()
- self._sql_constraints += [
- ('non_zero_rate_factor', 'CHECK((rate != 0.0) or (factor != 0.0))',
- 'Rate and factor can not be both equal to zero.')
- ]
-
-
@staticmethod
def round(number, precision=1.0):
return round(number / precision) * precision
@staticmethod
def check_factor_and_rate(values):
- factor = None
- rate = None
- if ('factor' not in values) and ('rate' not in values):
+
+ if values.get('factor', 0.0) == values.get('rate', 0.0) == 0.0:
return values
- elif 'factor' in values and 'rate' in values:
- if values['rate'] == 0.0 and values['factor'] == 0.0:
- return values
- elif values['factor'] != 0.0 and \
- values['rate'] != 0.0:
- if values['rate'] == round(1.0/values['factor'], 6) or \
- values['factor'] == round(1.0/values['rate'], 6):
- return values
- else:
- factor = round(1.0/values['rate'], 6)
- elif values['rate'] != 0.0 and \
- values['factor'] != round(1.0/values['rate'], 6):
- factor = round(1.0/values['rate'], 6)
- elif values['factor'] != 0.0 and \
- values['rate'] != round(1.0/values['factor'], 6):
- rate = round(1.0/values['factor'], 6)
- else:
- return values
- elif 'rate' in values:
- if values['rate'] != 0.0:
- factor = round(1.0/values['rate'], 6)
- else:
- factor = 0.0
- elif 'factor' in values:
- if values['factor'] != 0.0:
- rate = round(1.0/values['factor'], 6)
- else:
- rate = 0.0
- if rate != None or factor != None:
- values = values.copy()
- if rate != None: values['rate'] = rate
- if factor != None: values['factor'] = factor
+ if abs(values.get('factor', 0.0)) > abs(values.get('rate', 0.0)):
+ values['rate'] = 1.0 / values['factor']
+ else:
+ values['factor'] = 1.0 / values['rate']
+
return values
def create(self, cursor, user, values, context=None):
@@ -160,8 +133,32 @@ class Uom(OSV):
return super(Uom, self).create(cursor, user, values, context)
def write(self, cursor, user, ids, values, context=None):
+ if user == 0:
+ values = self.check_factor_and_rate(values)
+ return super(Uom, self).write(cursor, user, ids, values, context)
+ if 'rate' not in values and 'factor' not in values \
+ and 'category' not in values:
+ return super(Uom, self).write(cursor, user, ids, values, context)
+
+ if isinstance(ids, (int, long)):
+ ids = [ids]
+
+ uoms = self.browse(cursor, user, ids, context=context)
+ old_uom = dict((uom.id, (uom.factor, uom.rate, uom.category.id)) \
+ for uom in uoms)
+
values = self.check_factor_and_rate(values)
- return super(Uom, self).write(cursor, user, ids, values, context)
+ res = super(Uom, self).write(cursor, user, ids, values, context)
+ uoms = self.browse(cursor, user, ids, context=context)
+
+ for uom in uoms:
+ if uom.factor != old_uom[uom.id][0] \
+ or uom.rate != old_uom[uom.id][1] \
+ or uom.category.id != old_uom[uom.id][2]:
+
+ self.raise_user_error(cursor, 'change_uom_rate_title',
+ error_description='change_uom_rate')
+ return res
def compute_qty(self, cursor, user, from_uom, qty, to_uom=False,
round=True, context=None):
diff --git a/uom.xml b/uom.xml
index cca04b7..3981007 100644
--- a/uom.xml
+++ b/uom.xml
@@ -78,7 +78,8 @@
<field name="act_window" ref="act_uom_form2"/>
</record>
<menuitem name="New Unit of Measure" id="menu_uom_form2"
- parent="menu_uom_form" sequence="1" action="act_uom_form2"/>
+ parent="menu_uom_form" sequence="1" action="act_uom_form2"
+ groups="group_product_admin"/>
<record model="ir.ui.view" id="uom_category_view_tree">
<field name="model">product.uom.category</field>
commit 670fe9cbb74caf3bce467ab9a5bb3463f8ed403f
Author: Daniel Baumann <daniel at debian.org>
Date: Sat Mar 28 16:33:52 2009 +0100
Releasing debian version 1.0.2-2.
diff --git a/debian/changelog b/debian/changelog
index a4ffe88..843ab59 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+tryton-modules-product (1.0.2-2) unstable; urgency=low
+
+ * Adding Mathias to uploaders.
+
+ -- Daniel Baumann <daniel at debian.org> Sat, 28 Mar 2009 16:33:00 +0100
+
tryton-modules-product (1.0.2-1) unstable; urgency=low
* Merging upstream version 1.0.2.
commit 44b9281dc11866c56d6d842a7c1b6eff1586c38d
Author: Daniel Baumann <daniel at debian.org>
Date: Sat Mar 28 16:13:21 2009 +0100
Adding Mathias to uploaders.
diff --git a/debian/control b/debian/control
index 46f3b21..4d06848 100644
--- a/debian/control
+++ b/debian/control
@@ -2,6 +2,7 @@ Source: tryton-modules-product
Section: python
Priority: optional
Maintainer: Daniel Baumann <daniel at debian.org>
+Uploaders: Mathias Behrle <mathiasb at mbsolutions.selfip.biz>
Build-Depends: debhelper (>= 7), python, python-all-dev, python-setuptools, python-support
Standards-Version: 3.8.1
Homepage: http://www.tryton.org/
commit bbe56b99f645d3943045dda7b58e851724518dc6
Author: Daniel Baumann <daniel at debian.org>
Date: Mon Mar 23 07:10:50 2009 +0100
Releasing debian version 1.0.2-1.
diff --git a/debian/changelog b/debian/changelog
index 538f262..a4ffe88 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+tryton-modules-product (1.0.2-1) unstable; urgency=low
+
+ * Merging upstream version 1.0.2.
+
+ -- Daniel Baumann <daniel at debian.org> Mon, 23 Mar 2009 07:10:00 +0100
+
tryton-modules-product (1.0.1-1) unstable; urgency=low
* Merging upstream version 1.0.1.
commit aca9aa3cb75f3c157308817a8f316226121187d2
Author: Daniel Baumann <daniel at debian.org>
Date: Mon Mar 23 07:10:10 2009 +0100
Merging upstream version 1.0.2.
diff --git a/CHANGELOG b/CHANGELOG
index 9801fce..2521948 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 1.0.2 - 2009-03-02
+* Some bug fixes (see mercurial logs for details)
+
Version 1.0.1 - 2008-12-01
* Allow egg installation
diff --git a/PKG-INFO b/PKG-INFO
index fd6f94a..37cc937 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.0
Name: trytond_product
-Version: 1.0.1
+Version: 1.0.2
Summary: Define products, categories of product, units of measure, categories of units of measure.
Home-page: http://www.tryton.org/
Author: B2CK
diff --git a/__tryton__.py b/__tryton__.py
index 71ef99b..0a342b7 100644
--- a/__tryton__.py
+++ b/__tryton__.py
@@ -5,7 +5,7 @@
'name_de_DE': 'Artikel',
'name_fr_FR': 'Produit',
'name_es_ES': 'Productos',
- 'version' : '1.0.1',
+ 'version' : '1.0.2',
'author' : 'B2CK',
'email': 'info at b2ck.com',
'website': 'http://www.tryton.org/',
diff --git a/product.py b/product.py
index 316db2f..e0d48b1 100644
--- a/product.py
+++ b/product.py
@@ -110,25 +110,20 @@ class Product(OSV):
if isinstance(ids, (int, long)):
ids = [ids]
- # Delete template that have no more product linked
- cursor.execute('SELECT t.id ' \
- 'FROM product_product p, product_template t ' \
- 'WHERE p.template = t.id ' \
- 'GROUP BY t.id HAVING COUNT(p.template) = 1')
- template_ids = [x[0] for x in cursor.fetchall()]
-
- if template_ids:
- product_ids = self.search(cursor, user, [
- ('id', 'in', ids),
- ('template', 'in', template_ids),
- ], context=context)
- template_ids = [x.template.id for x in self.browse(cursor, user,
- product_ids, context=context)]
+ # Get the templates before we delete the products.
+ products = self.browse(cursor, user, ids, context=context)
+ template_ids = [product.template.id for product in products]
res = super(Product, self).delete(cursor, user, ids, context=context)
- if template_ids:
- template_obj.delete(cursor, user, template_ids, context=context)
+ # Get templates that are still linked after delete.
+ templates = template_obj.browse(cursor, user, template_ids,
+ context=context)
+ unlinked_template_ids = [template.id for template in templates \
+ if not template.products]
+ if unlinked_template_ids:
+ template_obj.delete(cursor, user, unlinked_template_ids,
+ context=context)
return res
diff --git a/trytond_product.egg-info/PKG-INFO b/trytond_product.egg-info/PKG-INFO
index dc87ce2..7b36e18 100644
--- a/trytond_product.egg-info/PKG-INFO
+++ b/trytond_product.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.0
Name: trytond-product
-Version: 1.0.1
+Version: 1.0.2
Summary: Define products, categories of product, units of measure, categories of units of measure.
Home-page: http://www.tryton.org/
Author: B2CK
commit a96b8aca160c4a4831e3f38ee076d04963f457e9
Author: Daniel Baumann <daniel at debian.org>
Date: Sun Mar 22 23:23:36 2009 +0100
Releasing debian version 1.0.1-1.
diff --git a/debian/changelog b/debian/changelog
index e6fef89..538f262 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+tryton-modules-product (1.0.1-1) unstable; urgency=low
+
+ * Merging upstream version 1.0.1.
+ * Updating standards to 3.8.1.
+ * Making package arch all as it should be (Closes: #520804).
+
+ -- Daniel Baumann <daniel at debian.org> Sun, 22 Mar 2009 23:23:00 +0100
+
tryton-modules-product (1.0.0-1) unstable; urgency=low
* Initial release (Closes: #506095).
commit 56040dca00d7f96419cc14ab96021b859f356096
Author: Daniel Baumann <daniel at debian.org>
Date: Sun Mar 22 23:23:11 2009 +0100
Making package arch all as it should be (Closes: #520804).
diff --git a/debian/control b/debian/control
index c131d2f..46f3b21 100644
--- a/debian/control
+++ b/debian/control
@@ -9,7 +9,7 @@ Vcs-Browser: http://git.debian.net/?p=debian/tryton-modules-product.git
Vcs-Git: git://git.debian.net/git/debian/tryton-modules-product.git
Package: tryton-modules-product
-Architecture: any
+Architecture: all
Depends: ${misc:Depends}, ${python:Depends}, tryton-server, python-pkg-resources
XB-Python-Version: ${python:Versions}
Description: Tryton Application Platform (Product Module)
commit e3ea340d636557d4dc1315fdf970c7a68b39fc0f
Author: Daniel Baumann <daniel at debian.org>
Date: Sun Mar 22 23:22:42 2009 +0100
Updating standards to 3.8.1.
diff --git a/debian/control b/debian/control
index dbfab53..c131d2f 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: python
Priority: optional
Maintainer: Daniel Baumann <daniel at debian.org>
Build-Depends: debhelper (>= 7), python, python-all-dev, python-setuptools, python-support
-Standards-Version: 3.8.0
+Standards-Version: 3.8.1
Homepage: http://www.tryton.org/
Vcs-Browser: http://git.debian.net/?p=debian/tryton-modules-product.git
Vcs-Git: git://git.debian.net/git/debian/tryton-modules-product.git
commit 11f09377c36a19bb91864c13fe01993a2d5dc7fa
Author: Daniel Baumann <daniel at debian.org>
Date: Wed Jan 28 14:15:27 2009 +0100
Merging upstream version 1.0.1.
diff --git a/CHANGELOG b/CHANGELOG
index eacaaef..9801fce 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,2 +1,5 @@
+Version 1.0.1 - 2008-12-01
+* Allow egg installation
+
Version 1.0.0 - 2008-11-17
* Initial release
diff --git a/PKG-INFO b/PKG-INFO
index 8a730b2..fd6f94a 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,11 +1,12 @@
Metadata-Version: 1.0
Name: trytond_product
-Version: 1.0.0
+Version: 1.0.1
Summary: Define products, categories of product, units of measure, categories of units of measure.
Home-page: http://www.tryton.org/
Author: B2CK
Author-email: info at b2ck.com
License: GPL-3
+Download-URL: http://downloads.tryton.org/1.0/
Description: UNKNOWN
Platform: UNKNOWN
Classifier: Development Status :: 5 - Production/Stable
diff --git a/__tryton__.py b/__tryton__.py
index 43b9e85..71ef99b 100644
--- a/__tryton__.py
+++ b/__tryton__.py
@@ -5,7 +5,7 @@
'name_de_DE': 'Artikel',
'name_fr_FR': 'Produit',
'name_es_ES': 'Productos',
- 'version' : '1.0.0',
+ 'version' : '1.0.1',
'author' : 'B2CK',
'email': 'info at b2ck.com',
'website': 'http://www.tryton.org/',
diff --git a/setup.py b/setup.py
index a002d45..f2c570c 100644
--- a/setup.py
+++ b/setup.py
@@ -27,6 +27,8 @@ setup(name='trytond_product',
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': '.'},
packages=[
'trytond.modules.product',
@@ -53,4 +55,9 @@ setup(name='trytond_product',
],
license='GPL-3',
install_requires=requires,
+ zip_safe=False,
+ entry_points="""
+ [trytond.modules]
+ product = trytond.modules.product
+ """,
)
diff --git a/trytond_product.egg-info/PKG-INFO b/trytond_product.egg-info/PKG-INFO
index 0a7e976..dc87ce2 100644
--- a/trytond_product.egg-info/PKG-INFO
+++ b/trytond_product.egg-info/PKG-INFO
@@ -1,11 +1,12 @@
Metadata-Version: 1.0
Name: trytond-product
-Version: 1.0.0
+Version: 1.0.1
Summary: Define products, categories of product, units of measure, categories of units of measure.
Home-page: http://www.tryton.org/
Author: B2CK
Author-email: info at b2ck.com
License: GPL-3
+Download-URL: http://downloads.tryton.org/1.0/
Description: UNKNOWN
Platform: UNKNOWN
Classifier: Development Status :: 5 - Production/Stable
diff --git a/trytond_product.egg-info/SOURCES.txt b/trytond_product.egg-info/SOURCES.txt
index 3e225b2..20ba319 100644
--- a/trytond_product.egg-info/SOURCES.txt
+++ b/trytond_product.egg-info/SOURCES.txt
@@ -19,5 +19,7 @@ uom.xml
trytond_product.egg-info/PKG-INFO
trytond_product.egg-info/SOURCES.txt
trytond_product.egg-info/dependency_links.txt
+trytond_product.egg-info/entry_points.txt
+trytond_product.egg-info/not-zip-safe
trytond_product.egg-info/requires.txt
trytond_product.egg-info/top_level.txt
\ No newline at end of file
diff --git a/trytond_product.egg-info/entry_points.txt b/trytond_product.egg-info/entry_points.txt
new file mode 100644
index 0000000..845bf78
--- /dev/null
+++ b/trytond_product.egg-info/entry_points.txt
@@ -0,0 +1,4 @@
+
+ [trytond.modules]
+ product = trytond.modules.product
+
\ No newline at end of file
diff --git a/trytond_product.egg-info/not-zip-safe b/trytond_product.egg-info/not-zip-safe
new file mode 100644
index 0000000..8b13789
--- /dev/null
+++ b/trytond_product.egg-info/not-zip-safe
@@ -0,0 +1 @@
+
commit 2f7cb90e3e0dc943570e91665ec1ca17c533605b
Author: Daniel Baumann <daniel at debian.org>
Date: Tue Nov 18 13:05:55 2008 +0100
Adding debian version 1.0.0-1.
diff --git a/CHANGELOG b/CHANGELOG
new file mode 100644
index 0000000..eacaaef
--- /dev/null
+++ b/CHANGELOG
@@ -0,0 +1,2 @@
+Version 1.0.0 - 2008-11-17
+* Initial release
diff --git a/COPYRIGHT b/COPYRIGHT
new file mode 100644
index 0000000..37fef2d
--- /dev/null
+++ b/COPYRIGHT
@@ -0,0 +1,17 @@
+Copyright (C) 2004-2008 Tiny SPRL.
+Copyright (C) 2008 Cédric Krier.
+Copyright (C) 2008 Bertrand Chenal.
+Copyright (C) 2008 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..f2f99af
--- /dev/null
+++ b/INSTALL
@@ -0,0 +1,29 @@
+Installing trytond_product
+==========================
+
+Prerequisites
+-------------
+
+ * Python 2.4 or later (http://www.python.org/)
+ * trytond 0.0.x (http://www.tryton.org/)
+
+Installation
+------------
+
+Once you've downloaded and unpacked a trytond_product 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.
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..8a730b2
--- /dev/null
+++ b/PKG-INFO
@@ -0,0 +1,24 @@
+Metadata-Version: 1.0
+Name: trytond_product
+Version: 1.0.0
+Summary: Define products, categories of product, units of measure, categories of units of measure.
+Home-page: http://www.tryton.org/
+Author: B2CK
+Author-email: info at b2ck.com
+License: GPL-3
+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..02e7d8d
--- /dev/null
+++ b/README
@@ -0,0 +1,36 @@
+trytond_product
+===============
+
+The product 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..eb347ff
--- /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 uom import *
+from category import *
+from product import *
diff --git a/__tryton__.py b/__tryton__.py
new file mode 100644
index 0000000..43b9e85
--- /dev/null
+++ b/__tryton__.py
@@ -0,0 +1,32 @@
+#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',
+ 'name_de_DE': 'Artikel',
+ 'name_fr_FR': 'Produit',
+ 'name_es_ES': 'Productos',
+ 'version' : '1.0.0',
+ 'author' : 'B2CK',
+ 'email': 'info at b2ck.com',
+ 'website': 'http://www.tryton.org/',
+ 'description': 'Define products, categories of product, units ' \
+ 'of measure, categories of units of measure.',
+ 'description_de_DE': 'Dient der Erstellung von Artikeln, Artikelkategorien, Maßeinheiten und Kategorien für Maßeinheiten.',
+ 'description_es_ES': 'Definición de productos, categorÃas de producto '
+ 'unidades de medida y categorÃas de unidades de medida',
+ 'depends' : [
+ 'ir',
+ 'res',
+ ],
+ 'xml' : [
+ 'product.xml',
+ 'category.xml',
+ 'uom.xml',
+ ],
+ 'translation': [
+ 'fr_FR.csv',
+ 'de_DE.csv',
+ 'es_ES.csv',
+ ]
+}
+
diff --git a/category.py b/category.py
new file mode 100644
index 0000000..9960e76
--- /dev/null
+++ b/category.py
@@ -0,0 +1,40 @@
+#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.osv import fields, OSV
+
+
+class Category(OSV):
+ "Product Category"
+ _name = "product.category"
+ _description = __doc__
+
+ name = fields.Char('Name', required=True, translate=True)
+ complete_name = fields.Function('get_complete_name', type="char",
+ string='Complete Name')
+ parent = fields.Many2One('product.category','Parent', select=1)
+ childs = fields.One2Many('product.category', 'parent',
+ string='Childs')
+
+ def __init__(self):
+ super(Category, self).__init__()
+ self._order.insert(0, ('name', 'ASC'))
+
+ def get_complete_name(self, cursor, user, ids, name, arg, context=None):
+ res = self.name_get(cursor, user, ids, context=context)
+ return dict(res)
+
+ def name_get(self, cursor, user, ids, context=None):
+ if not ids:
+ return []
+ if isinstance(ids, (int, long)):
+ ids = [ids]
+ categories = self.browse(cursor, user, ids, context=context)
+ res = []
+ for category in categories:
+ if category.parent:
+ name = category.parent.name+' / '+ category.name
+ else:
+ name = category.name
+ res.append((category.id, name))
+ return res
+
+Category()
diff --git a/category.xml b/category.xml
new file mode 100644
index 0000000..70b4b6c
--- /dev/null
+++ b/category.xml
@@ -0,0 +1,104 @@
+<?xml version="1.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. -->
+<tryton>
+ <data>
+ <record model="ir.ui.view" id="category_view_tree">
+ <field name="model">product.category</field>
+ <field name="type">tree</field>
+ <field name="priority">10</field>
+ <field name="arch" type="xml">
+ <![CDATA[
+ <tree string="Product Categories">
+ <field name="name" select="1"/>
+ <field name="complete_name"/>
+ </tree>
+ ]]>
+ </field>
+ </record>
+ <record model="ir.ui.view" id="category_view_tree2">
+ <field name="model">product.category</field>
+ <field name="type">tree</field>
+ <field name="priority">20</field>
+ <field name="field_childs">childs</field>
+ <field name="arch" type="xml">
+ <![CDATA[
+ <tree string="Product Categories">
+ <field name="name"/>
+ </tree>
+ ]]>
+ </field>
+ </record>
+ <record model="ir.ui.view" id="category_view_form">
+ <field name="model">product.category</field>
+ <field name="type">form</field>
+ <field name="arch" type="xml">
+ <![CDATA[
+ <form string="Product Category">
+ <label name="name"/>
+ <field name="name"/>
+ <label name="parent"/>
+ <field name="parent"/>
+ <label name="complete_name"/>
+ <field name="complete_name" colspan="3"/>
+ <notebook colspan="4">
+ <page string="Childs" col="1">
+ <field name="childs"/>
+ </page>
+ </notebook>
+ </form>
+ ]]>
+ </field>
+ </record>
+
+ <record model="ir.action.act_window" id="act_category_tree">
+ <field name="name">Categories</field>
+ <field name="res_model">product.category</field>
+ <field name="view_type">tree</field>
+ <field name="domain">[('parent', '=', False)]</field>
+ </record>
+ <record model="ir.action.act_window.view" id="act_category_tree_view1">
+ <field name="sequence" eval="10"/>
+ <field name="view" ref="category_view_tree2"/>
+ <field name="act_window" ref="act_category_tree"/>
+ </record>
+ <menuitem parent="menu_main_product" sequence="2"
+ action="act_category_tree" id="menu_category_tree"/>
+
+ <record model="ir.action.act_window" id="act_category_form">
+ <field name="name">Product Categories</field>
+ <field name="res_model">product.category</field>
+ <field name="view_type">form</field>
+ </record>
+ <record model="ir.action.act_window.view" id="act_category_form_view1">
+ <field name="sequence" eval="10"/>
+ <field name="view" ref="category_view_tree"/>
+ <field name="act_window" ref="act_category_form"/>
+ </record>
+ <record model="ir.action.act_window.view" id="act_category_form_view2">
+ <field name="sequence" eval="20"/>
+ <field name="view" ref="category_view_form"/>
+ <field name="act_window" ref="act_category_form"/>
+ </record>
+ <menuitem name="Edit Categories" parent="menu_category_tree"
+ sequence="2" id="menu_category_form"
+ action="act_category_form"/>
+
+ <record model="ir.model.access" id="access_product_category">
+ <field name="model" search="[('model', '=', 'product.category')]"/>
+ <field name="perm_read" eval="True"/>
+ <field name="perm_write" eval="False"/>
+ <field name="perm_create" eval="False"/>
+ <field name="perm_delete" eval="False"/>
+ </record>
+ <record model="ir.model.access" id="access_product_category_admin">
+ <field name="model" search="[('model', '=', 'product.category')]"/>
+ <field name="group" ref="group_product_admin"/>
+ <field name="perm_read" eval="True"/>
+ <field name="perm_write" eval="True"/>
+ <field name="perm_create" eval="True"/>
+ <field name="perm_delete" eval="True"/>
+ </record>
+
+
+ </data>
+</tryton>
diff --git a/de_DE.csv b/de_DE.csv
new file mode 100644
index 0000000..d9ca437
--- /dev/null
+++ b/de_DE.csv
@@ -0,0 +1,165 @@
+type,name,res_id,src,value,fuzzy
+error,product.uom,0,Rate and factor can not be both equal to zero.,Faktor und Kehrwert Faktor können beide nicht 0 sein,0
+field,"product.category,childs",0,Childs,Untergeordnet (Kategorien),0
+field,"product.category,complete_name",0,Complete Name,Vollständige Bezeichnung,0
+field,"product.category,create_date",0,Creation date,Erstellungsdatum,0
+field,"product.category,create_uid",0,Creation user,Ersteller,0
+field,"product.category,id",0,ID,ID,0
+field,"product.category,name",0,Name,Name,0
+field,"product.category,parent",0,Parent,Ãœbergeordnet (Kategorie),0
+field,"product.category,write_date",0,Last modification date,Zuletzt geändert am,0
+field,"product.category,write_uid",0,Last modification by,Zuletzt geändert von,0
+field,"product.product,code",0,Code,Artikelnummer,0
+field,"product.product,create_date",0,Creation date,Erstellungsdatum,0
+field,"product.product,create_uid",0,Creation user,Ersteller,0
+field,"product.product,description",0,Description,Beschreibung,0
+field,"product.product,id",0,ID,ID,0
+field,"product.product,template",0,Product Template,Artikelvorlage,0
+field,"product.product,write_date",0,Last modification date,Zuletzt geändert am,0
+field,"product.product,write_uid",0,Last modification by,Zuletzt geändert von,0
+field,"product.template,active",0,Active,Aktiv,0
+field,"product.template,category",0,Category,Artikelkategorie,0
+field,"product.template,cost_price",0,Cost Price,Einkaufspreis,0
+field,"product.template,cost_price_method",0,Cost Method,Kostenermittlung,0
+field,"product.template,cost_price_uom",0,Cost Price,Einkaufspreis,0
+field,"product.template,create_date",0,Creation date,Erstellungsdatum,0
+field,"product.template,create_uid",0,Creation user,Ersteller,0
+field,"product.template,default_uom",0,Default UOM,Standardeinheit,0
+field,"product.template,id",0,ID,ID,0
+field,"product.template,list_price",0,List Price,Listenpreis,0
+field,"product.template,list_price_uom",0,List Price,Listenpreis,0
+field,"product.template,name",0,Name,Name,0
+field,"product.template,products",0,Products,Artikel,0
+field,"product.template,type",0,Type,Typ,0
+field,"product.template,write_date",0,Last modification date,Zuletzt geändert am,0
+field,"product.template,write_uid",0,Last modification by,Zuletzt geändert von,0
+field,"product.uom,active",0,Active,Aktiv,0
+field,"product.uom,category",0,UOM Category,Kategorie Maßeinheit,0
+field,"product.uom.category,create_date",0,Creation date,Erstellungsdatum,0
+field,"product.uom.category,create_uid",0,Creation user,Ersteller,0
+field,"product.uom.category,id",0,ID,ID,0
+field,"product.uom.category,name",0,Name,Name,0
+field,"product.uom.category,uoms",0,Unit of Measures,Maßeinheiten,0
+field,"product.uom.category,write_date",0,Last modification date,Zuletzt geändert am,0
+field,"product.uom.category,write_uid",0,Last modification by,Zuletzt geändert von,0
+field,"product.uom,create_date",0,Creation date,Erstellungsdatum,0
+field,"product.uom,create_uid",0,Creation user,Ersteller,0
+field,"product.uom,digits",0,Display Digits,Angezeigte Stellen,0
+field,"product.uom,factor",0,Factor,Faktor,0
+field,"product.uom,id",0,ID,ID,0
+field,"product.uom,name",0,Name,Name,0
+field,"product.uom,rate",0,Rate,Kehrwert Faktor,0
+field,"product.uom,rounding",0,Rounding Precision,Rundungsgenauigkeit,0
+field,"product.uom,symbol",0,Symbol,Symbol,0
+field,"product.uom,write_date",0,Last modification date,Zuletzt geändert am,0
+field,"product.uom,write_uid",0,Last modification by,Zuletzt geändert von,0
+help,"product.uom,factor",0,"The coefficient for the formula:
+coef (base unit) = 1 (this unit)","Der Faktor der Basiseinheit für eine Maßeinheit ist immer 1.
+Formel: diese Einheit = Faktor * Basiseinheit
+Das Feld Kehrwert Faktor wird automatisch aus dem hier eingetragenen Wert ermittelt.",0
+help,"product.uom,rate",0,"The coefficient for the formula:
+1 (base unit) = coef (this unit)","Der Kehrwert des Faktors der Basiseinheit für eine Maßeinheit ist immer 1.
+Formel: Basiseinheit = Kehrwert * diese Einheit
+Das Feld Faktor wird automatisch aus dem hier eingetragenen Wert ermittelt.",0
+model,"ir.action,name",act_category_tree,Categories,Artikelkategorien,0
+model,"ir.action,name",act_uom_category_form,Categories of Unit of Measure,Kategorien Maßeinheiten,0
+model,"ir.action,name",act_category_form,Product Categories,Artikelkategorien,0
+model,"ir.action,name",act_product_form,Products,Artikel,0
+model,"ir.action,name",act_product_form2,Products,Artikel,0
+model,"ir.action,name",act_uom_form,Units of Measure,Maßeinheiten,0
+model,"ir.action,name",act_uom_form2,Units of Measure,Maßeinheiten,0
+model,"ir.ui.menu,name",menu_category_tree,Categories,Artikelkategorien,0
+model,"ir.ui.menu,name",menu_uom_category_form,Categories,Kategorien für Maßeinheiten,0
+model,"ir.ui.menu,name",menu_category_form,Edit Categories,Artikelkategorien bearbeiten,0
+model,"ir.ui.menu,name",menu_product_product_new,New Product,Neuer Artikel,0
+model,"ir.ui.menu,name",menu_uom_form2,New Unit of Measure,Neue Maßeinheit,0
+model,"ir.ui.menu,name",menu_main_product,Product,Artikel,0
+model,"ir.ui.menu,name",menu_product_product,Products,Artikel,0
+model,"ir.ui.menu,name",menu_uom_form,Units of Measure,Maßeinheiten,0
+model,"product.uom.category,name",uom_cat_length,Length,Länge,0
+model,"product.uom.category,name",uom_cat_surface,Surface,Fläche,0
+model,"product.uom.category,name",uom_cat_time,Time,Zeit,0
+model,"product.uom.category,name",uom_cat_unit,Units,Stückzahl,0
+model,"product.uom.category,name",uom_cat_volume,Volume,Volumen,0
+model,"product.uom.category,name",uom_cat_weight,Weight,Gewicht,0
+model,"product.uom,name",uom_are,Are,Ar,0
+model,"product.uom,name",uom_carat,Carat,Karat,0
+model,"product.uom,name",uom_centimeter,centimeter,Zentimeter,0
+model,"product.uom,name",uom_cubic_centimeter,Cubic centimeter,Kubikzentimeter,0
+model,"product.uom,name",uom_cubic_foot,Cubic foot,Kubikfuß,0
+model,"product.uom,name",uom_cubic_inch,Cubic inch,Kubikzoll,0
+model,"product.uom,name",uom_cubic_meter,Cubic meter,Kubikmeter,0
+model,"product.uom,name",uom_day,Day,Tag(e),0
+model,"product.uom,name",uom_foot,Foot,Fuß,0
+model,"product.uom,name",uom_gallon,Gallon,Gallone(n),0
+model,"product.uom,name",uom_gram,Gram,Gramm,0
+model,"product.uom,name",uom_hectare,Hectare,Hektar,0
+model,"product.uom,name",uom_hour,Hour,Stunde(n),0
+model,"product.uom,name",uom_inch,Inch,Zoll,0
+model,"product.uom,name",uom_kilogram,Kilogram,Kilogramm,0
+model,"product.uom,name",uom_kilometer,Kilometer,Kilometer,0
+model,"product.uom,name",uom_liter,Liter,Liter,0
+model,"product.uom,name",uom_meter,Meter,Meter,0
+model,"product.uom,name",uom_mile,Mile,Meile(n),0
+model,"product.uom,name",uom_millimeter,Millimeter,Millimeter,0
+model,"product.uom,name",uom_minute,Minute,Minuten(n),0
+model,"product.uom,name",uom_once,Ounce,Unze(n),0
+model,"product.uom,name",uom_pound,Pound,Pfund,0
+model,"product.uom,name",uom_second,Second,Sekunde(n),0
+model,"product.uom,name",uom_square_centimeter,Square centimeter,Quadratzentimeter,0
+model,"product.uom,name",uom_square_foot,Square foot,Quadratfuß,0
+model,"product.uom,name",uom_square_inch,Square inch,Quadratzoll,0
+model,"product.uom,name",uom_square_meter,Square meter,Quadratmeter,0
+model,"product.uom,name",uom_square_yard,Square yard,Quadratyard(s),0
+model,"product.uom,name",uom_unit,Unit,Stück,0
+model,"product.uom,name",uom_work_day,Work Day,Arbeitstag(e),0
+model,"product.uom,name",uom_yard,Yard,Yard(s),0
+model,"product.uom,symbol",uom_are,a,a,0
+model,"product.uom,symbol",uom_carat,c,c,0
+model,"product.uom,symbol",uom_centimeter,cm,cm,0
+model,"product.uom,symbol",uom_square_centimeter,cm²,cm²,0
+model,"product.uom,symbol",uom_cubic_centimeter,cm³,cm³,0
+model,"product.uom,symbol",uom_day,d,d,0
+model,"product.uom,symbol",uom_foot,ft,ft,0
+model,"product.uom,symbol",uom_square_foot,ft²,ft²,0
+model,"product.uom,symbol",uom_cubic_foot,ft³,ft³,0
+model,"product.uom,symbol",uom_gram,g,g,0
+model,"product.uom,symbol",uom_gallon,gal,gal,0
+model,"product.uom,symbol",uom_hour,h,h,0
+model,"product.uom,symbol",uom_hectare,ha,ha,0
+model,"product.uom,symbol",uom_inch,in,in,0
+model,"product.uom,symbol",uom_square_inch,in²,in²,0
+model,"product.uom,symbol",uom_cubic_inch,in³,in³,0
+model,"product.uom,symbol",uom_kilogram,kg,kg,0
+model,"product.uom,symbol",uom_kilometer,km,km,0
+model,"product.uom,symbol",uom_liter,l,l,0
+model,"product.uom,symbol",uom_pound,lbs,lbs,0
+model,"product.uom,symbol",uom_meter,m,m,0
+model,"product.uom,symbol",uom_square_meter,m²,m²,0
+model,"product.uom,symbol",uom_cubic_meter,m³,m³,0
+model,"product.uom,symbol",uom_mile,mi,mi,0
+model,"product.uom,symbol",uom_minute,min,min,0
+model,"product.uom,symbol",uom_millimeter,mm,mm,0
+model,"product.uom,symbol",uom_once,oz,oz,0
+model,"product.uom,symbol",uom_second,s,s,0
+model,"product.uom,symbol",uom_unit,u,u,0
+model,"product.uom,symbol",uom_work_day,wd,wd,0
+model,"product.uom,symbol",uom_yard,yd,yd,0
+model,"product.uom,symbol",uom_square_yard,yd²,yd²,0
+model,"res.group,name",group_product_admin,Product Administration,Administration Artikel,0
+selection,"product.template,cost_price_method",0,Average,Durchschnitt,0
+selection,"product.template,cost_price_method",0,Fixed,Fix,0
+selection,"product.template,type",0,Consumable,Verbrauchsmaterial,0
+selection,"product.template,type",0,Service,Dienstleistung,0
+selection,"product.template,type",0,Stockable,Lagerware,0
+view,product.category,0,Childs,Untergeordnet (Kategorien),0
+view,product.category,0,Product Categories,Artikelkategorien,0
+view,product.category,0,Product Category,Artikelkategorie,0
+view,product.product,0,General,Allgemein,0
+view,product.product,0,Product,Artikel,0
+view,product.product,0,Products,Artikel,0
+view,product.product,0,Product Suppliers,Lieferanten,0
+view,product.uom,0,Unit of Measure,Maßeinheit,0
+view,product.uom,0,Units of Measure,Maßeinheiten,0
+view,product.uom.category,0,Categories of Unit of Measure,Kategorien Maßeinheiten,0
+view,product.uom.category,0,Category of Unit of Measure,Kategorie Maßeinheit,0
diff --git a/debian/changelog b/debian/changelog
new file mode 100644
index 0000000..e6fef89
--- /dev/null
+++ b/debian/changelog
@@ -0,0 +1,5 @@
+tryton-modules-product (1.0.0-1) unstable; urgency=low
+
+ * Initial release (Closes: #506095).
+
+ -- Daniel Baumann <daniel at debian.org> Mon, 12 Jan 2009 15:49:00 -0500
diff --git a/debian/compat b/debian/compat
new file mode 100644
index 0000000..7f8f011
--- /dev/null
+++ b/debian/compat
@@ -0,0 +1 @@
+7
diff --git a/debian/control b/debian/control
new file mode 100644
index 0000000..dbfab53
--- /dev/null
+++ b/debian/control
@@ -0,0 +1,20 @@
+Source: tryton-modules-product
+Section: python
+Priority: optional
+Maintainer: Daniel Baumann <daniel at debian.org>
+Build-Depends: debhelper (>= 7), python, python-all-dev, python-setuptools, python-support
+Standards-Version: 3.8.0
+Homepage: http://www.tryton.org/
+Vcs-Browser: http://git.debian.net/?p=debian/tryton-modules-product.git
+Vcs-Git: git://git.debian.net/git/debian/tryton-modules-product.git
+
+Package: tryton-modules-product
+Architecture: any
+Depends: ${misc:Depends}, ${python:Depends}, tryton-server, python-pkg-resources
+XB-Python-Version: ${python:Versions}
+Description: Tryton Application Platform (Product Module)
+ Tryton is a high-level general purpose application platform written in Python
+ and using PostgreSQL as database engine. It is the core base of an ERP.
+ .
+ This module defines products, categories of product, units of measure,
+ categories of units of measure.
diff --git a/debian/copyright b/debian/copyright
new file mode 100644
index 0000000..0088eff
--- /dev/null
+++ b/debian/copyright
@@ -0,0 +1,44 @@
+Author: Tryton Project <http://www.tryton.org/>
+Download: http://www.tryton.org/downloads.html
+
+Files: *
+Copyright:
+ (C) 2004-2008 Tiny SPRL
+ (C) 2008 Cedric Krier
+ (C) 2008 Bertrand Chenal
+ (C) 2008 B2CK SPRL
+License: GPL-3+
+ 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/>.
+ .
+ On Debian systems, the complete text of the GNU General Public License
+ can be found in /usr/share/common-licenses/GPL-3 file.
+
+Files: debian/*
+Copyright: (C) 2009 Daniel Baumann <daniel at debian.org>
+License: GPL-3+
+ 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/>.
+ .
+ On Debian systems, the complete text of the GNU General Public License
+ can be found in /usr/share/common-licenses/GPL-3 file.
diff --git a/debian/pycompat b/debian/pycompat
new file mode 100644
index 0000000..0cfbf08
--- /dev/null
+++ b/debian/pycompat
@@ -0,0 +1 @@
+2
diff --git a/debian/pyversions b/debian/pyversions
new file mode 100644
index 0000000..8b253bc
--- /dev/null
+++ b/debian/pyversions
@@ -0,0 +1 @@
+2.4-
diff --git a/debian/rules b/debian/rules
new file mode 100755
index 0000000..bb21e73
--- /dev/null
+++ b/debian/rules
@@ -0,0 +1,42 @@
+#!/usr/bin/make -f
+
+clean:
+ dh_testdir
+ dh_testroot
+ rm -f build-stamp
+
+ python setup.py clean
+ rm -rf dist build trytond_product.egg-info
+
+ dh_clean
+
+build:
+
+install:
+ dh_testdir
+ dh_testroot
+ dh_prep
+ dh_installdirs
+
+ python setup.py install --single-version-externally-managed --root=$(CURDIR)/debian/tryton-modules-product --install-lib /usr/share/python-support/tryton-modules-product
+
+ find debian/tryton-modules-product -type f -name "*.pyc" | xargs rm -f
+
+binary: binary-indep
+
+binary-arch:
+
+binary-indep: install
+ dh_testdir
+ dh_testroot
+ dh_installchangelogs CHANGELOG
+ dh_installdocs
+ dh_pysupport
+ dh_compress
+ dh_fixperms
+ dh_installdeb
+ dh_gencontrol
+ dh_md5sums
+ dh_builddeb
+
+.PHONY: clean build install binary binary-arch binary-indep
diff --git a/es_ES.csv b/es_ES.csv
new file mode 100644
index 0000000..abd7b69
--- /dev/null
+++ b/es_ES.csv
@@ -0,0 +1,134 @@
+type,name,res_id,src,value,fuzzy
+error,product.uom,0,Rate and factor can not be both equal to zero.,Tasa de cambio y factor no pueden ser cero simultáneamente.,0
+field,"product.category,childs",0,Childs,Hij at s,0
+field,"product.category,complete_name",0,Complete Name,Nombre Completo,0
+field,"product.category,name",0,Name,Nombre,0
+field,"product.category,parent",0,Parent,Padre,0
+field,"product.product,code",0,Code,Código,0
+field,"product.product,description",0,Description,Descripción,0
+field,"product.product,template",0,Product Template,Plantilla de Producto,0
+field,"product.template,active",0,Active,Activo,0
+field,"product.template,category",0,Category,CategorÃa,0
+field,"product.template,cost_price",0,Cost Price,Método de Precio,0
+field,"product.template,cost_price_method",0,Cost Method,Método de Coste,0
+field,"product.template,cost_price_uom",0,Cost Price,Método de Precio,0
+field,"product.template,default_uom",0,Default UOM,UdM Predeterminado,0
+field,"product.template,list_price",0,List Price,Precio de Lista,0
+field,"product.template,list_price_uom",0,List Price,Precio de Lista,0
+field,"product.template,name",0,Name,Nombre,0
+field,"product.template,products",0,Products,Productos,0
+field,"product.template,type",0,Type,Tipo,0
+field,"product.uom,active",0,Active,Activo,0
+field,"product.uom,category",0,UOM Category,CategorÃa UDM,0
+field,"product.uom.category,name",0,Name,Nombre,0
+field,"product.uom.category,uoms",0,Unit of Measures,Unidad de Medidas,0
+field,"product.uom,digits",0,Display Digits,Mostrar DÃgitos,0
+field,"product.uom,factor",0,Factor,Factor,0
+field,"product.uom,name",0,Name,Nombre,0
+field,"product.uom,rate",0,Rate,Tasa de Cambio,0
+field,"product.uom,rounding",0,Rounding Precision,Precisión de Redondeo,0
+field,"product.uom,symbol",0,Symbol,SÃmbolo,0
+help,"product.uom,factor",0,"The coefficient for the formula:
+coef (base unit) = 1 (this unit)",El coeficiente para la fórmula:,0
+help,"product.uom,rate",0,"The coefficient for the formula:
+1 (base unit) = coef (this unit)",El coeficiente para la fórmula:,0
+model,"ir.action,name",act_category_tree,Categories,CategorÃas,0
+model,"ir.action,name",act_uom_category_form,Categories of Unit of Measure,CategorÃas de Unidad de Medida,0
+model,"ir.action,name",act_category_form,Product Categories,CategorÃas de Producto,0
+model,"ir.action,name",act_product_form,Products,Productos,0
+model,"ir.action,name",act_product_form2,Products,Productos,0
+model,"ir.action,name",act_uom_form,Units of Measure,Unidades de Medida,0
+model,"ir.action,name",act_uom_form2,Units of Measure,Unidades de Medida,0
+model,"ir.ui.menu,name",menu_category_tree,Categories,CategorÃas,0
+model,"ir.ui.menu,name",menu_uom_category_form,Categories,CategorÃas,0
+model,"ir.ui.menu,name",menu_category_form,Edit Categories,Editar CategorÃas,0
+model,"ir.ui.menu,name",menu_product_product_new,New Product,Nuevo Producto,0
+model,"ir.ui.menu,name",menu_uom_form2,New Unit of Measure,Nueva Unidad de Mesura,0
+model,"ir.ui.menu,name",menu_main_product,Product,Producto,0
+model,"ir.ui.menu,name",menu_product_product,Products,Productos,0
+model,"ir.ui.menu,name",menu_uom_form,Units of Measure,Unidades de Medida,0
+model,"product.uom.category,name",uom_cat_length,Length,Longitud,0
+model,"product.uom.category,name",uom_cat_surface,Surface,Superficie,0
+model,"product.uom.category,name",uom_cat_time,Time,Tiempo,0
+model,"product.uom.category,name",uom_cat_unit,Units,Unidades,0
+model,"product.uom.category,name",uom_cat_volume,Volume,Volumen,0
+model,"product.uom.category,name",uom_cat_weight,Weight,Peso,0
+model,"product.uom,name",uom_are,Are,Son,0
+model,"product.uom,name",uom_carat,Carat,Carat,0
+model,"product.uom,name",uom_centimeter,centimeter,centÃmetro,0
+model,"product.uom,name",uom_cubic_centimeter,Cubic centimeter,CentÃmetro Cúbico,0
+model,"product.uom,name",uom_cubic_foot,Cubic foot,Pie Cúbico,0
+model,"product.uom,name",uom_cubic_inch,Cubic inch,Pulgada Cúbica,0
+model,"product.uom,name",uom_cubic_meter,Cubic meter,Metro Cúbico,0
+model,"product.uom,name",uom_day,Day,DÃa,0
+model,"product.uom,name",uom_foot,Foot,Pie,0
+model,"product.uom,name",uom_gallon,Gallon,Galón,0
+model,"product.uom,name",uom_gram,Gram,Gram,0
+model,"product.uom,name",uom_hectare,Hectare,Hectárea,0
+model,"product.uom,name",uom_hour,Hour,Hora,0
+model,"product.uom,name",uom_inch,Inch,Pulgada,0
+model,"product.uom,name",uom_kilogram,Kilogram,Kilogramo,0
+model,"product.uom,name",uom_kilometer,Kilometer,Kilómetro,0
+model,"product.uom,name",uom_liter,Liter,Litro,0
+model,"product.uom,name",uom_meter,Meter,Metro,0
+model,"product.uom,name",uom_mile,Mile,Milla,0
+model,"product.uom,name",uom_millimeter,Millimeter,MilÃmetro,0
+model,"product.uom,name",uom_minute,Minute,Minuto,0
+model,"product.uom,name",uom_once,Ounce,Onza,0
+model,"product.uom,name",uom_pound,Pound,Libra,0
+model,"product.uom,name",uom_second,Second,Segundo,0
+model,"product.uom,name",uom_square_centimeter,Square centimeter,CentÃmetro Cuadrado,0
+model,"product.uom,name",uom_square_foot,Square foot,Pie Cuadrado,0
+model,"product.uom,name",uom_square_inch,Square inch,Pulgada Cuadrada,0
+model,"product.uom,name",uom_square_meter,Square meter,Metro Cuadrado,0
+model,"product.uom,name",uom_square_yard,Square yard,Yarda Cuadrada,0
+model,"product.uom,name",uom_unit,Unit,Unidad,0
+model,"product.uom,name",uom_work_day,Work Day,DÃa de Trabajo,0
+model,"product.uom,name",uom_yard,Yard,Yarda,0
+model,"product.uom,symbol",uom_are,a,a,0
+model,"product.uom,symbol",uom_carat,c,c,0
+model,"product.uom,symbol",uom_centimeter,cm,cm,0
+model,"product.uom,symbol",uom_square_centimeter,cm²,cm²,0
+model,"product.uom,symbol",uom_cubic_centimeter,cm³,cm³,0
+model,"product.uom,symbol",uom_day,d,d,0
+model,"product.uom,symbol",uom_foot,ft,pie,0
+model,"product.uom,symbol",uom_square_foot,ft²,pie²,0
+model,"product.uom,symbol",uom_cubic_foot,ft³,pie³,0
+model,"product.uom,symbol",uom_gram,g,g,0
+model,"product.uom,symbol",uom_gallon,gal,gal,0
+model,"product.uom,symbol",uom_hour,h,h,0
+model,"product.uom,symbol",uom_hectare,ha,ha,0
+model,"product.uom,symbol",uom_inch,in,en,0
+model,"product.uom,symbol",uom_square_inch,in²,pul²,0
+model,"product.uom,symbol",uom_cubic_inch,in³,pul³,0
+model,"product.uom,symbol",uom_kilogram,kg,kg,0
+model,"product.uom,symbol",uom_kilometer,km,km,0
+model,"product.uom,symbol",uom_liter,l,l,0
+model,"product.uom,symbol",uom_pound,lbs,lbs,0
+model,"product.uom,symbol",uom_meter,m,m,0
+model,"product.uom,symbol",uom_square_meter,m²,m²,0
+model,"product.uom,symbol",uom_cubic_meter,m³,m³,0
+model,"product.uom,symbol",uom_mile,mi,mi,0
+model,"product.uom,symbol",uom_minute,min,min,0
+model,"product.uom,symbol",uom_millimeter,mm,mm,0
+model,"product.uom,symbol",uom_once,oz,oz,0
+model,"product.uom,symbol",uom_second,s,s,0
+model,"product.uom,symbol",uom_unit,u,u,0
+model,"product.uom,symbol",uom_work_day,wd,wd,0
+model,"product.uom,symbol",uom_yard,yd,yd,0
+model,"product.uom,symbol",uom_square_yard,yd²,yd²,0
+selection,"product.template,cost_price_method",0,Average,Promedio,0
+selection,"product.template,cost_price_method",0,Fixed,Fijo,0
+selection,"product.template,type",0,Consumable,Consumible,0
+selection,"product.template,type",0,Service,Servicios,0
+selection,"product.template,type",0,Stockable,Almacenable,0
+view,product.category,0,Childs,Hij at s,0
+view,product.category,0,Product Categories,CategorÃas de Producto,0
+view,product.category,0,Product Category,CategorÃa de Producto,0
+view,product.product,0,General,General,0
+view,product.product,0,Product,Producto,0
+view,product.product,0,Product Suppliers,Proveedores de Productos,0
+view,product.uom,0,Unit of Measure,Unidad de Medida,0
+view,product.uom,0,Units of Measure,Unidades de Medida,0
+view,product.uom.category,0,Categories of Unit of Measure,CategorÃas de Unidad de Medida,0
+view,product.uom.category,0,Category of Unit of Measure,CategorÃa de unidad de Medida,0
diff --git a/fr_FR.csv b/fr_FR.csv
new file mode 100644
index 0000000..ce7d3cb
--- /dev/null
+++ b/fr_FR.csv
@@ -0,0 +1,58 @@
+type,name,res_id,src,value,fuzzy
+field,"product.category,childs",0,Childs,Enfants,0
+field,"product.category,complete_name",0,Complete Name,Nom Complet,0
+field,"product.category,name",0,Name,Nom,0
+field,"product.category,parent",0,Parent,Parent,0
+field,"product.product,code",0,Code,Code,0
+field,"product.product,description",0,Description,Description,0
+field,"product.product,template",0,Product Template,Modèle Produit,0
+field,"product.template,active",0,Active,Actif,0
+field,"product.template,category",0,Category,Catégorie,0
+field,"product.template,cost_price",0,Cost Price,Prix de Revient,0
+field,"product.template,cost_price_method",0,Cost Method,Méthode de Coût,0
+field,"product.template,cost_price_uom",0,Cost Price,Prix de Revient,0
+field,"product.template,default_uom",0,Default UOM,UDM par Défaut,0
+field,"product.template,list_price",0,List Price,Prix Listé,0
+field,"product.template,list_price_uom",0,List Price,Prix Listé,0
+field,"product.template,name",0,Name,Nom,0
+field,"product.template,type",0,Type,Type,0
+field,"product.uom,active",0,Active,Actif,0
+field,"product.uom,category",0,UOM Category,Catégorie d'UDM,0
+field,"product.uom.category,name",0,Name,Nom,0
+field,"product.uom.category,uoms",0,Unit of Measures,Unité de Mesures,0
+field,"product.uom,factor",0,Factor,Facteur,0
+field,"product.uom,name",0,Name,Nom,0
+field,"product.uom,rate",0,Rate,Taux,0
+field,"product.uom,rounding",0,Rounding Precision,Précision d'Arrondi,0
+field,"product.uom,symbol",0,Symbol,Symbole,0
+help,"product.uom,factor",0,"The coefficient for the formula:
+coef (base unit) = 1 (this unit)","Le coefficient pour la formule:
+coef (unité de base) = 1 (cette unité)",0
+help,"product.uom,rate",0,"The coefficient for the formula:
+1 (base unit) = coef (this unit)","Le coefficient pour la formule:
+1 (unité de base) = coef (cette unité)",0
+model,"ir.ui.menu,name",menu_category_tree,Categories,Catégories,0
+model,"ir.ui.menu,name",menu_uom_category_form,Categories,Catégories,0
+model,"ir.ui.menu,name",menu_category_form,Edit Categories,Éditer les Catégories,0
+model,"ir.ui.menu,name",menu_product_product_new,New Product,Nouveau Produit,0
+model,"ir.ui.menu,name",menu_uom_form2,New Unit of Measure,Nouvelle Unité de Mesure,0
+model,"ir.ui.menu,name",menu_main_product,Product,Produit,0
+model,"ir.ui.menu,name",menu_product_product,Products,Produits,0
+model,"ir.ui.menu,name",menu_uom_form,Units of Measure,Unités de Mesure,0
+selection,"product.template,cost_price_method",0,Average,Moyen,0
+selection,"product.template,cost_price_method",0,Fixed,Fixe,0
+selection,"product.template,type",0,Consumable,Consomable,0
+selection,"product.template,type",0,Service,Sevice,0
+selection,"product.template,type",0,Stockable,Stockable,0
+view,product.category,0,Childs,Enfants,0
+view,product.category,0,Product Categories,Catégories de Produit,0
+view,product.category,0,Product Category,Catégorie de Produit,0
+view,product.category,0,Properties,Propriétés,0
+view,product.product,0,General,Général,0
+view,product.product,0,Product,Produit,0
+view,product.product,0,Products,Produits,0
+view,product.product,0,Properties,Propriétés,0
+view,product.uom,0,Unit of Measure,Unité de Mesure,0
+view,product.uom,0,Units of Measure,Unités de Mesure,0
+view,product.uom.category,0,Categories of Unit of Measure,Catégories d'Unité de Mesure,0
+view,product.uom.category,0,Category of Unit of Measure,Catégorie d'Unité de Mesure,0
diff --git a/product.py b/product.py
new file mode 100644
index 0000000..316db2f
--- /dev/null
+++ b/product.py
@@ -0,0 +1,143 @@
+#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.osv import fields, OSV
+
+STATES = {
+ 'readonly': "active == False",
+}
+
+
+class Template(OSV):
+ "Product Template"
+ _name = "product.template"
+ _description = __doc__
+
+ name = fields.Char('Name', size=None, required=True, translate=True,
+ select=1, states=STATES)
+ type = fields.Selection([
+ ('stockable', 'Stockable'),
+ ('consumable', 'Consumable'),
+ ('service', 'Service')
+ ], 'Type', required=True, states=STATES)
+ category = fields.Many2One('product.category','Category', required=True,
+ states=STATES)
+ list_price = fields.Property(type='numeric', string='List Price',
+ states=STATES, digits=(16, 4))
+ list_price_uom = fields.Function('get_price_uom', string='List Price',
+ type="numeric", digits=(16, 4))
+ cost_price = fields.Property(type='numeric', string='Cost Price',
+ states=STATES, digits=(16, 4))
+ cost_price_uom = fields.Function('get_price_uom', string='Cost Price',
+ type="numeric", digits=(16, 4), states=STATES)
+ cost_price_method = fields.Property(type='selection', selection=[
+ ("fixed", "Fixed"),
+ ("average", "Average")
+ ], string="Cost Method", required=True, states=STATES)
+ default_uom = fields.Many2One('product.uom', 'Default UOM', required=True,
+ states=STATES)
+ active = fields.Boolean('Active')
+ products = fields.One2Many('product.product', 'template', 'Products',
+ states=STATES)
+
+ def default_active(self, cursor, user, context=None):
+ return True
+
+ def default_type(self, cursor, user, context=None):
+ return 'stockable'
+
+ def default_cost_price_method(self, cursor, user, context=None):
+ return 'fixed'
+
+ def get_price_uom(self, cursor, user, ids, name, arg, context=None):
+ product_uom_obj = self.pool.get('product.uom')
+ res = {}
+ if context is None:
+ context = {}
+ field = name[:-4]
+ if context.get('uom'):
+ to_uom = self.pool.get('product.uom').browse(
+ cursor, user, context['uom'], context=context)
+ for product in self.browse(cursor, user, ids, context=context):
+ res[product.id] = product_uom_obj.compute_price(
+ cursor, user, product.default_uom, product[field],
+ to_uom, context=context)
+ else:
+ for product in self.browse(cursor, user, ids, context=context):
+ res[product.id] = product[field]
+ return res
+
+Template()
+
+
+class Product(OSV):
+ "Product"
+ _name = "product.product"
+ _description = __doc__
+ _inherits = {'product.template': 'template'}
+
+ template = fields.Many2One('product.template', 'Product Template',
+ required=True, ondelete='CASCADE')
+ code = fields.Char("Code", size=None)
+ description = fields.Text("Description", translate=True)
+
+ def name_get(self, cursor, user, ids, context=None):
+ if not ids:
+ return []
+ if isinstance(ids, (int, long)):
+ ids = [ids]
+ res = []
+ for product in self.browse(cursor, user, ids, context=context):
+ name = product.name
+ if product.code:
+ name = '[' + product.code + '] ' + product.name
+ res.append((product.id, name))
+ return res
+
+ def name_search(self, cursor, user, name, args=None, operator='ilike',
+ context=None, limit=None):
+ if not args:
+ args = []
+ ids = self.search(cursor, user, [('code', '=', name)] + args,
+ limit=limit, context=context)
+ if ids:
+ return self.name_get(cursor, user, ids, context=context)
+ return super(Product, self).name_search(cursor, user, name,
+ args=args, operator=operator, context=context, limit=limit)
+
+ def delete(self, cursor, user, ids, context=None):
+ template_obj = self.pool.get('product.template')
+
+ if isinstance(ids, (int, long)):
+ ids = [ids]
+
+ # Delete template that have no more product linked
+ cursor.execute('SELECT t.id ' \
+ 'FROM product_product p, product_template t ' \
+ 'WHERE p.template = t.id ' \
+ 'GROUP BY t.id HAVING COUNT(p.template) = 1')
+ template_ids = [x[0] for x in cursor.fetchall()]
+
+ if template_ids:
+ product_ids = self.search(cursor, user, [
+ ('id', 'in', ids),
+ ('template', 'in', template_ids),
+ ], context=context)
+ template_ids = [x.template.id for x in self.browse(cursor, user,
+ product_ids, context=context)]
+
+ res = super(Product, self).delete(cursor, user, ids, context=context)
+
+ if template_ids:
+ template_obj.delete(cursor, user, template_ids, context=context)
+
+ return res
+
+ def copy(self, cursor, user, product_id, default=None, context=None):
+ if default is None:
+ default = {}
+ default = default.copy()
+ default['products'] = False
+ return super(Product, self).copy(cursor, user, product_id,
+ default=default, context=context)
+
+Product()
diff --git a/product.xml b/product.xml
new file mode 100644
index 0000000..7cd44b0
--- /dev/null
+++ b/product.xml
@@ -0,0 +1,158 @@
+<?xml version="1.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. -->
+<tryton>
+ <data>
+
+ <record model="res.group" id="group_product_admin">
+ <field name="name">Product Administration</field>
+ </record>
+ <record model="res.user" id="res.user_admin">
+ <field name="groups" eval="[('add', ref('group_product_admin'))]"/>
+ </record>
+
+ <menuitem name="Product" id="menu_main_product" sequence="1"
+ icon="tryton-package"/>
+
+ <record model="ir.ui.view" id="product_view_tree">
+ <field name="model">product.product</field>
+ <field name="type">tree</field>
+ <field name="arch" type="xml">
+ <![CDATA[
+ <tree string="Products">
+ <field name="name" select="1"/>
+ <field name="code" select="1"/>
+ <field name="list_price_uom" select="2"/>
+ <field name="cost_price_uom" select="2"/>
+ <field name="type" select="2"/>
+ <field name="category" select="1"/>
+ <field name="default_uom" select="2"/>
+ <field name="active" select="2" tree_invisible="1"/>
+ </tree>
+ ]]>
+ </field>
+ </record>
+
+ <record model="ir.ui.view" id="product_view_form">
+ <field name="model">product.product</field>
+ <field name="type">form</field>
+ <field name="arch" type="xml">
+ <![CDATA[
+ <form string="Product">
+ <label name="name"/>
+ <field name="name" xexpand="1"/>
+ <label name="active"/>
+ <field name="active" xexpand="0" width="100"/>
+ <notebook colspan="4">
+ <page string="General">
+ <label name="code"/>
+ <field name="code"/>
+ <label name="type"/>
+ <field name="type"/>
+ <label name="category"/>
+ <field name="category" />
+ <label name="default_uom"/>
+ <field name="default_uom" />
+ <label name="list_price"/>
+ <field name="list_price"/>
+ <newline/>
+ <label name="cost_price"/>
+ <field name="cost_price"/>
+ <label name="cost_price_method"/>
+ <field name="cost_price_method"/>
+ <separator name="description" colspan="4"/>
+ <field name="description" colspan="4"/>
+ </page>
+ </notebook>
+ </form>
+ ]]>
+ </field>
+ </record>
+
+ <record model="ir.action.act_window" id="act_product_form">
+ <field name="name">Products</field>
+ <field name="res_model">product.product</field>
+ <field name="view_type">form</field>
+ </record>
+
+
+ <record model="ir.action.act_window.view" id="act_product_list_view">
+ <field name="sequence" eval="10"/>
+ <field name="view" ref="product_view_tree"/>
+ <field name="act_window" ref="act_product_form"/>
+ </record>
+
+ <record model="ir.action.act_window.view" id="act_product_form_view">
+ <field name="sequence" eval="20"/>
+ <field name="view" ref="product_view_form"/>
+ <field name="act_window" ref="act_product_form"/>
+ </record>
+
+ <menuitem name="Products" parent="menu_main_product"
+ sequence="1" id="menu_product_product"
+ action="act_product_form"/>
+
+ <record model="ir.action.act_window" id="act_product_form2">
+ <field name="name">Products</field>
+ <field name="res_model">product.product</field>
+ <field name="view_type">form</field>
+ </record>
+
+ <record model="ir.action.act_window.view" id="act_product_list_view2">
+ <field name="sequence" eval="20"/>
+ <field name="view" ref="product_view_tree"/>
+ <field name="act_window" ref="act_product_form2"/>
+ </record>
+
+ <record model="ir.action.act_window.view" id="act_product_form_view2">
+ <field name="sequence" eval="10"/>
+ <field name="view" ref="product_view_form"/>
+ <field name="act_window" ref="act_product_form2"/>
+ </record>
+
+ <menuitem name="New Product" parent="menu_product_product"
+ sequence="1" id="menu_product_product_new"
+ action="act_product_form2"/>
+
+
+ <record model="ir.model.access" id="access_product">
+ <field name="model" search="[('model', '=', 'product.product')]"/>
+ <field name="perm_read" eval="True"/>
+ <field name="perm_write" eval="False"/>
+ <field name="perm_create" eval="False"/>
+ <field name="perm_delete" eval="False"/>
+ </record>
+ <record model="ir.model.access" id="access_product_admin">
+ <field name="model" search="[('model', '=', 'product.product')]"/>
+ <field name="group" ref="group_product_admin"/>
+ <field name="perm_read" eval="True"/>
+ <field name="perm_write" eval="True"/>
+ <field name="perm_create" eval="True"/>
+ <field name="perm_delete" eval="True"/>
+ </record>
+
+ <record model="ir.model.access" id="access_product_template">
+ <field name="model" search="[('model', '=', 'product.template')]"/>
+ <field name="perm_read" eval="True"/>
+ <field name="perm_write" eval="False"/>
+ <field name="perm_create" eval="False"/>
+ <field name="perm_delete" eval="False"/>
+ </record>
+ <record model="ir.model.access" id="access_product_template_admin">
+ <field name="model" search="[('model', '=', 'product.template')]"/>
+ <field name="group" ref="group_product_admin"/>
+ <field name="perm_read" eval="True"/>
+ <field name="perm_write" eval="True"/>
+ <field name="perm_create" eval="True"/>
+ <field name="perm_delete" eval="True"/>
+ </record>
+
+ <record model="ir.property" id="property_product_cost_price_method">
+ <field name="name">cost_price_method</field>
+ <field name="field"
+ search="[('model.model', '=', 'product.template'), ('name', '=', 'cost_price_method')]"/>
+ <field name="value">,fixed</field>
+ </record>
+
+ </data>
+</tryton>
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..a002d45
--- /dev/null
+++ b/setup.py
@@ -0,0 +1,56 @@
+#!/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',
+ version=info.get('version', '0.0.1'),
+ description=info.get('description', ''),
+ author=info.get('author', ''),
+ author_email=info.get('email', ''),
+ url=info.get('website', ''),
+ package_dir={'trytond.modules.product': '.'},
+ packages=[
+ 'trytond.modules.product',
+ ],
+ package_data={
+ 'trytond.modules.product': 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,
+)
diff --git a/trytond_product.egg-info/PKG-INFO b/trytond_product.egg-info/PKG-INFO
new file mode 100644
index 0000000..0a7e976
--- /dev/null
+++ b/trytond_product.egg-info/PKG-INFO
@@ -0,0 +1,24 @@
+Metadata-Version: 1.0
+Name: trytond-product
+Version: 1.0.0
+Summary: Define products, categories of product, units of measure, categories of units of measure.
+Home-page: http://www.tryton.org/
+Author: B2CK
+Author-email: info at b2ck.com
+License: GPL-3
+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.egg-info/SOURCES.txt b/trytond_product.egg-info/SOURCES.txt
new file mode 100644
index 0000000..3e225b2
--- /dev/null
+++ b/trytond_product.egg-info/SOURCES.txt
@@ -0,0 +1,23 @@
+CHANGELOG
+COPYRIGHT
+INSTALL
+LICENSE
+MANIFEST.in
+README
+category.xml
+de_DE.csv
+es_ES.csv
+fr_FR.csv
+product.xml
+setup.py
+uom.xml
+./__init__.py
+./__tryton__.py
+./category.py
+./product.py
+./uom.py
+trytond_product.egg-info/PKG-INFO
+trytond_product.egg-info/SOURCES.txt
+trytond_product.egg-info/dependency_links.txt
+trytond_product.egg-info/requires.txt
+trytond_product.egg-info/top_level.txt
\ No newline at end of file
diff --git a/trytond_product.egg-info/dependency_links.txt b/trytond_product.egg-info/dependency_links.txt
new file mode 100644
index 0000000..8b13789
--- /dev/null
+++ b/trytond_product.egg-info/dependency_links.txt
@@ -0,0 +1 @@
+
diff --git a/trytond_product.egg-info/requires.txt b/trytond_product.egg-info/requires.txt
new file mode 100644
index 0000000..e2ef220
--- /dev/null
+++ b/trytond_product.egg-info/requires.txt
@@ -0,0 +1,2 @@
+trytond >= 1.0
+trytond < 1.1
\ No newline at end of file
diff --git a/trytond_product.egg-info/top_level.txt b/trytond_product.egg-info/top_level.txt
new file mode 100644
index 0000000..93df119
--- /dev/null
+++ b/trytond_product.egg-info/top_level.txt
@@ -0,0 +1 @@
+trytond
diff --git a/uom.py b/uom.py
new file mode 100644
index 0000000..d2e2d48
--- /dev/null
+++ b/uom.py
@@ -0,0 +1,248 @@
+#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.osv import fields, OSV, OPERATORS
+from decimal import Decimal
+
+STATES = {
+ 'readonly': "active == False",
+}
+
+class UomCategory(OSV):
+ 'Product uom category'
+ _name = 'product.uom.category'
+ _description = __doc__
+ name = fields.Char('Name', required=True, translate=True)
+ uoms = fields.One2Many('product.uom', 'category', 'Unit of Measures')
+
+ def __init__(self):
+ super(UomCategory, self).__init__()
+ self._order.insert(0, ('name', 'ASC'))
+
+UomCategory()
+
+
+class Uom(OSV):
+ 'Unit of measure'
+ _name = 'product.uom'
+ _description = __doc__
+ name = fields.Char('Name', size=None, required=True, states=STATES,
+ translate=True)
+ symbol = fields.Char('Symbol', size=10, required=True, states=STATES,
+ translate=True)
+ category = fields.Many2One('product.uom.category', 'UOM Category',
+ required=True, ondelete='cascade', states=STATES)
+ rate = fields.Float('Rate', digits=(12, 6), required=True,
+ on_change=['rate'], states=STATES,
+ help='The coefficient for the formula:\n' \
+ '1 (base unit) = coef (this unit)')
+ factor = fields.Float('Factor', digits=(12, 6), states=STATES,
+ on_change=['factor'], required=True,
+ help='The coefficient for the formula:\n' \
+ 'coef (base unit) = 1 (this unit)')
+ rounding = fields.Float('Rounding Precision', digits=(12, 6),
+ required=True, states=STATES)
+ digits = fields.Integer('Display Digits')
+ active = fields.Boolean('Active')
+
+ def __init__(self):
+ super(Uom, self).__init__()
+ self._order.insert(0, ('name', 'ASC'))
+
+ def check_xml_record(self, cursor, user, ids, values, context=None):
+ return True
+
+ def default_rate(self, cursor, user, context=None):
+ return 1.0
+
+ def default_factor(self, cursor, user, context=None):
+ return 1.0
+
+ def default_active(self, cursor, user, context=None):
+ return 1
+
+ def default_rounding(self, cursor, user, context=None):
+ return 0.01
+
+ def default_digits(self, cursor, user, context=None):
+ return 2
+
+ def default_category(self, cursor, user, context=None):
+ category_obj = self.pool.get('product.uom.category')
+ product_obj = self.pool.get('product.product')
+ if context is None:
+ context = {}
+ if 'category' in context:
+ if isinstance(context['category'], (tuple, list)) \
+ and len(context['category']) > 1 \
+ and context['category'][1] in ('uom.category',
+ 'product.default_uom.category'):
+ if context['category'][1] == 'uom.category':
+ if not context['category'][0]:
+ return False
+ uom = self.browse(cursor, user, context['category'][0],
+ context=context)
+ return category_obj.name_get(cursor, user, uom.category.id,
+ context=context)[0]
+ else:
+ if not context['category'][0]:
+ return False
+ product = product_obj.browse(cursor, user,
+ context['category'][0], context=context)
+ return category_obj.name_get(cursor, user,
+ product.default_uom.category.id, context=context)[0]
+ return False
+
+ def on_change_factor(self, cursor, user, ids, value, context=None):
+ if value.get('factor', 0.0) == 0.0:
+ return {'rate': 0.0}
+ return {'rate': round(1.0/value['factor'], 6)}
+
+ def on_change_rate(self, cursor, user, ids, value, context=None):
+ if value.get('rate', 0.0) == 0.0:
+ return {'factor': 0.0}
+ return {'factor': round(1.0/value['rate'], 6)}
+
+
+ def __init__(self):
+ super(Uom, self).__init__()
+ self._sql_constraints += [
+ ('non_zero_rate_factor', 'CHECK((rate != 0.0) or (factor != 0.0))',
+ 'Rate and factor can not be both equal to zero.')
+ ]
+
+
+ @staticmethod
+ def round(number, precision=1.0):
+ return round(number / precision) * precision
+
+ @staticmethod
+ def check_factor_and_rate(values):
+ factor = None
+ rate = None
+ if ('factor' not in values) and ('rate' not in values):
+ return values
+ elif 'factor' in values and 'rate' in values:
+ if values['rate'] == 0.0 and values['factor'] == 0.0:
+ return values
+ elif values['factor'] != 0.0 and \
+ values['rate'] != 0.0:
+ if values['rate'] == round(1.0/values['factor'], 6) or \
+ values['factor'] == round(1.0/values['rate'], 6):
+ return values
+ else:
+ factor = round(1.0/values['rate'], 6)
+ elif values['rate'] != 0.0 and \
+ values['factor'] != round(1.0/values['rate'], 6):
+ factor = round(1.0/values['rate'], 6)
+ elif values['factor'] != 0.0 and \
+ values['rate'] != round(1.0/values['factor'], 6):
+ rate = round(1.0/values['factor'], 6)
+ else:
+ return values
+ elif 'rate' in values:
+ if values['rate'] != 0.0:
+ factor = round(1.0/values['rate'], 6)
+ else:
+ factor = 0.0
+ elif 'factor' in values:
+ if values['factor'] != 0.0:
+ rate = round(1.0/values['factor'], 6)
+ else:
+ rate = 0.0
+
+ if rate != None or factor != None:
+ values = values.copy()
+ if rate != None: values['rate'] = rate
+ if factor != None: values['factor'] = factor
+ return values
+
+ def create(self, cursor, user, values, context=None):
+ values = self.check_factor_and_rate(values)
+ return super(Uom, self).create(cursor, user, values, context)
+
+ def write(self, cursor, user, ids, values, context=None):
+ values = self.check_factor_and_rate(values)
+ return super(Uom, self).write(cursor, user, ids, values, context)
+
+ def compute_qty(self, cursor, user, from_uom, qty, to_uom=False,
+ round=True, context=None):
+ """
+ Convert quantity for given uom's. from_uom and to_uom should
+ be browse records.
+ """
+ if not from_uom or not qty or not to_uom:
+ return qty
+ if from_uom.category.id <> to_uom.category.id:
+ return qty
+ if from_uom.factor >= 1.0: # Choose the more precise field.
+ amount = qty * from_uom.factor
+ else:
+ amount = qty / from_uom.rate
+ if to_uom:
+ if to_uom.factor >= 1.0:
+ amount = amount / to_uom.factor
+ else:
+ amount = amount * to_uom.rate
+ if round:
+ amount = self.round(amount, to_uom.rounding)
+ return amount
+
+ def compute_price(self, cursor, user, from_uom, price, to_uom=False,
+ context=None):
+ """
+ Convert price for given uom's. from_uom and to_uom should be
+ browse records.
+ """
+ if not from_uom or not price or not to_uom:
+ return price
+ if from_uom.category.id <> to_uom.category.id:
+ return price
+
+ if from_uom.factor >= 1.0:
+ new_price = price / Decimal(str(from_uom.factor))
+ else:
+ new_price = price * Decimal(str(from_uom.rate))
+
+ if to_uom.factor >= 1.0:
+ new_price = new_price * Decimal(str(to_uom.factor))
+ else:
+ new_price = new_price / Decimal(str(to_uom.rate))
+
+ return new_price
+
+ def search(self, cursor, user, args, offset=0, limit=None, order=None,
+ context=None, count=False, query_string=False):
+ product_obj = self.pool.get('product.product')
+ args = args[:]
+ def process_args(args):
+ i = 0
+ while i < len(args):
+ #add test for xmlrpc that doesn't handle tuple
+ if (isinstance(args[i], tuple) \
+ or (isinstance(args[i], list) and len(args[i]) > 2 \
+ and args[i][1] in OPERATORS)) \
+ and args[i][0] == 'category' \
+ and isinstance(args[i][2], (list, tuple)) \
+ and len(args[i][2]) == 2 \
+ and args[i][2][1] in ('product.default_uom.category',
+ 'uom.category'):
+ if not args[i][2][0]:
+ args[i] = ('id', '!=', '0')
+ else:
+ if args[i][2][1] == 'product.default_uom.category':
+ product = product_obj.browse(cursor, user,
+ args[i][2][0], context=context)
+ category_id = product.default_uom.category.id
+ else:
+ uom = self.browse(cursor, user, args[i][2][0],
+ context=context)
+ category_id = uom.category.id
+ args[i] = (args[i][0], args[i][1], category_id)
+ elif isinstance(args[i], list):
+ process_args(args[i])
+ i += 1
+ process_args(args)
+ return super(Uom, self).search(cursor, user, args, offset=offset,
+ limit=limit, order=order, context=context, count=count,
+ query_string=query_string)
+
+Uom()
diff --git a/uom.xml b/uom.xml
new file mode 100644
index 0000000..cca04b7
--- /dev/null
+++ b/uom.xml
@@ -0,0 +1,413 @@
+<?xml version="1.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. -->
+<tryton>
+ <data>
+ <record model="ir.ui.view" id="uom_view_tree">
+ <field name="model">product.uom</field>
+ <field name="type">tree</field>
+ <field name="arch" type="xml">
+ <![CDATA[
+ <tree string="Units of Measure">
+ <field name="name" select="1"/>
+ <field name="symbol" select="2"/>
+ <field name="category" select="1"/>
+ <field name="factor" select="2"/>
+ <field name="rate" select="2"/>
+ <field name="rounding" select="2"/>
+ <field name="active" select="2" tree_invisible="1"/>
+ </tree>
+ ]]>
+ </field>
+ </record>
+ <record model="ir.ui.view" id="uom_view_form">
+ <field name="model">product.uom</field>
+ <field name="type">form</field>
+ <field name="arch" type="xml">
+ <![CDATA[
+ <form string="Unit of Measure" col="4">
+ <label name="name"/>
+ <field name="name"/>
+ <label name="category"/>
+ <field name="category"/>
+ <label name="symbol"/>
+ <field name="symbol"/>
+ <label name="active"/>
+ <field name="active"/>
+ <label name="factor"/>
+ <field name="factor"/>
+ <label name="rate"/>
+ <field name="rate"/>
+ <label name="rounding"/>
+ <field name="rounding"/>
+ <label name="digits"/>
+ <field name="digits"/>
+ </form>
+ ]]>
+ </field>
+ </record>
+ <record model="ir.action.act_window" id="act_uom_form">
+ <field name="name">Units of Measure</field>
+ <field name="res_model">product.uom</field>
+ <field name="view_type">form</field>
+ </record>
+ <record model="ir.action.act_window.view" id="act_uom_form_view1">
+ <field name="sequence" eval="10"/>
+ <field name="view" ref="uom_view_tree"/>
+ <field name="act_window" ref="act_uom_form"/>
+ </record>
+ <record model="ir.action.act_window.view" id="act_uom_form_view2">
+ <field name="sequence" eval="20"/>
+ <field name="view" ref="uom_view_form"/>
+ <field name="act_window" ref="act_uom_form"/>
+ </record>
+ <menuitem name="Units of Measure" parent="menu_main_product"
+ sequence="3" id="menu_uom_form" action="act_uom_form"/>
+ <record model="ir.action.act_window" id="act_uom_form2">
+ <field name="name">Units of Measure</field>
+ <field name="res_model">product.uom</field>
+ <field name="view_type">form</field>
+ </record>
+ <record model="ir.action.act_window.view" id="act_uom_form2_view1">
+ <field name="sequence" eval="10"/>
+ <field name="view" ref="uom_view_form"/>
+ <field name="act_window" ref="act_uom_form2"/>
+ </record>
+ <record model="ir.action.act_window.view" id="act_uom_form2_view2">
+ <field name="sequence" eval="20"/>
+ <field name="view" ref="uom_view_tree"/>
+ <field name="act_window" ref="act_uom_form2"/>
+ </record>
+ <menuitem name="New Unit of Measure" id="menu_uom_form2"
+ parent="menu_uom_form" sequence="1" action="act_uom_form2"/>
+
+ <record model="ir.ui.view" id="uom_category_view_tree">
+ <field name="model">product.uom.category</field>
+ <field name="type">tree</field>
+ <field name="arch" type="xml">
+ <![CDATA[
+ <tree string="Categories of Unit of Measure">
+ <field name="name" select="1"/>
+ </tree>
+ ]]>
+ </field>
+ </record>
+
+ <record model="ir.ui.view" id="uom_category_view_form">
+ <field name="model">product.uom.category</field>
+ <field name="type">form</field>
+ <field name="arch" type="xml">
+ <![CDATA[
+ <form string="Category of Unit of Measure" col="6">
+ <label name="name"/>
+ <field name="name"/>
+ </form>
+ ]]>
+ </field>
+ </record>
+
+ <record model="ir.action.act_window" id="act_uom_category_form">
+ <field name="name">Categories of Unit of Measure</field>
+ <field name="res_model">product.uom.category</field>
+ <field name="view_type">form</field>
+ </record>
+ <record model="ir.action.act_window.view" id="act_uom_category_form_view1">
+ <field name="sequence" eval="10"/>
+ <field name="view" ref="uom_category_view_tree"/>
+ <field name="act_window" ref="act_uom_category_form"/>
+ </record>
+ <record model="ir.action.act_window.view" id="act_uom_category_form_view2">
+ <field name="sequence" eval="20"/>
+ <field name="view" ref="uom_category_view_form"/>
+ <field name="act_window" ref="act_uom_category_form"/>
+ </record>
+ <menuitem name="Categories" parent="menu_uom_form" sequence="2"
+ id="menu_uom_category_form"
+ action="act_uom_category_form"/>
+
+
+ <record model="product.uom.category" id="uom_cat_unit">
+ <field name="name">Units</field>
+ </record>
+ <record model="product.uom" id="uom_unit">
+ <field name="name">Unit</field>
+ <field name="symbol">u</field>
+ <field name="category" ref="uom_cat_unit"/>
+ <field name="rate" eval="1"/>
+ <field name="factor" eval="1"/>
+ <field name="rounding" eval="1"/>
+ <field name="digits" eval="0"/>
+ </record>
+
+ <record model="product.uom.category" id="uom_cat_weight">
+ <field name="name">Weight</field>
+ </record>
+ <record model="product.uom" id="uom_kilogram">
+ <field name="name">Kilogram</field>
+ <field name="symbol">kg</field>
+ <field name="category" ref="uom_cat_weight"/>
+ <field name="factor" eval="1000"/>
+ <field name="rate" eval="0.001"/>
+ </record>
+ <record model="product.uom" id="uom_gram">
+ <field name="name">Gram</field>
+ <field name="symbol">g</field>
+ <field name="category" ref="uom_cat_weight"/>
+ <field name="rate" eval="1"/>
+ <field name="factor" eval="1"/>
+ </record>
+ <record model="product.uom" id="uom_carat">
+ <field name="name">Carat</field>
+ <field name="symbol">c</field>
+ <field name="category" ref="uom_cat_weight"/>
+ <field name="rate" eval="0.2"/>
+ <field name="factor" eval="5"/>
+ </record>
+ <record model="product.uom" id="uom_pound">
+ <field name="name">Pound</field>
+ <field name="symbol">lbs</field>
+ <field name="category" ref="uom_cat_weight"/>
+ <field name="factor" eval="453.592"/>
+ <field name="rate" eval="0.002205"/>
+ </record>
+ <record model="product.uom" id="uom_once">
+ <field name="name">Ounce</field>
+ <field name="symbol">oz</field>
+ <field name="category" ref="uom_cat_weight"/>
+ <field name="factor" eval="28.3495"/>
+ <field name="rate" eval="0.0352740"/>
+ </record>
+
+ <record model="product.uom.category" id="uom_cat_time">
+ <field name="name">Time</field>
+ </record>
+ <record model="product.uom" id="uom_second">
+ <field name="name">Second</field>
+ <field name="symbol">s</field>
+ <field name="category" ref="uom_cat_time"/>
+ <field name="rate" eval="3600"/>
+ <field name="factor" eval="1.0/3600"/>
+ </record>
+ <record model="product.uom" id="uom_minute">
+ <field name="name">Minute</field>
+ <field name="symbol">min</field>
+ <field name="category" ref="uom_cat_time"/>
+ <field name="rate" eval="60"/>
+ <field name="factor" eval="1.0/60"/>
+ </record>
+ <record model="product.uom" id="uom_hour">
+ <field name="name">Hour</field>
+ <field name="symbol">h</field>
+ <field name="category" ref="uom_cat_time"/>
+ <field name="rate" eval="1"/>
+ <field name="factor" eval="1"/>
+ </record>
+ <record model="product.uom" id="uom_work_day">
+ <field name="name">Work Day</field>
+ <field name="symbol">wd</field>
+ <field name="category" ref="uom_cat_time"/>
+ <field name="rate" eval="1.0/8"/>
+ <field name="factor" eval="8"/>
+ </record>
+ <record model="product.uom" id="uom_day">
+ <field name="name">Day</field>
+ <field name="symbol">d</field>
+ <field name="category" ref="uom_cat_time"/>
+ <field name="rate" eval="1.0/24"/>
+ <field name="factor" eval="24"/>
+ </record>
+
+
+ <record model="product.uom.category" id="uom_cat_length">
+ <field name="name">Length</field>
+ </record>
+ <record model="product.uom" id="uom_meter">
+ <field name="name">Meter</field>
+ <field name="symbol">m</field>
+ <field name="category" ref="uom_cat_length"/>
+ <field name="rate" eval="1"/>
+ <field name="factor" eval="1"/>
+ </record>
+ <record model="product.uom" id="uom_kilometer">
+ <field name="name">Kilometer</field>
+ <field name="symbol">km</field>
+ <field name="category" ref="uom_cat_length"/>
+ <field name="factor" eval="1000"/>
+ <field name="rate" eval="0.001"/>
+ </record>
+ <record model="product.uom" id="uom_centimeter">
+ <field name="name">centimeter</field>
+ <field name="symbol">cm</field>
+ <field name="category" ref="uom_cat_length"/>
+ <field name="rate" eval="100"/>
+ <field name="factor" eval="0.01"/>
+ </record>
+ <record model="product.uom" id="uom_millimeter">
+ <field name="name">Millimeter</field>
+ <field name="symbol">mm</field>
+ <field name="category" ref="uom_cat_length"/>
+ <field name="factor" eval="0.001"/>
+ <field name="rate" eval="1000"/>
+ </record>
+ <record model="product.uom" id="uom_foot">
+ <field name="name">Foot</field>
+ <field name="symbol">ft</field>
+ <field name="category" ref="uom_cat_length"/>
+ <field name="rate" eval="3.28084"/>
+ <field name="factor" eval="0.304800"/>
+ </record>
+ <record model="product.uom" id="uom_yard">
+ <field name="name">Yard</field>
+ <field name="symbol">yd</field>
+ <field name="category" ref="uom_cat_length"/>
+ <field name="factor" eval="0.914400"/>
+ <field name="rate" eval="1.093613"/>
+ </record>
+ <record model="product.uom" id="uom_inch">
+ <field name="name">Inch</field>
+ <field name="symbol">in</field>
+ <field name="category" ref="uom_cat_length"/>
+ <field name="factor" eval="0.02540"/>
+ <field name="rate" eval="39.3701"/>
+ </record>
+ <record model="product.uom" id="uom_mile">
+ <field name="name">Mile</field>
+ <field name="symbol">mi</field>
+ <field name="category" ref="uom_cat_length"/>
+ <field name="factor" eval="1609.344"/>
+ <field name="rate" eval="0.000621"/>
+ </record>
+
+ <record model="product.uom.category" id="uom_cat_volume">
+ <field name="name">Volume</field>
+ </record>
+ <record model="product.uom" id="uom_cubic_meter">
+ <field name="name">Cubic meter</field>
+ <field name="symbol">m³</field>
+ <field name="category" ref="uom_cat_volume"/>
+ <field name="factor" eval="1000"/>
+ <field name="rate" eval="0.001"/>
+ </record>
+ <record model="product.uom" id="uom_liter">
+ <field name="name">Liter</field>
+ <field name="symbol">l</field>
+ <field name="category" ref="uom_cat_length"/>
+ <field name="factor" eval="1"/>
+ <field name="rate" eval="1"/>
+ </record>
+ <record model="product.uom" id="uom_cubic_centimeter">
+ <field name="name">Cubic centimeter</field>
+ <field name="symbol">cm³</field>
+ <field name="category" ref="uom_cat_volume"/>
+ <field name="factor" eval="0.001"/>
+ <field name="rate" eval="1000"/>
+ </record>
+ <record model="product.uom" id="uom_cubic_inch">
+ <field name="name">Cubic inch</field>
+ <field name="symbol">in³</field>
+ <field name="category" ref="uom_cat_volume"/>
+ <field name="factor" eval="0.016387"/>
+ <field name="rate" eval="61.023744"/>
+ </record>
+ <record model="product.uom" id="uom_cubic_foot">
+ <field name="name">Cubic foot</field>
+ <field name="symbol">ft³</field>
+ <field name="category" ref="uom_cat_volume"/>
+ <field name="factor" eval="28.316847"/>
+ <field name="rate" eval="0.035315"/>
+ </record>
+ <record model="product.uom" id="uom_gallon">
+ <field name="name">Gallon</field>
+ <field name="symbol">gal</field>
+ <field name="category" ref="uom_cat_volume"/>
+ <field name="factor" eval="3.785412"/>
+ <field name="rate" eval="0.264172"/>
+ </record>
+
+ <record model="product.uom.category" id="uom_cat_surface">
+ <field name="name">Surface</field>
+ </record>
+ <record model="product.uom" id="uom_square_meter">
+ <field name="name">Square meter</field>
+ <field name="symbol">m²</field>
+ <field name="category" ref="uom_cat_surface"/>
+ <field name="factor" eval="1"/>
+ <field name="rate" eval="1"/>
+ </record>
+ <record model="product.uom" id="uom_square_centimeter">
+ <field name="name">Square centimeter</field>
+ <field name="symbol">cm²</field>
+ <field name="category" ref="uom_cat_surface"/>
+ <field name="factor" eval="0.0001"/>
+ <field name="rate" eval="10000"/>
+ </record>
+ <record model="product.uom" id="uom_are">
+ <field name="name">Are</field>
+ <field name="symbol">a</field>
+ <field name="category" ref="uom_cat_surface"/>
+ <field name="factor" eval="100"/>
+ <field name="rate" eval="0.01"/>
+ </record>
+ <record model="product.uom" id="uom_hectare">
+ <field name="name">Hectare</field>
+ <field name="symbol">ha</field>
+ <field name="category" ref="uom_cat_surface"/>
+ <field name="factor" eval="10000"/>
+ <field name="rate" eval="0.0001"/>
+ </record>
+ <record model="product.uom" id="uom_square_inch">
+ <field name="name">Square inch</field>
+ <field name="symbol">in²</field>
+ <field name="category" ref="uom_cat_surface"/>
+ <field name="factor" eval="0.000645"/>
+ <field name="rate" eval="1550.0"/>
+ </record>
+ <record model="product.uom" id="uom_square_foot">
+ <field name="name">Square foot</field>
+ <field name="symbol">ft²</field>
+ <field name="category" ref="uom_cat_surface"/>
+ <field name="factor" eval="0.092903"/>
+ <field name="rate" eval="10.7639"/>
+ </record>
+ <record model="product.uom" id="uom_square_yard">
+ <field name="name">Square yard</field>
+ <field name="symbol">yd²</field>
+ <field name="category" ref="uom_cat_surface"/>
+ <field name="factor" eval="0.836127"/>
+ <field name="rate" eval="1.19599"/>
+ </record>
+
+
+ <record model="ir.model.access" id="access_uom">
+ <field name="model" search="[('model', '=', 'product.uom')]"/>
+ <field name="perm_read" eval="True"/>
+ <field name="perm_write" eval="False"/>
+ <field name="perm_create" eval="False"/>
+ <field name="perm_delete" eval="False"/>
+ </record>
+ <record model="ir.model.access" id="access_uom_admin">
+ <field name="model" search="[('model', '=', 'product.uom')]"/>
+ <field name="group" ref="group_product_admin"/>
+ <field name="perm_read" eval="True"/>
+ <field name="perm_write" eval="True"/>
+ <field name="perm_create" eval="True"/>
+ <field name="perm_delete" eval="True"/>
+ </record>
+
+ <record model="ir.model.access" id="access_uom_category">
+ <field name="model" search="[('model', '=', 'product.uom.category')]"/>
+ <field name="perm_read" eval="True"/>
+ <field name="perm_write" eval="False"/>
+ <field name="perm_create" eval="False"/>
+ <field name="perm_delete" eval="False"/>
+ </record>
+ <record model="ir.model.access" id="access_uom_category_admin">
+ <field name="model" search="[('model', '=', 'product.uom.category')]"/>
+ <field name="group" ref="group_product_admin"/>
+ <field name="perm_read" eval="True"/>
+ <field name="perm_write" eval="True"/>
+ <field name="perm_create" eval="True"/>
+ <field name="perm_delete" eval="True"/>
+ </record>
+
+ </data>
+</tryton>
--
tryton-modules-product
More information about the tryton-debian-vcs
mailing list