[tryton-debian-vcs] tryton-modules-product branch upstream updated. upstream/3.8.0-2-g8571b5e

Mathias Behrle tryton-debian-vcs at alioth.debian.org
Thu Jun 2 16:21:29 UTC 2016


The following commit has been merged in the upstream branch:
https://alioth.debian.org/plugins/scmgit/cgi-bin/gitweb.cgi/?p=tryton/tryton-modules-product.git;a=commitdiff;h=upstream/3.8.0-2-g8571b5e

commit 8571b5e1995586231d79e17477243c5085e7b5a6
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Fri May 27 18:35:23 2016 +0200

    Adding upstream version 4.0.1.
    
    Signed-off-by: Mathias Behrle <mathiasb at m9s.biz>

diff --git a/CHANGELOG b/CHANGELOG
index 85478cf..cfd4198 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 4.0.1 - 2016-05-11
+* Bug fixes (see mercurial logs for details)
+
 Version 4.0.0 - 2016-05-02
 * Bug fixes (see mercurial logs for details)
 * Replace category by categories on Template
diff --git a/PKG-INFO b/PKG-INFO
index b945f7e..bdfa482 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: trytond_product
-Version: 4.0.0
+Version: 4.0.1
 Summary: Tryton module with products
 Home-page: http://www.tryton.org/
 Author: Tryton
diff --git a/locale/ca_ES.po b/locale/ca_ES.po
index 4ec05a8..bd39f5c 100644
--- a/locale/ca_ES.po
+++ b/locale/ca_ES.po
@@ -18,7 +18,6 @@ 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."
 
-#, fuzzy
 msgctxt "error:product.uom:"
 msgid "You cannot change Rate, Factor or Category on a Unit of Measure."
 msgstr ""
@@ -61,36 +60,30 @@ msgctxt "field:product.category,write_uid:"
 msgid "Write User"
 msgstr "Usuari modificació"
 
-#, fuzzy
 msgctxt "field:product.configuration,create_date:"
 msgid "Create Date"
 msgstr "Data creació"
 
-#, fuzzy
 msgctxt "field:product.configuration,create_uid:"
 msgid "Create User"
 msgstr "Usuari creació"
 
 msgctxt "field:product.configuration,default_cost_price_method:"
 msgid "Default Cost Method"
-msgstr ""
+msgstr "Mètode de cost per defecte"
 
-#, fuzzy
 msgctxt "field:product.configuration,id:"
 msgid "ID"
 msgstr "ID"
 
-#, fuzzy
 msgctxt "field:product.configuration,rec_name:"
 msgid "Name"
 msgstr "Nom"
 
-#, fuzzy
 msgctxt "field:product.configuration,write_date:"
 msgid "Write Date"
 msgstr "Data modificació"
 
-#, fuzzy
 msgctxt "field:product.configuration,write_uid:"
 msgid "Write User"
 msgstr "Usuari modificació"
@@ -99,7 +92,6 @@ msgctxt "field:product.product,active:"
 msgid "Active"
 msgstr "Actiu"
 
-#, fuzzy
 msgctxt "field:product.product,categories:"
 msgid "Categories"
 msgstr "Categories"
@@ -108,17 +100,14 @@ msgctxt "field:product.product,code:"
 msgid "Code"
 msgstr "Codi"
 
-#, fuzzy
 msgctxt "field:product.product,consumable:"
 msgid "Consumable"
 msgstr "Consumible"
 
-#, fuzzy
 msgctxt "field:product.product,cost_price:"
 msgid "Cost Price"
 msgstr "Preu de cost"
 
-#, fuzzy
 msgctxt "field:product.product,cost_price_method:"
 msgid "Cost Method"
 msgstr "Mètode de cost"
@@ -139,7 +128,6 @@ msgctxt "field:product.product,default_uom:"
 msgid "Default UOM"
 msgstr "UdM per defecte"
 
-#, fuzzy
 msgctxt "field:product.product,default_uom_category:"
 msgid "Default UOM Category"
 msgstr "Categoria per defecte UdM"
@@ -152,7 +140,6 @@ msgctxt "field:product.product,id:"
 msgid "ID"
 msgstr "ID"
 
-#, fuzzy
 msgctxt "field:product.product,list_price:"
 msgid "List Price"
 msgstr "Preu de venda"
@@ -161,7 +148,6 @@ msgctxt "field:product.product,list_price_uom:"
 msgid "List Price"
 msgstr "Preu de venda"
 
-#, fuzzy
 msgctxt "field:product.product,name:"
 msgid "Name"
 msgstr "Nom"
@@ -190,7 +176,6 @@ msgctxt "field:product.template,active:"
 msgid "Active"
 msgstr "Actiu"
 
-#, fuzzy
 msgctxt "field:product.template,categories:"
 msgid "Categories"
 msgstr "Categories"
@@ -255,41 +240,34 @@ msgctxt "field:product.template,write_uid:"
 msgid "Write User"
 msgstr "Usuari modificació"
 
-#, fuzzy
 msgctxt "field:product.template-product.category,category:"
 msgid "Category"
 msgstr "Categoria"
 
-#, fuzzy
 msgctxt "field:product.template-product.category,create_date:"
 msgid "Create Date"
 msgstr "Data creació"
 
-#, fuzzy
 msgctxt "field:product.template-product.category,create_uid:"
 msgid "Create User"
 msgstr "Usuari creació"
 
-#, fuzzy
 msgctxt "field:product.template-product.category,id:"
 msgid "ID"
 msgstr "ID"
 
-#, fuzzy
 msgctxt "field:product.template-product.category,rec_name:"
 msgid "Name"
 msgstr "Nom"
 
 msgctxt "field:product.template-product.category,template:"
 msgid "Template"
-msgstr ""
+msgstr "Plantilla"
 
-#, fuzzy
 msgctxt "field:product.template-product.category,write_date:"
 msgid "Write Date"
 msgstr "Data modificació"
 
-#, fuzzy
 msgctxt "field:product.template-product.category,write_uid:"
 msgid "Write User"
 msgstr "Usuari modificació"
@@ -400,15 +378,15 @@ msgstr ""
 
 msgctxt "model:ir.action,name:act_category_list"
 msgid "Categories"
-msgstr "Categories"
+msgstr "Categories de producte"
 
 msgctxt "model:ir.action,name:act_category_tree"
 msgid "Categories"
-msgstr "Categories"
+msgstr "Categories de producte"
 
 msgctxt "model:ir.action,name:act_product_configuration_form"
 msgid "Product Configuration"
-msgstr ""
+msgstr "Configuració de productes"
 
 msgctxt "model:ir.action,name:act_product_form"
 msgid "Variants"
@@ -436,11 +414,11 @@ msgstr "Categories"
 
 msgctxt "model:ir.ui.menu,name:menu_category_tree"
 msgid "Categories"
-msgstr "Categories"
+msgstr "Arbre de categories"
 
 msgctxt "model:ir.ui.menu,name:menu_configuration"
 msgid "Configuration"
-msgstr ""
+msgstr "Configuració"
 
 msgctxt "model:ir.ui.menu,name:menu_main_product"
 msgid "Product"
@@ -452,7 +430,7 @@ msgstr "Variants"
 
 msgctxt "model:ir.ui.menu,name:menu_product_configuration"
 msgid "Product Configuration"
-msgstr ""
+msgstr "Productes"
 
 msgctxt "model:ir.ui.menu,name:menu_template"
 msgid "Products"
@@ -472,7 +450,7 @@ msgstr "Categoria de producte"
 
 msgctxt "model:product.configuration,name:"
 msgid "Product Configuration"
-msgstr ""
+msgstr "Configuració de productes"
 
 msgctxt "model:product.product,name:"
 msgid "Product Variant"
@@ -484,7 +462,7 @@ msgstr "Plantilla de producte"
 
 msgctxt "model:product.template-product.category,name:"
 msgid "Template - Category"
-msgstr ""
+msgstr "Plantilla - Categoria"
 
 msgctxt "model:product.uom,name:"
 msgid "Unit of measure"
@@ -782,22 +760,18 @@ msgctxt "selection:product.configuration,default_cost_price_method:"
 msgid ""
 msgstr ""
 
-#, fuzzy
 msgctxt "selection:product.configuration,default_cost_price_method:"
 msgid "Average"
 msgstr "Mitjana"
 
-#, fuzzy
 msgctxt "selection:product.configuration,default_cost_price_method:"
 msgid "Fixed"
 msgstr "Fix"
 
-#, fuzzy
 msgctxt "selection:product.product,cost_price_method:"
 msgid "Average"
 msgstr "Mitjana"
 
-#, fuzzy
 msgctxt "selection:product.product,cost_price_method:"
 msgid "Fixed"
 msgstr "Fix"
@@ -848,7 +822,7 @@ msgstr "Categoria de producte"
 
 msgctxt "view:product.configuration:"
 msgid "Party Configuration"
-msgstr ""
+msgstr "Configuració de tercers"
 
 msgctxt "view:product.product:"
 msgid "Product"
diff --git a/locale/de_DE.po b/locale/de_DE.po
index 106c88c..09ab359 100644
--- a/locale/de_DE.po
+++ b/locale/de_DE.po
@@ -18,7 +18,6 @@ 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"
 
-#, fuzzy
 msgctxt "error:product.uom:"
 msgid "You cannot change Rate, Factor or Category on a Unit of Measure."
 msgstr ""
@@ -61,36 +60,30 @@ msgctxt "field:product.category,write_uid:"
 msgid "Write User"
 msgstr "Letzte Änderung durch"
 
-#, fuzzy
 msgctxt "field:product.configuration,create_date:"
 msgid "Create Date"
 msgstr "Erstellungsdatum"
 
-#, fuzzy
 msgctxt "field:product.configuration,create_uid:"
 msgid "Create User"
 msgstr "Erstellt durch"
 
 msgctxt "field:product.configuration,default_cost_price_method:"
 msgid "Default Cost Method"
-msgstr ""
+msgstr "Standardkostenmethode"
 
-#, fuzzy
 msgctxt "field:product.configuration,id:"
 msgid "ID"
 msgstr "ID"
 
-#, fuzzy
 msgctxt "field:product.configuration,rec_name:"
 msgid "Name"
 msgstr "Name"
 
-#, fuzzy
 msgctxt "field:product.configuration,write_date:"
 msgid "Write Date"
 msgstr "Zuletzt geändert"
 
-#, fuzzy
 msgctxt "field:product.configuration,write_uid:"
 msgid "Write User"
 msgstr "Letzte Änderung durch"
@@ -99,7 +92,6 @@ msgctxt "field:product.product,active:"
 msgid "Active"
 msgstr "Aktiv"
 
-#, fuzzy
 msgctxt "field:product.product,categories:"
 msgid "Categories"
 msgstr "Artikelkategorien"
@@ -108,17 +100,14 @@ msgctxt "field:product.product,code:"
 msgid "Code"
 msgstr "Variantennummer"
 
-#, fuzzy
 msgctxt "field:product.product,consumable:"
 msgid "Consumable"
 msgstr "Verbrauchsmaterial"
 
-#, fuzzy
 msgctxt "field:product.product,cost_price:"
 msgid "Cost Price"
 msgstr "Kostenpreis"
 
-#, fuzzy
 msgctxt "field:product.product,cost_price_method:"
 msgid "Cost Method"
 msgstr "Kostenmethode"
@@ -139,10 +128,9 @@ msgctxt "field:product.product,default_uom:"
 msgid "Default UOM"
 msgstr "Standardeinheit"
 
-#, fuzzy
 msgctxt "field:product.product,default_uom_category:"
 msgid "Default UOM Category"
-msgstr "Standardkategorie Maßeinheit"
+msgstr "Standardmaßeinheit Kategorie"
 
 msgctxt "field:product.product,description:"
 msgid "Description"
@@ -152,7 +140,6 @@ msgctxt "field:product.product,id:"
 msgid "ID"
 msgstr "ID"
 
-#, fuzzy
 msgctxt "field:product.product,list_price:"
 msgid "List Price"
 msgstr "Listenpreis"
@@ -161,7 +148,6 @@ msgctxt "field:product.product,list_price_uom:"
 msgid "List Price"
 msgstr "Listenpreis"
 
-#, fuzzy
 msgctxt "field:product.product,name:"
 msgid "Name"
 msgstr "Name"
@@ -190,7 +176,6 @@ msgctxt "field:product.template,active:"
 msgid "Active"
 msgstr "Aktiv"
 
-#, fuzzy
 msgctxt "field:product.template,categories:"
 msgid "Categories"
 msgstr "Artikelkategorien"
@@ -255,41 +240,34 @@ msgctxt "field:product.template,write_uid:"
 msgid "Write User"
 msgstr "Letzte Änderung durch"
 
-#, fuzzy
 msgctxt "field:product.template-product.category,category:"
 msgid "Category"
 msgstr "Artikelkategorie"
 
-#, fuzzy
 msgctxt "field:product.template-product.category,create_date:"
 msgid "Create Date"
 msgstr "Erstellungsdatum"
 
-#, fuzzy
 msgctxt "field:product.template-product.category,create_uid:"
 msgid "Create User"
 msgstr "Erstellt durch"
 
-#, fuzzy
 msgctxt "field:product.template-product.category,id:"
 msgid "ID"
 msgstr "ID"
 
-#, fuzzy
 msgctxt "field:product.template-product.category,rec_name:"
 msgid "Name"
 msgstr "Name"
 
 msgctxt "field:product.template-product.category,template:"
 msgid "Template"
-msgstr ""
+msgstr "Vorlage für Steuerkonto"
 
-#, fuzzy
 msgctxt "field:product.template-product.category,write_date:"
 msgid "Write Date"
 msgstr "Zuletzt geändert"
 
-#, fuzzy
 msgctxt "field:product.template-product.category,write_uid:"
 msgid "Write User"
 msgstr "Letzte Änderung durch"
@@ -410,7 +388,7 @@ msgstr "Artikelkategorien"
 
 msgctxt "model:ir.action,name:act_product_configuration_form"
 msgid "Product Configuration"
-msgstr ""
+msgstr "Einstellungen Artikel"
 
 msgctxt "model:ir.action,name:act_product_form"
 msgid "Variants"
@@ -442,7 +420,7 @@ msgstr "Artikelkategorien"
 
 msgctxt "model:ir.ui.menu,name:menu_configuration"
 msgid "Configuration"
-msgstr ""
+msgstr "Einstellungen"
 
 msgctxt "model:ir.ui.menu,name:menu_main_product"
 msgid "Product"
@@ -454,7 +432,7 @@ msgstr "Varianten"
 
 msgctxt "model:ir.ui.menu,name:menu_product_configuration"
 msgid "Product Configuration"
-msgstr ""
+msgstr "Artikel"
 
 msgctxt "model:ir.ui.menu,name:menu_template"
 msgid "Products"
@@ -474,7 +452,7 @@ msgstr "Artikel Kategorie"
 
 msgctxt "model:product.configuration,name:"
 msgid "Product Configuration"
-msgstr ""
+msgstr "Einstellungen Artikel"
 
 msgctxt "model:product.product,name:"
 msgid "Product Variant"
@@ -486,7 +464,7 @@ msgstr "Artikel"
 
 msgctxt "model:product.template-product.category,name:"
 msgid "Template - Category"
-msgstr ""
+msgstr "Artikel - Kategorie"
 
 msgctxt "model:product.uom,name:"
 msgid "Unit of measure"
@@ -782,24 +760,20 @@ msgstr "Artikel Administration"
 
 msgctxt "selection:product.configuration,default_cost_price_method:"
 msgid ""
-msgstr ""
+msgstr " "
 
-#, fuzzy
 msgctxt "selection:product.configuration,default_cost_price_method:"
 msgid "Average"
 msgstr "Durchschnitt"
 
-#, fuzzy
 msgctxt "selection:product.configuration,default_cost_price_method:"
 msgid "Fixed"
 msgstr "Fix"
 
-#, fuzzy
 msgctxt "selection:product.product,cost_price_method:"
 msgid "Average"
 msgstr "Durchschnitt"
 
-#, fuzzy
 msgctxt "selection:product.product,cost_price_method:"
 msgid "Fixed"
 msgstr "Fix"
@@ -850,7 +824,7 @@ msgstr "Artikelkategorie"
 
 msgctxt "view:product.configuration:"
 msgid "Party Configuration"
-msgstr ""
+msgstr "Partei"
 
 msgctxt "view:product.product:"
 msgid "Product"
diff --git a/locale/es_AR.po b/locale/es_AR.po
index 84412ab..8738017 100644
--- a/locale/es_AR.po
+++ b/locale/es_AR.po
@@ -18,7 +18,6 @@ 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."
 
-#, fuzzy
 msgctxt "error:product.uom:"
 msgid "You cannot change Rate, Factor or Category on a Unit of Measure."
 msgstr ""
@@ -61,36 +60,30 @@ msgctxt "field:product.category,write_uid:"
 msgid "Write User"
 msgstr "Usuario modificación"
 
-#, fuzzy
 msgctxt "field:product.configuration,create_date:"
 msgid "Create Date"
 msgstr "Fecha creación"
 
-#, fuzzy
 msgctxt "field:product.configuration,create_uid:"
 msgid "Create User"
 msgstr "Usuario creación"
 
 msgctxt "field:product.configuration,default_cost_price_method:"
 msgid "Default Cost Method"
-msgstr ""
+msgstr "Método de costo por defecto"
 
-#, fuzzy
 msgctxt "field:product.configuration,id:"
 msgid "ID"
 msgstr "ID"
 
-#, fuzzy
 msgctxt "field:product.configuration,rec_name:"
 msgid "Name"
 msgstr "Nombre"
 
-#, fuzzy
 msgctxt "field:product.configuration,write_date:"
 msgid "Write Date"
 msgstr "Fecha modificación"
 
-#, fuzzy
 msgctxt "field:product.configuration,write_uid:"
 msgid "Write User"
 msgstr "Usuario modificación"
@@ -99,7 +92,6 @@ msgctxt "field:product.product,active:"
 msgid "Active"
 msgstr "Activo"
 
-#, fuzzy
 msgctxt "field:product.product,categories:"
 msgid "Categories"
 msgstr "Categorías"
@@ -108,17 +100,14 @@ msgctxt "field:product.product,code:"
 msgid "Code"
 msgstr "Código"
 
-#, fuzzy
 msgctxt "field:product.product,consumable:"
 msgid "Consumable"
 msgstr "Consumible"
 
-#, fuzzy
 msgctxt "field:product.product,cost_price:"
 msgid "Cost Price"
 msgstr "Precio de costo"
 
-#, fuzzy
 msgctxt "field:product.product,cost_price_method:"
 msgid "Cost Method"
 msgstr "Método de costo"
@@ -139,7 +128,6 @@ msgctxt "field:product.product,default_uom:"
 msgid "Default UOM"
 msgstr "UdM por defecto"
 
-#, fuzzy
 msgctxt "field:product.product,default_uom_category:"
 msgid "Default UOM Category"
 msgstr "Categoría de UdM por defecto"
@@ -152,7 +140,6 @@ msgctxt "field:product.product,id:"
 msgid "ID"
 msgstr "ID"
 
-#, fuzzy
 msgctxt "field:product.product,list_price:"
 msgid "List Price"
 msgstr "Precio de lista"
@@ -161,7 +148,6 @@ msgctxt "field:product.product,list_price_uom:"
 msgid "List Price"
 msgstr "Precio de lista"
 
-#, fuzzy
 msgctxt "field:product.product,name:"
 msgid "Name"
 msgstr "Nombre"
@@ -190,7 +176,6 @@ msgctxt "field:product.template,active:"
 msgid "Active"
 msgstr "Activo"
 
-#, fuzzy
 msgctxt "field:product.template,categories:"
 msgid "Categories"
 msgstr "Categorías"
@@ -255,41 +240,34 @@ msgctxt "field:product.template,write_uid:"
 msgid "Write User"
 msgstr "Usuario modificación"
 
-#, fuzzy
 msgctxt "field:product.template-product.category,category:"
 msgid "Category"
 msgstr "Categoría"
 
-#, fuzzy
 msgctxt "field:product.template-product.category,create_date:"
 msgid "Create Date"
 msgstr "Fecha creación"
 
-#, fuzzy
 msgctxt "field:product.template-product.category,create_uid:"
 msgid "Create User"
 msgstr "Usuario creación"
 
-#, fuzzy
 msgctxt "field:product.template-product.category,id:"
 msgid "ID"
 msgstr "ID"
 
-#, fuzzy
 msgctxt "field:product.template-product.category,rec_name:"
 msgid "Name"
 msgstr "Nombre"
 
 msgctxt "field:product.template-product.category,template:"
 msgid "Template"
-msgstr ""
+msgstr "Plantilla"
 
-#, fuzzy
 msgctxt "field:product.template-product.category,write_date:"
 msgid "Write Date"
 msgstr "Fecha modificación"
 
-#, fuzzy
 msgctxt "field:product.template-product.category,write_uid:"
 msgid "Write User"
 msgstr "Usuario modificación"
@@ -408,7 +386,7 @@ msgstr "Categorías"
 
 msgctxt "model:ir.action,name:act_product_configuration_form"
 msgid "Product Configuration"
-msgstr ""
+msgstr "Configuración de productos"
 
 msgctxt "model:ir.action,name:act_product_form"
 msgid "Variants"
@@ -440,7 +418,7 @@ msgstr "Categorías"
 
 msgctxt "model:ir.ui.menu,name:menu_configuration"
 msgid "Configuration"
-msgstr ""
+msgstr "Configuración"
 
 msgctxt "model:ir.ui.menu,name:menu_main_product"
 msgid "Product"
@@ -452,7 +430,7 @@ msgstr "Variantes"
 
 msgctxt "model:ir.ui.menu,name:menu_product_configuration"
 msgid "Product Configuration"
-msgstr ""
+msgstr "Productos"
 
 msgctxt "model:ir.ui.menu,name:menu_template"
 msgid "Products"
@@ -472,7 +450,7 @@ msgstr "Categoría de producto"
 
 msgctxt "model:product.configuration,name:"
 msgid "Product Configuration"
-msgstr ""
+msgstr "Configuración de productos"
 
 msgctxt "model:product.product,name:"
 msgid "Product Variant"
@@ -484,7 +462,7 @@ msgstr "Plantilla de producto"
 
 msgctxt "model:product.template-product.category,name:"
 msgid "Template - Category"
-msgstr ""
+msgstr "Plantilla - Categoría"
 
 msgctxt "model:product.uom,name:"
 msgid "Unit of measure"
@@ -782,22 +760,18 @@ msgctxt "selection:product.configuration,default_cost_price_method:"
 msgid ""
 msgstr ""
 
-#, fuzzy
 msgctxt "selection:product.configuration,default_cost_price_method:"
 msgid "Average"
 msgstr "Promedio"
 
-#, fuzzy
 msgctxt "selection:product.configuration,default_cost_price_method:"
 msgid "Fixed"
 msgstr "Fijo"
 
-#, fuzzy
 msgctxt "selection:product.product,cost_price_method:"
 msgid "Average"
 msgstr "Promedio"
 
-#, fuzzy
 msgctxt "selection:product.product,cost_price_method:"
 msgid "Fixed"
 msgstr "Fijo"
@@ -848,7 +822,7 @@ msgstr "Categoría de producto"
 
 msgctxt "view:product.configuration:"
 msgid "Party Configuration"
-msgstr ""
+msgstr "Configuración de entidades"
 
 msgctxt "view:product.product:"
 msgid "Product"
diff --git a/locale/es_CO.po b/locale/es_CO.po
index 39771eb..db68196 100644
--- a/locale/es_CO.po
+++ b/locale/es_CO.po
@@ -18,12 +18,11 @@ 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."
 
-#, fuzzy
 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 puede cambiar la Conversión, el Factor o la Categoría de una Unidad de "
+"Medida."
 
 msgctxt "field:product.category,childs:"
 msgid "Children"
@@ -61,36 +60,30 @@ msgctxt "field:product.category,write_uid:"
 msgid "Write User"
 msgstr "Modificado por Usuario"
 
-#, fuzzy
 msgctxt "field:product.configuration,create_date:"
 msgid "Create Date"
 msgstr "Fecha de Creación"
 
-#, fuzzy
 msgctxt "field:product.configuration,create_uid:"
 msgid "Create User"
 msgstr "Creado por Usuario"
 
 msgctxt "field:product.configuration,default_cost_price_method:"
 msgid "Default Cost Method"
-msgstr ""
+msgstr "Método de Costeo por Defecto"
 
-#, fuzzy
 msgctxt "field:product.configuration,id:"
 msgid "ID"
 msgstr "ID"
 
-#, fuzzy
 msgctxt "field:product.configuration,rec_name:"
 msgid "Name"
 msgstr "Nombre"
 
-#, fuzzy
 msgctxt "field:product.configuration,write_date:"
 msgid "Write Date"
 msgstr "Fecha de Modificación"
 
-#, fuzzy
 msgctxt "field:product.configuration,write_uid:"
 msgid "Write User"
 msgstr "Modificado por Usuario"
@@ -99,7 +92,6 @@ msgctxt "field:product.product,active:"
 msgid "Active"
 msgstr "Activo"
 
-#, fuzzy
 msgctxt "field:product.product,categories:"
 msgid "Categories"
 msgstr "Categorías"
@@ -108,17 +100,14 @@ msgctxt "field:product.product,code:"
 msgid "Code"
 msgstr "Código"
 
-#, fuzzy
 msgctxt "field:product.product,consumable:"
 msgid "Consumable"
 msgstr "Consumible"
 
-#, fuzzy
 msgctxt "field:product.product,cost_price:"
 msgid "Cost Price"
 msgstr "Costo"
 
-#, fuzzy
 msgctxt "field:product.product,cost_price_method:"
 msgid "Cost Method"
 msgstr "Método de Costeo"
@@ -139,7 +128,6 @@ msgctxt "field:product.product,default_uom:"
 msgid "Default UOM"
 msgstr "UdM por Defecto"
 
-#, fuzzy
 msgctxt "field:product.product,default_uom_category:"
 msgid "Default UOM Category"
 msgstr "Categoría de UdM por Defecto"
@@ -152,7 +140,6 @@ msgctxt "field:product.product,id:"
 msgid "ID"
 msgstr "ID"
 
-#, fuzzy
 msgctxt "field:product.product,list_price:"
 msgid "List Price"
 msgstr "Precio de Venta"
@@ -161,7 +148,6 @@ msgctxt "field:product.product,list_price_uom:"
 msgid "List Price"
 msgstr "Precio de Venta"
 
-#, fuzzy
 msgctxt "field:product.product,name:"
 msgid "Name"
 msgstr "Nombre"
@@ -190,7 +176,6 @@ msgctxt "field:product.template,active:"
 msgid "Active"
 msgstr "Activo"
 
-#, fuzzy
 msgctxt "field:product.template,categories:"
 msgid "Categories"
 msgstr "Categorías"
@@ -255,41 +240,34 @@ msgctxt "field:product.template,write_uid:"
 msgid "Write User"
 msgstr "Modificado por Usuario"
 
-#, fuzzy
 msgctxt "field:product.template-product.category,category:"
 msgid "Category"
 msgstr "Categoría"
 
-#, fuzzy
 msgctxt "field:product.template-product.category,create_date:"
 msgid "Create Date"
 msgstr "Fecha de Creación"
 
-#, fuzzy
 msgctxt "field:product.template-product.category,create_uid:"
 msgid "Create User"
 msgstr "Creado por Usuario"
 
-#, fuzzy
 msgctxt "field:product.template-product.category,id:"
 msgid "ID"
 msgstr "ID"
 
-#, fuzzy
 msgctxt "field:product.template-product.category,rec_name:"
 msgid "Name"
 msgstr "Nombre"
 
 msgctxt "field:product.template-product.category,template:"
 msgid "Template"
-msgstr ""
+msgstr "Plantilla"
 
-#, fuzzy
 msgctxt "field:product.template-product.category,write_date:"
 msgid "Write Date"
 msgstr "Fecha de Modificación"
 
-#, fuzzy
 msgctxt "field:product.template-product.category,write_uid:"
 msgid "Write User"
 msgstr "Modificado por Usuario"
@@ -408,7 +386,7 @@ msgstr "Categorías"
 
 msgctxt "model:ir.action,name:act_product_configuration_form"
 msgid "Product Configuration"
-msgstr ""
+msgstr "Configuración de Producto"
 
 msgctxt "model:ir.action,name:act_product_form"
 msgid "Variants"
@@ -440,7 +418,7 @@ msgstr "Categorías"
 
 msgctxt "model:ir.ui.menu,name:menu_configuration"
 msgid "Configuration"
-msgstr ""
+msgstr "Configuración"
 
 msgctxt "model:ir.ui.menu,name:menu_main_product"
 msgid "Product"
@@ -452,7 +430,7 @@ msgstr "Variedades"
 
 msgctxt "model:ir.ui.menu,name:menu_product_configuration"
 msgid "Product Configuration"
-msgstr ""
+msgstr "Configuración de Producto"
 
 msgctxt "model:ir.ui.menu,name:menu_template"
 msgid "Products"
@@ -472,7 +450,7 @@ msgstr "Categoría de Producto"
 
 msgctxt "model:product.configuration,name:"
 msgid "Product Configuration"
-msgstr ""
+msgstr "Configuración de Producto"
 
 msgctxt "model:product.product,name:"
 msgid "Product Variant"
@@ -484,7 +462,7 @@ msgstr "Plantilla de Producto"
 
 msgctxt "model:product.template-product.category,name:"
 msgid "Template - Category"
-msgstr ""
+msgstr "Plantilla - Categoría"
 
 msgctxt "model:product.uom,name:"
 msgid "Unit of measure"
@@ -782,22 +760,18 @@ msgctxt "selection:product.configuration,default_cost_price_method:"
 msgid ""
 msgstr ""
 
-#, fuzzy
 msgctxt "selection:product.configuration,default_cost_price_method:"
 msgid "Average"
 msgstr "Promedio"
 
-#, fuzzy
 msgctxt "selection:product.configuration,default_cost_price_method:"
 msgid "Fixed"
 msgstr "Fijo"
 
-#, fuzzy
 msgctxt "selection:product.product,cost_price_method:"
 msgid "Average"
 msgstr "Promedio"
 
-#, fuzzy
 msgctxt "selection:product.product,cost_price_method:"
 msgid "Fixed"
 msgstr "Fijo"
@@ -848,7 +822,7 @@ msgstr "Categoría de Producto"
 
 msgctxt "view:product.configuration:"
 msgid "Party Configuration"
-msgstr ""
+msgstr "Configuración de Tercero"
 
 msgctxt "view:product.product:"
 msgid "Product"
diff --git a/locale/es_EC.po b/locale/es_EC.po
index 2799869..4fa3af3 100644
--- a/locale/es_EC.po
+++ b/locale/es_EC.po
@@ -19,7 +19,6 @@ msgctxt "error:product.uom:"
 msgid "Rate and factor can not be both equal to zero."
 msgstr "La conversión y el factor no pueden ser cero simultáneamente."
 
-#, fuzzy
 msgctxt "error:product.uom:"
 msgid "You cannot change Rate, Factor or Category on a Unit of Measure."
 msgstr ""
@@ -62,36 +61,30 @@ msgctxt "field:product.category,write_uid:"
 msgid "Write User"
 msgstr "Modificado por usuario"
 
-#, fuzzy
 msgctxt "field:product.configuration,create_date:"
 msgid "Create Date"
 msgstr "Fecha de creación"
 
-#, fuzzy
 msgctxt "field:product.configuration,create_uid:"
 msgid "Create User"
 msgstr "Creado por usuario"
 
 msgctxt "field:product.configuration,default_cost_price_method:"
 msgid "Default Cost Method"
-msgstr ""
+msgstr "Método de costo por defecto"
 
-#, fuzzy
 msgctxt "field:product.configuration,id:"
 msgid "ID"
 msgstr "ID"
 
-#, fuzzy
 msgctxt "field:product.configuration,rec_name:"
 msgid "Name"
 msgstr "Nombre"
 
-#, fuzzy
 msgctxt "field:product.configuration,write_date:"
 msgid "Write Date"
 msgstr "Fecha de modificación"
 
-#, fuzzy
 msgctxt "field:product.configuration,write_uid:"
 msgid "Write User"
 msgstr "Modificado por usuario"
@@ -100,7 +93,6 @@ msgctxt "field:product.product,active:"
 msgid "Active"
 msgstr "Activo"
 
-#, fuzzy
 msgctxt "field:product.product,categories:"
 msgid "Categories"
 msgstr "Categorías"
@@ -109,17 +101,14 @@ msgctxt "field:product.product,code:"
 msgid "Code"
 msgstr "Código"
 
-#, fuzzy
 msgctxt "field:product.product,consumable:"
 msgid "Consumable"
 msgstr "Consumible"
 
-#, fuzzy
 msgctxt "field:product.product,cost_price:"
 msgid "Cost Price"
 msgstr "Precio de costo"
 
-#, fuzzy
 msgctxt "field:product.product,cost_price_method:"
 msgid "Cost Method"
 msgstr "Método de costo"
@@ -140,7 +129,6 @@ msgctxt "field:product.product,default_uom:"
 msgid "Default UOM"
 msgstr "UdM por defecto"
 
-#, fuzzy
 msgctxt "field:product.product,default_uom_category:"
 msgid "Default UOM Category"
 msgstr "Categoría de UdM por defecto"
@@ -153,7 +141,6 @@ msgctxt "field:product.product,id:"
 msgid "ID"
 msgstr "ID"
 
-#, fuzzy
 msgctxt "field:product.product,list_price:"
 msgid "List Price"
 msgstr "Precio de venta"
@@ -162,7 +149,6 @@ msgctxt "field:product.product,list_price_uom:"
 msgid "List Price"
 msgstr "Precio de venta"
 
-#, fuzzy
 msgctxt "field:product.product,name:"
 msgid "Name"
 msgstr "Nombre"
@@ -191,7 +177,6 @@ msgctxt "field:product.template,active:"
 msgid "Active"
 msgstr "Activo"
 
-#, fuzzy
 msgctxt "field:product.template,categories:"
 msgid "Categories"
 msgstr "Categorías"
@@ -256,41 +241,34 @@ msgctxt "field:product.template,write_uid:"
 msgid "Write User"
 msgstr "Modificado por usuario"
 
-#, fuzzy
 msgctxt "field:product.template-product.category,category:"
 msgid "Category"
 msgstr "Categoría"
 
-#, fuzzy
 msgctxt "field:product.template-product.category,create_date:"
 msgid "Create Date"
 msgstr "Fecha de creación"
 
-#, fuzzy
 msgctxt "field:product.template-product.category,create_uid:"
 msgid "Create User"
 msgstr "Creado por usuario"
 
-#, fuzzy
 msgctxt "field:product.template-product.category,id:"
 msgid "ID"
 msgstr "ID"
 
-#, fuzzy
 msgctxt "field:product.template-product.category,rec_name:"
 msgid "Name"
 msgstr "Nombre"
 
 msgctxt "field:product.template-product.category,template:"
 msgid "Template"
-msgstr ""
+msgstr "Plantilla"
 
-#, fuzzy
 msgctxt "field:product.template-product.category,write_date:"
 msgid "Write Date"
 msgstr "Fecha de modificación"
 
-#, fuzzy
 msgctxt "field:product.template-product.category,write_uid:"
 msgid "Write User"
 msgstr "Modificado por usuario"
@@ -409,7 +387,7 @@ msgstr "Categorías"
 
 msgctxt "model:ir.action,name:act_product_configuration_form"
 msgid "Product Configuration"
-msgstr ""
+msgstr "Configuración de producto"
 
 msgctxt "model:ir.action,name:act_product_form"
 msgid "Variants"
@@ -441,7 +419,7 @@ msgstr "Categorías"
 
 msgctxt "model:ir.ui.menu,name:menu_configuration"
 msgid "Configuration"
-msgstr ""
+msgstr "Configuración"
 
 msgctxt "model:ir.ui.menu,name:menu_main_product"
 msgid "Product"
@@ -453,7 +431,7 @@ msgstr "Variantes"
 
 msgctxt "model:ir.ui.menu,name:menu_product_configuration"
 msgid "Product Configuration"
-msgstr ""
+msgstr "Configuración de Producto"
 
 msgctxt "model:ir.ui.menu,name:menu_template"
 msgid "Products"
@@ -473,7 +451,7 @@ msgstr "Categoría de producto"
 
 msgctxt "model:product.configuration,name:"
 msgid "Product Configuration"
-msgstr ""
+msgstr "Configuración de producto"
 
 msgctxt "model:product.product,name:"
 msgid "Product Variant"
@@ -485,7 +463,7 @@ msgstr "Plantilla de producto"
 
 msgctxt "model:product.template-product.category,name:"
 msgid "Template - Category"
-msgstr ""
+msgstr "Plantilla - Categoría"
 
 msgctxt "model:product.uom,name:"
 msgid "Unit of measure"
@@ -783,22 +761,18 @@ msgctxt "selection:product.configuration,default_cost_price_method:"
 msgid ""
 msgstr ""
 
-#, fuzzy
 msgctxt "selection:product.configuration,default_cost_price_method:"
 msgid "Average"
 msgstr "Promedio"
 
-#, fuzzy
 msgctxt "selection:product.configuration,default_cost_price_method:"
 msgid "Fixed"
 msgstr "Fijo"
 
-#, fuzzy
 msgctxt "selection:product.product,cost_price_method:"
 msgid "Average"
 msgstr "Promedio"
 
-#, fuzzy
 msgctxt "selection:product.product,cost_price_method:"
 msgid "Fixed"
 msgstr "Fijo"
@@ -849,7 +823,7 @@ msgstr "Categoría de producto"
 
 msgctxt "view:product.configuration:"
 msgid "Party Configuration"
-msgstr ""
+msgstr "Configuración de Terceros"
 
 msgctxt "view:product.product:"
 msgid "Product"
diff --git a/locale/es_ES.po b/locale/es_ES.po
index c165808..253e833 100644
--- a/locale/es_ES.po
+++ b/locale/es_ES.po
@@ -18,7 +18,6 @@ msgctxt "error:product.uom:"
 msgid "Rate and factor can not be both equal to zero."
 msgstr "La conversión y el factor no pueden ser cero simultáneamente."
 
-#, fuzzy
 msgctxt "error:product.uom:"
 msgid "You cannot change Rate, Factor or Category on a Unit of Measure."
 msgstr ""
@@ -61,36 +60,30 @@ msgctxt "field:product.category,write_uid:"
 msgid "Write User"
 msgstr "Usuario modificación"
 
-#, fuzzy
 msgctxt "field:product.configuration,create_date:"
 msgid "Create Date"
 msgstr "Fecha creación"
 
-#, fuzzy
 msgctxt "field:product.configuration,create_uid:"
 msgid "Create User"
 msgstr "Usuario creación"
 
 msgctxt "field:product.configuration,default_cost_price_method:"
 msgid "Default Cost Method"
-msgstr ""
+msgstr "Método de coste por defecto"
 
-#, fuzzy
 msgctxt "field:product.configuration,id:"
 msgid "ID"
 msgstr "ID"
 
-#, fuzzy
 msgctxt "field:product.configuration,rec_name:"
 msgid "Name"
 msgstr "Nombre"
 
-#, fuzzy
 msgctxt "field:product.configuration,write_date:"
 msgid "Write Date"
 msgstr "Fecha modificación"
 
-#, fuzzy
 msgctxt "field:product.configuration,write_uid:"
 msgid "Write User"
 msgstr "Usuario modificación"
@@ -99,7 +92,6 @@ msgctxt "field:product.product,active:"
 msgid "Active"
 msgstr "Activo"
 
-#, fuzzy
 msgctxt "field:product.product,categories:"
 msgid "Categories"
 msgstr "Categorías"
@@ -108,17 +100,14 @@ msgctxt "field:product.product,code:"
 msgid "Code"
 msgstr "Código"
 
-#, fuzzy
 msgctxt "field:product.product,consumable:"
 msgid "Consumable"
 msgstr "Consumible"
 
-#, fuzzy
 msgctxt "field:product.product,cost_price:"
 msgid "Cost Price"
 msgstr "Precio de coste"
 
-#, fuzzy
 msgctxt "field:product.product,cost_price_method:"
 msgid "Cost Method"
 msgstr "Método de coste"
@@ -139,7 +128,6 @@ msgctxt "field:product.product,default_uom:"
 msgid "Default UOM"
 msgstr "UdM por defecto"
 
-#, fuzzy
 msgctxt "field:product.product,default_uom_category:"
 msgid "Default UOM Category"
 msgstr "Categoría por defecto UdM"
@@ -152,7 +140,6 @@ msgctxt "field:product.product,id:"
 msgid "ID"
 msgstr "ID"
 
-#, fuzzy
 msgctxt "field:product.product,list_price:"
 msgid "List Price"
 msgstr "Precio de venta"
@@ -161,7 +148,6 @@ msgctxt "field:product.product,list_price_uom:"
 msgid "List Price"
 msgstr "Precio de venta"
 
-#, fuzzy
 msgctxt "field:product.product,name:"
 msgid "Name"
 msgstr "Nombre"
@@ -190,7 +176,6 @@ msgctxt "field:product.template,active:"
 msgid "Active"
 msgstr "Activo"
 
-#, fuzzy
 msgctxt "field:product.template,categories:"
 msgid "Categories"
 msgstr "Categorías"
@@ -255,41 +240,34 @@ msgctxt "field:product.template,write_uid:"
 msgid "Write User"
 msgstr "Usuario modificación"
 
-#, fuzzy
 msgctxt "field:product.template-product.category,category:"
 msgid "Category"
 msgstr "Categoría"
 
-#, fuzzy
 msgctxt "field:product.template-product.category,create_date:"
 msgid "Create Date"
 msgstr "Fecha creación"
 
-#, fuzzy
 msgctxt "field:product.template-product.category,create_uid:"
 msgid "Create User"
 msgstr "Usuario creación"
 
-#, fuzzy
 msgctxt "field:product.template-product.category,id:"
 msgid "ID"
 msgstr "ID"
 
-#, fuzzy
 msgctxt "field:product.template-product.category,rec_name:"
 msgid "Name"
 msgstr "Nombre"
 
 msgctxt "field:product.template-product.category,template:"
 msgid "Template"
-msgstr ""
+msgstr "Plantilla"
 
-#, fuzzy
 msgctxt "field:product.template-product.category,write_date:"
 msgid "Write Date"
 msgstr "Fecha modificación"
 
-#, fuzzy
 msgctxt "field:product.template-product.category,write_uid:"
 msgid "Write User"
 msgstr "Usuario modificación"
@@ -400,15 +378,15 @@ msgstr ""
 
 msgctxt "model:ir.action,name:act_category_list"
 msgid "Categories"
-msgstr "Categorías"
+msgstr "Categorías de producto"
 
 msgctxt "model:ir.action,name:act_category_tree"
 msgid "Categories"
-msgstr "Categorías"
+msgstr "Categorías de producto"
 
 msgctxt "model:ir.action,name:act_product_configuration_form"
 msgid "Product Configuration"
-msgstr ""
+msgstr "Configuración de productos"
 
 msgctxt "model:ir.action,name:act_product_form"
 msgid "Variants"
@@ -436,11 +414,11 @@ msgstr "Categorías"
 
 msgctxt "model:ir.ui.menu,name:menu_category_tree"
 msgid "Categories"
-msgstr "Categorías"
+msgstr "Árbol de categorías"
 
 msgctxt "model:ir.ui.menu,name:menu_configuration"
 msgid "Configuration"
-msgstr ""
+msgstr "Configuración"
 
 msgctxt "model:ir.ui.menu,name:menu_main_product"
 msgid "Product"
@@ -452,7 +430,7 @@ msgstr "Variantes"
 
 msgctxt "model:ir.ui.menu,name:menu_product_configuration"
 msgid "Product Configuration"
-msgstr ""
+msgstr "Productos"
 
 msgctxt "model:ir.ui.menu,name:menu_template"
 msgid "Products"
@@ -472,7 +450,7 @@ msgstr "Categoría de producto"
 
 msgctxt "model:product.configuration,name:"
 msgid "Product Configuration"
-msgstr ""
+msgstr "Configuración de productos"
 
 msgctxt "model:product.product,name:"
 msgid "Product Variant"
@@ -484,7 +462,7 @@ msgstr "Plantilla de producto"
 
 msgctxt "model:product.template-product.category,name:"
 msgid "Template - Category"
-msgstr ""
+msgstr "Plantilla - Categoría"
 
 msgctxt "model:product.uom,name:"
 msgid "Unit of measure"
@@ -782,22 +760,18 @@ msgctxt "selection:product.configuration,default_cost_price_method:"
 msgid ""
 msgstr ""
 
-#, fuzzy
 msgctxt "selection:product.configuration,default_cost_price_method:"
 msgid "Average"
 msgstr "Promedio"
 
-#, fuzzy
 msgctxt "selection:product.configuration,default_cost_price_method:"
 msgid "Fixed"
 msgstr "Fijo"
 
-#, fuzzy
 msgctxt "selection:product.product,cost_price_method:"
 msgid "Average"
 msgstr "Promedio"
 
-#, fuzzy
 msgctxt "selection:product.product,cost_price_method:"
 msgid "Fixed"
 msgstr "Fijo"
@@ -848,7 +822,7 @@ msgstr "Categoría de producto"
 
 msgctxt "view:product.configuration:"
 msgid "Party Configuration"
-msgstr ""
+msgstr "Configuración de terceros"
 
 msgctxt "view:product.product:"
 msgid "Product"
diff --git a/locale/fr_FR.po b/locale/fr_FR.po
index 5f7e5b3..60d5399 100644
--- a/locale/fr_FR.po
+++ b/locale/fr_FR.po
@@ -18,7 +18,6 @@ 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."
 
-#, fuzzy
 msgctxt "error:product.uom:"
 msgid "You cannot change Rate, Factor or Category on a Unit of Measure."
 msgstr ""
@@ -61,36 +60,30 @@ msgctxt "field:product.category,write_uid:"
 msgid "Write User"
 msgstr "Mis à jour par"
 
-#, fuzzy
 msgctxt "field:product.configuration,create_date:"
 msgid "Create Date"
 msgstr "Date de création"
 
-#, fuzzy
 msgctxt "field:product.configuration,create_uid:"
 msgid "Create User"
 msgstr "Créé par"
 
 msgctxt "field:product.configuration,default_cost_price_method:"
 msgid "Default Cost Method"
-msgstr ""
+msgstr "Méthode de coût par défaut"
 
-#, fuzzy
 msgctxt "field:product.configuration,id:"
 msgid "ID"
 msgstr "ID"
 
-#, fuzzy
 msgctxt "field:product.configuration,rec_name:"
 msgid "Name"
 msgstr "Nom"
 
-#, fuzzy
 msgctxt "field:product.configuration,write_date:"
 msgid "Write Date"
 msgstr "Date de mise à jour"
 
-#, fuzzy
 msgctxt "field:product.configuration,write_uid:"
 msgid "Write User"
 msgstr "Mis à jour par"
@@ -99,7 +92,6 @@ msgctxt "field:product.product,active:"
 msgid "Active"
 msgstr "Actif"
 
-#, fuzzy
 msgctxt "field:product.product,categories:"
 msgid "Categories"
 msgstr "Catégories"
@@ -108,17 +100,14 @@ msgctxt "field:product.product,code:"
 msgid "Code"
 msgstr "Code"
 
-#, fuzzy
 msgctxt "field:product.product,consumable:"
 msgid "Consumable"
 msgstr "Consommable"
 
-#, fuzzy
 msgctxt "field:product.product,cost_price:"
 msgid "Cost Price"
 msgstr "Prix de revient"
 
-#, fuzzy
 msgctxt "field:product.product,cost_price_method:"
 msgid "Cost Method"
 msgstr "Méthode de coût"
@@ -139,7 +128,6 @@ msgctxt "field:product.product,default_uom:"
 msgid "Default UOM"
 msgstr "UDM par défaut"
 
-#, fuzzy
 msgctxt "field:product.product,default_uom_category:"
 msgid "Default UOM Category"
 msgstr "Catégorie d'UDM par défaut"
@@ -152,7 +140,6 @@ msgctxt "field:product.product,id:"
 msgid "ID"
 msgstr "ID"
 
-#, fuzzy
 msgctxt "field:product.product,list_price:"
 msgid "List Price"
 msgstr "Prix listé"
@@ -161,7 +148,6 @@ msgctxt "field:product.product,list_price_uom:"
 msgid "List Price"
 msgstr "Prix listé"
 
-#, fuzzy
 msgctxt "field:product.product,name:"
 msgid "Name"
 msgstr "Nom"
@@ -190,7 +176,6 @@ msgctxt "field:product.template,active:"
 msgid "Active"
 msgstr "Actif"
 
-#, fuzzy
 msgctxt "field:product.template,categories:"
 msgid "Categories"
 msgstr "Catégories"
@@ -255,41 +240,34 @@ msgctxt "field:product.template,write_uid:"
 msgid "Write User"
 msgstr "Mis à jour par"
 
-#, fuzzy
 msgctxt "field:product.template-product.category,category:"
 msgid "Category"
 msgstr "Catégorie"
 
-#, fuzzy
 msgctxt "field:product.template-product.category,create_date:"
 msgid "Create Date"
 msgstr "Date de création"
 
-#, fuzzy
 msgctxt "field:product.template-product.category,create_uid:"
 msgid "Create User"
 msgstr "Créé par"
 
-#, fuzzy
 msgctxt "field:product.template-product.category,id:"
 msgid "ID"
 msgstr "ID"
 
-#, fuzzy
 msgctxt "field:product.template-product.category,rec_name:"
 msgid "Name"
 msgstr "Nom"
 
 msgctxt "field:product.template-product.category,template:"
 msgid "Template"
-msgstr ""
+msgstr "Modèle"
 
-#, fuzzy
 msgctxt "field:product.template-product.category,write_date:"
 msgid "Write Date"
 msgstr "Date de mise à jour"
 
-#, fuzzy
 msgctxt "field:product.template-product.category,write_uid:"
 msgid "Write User"
 msgstr "Mis à jour par"
@@ -408,7 +386,7 @@ msgstr "Catégories"
 
 msgctxt "model:ir.action,name:act_product_configuration_form"
 msgid "Product Configuration"
-msgstr ""
+msgstr "Configuration produit"
 
 msgctxt "model:ir.action,name:act_product_form"
 msgid "Variants"
@@ -440,7 +418,7 @@ msgstr "Catégories"
 
 msgctxt "model:ir.ui.menu,name:menu_configuration"
 msgid "Configuration"
-msgstr ""
+msgstr "Configuration"
 
 msgctxt "model:ir.ui.menu,name:menu_main_product"
 msgid "Product"
@@ -452,7 +430,7 @@ msgstr "Variantes"
 
 msgctxt "model:ir.ui.menu,name:menu_product_configuration"
 msgid "Product Configuration"
-msgstr ""
+msgstr "Configuration produit"
 
 msgctxt "model:ir.ui.menu,name:menu_template"
 msgid "Products"
@@ -472,7 +450,7 @@ msgstr "Catégorie de produit"
 
 msgctxt "model:product.configuration,name:"
 msgid "Product Configuration"
-msgstr ""
+msgstr "Configuration produit"
 
 msgctxt "model:product.product,name:"
 msgid "Product Variant"
@@ -484,7 +462,7 @@ msgstr "Modèle produit"
 
 msgctxt "model:product.template-product.category,name:"
 msgid "Template - Category"
-msgstr ""
+msgstr "Modèle - Catégorie"
 
 msgctxt "model:product.uom,name:"
 msgid "Unit of measure"
@@ -782,25 +760,21 @@ msgctxt "selection:product.configuration,default_cost_price_method:"
 msgid ""
 msgstr ""
 
-#, fuzzy
 msgctxt "selection:product.configuration,default_cost_price_method:"
 msgid "Average"
 msgstr "Moyenne"
 
-#, fuzzy
 msgctxt "selection:product.configuration,default_cost_price_method:"
 msgid "Fixed"
-msgstr "Fixé"
+msgstr "Fixe"
 
-#, fuzzy
 msgctxt "selection:product.product,cost_price_method:"
 msgid "Average"
 msgstr "Moyenne"
 
-#, fuzzy
 msgctxt "selection:product.product,cost_price_method:"
 msgid "Fixed"
-msgstr "Fixé"
+msgstr "Fixe"
 
 msgctxt "selection:product.product,type:"
 msgid "Assets"
@@ -848,7 +822,7 @@ msgstr "Catégorie de produit"
 
 msgctxt "view:product.configuration:"
 msgid "Party Configuration"
-msgstr ""
+msgstr "Configuration tiers"
 
 msgctxt "view:product.product:"
 msgid "Product"
diff --git a/locale/sl_SI.po b/locale/sl_SI.po
index 36fc1c9..2f3da26 100644
--- a/locale/sl_SI.po
+++ b/locale/sl_SI.po
@@ -18,7 +18,6 @@ msgctxt "error:product.uom:"
 msgid "Rate and factor can not be both equal to zero."
 msgstr "Oba, razmerje in faktor, ne moreta biti enaka ničli."
 
-#, fuzzy
 msgctxt "error:product.uom:"
 msgid "You cannot change Rate, Factor or Category on a Unit of Measure."
 msgstr ""
@@ -60,36 +59,30 @@ msgctxt "field:product.category,write_uid:"
 msgid "Write User"
 msgstr "Zapisal"
 
-#, fuzzy
 msgctxt "field:product.configuration,create_date:"
 msgid "Create Date"
 msgstr "Izdelano"
 
-#, fuzzy
 msgctxt "field:product.configuration,create_uid:"
 msgid "Create User"
 msgstr "Izdelal"
 
 msgctxt "field:product.configuration,default_cost_price_method:"
 msgid "Default Cost Method"
-msgstr ""
+msgstr "Privzeti obračun"
 
-#, fuzzy
 msgctxt "field:product.configuration,id:"
 msgid "ID"
 msgstr "ID"
 
-#, fuzzy
 msgctxt "field:product.configuration,rec_name:"
 msgid "Name"
-msgstr "Naziv"
+msgstr "Ime"
 
-#, fuzzy
 msgctxt "field:product.configuration,write_date:"
 msgid "Write Date"
 msgstr "Zapisano"
 
-#, fuzzy
 msgctxt "field:product.configuration,write_uid:"
 msgid "Write User"
 msgstr "Zapisal"
@@ -98,7 +91,6 @@ msgctxt "field:product.product,active:"
 msgid "Active"
 msgstr "Aktivno"
 
-#, fuzzy
 msgctxt "field:product.product,categories:"
 msgid "Categories"
 msgstr "Kategorije"
@@ -107,17 +99,14 @@ msgctxt "field:product.product,code:"
 msgid "Code"
 msgstr "Šifra"
 
-#, fuzzy
 msgctxt "field:product.product,consumable:"
 msgid "Consumable"
 msgstr "Potrošni material"
 
-#, fuzzy
 msgctxt "field:product.product,cost_price:"
 msgid "Cost Price"
 msgstr "Nabavna cena"
 
-#, fuzzy
 msgctxt "field:product.product,cost_price_method:"
 msgid "Cost Method"
 msgstr "Obračun"
@@ -138,7 +127,6 @@ msgctxt "field:product.product,default_uom:"
 msgid "Default UOM"
 msgstr "Privzeta ME"
 
-#, fuzzy
 msgctxt "field:product.product,default_uom_category:"
 msgid "Default UOM Category"
 msgstr "Privzeta kategorija ME"
@@ -151,7 +139,6 @@ msgctxt "field:product.product,id:"
 msgid "ID"
 msgstr "ID"
 
-#, fuzzy
 msgctxt "field:product.product,list_price:"
 msgid "List Price"
 msgstr "Prodajna cena"
@@ -160,7 +147,6 @@ msgctxt "field:product.product,list_price_uom:"
 msgid "List Price"
 msgstr "Prodajna cena"
 
-#, fuzzy
 msgctxt "field:product.product,name:"
 msgid "Name"
 msgstr "Naziv"
@@ -189,7 +175,6 @@ msgctxt "field:product.template,active:"
 msgid "Active"
 msgstr "Aktivno"
 
-#, fuzzy
 msgctxt "field:product.template,categories:"
 msgid "Categories"
 msgstr "Kategorije"
@@ -254,41 +239,34 @@ msgctxt "field:product.template,write_uid:"
 msgid "Write User"
 msgstr "Zapisal"
 
-#, fuzzy
 msgctxt "field:product.template-product.category,category:"
 msgid "Category"
 msgstr "Kategorija"
 
-#, fuzzy
 msgctxt "field:product.template-product.category,create_date:"
 msgid "Create Date"
 msgstr "Izdelano"
 
-#, fuzzy
 msgctxt "field:product.template-product.category,create_uid:"
 msgid "Create User"
 msgstr "Izdelal"
 
-#, fuzzy
 msgctxt "field:product.template-product.category,id:"
 msgid "ID"
 msgstr "ID"
 
-#, fuzzy
 msgctxt "field:product.template-product.category,rec_name:"
 msgid "Name"
-msgstr "Naziv"
+msgstr "Ime"
 
 msgctxt "field:product.template-product.category,template:"
 msgid "Template"
-msgstr ""
+msgstr "Predloga"
 
-#, fuzzy
 msgctxt "field:product.template-product.category,write_date:"
 msgid "Write Date"
 msgstr "Zapisano"
 
-#, fuzzy
 msgctxt "field:product.template-product.category,write_uid:"
 msgid "Write User"
 msgstr "Zapisal"
@@ -407,7 +385,7 @@ msgstr "Kategorije"
 
 msgctxt "model:ir.action,name:act_product_configuration_form"
 msgid "Product Configuration"
-msgstr ""
+msgstr "Konfiguracija izdelkov"
 
 msgctxt "model:ir.action,name:act_product_form"
 msgid "Variants"
@@ -439,7 +417,7 @@ msgstr "Kategorije"
 
 msgctxt "model:ir.ui.menu,name:menu_configuration"
 msgid "Configuration"
-msgstr ""
+msgstr "Nastavitve"
 
 msgctxt "model:ir.ui.menu,name:menu_main_product"
 msgid "Product"
@@ -451,7 +429,7 @@ msgstr "Različice"
 
 msgctxt "model:ir.ui.menu,name:menu_product_configuration"
 msgid "Product Configuration"
-msgstr ""
+msgstr "Konfiguracija"
 
 msgctxt "model:ir.ui.menu,name:menu_template"
 msgid "Products"
@@ -471,7 +449,7 @@ msgstr "Kategorija izdelkov"
 
 msgctxt "model:product.configuration,name:"
 msgid "Product Configuration"
-msgstr ""
+msgstr "Konfiguracija izdelkov"
 
 msgctxt "model:product.product,name:"
 msgid "Product Variant"
@@ -483,7 +461,7 @@ msgstr "Predloga izdelka"
 
 msgctxt "model:product.template-product.category,name:"
 msgid "Template - Category"
-msgstr ""
+msgstr "Predloga - Kategorija"
 
 msgctxt "model:product.uom,name:"
 msgid "Unit of measure"
@@ -707,7 +685,7 @@ msgstr "oz"
 
 msgctxt "model:product.uom,symbol:uom_pound"
 msgid "lb"
-msgstr ""
+msgstr "lb"
 
 msgctxt "model:product.uom,symbol:uom_second"
 msgid "s"
@@ -781,22 +759,18 @@ msgctxt "selection:product.configuration,default_cost_price_method:"
 msgid ""
 msgstr ""
 
-#, fuzzy
 msgctxt "selection:product.configuration,default_cost_price_method:"
 msgid "Average"
 msgstr "Povprečna cena"
 
-#, fuzzy
 msgctxt "selection:product.configuration,default_cost_price_method:"
 msgid "Fixed"
 msgstr "Fiksna"
 
-#, fuzzy
 msgctxt "selection:product.product,cost_price_method:"
 msgid "Average"
 msgstr "Povprečna cena"
 
-#, fuzzy
 msgctxt "selection:product.product,cost_price_method:"
 msgid "Fixed"
 msgstr "Fiksna"
@@ -847,7 +821,7 @@ msgstr "Kategorija"
 
 msgctxt "view:product.configuration:"
 msgid "Party Configuration"
-msgstr ""
+msgstr "Konfiguracija partnerjev"
 
 msgctxt "view:product.product:"
 msgid "Product"
diff --git a/tryton.cfg b/tryton.cfg
index a37bfc2..dcb6424 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
 [tryton]
-version=4.0.0
+version=4.0.1
 depends:
     ir
     res
diff --git a/trytond_product.egg-info/PKG-INFO b/trytond_product.egg-info/PKG-INFO
index 53c5caa..390af3f 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: 4.0.0
+Version: 4.0.1
 Summary: Tryton module with products
 Home-page: http://www.tryton.org/
 Author: Tryton
diff --git a/trytond_product.egg-info/SOURCES.txt b/trytond_product.egg-info/SOURCES.txt
index b959d59..84c1132 100644
--- a/trytond_product.egg-info/SOURCES.txt
+++ b/trytond_product.egg-info/SOURCES.txt
@@ -14,6 +14,7 @@ uom.xml
 ./category.py
 ./category.xml
 ./configuration.py
+./configuration.xml
 ./product.py
 ./product.xml
 ./tryton.cfg
@@ -33,17 +34,22 @@ uom.xml
 ./locale/hu_HU.po
 ./locale/it_IT.po
 ./locale/ja_JP.po
+./locale/lo_LA.po
 ./locale/lt_LT.po
 ./locale/nl_NL.po
 ./locale/pt_BR.po
 ./locale/ru_RU.po
 ./locale/sl_SI.po
+./locale/zh_CN.po
 ./tests/__init__.py
 ./tests/test_product.py
 ./view/category_form.xml
 ./view/category_list.xml
 ./view/category_tree.xml
+./view/configuration_form.xml
 ./view/product_form.xml
+./view/product_form_simple.xml
+./view/product_tree_simple.xml
 ./view/template_form.xml
 ./view/template_tree.xml
 ./view/uom_category_form.xml
diff --git a/trytond_product.egg-info/requires.txt b/trytond_product.egg-info/requires.txt
index 73ccfb4..8823e9a 100644
--- a/trytond_product.egg-info/requires.txt
+++ b/trytond_product.egg-info/requires.txt
@@ -1,2 +1,2 @@
 python-sql
-trytond >= 4.0, < 4.1
\ No newline at end of file
+trytond >= 4.0, < 4.1
commit 7d24bc89762fd587c8e8f25671e2c0500835878a
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Fri May 27 18:26:07 2016 +0200

    Adding upstream version 4.0.0.
    
    Signed-off-by: Mathias Behrle <mathiasb at m9s.biz>

diff --git a/CHANGELOG b/CHANGELOG
index 9d657af..85478cf 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,11 @@
+Version 4.0.0 - 2016-05-02
+* Bug fixes (see mercurial logs for details)
+* Replace category by categories on Template
+* Add Python3 support
+* Add configuration for default cost price method
+* Change Uom.round into an instance method
+* Add Function fields on Product from Template
+
 Version 3.8.0 - 2015-11-02
 * Bug fixes (see mercurial logs for details)
 * Be more strict on unit of measure conversion
diff --git a/COPYRIGHT b/COPYRIGHT
index 3a28212..48f96af 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -1,6 +1,6 @@
-Copyright (C) 2008-2015 Cédric Krier.
+Copyright (C) 2008-2016 Cédric Krier.
 Copyright (C) 2008-2013 Bertrand Chenal.
-Copyright (C) 2008-2015 B2CK SPRL.
+Copyright (C) 2008-2016 B2CK SPRL.
 Copyright (C) 2004-2008 Tiny SPRL.
 
 This program is free software: you can redistribute it and/or modify
diff --git a/PKG-INFO b/PKG-INFO
index f5ba3f9..b945f7e 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,12 +1,12 @@
 Metadata-Version: 1.1
 Name: trytond_product
-Version: 3.8.0
+Version: 4.0.0
 Summary: Tryton module with products
 Home-page: http://www.tryton.org/
 Author: Tryton
 Author-email: issue_tracker at tryton.org
 License: GPL-3
-Download-URL: http://downloads.tryton.org/3.8/
+Download-URL: http://downloads.tryton.org/4.0/
 Description: trytond_product
         ===============
         
@@ -55,6 +55,7 @@ Classifier: Intended Audience :: Manufacturing
 Classifier: License :: OSI Approved :: GNU General Public License (GPL)
 Classifier: Natural Language :: Bulgarian
 Classifier: Natural Language :: Catalan
+Classifier: Natural Language :: Chinese (Simplified)
 Classifier: Natural Language :: Czech
 Classifier: Natural Language :: Dutch
 Classifier: Natural Language :: English
@@ -68,6 +69,9 @@ Classifier: Natural Language :: Slovenian
 Classifier: Natural Language :: Spanish
 Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python :: 2.7
+Classifier: Programming Language :: Python :: 3.3
+Classifier: Programming Language :: Python :: 3.4
+Classifier: Programming Language :: Python :: 3.5
 Classifier: Programming Language :: Python :: Implementation :: CPython
 Classifier: Programming Language :: Python :: Implementation :: PyPy
 Classifier: Topic :: Office/Business
diff --git a/__init__.py b/__init__.py
index 6538a36..ffbe78e 100644
--- a/__init__.py
+++ b/__init__.py
@@ -5,6 +5,7 @@ from trytond.pool import Pool
 from .uom import *
 from .category import *
 from .product import *
+from .configuration import *
 
 
 def register():
@@ -14,4 +15,6 @@ def register():
         Category,
         Template,
         Product,
+        TemplateCategory,
+        Configuration,
         module='product', type_='model')
diff --git a/configuration.py b/configuration.py
new file mode 100644
index 0000000..c8154ed
--- /dev/null
+++ b/configuration.py
@@ -0,0 +1,64 @@
+# 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, ModelSingleton, fields
+from trytond.pool import Pool
+
+from .product import COST_PRICE_METHODS
+
+__all__ = ['Configuration']
+
+
+class Configuration(ModelSingleton, ModelSQL, ModelView):
+    'Product Configuration'
+    __name__ = 'product.configuration'
+
+    default_cost_price_method = fields.Function(fields.Selection(
+            [(None, '')] + COST_PRICE_METHODS, 'Default Cost Method'),
+        'get_default_cost_price_method',
+        setter='set_default_cost_price_method')
+
+    @classmethod
+    def default_default_cost_price_method(cls):
+        return cls().get_default_cost_price_method('default_cost_price_method')
+
+    @classmethod
+    def _get_product_field(cls, name):
+        pool = Pool()
+        ModelField = pool.get('ir.model.field')
+
+        for model in ['product.product', 'product.template']:
+            fields = ModelField.search([
+                    ('model.model', '=', model),
+                    ('name', '=', name),
+                    ], limit=1)
+            if fields:
+                return fields[0]
+
+    def get_default_cost_price_method(self, name):
+        pool = Pool()
+        Property = pool.get('ir.property')
+        field = self._get_product_field('cost_price_method')
+        properties = Property.search([
+                ('field', '=', field.id),
+                ('res', '=', None),
+                ], limit=1)
+        if properties:
+            prop, = properties
+            if prop.value:
+                return prop.value.split(',')[1]
+
+    @classmethod
+    def set_default_cost_price_method(cls, configurations, name, value):
+        pool = Pool()
+        Property = pool.get('ir.property')
+        field = cls._get_product_field('cost_price_method')
+        properties = Property.search([
+                ('field', '=', field.id),
+                ('res', '=', None),
+                ])
+        Property.delete(properties)
+        if value:
+            Property.create([{
+                        'field': field.id,
+                        'value': ',%s' % value,
+                        }])
diff --git a/configuration.xml b/configuration.xml
new file mode 100644
index 0000000..dfabb43
--- /dev/null
+++ b/configuration.xml
@@ -0,0 +1,39 @@
+<?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="product_configuration_view_form">
+            <field name="model">product.configuration</field>
+            <field name="type">form</field>
+            <field name="name">configuration_form</field>
+        </record>
+
+        <record model="ir.action.act_window"
+            id="act_product_configuration_form">
+            <field name="name">Product Configuration</field>
+            <field name="res_model">product.configuration</field>
+        </record>
+        <record model="ir.action.act_window.view"
+            id="act_product_configuration_form_view1">
+            <field name="sequence" eval="10"/>
+            <field name="view" ref="product_configuration_view_form"/>
+            <field name="act_window" ref="act_product_configuration_form"/>
+        </record>
+        <menuitem parent="menu_configuration"
+            action="act_product_configuration_form"
+            id="menu_product_configuration" sequence="0" icon="tryton-list"/>
+        <record model="ir.ui.menu-res.group"
+            id="menu_product_configuration_group_product_admin">
+            <field name="menu" ref="menu_product_configuration"/>
+            <field name="group" ref="group_product_admin"/>
+        </record>
+    </data>
+    <data noupdate="1">
+        <record model="ir.property" id="property_cost_price_method">
+            <field name="field"
+                search="[('model.model', '=', 'product.template'), ('name', '=', 'cost_price_method')]"/>
+            <field name="value">,fixed</field>
+        </record>
+    </data>
+</tryton>
diff --git a/locale/bg_BG.po b/locale/bg_BG.po
index 148d642..d8970ff 100644
--- a/locale/bg_BG.po
+++ b/locale/bg_BG.po
@@ -18,8 +18,9 @@ msgctxt "error:product.uom:"
 msgid "Rate and factor can not be both equal to zero."
 msgstr "Курса и коефициента не може едновременно да са нула."
 
+#, fuzzy
 msgctxt "error:product.uom:"
-msgid "You cannot change Rate, Factor or Category on a Unit of Measure. "
+msgid "You cannot change Rate, Factor or Category on a Unit of Measure."
 msgstr ""
 "За мерна единица не може да променате отношение, коефициент или категория."
 
@@ -60,15 +61,69 @@ msgid "Write User"
 msgstr "Променено от"
 
 #, fuzzy
+msgctxt "field:product.configuration,create_date:"
+msgid "Create Date"
+msgstr "Създадено на"
+
+#, fuzzy
+msgctxt "field:product.configuration,create_uid:"
+msgid "Create User"
+msgstr "Създадено от"
+
+msgctxt "field:product.configuration,default_cost_price_method:"
+msgid "Default Cost Method"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:product.configuration,id:"
+msgid "ID"
+msgstr "ID"
+
+#, fuzzy
+msgctxt "field:product.configuration,rec_name:"
+msgid "Name"
+msgstr "Име"
+
+#, fuzzy
+msgctxt "field:product.configuration,write_date:"
+msgid "Write Date"
+msgstr "Променено на"
+
+#, fuzzy
+msgctxt "field:product.configuration,write_uid:"
+msgid "Write User"
+msgstr "Променено от"
+
+#, fuzzy
 msgctxt "field:product.product,active:"
 msgid "Active"
 msgstr "Активен"
 
+#, fuzzy
+msgctxt "field:product.product,categories:"
+msgid "Categories"
+msgstr "Категории"
+
 msgctxt "field:product.product,code:"
 msgid "Code"
 msgstr "Код"
 
 #, fuzzy
+msgctxt "field:product.product,consumable:"
+msgid "Consumable"
+msgstr "Консуматив"
+
+#, fuzzy
+msgctxt "field:product.product,cost_price:"
+msgid "Cost Price"
+msgstr "Фабрична цена"
+
+#, fuzzy
+msgctxt "field:product.product,cost_price_method:"
+msgid "Cost Method"
+msgstr "Начин на остойностяване"
+
+#, fuzzy
 msgctxt "field:product.product,cost_price_uom:"
 msgid "Cost Price"
 msgstr "Фабрична цена"
@@ -86,6 +141,11 @@ msgctxt "field:product.product,default_uom:"
 msgid "Default UOM"
 msgstr "Мер. ед. по подрабиране"
 
+#, fuzzy
+msgctxt "field:product.product,default_uom_category:"
+msgid "Default UOM Category"
+msgstr "Категория мер. ед. по подразбиране"
+
 msgctxt "field:product.product,description:"
 msgid "Description"
 msgstr "Описание"
@@ -95,10 +155,20 @@ msgid "ID"
 msgstr "ID"
 
 #, fuzzy
+msgctxt "field:product.product,list_price:"
+msgid "List Price"
+msgstr "Каталожна цена"
+
+#, fuzzy
 msgctxt "field:product.product,list_price_uom:"
 msgid "List Price"
 msgstr "Каталожна цена"
 
+#, fuzzy
+msgctxt "field:product.product,name:"
+msgid "Name"
+msgstr "Име"
+
 msgctxt "field:product.product,rec_name:"
 msgid "Name"
 msgstr "Име"
@@ -124,9 +194,10 @@ msgctxt "field:product.template,active:"
 msgid "Active"
 msgstr "Активен"
 
-msgctxt "field:product.template,category:"
-msgid "Category"
-msgstr "Категория"
+#, fuzzy
+msgctxt "field:product.template,categories:"
+msgid "Categories"
+msgstr "Категории"
 
 msgctxt "field:product.template,consumable:"
 msgid "Consumable"
@@ -189,6 +260,45 @@ msgctxt "field:product.template,write_uid:"
 msgid "Write User"
 msgstr "Променено от"
 
+#, fuzzy
+msgctxt "field:product.template-product.category,category:"
+msgid "Category"
+msgstr "Категория"
+
+#, fuzzy
+msgctxt "field:product.template-product.category,create_date:"
+msgid "Create Date"
+msgstr "Създадено на"
+
+#, fuzzy
+msgctxt "field:product.template-product.category,create_uid:"
+msgid "Create User"
+msgstr "Създадено от"
+
+#, fuzzy
+msgctxt "field:product.template-product.category,id:"
+msgid "ID"
+msgstr "ID"
+
+#, fuzzy
+msgctxt "field:product.template-product.category,rec_name:"
+msgid "Name"
+msgstr "Име"
+
+msgctxt "field:product.template-product.category,template:"
+msgid "Template"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:product.template-product.category,write_date:"
+msgid "Write Date"
+msgstr "Променено на"
+
+#, fuzzy
+msgctxt "field:product.template-product.category,write_uid:"
+msgid "Write User"
+msgstr "Променено от"
+
 msgctxt "field:product.uom,active:"
 msgid "Active"
 msgstr "Активен"
@@ -302,14 +412,19 @@ msgctxt "model:ir.action,name:act_category_tree"
 msgid "Categories"
 msgstr "Категории"
 
+msgctxt "model:ir.action,name:act_product_configuration_form"
+msgid "Product Configuration"
+msgstr ""
+
 #, fuzzy
 msgctxt "model:ir.action,name:act_product_form"
 msgid "Variants"
 msgstr "Продукти"
 
+#, fuzzy
 msgctxt "model:ir.action,name:act_template_by_category"
 msgid "Product by Category"
-msgstr ""
+msgstr "Категория на продукт"
 
 #, fuzzy
 msgctxt "model:ir.action,name:act_template_form"
@@ -332,6 +447,10 @@ msgctxt "model:ir.ui.menu,name:menu_category_tree"
 msgid "Categories"
 msgstr "Категории"
 
+msgctxt "model:ir.ui.menu,name:menu_configuration"
+msgid "Configuration"
+msgstr ""
+
 msgctxt "model:ir.ui.menu,name:menu_main_product"
 msgid "Product"
 msgstr "Продукт"
@@ -341,6 +460,10 @@ msgctxt "model:ir.ui.menu,name:menu_product"
 msgid "Variants"
 msgstr "Продукти"
 
+msgctxt "model:ir.ui.menu,name:menu_product_configuration"
+msgid "Product Configuration"
+msgstr ""
+
 #, fuzzy
 msgctxt "model:ir.ui.menu,name:menu_template"
 msgid "Products"
@@ -358,6 +481,10 @@ msgctxt "model:product.category,name:"
 msgid "Product Category"
 msgstr "Категория на продукт"
 
+msgctxt "model:product.configuration,name:"
+msgid "Product Configuration"
+msgstr ""
+
 #, fuzzy
 msgctxt "model:product.product,name:"
 msgid "Product Variant"
@@ -367,6 +494,10 @@ msgctxt "model:product.template,name:"
 msgid "Product Template"
 msgstr "Щаблон за продукт"
 
+msgctxt "model:product.template-product.category,name:"
+msgid "Template - Category"
+msgstr ""
+
 msgctxt "model:product.uom,name:"
 msgid "Unit of measure"
 msgstr "Мерна единица"
@@ -660,6 +791,30 @@ msgctxt "model:res.group,name:group_product_admin"
 msgid "Product Administration"
 msgstr "Управление на продукти"
 
+msgctxt "selection:product.configuration,default_cost_price_method:"
+msgid ""
+msgstr ""
+
+#, fuzzy
+msgctxt "selection:product.configuration,default_cost_price_method:"
+msgid "Average"
+msgstr "Средна"
+
+#, fuzzy
+msgctxt "selection:product.configuration,default_cost_price_method:"
+msgid "Fixed"
+msgstr "Фиксирана"
+
+#, fuzzy
+msgctxt "selection:product.product,cost_price_method:"
+msgid "Average"
+msgstr "Средна"
+
+#, fuzzy
+msgctxt "selection:product.product,cost_price_method:"
+msgid "Fixed"
+msgstr "Фиксирана"
+
 #, fuzzy
 msgctxt "selection:product.product,type:"
 msgid "Assets"
@@ -707,6 +862,10 @@ msgctxt "view:product.category:"
 msgid "Product Category"
 msgstr "Категория на продукт"
 
+msgctxt "view:product.configuration:"
+msgid "Party Configuration"
+msgstr ""
+
 #, fuzzy
 msgctxt "view:product.product:"
 msgid "Product"
diff --git a/locale/ca_ES.po b/locale/ca_ES.po
index 471510d..4ec05a8 100644
--- a/locale/ca_ES.po
+++ b/locale/ca_ES.po
@@ -18,8 +18,9 @@ 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."
 
+#, fuzzy
 msgctxt "error:product.uom:"
-msgid "You cannot change Rate, Factor or Category on a Unit of Measure. "
+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."
@@ -60,14 +61,68 @@ msgctxt "field:product.category,write_uid:"
 msgid "Write User"
 msgstr "Usuari modificació"
 
+#, fuzzy
+msgctxt "field:product.configuration,create_date:"
+msgid "Create Date"
+msgstr "Data creació"
+
+#, fuzzy
+msgctxt "field:product.configuration,create_uid:"
+msgid "Create User"
+msgstr "Usuari creació"
+
+msgctxt "field:product.configuration,default_cost_price_method:"
+msgid "Default Cost Method"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:product.configuration,id:"
+msgid "ID"
+msgstr "ID"
+
+#, fuzzy
+msgctxt "field:product.configuration,rec_name:"
+msgid "Name"
+msgstr "Nom"
+
+#, fuzzy
+msgctxt "field:product.configuration,write_date:"
+msgid "Write Date"
+msgstr "Data modificació"
+
+#, fuzzy
+msgctxt "field:product.configuration,write_uid:"
+msgid "Write User"
+msgstr "Usuari modificació"
+
 msgctxt "field:product.product,active:"
 msgid "Active"
 msgstr "Actiu"
 
+#, fuzzy
+msgctxt "field:product.product,categories:"
+msgid "Categories"
+msgstr "Categories"
+
 msgctxt "field:product.product,code:"
 msgid "Code"
 msgstr "Codi"
 
+#, fuzzy
+msgctxt "field:product.product,consumable:"
+msgid "Consumable"
+msgstr "Consumible"
+
+#, fuzzy
+msgctxt "field:product.product,cost_price:"
+msgid "Cost Price"
+msgstr "Preu de cost"
+
+#, fuzzy
+msgctxt "field:product.product,cost_price_method:"
+msgid "Cost Method"
+msgstr "Mètode de cost"
+
 msgctxt "field:product.product,cost_price_uom:"
 msgid "Cost Price"
 msgstr "Preu de cost"
@@ -84,6 +139,11 @@ msgctxt "field:product.product,default_uom:"
 msgid "Default UOM"
 msgstr "UdM per defecte"
 
+#, fuzzy
+msgctxt "field:product.product,default_uom_category:"
+msgid "Default UOM Category"
+msgstr "Categoria per defecte UdM"
+
 msgctxt "field:product.product,description:"
 msgid "Description"
 msgstr "Descripció"
@@ -92,10 +152,20 @@ msgctxt "field:product.product,id:"
 msgid "ID"
 msgstr "ID"
 
+#, fuzzy
+msgctxt "field:product.product,list_price:"
+msgid "List Price"
+msgstr "Preu de venda"
+
 msgctxt "field:product.product,list_price_uom:"
 msgid "List Price"
 msgstr "Preu de venda"
 
+#, fuzzy
+msgctxt "field:product.product,name:"
+msgid "Name"
+msgstr "Nom"
+
 msgctxt "field:product.product,rec_name:"
 msgid "Name"
 msgstr "Nom"
@@ -120,9 +190,10 @@ msgctxt "field:product.template,active:"
 msgid "Active"
 msgstr "Actiu"
 
-msgctxt "field:product.template,category:"
-msgid "Category"
-msgstr "Categoria"
+#, fuzzy
+msgctxt "field:product.template,categories:"
+msgid "Categories"
+msgstr "Categories"
 
 msgctxt "field:product.template,consumable:"
 msgid "Consumable"
@@ -184,6 +255,45 @@ msgctxt "field:product.template,write_uid:"
 msgid "Write User"
 msgstr "Usuari modificació"
 
+#, fuzzy
+msgctxt "field:product.template-product.category,category:"
+msgid "Category"
+msgstr "Categoria"
+
+#, fuzzy
+msgctxt "field:product.template-product.category,create_date:"
+msgid "Create Date"
+msgstr "Data creació"
+
+#, fuzzy
+msgctxt "field:product.template-product.category,create_uid:"
+msgid "Create User"
+msgstr "Usuari creació"
+
+#, fuzzy
+msgctxt "field:product.template-product.category,id:"
+msgid "ID"
+msgstr "ID"
+
+#, fuzzy
+msgctxt "field:product.template-product.category,rec_name:"
+msgid "Name"
+msgstr "Nom"
+
+msgctxt "field:product.template-product.category,template:"
+msgid "Template"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:product.template-product.category,write_date:"
+msgid "Write Date"
+msgstr "Data modificació"
+
+#, fuzzy
+msgctxt "field:product.template-product.category,write_uid:"
+msgid "Write User"
+msgstr "Usuari modificació"
+
 msgctxt "field:product.uom,active:"
 msgid "Active"
 msgstr "Actiu"
@@ -296,6 +406,10 @@ msgctxt "model:ir.action,name:act_category_tree"
 msgid "Categories"
 msgstr "Categories"
 
+msgctxt "model:ir.action,name:act_product_configuration_form"
+msgid "Product Configuration"
+msgstr ""
+
 msgctxt "model:ir.action,name:act_product_form"
 msgid "Variants"
 msgstr "Productes"
@@ -324,6 +438,10 @@ msgctxt "model:ir.ui.menu,name:menu_category_tree"
 msgid "Categories"
 msgstr "Categories"
 
+msgctxt "model:ir.ui.menu,name:menu_configuration"
+msgid "Configuration"
+msgstr ""
+
 msgctxt "model:ir.ui.menu,name:menu_main_product"
 msgid "Product"
 msgstr "Productes"
@@ -332,6 +450,10 @@ msgctxt "model:ir.ui.menu,name:menu_product"
 msgid "Variants"
 msgstr "Variants"
 
+msgctxt "model:ir.ui.menu,name:menu_product_configuration"
+msgid "Product Configuration"
+msgstr ""
+
 msgctxt "model:ir.ui.menu,name:menu_template"
 msgid "Products"
 msgstr "Productes"
@@ -348,6 +470,10 @@ msgctxt "model:product.category,name:"
 msgid "Product Category"
 msgstr "Categoria de producte"
 
+msgctxt "model:product.configuration,name:"
+msgid "Product Configuration"
+msgstr ""
+
 msgctxt "model:product.product,name:"
 msgid "Product Variant"
 msgstr "Variant de producte"
@@ -356,6 +482,10 @@ msgctxt "model:product.template,name:"
 msgid "Product Template"
 msgstr "Plantilla de producte"
 
+msgctxt "model:product.template-product.category,name:"
+msgid "Template - Category"
+msgstr ""
+
 msgctxt "model:product.uom,name:"
 msgid "Unit of measure"
 msgstr "Unitat de mesura"
@@ -648,6 +778,30 @@ msgctxt "model:res.group,name:group_product_admin"
 msgid "Product Administration"
 msgstr "Administració de productes"
 
+msgctxt "selection:product.configuration,default_cost_price_method:"
+msgid ""
+msgstr ""
+
+#, fuzzy
+msgctxt "selection:product.configuration,default_cost_price_method:"
+msgid "Average"
+msgstr "Mitjana"
+
+#, fuzzy
+msgctxt "selection:product.configuration,default_cost_price_method:"
+msgid "Fixed"
+msgstr "Fix"
+
+#, fuzzy
+msgctxt "selection:product.product,cost_price_method:"
+msgid "Average"
+msgstr "Mitjana"
+
+#, fuzzy
+msgctxt "selection:product.product,cost_price_method:"
+msgid "Fixed"
+msgstr "Fix"
+
 msgctxt "selection:product.product,type:"
 msgid "Assets"
 msgstr "Actius"
@@ -692,6 +846,10 @@ msgctxt "view:product.category:"
 msgid "Product Category"
 msgstr "Categoria de producte"
 
+msgctxt "view:product.configuration:"
+msgid "Party Configuration"
+msgstr ""
+
 msgctxt "view:product.product:"
 msgid "Product"
 msgstr "Productes"
diff --git a/locale/cs_CZ.po b/locale/cs_CZ.po
index 7bc7454..fb35d5a 100644
--- a/locale/cs_CZ.po
+++ b/locale/cs_CZ.po
@@ -17,7 +17,7 @@ msgid "Rate and factor can not be both equal to zero."
 msgstr ""
 
 msgctxt "error:product.uom:"
-msgid "You cannot change Rate, Factor or Category on a Unit of Measure. "
+msgid "You cannot change Rate, Factor or Category on a Unit of Measure."
 msgstr ""
 
 msgctxt "field:product.category,childs:"
@@ -56,14 +56,58 @@ msgctxt "field:product.category,write_uid:"
 msgid "Write User"
 msgstr ""
 
+msgctxt "field:product.configuration,create_date:"
+msgid "Create Date"
+msgstr ""
+
+msgctxt "field:product.configuration,create_uid:"
+msgid "Create User"
+msgstr ""
+
+msgctxt "field:product.configuration,default_cost_price_method:"
+msgid "Default Cost Method"
+msgstr ""
+
+msgctxt "field:product.configuration,id:"
+msgid "ID"
+msgstr ""
+
+msgctxt "field:product.configuration,rec_name:"
+msgid "Name"
+msgstr ""
+
+msgctxt "field:product.configuration,write_date:"
+msgid "Write Date"
+msgstr ""
+
+msgctxt "field:product.configuration,write_uid:"
+msgid "Write User"
+msgstr ""
+
 msgctxt "field:product.product,active:"
 msgid "Active"
 msgstr ""
 
+msgctxt "field:product.product,categories:"
+msgid "Categories"
+msgstr ""
+
 msgctxt "field:product.product,code:"
 msgid "Code"
 msgstr ""
 
+msgctxt "field:product.product,consumable:"
+msgid "Consumable"
+msgstr ""
+
+msgctxt "field:product.product,cost_price:"
+msgid "Cost Price"
+msgstr ""
+
+msgctxt "field:product.product,cost_price_method:"
+msgid "Cost Method"
+msgstr ""
+
 msgctxt "field:product.product,cost_price_uom:"
 msgid "Cost Price"
 msgstr ""
@@ -80,6 +124,10 @@ msgctxt "field:product.product,default_uom:"
 msgid "Default UOM"
 msgstr ""
 
+msgctxt "field:product.product,default_uom_category:"
+msgid "Default UOM Category"
+msgstr ""
+
 msgctxt "field:product.product,description:"
 msgid "Description"
 msgstr ""
@@ -88,10 +136,18 @@ msgctxt "field:product.product,id:"
 msgid "ID"
 msgstr ""
 
+msgctxt "field:product.product,list_price:"
+msgid "List Price"
+msgstr ""
+
 msgctxt "field:product.product,list_price_uom:"
 msgid "List Price"
 msgstr ""
 
+msgctxt "field:product.product,name:"
+msgid "Name"
+msgstr ""
+
 msgctxt "field:product.product,rec_name:"
 msgid "Name"
 msgstr ""
@@ -116,8 +172,8 @@ msgctxt "field:product.template,active:"
 msgid "Active"
 msgstr ""
 
-msgctxt "field:product.template,category:"
-msgid "Category"
+msgctxt "field:product.template,categories:"
+msgid "Categories"
 msgstr ""
 
 msgctxt "field:product.template,consumable:"
@@ -180,6 +236,38 @@ msgctxt "field:product.template,write_uid:"
 msgid "Write User"
 msgstr ""
 
+msgctxt "field:product.template-product.category,category:"
+msgid "Category"
+msgstr ""
+
+msgctxt "field:product.template-product.category,create_date:"
+msgid "Create Date"
+msgstr ""
+
+msgctxt "field:product.template-product.category,create_uid:"
+msgid "Create User"
+msgstr ""
+
+msgctxt "field:product.template-product.category,id:"
+msgid "ID"
+msgstr ""
+
+msgctxt "field:product.template-product.category,rec_name:"
+msgid "Name"
+msgstr ""
+
+msgctxt "field:product.template-product.category,template:"
+msgid "Template"
+msgstr ""
+
+msgctxt "field:product.template-product.category,write_date:"
+msgid "Write Date"
+msgstr ""
+
+msgctxt "field:product.template-product.category,write_uid:"
+msgid "Write User"
+msgstr ""
+
 msgctxt "field:product.uom,active:"
 msgid "Active"
 msgstr ""
@@ -288,6 +376,10 @@ msgctxt "model:ir.action,name:act_category_tree"
 msgid "Categories"
 msgstr ""
 
+msgctxt "model:ir.action,name:act_product_configuration_form"
+msgid "Product Configuration"
+msgstr ""
+
 msgctxt "model:ir.action,name:act_product_form"
 msgid "Variants"
 msgstr ""
@@ -316,6 +408,10 @@ msgctxt "model:ir.ui.menu,name:menu_category_tree"
 msgid "Categories"
 msgstr ""
 
+msgctxt "model:ir.ui.menu,name:menu_configuration"
+msgid "Configuration"
+msgstr ""
+
 msgctxt "model:ir.ui.menu,name:menu_main_product"
 msgid "Product"
 msgstr ""
@@ -324,6 +420,10 @@ msgctxt "model:ir.ui.menu,name:menu_product"
 msgid "Variants"
 msgstr ""
 
+msgctxt "model:ir.ui.menu,name:menu_product_configuration"
+msgid "Product Configuration"
+msgstr ""
+
 msgctxt "model:ir.ui.menu,name:menu_template"
 msgid "Products"
 msgstr ""
@@ -340,6 +440,10 @@ msgctxt "model:product.category,name:"
 msgid "Product Category"
 msgstr ""
 
+msgctxt "model:product.configuration,name:"
+msgid "Product Configuration"
+msgstr ""
+
 msgctxt "model:product.product,name:"
 msgid "Product Variant"
 msgstr ""
@@ -348,6 +452,10 @@ msgctxt "model:product.template,name:"
 msgid "Product Template"
 msgstr ""
 
+msgctxt "model:product.template-product.category,name:"
+msgid "Template - Category"
+msgstr ""
+
 msgctxt "model:product.uom,name:"
 msgid "Unit of measure"
 msgstr ""
@@ -640,6 +748,26 @@ msgctxt "model:res.group,name:group_product_admin"
 msgid "Product Administration"
 msgstr ""
 
+msgctxt "selection:product.configuration,default_cost_price_method:"
+msgid ""
+msgstr ""
+
+msgctxt "selection:product.configuration,default_cost_price_method:"
+msgid "Average"
+msgstr ""
+
+msgctxt "selection:product.configuration,default_cost_price_method:"
+msgid "Fixed"
+msgstr ""
+
+msgctxt "selection:product.product,cost_price_method:"
+msgid "Average"
+msgstr ""
+
+msgctxt "selection:product.product,cost_price_method:"
+msgid "Fixed"
+msgstr ""
+
 msgctxt "selection:product.product,type:"
 msgid "Assets"
 msgstr ""
@@ -684,6 +812,10 @@ msgctxt "view:product.category:"
 msgid "Product Category"
 msgstr ""
 
+msgctxt "view:product.configuration:"
+msgid "Party Configuration"
+msgstr ""
+
 msgctxt "view:product.product:"
 msgid "Product"
 msgstr ""
diff --git a/locale/de_DE.po b/locale/de_DE.po
index 8ed5807..106c88c 100644
--- a/locale/de_DE.po
+++ b/locale/de_DE.po
@@ -2,14 +2,6 @@
 msgid ""
 msgstr "Content-Type: text/plain; charset=utf-8\n"
 
-msgctxt "error:product.template:"
-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:"
 msgid ""
 "If the UOM is still not used, you can delete it otherwise you can deactivate"
@@ -26,8 +18,9 @@ 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"
 
+#, fuzzy
 msgctxt "error:product.uom:"
-msgid "You cannot change Rate, Factor or Category on a Unit of Measure. "
+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."
@@ -68,14 +61,68 @@ msgctxt "field:product.category,write_uid:"
 msgid "Write User"
 msgstr "Letzte Änderung durch"
 
+#, fuzzy
+msgctxt "field:product.configuration,create_date:"
+msgid "Create Date"
+msgstr "Erstellungsdatum"
+
+#, fuzzy
+msgctxt "field:product.configuration,create_uid:"
+msgid "Create User"
+msgstr "Erstellt durch"
+
+msgctxt "field:product.configuration,default_cost_price_method:"
+msgid "Default Cost Method"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:product.configuration,id:"
+msgid "ID"
+msgstr "ID"
+
+#, fuzzy
+msgctxt "field:product.configuration,rec_name:"
+msgid "Name"
+msgstr "Name"
+
+#, fuzzy
+msgctxt "field:product.configuration,write_date:"
+msgid "Write Date"
+msgstr "Zuletzt geändert"
+
+#, fuzzy
+msgctxt "field:product.configuration,write_uid:"
+msgid "Write User"
+msgstr "Letzte Änderung durch"
+
 msgctxt "field:product.product,active:"
 msgid "Active"
 msgstr "Aktiv"
 
+#, fuzzy
+msgctxt "field:product.product,categories:"
+msgid "Categories"
+msgstr "Artikelkategorien"
+
 msgctxt "field:product.product,code:"
 msgid "Code"
 msgstr "Variantennummer"
 
+#, fuzzy
+msgctxt "field:product.product,consumable:"
+msgid "Consumable"
+msgstr "Verbrauchsmaterial"
+
+#, fuzzy
+msgctxt "field:product.product,cost_price:"
+msgid "Cost Price"
+msgstr "Kostenpreis"
+
+#, fuzzy
+msgctxt "field:product.product,cost_price_method:"
+msgid "Cost Method"
+msgstr "Kostenmethode"
+
 msgctxt "field:product.product,cost_price_uom:"
 msgid "Cost Price"
 msgstr "Kostenpreis"
@@ -92,6 +139,11 @@ msgctxt "field:product.product,default_uom:"
 msgid "Default UOM"
 msgstr "Standardeinheit"
 
+#, fuzzy
+msgctxt "field:product.product,default_uom_category:"
+msgid "Default UOM Category"
+msgstr "Standardkategorie Maßeinheit"
+
 msgctxt "field:product.product,description:"
 msgid "Description"
 msgstr "Beschreibung"
@@ -100,10 +152,20 @@ msgctxt "field:product.product,id:"
 msgid "ID"
 msgstr "ID"
 
+#, fuzzy
+msgctxt "field:product.product,list_price:"
+msgid "List Price"
+msgstr "Listenpreis"
+
 msgctxt "field:product.product,list_price_uom:"
 msgid "List Price"
 msgstr "Listenpreis"
 
+#, fuzzy
+msgctxt "field:product.product,name:"
+msgid "Name"
+msgstr "Name"
+
 msgctxt "field:product.product,rec_name:"
 msgid "Name"
 msgstr "Name"
@@ -128,9 +190,10 @@ msgctxt "field:product.template,active:"
 msgid "Active"
 msgstr "Aktiv"
 
-msgctxt "field:product.template,category:"
-msgid "Category"
-msgstr "Artikelkategorie"
+#, fuzzy
+msgctxt "field:product.template,categories:"
+msgid "Categories"
+msgstr "Artikelkategorien"
 
 msgctxt "field:product.template,consumable:"
 msgid "Consumable"
@@ -192,6 +255,45 @@ msgctxt "field:product.template,write_uid:"
 msgid "Write User"
 msgstr "Letzte Änderung durch"
 
+#, fuzzy
+msgctxt "field:product.template-product.category,category:"
+msgid "Category"
+msgstr "Artikelkategorie"
+
+#, fuzzy
+msgctxt "field:product.template-product.category,create_date:"
+msgid "Create Date"
+msgstr "Erstellungsdatum"
+
+#, fuzzy
+msgctxt "field:product.template-product.category,create_uid:"
+msgid "Create User"
+msgstr "Erstellt durch"
+
+#, fuzzy
+msgctxt "field:product.template-product.category,id:"
+msgid "ID"
+msgstr "ID"
+
+#, fuzzy
+msgctxt "field:product.template-product.category,rec_name:"
+msgid "Name"
+msgstr "Name"
+
+msgctxt "field:product.template-product.category,template:"
+msgid "Template"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:product.template-product.category,write_date:"
+msgid "Write Date"
+msgstr "Zuletzt geändert"
+
+#, fuzzy
+msgctxt "field:product.template-product.category,write_uid:"
+msgid "Write User"
+msgstr "Letzte Änderung durch"
+
 msgctxt "field:product.uom,active:"
 msgid "Active"
 msgstr "Aktiv"
@@ -306,6 +408,10 @@ msgctxt "model:ir.action,name:act_category_tree"
 msgid "Categories"
 msgstr "Artikelkategorien"
 
+msgctxt "model:ir.action,name:act_product_configuration_form"
+msgid "Product Configuration"
+msgstr ""
+
 msgctxt "model:ir.action,name:act_product_form"
 msgid "Variants"
 msgstr "Varianten"
@@ -334,6 +440,10 @@ msgctxt "model:ir.ui.menu,name:menu_category_tree"
 msgid "Categories"
 msgstr "Artikelkategorien"
 
+msgctxt "model:ir.ui.menu,name:menu_configuration"
+msgid "Configuration"
+msgstr ""
+
 msgctxt "model:ir.ui.menu,name:menu_main_product"
 msgid "Product"
 msgstr "Artikel"
@@ -342,6 +452,10 @@ msgctxt "model:ir.ui.menu,name:menu_product"
 msgid "Variants"
 msgstr "Varianten"
 
+msgctxt "model:ir.ui.menu,name:menu_product_configuration"
+msgid "Product Configuration"
+msgstr ""
+
 msgctxt "model:ir.ui.menu,name:menu_template"
 msgid "Products"
 msgstr "Artikel"
@@ -358,6 +472,10 @@ msgctxt "model:product.category,name:"
 msgid "Product Category"
 msgstr "Artikel Kategorie"
 
+msgctxt "model:product.configuration,name:"
+msgid "Product Configuration"
+msgstr ""
+
 msgctxt "model:product.product,name:"
 msgid "Product Variant"
 msgstr "Variante"
@@ -366,6 +484,10 @@ msgctxt "model:product.template,name:"
 msgid "Product Template"
 msgstr "Artikel"
 
+msgctxt "model:product.template-product.category,name:"
+msgid "Template - Category"
+msgstr ""
+
 msgctxt "model:product.uom,name:"
 msgid "Unit of measure"
 msgstr "Maßeinheit"
@@ -658,6 +780,30 @@ msgctxt "model:res.group,name:group_product_admin"
 msgid "Product Administration"
 msgstr "Artikel Administration"
 
+msgctxt "selection:product.configuration,default_cost_price_method:"
+msgid ""
+msgstr ""
+
+#, fuzzy
+msgctxt "selection:product.configuration,default_cost_price_method:"
+msgid "Average"
+msgstr "Durchschnitt"
+
+#, fuzzy
+msgctxt "selection:product.configuration,default_cost_price_method:"
+msgid "Fixed"
+msgstr "Fix"
+
+#, fuzzy
+msgctxt "selection:product.product,cost_price_method:"
+msgid "Average"
+msgstr "Durchschnitt"
+
+#, fuzzy
+msgctxt "selection:product.product,cost_price_method:"
+msgid "Fixed"
+msgstr "Fix"
+
 msgctxt "selection:product.product,type:"
 msgid "Assets"
 msgstr "Inventar"
@@ -702,6 +848,10 @@ msgctxt "view:product.category:"
 msgid "Product Category"
 msgstr "Artikelkategorie"
 
+msgctxt "view:product.configuration:"
+msgid "Party Configuration"
+msgstr ""
+
 msgctxt "view:product.product:"
 msgid "Product"
 msgstr "Variante"
diff --git a/locale/es_AR.po b/locale/es_AR.po
index da60f3e..84412ab 100644
--- a/locale/es_AR.po
+++ b/locale/es_AR.po
@@ -18,8 +18,9 @@ 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."
 
+#, fuzzy
 msgctxt "error:product.uom:"
-msgid "You cannot change Rate, Factor or Category on a Unit of Measure. "
+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."
@@ -60,14 +61,68 @@ msgctxt "field:product.category,write_uid:"
 msgid "Write User"
 msgstr "Usuario modificación"
 
+#, fuzzy
+msgctxt "field:product.configuration,create_date:"
+msgid "Create Date"
+msgstr "Fecha creación"
+
+#, fuzzy
+msgctxt "field:product.configuration,create_uid:"
+msgid "Create User"
+msgstr "Usuario creación"
+
+msgctxt "field:product.configuration,default_cost_price_method:"
+msgid "Default Cost Method"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:product.configuration,id:"
+msgid "ID"
+msgstr "ID"
+
+#, fuzzy
+msgctxt "field:product.configuration,rec_name:"
+msgid "Name"
+msgstr "Nombre"
+
+#, fuzzy
+msgctxt "field:product.configuration,write_date:"
+msgid "Write Date"
+msgstr "Fecha modificación"
+
+#, fuzzy
+msgctxt "field:product.configuration,write_uid:"
+msgid "Write User"
+msgstr "Usuario modificación"
+
 msgctxt "field:product.product,active:"
 msgid "Active"
 msgstr "Activo"
 
+#, fuzzy
+msgctxt "field:product.product,categories:"
+msgid "Categories"
+msgstr "Categorías"
+
 msgctxt "field:product.product,code:"
 msgid "Code"
 msgstr "Código"
 
+#, fuzzy
+msgctxt "field:product.product,consumable:"
+msgid "Consumable"
+msgstr "Consumible"
+
+#, fuzzy
+msgctxt "field:product.product,cost_price:"
+msgid "Cost Price"
+msgstr "Precio de costo"
+
+#, fuzzy
+msgctxt "field:product.product,cost_price_method:"
+msgid "Cost Method"
+msgstr "Método de costo"
+
 msgctxt "field:product.product,cost_price_uom:"
 msgid "Cost Price"
 msgstr "Precio de costo"
@@ -84,6 +139,11 @@ msgctxt "field:product.product,default_uom:"
 msgid "Default UOM"
 msgstr "UdM por defecto"
 
+#, fuzzy
+msgctxt "field:product.product,default_uom_category:"
+msgid "Default UOM Category"
+msgstr "Categoría de UdM por defecto"
+
 msgctxt "field:product.product,description:"
 msgid "Description"
 msgstr "Descripción"
@@ -92,10 +152,20 @@ msgctxt "field:product.product,id:"
 msgid "ID"
 msgstr "ID"
 
+#, fuzzy
+msgctxt "field:product.product,list_price:"
+msgid "List Price"
+msgstr "Precio de lista"
+
 msgctxt "field:product.product,list_price_uom:"
 msgid "List Price"
 msgstr "Precio de lista"
 
+#, fuzzy
+msgctxt "field:product.product,name:"
+msgid "Name"
+msgstr "Nombre"
+
 msgctxt "field:product.product,rec_name:"
 msgid "Name"
 msgstr "Nombre"
@@ -120,9 +190,10 @@ msgctxt "field:product.template,active:"
 msgid "Active"
 msgstr "Activo"
 
-msgctxt "field:product.template,category:"
-msgid "Category"
-msgstr "Categoría"
+#, fuzzy
+msgctxt "field:product.template,categories:"
+msgid "Categories"
+msgstr "Categorías"
 
 msgctxt "field:product.template,consumable:"
 msgid "Consumable"
@@ -184,6 +255,45 @@ msgctxt "field:product.template,write_uid:"
 msgid "Write User"
 msgstr "Usuario modificación"
 
+#, fuzzy
+msgctxt "field:product.template-product.category,category:"
+msgid "Category"
+msgstr "Categoría"
+
+#, fuzzy
+msgctxt "field:product.template-product.category,create_date:"
+msgid "Create Date"
+msgstr "Fecha creación"
+
+#, fuzzy
+msgctxt "field:product.template-product.category,create_uid:"
+msgid "Create User"
+msgstr "Usuario creación"
+
+#, fuzzy
+msgctxt "field:product.template-product.category,id:"
+msgid "ID"
+msgstr "ID"
+
+#, fuzzy
+msgctxt "field:product.template-product.category,rec_name:"
+msgid "Name"
+msgstr "Nombre"
+
+msgctxt "field:product.template-product.category,template:"
+msgid "Template"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:product.template-product.category,write_date:"
+msgid "Write Date"
+msgstr "Fecha modificación"
+
+#, fuzzy
+msgctxt "field:product.template-product.category,write_uid:"
+msgid "Write User"
+msgstr "Usuario modificación"
+
 msgctxt "field:product.uom,active:"
 msgid "Active"
 msgstr "Activo"
@@ -296,6 +406,10 @@ msgctxt "model:ir.action,name:act_category_tree"
 msgid "Categories"
 msgstr "Categorías"
 
+msgctxt "model:ir.action,name:act_product_configuration_form"
+msgid "Product Configuration"
+msgstr ""
+
 msgctxt "model:ir.action,name:act_product_form"
 msgid "Variants"
 msgstr "Variantes"
@@ -324,6 +438,10 @@ msgctxt "model:ir.ui.menu,name:menu_category_tree"
 msgid "Categories"
 msgstr "Categorías"
 
+msgctxt "model:ir.ui.menu,name:menu_configuration"
+msgid "Configuration"
+msgstr ""
+
 msgctxt "model:ir.ui.menu,name:menu_main_product"
 msgid "Product"
 msgstr "Productos"
@@ -332,6 +450,10 @@ msgctxt "model:ir.ui.menu,name:menu_product"
 msgid "Variants"
 msgstr "Variantes"
 
+msgctxt "model:ir.ui.menu,name:menu_product_configuration"
+msgid "Product Configuration"
+msgstr ""
+
 msgctxt "model:ir.ui.menu,name:menu_template"
 msgid "Products"
 msgstr "Productos"
@@ -348,6 +470,10 @@ msgctxt "model:product.category,name:"
 msgid "Product Category"
 msgstr "Categoría de producto"
 
+msgctxt "model:product.configuration,name:"
+msgid "Product Configuration"
+msgstr ""
+
 msgctxt "model:product.product,name:"
 msgid "Product Variant"
 msgstr "Variante de producto"
@@ -356,6 +482,10 @@ msgctxt "model:product.template,name:"
 msgid "Product Template"
 msgstr "Plantilla de producto"
 
+msgctxt "model:product.template-product.category,name:"
+msgid "Template - Category"
+msgstr ""
+
 msgctxt "model:product.uom,name:"
 msgid "Unit of measure"
 msgstr "Unidad de medida"
@@ -648,6 +778,30 @@ msgctxt "model:res.group,name:group_product_admin"
 msgid "Product Administration"
 msgstr "Administración de productos"
 
+msgctxt "selection:product.configuration,default_cost_price_method:"
+msgid ""
+msgstr ""
+
+#, fuzzy
+msgctxt "selection:product.configuration,default_cost_price_method:"
+msgid "Average"
+msgstr "Promedio"
+
+#, fuzzy
+msgctxt "selection:product.configuration,default_cost_price_method:"
+msgid "Fixed"
+msgstr "Fijo"
+
+#, fuzzy
+msgctxt "selection:product.product,cost_price_method:"
+msgid "Average"
+msgstr "Promedio"
+
+#, fuzzy
+msgctxt "selection:product.product,cost_price_method:"
+msgid "Fixed"
+msgstr "Fijo"
+
 msgctxt "selection:product.product,type:"
 msgid "Assets"
 msgstr "Activos"
@@ -692,6 +846,10 @@ msgctxt "view:product.category:"
 msgid "Product Category"
 msgstr "Categoría de producto"
 
+msgctxt "view:product.configuration:"
+msgid "Party Configuration"
+msgstr ""
+
 msgctxt "view:product.product:"
 msgid "Product"
 msgstr "Producto"
diff --git a/locale/es_CO.po b/locale/es_CO.po
index a23d209..39771eb 100644
--- a/locale/es_CO.po
+++ b/locale/es_CO.po
@@ -18,8 +18,9 @@ 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."
 
+#, fuzzy
 msgctxt "error:product.uom:"
-msgid "You cannot change Rate, Factor or Category on a Unit of Measure. "
+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."
@@ -60,14 +61,68 @@ msgctxt "field:product.category,write_uid:"
 msgid "Write User"
 msgstr "Modificado por Usuario"
 
+#, fuzzy
+msgctxt "field:product.configuration,create_date:"
+msgid "Create Date"
+msgstr "Fecha de Creación"
+
+#, fuzzy
+msgctxt "field:product.configuration,create_uid:"
+msgid "Create User"
+msgstr "Creado por Usuario"
+
+msgctxt "field:product.configuration,default_cost_price_method:"
+msgid "Default Cost Method"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:product.configuration,id:"
+msgid "ID"
+msgstr "ID"
+
+#, fuzzy
+msgctxt "field:product.configuration,rec_name:"
+msgid "Name"
+msgstr "Nombre"
+
+#, fuzzy
+msgctxt "field:product.configuration,write_date:"
+msgid "Write Date"
+msgstr "Fecha de Modificación"
+
+#, fuzzy
+msgctxt "field:product.configuration,write_uid:"
+msgid "Write User"
+msgstr "Modificado por Usuario"
+
 msgctxt "field:product.product,active:"
 msgid "Active"
 msgstr "Activo"
 
+#, fuzzy
+msgctxt "field:product.product,categories:"
+msgid "Categories"
+msgstr "Categorías"
+
 msgctxt "field:product.product,code:"
 msgid "Code"
 msgstr "Código"
 
+#, fuzzy
+msgctxt "field:product.product,consumable:"
+msgid "Consumable"
+msgstr "Consumible"
+
+#, fuzzy
+msgctxt "field:product.product,cost_price:"
+msgid "Cost Price"
+msgstr "Costo"
+
+#, fuzzy
+msgctxt "field:product.product,cost_price_method:"
+msgid "Cost Method"
+msgstr "Método de Costeo"
+
 msgctxt "field:product.product,cost_price_uom:"
 msgid "Cost Price"
 msgstr "Costo"
@@ -84,6 +139,11 @@ msgctxt "field:product.product,default_uom:"
 msgid "Default UOM"
 msgstr "UdM por Defecto"
 
+#, fuzzy
+msgctxt "field:product.product,default_uom_category:"
+msgid "Default UOM Category"
+msgstr "Categoría de UdM por Defecto"
+
 msgctxt "field:product.product,description:"
 msgid "Description"
 msgstr "Descripción"
@@ -92,10 +152,20 @@ msgctxt "field:product.product,id:"
 msgid "ID"
 msgstr "ID"
 
+#, fuzzy
+msgctxt "field:product.product,list_price:"
+msgid "List Price"
+msgstr "Precio de Venta"
+
 msgctxt "field:product.product,list_price_uom:"
 msgid "List Price"
 msgstr "Precio de Venta"
 
+#, fuzzy
+msgctxt "field:product.product,name:"
+msgid "Name"
+msgstr "Nombre"
+
 msgctxt "field:product.product,rec_name:"
 msgid "Name"
 msgstr "Nombre"
@@ -120,9 +190,10 @@ msgctxt "field:product.template,active:"
 msgid "Active"
 msgstr "Activo"
 
-msgctxt "field:product.template,category:"
-msgid "Category"
-msgstr "Categoría"
+#, fuzzy
+msgctxt "field:product.template,categories:"
+msgid "Categories"
+msgstr "Categorías"
 
 msgctxt "field:product.template,consumable:"
 msgid "Consumable"
@@ -184,6 +255,45 @@ msgctxt "field:product.template,write_uid:"
 msgid "Write User"
 msgstr "Modificado por Usuario"
 
+#, fuzzy
+msgctxt "field:product.template-product.category,category:"
+msgid "Category"
+msgstr "Categoría"
+
+#, fuzzy
+msgctxt "field:product.template-product.category,create_date:"
+msgid "Create Date"
+msgstr "Fecha de Creación"
+
+#, fuzzy
+msgctxt "field:product.template-product.category,create_uid:"
+msgid "Create User"
+msgstr "Creado por Usuario"
+
+#, fuzzy
+msgctxt "field:product.template-product.category,id:"
+msgid "ID"
+msgstr "ID"
+
+#, fuzzy
+msgctxt "field:product.template-product.category,rec_name:"
+msgid "Name"
+msgstr "Nombre"
+
+msgctxt "field:product.template-product.category,template:"
+msgid "Template"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:product.template-product.category,write_date:"
+msgid "Write Date"
+msgstr "Fecha de Modificación"
+
+#, fuzzy
+msgctxt "field:product.template-product.category,write_uid:"
+msgid "Write User"
+msgstr "Modificado por Usuario"
+
 msgctxt "field:product.uom,active:"
 msgid "Active"
 msgstr "Activo"
@@ -296,6 +406,10 @@ msgctxt "model:ir.action,name:act_category_tree"
 msgid "Categories"
 msgstr "Categorías"
 
+msgctxt "model:ir.action,name:act_product_configuration_form"
+msgid "Product Configuration"
+msgstr ""
+
 msgctxt "model:ir.action,name:act_product_form"
 msgid "Variants"
 msgstr "Variedades"
@@ -324,6 +438,10 @@ msgctxt "model:ir.ui.menu,name:menu_category_tree"
 msgid "Categories"
 msgstr "Categorías"
 
+msgctxt "model:ir.ui.menu,name:menu_configuration"
+msgid "Configuration"
+msgstr ""
+
 msgctxt "model:ir.ui.menu,name:menu_main_product"
 msgid "Product"
 msgstr "Administración de Productos"
@@ -332,6 +450,10 @@ msgctxt "model:ir.ui.menu,name:menu_product"
 msgid "Variants"
 msgstr "Variedades"
 
+msgctxt "model:ir.ui.menu,name:menu_product_configuration"
+msgid "Product Configuration"
+msgstr ""
+
 msgctxt "model:ir.ui.menu,name:menu_template"
 msgid "Products"
 msgstr "Productos"
@@ -348,6 +470,10 @@ msgctxt "model:product.category,name:"
 msgid "Product Category"
 msgstr "Categoría de Producto"
 
+msgctxt "model:product.configuration,name:"
+msgid "Product Configuration"
+msgstr ""
+
 msgctxt "model:product.product,name:"
 msgid "Product Variant"
 msgstr "Variedad de Producto"
@@ -356,6 +482,10 @@ msgctxt "model:product.template,name:"
 msgid "Product Template"
 msgstr "Plantilla de Producto"
 
+msgctxt "model:product.template-product.category,name:"
+msgid "Template - Category"
+msgstr ""
+
 msgctxt "model:product.uom,name:"
 msgid "Unit of measure"
 msgstr "Unidad de Medida"
@@ -648,6 +778,30 @@ msgctxt "model:res.group,name:group_product_admin"
 msgid "Product Administration"
 msgstr "Administración de Productos"
 
+msgctxt "selection:product.configuration,default_cost_price_method:"
+msgid ""
+msgstr ""
+
+#, fuzzy
+msgctxt "selection:product.configuration,default_cost_price_method:"
+msgid "Average"
+msgstr "Promedio"
+
+#, fuzzy
+msgctxt "selection:product.configuration,default_cost_price_method:"
+msgid "Fixed"
+msgstr "Fijo"
+
+#, fuzzy
+msgctxt "selection:product.product,cost_price_method:"
+msgid "Average"
+msgstr "Promedio"
+
+#, fuzzy
+msgctxt "selection:product.product,cost_price_method:"
+msgid "Fixed"
+msgstr "Fijo"
+
 msgctxt "selection:product.product,type:"
 msgid "Assets"
 msgstr "Activos Fijos"
@@ -692,6 +846,10 @@ msgctxt "view:product.category:"
 msgid "Product Category"
 msgstr "Categoría de Producto"
 
+msgctxt "view:product.configuration:"
+msgid "Party Configuration"
+msgstr ""
+
 msgctxt "view:product.product:"
 msgid "Product"
 msgstr "Producto"
diff --git a/locale/es_EC.po b/locale/es_EC.po
index b3dec47..2799869 100644
--- a/locale/es_EC.po
+++ b/locale/es_EC.po
@@ -19,8 +19,9 @@ msgctxt "error:product.uom:"
 msgid "Rate and factor can not be both equal to zero."
 msgstr "La conversión y el factor no pueden ser cero simultáneamente."
 
+#, fuzzy
 msgctxt "error:product.uom:"
-msgid "You cannot change Rate, Factor or Category on a Unit of Measure. "
+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."
@@ -61,14 +62,68 @@ msgctxt "field:product.category,write_uid:"
 msgid "Write User"
 msgstr "Modificado por usuario"
 
+#, fuzzy
+msgctxt "field:product.configuration,create_date:"
+msgid "Create Date"
+msgstr "Fecha de creación"
+
+#, fuzzy
+msgctxt "field:product.configuration,create_uid:"
+msgid "Create User"
+msgstr "Creado por usuario"
+
+msgctxt "field:product.configuration,default_cost_price_method:"
+msgid "Default Cost Method"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:product.configuration,id:"
+msgid "ID"
+msgstr "ID"
+
+#, fuzzy
+msgctxt "field:product.configuration,rec_name:"
+msgid "Name"
+msgstr "Nombre"
+
+#, fuzzy
+msgctxt "field:product.configuration,write_date:"
+msgid "Write Date"
+msgstr "Fecha de modificación"
+
+#, fuzzy
+msgctxt "field:product.configuration,write_uid:"
+msgid "Write User"
+msgstr "Modificado por usuario"
+
 msgctxt "field:product.product,active:"
 msgid "Active"
 msgstr "Activo"
 
+#, fuzzy
+msgctxt "field:product.product,categories:"
+msgid "Categories"
+msgstr "Categorías"
+
 msgctxt "field:product.product,code:"
 msgid "Code"
 msgstr "Código"
 
+#, fuzzy
+msgctxt "field:product.product,consumable:"
+msgid "Consumable"
+msgstr "Consumible"
+
+#, fuzzy
+msgctxt "field:product.product,cost_price:"
+msgid "Cost Price"
+msgstr "Precio de costo"
+
+#, fuzzy
+msgctxt "field:product.product,cost_price_method:"
+msgid "Cost Method"
+msgstr "Método de costo"
+
 msgctxt "field:product.product,cost_price_uom:"
 msgid "Cost Price"
 msgstr "Precio de costo"
@@ -85,6 +140,11 @@ msgctxt "field:product.product,default_uom:"
 msgid "Default UOM"
 msgstr "UdM por defecto"
 
+#, fuzzy
+msgctxt "field:product.product,default_uom_category:"
+msgid "Default UOM Category"
+msgstr "Categoría de UdM por defecto"
+
 msgctxt "field:product.product,description:"
 msgid "Description"
 msgstr "Descripción"
@@ -93,10 +153,20 @@ msgctxt "field:product.product,id:"
 msgid "ID"
 msgstr "ID"
 
+#, fuzzy
+msgctxt "field:product.product,list_price:"
+msgid "List Price"
+msgstr "Precio de venta"
+
 msgctxt "field:product.product,list_price_uom:"
 msgid "List Price"
 msgstr "Precio de venta"
 
+#, fuzzy
+msgctxt "field:product.product,name:"
+msgid "Name"
+msgstr "Nombre"
+
 msgctxt "field:product.product,rec_name:"
 msgid "Name"
 msgstr "Nombre"
@@ -121,9 +191,10 @@ msgctxt "field:product.template,active:"
 msgid "Active"
 msgstr "Activo"
 
-msgctxt "field:product.template,category:"
-msgid "Category"
-msgstr "Categoría"
+#, fuzzy
+msgctxt "field:product.template,categories:"
+msgid "Categories"
+msgstr "Categorías"
 
 msgctxt "field:product.template,consumable:"
 msgid "Consumable"
@@ -185,6 +256,45 @@ msgctxt "field:product.template,write_uid:"
 msgid "Write User"
 msgstr "Modificado por usuario"
 
+#, fuzzy
+msgctxt "field:product.template-product.category,category:"
+msgid "Category"
+msgstr "Categoría"
+
+#, fuzzy
+msgctxt "field:product.template-product.category,create_date:"
+msgid "Create Date"
+msgstr "Fecha de creación"
+
+#, fuzzy
+msgctxt "field:product.template-product.category,create_uid:"
+msgid "Create User"
+msgstr "Creado por usuario"
+
+#, fuzzy
+msgctxt "field:product.template-product.category,id:"
+msgid "ID"
+msgstr "ID"
+
+#, fuzzy
+msgctxt "field:product.template-product.category,rec_name:"
+msgid "Name"
+msgstr "Nombre"
+
+msgctxt "field:product.template-product.category,template:"
+msgid "Template"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:product.template-product.category,write_date:"
+msgid "Write Date"
+msgstr "Fecha de modificación"
+
+#, fuzzy
+msgctxt "field:product.template-product.category,write_uid:"
+msgid "Write User"
+msgstr "Modificado por usuario"
+
 msgctxt "field:product.uom,active:"
 msgid "Active"
 msgstr "Activo"
@@ -297,6 +407,10 @@ msgctxt "model:ir.action,name:act_category_tree"
 msgid "Categories"
 msgstr "Categorías"
 
+msgctxt "model:ir.action,name:act_product_configuration_form"
+msgid "Product Configuration"
+msgstr ""
+
 msgctxt "model:ir.action,name:act_product_form"
 msgid "Variants"
 msgstr "Variantes"
@@ -325,6 +439,10 @@ msgctxt "model:ir.ui.menu,name:menu_category_tree"
 msgid "Categories"
 msgstr "Categorías"
 
+msgctxt "model:ir.ui.menu,name:menu_configuration"
+msgid "Configuration"
+msgstr ""
+
 msgctxt "model:ir.ui.menu,name:menu_main_product"
 msgid "Product"
 msgstr "Productos"
@@ -333,6 +451,10 @@ msgctxt "model:ir.ui.menu,name:menu_product"
 msgid "Variants"
 msgstr "Variantes"
 
+msgctxt "model:ir.ui.menu,name:menu_product_configuration"
+msgid "Product Configuration"
+msgstr ""
+
 msgctxt "model:ir.ui.menu,name:menu_template"
 msgid "Products"
 msgstr "Productos"
@@ -349,6 +471,10 @@ msgctxt "model:product.category,name:"
 msgid "Product Category"
 msgstr "Categoría de producto"
 
+msgctxt "model:product.configuration,name:"
+msgid "Product Configuration"
+msgstr ""
+
 msgctxt "model:product.product,name:"
 msgid "Product Variant"
 msgstr "Variante de producto"
@@ -357,6 +483,10 @@ msgctxt "model:product.template,name:"
 msgid "Product Template"
 msgstr "Plantilla de producto"
 
+msgctxt "model:product.template-product.category,name:"
+msgid "Template - Category"
+msgstr ""
+
 msgctxt "model:product.uom,name:"
 msgid "Unit of measure"
 msgstr "Unidad de medida"
@@ -649,6 +779,30 @@ msgctxt "model:res.group,name:group_product_admin"
 msgid "Product Administration"
 msgstr "Administración de Productos"
 
+msgctxt "selection:product.configuration,default_cost_price_method:"
+msgid ""
+msgstr ""
+
+#, fuzzy
+msgctxt "selection:product.configuration,default_cost_price_method:"
+msgid "Average"
+msgstr "Promedio"
+
+#, fuzzy
+msgctxt "selection:product.configuration,default_cost_price_method:"
+msgid "Fixed"
+msgstr "Fijo"
+
+#, fuzzy
+msgctxt "selection:product.product,cost_price_method:"
+msgid "Average"
+msgstr "Promedio"
+
+#, fuzzy
+msgctxt "selection:product.product,cost_price_method:"
+msgid "Fixed"
+msgstr "Fijo"
+
 msgctxt "selection:product.product,type:"
 msgid "Assets"
 msgstr "Activos"
@@ -693,6 +847,10 @@ msgctxt "view:product.category:"
 msgid "Product Category"
 msgstr "Categoría de producto"
 
+msgctxt "view:product.configuration:"
+msgid "Party Configuration"
+msgstr ""
+
 msgctxt "view:product.product:"
 msgid "Product"
 msgstr "Producto"
diff --git a/locale/es_ES.po b/locale/es_ES.po
index 5dfb44f..c165808 100644
--- a/locale/es_ES.po
+++ b/locale/es_ES.po
@@ -18,8 +18,9 @@ msgctxt "error:product.uom:"
 msgid "Rate and factor can not be both equal to zero."
 msgstr "La conversión y el factor no pueden ser cero simultáneamente."
 
+#, fuzzy
 msgctxt "error:product.uom:"
-msgid "You cannot change Rate, Factor or Category on a Unit of Measure. "
+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."
@@ -60,14 +61,68 @@ msgctxt "field:product.category,write_uid:"
 msgid "Write User"
 msgstr "Usuario modificación"
 
+#, fuzzy
+msgctxt "field:product.configuration,create_date:"
+msgid "Create Date"
+msgstr "Fecha creación"
+
+#, fuzzy
+msgctxt "field:product.configuration,create_uid:"
+msgid "Create User"
+msgstr "Usuario creación"
+
+msgctxt "field:product.configuration,default_cost_price_method:"
+msgid "Default Cost Method"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:product.configuration,id:"
+msgid "ID"
+msgstr "ID"
+
+#, fuzzy
+msgctxt "field:product.configuration,rec_name:"
+msgid "Name"
+msgstr "Nombre"
+
+#, fuzzy
+msgctxt "field:product.configuration,write_date:"
+msgid "Write Date"
+msgstr "Fecha modificación"
+
+#, fuzzy
+msgctxt "field:product.configuration,write_uid:"
+msgid "Write User"
+msgstr "Usuario modificación"
+
 msgctxt "field:product.product,active:"
 msgid "Active"
 msgstr "Activo"
 
+#, fuzzy
+msgctxt "field:product.product,categories:"
+msgid "Categories"
+msgstr "Categorías"
+
 msgctxt "field:product.product,code:"
 msgid "Code"
 msgstr "Código"
 
+#, fuzzy
+msgctxt "field:product.product,consumable:"
+msgid "Consumable"
+msgstr "Consumible"
+
+#, fuzzy
+msgctxt "field:product.product,cost_price:"
+msgid "Cost Price"
+msgstr "Precio de coste"
+
+#, fuzzy
+msgctxt "field:product.product,cost_price_method:"
+msgid "Cost Method"
+msgstr "Método de coste"
+
 msgctxt "field:product.product,cost_price_uom:"
 msgid "Cost Price"
 msgstr "Precio de coste"
@@ -84,6 +139,11 @@ msgctxt "field:product.product,default_uom:"
 msgid "Default UOM"
 msgstr "UdM por defecto"
 
+#, fuzzy
+msgctxt "field:product.product,default_uom_category:"
+msgid "Default UOM Category"
+msgstr "Categoría por defecto UdM"
+
 msgctxt "field:product.product,description:"
 msgid "Description"
 msgstr "Descripción"
@@ -92,10 +152,20 @@ msgctxt "field:product.product,id:"
 msgid "ID"
 msgstr "ID"
 
+#, fuzzy
+msgctxt "field:product.product,list_price:"
+msgid "List Price"
+msgstr "Precio de venta"
+
 msgctxt "field:product.product,list_price_uom:"
 msgid "List Price"
 msgstr "Precio de venta"
 
+#, fuzzy
+msgctxt "field:product.product,name:"
+msgid "Name"
+msgstr "Nombre"
+
 msgctxt "field:product.product,rec_name:"
 msgid "Name"
 msgstr "Nombre"
@@ -120,9 +190,10 @@ msgctxt "field:product.template,active:"
 msgid "Active"
 msgstr "Activo"
 
-msgctxt "field:product.template,category:"
-msgid "Category"
-msgstr "Categoría"
+#, fuzzy
+msgctxt "field:product.template,categories:"
+msgid "Categories"
+msgstr "Categorías"
 
 msgctxt "field:product.template,consumable:"
 msgid "Consumable"
@@ -184,6 +255,45 @@ msgctxt "field:product.template,write_uid:"
 msgid "Write User"
 msgstr "Usuario modificación"
 
+#, fuzzy
+msgctxt "field:product.template-product.category,category:"
+msgid "Category"
+msgstr "Categoría"
+
+#, fuzzy
+msgctxt "field:product.template-product.category,create_date:"
+msgid "Create Date"
+msgstr "Fecha creación"
+
+#, fuzzy
+msgctxt "field:product.template-product.category,create_uid:"
+msgid "Create User"
+msgstr "Usuario creación"
+
+#, fuzzy
+msgctxt "field:product.template-product.category,id:"
+msgid "ID"
+msgstr "ID"
+
+#, fuzzy
+msgctxt "field:product.template-product.category,rec_name:"
+msgid "Name"
+msgstr "Nombre"
+
+msgctxt "field:product.template-product.category,template:"
+msgid "Template"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:product.template-product.category,write_date:"
+msgid "Write Date"
+msgstr "Fecha modificación"
+
+#, fuzzy
+msgctxt "field:product.template-product.category,write_uid:"
+msgid "Write User"
+msgstr "Usuario modificación"
+
 msgctxt "field:product.uom,active:"
 msgid "Active"
 msgstr "Activo"
@@ -296,6 +406,10 @@ msgctxt "model:ir.action,name:act_category_tree"
 msgid "Categories"
 msgstr "Categorías"
 
+msgctxt "model:ir.action,name:act_product_configuration_form"
+msgid "Product Configuration"
+msgstr ""
+
 msgctxt "model:ir.action,name:act_product_form"
 msgid "Variants"
 msgstr "Productos"
@@ -324,6 +438,10 @@ msgctxt "model:ir.ui.menu,name:menu_category_tree"
 msgid "Categories"
 msgstr "Categorías"
 
+msgctxt "model:ir.ui.menu,name:menu_configuration"
+msgid "Configuration"
+msgstr ""
+
 msgctxt "model:ir.ui.menu,name:menu_main_product"
 msgid "Product"
 msgstr "Productos"
@@ -332,6 +450,10 @@ msgctxt "model:ir.ui.menu,name:menu_product"
 msgid "Variants"
 msgstr "Variantes"
 
+msgctxt "model:ir.ui.menu,name:menu_product_configuration"
+msgid "Product Configuration"
+msgstr ""
+
 msgctxt "model:ir.ui.menu,name:menu_template"
 msgid "Products"
 msgstr "Productos"
@@ -348,6 +470,10 @@ msgctxt "model:product.category,name:"
 msgid "Product Category"
 msgstr "Categoría de producto"
 
+msgctxt "model:product.configuration,name:"
+msgid "Product Configuration"
+msgstr ""
+
 msgctxt "model:product.product,name:"
 msgid "Product Variant"
 msgstr "Variante de producto"
@@ -356,6 +482,10 @@ msgctxt "model:product.template,name:"
 msgid "Product Template"
 msgstr "Plantilla de producto"
 
+msgctxt "model:product.template-product.category,name:"
+msgid "Template - Category"
+msgstr ""
+
 msgctxt "model:product.uom,name:"
 msgid "Unit of measure"
 msgstr "Unidad de medida"
@@ -648,6 +778,30 @@ msgctxt "model:res.group,name:group_product_admin"
 msgid "Product Administration"
 msgstr "Administración de productos"
 
+msgctxt "selection:product.configuration,default_cost_price_method:"
+msgid ""
+msgstr ""
+
+#, fuzzy
+msgctxt "selection:product.configuration,default_cost_price_method:"
+msgid "Average"
+msgstr "Promedio"
+
+#, fuzzy
+msgctxt "selection:product.configuration,default_cost_price_method:"
+msgid "Fixed"
+msgstr "Fijo"
+
+#, fuzzy
+msgctxt "selection:product.product,cost_price_method:"
+msgid "Average"
+msgstr "Promedio"
+
+#, fuzzy
+msgctxt "selection:product.product,cost_price_method:"
+msgid "Fixed"
+msgstr "Fijo"
+
 msgctxt "selection:product.product,type:"
 msgid "Assets"
 msgstr "Activos"
@@ -692,6 +846,10 @@ msgctxt "view:product.category:"
 msgid "Product Category"
 msgstr "Categoría de producto"
 
+msgctxt "view:product.configuration:"
+msgid "Party Configuration"
+msgstr ""
+
 msgctxt "view:product.product:"
 msgid "Product"
 msgstr "Producto"
diff --git a/locale/es_MX.po b/locale/es_MX.po
index a8462aa..f74f19a 100644
--- a/locale/es_MX.po
+++ b/locale/es_MX.po
@@ -18,8 +18,9 @@ msgctxt "error:product.uom:"
 msgid "Rate and factor can not be both equal to zero."
 msgstr "La conversión y el factor no pueden ser cero simultáneamente."
 
+#, fuzzy
 msgctxt "error:product.uom:"
-msgid "You cannot change Rate, Factor or Category on a Unit of Measure. "
+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."
@@ -60,14 +61,68 @@ msgctxt "field:product.category,write_uid:"
 msgid "Write User"
 msgstr "Usuario modificación"
 
+#, fuzzy
+msgctxt "field:product.configuration,create_date:"
+msgid "Create Date"
+msgstr "Fecha creación"
+
+#, fuzzy
+msgctxt "field:product.configuration,create_uid:"
+msgid "Create User"
+msgstr "Usuario creación"
+
+msgctxt "field:product.configuration,default_cost_price_method:"
+msgid "Default Cost Method"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:product.configuration,id:"
+msgid "ID"
+msgstr "ID"
+
+#, fuzzy
+msgctxt "field:product.configuration,rec_name:"
+msgid "Name"
+msgstr "Nombre"
+
+#, fuzzy
+msgctxt "field:product.configuration,write_date:"
+msgid "Write Date"
+msgstr "Fecha modificación"
+
+#, fuzzy
+msgctxt "field:product.configuration,write_uid:"
+msgid "Write User"
+msgstr "Usuario modificación"
+
 msgctxt "field:product.product,active:"
 msgid "Active"
 msgstr "Activo"
 
+#, fuzzy
+msgctxt "field:product.product,categories:"
+msgid "Categories"
+msgstr "Categorías"
+
 msgctxt "field:product.product,code:"
 msgid "Code"
 msgstr "Código"
 
+#, fuzzy
+msgctxt "field:product.product,consumable:"
+msgid "Consumable"
+msgstr "Consumible"
+
+#, fuzzy
+msgctxt "field:product.product,cost_price:"
+msgid "Cost Price"
+msgstr "Precio de costo"
+
+#, fuzzy
+msgctxt "field:product.product,cost_price_method:"
+msgid "Cost Method"
+msgstr "Método de costo"
+
 msgctxt "field:product.product,cost_price_uom:"
 msgid "Cost Price"
 msgstr "Precio de costo"
@@ -84,6 +139,11 @@ msgctxt "field:product.product,default_uom:"
 msgid "Default UOM"
 msgstr "UdM predefinida"
 
+#, fuzzy
+msgctxt "field:product.product,default_uom_category:"
+msgid "Default UOM Category"
+msgstr "Categoría predefinida UdM"
+
 msgctxt "field:product.product,description:"
 msgid "Description"
 msgstr "Descripción"
@@ -92,10 +152,20 @@ msgctxt "field:product.product,id:"
 msgid "ID"
 msgstr "ID"
 
+#, fuzzy
+msgctxt "field:product.product,list_price:"
+msgid "List Price"
+msgstr "Precio de venta"
+
 msgctxt "field:product.product,list_price_uom:"
 msgid "List Price"
 msgstr "Precio de venta"
 
+#, fuzzy
+msgctxt "field:product.product,name:"
+msgid "Name"
+msgstr "Nombre"
+
 msgctxt "field:product.product,rec_name:"
 msgid "Name"
 msgstr "Nombre"
@@ -120,9 +190,10 @@ msgctxt "field:product.template,active:"
 msgid "Active"
 msgstr "Activo"
 
-msgctxt "field:product.template,category:"
-msgid "Category"
-msgstr "Categoría"
+#, fuzzy
+msgctxt "field:product.template,categories:"
+msgid "Categories"
+msgstr "Categorías"
 
 msgctxt "field:product.template,consumable:"
 msgid "Consumable"
@@ -184,6 +255,45 @@ msgctxt "field:product.template,write_uid:"
 msgid "Write User"
 msgstr "Usuario modificación"
 
+#, fuzzy
+msgctxt "field:product.template-product.category,category:"
+msgid "Category"
+msgstr "Categoría"
+
+#, fuzzy
+msgctxt "field:product.template-product.category,create_date:"
+msgid "Create Date"
+msgstr "Fecha creación"
+
+#, fuzzy
+msgctxt "field:product.template-product.category,create_uid:"
+msgid "Create User"
+msgstr "Usuario creación"
+
+#, fuzzy
+msgctxt "field:product.template-product.category,id:"
+msgid "ID"
+msgstr "ID"
+
+#, fuzzy
+msgctxt "field:product.template-product.category,rec_name:"
+msgid "Name"
+msgstr "Nombre"
+
+msgctxt "field:product.template-product.category,template:"
+msgid "Template"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:product.template-product.category,write_date:"
+msgid "Write Date"
+msgstr "Fecha modificación"
+
+#, fuzzy
+msgctxt "field:product.template-product.category,write_uid:"
+msgid "Write User"
+msgstr "Usuario modificación"
+
 msgctxt "field:product.uom,active:"
 msgid "Active"
 msgstr "Activo"
@@ -296,6 +406,10 @@ msgctxt "model:ir.action,name:act_category_tree"
 msgid "Categories"
 msgstr "Categorías"
 
+msgctxt "model:ir.action,name:act_product_configuration_form"
+msgid "Product Configuration"
+msgstr ""
+
 msgctxt "model:ir.action,name:act_product_form"
 msgid "Variants"
 msgstr "Productos"
@@ -324,6 +438,10 @@ msgctxt "model:ir.ui.menu,name:menu_category_tree"
 msgid "Categories"
 msgstr "Categorías"
 
+msgctxt "model:ir.ui.menu,name:menu_configuration"
+msgid "Configuration"
+msgstr ""
+
 msgctxt "model:ir.ui.menu,name:menu_main_product"
 msgid "Product"
 msgstr "Productos"
@@ -332,6 +450,10 @@ msgctxt "model:ir.ui.menu,name:menu_product"
 msgid "Variants"
 msgstr "Variantes"
 
+msgctxt "model:ir.ui.menu,name:menu_product_configuration"
+msgid "Product Configuration"
+msgstr ""
+
 msgctxt "model:ir.ui.menu,name:menu_template"
 msgid "Products"
 msgstr "Productos"
@@ -348,6 +470,10 @@ msgctxt "model:product.category,name:"
 msgid "Product Category"
 msgstr "Categoría de producto"
 
+msgctxt "model:product.configuration,name:"
+msgid "Product Configuration"
+msgstr ""
+
 msgctxt "model:product.product,name:"
 msgid "Product Variant"
 msgstr "Variante de producto"
@@ -356,6 +482,10 @@ msgctxt "model:product.template,name:"
 msgid "Product Template"
 msgstr "Plantilla de producto"
 
+msgctxt "model:product.template-product.category,name:"
+msgid "Template - Category"
+msgstr ""
+
 msgctxt "model:product.uom,name:"
 msgid "Unit of measure"
 msgstr "Unidad de medida"
@@ -648,6 +778,30 @@ msgctxt "model:res.group,name:group_product_admin"
 msgid "Product Administration"
 msgstr "Administración de productos"
 
+msgctxt "selection:product.configuration,default_cost_price_method:"
+msgid ""
+msgstr ""
+
+#, fuzzy
+msgctxt "selection:product.configuration,default_cost_price_method:"
+msgid "Average"
+msgstr "Promedio"
+
+#, fuzzy
+msgctxt "selection:product.configuration,default_cost_price_method:"
+msgid "Fixed"
+msgstr "Fijo"
+
+#, fuzzy
+msgctxt "selection:product.product,cost_price_method:"
+msgid "Average"
+msgstr "Promedio"
+
+#, fuzzy
+msgctxt "selection:product.product,cost_price_method:"
+msgid "Fixed"
+msgstr "Fijo"
+
 msgctxt "selection:product.product,type:"
 msgid "Assets"
 msgstr "Activos"
@@ -680,50 +834,65 @@ msgctxt "selection:product.template,type:"
 msgid "Service"
 msgstr "Servicios"
 
+#, fuzzy
 msgctxt "view:product.category:"
 msgid "Children"
-msgstr ""
+msgstr "Hijos"
 
+#, fuzzy
 msgctxt "view:product.category:"
 msgid "Product Categories"
-msgstr ""
+msgstr "Categoría de producto"
 
+#, fuzzy
 msgctxt "view:product.category:"
 msgid "Product Category"
+msgstr "Categoría de producto"
+
+msgctxt "view:product.configuration:"
+msgid "Party Configuration"
 msgstr ""
 
+#, fuzzy
 msgctxt "view:product.product:"
 msgid "Product"
-msgstr ""
+msgstr "Productos"
 
+#, fuzzy
 msgctxt "view:product.product:"
 msgid "Products"
-msgstr ""
+msgstr "Productos"
 
 msgctxt "view:product.template:"
 msgid "General"
 msgstr ""
 
+#, fuzzy
 msgctxt "view:product.template:"
 msgid "Product"
-msgstr ""
+msgstr "Productos"
 
+#, fuzzy
 msgctxt "view:product.template:"
 msgid "Products"
-msgstr ""
+msgstr "Productos"
 
+#, fuzzy
 msgctxt "view:product.uom.category:"
 msgid "Categories of Unit of Measure"
-msgstr ""
+msgstr "Categorías de la unidad de medida"
 
+#, fuzzy
 msgctxt "view:product.uom.category:"
 msgid "Category of Unit of Measure"
-msgstr ""
+msgstr "Categorías de la unidad de medida"
 
+#, fuzzy
 msgctxt "view:product.uom:"
 msgid "Unit of Measure"
-msgstr ""
+msgstr "Unidades de medidas"
 
+#, fuzzy
 msgctxt "view:product.uom:"
 msgid "Units of Measure"
-msgstr ""
+msgstr "Unidades de medida"
diff --git a/locale/fr_FR.po b/locale/fr_FR.po
index 2a08e52..5f7e5b3 100644
--- a/locale/fr_FR.po
+++ b/locale/fr_FR.po
@@ -18,8 +18,9 @@ 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."
 
+#, fuzzy
 msgctxt "error:product.uom:"
-msgid "You cannot change Rate, Factor or Category on a Unit of Measure. "
+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."
@@ -60,14 +61,68 @@ msgctxt "field:product.category,write_uid:"
 msgid "Write User"
 msgstr "Mis à jour par"
 
+#, fuzzy
+msgctxt "field:product.configuration,create_date:"
+msgid "Create Date"
+msgstr "Date de création"
+
+#, fuzzy
+msgctxt "field:product.configuration,create_uid:"
+msgid "Create User"
+msgstr "Créé par"
+
+msgctxt "field:product.configuration,default_cost_price_method:"
+msgid "Default Cost Method"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:product.configuration,id:"
+msgid "ID"
+msgstr "ID"
+
+#, fuzzy
+msgctxt "field:product.configuration,rec_name:"
+msgid "Name"
+msgstr "Nom"
+
+#, fuzzy
+msgctxt "field:product.configuration,write_date:"
+msgid "Write Date"
+msgstr "Date de mise à jour"
+
+#, fuzzy
+msgctxt "field:product.configuration,write_uid:"
+msgid "Write User"
+msgstr "Mis à jour par"
+
 msgctxt "field:product.product,active:"
 msgid "Active"
 msgstr "Actif"
 
+#, fuzzy
+msgctxt "field:product.product,categories:"
+msgid "Categories"
+msgstr "Catégories"
+
 msgctxt "field:product.product,code:"
 msgid "Code"
 msgstr "Code"
 
+#, fuzzy
+msgctxt "field:product.product,consumable:"
+msgid "Consumable"
+msgstr "Consommable"
+
+#, fuzzy
+msgctxt "field:product.product,cost_price:"
+msgid "Cost Price"
+msgstr "Prix de revient"
+
+#, fuzzy
+msgctxt "field:product.product,cost_price_method:"
+msgid "Cost Method"
+msgstr "Méthode de coût"
+
 msgctxt "field:product.product,cost_price_uom:"
 msgid "Cost Price"
 msgstr "Prix de revient"
@@ -84,6 +139,11 @@ msgctxt "field:product.product,default_uom:"
 msgid "Default UOM"
 msgstr "UDM par défaut"
 
+#, fuzzy
+msgctxt "field:product.product,default_uom_category:"
+msgid "Default UOM Category"
+msgstr "Catégorie d'UDM par défaut"
+
 msgctxt "field:product.product,description:"
 msgid "Description"
 msgstr "Description"
@@ -92,10 +152,20 @@ msgctxt "field:product.product,id:"
 msgid "ID"
 msgstr "ID"
 
+#, fuzzy
+msgctxt "field:product.product,list_price:"
+msgid "List Price"
+msgstr "Prix listé"
+
 msgctxt "field:product.product,list_price_uom:"
 msgid "List Price"
 msgstr "Prix listé"
 
+#, fuzzy
+msgctxt "field:product.product,name:"
+msgid "Name"
+msgstr "Nom"
+
 msgctxt "field:product.product,rec_name:"
 msgid "Name"
 msgstr "Nom"
@@ -120,9 +190,10 @@ msgctxt "field:product.template,active:"
 msgid "Active"
 msgstr "Actif"
 
-msgctxt "field:product.template,category:"
-msgid "Category"
-msgstr "Catégorie"
+#, fuzzy
+msgctxt "field:product.template,categories:"
+msgid "Categories"
+msgstr "Catégories"
 
 msgctxt "field:product.template,consumable:"
 msgid "Consumable"
@@ -184,6 +255,45 @@ msgctxt "field:product.template,write_uid:"
 msgid "Write User"
 msgstr "Mis à jour par"
 
+#, fuzzy
+msgctxt "field:product.template-product.category,category:"
+msgid "Category"
+msgstr "Catégorie"
+
+#, fuzzy
+msgctxt "field:product.template-product.category,create_date:"
+msgid "Create Date"
+msgstr "Date de création"
+
+#, fuzzy
+msgctxt "field:product.template-product.category,create_uid:"
+msgid "Create User"
+msgstr "Créé par"
+
+#, fuzzy
+msgctxt "field:product.template-product.category,id:"
+msgid "ID"
+msgstr "ID"
+
+#, fuzzy
+msgctxt "field:product.template-product.category,rec_name:"
+msgid "Name"
+msgstr "Nom"
+
+msgctxt "field:product.template-product.category,template:"
+msgid "Template"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:product.template-product.category,write_date:"
+msgid "Write Date"
+msgstr "Date de mise à jour"
+
+#, fuzzy
+msgctxt "field:product.template-product.category,write_uid:"
+msgid "Write User"
+msgstr "Mis à jour par"
+
 msgctxt "field:product.uom,active:"
 msgid "Active"
 msgstr "Actif"
@@ -296,6 +406,10 @@ msgctxt "model:ir.action,name:act_category_tree"
 msgid "Categories"
 msgstr "Catégories"
 
+msgctxt "model:ir.action,name:act_product_configuration_form"
+msgid "Product Configuration"
+msgstr ""
+
 msgctxt "model:ir.action,name:act_product_form"
 msgid "Variants"
 msgstr "Variantes"
@@ -324,6 +438,10 @@ msgctxt "model:ir.ui.menu,name:menu_category_tree"
 msgid "Categories"
 msgstr "Catégories"
 
+msgctxt "model:ir.ui.menu,name:menu_configuration"
+msgid "Configuration"
+msgstr ""
+
 msgctxt "model:ir.ui.menu,name:menu_main_product"
 msgid "Product"
 msgstr "Produit"
@@ -332,6 +450,10 @@ msgctxt "model:ir.ui.menu,name:menu_product"
 msgid "Variants"
 msgstr "Variantes"
 
+msgctxt "model:ir.ui.menu,name:menu_product_configuration"
+msgid "Product Configuration"
+msgstr ""
+
 msgctxt "model:ir.ui.menu,name:menu_template"
 msgid "Products"
 msgstr "Produits"
@@ -348,6 +470,10 @@ msgctxt "model:product.category,name:"
 msgid "Product Category"
 msgstr "Catégorie de produit"
 
+msgctxt "model:product.configuration,name:"
+msgid "Product Configuration"
+msgstr ""
+
 msgctxt "model:product.product,name:"
 msgid "Product Variant"
 msgstr "Variante produit"
@@ -356,6 +482,10 @@ msgctxt "model:product.template,name:"
 msgid "Product Template"
 msgstr "Modèle produit"
 
+msgctxt "model:product.template-product.category,name:"
+msgid "Template - Category"
+msgstr ""
+
 msgctxt "model:product.uom,name:"
 msgid "Unit of measure"
 msgstr "Unité de mesure"
@@ -648,6 +778,30 @@ msgctxt "model:res.group,name:group_product_admin"
 msgid "Product Administration"
 msgstr "Administration des produits"
 
+msgctxt "selection:product.configuration,default_cost_price_method:"
+msgid ""
+msgstr ""
+
+#, fuzzy
+msgctxt "selection:product.configuration,default_cost_price_method:"
+msgid "Average"
+msgstr "Moyenne"
+
+#, fuzzy
+msgctxt "selection:product.configuration,default_cost_price_method:"
+msgid "Fixed"
+msgstr "Fixé"
+
+#, fuzzy
+msgctxt "selection:product.product,cost_price_method:"
+msgid "Average"
+msgstr "Moyenne"
+
+#, fuzzy
+msgctxt "selection:product.product,cost_price_method:"
+msgid "Fixed"
+msgstr "Fixé"
+
 msgctxt "selection:product.product,type:"
 msgid "Assets"
 msgstr "Biens"
@@ -692,6 +846,10 @@ msgctxt "view:product.category:"
 msgid "Product Category"
 msgstr "Catégorie de produit"
 
+msgctxt "view:product.configuration:"
+msgid "Party Configuration"
+msgstr ""
+
 msgctxt "view:product.product:"
 msgid "Product"
 msgstr "Produit"
diff --git a/locale/hu_HU.po b/locale/hu_HU.po
index 04beaae..82c52e1 100644
--- a/locale/hu_HU.po
+++ b/locale/hu_HU.po
@@ -18,8 +18,9 @@ msgctxt "error:product.uom:"
 msgid "Rate and factor can not be both equal to zero."
 msgstr "Faktor és reciprok faktor nem lehet mind kettő 0"
 
+#, fuzzy
 msgctxt "error:product.uom:"
-msgid "You cannot change Rate, Factor or Category on a Unit of Measure. "
+msgid "You cannot change Rate, Factor or Category on a Unit of Measure."
 msgstr ""
 "Faktort, faktorértéket vagy kategóriáját egy mértékegységnek nem lehet "
 "módosítani"
@@ -60,14 +61,68 @@ msgctxt "field:product.category,write_uid:"
 msgid "Write User"
 msgstr "Által módosítva"
 
+#, fuzzy
+msgctxt "field:product.configuration,create_date:"
+msgid "Create Date"
+msgstr "Létrehozás dátuma"
+
+#, fuzzy
+msgctxt "field:product.configuration,create_uid:"
+msgid "Create User"
+msgstr "Által létrehozva"
+
+msgctxt "field:product.configuration,default_cost_price_method:"
+msgid "Default Cost Method"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:product.configuration,id:"
+msgid "ID"
+msgstr "ID"
+
+#, fuzzy
+msgctxt "field:product.configuration,rec_name:"
+msgid "Name"
+msgstr "Név"
+
+#, fuzzy
+msgctxt "field:product.configuration,write_date:"
+msgid "Write Date"
+msgstr "Utolsó módosítás dátuma"
+
+#, fuzzy
+msgctxt "field:product.configuration,write_uid:"
+msgid "Write User"
+msgstr "Által módosítva"
+
 msgctxt "field:product.product,active:"
 msgid "Active"
 msgstr "Aktív"
 
+#, fuzzy
+msgctxt "field:product.product,categories:"
+msgid "Categories"
+msgstr "Cikk kategória"
+
 msgctxt "field:product.product,code:"
 msgid "Code"
 msgstr "Cikkszám"
 
+#, fuzzy
+msgctxt "field:product.product,consumable:"
+msgid "Consumable"
+msgstr "Felhasznált anyag"
+
+#, fuzzy
+msgctxt "field:product.product,cost_price:"
+msgid "Cost Price"
+msgstr "Beszerzési ár"
+
+#, fuzzy
+msgctxt "field:product.product,cost_price_method:"
+msgid "Cost Method"
+msgstr "Költségmódszer"
+
 msgctxt "field:product.product,cost_price_uom:"
 msgid "Cost Price"
 msgstr "Beszerzési ár"
@@ -84,6 +139,11 @@ msgctxt "field:product.product,default_uom:"
 msgid "Default UOM"
 msgstr "Alapegység"
 
+#, fuzzy
+msgctxt "field:product.product,default_uom_category:"
+msgid "Default UOM Category"
+msgstr "Alapértelmezett kategória mértékegysége"
+
 msgctxt "field:product.product,description:"
 msgid "Description"
 msgstr "Jellemzés"
@@ -92,10 +152,20 @@ msgctxt "field:product.product,id:"
 msgid "ID"
 msgstr "ID"
 
+#, fuzzy
+msgctxt "field:product.product,list_price:"
+msgid "List Price"
+msgstr "Árlista szerinti ár"
+
 msgctxt "field:product.product,list_price_uom:"
 msgid "List Price"
 msgstr "Árlista szerinti ár"
 
+#, fuzzy
+msgctxt "field:product.product,name:"
+msgid "Name"
+msgstr "Név"
+
 msgctxt "field:product.product,rec_name:"
 msgid "Name"
 msgstr "Név"
@@ -120,8 +190,9 @@ msgctxt "field:product.template,active:"
 msgid "Active"
 msgstr "Aktív"
 
-msgctxt "field:product.template,category:"
-msgid "Category"
+#, fuzzy
+msgctxt "field:product.template,categories:"
+msgid "Categories"
 msgstr "Cikk kategória"
 
 msgctxt "field:product.template,consumable:"
@@ -184,6 +255,45 @@ msgctxt "field:product.template,write_uid:"
 msgid "Write User"
 msgstr "Által módosítva"
 
+#, fuzzy
+msgctxt "field:product.template-product.category,category:"
+msgid "Category"
+msgstr "Cikk kategória"
+
+#, fuzzy
+msgctxt "field:product.template-product.category,create_date:"
+msgid "Create Date"
+msgstr "Létrehozás dátuma"
+
+#, fuzzy
+msgctxt "field:product.template-product.category,create_uid:"
+msgid "Create User"
+msgstr "Által létrehozva"
+
+#, fuzzy
+msgctxt "field:product.template-product.category,id:"
+msgid "ID"
+msgstr "ID"
+
+#, fuzzy
+msgctxt "field:product.template-product.category,rec_name:"
+msgid "Name"
+msgstr "Név"
+
+msgctxt "field:product.template-product.category,template:"
+msgid "Template"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:product.template-product.category,write_date:"
+msgid "Write Date"
+msgstr "Utolsó módosítás dátuma"
+
+#, fuzzy
+msgctxt "field:product.template-product.category,write_uid:"
+msgid "Write User"
+msgstr "Által módosítva"
+
 msgctxt "field:product.uom,active:"
 msgid "Active"
 msgstr "Aktív"
@@ -298,6 +408,10 @@ msgctxt "model:ir.action,name:act_category_tree"
 msgid "Categories"
 msgstr "Cikk kategóriák"
 
+msgctxt "model:ir.action,name:act_product_configuration_form"
+msgid "Product Configuration"
+msgstr ""
+
 msgctxt "model:ir.action,name:act_product_form"
 msgid "Variants"
 msgstr "Változás"
@@ -326,6 +440,10 @@ msgctxt "model:ir.ui.menu,name:menu_category_tree"
 msgid "Categories"
 msgstr "Cikk kategóriák"
 
+msgctxt "model:ir.ui.menu,name:menu_configuration"
+msgid "Configuration"
+msgstr ""
+
 msgctxt "model:ir.ui.menu,name:menu_main_product"
 msgid "Product"
 msgstr "Cikk"
@@ -334,6 +452,10 @@ msgctxt "model:ir.ui.menu,name:menu_product"
 msgid "Variants"
 msgstr "Változat"
 
+msgctxt "model:ir.ui.menu,name:menu_product_configuration"
+msgid "Product Configuration"
+msgstr ""
+
 msgctxt "model:ir.ui.menu,name:menu_template"
 msgid "Products"
 msgstr "Cikk"
@@ -350,6 +472,10 @@ msgctxt "model:product.category,name:"
 msgid "Product Category"
 msgstr "Cikk kategória"
 
+msgctxt "model:product.configuration,name:"
+msgid "Product Configuration"
+msgstr ""
+
 msgctxt "model:product.product,name:"
 msgid "Product Variant"
 msgstr "Cikk változat"
@@ -358,6 +484,10 @@ msgctxt "model:product.template,name:"
 msgid "Product Template"
 msgstr "Cikk javaslat"
 
+msgctxt "model:product.template-product.category,name:"
+msgid "Template - Category"
+msgstr ""
+
 msgctxt "model:product.uom,name:"
 msgid "Unit of measure"
 msgstr "Mértékegység"
@@ -650,6 +780,30 @@ msgctxt "model:res.group,name:group_product_admin"
 msgid "Product Administration"
 msgstr "Cikk adminisztráció"
 
+msgctxt "selection:product.configuration,default_cost_price_method:"
+msgid ""
+msgstr ""
+
+#, fuzzy
+msgctxt "selection:product.configuration,default_cost_price_method:"
+msgid "Average"
+msgstr "Átlag"
+
+#, fuzzy
+msgctxt "selection:product.configuration,default_cost_price_method:"
+msgid "Fixed"
+msgstr "Rögzített"
+
+#, fuzzy
+msgctxt "selection:product.product,cost_price_method:"
+msgid "Average"
+msgstr "Átlag"
+
+#, fuzzy
+msgctxt "selection:product.product,cost_price_method:"
+msgid "Fixed"
+msgstr "Rögzített"
+
 msgctxt "selection:product.product,type:"
 msgid "Assets"
 msgstr "Eszköz"
@@ -684,23 +838,28 @@ msgstr "Szolgáltatás"
 
 msgctxt "view:product.category:"
 msgid "Children"
-msgstr ""
+msgstr "Alárendelt (kategória)"
 
+#, fuzzy
 msgctxt "view:product.category:"
 msgid "Product Categories"
-msgstr ""
+msgstr "Cikk kategória"
 
 msgctxt "view:product.category:"
 msgid "Product Category"
+msgstr "Cikk kategória"
+
+msgctxt "view:product.configuration:"
+msgid "Party Configuration"
 msgstr ""
 
 msgctxt "view:product.product:"
 msgid "Product"
-msgstr ""
+msgstr "Cikk"
 
 msgctxt "view:product.product:"
 msgid "Products"
-msgstr ""
+msgstr "Cikk"
 
 msgctxt "view:product.template:"
 msgid "General"
@@ -708,24 +867,26 @@ msgstr ""
 
 msgctxt "view:product.template:"
 msgid "Product"
-msgstr ""
+msgstr "Cikk"
 
 msgctxt "view:product.template:"
 msgid "Products"
-msgstr ""
+msgstr "Cikk"
 
 msgctxt "view:product.uom.category:"
 msgid "Categories of Unit of Measure"
-msgstr ""
+msgstr "Kategóriák mértékegysége"
 
+#, fuzzy
 msgctxt "view:product.uom.category:"
 msgid "Category of Unit of Measure"
-msgstr ""
+msgstr "Kategóriák mértékegysége"
 
+#, fuzzy
 msgctxt "view:product.uom:"
 msgid "Unit of Measure"
-msgstr ""
+msgstr "Mértékegység"
 
 msgctxt "view:product.uom:"
 msgid "Units of Measure"
-msgstr ""
+msgstr "Mértékegység"
diff --git a/locale/it_IT.po b/locale/it_IT.po
index 7bc7454..fb35d5a 100644
--- a/locale/it_IT.po
+++ b/locale/it_IT.po
@@ -17,7 +17,7 @@ msgid "Rate and factor can not be both equal to zero."
 msgstr ""
 
 msgctxt "error:product.uom:"
-msgid "You cannot change Rate, Factor or Category on a Unit of Measure. "
+msgid "You cannot change Rate, Factor or Category on a Unit of Measure."
 msgstr ""
 
 msgctxt "field:product.category,childs:"
@@ -56,14 +56,58 @@ msgctxt "field:product.category,write_uid:"
 msgid "Write User"
 msgstr ""
 
+msgctxt "field:product.configuration,create_date:"
+msgid "Create Date"
+msgstr ""
+
+msgctxt "field:product.configuration,create_uid:"
+msgid "Create User"
+msgstr ""
+
+msgctxt "field:product.configuration,default_cost_price_method:"
+msgid "Default Cost Method"
+msgstr ""
+
+msgctxt "field:product.configuration,id:"
+msgid "ID"
+msgstr ""
+
+msgctxt "field:product.configuration,rec_name:"
+msgid "Name"
+msgstr ""
+
+msgctxt "field:product.configuration,write_date:"
+msgid "Write Date"
+msgstr ""
+
+msgctxt "field:product.configuration,write_uid:"
+msgid "Write User"
+msgstr ""
+
 msgctxt "field:product.product,active:"
 msgid "Active"
 msgstr ""
 
+msgctxt "field:product.product,categories:"
+msgid "Categories"
+msgstr ""
+
 msgctxt "field:product.product,code:"
 msgid "Code"
 msgstr ""
 
+msgctxt "field:product.product,consumable:"
+msgid "Consumable"
+msgstr ""
+
+msgctxt "field:product.product,cost_price:"
+msgid "Cost Price"
+msgstr ""
+
+msgctxt "field:product.product,cost_price_method:"
+msgid "Cost Method"
+msgstr ""
+
 msgctxt "field:product.product,cost_price_uom:"
 msgid "Cost Price"
 msgstr ""
@@ -80,6 +124,10 @@ msgctxt "field:product.product,default_uom:"
 msgid "Default UOM"
 msgstr ""
 
+msgctxt "field:product.product,default_uom_category:"
+msgid "Default UOM Category"
+msgstr ""
+
 msgctxt "field:product.product,description:"
 msgid "Description"
 msgstr ""
@@ -88,10 +136,18 @@ msgctxt "field:product.product,id:"
 msgid "ID"
 msgstr ""
 
+msgctxt "field:product.product,list_price:"
+msgid "List Price"
+msgstr ""
+
 msgctxt "field:product.product,list_price_uom:"
 msgid "List Price"
 msgstr ""
 
+msgctxt "field:product.product,name:"
+msgid "Name"
+msgstr ""
+
 msgctxt "field:product.product,rec_name:"
 msgid "Name"
 msgstr ""
@@ -116,8 +172,8 @@ msgctxt "field:product.template,active:"
 msgid "Active"
 msgstr ""
 
-msgctxt "field:product.template,category:"
-msgid "Category"
+msgctxt "field:product.template,categories:"
+msgid "Categories"
 msgstr ""
 
 msgctxt "field:product.template,consumable:"
@@ -180,6 +236,38 @@ msgctxt "field:product.template,write_uid:"
 msgid "Write User"
 msgstr ""
 
+msgctxt "field:product.template-product.category,category:"
+msgid "Category"
+msgstr ""
+
+msgctxt "field:product.template-product.category,create_date:"
+msgid "Create Date"
+msgstr ""
+
+msgctxt "field:product.template-product.category,create_uid:"
+msgid "Create User"
+msgstr ""
+
+msgctxt "field:product.template-product.category,id:"
+msgid "ID"
+msgstr ""
+
+msgctxt "field:product.template-product.category,rec_name:"
+msgid "Name"
+msgstr ""
+
+msgctxt "field:product.template-product.category,template:"
+msgid "Template"
+msgstr ""
+
+msgctxt "field:product.template-product.category,write_date:"
+msgid "Write Date"
+msgstr ""
+
+msgctxt "field:product.template-product.category,write_uid:"
+msgid "Write User"
+msgstr ""
+
 msgctxt "field:product.uom,active:"
 msgid "Active"
 msgstr ""
@@ -288,6 +376,10 @@ msgctxt "model:ir.action,name:act_category_tree"
 msgid "Categories"
 msgstr ""
 
+msgctxt "model:ir.action,name:act_product_configuration_form"
+msgid "Product Configuration"
+msgstr ""
+
 msgctxt "model:ir.action,name:act_product_form"
 msgid "Variants"
 msgstr ""
@@ -316,6 +408,10 @@ msgctxt "model:ir.ui.menu,name:menu_category_tree"
 msgid "Categories"
 msgstr ""
 
+msgctxt "model:ir.ui.menu,name:menu_configuration"
+msgid "Configuration"
+msgstr ""
+
 msgctxt "model:ir.ui.menu,name:menu_main_product"
 msgid "Product"
 msgstr ""
@@ -324,6 +420,10 @@ msgctxt "model:ir.ui.menu,name:menu_product"
 msgid "Variants"
 msgstr ""
 
+msgctxt "model:ir.ui.menu,name:menu_product_configuration"
+msgid "Product Configuration"
+msgstr ""
+
 msgctxt "model:ir.ui.menu,name:menu_template"
 msgid "Products"
 msgstr ""
@@ -340,6 +440,10 @@ msgctxt "model:product.category,name:"
 msgid "Product Category"
 msgstr ""
 
+msgctxt "model:product.configuration,name:"
+msgid "Product Configuration"
+msgstr ""
+
 msgctxt "model:product.product,name:"
 msgid "Product Variant"
 msgstr ""
@@ -348,6 +452,10 @@ msgctxt "model:product.template,name:"
 msgid "Product Template"
 msgstr ""
 
+msgctxt "model:product.template-product.category,name:"
+msgid "Template - Category"
+msgstr ""
+
 msgctxt "model:product.uom,name:"
 msgid "Unit of measure"
 msgstr ""
@@ -640,6 +748,26 @@ msgctxt "model:res.group,name:group_product_admin"
 msgid "Product Administration"
 msgstr ""
 
+msgctxt "selection:product.configuration,default_cost_price_method:"
+msgid ""
+msgstr ""
+
+msgctxt "selection:product.configuration,default_cost_price_method:"
+msgid "Average"
+msgstr ""
+
+msgctxt "selection:product.configuration,default_cost_price_method:"
+msgid "Fixed"
+msgstr ""
+
+msgctxt "selection:product.product,cost_price_method:"
+msgid "Average"
+msgstr ""
+
+msgctxt "selection:product.product,cost_price_method:"
+msgid "Fixed"
+msgstr ""
+
 msgctxt "selection:product.product,type:"
 msgid "Assets"
 msgstr ""
@@ -684,6 +812,10 @@ msgctxt "view:product.category:"
 msgid "Product Category"
 msgstr ""
 
+msgctxt "view:product.configuration:"
+msgid "Party Configuration"
+msgstr ""
+
 msgctxt "view:product.product:"
 msgid "Product"
 msgstr ""
diff --git a/locale/ja_JP.po b/locale/ja_JP.po
index 7bc7454..fb35d5a 100644
--- a/locale/ja_JP.po
+++ b/locale/ja_JP.po
@@ -17,7 +17,7 @@ msgid "Rate and factor can not be both equal to zero."
 msgstr ""
 
 msgctxt "error:product.uom:"
-msgid "You cannot change Rate, Factor or Category on a Unit of Measure. "
+msgid "You cannot change Rate, Factor or Category on a Unit of Measure."
 msgstr ""
 
 msgctxt "field:product.category,childs:"
@@ -56,14 +56,58 @@ msgctxt "field:product.category,write_uid:"
 msgid "Write User"
 msgstr ""
 
+msgctxt "field:product.configuration,create_date:"
+msgid "Create Date"
+msgstr ""
+
+msgctxt "field:product.configuration,create_uid:"
+msgid "Create User"
+msgstr ""
+
+msgctxt "field:product.configuration,default_cost_price_method:"
+msgid "Default Cost Method"
+msgstr ""
+
+msgctxt "field:product.configuration,id:"
+msgid "ID"
+msgstr ""
+
+msgctxt "field:product.configuration,rec_name:"
+msgid "Name"
+msgstr ""
+
+msgctxt "field:product.configuration,write_date:"
+msgid "Write Date"
+msgstr ""
+
+msgctxt "field:product.configuration,write_uid:"
+msgid "Write User"
+msgstr ""
+
 msgctxt "field:product.product,active:"
 msgid "Active"
 msgstr ""
 
+msgctxt "field:product.product,categories:"
+msgid "Categories"
+msgstr ""
+
 msgctxt "field:product.product,code:"
 msgid "Code"
 msgstr ""
 
+msgctxt "field:product.product,consumable:"
+msgid "Consumable"
+msgstr ""
+
+msgctxt "field:product.product,cost_price:"
+msgid "Cost Price"
+msgstr ""
+
+msgctxt "field:product.product,cost_price_method:"
+msgid "Cost Method"
+msgstr ""
+
 msgctxt "field:product.product,cost_price_uom:"
 msgid "Cost Price"
 msgstr ""
@@ -80,6 +124,10 @@ msgctxt "field:product.product,default_uom:"
 msgid "Default UOM"
 msgstr ""
 
+msgctxt "field:product.product,default_uom_category:"
+msgid "Default UOM Category"
+msgstr ""
+
 msgctxt "field:product.product,description:"
 msgid "Description"
 msgstr ""
@@ -88,10 +136,18 @@ msgctxt "field:product.product,id:"
 msgid "ID"
 msgstr ""
 
+msgctxt "field:product.product,list_price:"
+msgid "List Price"
+msgstr ""
+
 msgctxt "field:product.product,list_price_uom:"
 msgid "List Price"
 msgstr ""
 
+msgctxt "field:product.product,name:"
+msgid "Name"
+msgstr ""
+
 msgctxt "field:product.product,rec_name:"
 msgid "Name"
 msgstr ""
@@ -116,8 +172,8 @@ msgctxt "field:product.template,active:"
 msgid "Active"
 msgstr ""
 
-msgctxt "field:product.template,category:"
-msgid "Category"
+msgctxt "field:product.template,categories:"
+msgid "Categories"
 msgstr ""
 
 msgctxt "field:product.template,consumable:"
@@ -180,6 +236,38 @@ msgctxt "field:product.template,write_uid:"
 msgid "Write User"
 msgstr ""
 
+msgctxt "field:product.template-product.category,category:"
+msgid "Category"
+msgstr ""
+
+msgctxt "field:product.template-product.category,create_date:"
+msgid "Create Date"
+msgstr ""
+
+msgctxt "field:product.template-product.category,create_uid:"
+msgid "Create User"
+msgstr ""
+
+msgctxt "field:product.template-product.category,id:"
+msgid "ID"
+msgstr ""
+
+msgctxt "field:product.template-product.category,rec_name:"
+msgid "Name"
+msgstr ""
+
+msgctxt "field:product.template-product.category,template:"
+msgid "Template"
+msgstr ""
+
+msgctxt "field:product.template-product.category,write_date:"
+msgid "Write Date"
+msgstr ""
+
+msgctxt "field:product.template-product.category,write_uid:"
+msgid "Write User"
+msgstr ""
+
 msgctxt "field:product.uom,active:"
 msgid "Active"
 msgstr ""
@@ -288,6 +376,10 @@ msgctxt "model:ir.action,name:act_category_tree"
 msgid "Categories"
 msgstr ""
 
+msgctxt "model:ir.action,name:act_product_configuration_form"
+msgid "Product Configuration"
+msgstr ""
+
 msgctxt "model:ir.action,name:act_product_form"
 msgid "Variants"
 msgstr ""
@@ -316,6 +408,10 @@ msgctxt "model:ir.ui.menu,name:menu_category_tree"
 msgid "Categories"
 msgstr ""
 
+msgctxt "model:ir.ui.menu,name:menu_configuration"
+msgid "Configuration"
+msgstr ""
+
 msgctxt "model:ir.ui.menu,name:menu_main_product"
 msgid "Product"
 msgstr ""
@@ -324,6 +420,10 @@ msgctxt "model:ir.ui.menu,name:menu_product"
 msgid "Variants"
 msgstr ""
 
+msgctxt "model:ir.ui.menu,name:menu_product_configuration"
+msgid "Product Configuration"
+msgstr ""
+
 msgctxt "model:ir.ui.menu,name:menu_template"
 msgid "Products"
 msgstr ""
@@ -340,6 +440,10 @@ msgctxt "model:product.category,name:"
 msgid "Product Category"
 msgstr ""
 
+msgctxt "model:product.configuration,name:"
+msgid "Product Configuration"
+msgstr ""
+
 msgctxt "model:product.product,name:"
 msgid "Product Variant"
 msgstr ""
@@ -348,6 +452,10 @@ msgctxt "model:product.template,name:"
 msgid "Product Template"
 msgstr ""
 
+msgctxt "model:product.template-product.category,name:"
+msgid "Template - Category"
+msgstr ""
+
 msgctxt "model:product.uom,name:"
 msgid "Unit of measure"
 msgstr ""
@@ -640,6 +748,26 @@ msgctxt "model:res.group,name:group_product_admin"
 msgid "Product Administration"
 msgstr ""
 
+msgctxt "selection:product.configuration,default_cost_price_method:"
+msgid ""
+msgstr ""
+
+msgctxt "selection:product.configuration,default_cost_price_method:"
+msgid "Average"
+msgstr ""
+
+msgctxt "selection:product.configuration,default_cost_price_method:"
+msgid "Fixed"
+msgstr ""
+
+msgctxt "selection:product.product,cost_price_method:"
+msgid "Average"
+msgstr ""
+
+msgctxt "selection:product.product,cost_price_method:"
+msgid "Fixed"
+msgstr ""
+
 msgctxt "selection:product.product,type:"
 msgid "Assets"
 msgstr ""
@@ -684,6 +812,10 @@ msgctxt "view:product.category:"
 msgid "Product Category"
 msgstr ""
 
+msgctxt "view:product.configuration:"
+msgid "Party Configuration"
+msgstr ""
+
 msgctxt "view:product.product:"
 msgid "Product"
 msgstr ""
diff --git a/locale/nl_NL.po b/locale/lo_LA.po
similarity index 54%
copy from locale/nl_NL.po
copy to locale/lo_LA.po
index 569d0da..67b8c36 100644
--- a/locale/nl_NL.po
+++ b/locale/lo_LA.po
@@ -7,587 +7,702 @@ 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:"
 msgid "Invalid Factor and Rate values in UOM \"%s\"."
-msgstr ""
+msgstr "ປັດໄຈຄູນ ແລະ ຄ່າອັດຕາ ໃນຫົວໜ່ວຍ \"%s\" ບໍ່ຖຶກຕ້ອງ."
 
 msgctxt "error:product.uom:"
 msgid "Rate and factor can not be both equal to zero."
-msgstr "Verhouding en factor kunnen niet beiden nul zijn! "
+msgstr "ອັດຕາ ແລະ ປັດໄຈຄູນ ທັງສອງບໍ່ສາມາດເທົ່າກັບສູນໄດ້."
 
+#, fuzzy
 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."
+msgid "You cannot change Rate, Factor or Category on a Unit of Measure."
+msgstr "ເຈົ້າບໍ່ສາມາດປ່ຽນອັດຕາ,ທະວີຄູນຫຼືປະເພດຂອງໜ່ວຍວັດແທກ."
 
 msgctxt "field:product.category,childs:"
 msgid "Children"
-msgstr "Onderliggende niveaus"
+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 "ເລກທີ"
 
 msgctxt "field:product.category,name:"
 msgid "Name"
-msgstr "Naam"
+msgstr "ຊື່"
 
 msgctxt "field:product.category,parent:"
 msgid "Parent"
-msgstr "Bovenliggend niveau"
+msgstr "ບັນຊີແມ່"
 
 msgctxt "field:product.category,rec_name:"
 msgid "Name"
-msgstr "Naam"
+msgstr "ຊື່"
 
 msgctxt "field:product.category,write_date:"
 msgid "Write Date"
-msgstr ""
+msgstr "ຂຽນວັນທີ"
 
 msgctxt "field:product.category,write_uid:"
 msgid "Write User"
+msgstr "ສ້າງຜູ້ໃຊ້"
+
+#, fuzzy
+msgctxt "field:product.configuration,create_date:"
+msgid "Create Date"
+msgstr "ສ້າງວັນທີ"
+
+#, fuzzy
+msgctxt "field:product.configuration,create_uid:"
+msgid "Create User"
+msgstr "ສ້າງຜູ້ໃຊ້"
+
+msgctxt "field:product.configuration,default_cost_price_method:"
+msgid "Default Cost Method"
 msgstr ""
 
 #, fuzzy
+msgctxt "field:product.configuration,id:"
+msgid "ID"
+msgstr "ເລກທີ"
+
+#, fuzzy
+msgctxt "field:product.configuration,rec_name:"
+msgid "Name"
+msgstr "ຊື່"
+
+#, fuzzy
+msgctxt "field:product.configuration,write_date:"
+msgid "Write Date"
+msgstr "ຂຽນວັນທີ"
+
+#, fuzzy
+msgctxt "field:product.configuration,write_uid:"
+msgid "Write User"
+msgstr "ສ້າງຜູ້ໃຊ້"
+
 msgctxt "field:product.product,active:"
 msgid "Active"
-msgstr "Actief"
+msgstr "ຍັງໃຊ້ຢູ່"
+
+#, fuzzy
+msgctxt "field:product.product,categories:"
+msgid "Categories"
+msgstr "ປະເພດ"
 
 msgctxt "field:product.product,code:"
 msgid "Code"
-msgstr "Code"
+msgstr "ລະຫັດ"
+
+#, fuzzy
+msgctxt "field:product.product,consumable:"
+msgid "Consumable"
+msgstr "ວັດຖຸສິ້ນເປືອງ"
 
 #, fuzzy
+msgctxt "field:product.product,cost_price:"
+msgid "Cost Price"
+msgstr "ລາຄາຄິດໄລ່"
+
+#, fuzzy
+msgctxt "field:product.product,cost_price_method:"
+msgid "Cost Method"
+msgstr "ວິທີຄິດໄລ່"
+
 msgctxt "field:product.product,cost_price_uom:"
 msgid "Cost Price"
-msgstr "Kostprijs"
+msgstr "ລາຄາຄິດໄລ່"
 
 msgctxt "field:product.product,create_date:"
 msgid "Create Date"
-msgstr ""
+msgstr "ສ້າງວັນທີ"
 
 msgctxt "field:product.product,create_uid:"
 msgid "Create User"
-msgstr ""
+msgstr "ສ້າງຜູ້ໃຊ້"
 
-#, fuzzy
 msgctxt "field:product.product,default_uom:"
 msgid "Default UOM"
-msgstr "Standaard ME"
+msgstr "ໜ່ວຍເດີມ"
+
+#, fuzzy
+msgctxt "field:product.product,default_uom_category:"
+msgid "Default UOM Category"
+msgstr "ໝວດຫົວໜ່ວຍເດີມ"
 
 msgctxt "field:product.product,description:"
 msgid "Description"
-msgstr "Omschrijving"
+msgstr "ລາຍລະອຽດ"
 
 msgctxt "field:product.product,id:"
 msgid "ID"
-msgstr ""
+msgstr "ເລກທີ"
 
 #, fuzzy
+msgctxt "field:product.product,list_price:"
+msgid "List Price"
+msgstr "ລາຄາຂາຍ"
+
 msgctxt "field:product.product,list_price_uom:"
 msgid "List Price"
-msgstr "Catalogusprijs"
+msgstr "ລາຄາຂາຍ"
+
+#, fuzzy
+msgctxt "field:product.product,name:"
+msgid "Name"
+msgstr "ຊື່"
 
 msgctxt "field:product.product,rec_name:"
 msgid "Name"
-msgstr "Naam"
+msgstr "ຊື່"
 
 msgctxt "field:product.product,template:"
 msgid "Product Template"
-msgstr "Productsjabloon"
+msgstr "ຮ່າງແບບຜະລິດຕະພັນ"
 
-#, fuzzy
 msgctxt "field:product.product,type:"
 msgid "Type"
-msgstr "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 "Actief"
+msgstr "ຍັງໃຊ້ຢູ່"
 
-msgctxt "field:product.template,category:"
-msgid "Category"
-msgstr "Categorie"
+#, fuzzy
+msgctxt "field:product.template,categories:"
+msgid "Categories"
+msgstr "ປະເພດ"
 
 msgctxt "field:product.template,consumable:"
 msgid "Consumable"
-msgstr ""
+msgstr "ວັດຖຸສິ້ນເປືອງ"
 
 msgctxt "field:product.template,cost_price:"
 msgid "Cost Price"
-msgstr "Kostprijs"
+msgstr "ລາຄາຄິດໄລ່"
 
 msgctxt "field:product.template,cost_price_method:"
 msgid "Cost Method"
-msgstr "Kostprijsmethode"
+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 "Standaard ME"
+msgstr "ຫົວໜ່ວຍເດີມ"
 
 msgctxt "field:product.template,default_uom_category:"
 msgid "Default UOM Category"
-msgstr ""
+msgstr "ໝວດຫົວໜ່ວຍເດີມ"
 
 msgctxt "field:product.template,id:"
 msgid "ID"
-msgstr ""
+msgstr "ເລກທີ"
 
 msgctxt "field:product.template,list_price:"
 msgid "List Price"
-msgstr "Catalogusprijs"
+msgstr "ລາຍການລາຄາ"
 
 msgctxt "field:product.template,name:"
 msgid "Name"
-msgstr "Naam"
+msgstr "ຊື່"
 
-#, fuzzy
 msgctxt "field:product.template,products:"
 msgid "Variants"
-msgstr "Producten"
+msgstr "ຜະລິດຕະພັນຍ່ອຍ"
 
 msgctxt "field:product.template,rec_name:"
 msgid "Name"
-msgstr "Naam"
+msgstr "ຊື່"
 
 msgctxt "field:product.template,type:"
 msgid "Type"
-msgstr "Type"
+msgstr "ປະເພດ"
 
 msgctxt "field:product.template,write_date:"
 msgid "Write Date"
-msgstr ""
+msgstr "ຂຽນວັນທີ"
 
 msgctxt "field:product.template,write_uid:"
 msgid "Write User"
+msgstr "ສ້າງຜູ້ໃຊ້"
+
+#, fuzzy
+msgctxt "field:product.template-product.category,category:"
+msgid "Category"
+msgstr "ໝວດ"
+
+#, fuzzy
+msgctxt "field:product.template-product.category,create_date:"
+msgid "Create Date"
+msgstr "ສ້າງວັນທີ"
+
+#, fuzzy
+msgctxt "field:product.template-product.category,create_uid:"
+msgid "Create User"
+msgstr "ສ້າງຜູ້ໃຊ້"
+
+#, fuzzy
+msgctxt "field:product.template-product.category,id:"
+msgid "ID"
+msgstr "ເລກທີ"
+
+#, fuzzy
+msgctxt "field:product.template-product.category,rec_name:"
+msgid "Name"
+msgstr "ຊື່"
+
+msgctxt "field:product.template-product.category,template:"
+msgid "Template"
 msgstr ""
 
+#, fuzzy
+msgctxt "field:product.template-product.category,write_date:"
+msgid "Write Date"
+msgstr "ຂຽນວັນທີ"
+
+#, fuzzy
+msgctxt "field:product.template-product.category,write_uid:"
+msgid "Write User"
+msgstr "ສ້າງຜູ້ໃຊ້"
+
 msgctxt "field:product.uom,active:"
 msgid "Active"
-msgstr "Actief"
+msgstr "ຍັງໃຊ້ຢູ່"
 
 #, fuzzy
 msgctxt "field:product.uom,category:"
 msgid "Category"
-msgstr "ME categorie"
+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"
-msgstr "Zichtbare decimalen"
+msgstr "ສະແດງໂຕເລກ"
 
 msgctxt "field:product.uom,factor:"
 msgid "Factor"
-msgstr "Faktor"
+msgstr "ປັດໄຈຄູນ"
 
 msgctxt "field:product.uom,id:"
 msgid "ID"
-msgstr ""
+msgstr "ບັດ"
 
 msgctxt "field:product.uom,name:"
 msgid "Name"
-msgstr "Naam"
+msgstr "ຊື່"
 
 msgctxt "field:product.uom,rate:"
 msgid "Rate"
-msgstr "Verhouding"
+msgstr "ອັດຕາ"
 
 msgctxt "field:product.uom,rec_name:"
 msgid "Name"
-msgstr "Naam"
+msgstr "ຊື່"
 
 msgctxt "field:product.uom,rounding:"
 msgid "Rounding Precision"
-msgstr "Afronding"
+msgstr "ປັດໂຕເລກມົນ"
 
 msgctxt "field:product.uom,symbol:"
 msgid "Symbol"
-msgstr "Symbool"
+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 "ບັດ"
 
 msgctxt "field:product.uom.category,name:"
 msgid "Name"
-msgstr "Naam"
+msgstr "ຊື່"
 
 msgctxt "field:product.uom.category,rec_name:"
 msgid "Name"
-msgstr "Naam"
+msgstr "ຊື່"
 
 msgctxt "field:product.uom.category,uoms:"
 msgid "Unit of Measures"
-msgstr "Meeteenheid"
+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 ""
 "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)"
+"ຄ່າຄູນຂອງສູດ:\n"
+"ຄ່າຄູນ (ໜ່ວຍພຶ້ນຖານ)= 1 (ໜ່ວຍນີ້) "
 
 msgctxt "help:product.uom,rate:"
 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)"
+"ຄ່າຄູນຂອງສູດ:\n"
+"ຄ່າຄູນ (ໜ່ວຍພຶ້ນຖານ)= 1 (ໜ່ວຍນີ້) "
 
-#, fuzzy
 msgctxt "model:ir.action,name:act_category_list"
 msgid "Categories"
-msgstr "Categorieën"
+msgstr "ປະເພດ"
 
 msgctxt "model:ir.action,name:act_category_tree"
 msgid "Categories"
-msgstr "Categorieën"
+msgstr "ປະເພດ"
+
+msgctxt "model:ir.action,name:act_product_configuration_form"
+msgid "Product Configuration"
+msgstr ""
 
-#, fuzzy
 msgctxt "model:ir.action,name:act_product_form"
 msgid "Variants"
-msgstr "Producten"
+msgstr "ໜ່ວຍວັດແທກ"
 
 msgctxt "model:ir.action,name:act_template_by_category"
 msgid "Product by Category"
-msgstr ""
+msgstr "ຜະລິດຕະພັນຕາມປະເພດ"
 
-#, fuzzy
 msgctxt "model:ir.action,name:act_template_form"
 msgid "Products"
-msgstr "Producten"
+msgstr "ຜະລິດຕະພັນ"
 
 msgctxt "model:ir.action,name:act_uom_category_form"
 msgid "Categories of Unit of Measure"
-msgstr "Categorieën van meeteenheden"
+msgstr "ປະເພດໜ່ວຍວັດແທກ"
 
 msgctxt "model:ir.action,name:act_uom_form"
 msgid "Units of Measure"
-msgstr "Meeteenheden"
+msgstr "ໜ່ວຍວັດແທກ"
 
-#, fuzzy
 msgctxt "model:ir.ui.menu,name:menu_category_list"
 msgid "Categories"
-msgstr "Categorieën"
+msgstr "ໝວດ"
 
 msgctxt "model:ir.ui.menu,name:menu_category_tree"
 msgid "Categories"
-msgstr "Categorieën"
+msgstr "ໝວດ"
+
+msgctxt "model:ir.ui.menu,name:menu_configuration"
+msgid "Configuration"
+msgstr ""
 
 msgctxt "model:ir.ui.menu,name:menu_main_product"
 msgid "Product"
-msgstr "Productbeheer"
+msgstr "ຜະລິດຕະພັນ"
 
-#, fuzzy
 msgctxt "model:ir.ui.menu,name:menu_product"
 msgid "Variants"
-msgstr "Producten"
+msgstr "ຜະລິດຕະພັນຍ່ອຍ"
+
+msgctxt "model:ir.ui.menu,name:menu_product_configuration"
+msgid "Product Configuration"
+msgstr ""
 
-#, fuzzy
 msgctxt "model:ir.ui.menu,name:menu_template"
 msgid "Products"
-msgstr "Producten"
+msgstr "ຜະລິດຕະພັນ"
 
 msgctxt "model:ir.ui.menu,name:menu_uom_category_form"
 msgid "Categories"
-msgstr "Categorieën"
+msgstr "ໝວດ"
 
 msgctxt "model:ir.ui.menu,name:menu_uom_form"
 msgid "Units of Measure"
-msgstr "Meeteenheden"
+msgstr "ໜ່ວຍວັດແທກ"
 
 msgctxt "model:product.category,name:"
 msgid "Product Category"
-msgstr "Product categorie"
+msgstr "ປະເພດຜະລິດຕະພັນ"
+
+msgctxt "model:product.configuration,name:"
+msgid "Product Configuration"
+msgstr ""
 
-#, fuzzy
 msgctxt "model:product.product,name:"
 msgid "Product Variant"
-msgstr "Product"
+msgstr "ຜະລິດຕະພັນຍ່ອຍ"
 
 msgctxt "model:product.template,name:"
 msgid "Product Template"
-msgstr "Productsjabloon"
+msgstr "ຮ່າງຂໍ້ມູນຜະລິດຕະພັນ"
+
+msgctxt "model:product.template-product.category,name:"
+msgid "Template - Category"
+msgstr ""
 
 msgctxt "model:product.uom,name:"
 msgid "Unit of measure"
-msgstr "Meeteenheid"
+msgstr "ໜ່ວຍວັດແທກ"
 
 msgctxt "model:product.uom,name:uom_are"
 msgid "Are"
-msgstr "Are"
+msgstr "ອາຣ໌"
 
 msgctxt "model:product.uom,name:uom_carat"
 msgid "Carat"
-msgstr "Karaat"
+msgstr "ກາລັດ"
 
 msgctxt "model:product.uom,name:uom_centimeter"
 msgid "centimeter"
-msgstr "centimeter"
+msgstr "ຊັງຕີເແມັດ"
 
 msgctxt "model:product.uom,name:uom_cubic_centimeter"
 msgid "Cubic centimeter"
-msgstr "Kubieke centimeter"
+msgstr "ຊັງຕີແມັດກ້ອນ"
 
 msgctxt "model:product.uom,name:uom_cubic_foot"
 msgid "Cubic foot"
-msgstr ""
+msgstr "ກຸບບິກຟຸດ"
 
 msgctxt "model:product.uom,name:uom_cubic_inch"
 msgid "Cubic inch"
-msgstr ""
+msgstr "ກຸບບິກນິ້ວ"
 
 msgctxt "model:product.uom,name:uom_cubic_meter"
 msgid "Cubic meter"
-msgstr "Kubieke meter"
+msgstr "ແມັດກ້ອນ"
 
 msgctxt "model:product.uom,name:uom_day"
 msgid "Day"
-msgstr "Dag"
+msgstr "ມຶ້"
 
 msgctxt "model:product.uom,name:uom_foot"
 msgid "Foot"
-msgstr "Voet"
+msgstr "ຟຸດຕ໌"
 
 msgctxt "model:product.uom,name:uom_gallon"
 msgid "Gallon"
-msgstr ""
+msgstr "ແກນລອນ"
 
 msgctxt "model:product.uom,name:uom_gram"
 msgid "Gram"
-msgstr "Gram"
+msgstr "ກຣາມ"
 
 msgctxt "model:product.uom,name:uom_hectare"
 msgid "Hectare"
-msgstr "Hectare"
+msgstr "ເຮັກຕາ"
 
 msgctxt "model:product.uom,name:uom_hour"
 msgid "Hour"
-msgstr "Uur"
+msgstr "ຊົ່ວໂມງ"
 
 msgctxt "model:product.uom,name:uom_inch"
 msgid "Inch"
-msgstr ""
+msgstr "ນິ້ວ"
 
 msgctxt "model:product.uom,name:uom_kilogram"
 msgid "Kilogram"
-msgstr "Kilogram"
+msgstr "ກິໂລກຣາມ"
 
 msgctxt "model:product.uom,name:uom_kilometer"
 msgid "Kilometer"
-msgstr "Kilometer"
+msgstr "ກິໂລແມດ"
 
 msgctxt "model:product.uom,name:uom_liter"
 msgid "Liter"
-msgstr "Liter"
+msgstr "ລິດ"
 
 msgctxt "model:product.uom,name:uom_meter"
 msgid "Meter"
-msgstr "Meter"
+msgstr "ແມດ"
 
 msgctxt "model:product.uom,name:uom_mile"
 msgid "Mile"
-msgstr "Mijl"
+msgstr "ໄມລ໌"
 
 msgctxt "model:product.uom,name:uom_millimeter"
 msgid "Millimeter"
-msgstr "Milimeter"
+msgstr "ມີນລິແມດ"
 
 msgctxt "model:product.uom,name:uom_minute"
 msgid "Minute"
-msgstr "Minute"
+msgstr "ນາທີ"
 
 msgctxt "model:product.uom,name:uom_ounce"
 msgid "Ounce"
-msgstr "Ons"
+msgstr "ອອນ"
 
 msgctxt "model:product.uom,name:uom_pound"
 msgid "Pound"
-msgstr "Pond"
+msgstr "ພາວດ໌"
 
 msgctxt "model:product.uom,name:uom_second"
 msgid "Second"
-msgstr "Seconde"
+msgstr "ວິນາທີ"
 
 msgctxt "model:product.uom,name:uom_square_centimeter"
 msgid "Square centimeter"
-msgstr "Vierkante centimeter"
+msgstr "ຕາຊັງຕີແມັດ"
 
 msgctxt "model:product.uom,name:uom_square_foot"
 msgid "Square foot"
-msgstr ""
+msgstr "ມົນທົນຟຸດ"
 
 msgctxt "model:product.uom,name:uom_square_inch"
 msgid "Square inch"
-msgstr ""
+msgstr "ມົນທົນນິ້ວ"
 
 msgctxt "model:product.uom,name:uom_square_meter"
 msgid "Square meter"
-msgstr "Vierkante meter"
+msgstr "ຕາແມັດ"
 
 msgctxt "model:product.uom,name:uom_square_yard"
 msgid "Square yard"
-msgstr ""
+msgstr "ຢາດມົນທົນ"
 
 msgctxt "model:product.uom,name:uom_unit"
 msgid "Unit"
-msgstr "Eenheid"
+msgstr "ໜ່ວຍ"
 
 msgctxt "model:product.uom,name:uom_work_day"
 msgid "Work Day"
-msgstr "Werkdag"
+msgstr "ມື້ເຮັດວຽກ"
 
 msgctxt "model:product.uom,name:uom_yard"
 msgid "Yard"
-msgstr ""
+msgstr "ຫລາ"
 
 msgctxt "model:product.uom,symbol:uom_are"
 msgid "a"
-msgstr ""
+msgstr "a"
 
 msgctxt "model:product.uom,symbol:uom_carat"
 msgid "c"
-msgstr ""
+msgstr "ຊີ"
 
 msgctxt "model:product.uom,symbol:uom_centimeter"
 msgid "cm"
-msgstr "cm."
+msgstr "ຊມ"
 
 msgctxt "model:product.uom,symbol:uom_cubic_centimeter"
 msgid "cm³"
-msgstr "cm³"
+msgstr "ຊມ2"
 
 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 "m³"
+msgstr "ມ2"
 
 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 "ha."
+msgstr "ຮຕ"
 
 msgctxt "model:product.uom,symbol:uom_hour"
 msgid "h"
-msgstr "uur"
+msgstr "ໂມງ"
 
 msgctxt "model:product.uom,symbol:uom_inch"
 msgid "in"
-msgstr ""
+msgstr "ນິ້ວ"
 
 msgctxt "model:product.uom,symbol:uom_kilogram"
 msgid "kg"
-msgstr "kg."
+msgstr "ກກ"
 
 msgctxt "model:product.uom,symbol:uom_kilometer"
 msgid "km"
-msgstr "km."
+msgstr "ກມ"
 
 msgctxt "model:product.uom,symbol:uom_liter"
 msgid "l"
-msgstr ""
+msgstr "ລ"
 
 msgctxt "model:product.uom,symbol:uom_meter"
 msgid "m"
-msgstr "m."
+msgstr "ມ"
 
 msgctxt "model:product.uom,symbol:uom_mile"
 msgid "mi"
-msgstr ""
+msgstr "ໄມ"
 
 msgctxt "model:product.uom,symbol:uom_millimeter"
 msgid "mm"
-msgstr "mm."
+msgstr "ມມ"
 
 msgctxt "model:product.uom,symbol:uom_minute"
 msgid "min"
-msgstr "min."
+msgstr "ນາທີ"
 
 msgctxt "model:product.uom,symbol:uom_ounce"
 msgid "oz"
-msgstr ""
+msgstr "ອອນ"
 
 msgctxt "model:product.uom,symbol:uom_pound"
 msgid "lb"
@@ -595,152 +710,176 @@ msgstr ""
 
 msgctxt "model:product.uom,symbol:uom_second"
 msgid "s"
-msgstr ""
+msgstr "ວິນາທີ"
 
 msgctxt "model:product.uom,symbol:uom_square_centimeter"
 msgid "cm²"
-msgstr "cm²"
+msgstr "ຊມ2"
 
 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 "m²"
+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 "Product ME catergorie"
+msgstr "ປະເພດຫົວໜ່ວຍວັດແທກຜະລິດຕະພັນ"
 
 msgctxt "model:product.uom.category,name:uom_cat_length"
 msgid "Length"
-msgstr "Lengte"
+msgstr "ຄວາມຍາວ"
 
 msgctxt "model:product.uom.category,name:uom_cat_surface"
 msgid "Surface"
-msgstr "Oppervlak"
+msgstr "ໜ້າພຽງ"
 
 msgctxt "model:product.uom.category,name:uom_cat_time"
 msgid "Time"
-msgstr "Tijd"
+msgstr "ເວລາ"
 
 msgctxt "model:product.uom.category,name:uom_cat_unit"
 msgid "Units"
-msgstr "Eenheden"
+msgstr "ໜ່ວຍ"
 
 msgctxt "model:product.uom.category,name:uom_cat_volume"
 msgid "Volume"
-msgstr "Volume"
+msgstr "ບໍລິມາດ"
 
 msgctxt "model:product.uom.category,name:uom_cat_weight"
 msgid "Weight"
-msgstr "Gewicht"
+msgstr "ນໍ້າໜັກ"
 
 msgctxt "model:res.group,name:group_product_admin"
 msgid "Product Administration"
-msgstr "Productregistratie"
+msgstr "ບໍລິຫານຜະລິດຕະພັນ"
+
+msgctxt "selection:product.configuration,default_cost_price_method:"
+msgid ""
+msgstr ""
+
+#, fuzzy
+msgctxt "selection:product.configuration,default_cost_price_method:"
+msgid "Average"
+msgstr "ສະເລັ່ຍ"
+
+#, fuzzy
+msgctxt "selection:product.configuration,default_cost_price_method:"
+msgid "Fixed"
+msgstr "ຄົງທີ່"
+
+#, fuzzy
+msgctxt "selection:product.product,cost_price_method:"
+msgid "Average"
+msgstr "ສະເລັ່ຍ"
+
+#, fuzzy
+msgctxt "selection:product.product,cost_price_method:"
+msgid "Fixed"
+msgstr "ຄົງທີ່"
 
 msgctxt "selection:product.product,type:"
 msgid "Assets"
-msgstr ""
+msgstr "ຊັບສົມສິນ"
 
 msgctxt "selection:product.product,type:"
 msgid "Goods"
-msgstr ""
+msgstr "ສິນຄ້າ"
 
-#, fuzzy
 msgctxt "selection:product.product,type:"
 msgid "Service"
-msgstr "Service"
+msgstr "ການບໍລິການ"
 
 msgctxt "selection:product.template,cost_price_method:"
 msgid "Average"
-msgstr "Gemiddeld"
+msgstr "ສະເລັ່ຍ"
 
 msgctxt "selection:product.template,cost_price_method:"
 msgid "Fixed"
-msgstr "Vast"
+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"
-msgstr "Service"
+msgstr "ບໍລິການ"
 
 msgctxt "view:product.category:"
 msgid "Children"
-msgstr "Onderliggende niveaus"
+msgstr "ໝວດຍ່ອຍ"
 
 msgctxt "view:product.category:"
 msgid "Product Categories"
-msgstr "Product categorieën"
+msgstr "ປະເພດຜະລິດຕະພັນ"
 
 msgctxt "view:product.category:"
 msgid "Product Category"
-msgstr "Product categorie"
+msgstr "ປະເພດຜະລິດຕະພັນ"
+
+msgctxt "view:product.configuration:"
+msgid "Party Configuration"
+msgstr ""
 
-#, fuzzy
 msgctxt "view:product.product:"
 msgid "Product"
-msgstr "Producten"
+msgstr "ຜະລິດຕະພັນ"
 
 msgctxt "view:product.product:"
 msgid "Products"
-msgstr "Producten"
+msgstr "ຜະລິດຕະພັນ"
 
 msgctxt "view:product.template:"
 msgid "General"
-msgstr "Algemeen"
+msgstr "ທົ່ວໄປ"
 
-#, fuzzy
 msgctxt "view:product.template:"
 msgid "Product"
-msgstr "Producten"
+msgstr "ຜະລິດຕະພັນ"
 
-#, fuzzy
 msgctxt "view:product.template:"
 msgid "Products"
-msgstr "Producten"
+msgstr "ຜະລິດຕະພັນ"
 
 msgctxt "view:product.uom.category:"
 msgid "Categories of Unit of Measure"
-msgstr "Categorieën van meeteenheden"
+msgstr "ປະເພດໜ່ວຍວັດແທກ"
 
 msgctxt "view:product.uom.category:"
 msgid "Category of Unit of Measure"
-msgstr "Categorie van meeteenheden"
+msgstr "ປະເພດໜ່ວຍວັດແທກ"
 
 msgctxt "view:product.uom:"
 msgid "Unit of Measure"
-msgstr "Meeteenheid"
+msgstr "ໜ່ວຍວັດແທກ"
 
 msgctxt "view:product.uom:"
 msgid "Units of Measure"
-msgstr "Meeteenheden"
+msgstr "ໜ່ວຍວັດແທກ"
diff --git a/locale/lt_LT.po b/locale/lt_LT.po
index 7bc7454..fb35d5a 100644
--- a/locale/lt_LT.po
+++ b/locale/lt_LT.po
@@ -17,7 +17,7 @@ msgid "Rate and factor can not be both equal to zero."
 msgstr ""
 
 msgctxt "error:product.uom:"
-msgid "You cannot change Rate, Factor or Category on a Unit of Measure. "
+msgid "You cannot change Rate, Factor or Category on a Unit of Measure."
 msgstr ""
 
 msgctxt "field:product.category,childs:"
@@ -56,14 +56,58 @@ msgctxt "field:product.category,write_uid:"
 msgid "Write User"
 msgstr ""
 
+msgctxt "field:product.configuration,create_date:"
+msgid "Create Date"
+msgstr ""
+
+msgctxt "field:product.configuration,create_uid:"
+msgid "Create User"
+msgstr ""
+
+msgctxt "field:product.configuration,default_cost_price_method:"
+msgid "Default Cost Method"
+msgstr ""
+
+msgctxt "field:product.configuration,id:"
+msgid "ID"
+msgstr ""
+
+msgctxt "field:product.configuration,rec_name:"
+msgid "Name"
+msgstr ""
+
+msgctxt "field:product.configuration,write_date:"
+msgid "Write Date"
+msgstr ""
+
+msgctxt "field:product.configuration,write_uid:"
+msgid "Write User"
+msgstr ""
+
 msgctxt "field:product.product,active:"
 msgid "Active"
 msgstr ""
 
+msgctxt "field:product.product,categories:"
+msgid "Categories"
+msgstr ""
+
 msgctxt "field:product.product,code:"
 msgid "Code"
 msgstr ""
 
+msgctxt "field:product.product,consumable:"
+msgid "Consumable"
+msgstr ""
+
+msgctxt "field:product.product,cost_price:"
+msgid "Cost Price"
+msgstr ""
+
+msgctxt "field:product.product,cost_price_method:"
+msgid "Cost Method"
+msgstr ""
+
 msgctxt "field:product.product,cost_price_uom:"
 msgid "Cost Price"
 msgstr ""
@@ -80,6 +124,10 @@ msgctxt "field:product.product,default_uom:"
 msgid "Default UOM"
 msgstr ""
 
+msgctxt "field:product.product,default_uom_category:"
+msgid "Default UOM Category"
+msgstr ""
+
 msgctxt "field:product.product,description:"
 msgid "Description"
 msgstr ""
@@ -88,10 +136,18 @@ msgctxt "field:product.product,id:"
 msgid "ID"
 msgstr ""
 
+msgctxt "field:product.product,list_price:"
+msgid "List Price"
+msgstr ""
+
 msgctxt "field:product.product,list_price_uom:"
 msgid "List Price"
 msgstr ""
 
+msgctxt "field:product.product,name:"
+msgid "Name"
+msgstr ""
+
 msgctxt "field:product.product,rec_name:"
 msgid "Name"
 msgstr ""
@@ -116,8 +172,8 @@ msgctxt "field:product.template,active:"
 msgid "Active"
 msgstr ""
 
-msgctxt "field:product.template,category:"
-msgid "Category"
+msgctxt "field:product.template,categories:"
+msgid "Categories"
 msgstr ""
 
 msgctxt "field:product.template,consumable:"
@@ -180,6 +236,38 @@ msgctxt "field:product.template,write_uid:"
 msgid "Write User"
 msgstr ""
 
+msgctxt "field:product.template-product.category,category:"
+msgid "Category"
+msgstr ""
+
+msgctxt "field:product.template-product.category,create_date:"
+msgid "Create Date"
+msgstr ""
+
+msgctxt "field:product.template-product.category,create_uid:"
+msgid "Create User"
+msgstr ""
+
+msgctxt "field:product.template-product.category,id:"
+msgid "ID"
+msgstr ""
+
+msgctxt "field:product.template-product.category,rec_name:"
+msgid "Name"
+msgstr ""
+
+msgctxt "field:product.template-product.category,template:"
+msgid "Template"
+msgstr ""
+
+msgctxt "field:product.template-product.category,write_date:"
+msgid "Write Date"
+msgstr ""
+
+msgctxt "field:product.template-product.category,write_uid:"
+msgid "Write User"
+msgstr ""
+
 msgctxt "field:product.uom,active:"
 msgid "Active"
 msgstr ""
@@ -288,6 +376,10 @@ msgctxt "model:ir.action,name:act_category_tree"
 msgid "Categories"
 msgstr ""
 
+msgctxt "model:ir.action,name:act_product_configuration_form"
+msgid "Product Configuration"
+msgstr ""
+
 msgctxt "model:ir.action,name:act_product_form"
 msgid "Variants"
 msgstr ""
@@ -316,6 +408,10 @@ msgctxt "model:ir.ui.menu,name:menu_category_tree"
 msgid "Categories"
 msgstr ""
 
+msgctxt "model:ir.ui.menu,name:menu_configuration"
+msgid "Configuration"
+msgstr ""
+
 msgctxt "model:ir.ui.menu,name:menu_main_product"
 msgid "Product"
 msgstr ""
@@ -324,6 +420,10 @@ msgctxt "model:ir.ui.menu,name:menu_product"
 msgid "Variants"
 msgstr ""
 
+msgctxt "model:ir.ui.menu,name:menu_product_configuration"
+msgid "Product Configuration"
+msgstr ""
+
 msgctxt "model:ir.ui.menu,name:menu_template"
 msgid "Products"
 msgstr ""
@@ -340,6 +440,10 @@ msgctxt "model:product.category,name:"
 msgid "Product Category"
 msgstr ""
 
+msgctxt "model:product.configuration,name:"
+msgid "Product Configuration"
+msgstr ""
+
 msgctxt "model:product.product,name:"
 msgid "Product Variant"
 msgstr ""
@@ -348,6 +452,10 @@ msgctxt "model:product.template,name:"
 msgid "Product Template"
 msgstr ""
 
+msgctxt "model:product.template-product.category,name:"
+msgid "Template - Category"
+msgstr ""
+
 msgctxt "model:product.uom,name:"
 msgid "Unit of measure"
 msgstr ""
@@ -640,6 +748,26 @@ msgctxt "model:res.group,name:group_product_admin"
 msgid "Product Administration"
 msgstr ""
 
+msgctxt "selection:product.configuration,default_cost_price_method:"
+msgid ""
+msgstr ""
+
+msgctxt "selection:product.configuration,default_cost_price_method:"
+msgid "Average"
+msgstr ""
+
+msgctxt "selection:product.configuration,default_cost_price_method:"
+msgid "Fixed"
+msgstr ""
+
+msgctxt "selection:product.product,cost_price_method:"
+msgid "Average"
+msgstr ""
+
+msgctxt "selection:product.product,cost_price_method:"
+msgid "Fixed"
+msgstr ""
+
 msgctxt "selection:product.product,type:"
 msgid "Assets"
 msgstr ""
@@ -684,6 +812,10 @@ msgctxt "view:product.category:"
 msgid "Product Category"
 msgstr ""
 
+msgctxt "view:product.configuration:"
+msgid "Party Configuration"
+msgstr ""
+
 msgctxt "view:product.product:"
 msgid "Product"
 msgstr ""
diff --git a/locale/nl_NL.po b/locale/nl_NL.po
index 569d0da..56856b3 100644
--- a/locale/nl_NL.po
+++ b/locale/nl_NL.po
@@ -18,8 +18,9 @@ msgctxt "error:product.uom:"
 msgid "Rate and factor can not be both equal to zero."
 msgstr "Verhouding en factor kunnen niet beiden nul zijn! "
 
+#, fuzzy
 msgctxt "error:product.uom:"
-msgid "You cannot change Rate, Factor or Category on a Unit of Measure. "
+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."
 
@@ -59,15 +60,63 @@ msgctxt "field:product.category,write_uid:"
 msgid "Write User"
 msgstr ""
 
+msgctxt "field:product.configuration,create_date:"
+msgid "Create Date"
+msgstr ""
+
+msgctxt "field:product.configuration,create_uid:"
+msgid "Create User"
+msgstr ""
+
+msgctxt "field:product.configuration,default_cost_price_method:"
+msgid "Default Cost Method"
+msgstr ""
+
+msgctxt "field:product.configuration,id:"
+msgid "ID"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:product.configuration,rec_name:"
+msgid "Name"
+msgstr "Naam"
+
+msgctxt "field:product.configuration,write_date:"
+msgid "Write Date"
+msgstr ""
+
+msgctxt "field:product.configuration,write_uid:"
+msgid "Write User"
+msgstr ""
+
 #, fuzzy
 msgctxt "field:product.product,active:"
 msgid "Active"
 msgstr "Actief"
 
+#, fuzzy
+msgctxt "field:product.product,categories:"
+msgid "Categories"
+msgstr "Categorieën"
+
 msgctxt "field:product.product,code:"
 msgid "Code"
 msgstr "Code"
 
+msgctxt "field:product.product,consumable:"
+msgid "Consumable"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:product.product,cost_price:"
+msgid "Cost Price"
+msgstr "Kostprijs"
+
+#, fuzzy
+msgctxt "field:product.product,cost_price_method:"
+msgid "Cost Method"
+msgstr "Kostprijsmethode"
+
 #, fuzzy
 msgctxt "field:product.product,cost_price_uom:"
 msgid "Cost Price"
@@ -86,6 +135,10 @@ msgctxt "field:product.product,default_uom:"
 msgid "Default UOM"
 msgstr "Standaard ME"
 
+msgctxt "field:product.product,default_uom_category:"
+msgid "Default UOM Category"
+msgstr ""
+
 msgctxt "field:product.product,description:"
 msgid "Description"
 msgstr "Omschrijving"
@@ -95,10 +148,20 @@ msgid "ID"
 msgstr ""
 
 #, fuzzy
+msgctxt "field:product.product,list_price:"
+msgid "List Price"
+msgstr "Catalogusprijs"
+
+#, fuzzy
 msgctxt "field:product.product,list_price_uom:"
 msgid "List Price"
 msgstr "Catalogusprijs"
 
+#, fuzzy
+msgctxt "field:product.product,name:"
+msgid "Name"
+msgstr "Naam"
+
 msgctxt "field:product.product,rec_name:"
 msgid "Name"
 msgstr "Naam"
@@ -124,9 +187,10 @@ msgctxt "field:product.template,active:"
 msgid "Active"
 msgstr "Actief"
 
-msgctxt "field:product.template,category:"
-msgid "Category"
-msgstr "Categorie"
+#, fuzzy
+msgctxt "field:product.template,categories:"
+msgid "Categories"
+msgstr "Categorieën"
 
 msgctxt "field:product.template,consumable:"
 msgid "Consumable"
@@ -189,6 +253,40 @@ msgctxt "field:product.template,write_uid:"
 msgid "Write User"
 msgstr ""
 
+#, fuzzy
+msgctxt "field:product.template-product.category,category:"
+msgid "Category"
+msgstr "Categorie"
+
+msgctxt "field:product.template-product.category,create_date:"
+msgid "Create Date"
+msgstr ""
+
+msgctxt "field:product.template-product.category,create_uid:"
+msgid "Create User"
+msgstr ""
+
+msgctxt "field:product.template-product.category,id:"
+msgid "ID"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:product.template-product.category,rec_name:"
+msgid "Name"
+msgstr "Naam"
+
+msgctxt "field:product.template-product.category,template:"
+msgid "Template"
+msgstr ""
+
+msgctxt "field:product.template-product.category,write_date:"
+msgid "Write Date"
+msgstr ""
+
+msgctxt "field:product.template-product.category,write_uid:"
+msgid "Write User"
+msgstr ""
+
 msgctxt "field:product.uom,active:"
 msgid "Active"
 msgstr "Actief"
@@ -303,14 +401,19 @@ msgctxt "model:ir.action,name:act_category_tree"
 msgid "Categories"
 msgstr "Categorieën"
 
+msgctxt "model:ir.action,name:act_product_configuration_form"
+msgid "Product Configuration"
+msgstr ""
+
 #, fuzzy
 msgctxt "model:ir.action,name:act_product_form"
 msgid "Variants"
 msgstr "Producten"
 
+#, fuzzy
 msgctxt "model:ir.action,name:act_template_by_category"
 msgid "Product by Category"
-msgstr ""
+msgstr "Product categorie"
 
 #, fuzzy
 msgctxt "model:ir.action,name:act_template_form"
@@ -334,6 +437,10 @@ msgctxt "model:ir.ui.menu,name:menu_category_tree"
 msgid "Categories"
 msgstr "Categorieën"
 
+msgctxt "model:ir.ui.menu,name:menu_configuration"
+msgid "Configuration"
+msgstr ""
+
 msgctxt "model:ir.ui.menu,name:menu_main_product"
 msgid "Product"
 msgstr "Productbeheer"
@@ -343,6 +450,10 @@ msgctxt "model:ir.ui.menu,name:menu_product"
 msgid "Variants"
 msgstr "Producten"
 
+msgctxt "model:ir.ui.menu,name:menu_product_configuration"
+msgid "Product Configuration"
+msgstr ""
+
 #, fuzzy
 msgctxt "model:ir.ui.menu,name:menu_template"
 msgid "Products"
@@ -360,6 +471,10 @@ msgctxt "model:product.category,name:"
 msgid "Product Category"
 msgstr "Product categorie"
 
+msgctxt "model:product.configuration,name:"
+msgid "Product Configuration"
+msgstr ""
+
 #, fuzzy
 msgctxt "model:product.product,name:"
 msgid "Product Variant"
@@ -369,6 +484,10 @@ msgctxt "model:product.template,name:"
 msgid "Product Template"
 msgstr "Productsjabloon"
 
+msgctxt "model:product.template-product.category,name:"
+msgid "Template - Category"
+msgstr ""
+
 msgctxt "model:product.uom,name:"
 msgid "Unit of measure"
 msgstr "Meeteenheid"
@@ -661,6 +780,30 @@ msgctxt "model:res.group,name:group_product_admin"
 msgid "Product Administration"
 msgstr "Productregistratie"
 
+msgctxt "selection:product.configuration,default_cost_price_method:"
+msgid ""
+msgstr ""
+
+#, fuzzy
+msgctxt "selection:product.configuration,default_cost_price_method:"
+msgid "Average"
+msgstr "Gemiddeld"
+
+#, fuzzy
+msgctxt "selection:product.configuration,default_cost_price_method:"
+msgid "Fixed"
+msgstr "Vast"
+
+#, fuzzy
+msgctxt "selection:product.product,cost_price_method:"
+msgid "Average"
+msgstr "Gemiddeld"
+
+#, fuzzy
+msgctxt "selection:product.product,cost_price_method:"
+msgid "Fixed"
+msgstr "Vast"
+
 msgctxt "selection:product.product,type:"
 msgid "Assets"
 msgstr ""
@@ -706,6 +849,10 @@ msgctxt "view:product.category:"
 msgid "Product Category"
 msgstr "Product categorie"
 
+msgctxt "view:product.configuration:"
+msgid "Party Configuration"
+msgstr ""
+
 #, fuzzy
 msgctxt "view:product.product:"
 msgid "Product"
diff --git a/locale/pt_BR.po b/locale/pt_BR.po
index 172ead2..dffe82c 100644
--- a/locale/pt_BR.po
+++ b/locale/pt_BR.po
@@ -18,8 +18,9 @@ msgctxt "error:product.uom:"
 msgid "Rate and factor can not be both equal to zero."
 msgstr "Taxa e Fator não podem ser ambos iguais a zero."
 
+#, fuzzy
 msgctxt "error:product.uom:"
-msgid "You cannot change Rate, Factor or Category on a Unit of Measure. "
+msgid "You cannot change Rate, Factor or Category on a Unit of Measure."
 msgstr ""
 "Você não pode mudar Taxa, Fator ou Categoria em uma unidade de medida."
 
@@ -59,14 +60,68 @@ msgctxt "field:product.category,write_uid:"
 msgid "Write User"
 msgstr "Gravado pelo usuário"
 
+#, fuzzy
+msgctxt "field:product.configuration,create_date:"
+msgid "Create Date"
+msgstr "Data de criação"
+
+#, fuzzy
+msgctxt "field:product.configuration,create_uid:"
+msgid "Create User"
+msgstr "Criado pelo usuário"
+
+msgctxt "field:product.configuration,default_cost_price_method:"
+msgid "Default Cost Method"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:product.configuration,id:"
+msgid "ID"
+msgstr "ID"
+
+#, fuzzy
+msgctxt "field:product.configuration,rec_name:"
+msgid "Name"
+msgstr "Nome"
+
+#, fuzzy
+msgctxt "field:product.configuration,write_date:"
+msgid "Write Date"
+msgstr "Data de gravação"
+
+#, fuzzy
+msgctxt "field:product.configuration,write_uid:"
+msgid "Write User"
+msgstr "Gravado pelo usuário"
+
 msgctxt "field:product.product,active:"
 msgid "Active"
 msgstr "Ativo"
 
+#, fuzzy
+msgctxt "field:product.product,categories:"
+msgid "Categories"
+msgstr "Categorias"
+
 msgctxt "field:product.product,code:"
 msgid "Code"
 msgstr "Código"
 
+#, fuzzy
+msgctxt "field:product.product,consumable:"
+msgid "Consumable"
+msgstr "Consumível"
+
+#, fuzzy
+msgctxt "field:product.product,cost_price:"
+msgid "Cost Price"
+msgstr "Preço de custo"
+
+#, fuzzy
+msgctxt "field:product.product,cost_price_method:"
+msgid "Cost Method"
+msgstr "Método de custo"
+
 msgctxt "field:product.product,cost_price_uom:"
 msgid "Cost Price"
 msgstr "Preço de custo"
@@ -83,6 +138,11 @@ msgctxt "field:product.product,default_uom:"
 msgid "Default UOM"
 msgstr "UDM padrão"
 
+#, fuzzy
+msgctxt "field:product.product,default_uom_category:"
+msgid "Default UOM Category"
+msgstr "Categoria padrão para UDM"
+
 msgctxt "field:product.product,description:"
 msgid "Description"
 msgstr "Descrição"
@@ -91,10 +151,20 @@ msgctxt "field:product.product,id:"
 msgid "ID"
 msgstr "ID"
 
+#, fuzzy
+msgctxt "field:product.product,list_price:"
+msgid "List Price"
+msgstr "Preço de tabela"
+
 msgctxt "field:product.product,list_price_uom:"
 msgid "List Price"
 msgstr "Preço de tabela"
 
+#, fuzzy
+msgctxt "field:product.product,name:"
+msgid "Name"
+msgstr "Nome"
+
 msgctxt "field:product.product,rec_name:"
 msgid "Name"
 msgstr "Nome"
@@ -119,9 +189,10 @@ msgctxt "field:product.template,active:"
 msgid "Active"
 msgstr "Ativo"
 
-msgctxt "field:product.template,category:"
-msgid "Category"
-msgstr "Categoria"
+#, fuzzy
+msgctxt "field:product.template,categories:"
+msgid "Categories"
+msgstr "Categorias"
 
 msgctxt "field:product.template,consumable:"
 msgid "Consumable"
@@ -183,6 +254,45 @@ msgctxt "field:product.template,write_uid:"
 msgid "Write User"
 msgstr "Gravado pelo usuário"
 
+#, fuzzy
+msgctxt "field:product.template-product.category,category:"
+msgid "Category"
+msgstr "Categoria"
+
+#, fuzzy
+msgctxt "field:product.template-product.category,create_date:"
+msgid "Create Date"
+msgstr "Data de criação"
+
+#, fuzzy
+msgctxt "field:product.template-product.category,create_uid:"
+msgid "Create User"
+msgstr "Criado pelo usuário"
+
+#, fuzzy
+msgctxt "field:product.template-product.category,id:"
+msgid "ID"
+msgstr "ID"
+
+#, fuzzy
+msgctxt "field:product.template-product.category,rec_name:"
+msgid "Name"
+msgstr "Nome"
+
+msgctxt "field:product.template-product.category,template:"
+msgid "Template"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:product.template-product.category,write_date:"
+msgid "Write Date"
+msgstr "Data de gravação"
+
+#, fuzzy
+msgctxt "field:product.template-product.category,write_uid:"
+msgid "Write User"
+msgstr "Gravado pelo usuário"
+
 msgctxt "field:product.uom,active:"
 msgid "Active"
 msgstr "Ativo"
@@ -295,6 +405,10 @@ msgctxt "model:ir.action,name:act_category_tree"
 msgid "Categories"
 msgstr "Categorias"
 
+msgctxt "model:ir.action,name:act_product_configuration_form"
+msgid "Product Configuration"
+msgstr ""
+
 msgctxt "model:ir.action,name:act_product_form"
 msgid "Variants"
 msgstr "Variantes"
@@ -323,6 +437,10 @@ msgctxt "model:ir.ui.menu,name:menu_category_tree"
 msgid "Categories"
 msgstr "Categorias"
 
+msgctxt "model:ir.ui.menu,name:menu_configuration"
+msgid "Configuration"
+msgstr ""
+
 msgctxt "model:ir.ui.menu,name:menu_main_product"
 msgid "Product"
 msgstr "Produto"
@@ -331,6 +449,10 @@ msgctxt "model:ir.ui.menu,name:menu_product"
 msgid "Variants"
 msgstr "Variantes"
 
+msgctxt "model:ir.ui.menu,name:menu_product_configuration"
+msgid "Product Configuration"
+msgstr ""
+
 msgctxt "model:ir.ui.menu,name:menu_template"
 msgid "Products"
 msgstr "Produtos"
@@ -347,6 +469,10 @@ msgctxt "model:product.category,name:"
 msgid "Product Category"
 msgstr "Categoria do produto"
 
+msgctxt "model:product.configuration,name:"
+msgid "Product Configuration"
+msgstr ""
+
 msgctxt "model:product.product,name:"
 msgid "Product Variant"
 msgstr "Variante do Produto"
@@ -355,6 +481,10 @@ msgctxt "model:product.template,name:"
 msgid "Product Template"
 msgstr "Modelo de produto"
 
+msgctxt "model:product.template-product.category,name:"
+msgid "Template - Category"
+msgstr ""
+
 msgctxt "model:product.uom,name:"
 msgid "Unit of measure"
 msgstr "Unidade de medida"
@@ -647,6 +777,30 @@ msgctxt "model:res.group,name:group_product_admin"
 msgid "Product Administration"
 msgstr "Administração de produtos"
 
+msgctxt "selection:product.configuration,default_cost_price_method:"
+msgid ""
+msgstr ""
+
+#, fuzzy
+msgctxt "selection:product.configuration,default_cost_price_method:"
+msgid "Average"
+msgstr "Média"
+
+#, fuzzy
+msgctxt "selection:product.configuration,default_cost_price_method:"
+msgid "Fixed"
+msgstr "Fixo"
+
+#, fuzzy
+msgctxt "selection:product.product,cost_price_method:"
+msgid "Average"
+msgstr "Média"
+
+#, fuzzy
+msgctxt "selection:product.product,cost_price_method:"
+msgid "Fixed"
+msgstr "Fixo"
+
 msgctxt "selection:product.product,type:"
 msgid "Assets"
 msgstr "Ativos"
@@ -691,6 +845,10 @@ msgctxt "view:product.category:"
 msgid "Product Category"
 msgstr "Categoria de produto"
 
+msgctxt "view:product.configuration:"
+msgid "Party Configuration"
+msgstr ""
+
 msgctxt "view:product.product:"
 msgid "Product"
 msgstr "Produto"
diff --git a/locale/ru_RU.po b/locale/ru_RU.po
index c51b078..a817b5e 100644
--- a/locale/ru_RU.po
+++ b/locale/ru_RU.po
@@ -18,8 +18,9 @@ msgctxt "error:product.uom:"
 msgid "Rate and factor can not be both equal to zero."
 msgstr "Размер и коэффициент не могут быть одновременно равны нулю."
 
+#, fuzzy
 msgctxt "error:product.uom:"
-msgid "You cannot change Rate, Factor or Category on a Unit of Measure. "
+msgid "You cannot change Rate, Factor or Category on a Unit of Measure."
 msgstr ""
 "Вы не можете изменить размер, коэффициент или категорию на единицу "
 "измерения."
@@ -60,14 +61,68 @@ msgctxt "field:product.category,write_uid:"
 msgid "Write User"
 msgstr "Изменено пользователем"
 
+#, fuzzy
+msgctxt "field:product.configuration,create_date:"
+msgid "Create Date"
+msgstr "Дата создания"
+
+#, fuzzy
+msgctxt "field:product.configuration,create_uid:"
+msgid "Create User"
+msgstr "Создано пользователем"
+
+msgctxt "field:product.configuration,default_cost_price_method:"
+msgid "Default Cost Method"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:product.configuration,id:"
+msgid "ID"
+msgstr "ID"
+
+#, fuzzy
+msgctxt "field:product.configuration,rec_name:"
+msgid "Name"
+msgstr "Наименование"
+
+#, fuzzy
+msgctxt "field:product.configuration,write_date:"
+msgid "Write Date"
+msgstr "Дата изменения"
+
+#, fuzzy
+msgctxt "field:product.configuration,write_uid:"
+msgid "Write User"
+msgstr "Изменено пользователем"
+
 msgctxt "field:product.product,active:"
 msgid "Active"
 msgstr "Действующий"
 
+#, fuzzy
+msgctxt "field:product.product,categories:"
+msgid "Categories"
+msgstr "Категории"
+
 msgctxt "field:product.product,code:"
 msgid "Code"
 msgstr "Код"
 
+#, fuzzy
+msgctxt "field:product.product,consumable:"
+msgid "Consumable"
+msgstr "Потребляемый"
+
+#, fuzzy
+msgctxt "field:product.product,cost_price:"
+msgid "Cost Price"
+msgstr "Себестоимость"
+
+#, fuzzy
+msgctxt "field:product.product,cost_price_method:"
+msgid "Cost Method"
+msgstr "Учет стоимости"
+
 msgctxt "field:product.product,cost_price_uom:"
 msgid "Cost Price"
 msgstr "Себестоимость"
@@ -84,6 +139,11 @@ msgctxt "field:product.product,default_uom:"
 msgid "Default UOM"
 msgstr "Ед.измерения по умолчанию"
 
+#, fuzzy
+msgctxt "field:product.product,default_uom_category:"
+msgid "Default UOM Category"
+msgstr "Категория ед.измерения по умолчанию"
+
 msgctxt "field:product.product,description:"
 msgid "Description"
 msgstr "Описание"
@@ -92,10 +152,20 @@ msgctxt "field:product.product,id:"
 msgid "ID"
 msgstr "ID"
 
+#, fuzzy
+msgctxt "field:product.product,list_price:"
+msgid "List Price"
+msgstr "Цена"
+
 msgctxt "field:product.product,list_price_uom:"
 msgid "List Price"
 msgstr "Цена"
 
+#, fuzzy
+msgctxt "field:product.product,name:"
+msgid "Name"
+msgstr "Наименование"
+
 msgctxt "field:product.product,rec_name:"
 msgid "Name"
 msgstr "Наименование"
@@ -120,9 +190,10 @@ msgctxt "field:product.template,active:"
 msgid "Active"
 msgstr "Действующий"
 
-msgctxt "field:product.template,category:"
-msgid "Category"
-msgstr "Категория"
+#, fuzzy
+msgctxt "field:product.template,categories:"
+msgid "Categories"
+msgstr "Категории"
 
 msgctxt "field:product.template,consumable:"
 msgid "Consumable"
@@ -184,6 +255,45 @@ msgctxt "field:product.template,write_uid:"
 msgid "Write User"
 msgstr "Изменено пользователем"
 
+#, fuzzy
+msgctxt "field:product.template-product.category,category:"
+msgid "Category"
+msgstr "Категория"
+
+#, fuzzy
+msgctxt "field:product.template-product.category,create_date:"
+msgid "Create Date"
+msgstr "Дата создания"
+
+#, fuzzy
+msgctxt "field:product.template-product.category,create_uid:"
+msgid "Create User"
+msgstr "Создано пользователем"
+
+#, fuzzy
+msgctxt "field:product.template-product.category,id:"
+msgid "ID"
+msgstr "ID"
+
+#, fuzzy
+msgctxt "field:product.template-product.category,rec_name:"
+msgid "Name"
+msgstr "Наименование"
+
+msgctxt "field:product.template-product.category,template:"
+msgid "Template"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:product.template-product.category,write_date:"
+msgid "Write Date"
+msgstr "Дата изменения"
+
+#, fuzzy
+msgctxt "field:product.template-product.category,write_uid:"
+msgid "Write User"
+msgstr "Изменено пользователем"
+
 msgctxt "field:product.uom,active:"
 msgid "Active"
 msgstr "Действующий"
@@ -297,6 +407,10 @@ msgctxt "model:ir.action,name:act_category_tree"
 msgid "Categories"
 msgstr "Категории"
 
+msgctxt "model:ir.action,name:act_product_configuration_form"
+msgid "Product Configuration"
+msgstr ""
+
 msgctxt "model:ir.action,name:act_product_form"
 msgid "Variants"
 msgstr "Разновидности"
@@ -325,6 +439,10 @@ msgctxt "model:ir.ui.menu,name:menu_category_tree"
 msgid "Categories"
 msgstr "Категории в виде дерева"
 
+msgctxt "model:ir.ui.menu,name:menu_configuration"
+msgid "Configuration"
+msgstr ""
+
 msgctxt "model:ir.ui.menu,name:menu_main_product"
 msgid "Product"
 msgstr "Продукция"
@@ -333,6 +451,10 @@ msgctxt "model:ir.ui.menu,name:menu_product"
 msgid "Variants"
 msgstr "Разновидности"
 
+msgctxt "model:ir.ui.menu,name:menu_product_configuration"
+msgid "Product Configuration"
+msgstr ""
+
 msgctxt "model:ir.ui.menu,name:menu_template"
 msgid "Products"
 msgstr "Продукция"
@@ -349,6 +471,10 @@ msgctxt "model:product.category,name:"
 msgid "Product Category"
 msgstr "Категория продукции"
 
+msgctxt "model:product.configuration,name:"
+msgid "Product Configuration"
+msgstr ""
+
 msgctxt "model:product.product,name:"
 msgid "Product Variant"
 msgstr "Вид продукта"
@@ -357,6 +483,10 @@ msgctxt "model:product.template,name:"
 msgid "Product Template"
 msgstr "Шаблон продукта"
 
+msgctxt "model:product.template-product.category,name:"
+msgid "Template - Category"
+msgstr ""
+
 msgctxt "model:product.uom,name:"
 msgid "Unit of measure"
 msgstr "Единица измерения"
@@ -650,6 +780,30 @@ msgctxt "model:res.group,name:group_product_admin"
 msgid "Product Administration"
 msgstr "Администрирование продукции"
 
+msgctxt "selection:product.configuration,default_cost_price_method:"
+msgid ""
+msgstr ""
+
+#, fuzzy
+msgctxt "selection:product.configuration,default_cost_price_method:"
+msgid "Average"
+msgstr "Средняя цена"
+
+#, fuzzy
+msgctxt "selection:product.configuration,default_cost_price_method:"
+msgid "Fixed"
+msgstr "Фиксированная цена"
+
+#, fuzzy
+msgctxt "selection:product.product,cost_price_method:"
+msgid "Average"
+msgstr "Средняя цена"
+
+#, fuzzy
+msgctxt "selection:product.product,cost_price_method:"
+msgid "Fixed"
+msgstr "Фиксированная цена"
+
 msgctxt "selection:product.product,type:"
 msgid "Assets"
 msgstr "Активы"
@@ -694,6 +848,10 @@ msgctxt "view:product.category:"
 msgid "Product Category"
 msgstr "Категория продукции"
 
+msgctxt "view:product.configuration:"
+msgid "Party Configuration"
+msgstr ""
+
 msgctxt "view:product.product:"
 msgid "Product"
 msgstr "Продукт"
diff --git a/locale/sl_SI.po b/locale/sl_SI.po
index c5a8b01..36fc1c9 100644
--- a/locale/sl_SI.po
+++ b/locale/sl_SI.po
@@ -18,8 +18,9 @@ msgctxt "error:product.uom:"
 msgid "Rate and factor can not be both equal to zero."
 msgstr "Oba, razmerje in faktor, ne moreta biti enaka ničli."
 
+#, fuzzy
 msgctxt "error:product.uom:"
-msgid "You cannot change Rate, Factor or Category on a Unit of Measure. "
+msgid "You cannot change Rate, Factor or Category on a Unit of Measure."
 msgstr ""
 "Pri merski enoti ni možno popraviti razmerja, faktorja ali kategorije."
 
@@ -59,14 +60,68 @@ msgctxt "field:product.category,write_uid:"
 msgid "Write User"
 msgstr "Zapisal"
 
+#, fuzzy
+msgctxt "field:product.configuration,create_date:"
+msgid "Create Date"
+msgstr "Izdelano"
+
+#, fuzzy
+msgctxt "field:product.configuration,create_uid:"
+msgid "Create User"
+msgstr "Izdelal"
+
+msgctxt "field:product.configuration,default_cost_price_method:"
+msgid "Default Cost Method"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:product.configuration,id:"
+msgid "ID"
+msgstr "ID"
+
+#, fuzzy
+msgctxt "field:product.configuration,rec_name:"
+msgid "Name"
+msgstr "Naziv"
+
+#, fuzzy
+msgctxt "field:product.configuration,write_date:"
+msgid "Write Date"
+msgstr "Zapisano"
+
+#, fuzzy
+msgctxt "field:product.configuration,write_uid:"
+msgid "Write User"
+msgstr "Zapisal"
+
 msgctxt "field:product.product,active:"
 msgid "Active"
 msgstr "Aktivno"
 
+#, fuzzy
+msgctxt "field:product.product,categories:"
+msgid "Categories"
+msgstr "Kategorije"
+
 msgctxt "field:product.product,code:"
 msgid "Code"
 msgstr "Šifra"
 
+#, fuzzy
+msgctxt "field:product.product,consumable:"
+msgid "Consumable"
+msgstr "Potrošni material"
+
+#, fuzzy
+msgctxt "field:product.product,cost_price:"
+msgid "Cost Price"
+msgstr "Nabavna cena"
+
+#, fuzzy
+msgctxt "field:product.product,cost_price_method:"
+msgid "Cost Method"
+msgstr "Obračun"
+
 msgctxt "field:product.product,cost_price_uom:"
 msgid "Cost Price"
 msgstr "Nabavna cena"
@@ -83,6 +138,11 @@ msgctxt "field:product.product,default_uom:"
 msgid "Default UOM"
 msgstr "Privzeta ME"
 
+#, fuzzy
+msgctxt "field:product.product,default_uom_category:"
+msgid "Default UOM Category"
+msgstr "Privzeta kategorija ME"
+
 msgctxt "field:product.product,description:"
 msgid "Description"
 msgstr "Opis"
@@ -91,10 +151,20 @@ msgctxt "field:product.product,id:"
 msgid "ID"
 msgstr "ID"
 
+#, fuzzy
+msgctxt "field:product.product,list_price:"
+msgid "List Price"
+msgstr "Prodajna cena"
+
 msgctxt "field:product.product,list_price_uom:"
 msgid "List Price"
 msgstr "Prodajna cena"
 
+#, fuzzy
+msgctxt "field:product.product,name:"
+msgid "Name"
+msgstr "Naziv"
+
 msgctxt "field:product.product,rec_name:"
 msgid "Name"
 msgstr "Ime"
@@ -119,9 +189,10 @@ msgctxt "field:product.template,active:"
 msgid "Active"
 msgstr "Aktivno"
 
-msgctxt "field:product.template,category:"
-msgid "Category"
-msgstr "Kategorija"
+#, fuzzy
+msgctxt "field:product.template,categories:"
+msgid "Categories"
+msgstr "Kategorije"
 
 msgctxt "field:product.template,consumable:"
 msgid "Consumable"
@@ -183,6 +254,45 @@ msgctxt "field:product.template,write_uid:"
 msgid "Write User"
 msgstr "Zapisal"
 
+#, fuzzy
+msgctxt "field:product.template-product.category,category:"
+msgid "Category"
+msgstr "Kategorija"
+
+#, fuzzy
+msgctxt "field:product.template-product.category,create_date:"
+msgid "Create Date"
+msgstr "Izdelano"
+
+#, fuzzy
+msgctxt "field:product.template-product.category,create_uid:"
+msgid "Create User"
+msgstr "Izdelal"
+
+#, fuzzy
+msgctxt "field:product.template-product.category,id:"
+msgid "ID"
+msgstr "ID"
+
+#, fuzzy
+msgctxt "field:product.template-product.category,rec_name:"
+msgid "Name"
+msgstr "Naziv"
+
+msgctxt "field:product.template-product.category,template:"
+msgid "Template"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:product.template-product.category,write_date:"
+msgid "Write Date"
+msgstr "Zapisano"
+
+#, fuzzy
+msgctxt "field:product.template-product.category,write_uid:"
+msgid "Write User"
+msgstr "Zapisal"
+
 msgctxt "field:product.uom,active:"
 msgid "Active"
 msgstr "Aktivno"
@@ -295,6 +405,10 @@ msgctxt "model:ir.action,name:act_category_tree"
 msgid "Categories"
 msgstr "Kategorije"
 
+msgctxt "model:ir.action,name:act_product_configuration_form"
+msgid "Product Configuration"
+msgstr ""
+
 msgctxt "model:ir.action,name:act_product_form"
 msgid "Variants"
 msgstr "Različice"
@@ -323,6 +437,10 @@ msgctxt "model:ir.ui.menu,name:menu_category_tree"
 msgid "Categories"
 msgstr "Kategorije"
 
+msgctxt "model:ir.ui.menu,name:menu_configuration"
+msgid "Configuration"
+msgstr ""
+
 msgctxt "model:ir.ui.menu,name:menu_main_product"
 msgid "Product"
 msgstr "Izdelek"
@@ -331,6 +449,10 @@ msgctxt "model:ir.ui.menu,name:menu_product"
 msgid "Variants"
 msgstr "Različice"
 
+msgctxt "model:ir.ui.menu,name:menu_product_configuration"
+msgid "Product Configuration"
+msgstr ""
+
 msgctxt "model:ir.ui.menu,name:menu_template"
 msgid "Products"
 msgstr "Izdelki"
@@ -347,6 +469,10 @@ msgctxt "model:product.category,name:"
 msgid "Product Category"
 msgstr "Kategorija izdelkov"
 
+msgctxt "model:product.configuration,name:"
+msgid "Product Configuration"
+msgstr ""
+
 msgctxt "model:product.product,name:"
 msgid "Product Variant"
 msgstr "Različica"
@@ -355,6 +481,10 @@ msgctxt "model:product.template,name:"
 msgid "Product Template"
 msgstr "Predloga izdelka"
 
+msgctxt "model:product.template-product.category,name:"
+msgid "Template - Category"
+msgstr ""
+
 msgctxt "model:product.uom,name:"
 msgid "Unit of measure"
 msgstr "Merska enota"
@@ -576,8 +706,8 @@ msgid "oz"
 msgstr "oz"
 
 msgctxt "model:product.uom,symbol:uom_pound"
-msgid "lbs"
-msgstr "lb"
+msgid "lb"
+msgstr ""
 
 msgctxt "model:product.uom,symbol:uom_second"
 msgid "s"
@@ -647,6 +777,30 @@ msgctxt "model:res.group,name:group_product_admin"
 msgid "Product Administration"
 msgstr "Izdelek - vodenje"
 
+msgctxt "selection:product.configuration,default_cost_price_method:"
+msgid ""
+msgstr ""
+
+#, fuzzy
+msgctxt "selection:product.configuration,default_cost_price_method:"
+msgid "Average"
+msgstr "Povprečna cena"
+
+#, fuzzy
+msgctxt "selection:product.configuration,default_cost_price_method:"
+msgid "Fixed"
+msgstr "Fiksna"
+
+#, fuzzy
+msgctxt "selection:product.product,cost_price_method:"
+msgid "Average"
+msgstr "Povprečna cena"
+
+#, fuzzy
+msgctxt "selection:product.product,cost_price_method:"
+msgid "Fixed"
+msgstr "Fiksna"
+
 msgctxt "selection:product.product,type:"
 msgid "Assets"
 msgstr "Osnovna sredstva"
@@ -691,6 +845,10 @@ msgctxt "view:product.category:"
 msgid "Product Category"
 msgstr "Kategorija"
 
+msgctxt "view:product.configuration:"
+msgid "Party Configuration"
+msgstr ""
+
 msgctxt "view:product.product:"
 msgid "Product"
 msgstr "Izdelek"
diff --git a/locale/lt_LT.po b/locale/zh_CN.po
similarity index 82%
copy from locale/lt_LT.po
copy to locale/zh_CN.po
index 7bc7454..fb35d5a 100644
--- a/locale/lt_LT.po
+++ b/locale/zh_CN.po
@@ -17,7 +17,7 @@ msgid "Rate and factor can not be both equal to zero."
 msgstr ""
 
 msgctxt "error:product.uom:"
-msgid "You cannot change Rate, Factor or Category on a Unit of Measure. "
+msgid "You cannot change Rate, Factor or Category on a Unit of Measure."
 msgstr ""
 
 msgctxt "field:product.category,childs:"
@@ -56,14 +56,58 @@ msgctxt "field:product.category,write_uid:"
 msgid "Write User"
 msgstr ""
 
+msgctxt "field:product.configuration,create_date:"
+msgid "Create Date"
+msgstr ""
+
+msgctxt "field:product.configuration,create_uid:"
+msgid "Create User"
+msgstr ""
+
+msgctxt "field:product.configuration,default_cost_price_method:"
+msgid "Default Cost Method"
+msgstr ""
+
+msgctxt "field:product.configuration,id:"
+msgid "ID"
+msgstr ""
+
+msgctxt "field:product.configuration,rec_name:"
+msgid "Name"
+msgstr ""
+
+msgctxt "field:product.configuration,write_date:"
+msgid "Write Date"
+msgstr ""
+
+msgctxt "field:product.configuration,write_uid:"
+msgid "Write User"
+msgstr ""
+
 msgctxt "field:product.product,active:"
 msgid "Active"
 msgstr ""
 
+msgctxt "field:product.product,categories:"
+msgid "Categories"
+msgstr ""
+
 msgctxt "field:product.product,code:"
 msgid "Code"
 msgstr ""
 
+msgctxt "field:product.product,consumable:"
+msgid "Consumable"
+msgstr ""
+
+msgctxt "field:product.product,cost_price:"
+msgid "Cost Price"
+msgstr ""
+
+msgctxt "field:product.product,cost_price_method:"
+msgid "Cost Method"
+msgstr ""
+
 msgctxt "field:product.product,cost_price_uom:"
 msgid "Cost Price"
 msgstr ""
@@ -80,6 +124,10 @@ msgctxt "field:product.product,default_uom:"
 msgid "Default UOM"
 msgstr ""
 
+msgctxt "field:product.product,default_uom_category:"
+msgid "Default UOM Category"
+msgstr ""
+
 msgctxt "field:product.product,description:"
 msgid "Description"
 msgstr ""
@@ -88,10 +136,18 @@ msgctxt "field:product.product,id:"
 msgid "ID"
 msgstr ""
 
+msgctxt "field:product.product,list_price:"
+msgid "List Price"
+msgstr ""
+
 msgctxt "field:product.product,list_price_uom:"
 msgid "List Price"
 msgstr ""
 
+msgctxt "field:product.product,name:"
+msgid "Name"
+msgstr ""
+
 msgctxt "field:product.product,rec_name:"
 msgid "Name"
 msgstr ""
@@ -116,8 +172,8 @@ msgctxt "field:product.template,active:"
 msgid "Active"
 msgstr ""
 
-msgctxt "field:product.template,category:"
-msgid "Category"
+msgctxt "field:product.template,categories:"
+msgid "Categories"
 msgstr ""
 
 msgctxt "field:product.template,consumable:"
@@ -180,6 +236,38 @@ msgctxt "field:product.template,write_uid:"
 msgid "Write User"
 msgstr ""
 
+msgctxt "field:product.template-product.category,category:"
+msgid "Category"
+msgstr ""
+
+msgctxt "field:product.template-product.category,create_date:"
+msgid "Create Date"
+msgstr ""
+
+msgctxt "field:product.template-product.category,create_uid:"
+msgid "Create User"
+msgstr ""
+
+msgctxt "field:product.template-product.category,id:"
+msgid "ID"
+msgstr ""
+
+msgctxt "field:product.template-product.category,rec_name:"
+msgid "Name"
+msgstr ""
+
+msgctxt "field:product.template-product.category,template:"
+msgid "Template"
+msgstr ""
+
+msgctxt "field:product.template-product.category,write_date:"
+msgid "Write Date"
+msgstr ""
+
+msgctxt "field:product.template-product.category,write_uid:"
+msgid "Write User"
+msgstr ""
+
 msgctxt "field:product.uom,active:"
 msgid "Active"
 msgstr ""
@@ -288,6 +376,10 @@ msgctxt "model:ir.action,name:act_category_tree"
 msgid "Categories"
 msgstr ""
 
+msgctxt "model:ir.action,name:act_product_configuration_form"
+msgid "Product Configuration"
+msgstr ""
+
 msgctxt "model:ir.action,name:act_product_form"
 msgid "Variants"
 msgstr ""
@@ -316,6 +408,10 @@ msgctxt "model:ir.ui.menu,name:menu_category_tree"
 msgid "Categories"
 msgstr ""
 
+msgctxt "model:ir.ui.menu,name:menu_configuration"
+msgid "Configuration"
+msgstr ""
+
 msgctxt "model:ir.ui.menu,name:menu_main_product"
 msgid "Product"
 msgstr ""
@@ -324,6 +420,10 @@ msgctxt "model:ir.ui.menu,name:menu_product"
 msgid "Variants"
 msgstr ""
 
+msgctxt "model:ir.ui.menu,name:menu_product_configuration"
+msgid "Product Configuration"
+msgstr ""
+
 msgctxt "model:ir.ui.menu,name:menu_template"
 msgid "Products"
 msgstr ""
@@ -340,6 +440,10 @@ msgctxt "model:product.category,name:"
 msgid "Product Category"
 msgstr ""
 
+msgctxt "model:product.configuration,name:"
+msgid "Product Configuration"
+msgstr ""
+
 msgctxt "model:product.product,name:"
 msgid "Product Variant"
 msgstr ""
@@ -348,6 +452,10 @@ msgctxt "model:product.template,name:"
 msgid "Product Template"
 msgstr ""
 
+msgctxt "model:product.template-product.category,name:"
+msgid "Template - Category"
+msgstr ""
+
 msgctxt "model:product.uom,name:"
 msgid "Unit of measure"
 msgstr ""
@@ -640,6 +748,26 @@ msgctxt "model:res.group,name:group_product_admin"
 msgid "Product Administration"
 msgstr ""
 
+msgctxt "selection:product.configuration,default_cost_price_method:"
+msgid ""
+msgstr ""
+
+msgctxt "selection:product.configuration,default_cost_price_method:"
+msgid "Average"
+msgstr ""
+
+msgctxt "selection:product.configuration,default_cost_price_method:"
+msgid "Fixed"
+msgstr ""
+
+msgctxt "selection:product.product,cost_price_method:"
+msgid "Average"
+msgstr ""
+
+msgctxt "selection:product.product,cost_price_method:"
+msgid "Fixed"
+msgstr ""
+
 msgctxt "selection:product.product,type:"
 msgid "Assets"
 msgstr ""
@@ -684,6 +812,10 @@ msgctxt "view:product.category:"
 msgid "Product Category"
 msgstr ""
 
+msgctxt "view:product.configuration:"
+msgid "Party Configuration"
+msgstr ""
+
 msgctxt "view:product.product:"
 msgid "Product"
 msgstr ""
diff --git a/product.py b/product.py
index 9f88a63..fbad8ab 100644
--- a/product.py
+++ b/product.py
@@ -1,14 +1,20 @@
 # 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
+import copy
+import logging
+
+from sql import Column
+
+from trytond.model import ModelView, ModelSQL, Model, fields
 from trytond.pyson import Eval
 from trytond.transaction import Transaction
 from trytond.pool import Pool
 from trytond import backend
-from trytond.const import OPERATORS
 from trytond.config import config
 
-__all__ = ['Template', 'Product', 'price_digits']
+__all__ = ['Template', 'Product', 'price_digits', 'TemplateFunction',
+    'TemplateCategory']
+logger = logging.getLogger(__name__)
 
 STATES = {
     'readonly': ~Eval('active', True),
@@ -19,6 +25,10 @@ TYPES = [
     ('assets', 'Assets'),
     ('service', 'Service'),
     ]
+COST_PRICE_METHODS = [
+    ('fixed', 'Fixed'),
+    ('average', 'Average'),
+    ]
 
 price_digits = (16, config.getint('product', 'price_decimal', default=4))
 
@@ -36,17 +46,12 @@ class Template(ModelSQL, ModelView):
             '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=price_digits, depends=DEPENDS, required=True))
     cost_price = fields.Property(fields.Numeric('Cost Price', states=STATES,
             digits=price_digits, depends=DEPENDS, required=True))
-    cost_price_method = fields.Property(fields.Selection([
-                ("fixed", "Fixed"),
-                ("average", "Average")
-                ], 'Cost Method', required=True, states=STATES,
-            depends=DEPENDS))
+    cost_price_method = fields.Property(fields.Selection(COST_PRICE_METHODS,
+            'Cost Method', required=True, states=STATES, depends=DEPENDS))
     default_uom = fields.Many2One('product.uom', 'Default UOM', required=True,
         states=STATES, depends=DEPENDS)
     default_uom_category = fields.Function(
@@ -54,18 +59,20 @@ class Template(ModelSQL, ModelView):
         'on_change_with_default_uom_category',
         searcher='search_default_uom_category')
     active = fields.Boolean('Active', select=True)
+    categories = fields.Many2Many('product.template-product.category',
+        'template', 'category', 'Categories', states=STATES, depends=DEPENDS)
     products = fields.One2Many('product.product', 'template', 'Variants',
         states=STATES, depends=DEPENDS)
 
     @classmethod
     def __register__(cls, module_name):
         TableHandler = backend.get('TableHandler')
-        cursor = Transaction().cursor
+        cursor = Transaction().connection.cursor()
         sql_table = cls.__table__()
 
         super(Template, cls).__register__(module_name)
 
-        table = TableHandler(cursor, cls, module_name)
+        table = TableHandler(cls, module_name)
         # Migration from 2.2: category is no more required
         table.not_null_action('category', 'remove')
 
@@ -79,6 +86,12 @@ class Template(ModelSQL, ModelView):
                 values=['goods'],
                 where=sql_table.type.in_(['stockable', 'consumable'])))
 
+        # Migration from 3.8: rename category into categories
+        if table.column_exist('category'):
+            logger.warning(
+                'The column "category" on table "%s" must be dropped manually',
+                cls._table)
+
     @staticmethod
     def default_active():
         return True
@@ -92,10 +105,6 @@ class Template(ModelSQL, ModelView):
         return False
 
     @staticmethod
-    def default_cost_price_method():
-        return 'fixed'
-
-    @staticmethod
     def default_products():
         pool = Pool()
         Product = pool.get('product.product')
@@ -129,6 +138,36 @@ class Template(ModelSQL, ModelView):
             yield record, rec_name, icon
 
 
+class TemplateFunction(fields.Function):
+
+    def __init__(self, field):
+        super(TemplateFunction, self).__init__(
+            field, 'get_template', searcher='search_template')
+
+    def __copy__(self):
+        return TemplateFunction(copy.copy(self._field))
+
+    def __deepcopy__(self, memo):
+        return TemplateFunction(copy.deepcopy(self._field, memo))
+
+    @staticmethod
+    def order(name):
+        @classmethod
+        def order(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 [Column(template, name)]
+        return order
+
+
 class Product(ModelSQL, ModelView):
     "Product Variant"
     __name__ = "product.product"
@@ -141,16 +180,65 @@ class Product(ModelSQL, ModelView):
     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_type', searcher='search_type')
     list_price_uom = fields.Function(fields.Numeric('List Price',
         digits=price_digits), 'get_price_uom')
     cost_price_uom = fields.Function(fields.Numeric('Cost Price',
         digits=price_digits), 'get_price_uom')
 
     @classmethod
+    def __setup__(cls):
+        pool = Pool()
+        Template = pool.get('product.template')
+
+        if not hasattr(cls, '_no_template_field'):
+            cls._no_template_field = set()
+        cls._no_template_field.update(['products'])
+
+        super(Product, cls).__setup__()
+
+        for attr in dir(Template):
+            tfield = getattr(Template, attr)
+            if not isinstance(tfield, fields.Field):
+                continue
+            if attr in cls._no_template_field:
+                continue
+            field = getattr(cls, attr, None)
+            if not field or isinstance(field, TemplateFunction):
+                setattr(cls, attr, TemplateFunction(copy.deepcopy(tfield)))
+                order_method = getattr(cls, 'order_%s' % attr, None)
+                if (not order_method
+                        and not isinstance(tfield, (
+                                fields.Function,
+                                fields.One2Many,
+                                fields.Many2Many))):
+                    order_method = TemplateFunction.order(attr)
+                    setattr(cls, 'order_%s' % attr, order_method)
+
+    @fields.depends('template')
+    def on_change_template(self):
+        for name, field in self._fields.iteritems():
+            if isinstance(field, TemplateFunction):
+                if self.template:
+                    value = getattr(self.template, name)
+                else:
+                    value = None
+                setattr(self, name, value)
+
+    def get_template(self, name):
+        value = getattr(self.template, name)
+        if isinstance(value, Model):
+            return value.id
+        elif (isinstance(value, (list, tuple))
+                and value and isinstance(value[0], Model)):
+            return [r.id for r in value]
+        else:
+            return value
+
+    @classmethod
+    def search_template(cls, name, clause):
+        return [('template.%s' % name,) + tuple(clause[1:])]
+
+    @classmethod
     def order_rec_name(cls, tables):
         pool = Pool()
         Template = pool.get('product.template')
@@ -169,13 +257,6 @@ class Product(ModelSQL, ModelView):
     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:
             return '[' + self.code + '] ' + self.name
@@ -193,22 +274,6 @@ class Product(ModelSQL, ModelView):
             ('template.name',) + tuple(clause[1:]),
             ]
 
-    def get_default_uom(self, name):
-        return self.template.default_uom.id
-
-    @classmethod
-    def search_default_uom(cls, name, clause):
-        return [('template.default_uom',) + tuple(clause[1:])]
-
-    @fields.depends('template')
-    def on_change_with_type(self, name=None):
-        if self.template:
-            return self.template.type
-
-    @classmethod
-    def search_type(cls, name, clause):
-        return [('template.type',) + tuple(clause[1:])]
-
     @staticmethod
     def get_price_uom(products, name):
         Uom = Pool().get('product.uom')
@@ -230,26 +295,11 @@ class Product(ModelSQL, ModelView):
             icon = icon or 'tryton-product'
             yield id_, rec_name, icon
 
-    @classmethod
-    def search_domain(cls, domain, active_test=True, tables=None):
-        def is_leaf(expression):
-            return (isinstance(expression, (list, tuple))
-                and len(expression) > 2
-                and isinstance(expression[1], basestring)
-                and expression[1] in OPERATORS)  # TODO remove OPERATORS test
-
-        def convert_domain(domain):
-            'Replace missing product field by the template one'
-            if is_leaf(domain):
-                field = domain[0].split('.', 1)[0]
-                if not getattr(cls, field, None):
-                    field = 'template.' + domain[0]
-                    return (field,) + tuple(domain[1:])
-                else:
-                    return domain
-            elif domain in ['OR', 'AND']:
-                return domain
-            else:
-                return [convert_domain(d) for d in domain]
-        return super(Product, cls).search_domain(convert_domain(domain),
-            active_test=active_test, tables=tables)
+
+class TemplateCategory(ModelSQL):
+    'Template - Category'
+    __name__ = 'product.template-product.category'
+    template = fields.Many2One('product.template', 'Template',
+        ondelete='CASCADE', required=True, select=True)
+    category = fields.Many2One('product.category', 'Category',
+        ondelete='CASCADE', required=True, select=True)
diff --git a/product.xml b/product.xml
index a4c55dd..b34d7cb 100644
--- a/product.xml
+++ b/product.xml
@@ -23,6 +23,14 @@ this repository contains the full copyright notices and license terms. -->
         <menuitem name="Product" id="menu_main_product" sequence="1"
             icon="tryton-product"/>
 
+        <menuitem name="Configuration" parent="menu_main_product"
+            id="menu_configuration" sequence="0" icon="tryton-preferences"/>
+        <record model="ir.ui.menu-res.group"
+            id="menu_product_group_product_admin">
+            <field name="menu" ref="menu_configuration"/>
+            <field name="group" ref="group_product_admin"/>
+        </record>
+
         <record model="ir.ui.view" id="template_view_tree">
             <field name="model">product.template</field>
             <field name="type">tree</field>
@@ -59,7 +67,7 @@ this repository contains the full copyright notices and license terms. -->
             <field name="context"
                 eval="{'categories': [Eval('active_id')]}" pyson="1"/>
             <field name="domain"
-                eval="[('category','child_of', [Eval('active_id')], 'parent')]"
+                eval="[('categories','child_of', [Eval('active_id')], 'parent')]"
                 pyson="1"/>
         </record>
         <record model="ir.action.act_window.view" id="act_template_by_category_view1">
@@ -80,18 +88,34 @@ this repository contains the full copyright notices and license terms. -->
 
         <record model="ir.ui.view" id="product_view_tree">
             <field name="model">product.product</field>
+            <field name="type" eval="None"/>
+            <field name="inherit" ref="template_view_tree"/>
+            <field name="priority" eval="10"/>
+            <field name="name"></field>
+        </record>
+
+        <record model="ir.ui.view" id="product_view_tree_simple">
+            <field name="model">product.product</field>
             <field name="type">tree</field>
-            <field name="inherit" eval="None"/>
-            <field name="name">product_tree</field>
+            <field name="priority" eval="20"/>
+            <field name="name">product_tree_simple</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" eval="None"/>
+            <field name="type" eval="None"/>
+            <field name="inherit" ref="template_view_form"/>
+            <field name="priority" eval="10"/>
             <field name="name">product_form</field>
         </record>
 
+        <record model="ir.ui.view" id="product_view_form_simple">
+            <field name="model">product.product</field>
+            <field name="type">form</field>
+            <field name="priority" eval="20"/>
+            <field name="name">product_form_simple</field>
+        </record>
+
         <record model="ir.action.act_window" id="act_product_form">
             <field name="name">Variants</field>
             <field name="res_model">product.product</field>
@@ -108,7 +132,7 @@ this repository contains the full copyright notices and license terms. -->
         </record>
 
         <menuitem parent="menu_template" sequence="1" id="menu_product"
-            action="act_product_form"/>
+            action="act_product_form" icon="tryton-list"/>
 
         <record model="ir.model.access" id="access_product">
             <field name="model" search="[('model', '=', 'product.product')]"/>
diff --git a/setup.py b/setup.py
index d7f0b6b..f9e3a6a 100644
--- a/setup.py
+++ b/setup.py
@@ -5,11 +5,17 @@
 from setuptools import setup
 import re
 import os
-import ConfigParser
+import io
+try:
+    from configparser import ConfigParser
+except ImportError:
+    from ConfigParser import ConfigParser
 
 
 def read(fname):
-    return open(os.path.join(os.path.dirname(__file__), fname)).read()
+    return io.open(
+        os.path.join(os.path.dirname(__file__), fname),
+        'r', encoding='utf-8').read()
 
 
 def get_require_version(name):
@@ -21,7 +27,7 @@ def get_require_version(name):
         major_version, minor_version + 1)
     return require
 
-config = ConfigParser.ConfigParser()
+config = ConfigParser()
 config.readfp(open('tryton.cfg'))
 info = dict(config.items('tryton'))
 for key in ('depends', 'extras_depend', 'xml'):
@@ -43,7 +49,7 @@ if minor_version % 2:
 
 requires = ['python-sql']
 for dep in info.get('depends', []):
-    if not re.match(r'(ir|res|webdav)(\W|$)', dep):
+    if not re.match(r'(ir|res)(\W|$)', dep):
         requires.append(get_require_version('trytond_%s' % dep))
 requires.append(get_require_version('trytond'))
 
@@ -76,6 +82,7 @@ setup(name=name,
         'License :: OSI Approved :: GNU General Public License (GPL)',
         'Natural Language :: Bulgarian',
         'Natural Language :: Catalan',
+        'Natural Language :: Chinese (Simplified)',
         'Natural Language :: Czech',
         'Natural Language :: Dutch',
         'Natural Language :: English',
@@ -89,6 +96,9 @@ setup(name=name,
         'Natural Language :: Spanish',
         'Operating System :: OS Independent',
         'Programming Language :: Python :: 2.7',
+        'Programming Language :: Python :: 3.3',
+        'Programming Language :: Python :: 3.4',
+        'Programming Language :: Python :: 3.5',
         'Programming Language :: Python :: Implementation :: CPython',
         'Programming Language :: Python :: Implementation :: PyPy',
         'Topic :: Office/Business',
@@ -102,4 +112,5 @@ setup(name=name,
     """,
     test_suite='tests',
     test_loader='trytond.test_loader:Loader',
+    use_2to3=True,
     )
diff --git a/tests/__init__.py b/tests/__init__.py
index 8d506bf..15b4004 100644
--- a/tests/__init__.py
+++ b/tests/__init__.py
@@ -1,6 +1,9 @@
 # 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
+try:
+    from trytond.modules.product.tests.test_product import suite
+except ImportError:
+    from .test_product import suite
 
 __all__ = ['suite']
diff --git a/tests/test_product.py b/tests/test_product.py
index ec5048c..84e81fa 100644
--- a/tests/test_product.py
+++ b/tests/test_product.py
@@ -3,8 +3,7 @@
 import unittest
 from decimal import Decimal
 import trytond.tests.test_tryton
-from trytond.tests.test_tryton import ModuleTestCase
-from trytond.tests.test_tryton import POOL, DB_NAME, USER, CONTEXT
+from trytond.tests.test_tryton import ModuleTestCase, with_transaction
 from trytond.transaction import Transaction
 from trytond.pool import Pool
 
@@ -13,105 +12,115 @@ class ProductTestCase(ModuleTestCase):
     'Test Product module'
     module = 'product'
 
-    def setUp(self):
-        super(ProductTestCase, self).setUp()
-        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 test0010uom_non_zero_rate_factor(self):
+    @with_transaction()
+    def test_uom_non_zero_rate_factor(self):
         'Test uom non_zero_rate_factor constraint'
-        with Transaction().start(DB_NAME, USER,
-                context=CONTEXT) as transaction:
-            category, = self.uom_category.create([{'name': 'Test'}])
-            transaction.cursor.commit()
+        pool = Pool()
+        UomCategory = pool.get('product.uom.category')
+        Uom = pool.get('product.uom')
+        transaction = Transaction()
+        category, = UomCategory.create([{'name': 'Test'}])
 
-            self.assertRaises(Exception, self.uom.create, [{
-                    'name': 'Test',
-                    'symbol': 'T',
-                    'category': category.id,
-                    'rate': 0,
-                    'factor': 0,
-                    }])
-            transaction.cursor.rollback()
+        self.assertRaises(Exception, Uom.create, [{
+                'name': 'Test',
+                'symbol': 'T',
+                'category': category.id,
+                'rate': 0,
+                'factor': 0,
+                }])
+        transaction.rollback()
 
-            uom, = self.uom.create([{
+        def create():
+            category, = UomCategory.create([{'name': 'Test'}])
+            return Uom.create([{
                         'name': 'Test',
                         'symbol': 'T',
                         'category': category.id,
                         'rate': 1.0,
                         'factor': 1.0,
-                        }])
-            transaction.cursor.commit()
+                        }])[0]
 
-            self.assertRaises(Exception, self.uom.write, [uom], {
-                    'rate': 0.0,
-                    })
-            transaction.cursor.rollback()
+        uom = create()
+        self.assertRaises(Exception, Uom.write, [uom], {
+                'rate': 0.0,
+                })
+        transaction.rollback()
 
-            self.assertRaises(Exception, self.uom.write, [uom], {
-                    'factor': 0.0,
-                    })
-            transaction.cursor.rollback()
+        uom = create()
+        self.assertRaises(Exception, Uom.write, [uom], {
+                'factor': 0.0,
+                })
+        transaction.rollback()
 
-            self.assertRaises(Exception, self.uom.write, [uom], {
-                    'rate': 0.0,
-                    'factor': 0.0,
-                    })
-            transaction.cursor.rollback()
+        uom = create()
+        self.assertRaises(Exception, Uom.write, [uom], {
+                'rate': 0.0,
+                'factor': 0.0,
+                })
+        transaction.rollback()
 
-    def test0020uom_check_factor_and_rate(self):
+    @with_transaction()
+    def test_uom_check_factor_and_rate(self):
         'Test uom check_factor_and_rate constraint'
-        with Transaction().start(DB_NAME, USER,
-                context=CONTEXT) as transaction:
-            category, = self.uom_category.search([
-                    ('name', '=', 'Test'),
-                    ], limit=1)
+        pool = Pool()
+        UomCategory = pool.get('product.uom.category')
+        Uom = pool.get('product.uom')
+        transaction = Transaction()
+        category, = UomCategory.create([{'name': 'Test'}])
 
-            self.assertRaises(Exception, self.uom.create, [{
-                    'name': 'Test',
-                    'symbol': 'T',
-                    'category': category.id,
-                    'rate': 2,
-                    'factor': 2,
-                    }])
-            transaction.cursor.rollback()
+        self.assertRaises(Exception, Uom.create, [{
+                'name': 'Test',
+                'symbol': 'T',
+                'category': category.id,
+                'rate': 2,
+                'factor': 2,
+                }])
+        transaction.rollback()
 
-            uom, = self.uom.search([
-                    ('name', '=', 'Test'),
-                    ], limit=1)
+        def create():
+            category, = UomCategory.create([{'name': 'Test'}])
+            return Uom.create([{
+                        'name': 'Test',
+                        'symbol': 'T',
+                        'category': category.id,
+                        'rate': 1.0,
+                        'factor': 1.0,
+                        }])[0]
 
-            self.assertRaises(Exception, self.uom.write, [uom],
-                {
-                    'rate': 2.0,
-                    })
-            transaction.cursor.rollback()
+        uom = create()
+        self.assertRaises(Exception, Uom.write, [uom], {
+                'rate': 2.0,
+                })
+        transaction.rollback()
 
-            self.assertRaises(Exception, self.uom.write, [uom],
-                {
-                    'factor': 2.0,
-                    })
-            transaction.cursor.rollback()
+        uom = create()
+        self.assertRaises(Exception, Uom.write, [uom], {
+                'factor': 2.0,
+                })
+        transaction.rollback()
 
-    def test0030uom_select_accurate_field(self):
+    @with_transaction()
+    def test_uom_select_accurate_field(self):
         'Test uom select_accurate_field function'
+        pool = Pool()
+        Uom = pool.get('product.uom')
         tests = [
             ('Meter', 'factor'),
             ('Kilometer', 'factor'),
             ('centimeter', 'rate'),
             ('Foot', 'factor'),
             ]
-        with Transaction().start(DB_NAME, USER, context=CONTEXT):
-            for name, result in tests:
-                uom, = self.uom.search([
-                        ('name', '=', name),
-                        ], limit=1)
-                self.assertEqual(result, uom.accurate_field)
+        for name, result in tests:
+            uom, = Uom.search([
+                    ('name', '=', name),
+                    ], limit=1)
+            self.assertEqual(result, uom.accurate_field)
 
-    def test0040uom_compute_qty(self):
+    @with_transaction()
+    def test_uom_compute_qty(self):
         'Test uom compute_qty function'
+        pool = Pool()
+        Uom = pool.get('product.uom')
         tests = [
             ('Kilogram', 100, 'Gram', 100000, 100000),
             ('Gram', 1, 'Pound', 0.0022046226218487759, 0.0),
@@ -121,44 +130,45 @@ class ProductTestCase(ModuleTestCase):
             ('Millimeter', 0, 'Inch', 0, 0),
             ('Millimeter', None, 'Inch', None, None),
             ]
-        with Transaction().start(DB_NAME, USER, context=CONTEXT):
-            for from_name, qty, to_name, result, rounded_result in tests:
-                from_uom, = self.uom.search([
-                        ('name', '=', from_name),
-                        ], limit=1)
-                to_uom, = self.uom.search([
-                        ('name', '=', to_name),
-                        ], 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(0.2, self.uom.compute_qty(None, 0.2, None, False))
-            self.assertEqual(0.2, self.uom.compute_qty(None, 0.2, None, True))
+        for from_name, qty, to_name, result, rounded_result in tests:
+            from_uom, = Uom.search([
+                    ('name', '=', from_name),
+                    ], limit=1)
+            to_uom, = Uom.search([
+                    ('name', '=', to_name),
+                    ], limit=1)
+            self.assertEqual(result, Uom.compute_qty(
+                    from_uom, qty, to_uom, False))
+            self.assertEqual(rounded_result, Uom.compute_qty(
+                    from_uom, qty, to_uom, True))
+        self.assertEqual(0.2, Uom.compute_qty(None, 0.2, None, False))
+        self.assertEqual(0.2, Uom.compute_qty(None, 0.2, None, True))
 
         tests_exceptions = [
             ('Millimeter', 3, 'Pound', ValueError),
             ('Kilogram', 'not a number', 'Pound', TypeError),
             ]
-        with Transaction().start(DB_NAME, USER, context=CONTEXT):
-            for from_name, qty, to_name, exception in tests_exceptions:
-                from_uom, = self.uom.search([
-                        ('name', '=', from_name),
-                        ], limit=1)
-                to_uom, = self.uom.search([
-                        ('name', '=', to_name),
-                        ], limit=1)
-                self.assertRaises(exception, self.uom.compute_qty,
-                        from_uom, qty, to_uom, False)
-                self.assertRaises(exception, self.uom.compute_qty,
-                        from_uom, qty, to_uom, True)
-            self.assertRaises(ValueError, self.uom.compute_qty,
-                    None, qty, to_uom, True)
-            self.assertRaises(ValueError, self.uom.compute_qty,
-                    from_uom, qty, None, True)
+        for from_name, qty, to_name, exception in tests_exceptions:
+            from_uom, = Uom.search([
+                    ('name', '=', from_name),
+                    ], limit=1)
+            to_uom, = Uom.search([
+                    ('name', '=', to_name),
+                    ], limit=1)
+            self.assertRaises(exception, Uom.compute_qty,
+                from_uom, qty, to_uom, False)
+            self.assertRaises(exception, Uom.compute_qty,
+                from_uom, qty, to_uom, True)
+        self.assertRaises(ValueError, Uom.compute_qty,
+            None, qty, to_uom, True)
+        self.assertRaises(ValueError, Uom.compute_qty,
+            from_uom, qty, None, True)
 
-    def test0050uom_compute_price(self):
+    @with_transaction()
+    def test_uom_compute_price(self):
         'Test uom compute_price function'
+        pool = Pool()
+        Uom = pool.get('product.uom')
         tests = [
             ('Kilogram', Decimal('100'), 'Gram', Decimal('0.1')),
             ('Gram', Decimal('1'), 'Pound', Decimal('453.59237')),
@@ -168,133 +178,145 @@ class ProductTestCase(ModuleTestCase):
             ('Millimeter', Decimal('0'), 'Inch', Decimal('0')),
             ('Millimeter', None, 'Inch', None),
             ]
-        with Transaction().start(DB_NAME, USER, context=CONTEXT):
-            for from_name, price, to_name, result in tests:
-                from_uom, = self.uom.search([
-                        ('name', '=', from_name),
-                        ], limit=1)
-                to_uom, = self.uom.search([
-                        ('name', '=', to_name),
-                        ], limit=1)
-                self.assertEqual(result, self.uom.compute_price(
-                        from_uom, price, to_uom))
-            self.assertEqual(Decimal('0.2'), self.uom.compute_price(
-                    None, Decimal('0.2'), None))
+        for from_name, price, to_name, result in tests:
+            from_uom, = Uom.search([
+                    ('name', '=', from_name),
+                    ], limit=1)
+            to_uom, = Uom.search([
+                    ('name', '=', to_name),
+                    ], limit=1)
+            self.assertEqual(result, Uom.compute_price(
+                    from_uom, price, to_uom))
+        self.assertEqual(Decimal('0.2'), Uom.compute_price(
+                None, Decimal('0.2'), None))
 
         tests_exceptions = [
             ('Millimeter', Decimal('3'), 'Pound', ValueError),
             ('Kilogram', 'not a number', 'Pound', TypeError),
             ]
-        with Transaction().start(DB_NAME, USER, context=CONTEXT):
-            for from_name, price, to_name, exception in tests_exceptions:
-                from_uom, = self.uom.search([
-                        ('name', '=', from_name),
-                        ], limit=1)
-                to_uom, = self.uom.search([
-                        ('name', '=', to_name),
-                        ], limit=1)
-                self.assertRaises(exception, self.uom.compute_price,
-                        from_uom, price, to_uom)
-            self.assertRaises(ValueError, self.uom.compute_price,
-                    None, price, to_uom)
-            self.assertRaises(ValueError, self.uom.compute_price,
-                    from_uom, price, None)
+        for from_name, price, to_name, exception in tests_exceptions:
+            from_uom, = Uom.search([
+                    ('name', '=', from_name),
+                    ], limit=1)
+            to_uom, = Uom.search([
+                    ('name', '=', to_name),
+                    ], limit=1)
+            self.assertRaises(exception, Uom.compute_price,
+                from_uom, price, to_uom)
+        self.assertRaises(ValueError, Uom.compute_price,
+            None, price, to_uom)
+        self.assertRaises(ValueError, Uom.compute_price,
+            from_uom, price, None)
 
-    def test0060product_search_domain(self):
+    @with_transaction()
+    def test_product_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])
+        pool = Pool()
+        Uom = pool.get('product.uom')
+        Template = pool.get('product.template')
+        Product = pool.get('product.product')
 
-    def test0060search_domain_conversion(self):
+        kilogram, = Uom.search([
+                ('name', '=', 'Kilogram'),
+                ], limit=1)
+        millimeter, = Uom.search([
+                ('name', '=', 'Millimeter'),
+                ])
+        pt1, pt2 = 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, = Product.search([
+                ('default_uom.name', '=', 'Kilogram'),
+                ])
+        self.assertEqual(p, pt1.products[0])
+        p, = Product.search([
+                ('default_uom.name', '=', 'Millimeter'),
+                ])
+        self.assertEqual(p, pt2.products[0])
+
+    @with_transaction()
+    def test_search_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,
-                'products': [('create', [{}])],
-                }
-            values2 = {
-                'name': 'Some product-2',
-                'category': category2.id,
-                'type': 'goods',
-                'list_price': Decimal('10'),
-                'cost_price': Decimal('5'),
-                'default_uom': uom.id,
-                'products': [('create', [{}])],
-                }
+        pool = Pool()
+        Category = pool.get('product.category')
+        Template = pool.get('product.template')
+        Product = pool.get('product.product')
+        Uom = pool.get('product.uom')
+
+        category1, = Category.create([{'name': 'Category1'}])
+        category2, = Category.create([{'name': 'Category2'}])
+        uom, = Uom.search([], limit=1)
+        values1 = {
+            'name': 'Some product-1',
+            'categories': [('add', [category1.id])],
+            'type': 'goods',
+            'list_price': Decimal('10'),
+            'cost_price': Decimal('5'),
+            'default_uom': uom.id,
+            'products': [('create', [{}])],
+            }
+        values2 = {
+            'name': 'Some product-2',
+            'categories': [('add', [category2.id])],
+            'type': 'goods',
+            'list_price': Decimal('10'),
+            'cost_price': Decimal('5'),
+            'default_uom': uom.id,
+            'products': [('create', [{}])],
+            }
 
-            # 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),
+        # 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.categories', '=', 1) will return 2 records which
+        # it supposed to be.
+        template1, template2, template3, template4 = Template.create(
+            [values1, values1.copy(), values2, values2.copy()]
+            )
+        self.assertEqual(Product.search([], count=True), 4)
+        self.assertEqual(
+            Product.search([
+                    ('categories', '=', category1.id),
                     ], count=True), 2)
 
-            self.assertEqual(
-                self.product.search([
-                    ('template.category', '=', category1.id),
+        self.assertEqual(
+            Product.search([
+                    ('template.categories', '=', category1.id),
                     ], count=True), 2)
 
-            self.assertEqual(
-                self.product.search([
-                    ('category', '=', category2.id),
+        self.assertEqual(
+            Product.search([
+                    ('categories', '=', category2.id),
                     ], count=True), 2)
-            self.assertEqual(
-                self.product.search([
-                    ('template.category', '=', category2.id),
+        self.assertEqual(
+            Product.search([
+                    ('template.categories', '=', category2.id),
                     ], count=True), 2)
 
+    @with_transaction()
     def test_uom_round(self):
         'Test uom round function'
+        pool = Pool()
+        Uom = pool.get('product.uom')
         tests = [
             (2.53, .1, 2.5),
             (3.8, .1, 3.8),
@@ -307,11 +329,8 @@ class ProductTestCase(ModuleTestCase):
             (17, 15, 15),
             (2.5, 1.4, 2.8),
             ]
-        with Transaction().start(DB_NAME, USER, context=CONTEXT):
-            pool = Pool()
-            Uom = pool.get('product.uom')
-            for number, precision, result in tests:
-                self.assertEqual(Uom.round(number, precision), result)
+        for number, precision, result in tests:
+            self.assertEqual(Uom(rounding=precision).round(number), result)
 
 
 def suite():
diff --git a/tryton.cfg b/tryton.cfg
index 882eaab..a37bfc2 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
 [tryton]
-version=3.8.0
+version=4.0.0
 depends:
     ir
     res
@@ -7,3 +7,4 @@ xml:
     product.xml
     category.xml
     uom.xml
+    configuration.xml
diff --git a/trytond_product.egg-info/PKG-INFO b/trytond_product.egg-info/PKG-INFO
index 9819092..53c5caa 100644
--- a/trytond_product.egg-info/PKG-INFO
+++ b/trytond_product.egg-info/PKG-INFO
@@ -1,12 +1,12 @@
 Metadata-Version: 1.1
 Name: trytond-product
-Version: 3.8.0
+Version: 4.0.0
 Summary: Tryton module with products
 Home-page: http://www.tryton.org/
 Author: Tryton
 Author-email: issue_tracker at tryton.org
 License: GPL-3
-Download-URL: http://downloads.tryton.org/3.8/
+Download-URL: http://downloads.tryton.org/4.0/
 Description: trytond_product
         ===============
         
@@ -55,6 +55,7 @@ Classifier: Intended Audience :: Manufacturing
 Classifier: License :: OSI Approved :: GNU General Public License (GPL)
 Classifier: Natural Language :: Bulgarian
 Classifier: Natural Language :: Catalan
+Classifier: Natural Language :: Chinese (Simplified)
 Classifier: Natural Language :: Czech
 Classifier: Natural Language :: Dutch
 Classifier: Natural Language :: English
@@ -68,6 +69,9 @@ Classifier: Natural Language :: Slovenian
 Classifier: Natural Language :: Spanish
 Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python :: 2.7
+Classifier: Programming Language :: Python :: 3.3
+Classifier: Programming Language :: Python :: 3.4
+Classifier: Programming Language :: Python :: 3.5
 Classifier: Programming Language :: Python :: Implementation :: CPython
 Classifier: Programming Language :: Python :: Implementation :: PyPy
 Classifier: Topic :: Office/Business
diff --git a/trytond_product.egg-info/SOURCES.txt b/trytond_product.egg-info/SOURCES.txt
index ecaa58e..b959d59 100644
--- a/trytond_product.egg-info/SOURCES.txt
+++ b/trytond_product.egg-info/SOURCES.txt
@@ -5,6 +5,7 @@ LICENSE
 MANIFEST.in
 README
 category.xml
+configuration.xml
 product.xml
 setup.py
 tryton.cfg
@@ -12,6 +13,7 @@ uom.xml
 ./__init__.py
 ./category.py
 ./category.xml
+./configuration.py
 ./product.py
 ./product.xml
 ./tryton.cfg
@@ -42,7 +44,6 @@ uom.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
@@ -64,11 +65,13 @@ locale/fr_FR.po
 locale/hu_HU.po
 locale/it_IT.po
 locale/ja_JP.po
+locale/lo_LA.po
 locale/lt_LT.po
 locale/nl_NL.po
 locale/pt_BR.po
 locale/ru_RU.po
 locale/sl_SI.po
+locale/zh_CN.po
 trytond_product.egg-info/PKG-INFO
 trytond_product.egg-info/SOURCES.txt
 trytond_product.egg-info/dependency_links.txt
@@ -79,8 +82,10 @@ trytond_product.egg-info/top_level.txt
 view/category_form.xml
 view/category_list.xml
 view/category_tree.xml
+view/configuration_form.xml
 view/product_form.xml
-view/product_tree.xml
+view/product_form_simple.xml
+view/product_tree_simple.xml
 view/template_form.xml
 view/template_tree.xml
 view/uom_category_form.xml
diff --git a/trytond_product.egg-info/requires.txt b/trytond_product.egg-info/requires.txt
index fad3dd9..73ccfb4 100644
--- a/trytond_product.egg-info/requires.txt
+++ b/trytond_product.egg-info/requires.txt
@@ -1,2 +1,2 @@
 python-sql
-trytond >= 3.8, < 3.9
\ No newline at end of file
+trytond >= 4.0, < 4.1
\ No newline at end of file
diff --git a/uom.py b/uom.py
index 62b6eec..df6ad87 100644
--- a/uom.py
+++ b/uom.py
@@ -55,7 +55,7 @@ class Uom(ModelSQL, ModelView):
 
     @classmethod
     def __register__(cls, module_name):
-        cursor = Transaction().cursor
+        cursor = Transaction().connection.cursor()
         model_data = Table('ir_model_data')
         # Migration from 1.6: corrected misspelling of ounce (was once)
         cursor.execute(*model_data.update(
@@ -76,7 +76,7 @@ class Uom(ModelSQL, ModelView):
         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. '),
+                    '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.'),
@@ -134,8 +134,8 @@ class Uom(ModelSQL, ModelView):
             ('symbol',) + tuple(clause[1:]),
             ]
 
-    @staticmethod
-    def round(number, precision=1.0):
+    def round(self, number):
+        precision = self.rounding
         i, d = divmod(precision, 1)
         base = round(number / precision)
         # Instead of multiply by the decimal part, we must divide by the
@@ -232,7 +232,7 @@ class Uom(ModelSQL, ModelView):
             amount = amount * to_uom.rate
 
         if round:
-            amount = cls.round(amount, to_uom.rounding)
+            amount = to_uom.round(amount)
 
         return amount
 
diff --git a/view/category_form.xml b/view/category_form.xml
index 8b25285..be29ed0 100644
--- a/view/category_form.xml
+++ b/view/category_form.xml
@@ -6,6 +6,9 @@ this repository contains the full copyright notices and license terms. -->
     <field name="name"/>
     <label name="parent"/>
     <field name="parent"/>
+    <group colspan="4" col="20" id="checkboxes">
+        <!-- Add here some checkboxes ! -->
+    </group>
     <label name="rec_name"/>
     <field name="rec_name" colspan="3"/>
     <notebook colspan="4">
diff --git a/view/category_list.xml b/view/category_list.xml
index af5b4a6..5563049 100644
--- a/view/category_list.xml
+++ b/view/category_list.xml
@@ -2,6 +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. -->
 <tree string="Product Categories">
-    <field name="name"/>
     <field name="rec_name"/>
+    <field name="name" tree_invisible="1"/>
 </tree>
diff --git a/view/category_list.xml b/view/configuration_form.xml
similarity index 55%
copy from view/category_list.xml
copy to view/configuration_form.xml
index af5b4a6..463eed9 100644
--- a/view/category_list.xml
+++ b/view/configuration_form.xml
@@ -1,7 +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>
+<form string="Party Configuration">
+    <label name="default_cost_price_method"/>
+    <field name="default_cost_price_method"/>
+</form>
diff --git a/view/product_form.xml b/view/product_form.xml
index caf9017..6aa736c 100644
--- a/view/product_form.xml
+++ b/view/product_form.xml
@@ -1,13 +1,20 @@
 <?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>
+<data>
+    <xpath expr="/form/field[@name='name']" position="after">
+        <label name="code"/>
+        <field name="code"/>
+    </xpath>
+    <xpath expr="/form/notebook/page[@id='general']/label[@name='type']"
+        position="before">
+        <label name="template"/>
+        <field name="template" colspan="3"/>
+    </xpath>
+    <xpath expr="/form/notebook/page/field[@name='products']" position="replace">
+        <group id="description" colspan="2" col="1" yexpand="1" yfill="1">
+            <separator name="description"/>
+            <field name="description"/>
+        </group>
+    </xpath>
+</data>
diff --git a/view/product_form.xml b/view/product_form_simple.xml
similarity index 100%
copy from view/product_form.xml
copy to view/product_form_simple.xml
diff --git a/view/product_tree.xml b/view/product_tree_simple.xml
similarity index 100%
rename from view/product_tree.xml
rename to view/product_tree_simple.xml
diff --git a/view/template_form.xml b/view/template_form.xml
index ee61a24..ce6dfc7 100644
--- a/view/template_form.xml
+++ b/view/template_form.xml
@@ -6,16 +6,16 @@ this repository contains the full copyright notices and license terms. -->
   <field name="name" xexpand="1"/>
   <label name="active"/>
   <field name="active" xexpand="0" width="100"/>
+  <newline/>
   <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" />
+          <newline/>
           <label name="list_price"/>
           <field name="list_price"/>
           <newline/>
@@ -23,7 +23,11 @@ this repository contains the full copyright notices and license terms. -->
           <field name="cost_price"/>
           <label name="cost_price_method"/>
           <field name="cost_price_method"/>
-          <field name="products" mode="form,tree" colspan="4"/>
+          <newline/>
+          <field name="products" mode="form,tree" colspan="2"
+              view_ids="product.product_view_form_simple"/>
+          <field name="categories" colspan="2"
+              view_ids="product.category_view_list"/>
       </page>
   </notebook>
 </form>
diff --git a/view/template_tree.xml b/view/template_tree.xml
index ee33d79..18a3a6d 100644
--- a/view/template_tree.xml
+++ b/view/template_tree.xml
@@ -6,7 +6,6 @@ this repository contains the full copyright notices and license terms. -->
     <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>
-- 
tryton-modules-product



More information about the tryton-debian-vcs mailing list