[tryton-debian-vcs] tryton-modules-product branch upstream updated. upstream/4.4.1-1-g34c8429

Mathias Behrle tryton-debian-vcs at alioth.debian.org
Fri Nov 10 12:11:56 UTC 2017


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

commit 34c84290504d95f05b5b7175c6988c1561a852dc
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Mon Nov 6 14:40:59 2017 +0100

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

diff --git a/.drone.yml b/.drone.yml
new file mode 100644
index 0000000..e0bc2f7
--- /dev/null
+++ b/.drone.yml
@@ -0,0 +1,51 @@
+clone:
+    hg:
+        image: plugins/hg
+
+pipeline:
+    tox:
+        image: ${IMAGE}
+        environment:
+            - CFLAGS=-O0
+            - DB_CACHE=/cache
+            - TOX_TESTENV_PASSENV=CFLAGS DB_CACHE
+            - POSTGRESQL_URI=postgresql://postgres@postgresql:5432/
+        commands:
+            - pip install tox
+            - tox -e "${TOXENV}-${DATABASE}"
+        volumes:
+            - cache:/root/.cache
+
+services:
+    postgresql:
+        image: postgres
+        when:
+            matrix:
+                DATABASE: postgresql
+
+matrix:
+    include:
+        - IMAGE: python:2.7
+          TOXENV: py27
+          DATABASE: sqlite
+        - IMAGE: python:2.7
+          TOXENV: py27
+          DATABASE: postgresql
+        - IMAGE: python:3.4
+          TOXENV: py34
+          DATABASE: sqlite
+        - IMAGE: python:3.4
+          TOXENV: py34
+          DATABASE: postgresql
+        - IMAGE: python:3.5
+          TOXENV: py35
+          DATABASE: sqlite
+        - IMAGE: python:3.5
+          TOXENV: py35
+          DATABASE: postgresql
+        - IMAGE: python:3.6
+          TOXENV: py36
+          DATABASE: sqlite
+        - IMAGE: python:3.6
+          TOXENV: py36
+          DATABASE: postgresql
diff --git a/CHANGELOG b/CHANGELOG
index ba020aa..9c7604e 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,5 +1,8 @@
-Version 4.4.1 - 2017-08-08
+Version 4.6.0 - 2017-10-30
 * Bug fixes (see mercurial logs for details)
+* Show all products by category
+* Limit cost method to fixed for service
+* Move cost_price from Template to Product
 
 Version 4.4.0 - 2017-05-01
 * Bug fixes (see mercurial logs for details)
diff --git a/PKG-INFO b/PKG-INFO
index 8a4436a..65685ad 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,12 +1,12 @@
 Metadata-Version: 1.1
 Name: trytond_product
-Version: 4.4.1
+Version: 4.6.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/4.4/
+Download-URL: http://downloads.tryton.org/4.6/
 Description: trytond_product
         ===============
         
@@ -70,9 +70,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 :: 3.6
 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 f567154..2df0c5c 100644
--- a/__init__.py
+++ b/__init__.py
@@ -16,8 +16,10 @@ def register():
         Template,
         Product,
         ProductListPrice,
+        ProductCostPriceMethod,  # before ProductCostPrice for migration
         ProductCostPrice,
         TemplateCategory,
+        TemplateCategoryAll,
         Configuration,
         ConfigurationDefaultCostPriceMethod,
         module='product', type_='model')
diff --git a/locale/bg.po b/locale/bg.po
index c2d3dcc..ce5b111 100644
--- a/locale/bg.po
+++ b/locale/bg.po
@@ -1,4 +1,4 @@
-# 
+#
 msgid ""
 msgstr "Content-Type: text/plain; charset=utf-8\n"
 
@@ -49,8 +49,8 @@ msgid "Parent"
 msgstr "Родител"
 
 msgctxt "field:product.category,rec_name:"
-msgid "Name"
-msgstr "Име"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:product.category,write_date:"
 msgid "Write Date"
@@ -79,10 +79,9 @@ msgctxt "field:product.configuration,id:"
 msgid "ID"
 msgstr "ID"
 
-#, fuzzy
 msgctxt "field:product.configuration,rec_name:"
-msgid "Name"
-msgstr "Име"
+msgid "Record Name"
+msgstr ""
 
 #, fuzzy
 msgctxt "field:product.configuration,write_date:"
@@ -114,10 +113,9 @@ msgctxt "field:product.configuration.default_cost_price_method,id:"
 msgid "ID"
 msgstr "ID"
 
-#, fuzzy
 msgctxt "field:product.configuration.default_cost_price_method,rec_name:"
-msgid "Name"
-msgstr "Име"
+msgid "Record Name"
+msgstr ""
 
 #, fuzzy
 msgctxt "field:product.configuration.default_cost_price_method,write_date:"
@@ -139,11 +137,6 @@ msgid "Cost Price"
 msgstr "Фабрична цена"
 
 #, fuzzy
-msgctxt "field:product.cost_price,cost_price_method:"
-msgid "Cost Method"
-msgstr "Начин на остойностяване"
-
-#, fuzzy
 msgctxt "field:product.cost_price,create_date:"
 msgid "Create Date"
 msgstr "Създадено на"
@@ -159,22 +152,63 @@ msgid "ID"
 msgstr "ID"
 
 #, fuzzy
+msgctxt "field:product.cost_price,product:"
+msgid "Product"
+msgstr "Продукт"
+
 msgctxt "field:product.cost_price,rec_name:"
-msgid "Name"
-msgstr "Име"
+msgid "Record Name"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:product.cost_price,write_date:"
+msgid "Write Date"
+msgstr "Променено на"
 
 #, fuzzy
-msgctxt "field:product.cost_price,template:"
+msgctxt "field:product.cost_price,write_uid:"
+msgid "Write User"
+msgstr "Променено от"
+
+msgctxt "field:product.cost_price_method,company:"
+msgid "Company"
+msgstr ""
+
+msgctxt "field:product.cost_price_method,cost_price_method:"
+msgid "Cost Price Method"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:product.cost_price_method,create_date:"
+msgid "Create Date"
+msgstr "Създадено на"
+
+#, fuzzy
+msgctxt "field:product.cost_price_method,create_uid:"
+msgid "Create User"
+msgstr "Създадено от"
+
+#, fuzzy
+msgctxt "field:product.cost_price_method,id:"
+msgid "ID"
+msgstr "ID"
+
+msgctxt "field:product.cost_price_method,rec_name:"
+msgid "Record Name"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:product.cost_price_method,template:"
 msgid "Template"
 msgstr "Шаблон"
 
 #, fuzzy
-msgctxt "field:product.cost_price,write_date:"
+msgctxt "field:product.cost_price_method,write_date:"
 msgid "Write Date"
 msgstr "Променено на"
 
 #, fuzzy
-msgctxt "field:product.cost_price,write_uid:"
+msgctxt "field:product.cost_price_method,write_uid:"
 msgid "Write User"
 msgstr "Променено от"
 
@@ -202,10 +236,9 @@ msgctxt "field:product.list_price,list_price:"
 msgid "List Price"
 msgstr "Каталожна цена"
 
-#, fuzzy
 msgctxt "field:product.list_price,rec_name:"
-msgid "Name"
-msgstr "Име"
+msgid "Record Name"
+msgstr ""
 
 #, fuzzy
 msgctxt "field:product.list_price,template:"
@@ -232,6 +265,11 @@ msgctxt "field:product.product,categories:"
 msgid "Categories"
 msgstr "Категории"
 
+#, fuzzy
+msgctxt "field:product.product,categories_all:"
+msgid "Categories"
+msgstr "Категории"
+
 msgctxt "field:product.product,code:"
 msgid "Code"
 msgstr "Код"
@@ -246,10 +284,13 @@ msgctxt "field:product.product,cost_price:"
 msgid "Cost Price"
 msgstr "Фабрична цена"
 
-#, fuzzy
 msgctxt "field:product.product,cost_price_method:"
-msgid "Cost Method"
-msgstr "Начин на остойностяване"
+msgid "Cost Price Method"
+msgstr ""
+
+msgctxt "field:product.product,cost_price_methods:"
+msgid "Cost Price Methods"
+msgstr ""
 
 #, fuzzy
 msgctxt "field:product.product,cost_price_uom:"
@@ -308,8 +349,8 @@ msgid "Name"
 msgstr "Име"
 
 msgctxt "field:product.product,rec_name:"
-msgid "Name"
-msgstr "Име"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:product.product,template:"
 msgid "Product Template"
@@ -337,6 +378,11 @@ msgctxt "field:product.template,categories:"
 msgid "Categories"
 msgstr "Категории"
 
+#, fuzzy
+msgctxt "field:product.template,categories_all:"
+msgid "Categories"
+msgstr "Категории"
+
 msgctxt "field:product.template,consumable:"
 msgid "Consumable"
 msgstr "Консуматив"
@@ -346,13 +392,12 @@ msgid "Cost Price"
 msgstr "Фабрична цена"
 
 msgctxt "field:product.template,cost_price_method:"
-msgid "Cost Method"
-msgstr "Начин на остойностяване"
+msgid "Cost Price Method"
+msgstr ""
 
-#, fuzzy
-msgctxt "field:product.template,cost_prices:"
-msgid "Cost Prices"
-msgstr "Фабрична цена"
+msgctxt "field:product.template,cost_price_methods:"
+msgid "Cost Price Methods"
+msgstr ""
 
 msgctxt "field:product.template,create_date:"
 msgid "Create Date"
@@ -393,8 +438,8 @@ msgid "Variants"
 msgstr "Продукти"
 
 msgctxt "field:product.template,rec_name:"
-msgid "Name"
-msgstr "Име"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:product.template,type:"
 msgid "Type"
@@ -428,10 +473,9 @@ msgctxt "field:product.template-product.category,id:"
 msgid "ID"
 msgstr "ID"
 
-#, fuzzy
 msgctxt "field:product.template-product.category,rec_name:"
-msgid "Name"
-msgstr "Име"
+msgid "Record Name"
+msgstr ""
 
 #, fuzzy
 msgctxt "field:product.template-product.category,template:"
@@ -448,6 +492,45 @@ msgctxt "field:product.template-product.category,write_uid:"
 msgid "Write User"
 msgstr "Променено от"
 
+#, fuzzy
+msgctxt "field:product.template-product.category.all,category:"
+msgid "Category"
+msgstr "Категория"
+
+#, fuzzy
+msgctxt "field:product.template-product.category.all,create_date:"
+msgid "Create Date"
+msgstr "Създадено на"
+
+#, fuzzy
+msgctxt "field:product.template-product.category.all,create_uid:"
+msgid "Create User"
+msgstr "Създадено от"
+
+#, fuzzy
+msgctxt "field:product.template-product.category.all,id:"
+msgid "ID"
+msgstr "ID"
+
+msgctxt "field:product.template-product.category.all,rec_name:"
+msgid "Record Name"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:product.template-product.category.all,template:"
+msgid "Template"
+msgstr "Шаблон"
+
+#, fuzzy
+msgctxt "field:product.template-product.category.all,write_date:"
+msgid "Write Date"
+msgstr "Променено на"
+
+#, fuzzy
+msgctxt "field:product.template-product.category.all,write_uid:"
+msgid "Write User"
+msgstr "Променено от"
+
 msgctxt "field:product.uom,active:"
 msgid "Active"
 msgstr "Активен"
@@ -486,8 +569,8 @@ msgid "Rate"
 msgstr "Отношение"
 
 msgctxt "field:product.uom,rec_name:"
-msgid "Name"
-msgstr "Име"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:product.uom,rounding:"
 msgid "Rounding Precision"
@@ -522,8 +605,8 @@ msgid "Name"
 msgstr "Име"
 
 msgctxt "field:product.uom.category,rec_name:"
-msgid "Name"
-msgstr "Име"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:product.uom.category,uoms:"
 msgid "Unit of Measures"
@@ -648,6 +731,10 @@ msgctxt "model:product.cost_price,name:"
 msgid "Product Cost Price"
 msgstr ""
 
+msgctxt "model:product.cost_price_method,name:"
+msgid "Product Cost Price Method"
+msgstr ""
+
 msgctxt "model:product.list_price,name:"
 msgid "Product List Price"
 msgstr ""
@@ -665,6 +752,10 @@ msgctxt "model:product.template-product.category,name:"
 msgid "Template - Category"
 msgstr ""
 
+msgctxt "model:product.template-product.category.all,name:"
+msgid "Template - Category All"
+msgstr ""
+
 msgctxt "model:product.uom,name:"
 msgid "Unit of measure"
 msgstr "Мерна единица"
diff --git a/locale/ca.po b/locale/ca.po
index d33c2b8..9360e1c 100644
--- a/locale/ca.po
+++ b/locale/ca.po
@@ -1,4 +1,4 @@
-# 
+#
 msgid ""
 msgstr "Content-Type: text/plain; charset=utf-8\n"
 
@@ -49,8 +49,8 @@ msgid "Parent"
 msgstr "Pare"
 
 msgctxt "field:product.category,rec_name:"
-msgid "Name"
-msgstr "Nom"
+msgid "Record Name"
+msgstr "Nom del registre"
 
 msgctxt "field:product.category,write_date:"
 msgid "Write Date"
@@ -77,8 +77,8 @@ msgid "ID"
 msgstr "ID"
 
 msgctxt "field:product.configuration,rec_name:"
-msgid "Name"
-msgstr "Nom"
+msgid "Record Name"
+msgstr "Nom del registre"
 
 msgctxt "field:product.configuration,write_date:"
 msgid "Write Date"
@@ -106,8 +106,8 @@ msgid "ID"
 msgstr "ID"
 
 msgctxt "field:product.configuration.default_cost_price_method,rec_name:"
-msgid "Name"
-msgstr "Nom"
+msgid "Record Name"
+msgstr "Nom del registre"
 
 msgctxt "field:product.configuration.default_cost_price_method,write_date:"
 msgid "Write Date"
@@ -125,10 +125,6 @@ msgctxt "field:product.cost_price,cost_price:"
 msgid "Cost Price"
 msgstr "Preu de cost"
 
-msgctxt "field:product.cost_price,cost_price_method:"
-msgid "Cost Method"
-msgstr "Mètode de cost"
-
 msgctxt "field:product.cost_price,create_date:"
 msgid "Create Date"
 msgstr "Data de creació"
@@ -141,19 +137,55 @@ msgctxt "field:product.cost_price,id:"
 msgid "ID"
 msgstr "ID"
 
+msgctxt "field:product.cost_price,product:"
+msgid "Product"
+msgstr "Producte"
+
 msgctxt "field:product.cost_price,rec_name:"
-msgid "Name"
-msgstr "Nom"
+msgid "Record Name"
+msgstr "Nom del registre"
+
+msgctxt "field:product.cost_price,write_date:"
+msgid "Write Date"
+msgstr "Data de modificació"
 
-msgctxt "field:product.cost_price,template:"
+msgctxt "field:product.cost_price,write_uid:"
+msgid "Write User"
+msgstr "Usuari de modificació"
+
+msgctxt "field:product.cost_price_method,company:"
+msgid "Company"
+msgstr "Empresa"
+
+msgctxt "field:product.cost_price_method,cost_price_method:"
+msgid "Cost Price Method"
+msgstr "Mètode de cost"
+
+msgctxt "field:product.cost_price_method,create_date:"
+msgid "Create Date"
+msgstr "Data de creació"
+
+msgctxt "field:product.cost_price_method,create_uid:"
+msgid "Create User"
+msgstr "Usuari de creació"
+
+msgctxt "field:product.cost_price_method,id:"
+msgid "ID"
+msgstr "ID"
+
+msgctxt "field:product.cost_price_method,rec_name:"
+msgid "Record Name"
+msgstr "Nom del registre"
+
+msgctxt "field:product.cost_price_method,template:"
 msgid "Template"
 msgstr "Plantilla"
 
-msgctxt "field:product.cost_price,write_date:"
+msgctxt "field:product.cost_price_method,write_date:"
 msgid "Write Date"
 msgstr "Data de modificació"
 
-msgctxt "field:product.cost_price,write_uid:"
+msgctxt "field:product.cost_price_method,write_uid:"
 msgid "Write User"
 msgstr "Usuari de modificació"
 
@@ -178,8 +210,8 @@ msgid "List Price"
 msgstr "Preu de venda"
 
 msgctxt "field:product.list_price,rec_name:"
-msgid "Name"
-msgstr "Nom"
+msgid "Record Name"
+msgstr "Nom del registre"
 
 msgctxt "field:product.list_price,template:"
 msgid "Template"
@@ -201,6 +233,10 @@ msgctxt "field:product.product,categories:"
 msgid "Categories"
 msgstr "Categories"
 
+msgctxt "field:product.product,categories_all:"
+msgid "Categories"
+msgstr "Categories"
+
 msgctxt "field:product.product,code:"
 msgid "Code"
 msgstr "Codi"
@@ -214,9 +250,13 @@ msgid "Cost Price"
 msgstr "Preu de cost"
 
 msgctxt "field:product.product,cost_price_method:"
-msgid "Cost Method"
+msgid "Cost Price Method"
 msgstr "Mètode de cost"
 
+msgctxt "field:product.product,cost_price_methods:"
+msgid "Cost Price Methods"
+msgstr "Mètodes de cost"
+
 msgctxt "field:product.product,cost_price_uom:"
 msgid "Cost Price"
 msgstr "Preu de cost"
@@ -266,8 +306,8 @@ msgid "Name"
 msgstr "Nom"
 
 msgctxt "field:product.product,rec_name:"
-msgid "Name"
-msgstr "Nom"
+msgid "Record Name"
+msgstr "Nom del registre"
 
 msgctxt "field:product.product,template:"
 msgid "Product Template"
@@ -293,6 +333,10 @@ msgctxt "field:product.template,categories:"
 msgid "Categories"
 msgstr "Categories"
 
+msgctxt "field:product.template,categories_all:"
+msgid "Categories"
+msgstr "Categories"
+
 msgctxt "field:product.template,consumable:"
 msgid "Consumable"
 msgstr "Consumible"
@@ -302,12 +346,12 @@ msgid "Cost Price"
 msgstr "Preu de cost"
 
 msgctxt "field:product.template,cost_price_method:"
-msgid "Cost Method"
+msgid "Cost Price Method"
 msgstr "Mètode de cost"
 
-msgctxt "field:product.template,cost_prices:"
-msgid "Cost Prices"
-msgstr "Preu de cost"
+msgctxt "field:product.template,cost_price_methods:"
+msgid "Cost Price Methods"
+msgstr "Mètodes de cost"
 
 msgctxt "field:product.template,create_date:"
 msgid "Create Date"
@@ -346,8 +390,8 @@ msgid "Variants"
 msgstr "Variants"
 
 msgctxt "field:product.template,rec_name:"
-msgid "Name"
-msgstr "Nom"
+msgid "Record Name"
+msgstr "Nom del registre"
 
 msgctxt "field:product.template,type:"
 msgid "Type"
@@ -378,8 +422,8 @@ msgid "ID"
 msgstr "ID"
 
 msgctxt "field:product.template-product.category,rec_name:"
-msgid "Name"
-msgstr "Nom"
+msgid "Record Name"
+msgstr "Nom del registre"
 
 msgctxt "field:product.template-product.category,template:"
 msgid "Template"
@@ -393,6 +437,38 @@ msgctxt "field:product.template-product.category,write_uid:"
 msgid "Write User"
 msgstr "Usuari de modificació"
 
+msgctxt "field:product.template-product.category.all,category:"
+msgid "Category"
+msgstr "Categoria"
+
+msgctxt "field:product.template-product.category.all,create_date:"
+msgid "Create Date"
+msgstr "Data de creació"
+
+msgctxt "field:product.template-product.category.all,create_uid:"
+msgid "Create User"
+msgstr "Usuari de creació"
+
+msgctxt "field:product.template-product.category.all,id:"
+msgid "ID"
+msgstr "ID"
+
+msgctxt "field:product.template-product.category.all,rec_name:"
+msgid "Record Name"
+msgstr "Nom del registre"
+
+msgctxt "field:product.template-product.category.all,template:"
+msgid "Template"
+msgstr "Plantilla"
+
+msgctxt "field:product.template-product.category.all,write_date:"
+msgid "Write Date"
+msgstr "Data de modificació"
+
+msgctxt "field:product.template-product.category.all,write_uid:"
+msgid "Write User"
+msgstr "Usuari de modificació"
+
 msgctxt "field:product.uom,active:"
 msgid "Active"
 msgstr "Actiu"
@@ -430,8 +506,8 @@ msgid "Rate"
 msgstr "Conversió"
 
 msgctxt "field:product.uom,rec_name:"
-msgid "Name"
-msgstr "Nom"
+msgid "Record Name"
+msgstr "Nom del registre"
 
 msgctxt "field:product.uom,rounding:"
 msgid "Rounding Precision"
@@ -466,8 +542,8 @@ msgid "Name"
 msgstr "Nom"
 
 msgctxt "field:product.uom.category,rec_name:"
-msgid "Name"
-msgstr "Nom"
+msgid "Record Name"
+msgstr "Nom del registre"
 
 msgctxt "field:product.uom.category,uoms:"
 msgid "Unit of Measures"
@@ -585,6 +661,10 @@ msgctxt "model:product.cost_price,name:"
 msgid "Product Cost Price"
 msgstr "Preu de cost del producte"
 
+msgctxt "model:product.cost_price_method,name:"
+msgid "Product Cost Price Method"
+msgstr "Mètode de cost per producte"
+
 msgctxt "model:product.list_price,name:"
 msgid "Product List Price"
 msgstr "Preu de venda del producte"
@@ -601,6 +681,10 @@ msgctxt "model:product.template-product.category,name:"
 msgid "Template - Category"
 msgstr "Plantilla - Categoria"
 
+msgctxt "model:product.template-product.category.all,name:"
+msgid "Template - Category All"
+msgstr "Plantilla - Totes les categories"
+
 msgctxt "model:product.uom,name:"
 msgid "Unit of measure"
 msgstr "Unitat de mesura"
diff --git a/locale/cs.po b/locale/cs.po
index b197137..529ab47 100644
--- a/locale/cs.po
+++ b/locale/cs.po
@@ -1,4 +1,4 @@
-# 
+#
 msgid ""
 msgstr "Content-Type: text/plain; charset=utf-8\n"
 
@@ -45,10 +45,9 @@ msgctxt "field:product.category,parent:"
 msgid "Parent"
 msgstr ""
 
-#, fuzzy
 msgctxt "field:product.category,rec_name:"
-msgid "Name"
-msgstr "Namu"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:product.category,write_date:"
 msgid "Write Date"
@@ -74,10 +73,9 @@ msgctxt "field:product.configuration,id:"
 msgid "ID"
 msgstr ""
 
-#, fuzzy
 msgctxt "field:product.configuration,rec_name:"
-msgid "Name"
-msgstr "Namu"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:product.configuration,write_date:"
 msgid "Write Date"
@@ -104,10 +102,9 @@ msgctxt "field:product.configuration.default_cost_price_method,id:"
 msgid "ID"
 msgstr ""
 
-#, fuzzy
 msgctxt "field:product.configuration.default_cost_price_method,rec_name:"
-msgid "Name"
-msgstr "Namu"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:product.configuration.default_cost_price_method,write_date:"
 msgid "Write Date"
@@ -125,10 +122,6 @@ msgctxt "field:product.cost_price,cost_price:"
 msgid "Cost Price"
 msgstr ""
 
-msgctxt "field:product.cost_price,cost_price_method:"
-msgid "Cost Method"
-msgstr ""
-
 msgctxt "field:product.cost_price,create_date:"
 msgid "Create Date"
 msgstr ""
@@ -141,13 +134,12 @@ msgctxt "field:product.cost_price,id:"
 msgid "ID"
 msgstr ""
 
-#, fuzzy
-msgctxt "field:product.cost_price,rec_name:"
-msgid "Name"
-msgstr "Namu"
+msgctxt "field:product.cost_price,product:"
+msgid "Product"
+msgstr ""
 
-msgctxt "field:product.cost_price,template:"
-msgid "Template"
+msgctxt "field:product.cost_price,rec_name:"
+msgid "Record Name"
 msgstr ""
 
 msgctxt "field:product.cost_price,write_date:"
@@ -158,6 +150,42 @@ msgctxt "field:product.cost_price,write_uid:"
 msgid "Write User"
 msgstr ""
 
+msgctxt "field:product.cost_price_method,company:"
+msgid "Company"
+msgstr ""
+
+msgctxt "field:product.cost_price_method,cost_price_method:"
+msgid "Cost Price Method"
+msgstr ""
+
+msgctxt "field:product.cost_price_method,create_date:"
+msgid "Create Date"
+msgstr ""
+
+msgctxt "field:product.cost_price_method,create_uid:"
+msgid "Create User"
+msgstr ""
+
+msgctxt "field:product.cost_price_method,id:"
+msgid "ID"
+msgstr ""
+
+msgctxt "field:product.cost_price_method,rec_name:"
+msgid "Record Name"
+msgstr ""
+
+msgctxt "field:product.cost_price_method,template:"
+msgid "Template"
+msgstr ""
+
+msgctxt "field:product.cost_price_method,write_date:"
+msgid "Write Date"
+msgstr ""
+
+msgctxt "field:product.cost_price_method,write_uid:"
+msgid "Write User"
+msgstr ""
+
 msgctxt "field:product.list_price,company:"
 msgid "Company"
 msgstr ""
@@ -178,10 +206,9 @@ msgctxt "field:product.list_price,list_price:"
 msgid "List Price"
 msgstr ""
 
-#, fuzzy
 msgctxt "field:product.list_price,rec_name:"
-msgid "Name"
-msgstr "Namu"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:product.list_price,template:"
 msgid "Template"
@@ -203,6 +230,10 @@ msgctxt "field:product.product,categories:"
 msgid "Categories"
 msgstr ""
 
+msgctxt "field:product.product,categories_all:"
+msgid "Categories"
+msgstr ""
+
 msgctxt "field:product.product,code:"
 msgid "Code"
 msgstr ""
@@ -216,7 +247,11 @@ msgid "Cost Price"
 msgstr ""
 
 msgctxt "field:product.product,cost_price_method:"
-msgid "Cost Method"
+msgid "Cost Price Method"
+msgstr ""
+
+msgctxt "field:product.product,cost_price_methods:"
+msgid "Cost Price Methods"
 msgstr ""
 
 msgctxt "field:product.product,cost_price_uom:"
@@ -268,10 +303,9 @@ msgctxt "field:product.product,name:"
 msgid "Name"
 msgstr "Namu"
 
-#, fuzzy
 msgctxt "field:product.product,rec_name:"
-msgid "Name"
-msgstr "Namu"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:product.product,template:"
 msgid "Product Template"
@@ -297,6 +331,10 @@ msgctxt "field:product.template,categories:"
 msgid "Categories"
 msgstr ""
 
+msgctxt "field:product.template,categories_all:"
+msgid "Categories"
+msgstr ""
+
 msgctxt "field:product.template,consumable:"
 msgid "Consumable"
 msgstr ""
@@ -306,11 +344,11 @@ msgid "Cost Price"
 msgstr ""
 
 msgctxt "field:product.template,cost_price_method:"
-msgid "Cost Method"
+msgid "Cost Price Method"
 msgstr ""
 
-msgctxt "field:product.template,cost_prices:"
-msgid "Cost Prices"
+msgctxt "field:product.template,cost_price_methods:"
+msgid "Cost Price Methods"
 msgstr ""
 
 msgctxt "field:product.template,create_date:"
@@ -350,10 +388,9 @@ msgctxt "field:product.template,products:"
 msgid "Variants"
 msgstr ""
 
-#, fuzzy
 msgctxt "field:product.template,rec_name:"
-msgid "Name"
-msgstr "Namu"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:product.template,type:"
 msgid "Type"
@@ -383,10 +420,9 @@ msgctxt "field:product.template-product.category,id:"
 msgid "ID"
 msgstr ""
 
-#, fuzzy
 msgctxt "field:product.template-product.category,rec_name:"
-msgid "Name"
-msgstr "Namu"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:product.template-product.category,template:"
 msgid "Template"
@@ -400,6 +436,38 @@ msgctxt "field:product.template-product.category,write_uid:"
 msgid "Write User"
 msgstr ""
 
+msgctxt "field:product.template-product.category.all,category:"
+msgid "Category"
+msgstr ""
+
+msgctxt "field:product.template-product.category.all,create_date:"
+msgid "Create Date"
+msgstr ""
+
+msgctxt "field:product.template-product.category.all,create_uid:"
+msgid "Create User"
+msgstr ""
+
+msgctxt "field:product.template-product.category.all,id:"
+msgid "ID"
+msgstr ""
+
+msgctxt "field:product.template-product.category.all,rec_name:"
+msgid "Record Name"
+msgstr ""
+
+msgctxt "field:product.template-product.category.all,template:"
+msgid "Template"
+msgstr ""
+
+msgctxt "field:product.template-product.category.all,write_date:"
+msgid "Write Date"
+msgstr ""
+
+msgctxt "field:product.template-product.category.all,write_uid:"
+msgid "Write User"
+msgstr ""
+
 msgctxt "field:product.uom,active:"
 msgid "Active"
 msgstr ""
@@ -437,10 +505,9 @@ msgctxt "field:product.uom,rate:"
 msgid "Rate"
 msgstr ""
 
-#, fuzzy
 msgctxt "field:product.uom,rec_name:"
-msgid "Name"
-msgstr "Namu"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:product.uom,rounding:"
 msgid "Rounding Precision"
@@ -475,10 +542,9 @@ msgctxt "field:product.uom.category,name:"
 msgid "Name"
 msgstr "Namu"
 
-#, fuzzy
 msgctxt "field:product.uom.category,rec_name:"
-msgid "Name"
-msgstr "Namu"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:product.uom.category,uoms:"
 msgid "Unit of Measures"
@@ -592,6 +658,10 @@ msgctxt "model:product.cost_price,name:"
 msgid "Product Cost Price"
 msgstr ""
 
+msgctxt "model:product.cost_price_method,name:"
+msgid "Product Cost Price Method"
+msgstr ""
+
 msgctxt "model:product.list_price,name:"
 msgid "Product List Price"
 msgstr ""
@@ -608,6 +678,10 @@ msgctxt "model:product.template-product.category,name:"
 msgid "Template - Category"
 msgstr ""
 
+msgctxt "model:product.template-product.category.all,name:"
+msgid "Template - Category All"
+msgstr ""
+
 msgctxt "model:product.uom,name:"
 msgid "Unit of measure"
 msgstr ""
diff --git a/locale/de.po b/locale/de.po
index 2f40ee2..0b04705 100644
--- a/locale/de.po
+++ b/locale/de.po
@@ -1,4 +1,4 @@
-# 
+#
 msgid ""
 msgstr "Content-Type: text/plain; charset=utf-8\n"
 
@@ -49,8 +49,8 @@ msgid "Parent"
 msgstr "Übergeordnet (Kategorie)"
 
 msgctxt "field:product.category,rec_name:"
-msgid "Name"
-msgstr "Name"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:product.category,write_date:"
 msgid "Write Date"
@@ -77,8 +77,8 @@ msgid "ID"
 msgstr "ID"
 
 msgctxt "field:product.configuration,rec_name:"
-msgid "Name"
-msgstr "Name"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:product.configuration,write_date:"
 msgid "Write Date"
@@ -106,8 +106,8 @@ msgid "ID"
 msgstr "ID"
 
 msgctxt "field:product.configuration.default_cost_price_method,rec_name:"
-msgid "Name"
-msgstr "Name"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:product.configuration.default_cost_price_method,write_date:"
 msgid "Write Date"
@@ -125,10 +125,6 @@ msgctxt "field:product.cost_price,cost_price:"
 msgid "Cost Price"
 msgstr "Kostenpreis"
 
-msgctxt "field:product.cost_price,cost_price_method:"
-msgid "Cost Method"
-msgstr "Kostenmethode"
-
 msgctxt "field:product.cost_price,create_date:"
 msgid "Create Date"
 msgstr "Erstellungsdatum"
@@ -141,19 +137,63 @@ msgctxt "field:product.cost_price,id:"
 msgid "ID"
 msgstr "ID"
 
+#, fuzzy
+msgctxt "field:product.cost_price,product:"
+msgid "Product"
+msgstr "Artikel"
+
 msgctxt "field:product.cost_price,rec_name:"
-msgid "Name"
-msgstr "Name"
+msgid "Record Name"
+msgstr ""
+
+msgctxt "field:product.cost_price,write_date:"
+msgid "Write Date"
+msgstr "Zuletzt geändert"
+
+msgctxt "field:product.cost_price,write_uid:"
+msgid "Write User"
+msgstr "Letzte Änderung durch"
+
+#, fuzzy
+msgctxt "field:product.cost_price_method,company:"
+msgid "Company"
+msgstr "Unternehmen"
+
+msgctxt "field:product.cost_price_method,cost_price_method:"
+msgid "Cost Price Method"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:product.cost_price_method,create_date:"
+msgid "Create Date"
+msgstr "Erstellungsdatum"
+
+#, fuzzy
+msgctxt "field:product.cost_price_method,create_uid:"
+msgid "Create User"
+msgstr "Erstellt durch"
+
+#, fuzzy
+msgctxt "field:product.cost_price_method,id:"
+msgid "ID"
+msgstr "ID"
 
-msgctxt "field:product.cost_price,template:"
+msgctxt "field:product.cost_price_method,rec_name:"
+msgid "Record Name"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:product.cost_price_method,template:"
 msgid "Template"
 msgstr "Vorlage"
 
-msgctxt "field:product.cost_price,write_date:"
+#, fuzzy
+msgctxt "field:product.cost_price_method,write_date:"
 msgid "Write Date"
 msgstr "Zuletzt geändert"
 
-msgctxt "field:product.cost_price,write_uid:"
+#, fuzzy
+msgctxt "field:product.cost_price_method,write_uid:"
 msgid "Write User"
 msgstr "Letzte Änderung durch"
 
@@ -178,8 +218,8 @@ msgid "List Price"
 msgstr "Listenpreis"
 
 msgctxt "field:product.list_price,rec_name:"
-msgid "Name"
-msgstr "Name"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:product.list_price,template:"
 msgid "Template"
@@ -201,6 +241,11 @@ msgctxt "field:product.product,categories:"
 msgid "Categories"
 msgstr "Artikelkategorien"
 
+#, fuzzy
+msgctxt "field:product.product,categories_all:"
+msgid "Categories"
+msgstr "Artikelkategorien"
+
 msgctxt "field:product.product,code:"
 msgid "Code"
 msgstr "Variantennummer"
@@ -214,8 +259,12 @@ msgid "Cost Price"
 msgstr "Kostenpreis"
 
 msgctxt "field:product.product,cost_price_method:"
-msgid "Cost Method"
-msgstr "Kostenmethode"
+msgid "Cost Price Method"
+msgstr ""
+
+msgctxt "field:product.product,cost_price_methods:"
+msgid "Cost Price Methods"
+msgstr ""
 
 msgctxt "field:product.product,cost_price_uom:"
 msgid "Cost Price"
@@ -266,8 +315,8 @@ msgid "Name"
 msgstr "Name"
 
 msgctxt "field:product.product,rec_name:"
-msgid "Name"
-msgstr "Name"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:product.product,template:"
 msgid "Product Template"
@@ -293,6 +342,11 @@ msgctxt "field:product.template,categories:"
 msgid "Categories"
 msgstr "Artikelkategorien"
 
+#, fuzzy
+msgctxt "field:product.template,categories_all:"
+msgid "Categories"
+msgstr "Artikelkategorien"
+
 msgctxt "field:product.template,consumable:"
 msgid "Consumable"
 msgstr "Verbrauchsmaterial"
@@ -302,12 +356,12 @@ msgid "Cost Price"
 msgstr "Kostenpreis"
 
 msgctxt "field:product.template,cost_price_method:"
-msgid "Cost Method"
-msgstr "Kostenmethode"
+msgid "Cost Price Method"
+msgstr ""
 
-msgctxt "field:product.template,cost_prices:"
-msgid "Cost Prices"
-msgstr "Kostenpreis"
+msgctxt "field:product.template,cost_price_methods:"
+msgid "Cost Price Methods"
+msgstr ""
 
 msgctxt "field:product.template,create_date:"
 msgid "Create Date"
@@ -346,8 +400,8 @@ msgid "Variants"
 msgstr "Varianten"
 
 msgctxt "field:product.template,rec_name:"
-msgid "Name"
-msgstr "Name"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:product.template,type:"
 msgid "Type"
@@ -378,8 +432,8 @@ msgid "ID"
 msgstr "ID"
 
 msgctxt "field:product.template-product.category,rec_name:"
-msgid "Name"
-msgstr "Name"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:product.template-product.category,template:"
 msgid "Template"
@@ -393,6 +447,45 @@ msgctxt "field:product.template-product.category,write_uid:"
 msgid "Write User"
 msgstr "Letzte Änderung durch"
 
+#, fuzzy
+msgctxt "field:product.template-product.category.all,category:"
+msgid "Category"
+msgstr "Artikelkategorie"
+
+#, fuzzy
+msgctxt "field:product.template-product.category.all,create_date:"
+msgid "Create Date"
+msgstr "Erstellungsdatum"
+
+#, fuzzy
+msgctxt "field:product.template-product.category.all,create_uid:"
+msgid "Create User"
+msgstr "Erstellt durch"
+
+#, fuzzy
+msgctxt "field:product.template-product.category.all,id:"
+msgid "ID"
+msgstr "ID"
+
+msgctxt "field:product.template-product.category.all,rec_name:"
+msgid "Record Name"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:product.template-product.category.all,template:"
+msgid "Template"
+msgstr "Vorlage"
+
+#, fuzzy
+msgctxt "field:product.template-product.category.all,write_date:"
+msgid "Write Date"
+msgstr "Zuletzt geändert"
+
+#, fuzzy
+msgctxt "field:product.template-product.category.all,write_uid:"
+msgid "Write User"
+msgstr "Letzte Änderung durch"
+
 msgctxt "field:product.uom,active:"
 msgid "Active"
 msgstr "Aktiv"
@@ -430,8 +523,8 @@ msgid "Rate"
 msgstr "Kehrwert Faktor"
 
 msgctxt "field:product.uom,rec_name:"
-msgid "Name"
-msgstr "Name"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:product.uom,rounding:"
 msgid "Rounding Precision"
@@ -466,8 +559,8 @@ msgid "Name"
 msgstr "Name"
 
 msgctxt "field:product.uom.category,rec_name:"
-msgid "Name"
-msgstr "Name"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:product.uom.category,uoms:"
 msgid "Unit of Measures"
@@ -587,6 +680,10 @@ msgctxt "model:product.cost_price,name:"
 msgid "Product Cost Price"
 msgstr "Produkt Kostenpreis"
 
+msgctxt "model:product.cost_price_method,name:"
+msgid "Product Cost Price Method"
+msgstr ""
+
 msgctxt "model:product.list_price,name:"
 msgid "Product List Price"
 msgstr "Variante Listenpreis"
@@ -603,6 +700,11 @@ msgctxt "model:product.template-product.category,name:"
 msgid "Template - Category"
 msgstr "Artikel - Kategorie"
 
+#, fuzzy
+msgctxt "model:product.template-product.category.all,name:"
+msgid "Template - Category All"
+msgstr "Artikel - Kategorie"
+
 msgctxt "model:product.uom,name:"
 msgid "Unit of measure"
 msgstr "Maßeinheit"
diff --git a/locale/es.po b/locale/es.po
index 8d196e4..041c75e 100644
--- a/locale/es.po
+++ b/locale/es.po
@@ -1,4 +1,4 @@
-# 
+#
 msgid ""
 msgstr "Content-Type: text/plain; charset=utf-8\n"
 
@@ -49,8 +49,8 @@ msgid "Parent"
 msgstr "Padre"
 
 msgctxt "field:product.category,rec_name:"
-msgid "Name"
-msgstr "Nombre"
+msgid "Record Name"
+msgstr "Nombre del registro"
 
 msgctxt "field:product.category,write_date:"
 msgid "Write Date"
@@ -77,8 +77,8 @@ msgid "ID"
 msgstr "ID"
 
 msgctxt "field:product.configuration,rec_name:"
-msgid "Name"
-msgstr "Nombre"
+msgid "Record Name"
+msgstr "Nombre del registro"
 
 msgctxt "field:product.configuration,write_date:"
 msgid "Write Date"
@@ -106,8 +106,8 @@ msgid "ID"
 msgstr "ID"
 
 msgctxt "field:product.configuration.default_cost_price_method,rec_name:"
-msgid "Name"
-msgstr "Nombre"
+msgid "Record Name"
+msgstr "Nombre del registro"
 
 msgctxt "field:product.configuration.default_cost_price_method,write_date:"
 msgid "Write Date"
@@ -125,10 +125,6 @@ msgctxt "field:product.cost_price,cost_price:"
 msgid "Cost Price"
 msgstr "Precio de coste"
 
-msgctxt "field:product.cost_price,cost_price_method:"
-msgid "Cost Method"
-msgstr "Método de coste"
-
 msgctxt "field:product.cost_price,create_date:"
 msgid "Create Date"
 msgstr "Fecha de creación"
@@ -141,19 +137,55 @@ msgctxt "field:product.cost_price,id:"
 msgid "ID"
 msgstr "ID"
 
+msgctxt "field:product.cost_price,product:"
+msgid "Product"
+msgstr "Producto"
+
 msgctxt "field:product.cost_price,rec_name:"
-msgid "Name"
-msgstr "Nombre"
+msgid "Record Name"
+msgstr "Nombre del registro"
+
+msgctxt "field:product.cost_price,write_date:"
+msgid "Write Date"
+msgstr "Fecha de modificación"
+
+msgctxt "field:product.cost_price,write_uid:"
+msgid "Write User"
+msgstr "Usuario de modificación"
 
-msgctxt "field:product.cost_price,template:"
+msgctxt "field:product.cost_price_method,company:"
+msgid "Company"
+msgstr "Empresa"
+
+msgctxt "field:product.cost_price_method,cost_price_method:"
+msgid "Cost Price Method"
+msgstr "Método de costo"
+
+msgctxt "field:product.cost_price_method,create_date:"
+msgid "Create Date"
+msgstr "Fecha de creación"
+
+msgctxt "field:product.cost_price_method,create_uid:"
+msgid "Create User"
+msgstr "Usuario de creación"
+
+msgctxt "field:product.cost_price_method,id:"
+msgid "ID"
+msgstr "ID"
+
+msgctxt "field:product.cost_price_method,rec_name:"
+msgid "Record Name"
+msgstr "Nombre del registro"
+
+msgctxt "field:product.cost_price_method,template:"
 msgid "Template"
 msgstr "Plantilla"
 
-msgctxt "field:product.cost_price,write_date:"
+msgctxt "field:product.cost_price_method,write_date:"
 msgid "Write Date"
 msgstr "Fecha de modificación"
 
-msgctxt "field:product.cost_price,write_uid:"
+msgctxt "field:product.cost_price_method,write_uid:"
 msgid "Write User"
 msgstr "Usuario de modificación"
 
@@ -178,8 +210,8 @@ msgid "List Price"
 msgstr "Precio de venta"
 
 msgctxt "field:product.list_price,rec_name:"
-msgid "Name"
-msgstr "Nombre"
+msgid "Record Name"
+msgstr "Nombre del registro"
 
 msgctxt "field:product.list_price,template:"
 msgid "Template"
@@ -201,6 +233,10 @@ msgctxt "field:product.product,categories:"
 msgid "Categories"
 msgstr "Categorías"
 
+msgctxt "field:product.product,categories_all:"
+msgid "Categories"
+msgstr "Categorías"
+
 msgctxt "field:product.product,code:"
 msgid "Code"
 msgstr "Código"
@@ -214,9 +250,13 @@ msgid "Cost Price"
 msgstr "Precio de coste"
 
 msgctxt "field:product.product,cost_price_method:"
-msgid "Cost Method"
+msgid "Cost Price Method"
 msgstr "Método de coste"
 
+msgctxt "field:product.product,cost_price_methods:"
+msgid "Cost Price Methods"
+msgstr "Métodos de coste"
+
 msgctxt "field:product.product,cost_price_uom:"
 msgid "Cost Price"
 msgstr "Precio de coste"
@@ -266,8 +306,8 @@ msgid "Name"
 msgstr "Nombre"
 
 msgctxt "field:product.product,rec_name:"
-msgid "Name"
-msgstr "Nombre"
+msgid "Record Name"
+msgstr "Nombre del registro"
 
 msgctxt "field:product.product,template:"
 msgid "Product Template"
@@ -293,6 +333,10 @@ msgctxt "field:product.template,categories:"
 msgid "Categories"
 msgstr "Categorías"
 
+msgctxt "field:product.template,categories_all:"
+msgid "Categories"
+msgstr "Categorías"
+
 msgctxt "field:product.template,consumable:"
 msgid "Consumable"
 msgstr "Consumible"
@@ -302,12 +346,12 @@ msgid "Cost Price"
 msgstr "Precio de coste"
 
 msgctxt "field:product.template,cost_price_method:"
-msgid "Cost Method"
+msgid "Cost Price Method"
 msgstr "Método de coste"
 
-msgctxt "field:product.template,cost_prices:"
-msgid "Cost Prices"
-msgstr "Precio de coste"
+msgctxt "field:product.template,cost_price_methods:"
+msgid "Cost Price Methods"
+msgstr "Métodos de coste"
 
 msgctxt "field:product.template,create_date:"
 msgid "Create Date"
@@ -346,8 +390,8 @@ msgid "Variants"
 msgstr "Variantes"
 
 msgctxt "field:product.template,rec_name:"
-msgid "Name"
-msgstr "Nombre"
+msgid "Record Name"
+msgstr "Nombre del registro"
 
 msgctxt "field:product.template,type:"
 msgid "Type"
@@ -378,8 +422,8 @@ msgid "ID"
 msgstr "ID"
 
 msgctxt "field:product.template-product.category,rec_name:"
-msgid "Name"
-msgstr "Nombre"
+msgid "Record Name"
+msgstr "Nombre del registro"
 
 msgctxt "field:product.template-product.category,template:"
 msgid "Template"
@@ -393,6 +437,38 @@ msgctxt "field:product.template-product.category,write_uid:"
 msgid "Write User"
 msgstr "Usuario de modificación"
 
+msgctxt "field:product.template-product.category.all,category:"
+msgid "Category"
+msgstr "Categoría"
+
+msgctxt "field:product.template-product.category.all,create_date:"
+msgid "Create Date"
+msgstr "Fecha de creación"
+
+msgctxt "field:product.template-product.category.all,create_uid:"
+msgid "Create User"
+msgstr "Usuario de creación"
+
+msgctxt "field:product.template-product.category.all,id:"
+msgid "ID"
+msgstr "ID"
+
+msgctxt "field:product.template-product.category.all,rec_name:"
+msgid "Record Name"
+msgstr "Nombre del registro"
+
+msgctxt "field:product.template-product.category.all,template:"
+msgid "Template"
+msgstr "Plantilla"
+
+msgctxt "field:product.template-product.category.all,write_date:"
+msgid "Write Date"
+msgstr "Fecha de modificación"
+
+msgctxt "field:product.template-product.category.all,write_uid:"
+msgid "Write User"
+msgstr "Usuario de modificación"
+
 msgctxt "field:product.uom,active:"
 msgid "Active"
 msgstr "Activo"
@@ -430,8 +506,8 @@ msgid "Rate"
 msgstr "Conversión"
 
 msgctxt "field:product.uom,rec_name:"
-msgid "Name"
-msgstr "Nombre"
+msgid "Record Name"
+msgstr "Nombre del registro"
 
 msgctxt "field:product.uom,rounding:"
 msgid "Rounding Precision"
@@ -466,8 +542,8 @@ msgid "Name"
 msgstr "Nombre"
 
 msgctxt "field:product.uom.category,rec_name:"
-msgid "Name"
-msgstr "Nombre"
+msgid "Record Name"
+msgstr "Nombre del registro"
 
 msgctxt "field:product.uom.category,uoms:"
 msgid "Unit of Measures"
@@ -585,6 +661,10 @@ msgctxt "model:product.cost_price,name:"
 msgid "Product Cost Price"
 msgstr "Precio de coste del producto"
 
+msgctxt "model:product.cost_price_method,name:"
+msgid "Product Cost Price Method"
+msgstr "Método de coste por producto"
+
 msgctxt "model:product.list_price,name:"
 msgid "Product List Price"
 msgstr "Precio de venta del producto"
@@ -601,6 +681,10 @@ msgctxt "model:product.template-product.category,name:"
 msgid "Template - Category"
 msgstr "Plantilla - Categoría"
 
+msgctxt "model:product.template-product.category.all,name:"
+msgid "Template - Category All"
+msgstr "Plantilla - Todas las categorías"
+
 msgctxt "model:product.uom,name:"
 msgid "Unit of measure"
 msgstr "Unidad de medida"
diff --git a/locale/es_419.po b/locale/es_419.po
index ff9bb92..5c9e5a5 100644
--- a/locale/es_419.po
+++ b/locale/es_419.po
@@ -1,4 +1,4 @@
-# 
+#
 msgid ""
 msgstr "Content-Type: text/plain; charset=utf-8\n"
 
@@ -46,7 +46,7 @@ msgid "Parent"
 msgstr ""
 
 msgctxt "field:product.category,rec_name:"
-msgid "Name"
+msgid "Record Name"
 msgstr ""
 
 msgctxt "field:product.category,write_date:"
@@ -74,7 +74,7 @@ msgid "ID"
 msgstr ""
 
 msgctxt "field:product.configuration,rec_name:"
-msgid "Name"
+msgid "Record Name"
 msgstr ""
 
 msgctxt "field:product.configuration,write_date:"
@@ -105,7 +105,7 @@ msgid "ID"
 msgstr ""
 
 msgctxt "field:product.configuration.default_cost_price_method,rec_name:"
-msgid "Name"
+msgid "Record Name"
 msgstr ""
 
 msgctxt "field:product.configuration.default_cost_price_method,write_date:"
@@ -126,11 +126,6 @@ msgctxt "field:product.cost_price,cost_price:"
 msgid "Cost Price"
 msgstr "Precio de costo"
 
-#, fuzzy
-msgctxt "field:product.cost_price,cost_price_method:"
-msgid "Cost Method"
-msgstr "Método de costo"
-
 msgctxt "field:product.cost_price,create_date:"
 msgid "Create Date"
 msgstr ""
@@ -144,12 +139,12 @@ msgctxt "field:product.cost_price,id:"
 msgid "ID"
 msgstr ""
 
-msgctxt "field:product.cost_price,rec_name:"
-msgid "Name"
+msgctxt "field:product.cost_price,product:"
+msgid "Product"
 msgstr ""
 
-msgctxt "field:product.cost_price,template:"
-msgid "Template"
+msgctxt "field:product.cost_price,rec_name:"
+msgid "Record Name"
 msgstr ""
 
 msgctxt "field:product.cost_price,write_date:"
@@ -161,6 +156,44 @@ msgctxt "field:product.cost_price,write_uid:"
 msgid "Write User"
 msgstr "Modificado por usuario"
 
+msgctxt "field:product.cost_price_method,company:"
+msgid "Company"
+msgstr ""
+
+msgctxt "field:product.cost_price_method,cost_price_method:"
+msgid "Cost Price Method"
+msgstr ""
+
+msgctxt "field:product.cost_price_method,create_date:"
+msgid "Create Date"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:product.cost_price_method,create_uid:"
+msgid "Create User"
+msgstr "Creado por usuario"
+
+msgctxt "field:product.cost_price_method,id:"
+msgid "ID"
+msgstr ""
+
+msgctxt "field:product.cost_price_method,rec_name:"
+msgid "Record Name"
+msgstr ""
+
+msgctxt "field:product.cost_price_method,template:"
+msgid "Template"
+msgstr ""
+
+msgctxt "field:product.cost_price_method,write_date:"
+msgid "Write Date"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:product.cost_price_method,write_uid:"
+msgid "Write User"
+msgstr "Modificado por usuario"
+
 msgctxt "field:product.list_price,company:"
 msgid "Company"
 msgstr ""
@@ -184,7 +217,7 @@ msgid "List Price"
 msgstr "Precio de costo"
 
 msgctxt "field:product.list_price,rec_name:"
-msgid "Name"
+msgid "Record Name"
 msgstr ""
 
 msgctxt "field:product.list_price,template:"
@@ -209,6 +242,11 @@ msgctxt "field:product.product,categories:"
 msgid "Categories"
 msgstr "Categorías"
 
+#, fuzzy
+msgctxt "field:product.product,categories_all:"
+msgid "Categories"
+msgstr "Categorías"
+
 msgctxt "field:product.product,code:"
 msgid "Code"
 msgstr ""
@@ -222,8 +260,12 @@ msgid "Cost Price"
 msgstr "Precio de costo"
 
 msgctxt "field:product.product,cost_price_method:"
-msgid "Cost Method"
-msgstr "Método de costo"
+msgid "Cost Price Method"
+msgstr ""
+
+msgctxt "field:product.product,cost_price_methods:"
+msgid "Cost Price Methods"
+msgstr ""
 
 msgctxt "field:product.product,cost_price_uom:"
 msgid "Cost Price"
@@ -278,7 +320,7 @@ msgid "Name"
 msgstr ""
 
 msgctxt "field:product.product,rec_name:"
-msgid "Name"
+msgid "Record Name"
 msgstr ""
 
 msgctxt "field:product.product,template:"
@@ -306,6 +348,11 @@ msgctxt "field:product.template,categories:"
 msgid "Categories"
 msgstr "Categorías"
 
+#, fuzzy
+msgctxt "field:product.template,categories_all:"
+msgid "Categories"
+msgstr "Categorías"
+
 msgctxt "field:product.template,consumable:"
 msgid "Consumable"
 msgstr ""
@@ -315,13 +362,12 @@ msgid "Cost Price"
 msgstr "Precio de costo"
 
 msgctxt "field:product.template,cost_price_method:"
-msgid "Cost Method"
-msgstr "Método de costo"
+msgid "Cost Price Method"
+msgstr ""
 
-#, fuzzy
-msgctxt "field:product.template,cost_prices:"
-msgid "Cost Prices"
-msgstr "Precio de costo"
+msgctxt "field:product.template,cost_price_methods:"
+msgid "Cost Price Methods"
+msgstr ""
 
 msgctxt "field:product.template,create_date:"
 msgid "Create Date"
@@ -363,7 +409,7 @@ msgid "Variants"
 msgstr "Variantes"
 
 msgctxt "field:product.template,rec_name:"
-msgid "Name"
+msgid "Record Name"
 msgstr ""
 
 msgctxt "field:product.template,type:"
@@ -395,7 +441,7 @@ msgid "ID"
 msgstr ""
 
 msgctxt "field:product.template-product.category,rec_name:"
-msgid "Name"
+msgid "Record Name"
 msgstr ""
 
 msgctxt "field:product.template-product.category,template:"
@@ -410,6 +456,40 @@ msgctxt "field:product.template-product.category,write_uid:"
 msgid "Write User"
 msgstr "Modificado por usuario"
 
+msgctxt "field:product.template-product.category.all,category:"
+msgid "Category"
+msgstr ""
+
+msgctxt "field:product.template-product.category.all,create_date:"
+msgid "Create Date"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:product.template-product.category.all,create_uid:"
+msgid "Create User"
+msgstr "Creado por usuario"
+
+msgctxt "field:product.template-product.category.all,id:"
+msgid "ID"
+msgstr ""
+
+msgctxt "field:product.template-product.category.all,rec_name:"
+msgid "Record Name"
+msgstr ""
+
+msgctxt "field:product.template-product.category.all,template:"
+msgid "Template"
+msgstr ""
+
+msgctxt "field:product.template-product.category.all,write_date:"
+msgid "Write Date"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:product.template-product.category.all,write_uid:"
+msgid "Write User"
+msgstr "Modificado por usuario"
+
 msgctxt "field:product.uom,active:"
 msgid "Active"
 msgstr ""
@@ -447,7 +527,7 @@ msgid "Rate"
 msgstr ""
 
 msgctxt "field:product.uom,rec_name:"
-msgid "Name"
+msgid "Record Name"
 msgstr ""
 
 msgctxt "field:product.uom,rounding:"
@@ -483,7 +563,7 @@ msgid "Name"
 msgstr ""
 
 msgctxt "field:product.uom.category,rec_name:"
-msgid "Name"
+msgid "Record Name"
 msgstr ""
 
 msgctxt "field:product.uom.category,uoms:"
@@ -606,6 +686,10 @@ msgctxt "model:product.cost_price,name:"
 msgid "Product Cost Price"
 msgstr ""
 
+msgctxt "model:product.cost_price_method,name:"
+msgid "Product Cost Price Method"
+msgstr ""
+
 msgctxt "model:product.list_price,name:"
 msgid "Product List Price"
 msgstr ""
@@ -622,6 +706,10 @@ msgctxt "model:product.template-product.category,name:"
 msgid "Template - Category"
 msgstr ""
 
+msgctxt "model:product.template-product.category.all,name:"
+msgid "Template - Category All"
+msgstr ""
+
 msgctxt "model:product.uom,name:"
 msgid "Unit of measure"
 msgstr ""
diff --git a/locale/fr.po b/locale/fr.po
index 36e4b9f..163a076 100644
--- a/locale/fr.po
+++ b/locale/fr.po
@@ -1,4 +1,4 @@
-# 
+#
 msgid ""
 msgstr "Content-Type: text/plain; charset=utf-8\n"
 
@@ -49,8 +49,8 @@ msgid "Parent"
 msgstr "Parent"
 
 msgctxt "field:product.category,rec_name:"
-msgid "Name"
-msgstr "Nom"
+msgid "Record Name"
+msgstr "Nom de l'enregistrement"
 
 msgctxt "field:product.category,write_date:"
 msgid "Write Date"
@@ -77,8 +77,8 @@ msgid "ID"
 msgstr "ID"
 
 msgctxt "field:product.configuration,rec_name:"
-msgid "Name"
-msgstr "Nom"
+msgid "Record Name"
+msgstr "Nom de l'enregistrement"
 
 msgctxt "field:product.configuration,write_date:"
 msgid "Write Date"
@@ -106,8 +106,8 @@ msgid "ID"
 msgstr "ID"
 
 msgctxt "field:product.configuration.default_cost_price_method,rec_name:"
-msgid "Name"
-msgstr "Nom"
+msgid "Record Name"
+msgstr "Nom de l'enregistrement"
 
 msgctxt "field:product.configuration.default_cost_price_method,write_date:"
 msgid "Write Date"
@@ -125,10 +125,6 @@ msgctxt "field:product.cost_price,cost_price:"
 msgid "Cost Price"
 msgstr "Prix de revient"
 
-msgctxt "field:product.cost_price,cost_price_method:"
-msgid "Cost Method"
-msgstr "Méthode de coût"
-
 msgctxt "field:product.cost_price,create_date:"
 msgid "Create Date"
 msgstr "Date de création"
@@ -141,19 +137,55 @@ msgctxt "field:product.cost_price,id:"
 msgid "ID"
 msgstr "ID"
 
+msgctxt "field:product.cost_price,product:"
+msgid "Product"
+msgstr "Produit"
+
 msgctxt "field:product.cost_price,rec_name:"
-msgid "Name"
-msgstr "Nom"
+msgid "Record Name"
+msgstr "Nom de l'enregistrement"
+
+msgctxt "field:product.cost_price,write_date:"
+msgid "Write Date"
+msgstr "Date de mise à jour"
 
-msgctxt "field:product.cost_price,template:"
+msgctxt "field:product.cost_price,write_uid:"
+msgid "Write User"
+msgstr "Mis à jour par"
+
+msgctxt "field:product.cost_price_method,company:"
+msgid "Company"
+msgstr "Société"
+
+msgctxt "field:product.cost_price_method,cost_price_method:"
+msgid "Cost Price Method"
+msgstr "Méthode de prix de revient"
+
+msgctxt "field:product.cost_price_method,create_date:"
+msgid "Create Date"
+msgstr "Date de création"
+
+msgctxt "field:product.cost_price_method,create_uid:"
+msgid "Create User"
+msgstr "Créé par"
+
+msgctxt "field:product.cost_price_method,id:"
+msgid "ID"
+msgstr "ID"
+
+msgctxt "field:product.cost_price_method,rec_name:"
+msgid "Record Name"
+msgstr "Nom de l'enregistrement"
+
+msgctxt "field:product.cost_price_method,template:"
 msgid "Template"
 msgstr "Modèle"
 
-msgctxt "field:product.cost_price,write_date:"
+msgctxt "field:product.cost_price_method,write_date:"
 msgid "Write Date"
 msgstr "Date de mise à jour"
 
-msgctxt "field:product.cost_price,write_uid:"
+msgctxt "field:product.cost_price_method,write_uid:"
 msgid "Write User"
 msgstr "Mis à jour par"
 
@@ -178,8 +210,8 @@ msgid "List Price"
 msgstr "Prix listé"
 
 msgctxt "field:product.list_price,rec_name:"
-msgid "Name"
-msgstr "Nom"
+msgid "Record Name"
+msgstr "Nom de l'enregistrement"
 
 msgctxt "field:product.list_price,template:"
 msgid "Template"
@@ -201,6 +233,10 @@ msgctxt "field:product.product,categories:"
 msgid "Categories"
 msgstr "Catégories"
 
+msgctxt "field:product.product,categories_all:"
+msgid "Categories"
+msgstr "Catégories"
+
 msgctxt "field:product.product,code:"
 msgid "Code"
 msgstr "Code"
@@ -214,8 +250,12 @@ msgid "Cost Price"
 msgstr "Prix de revient"
 
 msgctxt "field:product.product,cost_price_method:"
-msgid "Cost Method"
-msgstr "Méthode de coût"
+msgid "Cost Price Method"
+msgstr "Méthode de prix de revient"
+
+msgctxt "field:product.product,cost_price_methods:"
+msgid "Cost Price Methods"
+msgstr "Méthodes de prix de revient"
 
 msgctxt "field:product.product,cost_price_uom:"
 msgid "Cost Price"
@@ -266,8 +306,8 @@ msgid "Name"
 msgstr "Nom"
 
 msgctxt "field:product.product,rec_name:"
-msgid "Name"
-msgstr "Nom"
+msgid "Record Name"
+msgstr "Nom de l'enregistrement"
 
 msgctxt "field:product.product,template:"
 msgid "Product Template"
@@ -293,6 +333,10 @@ msgctxt "field:product.template,categories:"
 msgid "Categories"
 msgstr "Catégories"
 
+msgctxt "field:product.template,categories_all:"
+msgid "Categories"
+msgstr "Catégories"
+
 msgctxt "field:product.template,consumable:"
 msgid "Consumable"
 msgstr "Consommable"
@@ -302,12 +346,12 @@ msgid "Cost Price"
 msgstr "Prix de revient"
 
 msgctxt "field:product.template,cost_price_method:"
-msgid "Cost Method"
-msgstr "Méthode de coût"
+msgid "Cost Price Method"
+msgstr "Méthode de prix de revient"
 
-msgctxt "field:product.template,cost_prices:"
-msgid "Cost Prices"
-msgstr "Prix de revient"
+msgctxt "field:product.template,cost_price_methods:"
+msgid "Cost Price Methods"
+msgstr "Méthodes de prix de revient"
 
 msgctxt "field:product.template,create_date:"
 msgid "Create Date"
@@ -346,8 +390,8 @@ msgid "Variants"
 msgstr "Variantes"
 
 msgctxt "field:product.template,rec_name:"
-msgid "Name"
-msgstr "Nom"
+msgid "Record Name"
+msgstr "Nom de l'enregistrement"
 
 msgctxt "field:product.template,type:"
 msgid "Type"
@@ -378,8 +422,8 @@ msgid "ID"
 msgstr "ID"
 
 msgctxt "field:product.template-product.category,rec_name:"
-msgid "Name"
-msgstr "Nom"
+msgid "Record Name"
+msgstr "Nom de l'enregistrement"
 
 msgctxt "field:product.template-product.category,template:"
 msgid "Template"
@@ -393,6 +437,38 @@ msgctxt "field:product.template-product.category,write_uid:"
 msgid "Write User"
 msgstr "Mis à jour par"
 
+msgctxt "field:product.template-product.category.all,category:"
+msgid "Category"
+msgstr "Catégorie"
+
+msgctxt "field:product.template-product.category.all,create_date:"
+msgid "Create Date"
+msgstr "Date de création"
+
+msgctxt "field:product.template-product.category.all,create_uid:"
+msgid "Create User"
+msgstr "Créé par"
+
+msgctxt "field:product.template-product.category.all,id:"
+msgid "ID"
+msgstr "ID"
+
+msgctxt "field:product.template-product.category.all,rec_name:"
+msgid "Record Name"
+msgstr "Nom de l'enregistrement"
+
+msgctxt "field:product.template-product.category.all,template:"
+msgid "Template"
+msgstr "Modèle"
+
+msgctxt "field:product.template-product.category.all,write_date:"
+msgid "Write Date"
+msgstr "Date de mise à jour"
+
+msgctxt "field:product.template-product.category.all,write_uid:"
+msgid "Write User"
+msgstr "Mis à jour par"
+
 msgctxt "field:product.uom,active:"
 msgid "Active"
 msgstr "Actif"
@@ -430,8 +506,8 @@ msgid "Rate"
 msgstr "Taux"
 
 msgctxt "field:product.uom,rec_name:"
-msgid "Name"
-msgstr "Nom"
+msgid "Record Name"
+msgstr "Nom de l'enregistrement"
 
 msgctxt "field:product.uom,rounding:"
 msgid "Rounding Precision"
@@ -466,8 +542,8 @@ msgid "Name"
 msgstr "Nom"
 
 msgctxt "field:product.uom.category,rec_name:"
-msgid "Name"
-msgstr "Nom"
+msgid "Record Name"
+msgstr "Nom de l'enregistrement"
 
 msgctxt "field:product.uom.category,uoms:"
 msgid "Unit of Measures"
@@ -585,6 +661,10 @@ msgctxt "model:product.cost_price,name:"
 msgid "Product Cost Price"
 msgstr "Produit Prix de revient"
 
+msgctxt "model:product.cost_price_method,name:"
+msgid "Product Cost Price Method"
+msgstr "Méthode de prix de revient de produit"
+
 msgctxt "model:product.list_price,name:"
 msgid "Product List Price"
 msgstr "Produit Prix listé"
@@ -601,6 +681,10 @@ msgctxt "model:product.template-product.category,name:"
 msgid "Template - Category"
 msgstr "Modèle - Catégorie"
 
+msgctxt "model:product.template-product.category.all,name:"
+msgid "Template - Category All"
+msgstr "Modèle - Catégorie Toutes"
+
 msgctxt "model:product.uom,name:"
 msgid "Unit of measure"
 msgstr "Unité de mesure"
diff --git a/locale/hu_HU.po b/locale/hu_HU.po
index 944ea02..04b1715 100644
--- a/locale/hu_HU.po
+++ b/locale/hu_HU.po
@@ -1,4 +1,4 @@
-# 
+#
 msgid ""
 msgstr "Content-Type: text/plain; charset=utf-8\n"
 
@@ -50,8 +50,8 @@ msgid "Parent"
 msgstr "Fölérendelt (kategória)"
 
 msgctxt "field:product.category,rec_name:"
-msgid "Name"
-msgstr "Név"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:product.category,write_date:"
 msgid "Write Date"
@@ -80,10 +80,9 @@ msgctxt "field:product.configuration,id:"
 msgid "ID"
 msgstr "ID"
 
-#, fuzzy
 msgctxt "field:product.configuration,rec_name:"
-msgid "Name"
-msgstr "Név"
+msgid "Record Name"
+msgstr ""
 
 #, fuzzy
 msgctxt "field:product.configuration,write_date:"
@@ -115,10 +114,9 @@ msgctxt "field:product.configuration.default_cost_price_method,id:"
 msgid "ID"
 msgstr "ID"
 
-#, fuzzy
 msgctxt "field:product.configuration.default_cost_price_method,rec_name:"
-msgid "Name"
-msgstr "Név"
+msgid "Record Name"
+msgstr ""
 
 #, fuzzy
 msgctxt "field:product.configuration.default_cost_price_method,write_date:"
@@ -140,11 +138,6 @@ msgid "Cost Price"
 msgstr "Beszerzési ár"
 
 #, fuzzy
-msgctxt "field:product.cost_price,cost_price_method:"
-msgid "Cost Method"
-msgstr "Költségmódszer"
-
-#, fuzzy
 msgctxt "field:product.cost_price,create_date:"
 msgid "Create Date"
 msgstr "Létrehozás dátuma"
@@ -160,22 +153,63 @@ msgid "ID"
 msgstr "ID"
 
 #, fuzzy
+msgctxt "field:product.cost_price,product:"
+msgid "Product"
+msgstr "Cikk"
+
 msgctxt "field:product.cost_price,rec_name:"
-msgid "Name"
-msgstr "Név"
+msgid "Record Name"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:product.cost_price,write_date:"
+msgid "Write Date"
+msgstr "Utolsó módosítás dátuma"
 
 #, fuzzy
-msgctxt "field:product.cost_price,template:"
+msgctxt "field:product.cost_price,write_uid:"
+msgid "Write User"
+msgstr "Által módosítva"
+
+msgctxt "field:product.cost_price_method,company:"
+msgid "Company"
+msgstr ""
+
+msgctxt "field:product.cost_price_method,cost_price_method:"
+msgid "Cost Price Method"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:product.cost_price_method,create_date:"
+msgid "Create Date"
+msgstr "Létrehozás dátuma"
+
+#, fuzzy
+msgctxt "field:product.cost_price_method,create_uid:"
+msgid "Create User"
+msgstr "Által létrehozva"
+
+#, fuzzy
+msgctxt "field:product.cost_price_method,id:"
+msgid "ID"
+msgstr "ID"
+
+msgctxt "field:product.cost_price_method,rec_name:"
+msgid "Record Name"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:product.cost_price_method,template:"
 msgid "Template"
 msgstr "Űrlap adószámlához"
 
 #, fuzzy
-msgctxt "field:product.cost_price,write_date:"
+msgctxt "field:product.cost_price_method,write_date:"
 msgid "Write Date"
 msgstr "Utolsó módosítás dátuma"
 
 #, fuzzy
-msgctxt "field:product.cost_price,write_uid:"
+msgctxt "field:product.cost_price_method,write_uid:"
 msgid "Write User"
 msgstr "Által módosítva"
 
@@ -203,10 +237,9 @@ msgctxt "field:product.list_price,list_price:"
 msgid "List Price"
 msgstr "Árlista szerinti ár"
 
-#, fuzzy
 msgctxt "field:product.list_price,rec_name:"
-msgid "Name"
-msgstr "Név"
+msgid "Record Name"
+msgstr ""
 
 #, fuzzy
 msgctxt "field:product.list_price,template:"
@@ -232,6 +265,11 @@ msgctxt "field:product.product,categories:"
 msgid "Categories"
 msgstr "Cikk kategória"
 
+#, fuzzy
+msgctxt "field:product.product,categories_all:"
+msgid "Categories"
+msgstr "Cikk kategória"
+
 msgctxt "field:product.product,code:"
 msgid "Code"
 msgstr "Cikkszám"
@@ -246,10 +284,13 @@ 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"
+msgid "Cost Price Method"
+msgstr ""
+
+msgctxt "field:product.product,cost_price_methods:"
+msgid "Cost Price Methods"
+msgstr ""
 
 msgctxt "field:product.product,cost_price_uom:"
 msgid "Cost Price"
@@ -305,8 +346,8 @@ msgid "Name"
 msgstr "Név"
 
 msgctxt "field:product.product,rec_name:"
-msgid "Name"
-msgstr "Név"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:product.product,template:"
 msgid "Product Template"
@@ -333,6 +374,11 @@ msgctxt "field:product.template,categories:"
 msgid "Categories"
 msgstr "Cikk kategória"
 
+#, fuzzy
+msgctxt "field:product.template,categories_all:"
+msgid "Categories"
+msgstr "Cikk kategória"
+
 msgctxt "field:product.template,consumable:"
 msgid "Consumable"
 msgstr "Felhasznált anyag"
@@ -342,13 +388,12 @@ msgid "Cost Price"
 msgstr "Beszerzési ár"
 
 msgctxt "field:product.template,cost_price_method:"
-msgid "Cost Method"
-msgstr "Költségmódszer"
+msgid "Cost Price Method"
+msgstr ""
 
-#, fuzzy
-msgctxt "field:product.template,cost_prices:"
-msgid "Cost Prices"
-msgstr "Beszerzési ár"
+msgctxt "field:product.template,cost_price_methods:"
+msgid "Cost Price Methods"
+msgstr ""
 
 msgctxt "field:product.template,create_date:"
 msgid "Create Date"
@@ -388,8 +433,8 @@ msgid "Variants"
 msgstr "Változat"
 
 msgctxt "field:product.template,rec_name:"
-msgid "Name"
-msgstr "Név"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:product.template,type:"
 msgid "Type"
@@ -423,10 +468,9 @@ 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"
+msgid "Record Name"
+msgstr ""
 
 #, fuzzy
 msgctxt "field:product.template-product.category,template:"
@@ -443,6 +487,45 @@ msgctxt "field:product.template-product.category,write_uid:"
 msgid "Write User"
 msgstr "Által módosítva"
 
+#, fuzzy
+msgctxt "field:product.template-product.category.all,category:"
+msgid "Category"
+msgstr "Cikk kategória"
+
+#, fuzzy
+msgctxt "field:product.template-product.category.all,create_date:"
+msgid "Create Date"
+msgstr "Létrehozás dátuma"
+
+#, fuzzy
+msgctxt "field:product.template-product.category.all,create_uid:"
+msgid "Create User"
+msgstr "Által létrehozva"
+
+#, fuzzy
+msgctxt "field:product.template-product.category.all,id:"
+msgid "ID"
+msgstr "ID"
+
+msgctxt "field:product.template-product.category.all,rec_name:"
+msgid "Record Name"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:product.template-product.category.all,template:"
+msgid "Template"
+msgstr "Űrlap adószámlához"
+
+#, fuzzy
+msgctxt "field:product.template-product.category.all,write_date:"
+msgid "Write Date"
+msgstr "Utolsó módosítás dátuma"
+
+#, fuzzy
+msgctxt "field:product.template-product.category.all,write_uid:"
+msgid "Write User"
+msgstr "Által módosítva"
+
 msgctxt "field:product.uom,active:"
 msgid "Active"
 msgstr "Aktív"
@@ -480,8 +563,8 @@ msgid "Rate"
 msgstr "Mérték"
 
 msgctxt "field:product.uom,rec_name:"
-msgid "Name"
-msgstr "Név"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:product.uom,rounding:"
 msgid "Rounding Precision"
@@ -516,8 +599,8 @@ msgid "Name"
 msgstr "Név"
 
 msgctxt "field:product.uom.category,rec_name:"
-msgid "Name"
-msgstr "Név"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:product.uom.category,uoms:"
 msgid "Unit of Measures"
@@ -639,6 +722,10 @@ msgctxt "model:product.cost_price,name:"
 msgid "Product Cost Price"
 msgstr ""
 
+msgctxt "model:product.cost_price_method,name:"
+msgid "Product Cost Price Method"
+msgstr ""
+
 msgctxt "model:product.list_price,name:"
 msgid "Product List Price"
 msgstr ""
@@ -655,6 +742,10 @@ msgctxt "model:product.template-product.category,name:"
 msgid "Template - Category"
 msgstr ""
 
+msgctxt "model:product.template-product.category.all,name:"
+msgid "Template - Category All"
+msgstr ""
+
 msgctxt "model:product.uom,name:"
 msgid "Unit of measure"
 msgstr "Mértékegység"
diff --git a/locale/it_IT.po b/locale/it_IT.po
index 396b620..0cbe9ba 100644
--- a/locale/it_IT.po
+++ b/locale/it_IT.po
@@ -1,4 +1,4 @@
-# 
+#
 msgid ""
 msgstr "Content-Type: text/plain; charset=utf-8\n"
 
@@ -50,10 +50,9 @@ msgctxt "field:product.category,parent:"
 msgid "Parent"
 msgstr "Parte"
 
-#, fuzzy
 msgctxt "field:product.category,rec_name:"
-msgid "Name"
-msgstr "Nome"
+msgid "Record Name"
+msgstr ""
 
 #, fuzzy
 msgctxt "field:product.category,write_date:"
@@ -84,10 +83,9 @@ msgctxt "field:product.configuration,id:"
 msgid "ID"
 msgstr "Movimento contabile"
 
-#, fuzzy
 msgctxt "field:product.configuration,rec_name:"
-msgid "Name"
-msgstr "Nome"
+msgid "Record Name"
+msgstr ""
 
 #, fuzzy
 msgctxt "field:product.configuration,write_date:"
@@ -119,10 +117,9 @@ msgctxt "field:product.configuration.default_cost_price_method,id:"
 msgid "ID"
 msgstr "Movimento contabile"
 
-#, fuzzy
 msgctxt "field:product.configuration.default_cost_price_method,rec_name:"
-msgid "Name"
-msgstr "Nome"
+msgid "Record Name"
+msgstr ""
 
 #, fuzzy
 msgctxt "field:product.configuration.default_cost_price_method,write_date:"
@@ -142,10 +139,6 @@ msgctxt "field:product.cost_price,cost_price:"
 msgid "Cost Price"
 msgstr ""
 
-msgctxt "field:product.cost_price,cost_price_method:"
-msgid "Cost Method"
-msgstr ""
-
 #, fuzzy
 msgctxt "field:product.cost_price,create_date:"
 msgid "Create Date"
@@ -162,12 +155,12 @@ msgid "ID"
 msgstr "Movimento contabile"
 
 #, fuzzy
-msgctxt "field:product.cost_price,rec_name:"
-msgid "Name"
-msgstr "Nome"
+msgctxt "field:product.cost_price,product:"
+msgid "Product"
+msgstr "Prodotto"
 
-msgctxt "field:product.cost_price,template:"
-msgid "Template"
+msgctxt "field:product.cost_price,rec_name:"
+msgid "Record Name"
 msgstr ""
 
 #, fuzzy
@@ -180,6 +173,47 @@ msgctxt "field:product.cost_price,write_uid:"
 msgid "Write User"
 msgstr "modificato da"
 
+msgctxt "field:product.cost_price_method,company:"
+msgid "Company"
+msgstr ""
+
+msgctxt "field:product.cost_price_method,cost_price_method:"
+msgid "Cost Price Method"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:product.cost_price_method,create_date:"
+msgid "Create Date"
+msgstr "Data di creazione"
+
+#, fuzzy
+msgctxt "field:product.cost_price_method,create_uid:"
+msgid "Create User"
+msgstr "Utente creazione"
+
+#, fuzzy
+msgctxt "field:product.cost_price_method,id:"
+msgid "ID"
+msgstr "Movimento contabile"
+
+msgctxt "field:product.cost_price_method,rec_name:"
+msgid "Record Name"
+msgstr ""
+
+msgctxt "field:product.cost_price_method,template:"
+msgid "Template"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:product.cost_price_method,write_date:"
+msgid "Write Date"
+msgstr "Utente scrittura"
+
+#, fuzzy
+msgctxt "field:product.cost_price_method,write_uid:"
+msgid "Write User"
+msgstr "modificato da"
+
 msgctxt "field:product.list_price,company:"
 msgid "Company"
 msgstr ""
@@ -203,10 +237,9 @@ msgctxt "field:product.list_price,list_price:"
 msgid "List Price"
 msgstr ""
 
-#, fuzzy
 msgctxt "field:product.list_price,rec_name:"
-msgid "Name"
-msgstr "Nome"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:product.list_price,template:"
 msgid "Template"
@@ -233,6 +266,11 @@ msgid "Categories"
 msgstr "Categorie"
 
 #, fuzzy
+msgctxt "field:product.product,categories_all:"
+msgid "Categories"
+msgstr "Categorie"
+
+#, fuzzy
 msgctxt "field:product.product,code:"
 msgid "Code"
 msgstr "Codice"
@@ -246,7 +284,11 @@ msgid "Cost Price"
 msgstr ""
 
 msgctxt "field:product.product,cost_price_method:"
-msgid "Cost Method"
+msgid "Cost Price Method"
+msgstr ""
+
+msgctxt "field:product.product,cost_price_methods:"
+msgid "Cost Price Methods"
 msgstr ""
 
 msgctxt "field:product.product,cost_price_uom:"
@@ -302,10 +344,9 @@ msgctxt "field:product.product,name:"
 msgid "Name"
 msgstr "Nome"
 
-#, fuzzy
 msgctxt "field:product.product,rec_name:"
-msgid "Name"
-msgstr "Nome"
+msgid "Record Name"
+msgstr ""
 
 #, fuzzy
 msgctxt "field:product.product,template:"
@@ -337,6 +378,11 @@ msgctxt "field:product.template,categories:"
 msgid "Categories"
 msgstr "Categorie"
 
+#, fuzzy
+msgctxt "field:product.template,categories_all:"
+msgid "Categories"
+msgstr "Categorie"
+
 msgctxt "field:product.template,consumable:"
 msgid "Consumable"
 msgstr ""
@@ -346,11 +392,11 @@ msgid "Cost Price"
 msgstr ""
 
 msgctxt "field:product.template,cost_price_method:"
-msgid "Cost Method"
+msgid "Cost Price Method"
 msgstr ""
 
-msgctxt "field:product.template,cost_prices:"
-msgid "Cost Prices"
+msgctxt "field:product.template,cost_price_methods:"
+msgid "Cost Price Methods"
 msgstr ""
 
 #, fuzzy
@@ -393,10 +439,9 @@ msgctxt "field:product.template,products:"
 msgid "Variants"
 msgstr ""
 
-#, fuzzy
 msgctxt "field:product.template,rec_name:"
-msgid "Name"
-msgstr "Nome"
+msgid "Record Name"
+msgstr ""
 
 #, fuzzy
 msgctxt "field:product.template,type:"
@@ -433,10 +478,9 @@ msgctxt "field:product.template-product.category,id:"
 msgid "ID"
 msgstr "Movimento contabile"
 
-#, fuzzy
 msgctxt "field:product.template-product.category,rec_name:"
-msgid "Name"
-msgstr "Nome"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:product.template-product.category,template:"
 msgid "Template"
@@ -453,6 +497,44 @@ msgid "Write User"
 msgstr "modificato da"
 
 #, fuzzy
+msgctxt "field:product.template-product.category.all,category:"
+msgid "Category"
+msgstr "Categoria"
+
+#, fuzzy
+msgctxt "field:product.template-product.category.all,create_date:"
+msgid "Create Date"
+msgstr "Data di creazione"
+
+#, fuzzy
+msgctxt "field:product.template-product.category.all,create_uid:"
+msgid "Create User"
+msgstr "Utente creazione"
+
+#, fuzzy
+msgctxt "field:product.template-product.category.all,id:"
+msgid "ID"
+msgstr "Movimento contabile"
+
+msgctxt "field:product.template-product.category.all,rec_name:"
+msgid "Record Name"
+msgstr ""
+
+msgctxt "field:product.template-product.category.all,template:"
+msgid "Template"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:product.template-product.category.all,write_date:"
+msgid "Write Date"
+msgstr "Utente scrittura"
+
+#, fuzzy
+msgctxt "field:product.template-product.category.all,write_uid:"
+msgid "Write User"
+msgstr "modificato da"
+
+#, fuzzy
 msgctxt "field:product.uom,active:"
 msgid "Active"
 msgstr "Attivo"
@@ -496,10 +578,9 @@ msgctxt "field:product.uom,rate:"
 msgid "Rate"
 msgstr "Cambio"
 
-#, fuzzy
 msgctxt "field:product.uom,rec_name:"
-msgid "Name"
-msgstr "Nome"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:product.uom,rounding:"
 msgid "Rounding Precision"
@@ -540,10 +621,9 @@ msgctxt "field:product.uom.category,name:"
 msgid "Name"
 msgstr "Nome"
 
-#, fuzzy
 msgctxt "field:product.uom.category,rec_name:"
-msgid "Name"
-msgstr "Nome"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:product.uom.category,uoms:"
 msgid "Unit of Measures"
@@ -668,6 +748,10 @@ msgctxt "model:product.cost_price,name:"
 msgid "Product Cost Price"
 msgstr ""
 
+msgctxt "model:product.cost_price_method,name:"
+msgid "Product Cost Price Method"
+msgstr ""
+
 msgctxt "model:product.list_price,name:"
 msgid "Product List Price"
 msgstr ""
@@ -685,6 +769,10 @@ msgctxt "model:product.template-product.category,name:"
 msgid "Template - Category"
 msgstr ""
 
+msgctxt "model:product.template-product.category.all,name:"
+msgid "Template - Category All"
+msgstr ""
+
 msgctxt "model:product.uom,name:"
 msgid "Unit of measure"
 msgstr ""
diff --git a/locale/ja_JP.po b/locale/ja_JP.po
index 05c843e..de78a7e 100644
--- a/locale/ja_JP.po
+++ b/locale/ja_JP.po
@@ -1,4 +1,4 @@
-# 
+#
 msgid ""
 msgstr "Content-Type: text/plain; charset=utf-8\n"
 
@@ -45,7 +45,7 @@ msgid "Parent"
 msgstr ""
 
 msgctxt "field:product.category,rec_name:"
-msgid "Name"
+msgid "Record Name"
 msgstr ""
 
 msgctxt "field:product.category,write_date:"
@@ -73,7 +73,7 @@ msgid "ID"
 msgstr ""
 
 msgctxt "field:product.configuration,rec_name:"
-msgid "Name"
+msgid "Record Name"
 msgstr ""
 
 msgctxt "field:product.configuration,write_date:"
@@ -102,7 +102,7 @@ msgid "ID"
 msgstr ""
 
 msgctxt "field:product.configuration.default_cost_price_method,rec_name:"
-msgid "Name"
+msgid "Record Name"
 msgstr ""
 
 msgctxt "field:product.configuration.default_cost_price_method,write_date:"
@@ -121,10 +121,6 @@ msgctxt "field:product.cost_price,cost_price:"
 msgid "Cost Price"
 msgstr ""
 
-msgctxt "field:product.cost_price,cost_price_method:"
-msgid "Cost Method"
-msgstr ""
-
 msgctxt "field:product.cost_price,create_date:"
 msgid "Create Date"
 msgstr ""
@@ -137,19 +133,56 @@ msgctxt "field:product.cost_price,id:"
 msgid "ID"
 msgstr ""
 
+#, fuzzy
+msgctxt "field:product.cost_price,product:"
+msgid "Product"
+msgstr "Product"
+
 msgctxt "field:product.cost_price,rec_name:"
-msgid "Name"
+msgid "Record Name"
+msgstr ""
+
+msgctxt "field:product.cost_price,write_date:"
+msgid "Write Date"
+msgstr ""
+
+msgctxt "field:product.cost_price,write_uid:"
+msgid "Write User"
+msgstr ""
+
+msgctxt "field:product.cost_price_method,company:"
+msgid "Company"
+msgstr ""
+
+msgctxt "field:product.cost_price_method,cost_price_method:"
+msgid "Cost Price Method"
+msgstr ""
+
+msgctxt "field:product.cost_price_method,create_date:"
+msgid "Create Date"
+msgstr ""
+
+msgctxt "field:product.cost_price_method,create_uid:"
+msgid "Create User"
+msgstr ""
+
+msgctxt "field:product.cost_price_method,id:"
+msgid "ID"
 msgstr ""
 
-msgctxt "field:product.cost_price,template:"
+msgctxt "field:product.cost_price_method,rec_name:"
+msgid "Record Name"
+msgstr ""
+
+msgctxt "field:product.cost_price_method,template:"
 msgid "Template"
 msgstr ""
 
-msgctxt "field:product.cost_price,write_date:"
+msgctxt "field:product.cost_price_method,write_date:"
 msgid "Write Date"
 msgstr ""
 
-msgctxt "field:product.cost_price,write_uid:"
+msgctxt "field:product.cost_price_method,write_uid:"
 msgid "Write User"
 msgstr ""
 
@@ -174,7 +207,7 @@ msgid "List Price"
 msgstr ""
 
 msgctxt "field:product.list_price,rec_name:"
-msgid "Name"
+msgid "Record Name"
 msgstr ""
 
 msgctxt "field:product.list_price,template:"
@@ -198,6 +231,11 @@ msgctxt "field:product.product,categories:"
 msgid "Categories"
 msgstr "Categories"
 
+#, fuzzy
+msgctxt "field:product.product,categories_all:"
+msgid "Categories"
+msgstr "Categories"
+
 msgctxt "field:product.product,code:"
 msgid "Code"
 msgstr ""
@@ -211,7 +249,11 @@ msgid "Cost Price"
 msgstr ""
 
 msgctxt "field:product.product,cost_price_method:"
-msgid "Cost Method"
+msgid "Cost Price Method"
+msgstr ""
+
+msgctxt "field:product.product,cost_price_methods:"
+msgid "Cost Price Methods"
 msgstr ""
 
 msgctxt "field:product.product,cost_price_uom:"
@@ -263,7 +305,7 @@ msgid "Name"
 msgstr ""
 
 msgctxt "field:product.product,rec_name:"
-msgid "Name"
+msgid "Record Name"
 msgstr ""
 
 msgctxt "field:product.product,template:"
@@ -291,6 +333,11 @@ msgctxt "field:product.template,categories:"
 msgid "Categories"
 msgstr "Categories"
 
+#, fuzzy
+msgctxt "field:product.template,categories_all:"
+msgid "Categories"
+msgstr "Categories"
+
 msgctxt "field:product.template,consumable:"
 msgid "Consumable"
 msgstr ""
@@ -300,11 +347,11 @@ msgid "Cost Price"
 msgstr ""
 
 msgctxt "field:product.template,cost_price_method:"
-msgid "Cost Method"
+msgid "Cost Price Method"
 msgstr ""
 
-msgctxt "field:product.template,cost_prices:"
-msgid "Cost Prices"
+msgctxt "field:product.template,cost_price_methods:"
+msgid "Cost Price Methods"
 msgstr ""
 
 msgctxt "field:product.template,create_date:"
@@ -345,7 +392,7 @@ msgid "Variants"
 msgstr "Variants"
 
 msgctxt "field:product.template,rec_name:"
-msgid "Name"
+msgid "Record Name"
 msgstr ""
 
 msgctxt "field:product.template,type:"
@@ -377,7 +424,7 @@ msgid "ID"
 msgstr ""
 
 msgctxt "field:product.template-product.category,rec_name:"
-msgid "Name"
+msgid "Record Name"
 msgstr ""
 
 msgctxt "field:product.template-product.category,template:"
@@ -392,6 +439,38 @@ msgctxt "field:product.template-product.category,write_uid:"
 msgid "Write User"
 msgstr ""
 
+msgctxt "field:product.template-product.category.all,category:"
+msgid "Category"
+msgstr ""
+
+msgctxt "field:product.template-product.category.all,create_date:"
+msgid "Create Date"
+msgstr ""
+
+msgctxt "field:product.template-product.category.all,create_uid:"
+msgid "Create User"
+msgstr ""
+
+msgctxt "field:product.template-product.category.all,id:"
+msgid "ID"
+msgstr ""
+
+msgctxt "field:product.template-product.category.all,rec_name:"
+msgid "Record Name"
+msgstr ""
+
+msgctxt "field:product.template-product.category.all,template:"
+msgid "Template"
+msgstr ""
+
+msgctxt "field:product.template-product.category.all,write_date:"
+msgid "Write Date"
+msgstr ""
+
+msgctxt "field:product.template-product.category.all,write_uid:"
+msgid "Write User"
+msgstr ""
+
 msgctxt "field:product.uom,active:"
 msgid "Active"
 msgstr ""
@@ -429,7 +508,7 @@ msgid "Rate"
 msgstr ""
 
 msgctxt "field:product.uom,rec_name:"
-msgid "Name"
+msgid "Record Name"
 msgstr ""
 
 msgctxt "field:product.uom,rounding:"
@@ -465,7 +544,7 @@ msgid "Name"
 msgstr ""
 
 msgctxt "field:product.uom.category,rec_name:"
-msgid "Name"
+msgid "Record Name"
 msgstr ""
 
 #, fuzzy
@@ -583,6 +662,10 @@ msgctxt "model:product.cost_price,name:"
 msgid "Product Cost Price"
 msgstr ""
 
+msgctxt "model:product.cost_price_method,name:"
+msgid "Product Cost Price Method"
+msgstr ""
+
 msgctxt "model:product.list_price,name:"
 msgid "Product List Price"
 msgstr ""
@@ -599,6 +682,10 @@ msgctxt "model:product.template-product.category,name:"
 msgid "Template - Category"
 msgstr ""
 
+msgctxt "model:product.template-product.category.all,name:"
+msgid "Template - Category All"
+msgstr ""
+
 #, fuzzy
 msgctxt "model:product.uom,name:"
 msgid "Unit of measure"
diff --git a/locale/lo.po b/locale/lo.po
index 64eb952..33124d6 100644
--- a/locale/lo.po
+++ b/locale/lo.po
@@ -1,4 +1,4 @@
-# 
+#
 msgid ""
 msgstr "Content-Type: text/plain; charset=utf-8\n"
 
@@ -47,8 +47,8 @@ msgid "Parent"
 msgstr "ບັນຊີແມ່"
 
 msgctxt "field:product.category,rec_name:"
-msgid "Name"
-msgstr "ຊື່"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:product.category,write_date:"
 msgid "Write Date"
@@ -75,8 +75,8 @@ msgid "ID"
 msgstr "ເລກລຳດັບ"
 
 msgctxt "field:product.configuration,rec_name:"
-msgid "Name"
-msgstr "ຊື່"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:product.configuration,write_date:"
 msgid "Write Date"
@@ -107,10 +107,9 @@ msgctxt "field:product.configuration.default_cost_price_method,id:"
 msgid "ID"
 msgstr "ເລກທີ"
 
-#, fuzzy
 msgctxt "field:product.configuration.default_cost_price_method,rec_name:"
-msgid "Name"
-msgstr "ຊື່"
+msgid "Record Name"
+msgstr ""
 
 #, fuzzy
 msgctxt "field:product.configuration.default_cost_price_method,write_date:"
@@ -132,11 +131,6 @@ msgid "Cost Price"
 msgstr "ລາຄາຄິດໄລ່"
 
 #, fuzzy
-msgctxt "field:product.cost_price,cost_price_method:"
-msgid "Cost Method"
-msgstr "ວິທີຄິດໄລ່"
-
-#, fuzzy
 msgctxt "field:product.cost_price,create_date:"
 msgid "Create Date"
 msgstr "ວັນທີສ້າງ"
@@ -152,22 +146,63 @@ msgid "ID"
 msgstr "ເລກທີ"
 
 #, fuzzy
+msgctxt "field:product.cost_price,product:"
+msgid "Product"
+msgstr "ຜະລິດຕະພັນ"
+
 msgctxt "field:product.cost_price,rec_name:"
-msgid "Name"
-msgstr "ຊື່"
+msgid "Record Name"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:product.cost_price,write_date:"
+msgid "Write Date"
+msgstr "ວັນທີບັນທຶກ"
+
+#, fuzzy
+msgctxt "field:product.cost_price,write_uid:"
+msgid "Write User"
+msgstr "ຜູ້ບັນທຶກ"
+
+msgctxt "field:product.cost_price_method,company:"
+msgid "Company"
+msgstr ""
+
+msgctxt "field:product.cost_price_method,cost_price_method:"
+msgid "Cost Price Method"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:product.cost_price_method,create_date:"
+msgid "Create Date"
+msgstr "ວັນທີສ້າງ"
+
+#, fuzzy
+msgctxt "field:product.cost_price_method,create_uid:"
+msgid "Create User"
+msgstr "ຜູ້ສ້າງ"
+
+#, fuzzy
+msgctxt "field:product.cost_price_method,id:"
+msgid "ID"
+msgstr "ເລກທີ"
+
+msgctxt "field:product.cost_price_method,rec_name:"
+msgid "Record Name"
+msgstr ""
 
 #, fuzzy
-msgctxt "field:product.cost_price,template:"
+msgctxt "field:product.cost_price_method,template:"
 msgid "Template"
 msgstr "ຮ່າງແບບ"
 
 #, fuzzy
-msgctxt "field:product.cost_price,write_date:"
+msgctxt "field:product.cost_price_method,write_date:"
 msgid "Write Date"
 msgstr "ວັນທີບັນທຶກ"
 
 #, fuzzy
-msgctxt "field:product.cost_price,write_uid:"
+msgctxt "field:product.cost_price_method,write_uid:"
 msgid "Write User"
 msgstr "ຜູ້ບັນທຶກ"
 
@@ -195,10 +230,9 @@ msgctxt "field:product.list_price,list_price:"
 msgid "List Price"
 msgstr "ລາຄາຂາຍ"
 
-#, fuzzy
 msgctxt "field:product.list_price,rec_name:"
-msgid "Name"
-msgstr "ຊື່"
+msgid "Record Name"
+msgstr ""
 
 #, fuzzy
 msgctxt "field:product.list_price,template:"
@@ -223,6 +257,11 @@ msgctxt "field:product.product,categories:"
 msgid "Categories"
 msgstr "ປະເພດ"
 
+#, fuzzy
+msgctxt "field:product.product,categories_all:"
+msgid "Categories"
+msgstr "ປະເພດ"
+
 msgctxt "field:product.product,code:"
 msgid "Code"
 msgstr "ລະຫັດ"
@@ -236,8 +275,12 @@ msgid "Cost Price"
 msgstr "ລາຄາຄິດໄລ່"
 
 msgctxt "field:product.product,cost_price_method:"
-msgid "Cost Method"
-msgstr "ວິທີຄິດໄລ່"
+msgid "Cost Price Method"
+msgstr ""
+
+msgctxt "field:product.product,cost_price_methods:"
+msgid "Cost Price Methods"
+msgstr ""
 
 msgctxt "field:product.product,cost_price_uom:"
 msgid "Cost Price"
@@ -290,8 +333,8 @@ msgid "Name"
 msgstr "ຊື່"
 
 msgctxt "field:product.product,rec_name:"
-msgid "Name"
-msgstr "ຊື່"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:product.product,template:"
 msgid "Product Template"
@@ -317,6 +360,11 @@ msgctxt "field:product.template,categories:"
 msgid "Categories"
 msgstr "ປະເພດ"
 
+#, fuzzy
+msgctxt "field:product.template,categories_all:"
+msgid "Categories"
+msgstr "ປະເພດ"
+
 msgctxt "field:product.template,consumable:"
 msgid "Consumable"
 msgstr "ວັດຖຸສິ້ນເປືອງ"
@@ -326,13 +374,12 @@ msgid "Cost Price"
 msgstr "ລາຄາຄິດໄລ່"
 
 msgctxt "field:product.template,cost_price_method:"
-msgid "Cost Method"
-msgstr "ວິທີຄິດໄລ່"
+msgid "Cost Price Method"
+msgstr ""
 
-#, fuzzy
-msgctxt "field:product.template,cost_prices:"
-msgid "Cost Prices"
-msgstr "ລາຄາຄິດໄລ່"
+msgctxt "field:product.template,cost_price_methods:"
+msgid "Cost Price Methods"
+msgstr ""
 
 msgctxt "field:product.template,create_date:"
 msgid "Create Date"
@@ -372,8 +419,8 @@ msgid "Variants"
 msgstr "ຜະລິດຕະພັນຍ່ອຍ"
 
 msgctxt "field:product.template,rec_name:"
-msgid "Name"
-msgstr "ຊື່"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:product.template,type:"
 msgid "Type"
@@ -404,8 +451,8 @@ msgid "ID"
 msgstr "ເລກທີ"
 
 msgctxt "field:product.template-product.category,rec_name:"
-msgid "Name"
-msgstr "ຊື່"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:product.template-product.category,template:"
 msgid "Template"
@@ -419,6 +466,45 @@ msgctxt "field:product.template-product.category,write_uid:"
 msgid "Write User"
 msgstr "ຜູ້ບັນທຶກ"
 
+#, fuzzy
+msgctxt "field:product.template-product.category.all,category:"
+msgid "Category"
+msgstr "ປະເພດ"
+
+#, fuzzy
+msgctxt "field:product.template-product.category.all,create_date:"
+msgid "Create Date"
+msgstr "ວັນທີສ້າງ"
+
+#, fuzzy
+msgctxt "field:product.template-product.category.all,create_uid:"
+msgid "Create User"
+msgstr "ຜູ້ສ້າງ"
+
+#, fuzzy
+msgctxt "field:product.template-product.category.all,id:"
+msgid "ID"
+msgstr "ເລກທີ"
+
+msgctxt "field:product.template-product.category.all,rec_name:"
+msgid "Record Name"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:product.template-product.category.all,template:"
+msgid "Template"
+msgstr "ຮ່າງແບບ"
+
+#, fuzzy
+msgctxt "field:product.template-product.category.all,write_date:"
+msgid "Write Date"
+msgstr "ວັນທີບັນທຶກ"
+
+#, fuzzy
+msgctxt "field:product.template-product.category.all,write_uid:"
+msgid "Write User"
+msgstr "ຜູ້ບັນທຶກ"
+
 msgctxt "field:product.uom,active:"
 msgid "Active"
 msgstr "ຍັງໃຊ້ຢູ່"
@@ -456,8 +542,8 @@ msgid "Rate"
 msgstr "ອັດຕາ"
 
 msgctxt "field:product.uom,rec_name:"
-msgid "Name"
-msgstr "ຊື່"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:product.uom,rounding:"
 msgid "Rounding Precision"
@@ -492,8 +578,8 @@ msgid "Name"
 msgstr "ຊື່"
 
 msgctxt "field:product.uom.category,rec_name:"
-msgid "Name"
-msgstr "ຊື່"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:product.uom.category,uoms:"
 msgid "Unit of Measures"
@@ -611,6 +697,10 @@ msgctxt "model:product.cost_price,name:"
 msgid "Product Cost Price"
 msgstr ""
 
+msgctxt "model:product.cost_price_method,name:"
+msgid "Product Cost Price Method"
+msgstr ""
+
 msgctxt "model:product.list_price,name:"
 msgid "Product List Price"
 msgstr ""
@@ -627,6 +717,11 @@ msgctxt "model:product.template-product.category,name:"
 msgid "Template - Category"
 msgstr "ຮ່າງແບບ - ປະເພດ"
 
+#, fuzzy
+msgctxt "model:product.template-product.category.all,name:"
+msgid "Template - Category All"
+msgstr "ຮ່າງແບບ - ປະເພດ"
+
 msgctxt "model:product.uom,name:"
 msgid "Unit of measure"
 msgstr "ໜ່ວຍວັດແທກ"
diff --git a/locale/lt.po b/locale/lt.po
index b197137..529ab47 100644
--- a/locale/lt.po
+++ b/locale/lt.po
@@ -1,4 +1,4 @@
-# 
+#
 msgid ""
 msgstr "Content-Type: text/plain; charset=utf-8\n"
 
@@ -45,10 +45,9 @@ msgctxt "field:product.category,parent:"
 msgid "Parent"
 msgstr ""
 
-#, fuzzy
 msgctxt "field:product.category,rec_name:"
-msgid "Name"
-msgstr "Namu"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:product.category,write_date:"
 msgid "Write Date"
@@ -74,10 +73,9 @@ msgctxt "field:product.configuration,id:"
 msgid "ID"
 msgstr ""
 
-#, fuzzy
 msgctxt "field:product.configuration,rec_name:"
-msgid "Name"
-msgstr "Namu"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:product.configuration,write_date:"
 msgid "Write Date"
@@ -104,10 +102,9 @@ msgctxt "field:product.configuration.default_cost_price_method,id:"
 msgid "ID"
 msgstr ""
 
-#, fuzzy
 msgctxt "field:product.configuration.default_cost_price_method,rec_name:"
-msgid "Name"
-msgstr "Namu"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:product.configuration.default_cost_price_method,write_date:"
 msgid "Write Date"
@@ -125,10 +122,6 @@ msgctxt "field:product.cost_price,cost_price:"
 msgid "Cost Price"
 msgstr ""
 
-msgctxt "field:product.cost_price,cost_price_method:"
-msgid "Cost Method"
-msgstr ""
-
 msgctxt "field:product.cost_price,create_date:"
 msgid "Create Date"
 msgstr ""
@@ -141,13 +134,12 @@ msgctxt "field:product.cost_price,id:"
 msgid "ID"
 msgstr ""
 
-#, fuzzy
-msgctxt "field:product.cost_price,rec_name:"
-msgid "Name"
-msgstr "Namu"
+msgctxt "field:product.cost_price,product:"
+msgid "Product"
+msgstr ""
 
-msgctxt "field:product.cost_price,template:"
-msgid "Template"
+msgctxt "field:product.cost_price,rec_name:"
+msgid "Record Name"
 msgstr ""
 
 msgctxt "field:product.cost_price,write_date:"
@@ -158,6 +150,42 @@ msgctxt "field:product.cost_price,write_uid:"
 msgid "Write User"
 msgstr ""
 
+msgctxt "field:product.cost_price_method,company:"
+msgid "Company"
+msgstr ""
+
+msgctxt "field:product.cost_price_method,cost_price_method:"
+msgid "Cost Price Method"
+msgstr ""
+
+msgctxt "field:product.cost_price_method,create_date:"
+msgid "Create Date"
+msgstr ""
+
+msgctxt "field:product.cost_price_method,create_uid:"
+msgid "Create User"
+msgstr ""
+
+msgctxt "field:product.cost_price_method,id:"
+msgid "ID"
+msgstr ""
+
+msgctxt "field:product.cost_price_method,rec_name:"
+msgid "Record Name"
+msgstr ""
+
+msgctxt "field:product.cost_price_method,template:"
+msgid "Template"
+msgstr ""
+
+msgctxt "field:product.cost_price_method,write_date:"
+msgid "Write Date"
+msgstr ""
+
+msgctxt "field:product.cost_price_method,write_uid:"
+msgid "Write User"
+msgstr ""
+
 msgctxt "field:product.list_price,company:"
 msgid "Company"
 msgstr ""
@@ -178,10 +206,9 @@ msgctxt "field:product.list_price,list_price:"
 msgid "List Price"
 msgstr ""
 
-#, fuzzy
 msgctxt "field:product.list_price,rec_name:"
-msgid "Name"
-msgstr "Namu"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:product.list_price,template:"
 msgid "Template"
@@ -203,6 +230,10 @@ msgctxt "field:product.product,categories:"
 msgid "Categories"
 msgstr ""
 
+msgctxt "field:product.product,categories_all:"
+msgid "Categories"
+msgstr ""
+
 msgctxt "field:product.product,code:"
 msgid "Code"
 msgstr ""
@@ -216,7 +247,11 @@ msgid "Cost Price"
 msgstr ""
 
 msgctxt "field:product.product,cost_price_method:"
-msgid "Cost Method"
+msgid "Cost Price Method"
+msgstr ""
+
+msgctxt "field:product.product,cost_price_methods:"
+msgid "Cost Price Methods"
 msgstr ""
 
 msgctxt "field:product.product,cost_price_uom:"
@@ -268,10 +303,9 @@ msgctxt "field:product.product,name:"
 msgid "Name"
 msgstr "Namu"
 
-#, fuzzy
 msgctxt "field:product.product,rec_name:"
-msgid "Name"
-msgstr "Namu"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:product.product,template:"
 msgid "Product Template"
@@ -297,6 +331,10 @@ msgctxt "field:product.template,categories:"
 msgid "Categories"
 msgstr ""
 
+msgctxt "field:product.template,categories_all:"
+msgid "Categories"
+msgstr ""
+
 msgctxt "field:product.template,consumable:"
 msgid "Consumable"
 msgstr ""
@@ -306,11 +344,11 @@ msgid "Cost Price"
 msgstr ""
 
 msgctxt "field:product.template,cost_price_method:"
-msgid "Cost Method"
+msgid "Cost Price Method"
 msgstr ""
 
-msgctxt "field:product.template,cost_prices:"
-msgid "Cost Prices"
+msgctxt "field:product.template,cost_price_methods:"
+msgid "Cost Price Methods"
 msgstr ""
 
 msgctxt "field:product.template,create_date:"
@@ -350,10 +388,9 @@ msgctxt "field:product.template,products:"
 msgid "Variants"
 msgstr ""
 
-#, fuzzy
 msgctxt "field:product.template,rec_name:"
-msgid "Name"
-msgstr "Namu"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:product.template,type:"
 msgid "Type"
@@ -383,10 +420,9 @@ msgctxt "field:product.template-product.category,id:"
 msgid "ID"
 msgstr ""
 
-#, fuzzy
 msgctxt "field:product.template-product.category,rec_name:"
-msgid "Name"
-msgstr "Namu"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:product.template-product.category,template:"
 msgid "Template"
@@ -400,6 +436,38 @@ msgctxt "field:product.template-product.category,write_uid:"
 msgid "Write User"
 msgstr ""
 
+msgctxt "field:product.template-product.category.all,category:"
+msgid "Category"
+msgstr ""
+
+msgctxt "field:product.template-product.category.all,create_date:"
+msgid "Create Date"
+msgstr ""
+
+msgctxt "field:product.template-product.category.all,create_uid:"
+msgid "Create User"
+msgstr ""
+
+msgctxt "field:product.template-product.category.all,id:"
+msgid "ID"
+msgstr ""
+
+msgctxt "field:product.template-product.category.all,rec_name:"
+msgid "Record Name"
+msgstr ""
+
+msgctxt "field:product.template-product.category.all,template:"
+msgid "Template"
+msgstr ""
+
+msgctxt "field:product.template-product.category.all,write_date:"
+msgid "Write Date"
+msgstr ""
+
+msgctxt "field:product.template-product.category.all,write_uid:"
+msgid "Write User"
+msgstr ""
+
 msgctxt "field:product.uom,active:"
 msgid "Active"
 msgstr ""
@@ -437,10 +505,9 @@ msgctxt "field:product.uom,rate:"
 msgid "Rate"
 msgstr ""
 
-#, fuzzy
 msgctxt "field:product.uom,rec_name:"
-msgid "Name"
-msgstr "Namu"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:product.uom,rounding:"
 msgid "Rounding Precision"
@@ -475,10 +542,9 @@ msgctxt "field:product.uom.category,name:"
 msgid "Name"
 msgstr "Namu"
 
-#, fuzzy
 msgctxt "field:product.uom.category,rec_name:"
-msgid "Name"
-msgstr "Namu"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:product.uom.category,uoms:"
 msgid "Unit of Measures"
@@ -592,6 +658,10 @@ msgctxt "model:product.cost_price,name:"
 msgid "Product Cost Price"
 msgstr ""
 
+msgctxt "model:product.cost_price_method,name:"
+msgid "Product Cost Price Method"
+msgstr ""
+
 msgctxt "model:product.list_price,name:"
 msgid "Product List Price"
 msgstr ""
@@ -608,6 +678,10 @@ msgctxt "model:product.template-product.category,name:"
 msgid "Template - Category"
 msgstr ""
 
+msgctxt "model:product.template-product.category.all,name:"
+msgid "Template - Category All"
+msgstr ""
+
 msgctxt "model:product.uom,name:"
 msgid "Unit of measure"
 msgstr ""
diff --git a/locale/nl.po b/locale/nl.po
index 19ac389..5991af1 100644
--- a/locale/nl.po
+++ b/locale/nl.po
@@ -1,4 +1,4 @@
-# 
+#
 msgid ""
 msgstr "Content-Type: text/plain; charset=utf-8\n"
 
@@ -52,8 +52,8 @@ msgid "Parent"
 msgstr "Bovenliggend niveau"
 
 msgctxt "field:product.category,rec_name:"
-msgid "Name"
-msgstr "Naam"
+msgid "Record Name"
+msgstr ""
 
 #, fuzzy
 msgctxt "field:product.category,write_date:"
@@ -84,10 +84,9 @@ msgctxt "field:product.configuration,id:"
 msgid "ID"
 msgstr "ID"
 
-#, fuzzy
 msgctxt "field:product.configuration,rec_name:"
-msgid "Name"
-msgstr "Naam"
+msgid "Record Name"
+msgstr ""
 
 #, fuzzy
 msgctxt "field:product.configuration,write_date:"
@@ -119,10 +118,9 @@ msgctxt "field:product.configuration.default_cost_price_method,id:"
 msgid "ID"
 msgstr "ID"
 
-#, fuzzy
 msgctxt "field:product.configuration.default_cost_price_method,rec_name:"
-msgid "Name"
-msgstr "Naam"
+msgid "Record Name"
+msgstr ""
 
 #, fuzzy
 msgctxt "field:product.configuration.default_cost_price_method,write_date:"
@@ -144,11 +142,6 @@ msgid "Cost Price"
 msgstr "Kostprijs"
 
 #, fuzzy
-msgctxt "field:product.cost_price,cost_price_method:"
-msgid "Cost Method"
-msgstr "Kostprijsmethode"
-
-#, fuzzy
 msgctxt "field:product.cost_price,create_date:"
 msgid "Create Date"
 msgstr "Datum"
@@ -164,22 +157,63 @@ msgid "ID"
 msgstr "ID"
 
 #, fuzzy
+msgctxt "field:product.cost_price,product:"
+msgid "Product"
+msgstr "Productbeheer"
+
 msgctxt "field:product.cost_price,rec_name:"
-msgid "Name"
-msgstr "Naam"
+msgid "Record Name"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:product.cost_price,write_date:"
+msgid "Write Date"
+msgstr "Schrijfdatum"
 
 #, fuzzy
-msgctxt "field:product.cost_price,template:"
+msgctxt "field:product.cost_price,write_uid:"
+msgid "Write User"
+msgstr "Gebruiker"
+
+msgctxt "field:product.cost_price_method,company:"
+msgid "Company"
+msgstr ""
+
+msgctxt "field:product.cost_price_method,cost_price_method:"
+msgid "Cost Price Method"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:product.cost_price_method,create_date:"
+msgid "Create Date"
+msgstr "Datum"
+
+#, fuzzy
+msgctxt "field:product.cost_price_method,create_uid:"
+msgid "Create User"
+msgstr "Gebruiker"
+
+#, fuzzy
+msgctxt "field:product.cost_price_method,id:"
+msgid "ID"
+msgstr "ID"
+
+msgctxt "field:product.cost_price_method,rec_name:"
+msgid "Record Name"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:product.cost_price_method,template:"
 msgid "Template"
 msgstr "Sjabloon"
 
 #, fuzzy
-msgctxt "field:product.cost_price,write_date:"
+msgctxt "field:product.cost_price_method,write_date:"
 msgid "Write Date"
 msgstr "Schrijfdatum"
 
 #, fuzzy
-msgctxt "field:product.cost_price,write_uid:"
+msgctxt "field:product.cost_price_method,write_uid:"
 msgid "Write User"
 msgstr "Gebruiker"
 
@@ -207,10 +241,9 @@ msgctxt "field:product.list_price,list_price:"
 msgid "List Price"
 msgstr "Catalogusprijs"
 
-#, fuzzy
 msgctxt "field:product.list_price,rec_name:"
-msgid "Name"
-msgstr "Naam"
+msgid "Record Name"
+msgstr ""
 
 #, fuzzy
 msgctxt "field:product.list_price,template:"
@@ -237,6 +270,11 @@ msgctxt "field:product.product,categories:"
 msgid "Categories"
 msgstr "Categorieën"
 
+#, fuzzy
+msgctxt "field:product.product,categories_all:"
+msgid "Categories"
+msgstr "Categorieën"
+
 msgctxt "field:product.product,code:"
 msgid "Code"
 msgstr "Code"
@@ -250,10 +288,13 @@ msgctxt "field:product.product,cost_price:"
 msgid "Cost Price"
 msgstr "Kostprijs"
 
-#, fuzzy
 msgctxt "field:product.product,cost_price_method:"
-msgid "Cost Method"
-msgstr "Kostprijsmethode"
+msgid "Cost Price Method"
+msgstr ""
+
+msgctxt "field:product.product,cost_price_methods:"
+msgid "Cost Price Methods"
+msgstr ""
 
 #, fuzzy
 msgctxt "field:product.product,cost_price_uom:"
@@ -314,8 +355,8 @@ msgid "Name"
 msgstr "Naam"
 
 msgctxt "field:product.product,rec_name:"
-msgid "Name"
-msgstr "Naam"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:product.product,template:"
 msgid "Product Template"
@@ -345,6 +386,11 @@ msgctxt "field:product.template,categories:"
 msgid "Categories"
 msgstr "Categorieën"
 
+#, fuzzy
+msgctxt "field:product.template,categories_all:"
+msgid "Categories"
+msgstr "Categorieën"
+
 msgctxt "field:product.template,consumable:"
 msgid "Consumable"
 msgstr ""
@@ -354,13 +400,12 @@ msgid "Cost Price"
 msgstr "Kostprijs"
 
 msgctxt "field:product.template,cost_price_method:"
-msgid "Cost Method"
-msgstr "Kostprijsmethode"
+msgid "Cost Price Method"
+msgstr ""
 
-#, fuzzy
-msgctxt "field:product.template,cost_prices:"
-msgid "Cost Prices"
-msgstr "Kostprijs"
+msgctxt "field:product.template,cost_price_methods:"
+msgid "Cost Price Methods"
+msgstr ""
 
 #, fuzzy
 msgctxt "field:product.template,create_date:"
@@ -404,8 +449,8 @@ msgid "Variants"
 msgstr "Producten"
 
 msgctxt "field:product.template,rec_name:"
-msgid "Name"
-msgstr "Naam"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:product.template,type:"
 msgid "Type"
@@ -441,10 +486,9 @@ msgctxt "field:product.template-product.category,id:"
 msgid "ID"
 msgstr "ID"
 
-#, fuzzy
 msgctxt "field:product.template-product.category,rec_name:"
-msgid "Name"
-msgstr "Naam"
+msgid "Record Name"
+msgstr ""
 
 #, fuzzy
 msgctxt "field:product.template-product.category,template:"
@@ -461,6 +505,45 @@ msgctxt "field:product.template-product.category,write_uid:"
 msgid "Write User"
 msgstr "Gebruiker"
 
+#, fuzzy
+msgctxt "field:product.template-product.category.all,category:"
+msgid "Category"
+msgstr "Categorie"
+
+#, fuzzy
+msgctxt "field:product.template-product.category.all,create_date:"
+msgid "Create Date"
+msgstr "Datum"
+
+#, fuzzy
+msgctxt "field:product.template-product.category.all,create_uid:"
+msgid "Create User"
+msgstr "Gebruiker"
+
+#, fuzzy
+msgctxt "field:product.template-product.category.all,id:"
+msgid "ID"
+msgstr "ID"
+
+msgctxt "field:product.template-product.category.all,rec_name:"
+msgid "Record Name"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:product.template-product.category.all,template:"
+msgid "Template"
+msgstr "Sjabloon"
+
+#, fuzzy
+msgctxt "field:product.template-product.category.all,write_date:"
+msgid "Write Date"
+msgstr "Schrijfdatum"
+
+#, fuzzy
+msgctxt "field:product.template-product.category.all,write_uid:"
+msgid "Write User"
+msgstr "Gebruiker"
+
 msgctxt "field:product.uom,active:"
 msgid "Active"
 msgstr "Actief"
@@ -502,8 +585,8 @@ msgid "Rate"
 msgstr "Verhouding"
 
 msgctxt "field:product.uom,rec_name:"
-msgid "Name"
-msgstr "Naam"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:product.uom,rounding:"
 msgid "Rounding Precision"
@@ -543,8 +626,8 @@ msgid "Name"
 msgstr "Naam"
 
 msgctxt "field:product.uom.category,rec_name:"
-msgid "Name"
-msgstr "Naam"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:product.uom.category,uoms:"
 msgid "Unit of Measures"
@@ -673,6 +756,10 @@ msgctxt "model:product.cost_price,name:"
 msgid "Product Cost Price"
 msgstr ""
 
+msgctxt "model:product.cost_price_method,name:"
+msgid "Product Cost Price Method"
+msgstr ""
+
 msgctxt "model:product.list_price,name:"
 msgid "Product List Price"
 msgstr ""
@@ -690,6 +777,10 @@ msgctxt "model:product.template-product.category,name:"
 msgid "Template - Category"
 msgstr ""
 
+msgctxt "model:product.template-product.category.all,name:"
+msgid "Template - Category All"
+msgstr ""
+
 msgctxt "model:product.uom,name:"
 msgid "Unit of measure"
 msgstr "Meeteenheid"
diff --git a/locale/pl.po b/locale/pl.po
index af9698d..ea38993 100644
--- a/locale/pl.po
+++ b/locale/pl.po
@@ -1,4 +1,4 @@
-# 
+#
 msgid ""
 msgstr "Content-Type: text/plain; charset=utf-8\n"
 
@@ -24,7 +24,7 @@ msgstr ""
 
 msgctxt "field:product.category,childs:"
 msgid "Children"
-msgstr "Elementy podrzędne"
+msgstr "Kategorie podrzędne"
 
 msgctxt "field:product.category,create_date:"
 msgid "Create Date"
@@ -44,11 +44,11 @@ msgstr "Nazwa"
 
 msgctxt "field:product.category,parent:"
 msgid "Parent"
-msgstr "Element nadrzędny"
+msgstr "Kategoria nadrzędna"
 
 msgctxt "field:product.category,rec_name:"
-msgid "Name"
-msgstr "Nazwa"
+msgid "Record Name"
+msgstr "Nazwa rekordu"
 
 msgctxt "field:product.category,write_date:"
 msgid "Write Date"
@@ -75,8 +75,8 @@ msgid "ID"
 msgstr "ID"
 
 msgctxt "field:product.configuration,rec_name:"
-msgid "Name"
-msgstr "Nazwa"
+msgid "Record Name"
+msgstr "Nazwa rekordu"
 
 msgctxt "field:product.configuration,write_date:"
 msgid "Write Date"
@@ -86,143 +86,155 @@ msgctxt "field:product.configuration,write_uid:"
 msgid "Write User"
 msgstr "Zapisał"
 
-#, fuzzy
 msgctxt "field:product.configuration.default_cost_price_method,create_date:"
 msgid "Create Date"
 msgstr "Data utworzenia"
 
-#, fuzzy
 msgctxt "field:product.configuration.default_cost_price_method,create_uid:"
 msgid "Create User"
 msgstr "Utworzył"
 
-#, fuzzy
 msgctxt ""
 "field:product.configuration.default_cost_price_method,default_cost_price_method:"
 msgid "Default Cost Method"
 msgstr "Domyślna metoda kosztowa"
 
-#, fuzzy
 msgctxt "field:product.configuration.default_cost_price_method,id:"
 msgid "ID"
 msgstr "ID"
 
-#, fuzzy
 msgctxt "field:product.configuration.default_cost_price_method,rec_name:"
-msgid "Name"
-msgstr "Nazwa"
+msgid "Record Name"
+msgstr "Nazwa rekordu"
 
-#, fuzzy
 msgctxt "field:product.configuration.default_cost_price_method,write_date:"
 msgid "Write Date"
 msgstr "Data zapisu"
 
-#, fuzzy
 msgctxt "field:product.configuration.default_cost_price_method,write_uid:"
 msgid "Write User"
 msgstr "Zapisał"
 
 msgctxt "field:product.cost_price,company:"
 msgid "Company"
-msgstr ""
+msgstr "Firma"
 
-#, fuzzy
 msgctxt "field:product.cost_price,cost_price:"
 msgid "Cost Price"
-msgstr "Cena fabryczna"
+msgstr "Cena kosztów"
 
-#, fuzzy
-msgctxt "field:product.cost_price,cost_price_method:"
-msgid "Cost Method"
-msgstr "Metoda kosztowa"
-
-#, fuzzy
 msgctxt "field:product.cost_price,create_date:"
 msgid "Create Date"
 msgstr "Data utworzenia"
 
-#, fuzzy
 msgctxt "field:product.cost_price,create_uid:"
 msgid "Create User"
 msgstr "Utworzył"
 
-#, fuzzy
 msgctxt "field:product.cost_price,id:"
 msgid "ID"
 msgstr "ID"
 
-#, fuzzy
+msgctxt "field:product.cost_price,product:"
+msgid "Product"
+msgstr "Produkt"
+
 msgctxt "field:product.cost_price,rec_name:"
-msgid "Name"
-msgstr "Nazwa"
+msgid "Record Name"
+msgstr "Nazwa rekordu"
 
-#, fuzzy
-msgctxt "field:product.cost_price,template:"
+msgctxt "field:product.cost_price,write_date:"
+msgid "Write Date"
+msgstr "Data zapisu"
+
+msgctxt "field:product.cost_price,write_uid:"
+msgid "Write User"
+msgstr "Zapisał"
+
+msgctxt "field:product.cost_price_method,company:"
+msgid "Company"
+msgstr "Firma"
+
+msgctxt "field:product.cost_price_method,cost_price_method:"
+msgid "Cost Price Method"
+msgstr ""
+
+msgctxt "field:product.cost_price_method,create_date:"
+msgid "Create Date"
+msgstr "Data utworzenia"
+
+msgctxt "field:product.cost_price_method,create_uid:"
+msgid "Create User"
+msgstr "Utworzył"
+
+msgctxt "field:product.cost_price_method,id:"
+msgid "ID"
+msgstr "ID"
+
+msgctxt "field:product.cost_price_method,rec_name:"
+msgid "Record Name"
+msgstr "Nazwa rekordu"
+
+msgctxt "field:product.cost_price_method,template:"
 msgid "Template"
 msgstr "Szablon"
 
-#, fuzzy
-msgctxt "field:product.cost_price,write_date:"
+msgctxt "field:product.cost_price_method,write_date:"
 msgid "Write Date"
 msgstr "Data zapisu"
 
-#, fuzzy
-msgctxt "field:product.cost_price,write_uid:"
+msgctxt "field:product.cost_price_method,write_uid:"
 msgid "Write User"
 msgstr "Zapisał"
 
 msgctxt "field:product.list_price,company:"
 msgid "Company"
-msgstr ""
+msgstr "Firma"
 
-#, fuzzy
 msgctxt "field:product.list_price,create_date:"
 msgid "Create Date"
 msgstr "Data utworzenia"
 
-#, fuzzy
 msgctxt "field:product.list_price,create_uid:"
 msgid "Create User"
 msgstr "Utworzył"
 
-#, fuzzy
 msgctxt "field:product.list_price,id:"
 msgid "ID"
 msgstr "ID"
 
-#, fuzzy
 msgctxt "field:product.list_price,list_price:"
 msgid "List Price"
-msgstr "Cena katalogowa"
+msgstr "Cena sprzedaży"
 
-#, fuzzy
 msgctxt "field:product.list_price,rec_name:"
-msgid "Name"
-msgstr "Nazwa"
+msgid "Record Name"
+msgstr "Nazwa rekordu"
 
-#, fuzzy
 msgctxt "field:product.list_price,template:"
 msgid "Template"
 msgstr "Szablon"
 
-#, fuzzy
 msgctxt "field:product.list_price,write_date:"
 msgid "Write Date"
 msgstr "Data zapisu"
 
-#, fuzzy
 msgctxt "field:product.list_price,write_uid:"
 msgid "Write User"
 msgstr "Zapisał"
 
 msgctxt "field:product.product,active:"
 msgid "Active"
-msgstr "Akywny"
+msgstr "Aktywny"
 
 msgctxt "field:product.product,categories:"
 msgid "Categories"
 msgstr "Kategorie"
 
+msgctxt "field:product.product,categories_all:"
+msgid "Categories"
+msgstr "Kategorie"
+
 msgctxt "field:product.product,code:"
 msgid "Code"
 msgstr "Kod"
@@ -233,20 +245,23 @@ msgstr "Artykuły konsumpcyjne"
 
 msgctxt "field:product.product,cost_price:"
 msgid "Cost Price"
-msgstr "Cena fabryczna"
+msgstr "Cena kosztów"
 
 msgctxt "field:product.product,cost_price_method:"
-msgid "Cost Method"
-msgstr "Metoda kosztowa"
+msgid "Cost Price Method"
+msgstr ""
+
+msgctxt "field:product.product,cost_price_methods:"
+msgid "Cost Price Methods"
+msgstr ""
 
 msgctxt "field:product.product,cost_price_uom:"
 msgid "Cost Price"
-msgstr "Cena fabryczna"
+msgstr "Cena kosztów"
 
-#, fuzzy
 msgctxt "field:product.product,cost_prices:"
 msgid "Cost Prices"
-msgstr "Cena fabryczna"
+msgstr "Ceny kosztów"
 
 msgctxt "field:product.product,create_date:"
 msgid "Create Date"
@@ -258,11 +273,11 @@ msgstr "Utworzył"
 
 msgctxt "field:product.product,default_uom:"
 msgid "Default UOM"
-msgstr "Domyślna jednostka miary"
+msgstr "Domyślna jm"
 
 msgctxt "field:product.product,default_uom_category:"
 msgid "Default UOM Category"
-msgstr "Domyślna kategoria jednostki miary"
+msgstr "Domyślna kategoria jm"
 
 msgctxt "field:product.product,description:"
 msgid "Description"
@@ -274,24 +289,23 @@ msgstr "ID"
 
 msgctxt "field:product.product,list_price:"
 msgid "List Price"
-msgstr "Cena katalogowa"
+msgstr "Cena sprzedaży"
 
 msgctxt "field:product.product,list_price_uom:"
 msgid "List Price"
-msgstr "Cena katalogowa"
+msgstr "Cena sprzedaży"
 
-#, fuzzy
 msgctxt "field:product.product,list_prices:"
 msgid "List Prices"
-msgstr "Cena katalogowa"
+msgstr "Ceny sprzedaży"
 
 msgctxt "field:product.product,name:"
 msgid "Name"
 msgstr "Nazwa"
 
 msgctxt "field:product.product,rec_name:"
-msgid "Name"
-msgstr "Nazwa"
+msgid "Record Name"
+msgstr "Nazwa rekordu"
 
 msgctxt "field:product.product,template:"
 msgid "Product Template"
@@ -317,22 +331,25 @@ msgctxt "field:product.template,categories:"
 msgid "Categories"
 msgstr "Kategorie"
 
+msgctxt "field:product.template,categories_all:"
+msgid "Categories"
+msgstr "Kategorie"
+
 msgctxt "field:product.template,consumable:"
 msgid "Consumable"
 msgstr "Artykuły konsumpcyjne"
 
 msgctxt "field:product.template,cost_price:"
 msgid "Cost Price"
-msgstr "Cena fabryczna"
+msgstr "Cena kosztów"
 
 msgctxt "field:product.template,cost_price_method:"
-msgid "Cost Method"
-msgstr "Metoda kosztowa"
+msgid "Cost Price Method"
+msgstr ""
 
-#, fuzzy
-msgctxt "field:product.template,cost_prices:"
-msgid "Cost Prices"
-msgstr "Cena fabryczna"
+msgctxt "field:product.template,cost_price_methods:"
+msgid "Cost Price Methods"
+msgstr ""
 
 msgctxt "field:product.template,create_date:"
 msgid "Create Date"
@@ -344,11 +361,11 @@ msgstr "Utworzył"
 
 msgctxt "field:product.template,default_uom:"
 msgid "Default UOM"
-msgstr "Domyślna jednostka miary"
+msgstr "Domyślna jm"
 
 msgctxt "field:product.template,default_uom_category:"
 msgid "Default UOM Category"
-msgstr "Domyślna kategoria jednostki miary"
+msgstr "Domyślna kategoria jm"
 
 msgctxt "field:product.template,id:"
 msgid "ID"
@@ -356,12 +373,11 @@ msgstr "ID"
 
 msgctxt "field:product.template,list_price:"
 msgid "List Price"
-msgstr "Cena katalogowa"
+msgstr "Cena sprzedaży"
 
-#, fuzzy
 msgctxt "field:product.template,list_prices:"
 msgid "List Prices"
-msgstr "Cena katalogowa"
+msgstr "Ceny sprzedaży"
 
 msgctxt "field:product.template,name:"
 msgid "Name"
@@ -372,8 +388,8 @@ msgid "Variants"
 msgstr "Warianty"
 
 msgctxt "field:product.template,rec_name:"
-msgid "Name"
-msgstr "Nazwa"
+msgid "Record Name"
+msgstr "Nazwa rekordu"
 
 msgctxt "field:product.template,type:"
 msgid "Type"
@@ -404,8 +420,8 @@ msgid "ID"
 msgstr "ID"
 
 msgctxt "field:product.template-product.category,rec_name:"
-msgid "Name"
-msgstr "Nazwa"
+msgid "Record Name"
+msgstr "Nazwa rekordu"
 
 msgctxt "field:product.template-product.category,template:"
 msgid "Template"
@@ -419,9 +435,41 @@ msgctxt "field:product.template-product.category,write_uid:"
 msgid "Write User"
 msgstr "Zapisał"
 
+msgctxt "field:product.template-product.category.all,category:"
+msgid "Category"
+msgstr "Kategoria"
+
+msgctxt "field:product.template-product.category.all,create_date:"
+msgid "Create Date"
+msgstr "Data utworzenia"
+
+msgctxt "field:product.template-product.category.all,create_uid:"
+msgid "Create User"
+msgstr "Utworzył"
+
+msgctxt "field:product.template-product.category.all,id:"
+msgid "ID"
+msgstr "ID"
+
+msgctxt "field:product.template-product.category.all,rec_name:"
+msgid "Record Name"
+msgstr "Nazwa rekordu"
+
+msgctxt "field:product.template-product.category.all,template:"
+msgid "Template"
+msgstr "Szablon"
+
+msgctxt "field:product.template-product.category.all,write_date:"
+msgid "Write Date"
+msgstr "Data zapisu"
+
+msgctxt "field:product.template-product.category.all,write_uid:"
+msgid "Write User"
+msgstr "Zapisał"
+
 msgctxt "field:product.uom,active:"
 msgid "Active"
-msgstr "Aktywny"
+msgstr "Aktywna"
 
 msgctxt "field:product.uom,category:"
 msgid "Category"
@@ -456,8 +504,8 @@ msgid "Rate"
 msgstr ""
 
 msgctxt "field:product.uom,rec_name:"
-msgid "Name"
-msgstr "Nazwa"
+msgid "Record Name"
+msgstr "Nazwa rekordu"
 
 msgctxt "field:product.uom,rounding:"
 msgid "Rounding Precision"
@@ -492,8 +540,8 @@ msgid "Name"
 msgstr "Nazwa"
 
 msgctxt "field:product.uom.category,rec_name:"
-msgid "Name"
-msgstr "Nazwa"
+msgid "Record Name"
+msgstr "Nazwa rekordu"
 
 msgctxt "field:product.uom.category,uoms:"
 msgid "Unit of Measures"
@@ -529,7 +577,7 @@ msgstr "Kategorie"
 
 msgctxt "model:ir.action,name:act_product_configuration_form"
 msgid "Product Configuration"
-msgstr "Konfiguracja ustawień produktu"
+msgstr "Konfiguracja produktu"
 
 msgctxt "model:ir.action,name:act_product_form"
 msgid "Variants"
@@ -577,7 +625,7 @@ msgstr "Warianty"
 
 msgctxt "model:ir.ui.menu,name:menu_product_configuration"
 msgid "Product Configuration"
-msgstr "Konfiguracja ustawień produktu"
+msgstr "Konfiguracja produktu"
 
 msgctxt "model:ir.ui.menu,name:menu_template"
 msgid "Products"
@@ -597,7 +645,7 @@ msgstr "Produkt wg kategorii"
 
 msgctxt "model:product.configuration,name:"
 msgid "Product Configuration"
-msgstr "Konfiguracja ustawień produktu"
+msgstr "Konfiguracja produktu"
 
 msgctxt "model:product.configuration.default_cost_price_method,name:"
 msgid "Product Configuration Default Cost Price Method"
@@ -605,11 +653,15 @@ msgstr ""
 
 msgctxt "model:product.cost_price,name:"
 msgid "Product Cost Price"
+msgstr "Cena kosztów produktu"
+
+msgctxt "model:product.cost_price_method,name:"
+msgid "Product Cost Price Method"
 msgstr ""
 
 msgctxt "model:product.list_price,name:"
 msgid "Product List Price"
-msgstr ""
+msgstr "Cena sprzedaży produktu"
 
 msgctxt "model:product.product,name:"
 msgid "Product Variant"
@@ -623,49 +675,54 @@ msgctxt "model:product.template-product.category,name:"
 msgid "Template - Category"
 msgstr "Szablon - Kategoria"
 
+#, fuzzy
+msgctxt "model:product.template-product.category.all,name:"
+msgid "Template - Category All"
+msgstr "Szablon - Kategoria"
+
 msgctxt "model:product.uom,name:"
 msgid "Unit of measure"
-msgstr "Jednostki miary"
+msgstr "Jednostka miary"
 
 msgctxt "model:product.uom,name:uom_are"
 msgid "Are"
-msgstr "Are"
+msgstr "Ar"
 
 msgctxt "model:product.uom,name:uom_carat"
 msgid "Carat"
-msgstr "Carat"
+msgstr "Karat"
 
 msgctxt "model:product.uom,name:uom_centimeter"
 msgid "centimeter"
-msgstr "centimeter"
+msgstr "Centymetr"
 
 msgctxt "model:product.uom,name:uom_cubic_centimeter"
 msgid "Cubic centimeter"
-msgstr "Cubic centimeter"
+msgstr "Centymetr sześcienny"
 
 msgctxt "model:product.uom,name:uom_cubic_foot"
 msgid "Cubic foot"
-msgstr "Cubic foot"
+msgstr "Stopa sześcienna"
 
 msgctxt "model:product.uom,name:uom_cubic_inch"
 msgid "Cubic inch"
-msgstr "Cubic inch"
+msgstr "Cal sześcienny"
 
 msgctxt "model:product.uom,name:uom_cubic_meter"
 msgid "Cubic meter"
-msgstr "Cubic meter"
+msgstr "Metr sześcienny"
 
 msgctxt "model:product.uom,name:uom_day"
 msgid "Day"
-msgstr "Day"
+msgstr "Dzień"
 
 msgctxt "model:product.uom,name:uom_foot"
 msgid "Foot"
-msgstr "Foot"
+msgstr "Stopa"
 
 msgctxt "model:product.uom,name:uom_gallon"
 msgid "Gallon"
-msgstr "Gallon"
+msgstr "Galon"
 
 msgctxt "model:product.uom,name:uom_gram"
 msgid "Gram"
@@ -673,15 +730,15 @@ msgstr "Gram"
 
 msgctxt "model:product.uom,name:uom_hectare"
 msgid "Hectare"
-msgstr "Hectare"
+msgstr "Hektar"
 
 msgctxt "model:product.uom,name:uom_hour"
 msgid "Hour"
-msgstr "Hour"
+msgstr "Godzina"
 
 msgctxt "model:product.uom,name:uom_inch"
 msgid "Inch"
-msgstr "Inch"
+msgstr "Cal"
 
 msgctxt "model:product.uom,name:uom_kilogram"
 msgid "Kilogram"
@@ -689,71 +746,71 @@ msgstr "Kilogram"
 
 msgctxt "model:product.uom,name:uom_kilometer"
 msgid "Kilometer"
-msgstr "Kilometer"
+msgstr "Kilometr"
 
 msgctxt "model:product.uom,name:uom_liter"
 msgid "Liter"
-msgstr "Liter"
+msgstr "Litr"
 
 msgctxt "model:product.uom,name:uom_meter"
 msgid "Meter"
-msgstr "Meter"
+msgstr "Metr"
 
 msgctxt "model:product.uom,name:uom_mile"
 msgid "Mile"
-msgstr "Mile"
+msgstr "Mila"
 
 msgctxt "model:product.uom,name:uom_millimeter"
 msgid "Millimeter"
-msgstr "Millimeter"
+msgstr "Milimetr"
 
 msgctxt "model:product.uom,name:uom_minute"
 msgid "Minute"
-msgstr "Minute"
+msgstr "Minuta"
 
 msgctxt "model:product.uom,name:uom_ounce"
 msgid "Ounce"
-msgstr "Ounce"
+msgstr "Uncja"
 
 msgctxt "model:product.uom,name:uom_pound"
 msgid "Pound"
-msgstr "Pound"
+msgstr "Funt"
 
 msgctxt "model:product.uom,name:uom_second"
 msgid "Second"
-msgstr "Second"
+msgstr "Sekunda"
 
 msgctxt "model:product.uom,name:uom_square_centimeter"
 msgid "Square centimeter"
-msgstr "Square centimeter"
+msgstr "Centymetr kwadratowy"
 
 msgctxt "model:product.uom,name:uom_square_foot"
 msgid "Square foot"
-msgstr "Square foot"
+msgstr "Stopa kwadratowa"
 
 msgctxt "model:product.uom,name:uom_square_inch"
 msgid "Square inch"
-msgstr "Square inch"
+msgstr "Cal kwadratowy"
 
 msgctxt "model:product.uom,name:uom_square_meter"
 msgid "Square meter"
-msgstr "Square meter"
+msgstr "Metr kwadratowy"
 
 msgctxt "model:product.uom,name:uom_square_yard"
 msgid "Square yard"
-msgstr "Square yard"
+msgstr "Jard kwadratowy"
 
 msgctxt "model:product.uom,name:uom_unit"
 msgid "Unit"
-msgstr "Unit"
+msgstr "Sztuka"
 
 msgctxt "model:product.uom,name:uom_work_day"
 msgid "Work Day"
-msgstr "Work Day"
+msgstr "Dzień pracy"
 
 msgctxt "model:product.uom,name:uom_yard"
 msgid "Yard"
-msgstr "Yard"
+msgstr "Jard"
 
 msgctxt "model:product.uom,symbol:uom_are"
 msgid "a"
@@ -873,7 +930,7 @@ msgstr "yd²"
 
 msgctxt "model:product.uom,symbol:uom_unit"
 msgid "u"
-msgstr "u"
+msgstr "szt."
 
 msgctxt "model:product.uom,symbol:uom_work_day"
 msgid "wd"
@@ -885,35 +942,35 @@ msgstr "yd"
 
 msgctxt "model:product.uom.category,name:"
 msgid "Product uom category"
-msgstr "Kategoria jednostki miary produktu"
+msgstr "Kategoria jm produktu"
 
 msgctxt "model:product.uom.category,name:uom_cat_length"
 msgid "Length"
-msgstr "Length"
+msgstr "Długość"
 
 msgctxt "model:product.uom.category,name:uom_cat_surface"
 msgid "Surface"
-msgstr "Surface"
+msgstr "Powierzchnia"
 
 msgctxt "model:product.uom.category,name:uom_cat_time"
 msgid "Time"
-msgstr "Time"
+msgstr "Czas"
 
 msgctxt "model:product.uom.category,name:uom_cat_unit"
 msgid "Units"
-msgstr "Units"
+msgstr "Sztuki"
 
 msgctxt "model:product.uom.category,name:uom_cat_volume"
 msgid "Volume"
-msgstr "Volume"
+msgstr "Objętość"
 
 msgctxt "model:product.uom.category,name:uom_cat_weight"
 msgid "Weight"
-msgstr "Weight"
+msgstr "Waga"
 
 msgctxt "model:res.group,name:group_product_admin"
 msgid "Product Administration"
-msgstr "Administracja ustawieniami produktów"
+msgstr "Administracja produktem"
 
 msgctxt "selection:product.product,cost_price_method:"
 msgid "Average"
@@ -957,7 +1014,7 @@ msgstr "Usługa"
 
 msgctxt "view:product.category:"
 msgid "Children"
-msgstr "Elementy podrzędne"
+msgstr "Kategorie podrzędne"
 
 msgctxt "view:product.template:"
 msgid "General"
diff --git a/locale/pt_BR.po b/locale/pt_BR.po
index b7afdaf..cfe9761 100644
--- a/locale/pt_BR.po
+++ b/locale/pt_BR.po
@@ -1,4 +1,4 @@
-# 
+#
 msgid ""
 msgstr "Content-Type: text/plain; charset=utf-8\n"
 
@@ -48,8 +48,8 @@ msgid "Parent"
 msgstr "Pai"
 
 msgctxt "field:product.category,rec_name:"
-msgid "Name"
-msgstr "Nome"
+msgid "Record Name"
+msgstr "Nome do Registro"
 
 msgctxt "field:product.category,write_date:"
 msgid "Write Date"
@@ -76,8 +76,8 @@ msgid "ID"
 msgstr "ID"
 
 msgctxt "field:product.configuration,rec_name:"
-msgid "Name"
-msgstr "Nome"
+msgid "Record Name"
+msgstr "Nome do Registro"
 
 msgctxt "field:product.configuration,write_date:"
 msgid "Write Date"
@@ -105,8 +105,8 @@ msgid "ID"
 msgstr "ID"
 
 msgctxt "field:product.configuration.default_cost_price_method,rec_name:"
-msgid "Name"
-msgstr "Nome"
+msgid "Record Name"
+msgstr "Nome do Registro"
 
 msgctxt "field:product.configuration.default_cost_price_method,write_date:"
 msgid "Write Date"
@@ -124,10 +124,6 @@ msgctxt "field:product.cost_price,cost_price:"
 msgid "Cost Price"
 msgstr "Preço de Custo"
 
-msgctxt "field:product.cost_price,cost_price_method:"
-msgid "Cost Method"
-msgstr "Método de Custo"
-
 msgctxt "field:product.cost_price,create_date:"
 msgid "Create Date"
 msgstr "Data de criação"
@@ -140,19 +136,55 @@ msgctxt "field:product.cost_price,id:"
 msgid "ID"
 msgstr "ID"
 
+msgctxt "field:product.cost_price,product:"
+msgid "Product"
+msgstr "Produto"
+
 msgctxt "field:product.cost_price,rec_name:"
-msgid "Name"
-msgstr "Nome"
+msgid "Record Name"
+msgstr "Nome do Registro"
+
+msgctxt "field:product.cost_price,write_date:"
+msgid "Write Date"
+msgstr "Data de edição"
+
+msgctxt "field:product.cost_price,write_uid:"
+msgid "Write User"
+msgstr "Editado por"
 
-msgctxt "field:product.cost_price,template:"
+msgctxt "field:product.cost_price_method,company:"
+msgid "Company"
+msgstr "Empresa"
+
+msgctxt "field:product.cost_price_method,cost_price_method:"
+msgid "Cost Price Method"
+msgstr "Método de preço de custo"
+
+msgctxt "field:product.cost_price_method,create_date:"
+msgid "Create Date"
+msgstr "Data de criação"
+
+msgctxt "field:product.cost_price_method,create_uid:"
+msgid "Create User"
+msgstr "Criado por"
+
+msgctxt "field:product.cost_price_method,id:"
+msgid "ID"
+msgstr "ID"
+
+msgctxt "field:product.cost_price_method,rec_name:"
+msgid "Record Name"
+msgstr "Nome do Registro"
+
+msgctxt "field:product.cost_price_method,template:"
 msgid "Template"
 msgstr "Modelo"
 
-msgctxt "field:product.cost_price,write_date:"
+msgctxt "field:product.cost_price_method,write_date:"
 msgid "Write Date"
 msgstr "Data de edição"
 
-msgctxt "field:product.cost_price,write_uid:"
+msgctxt "field:product.cost_price_method,write_uid:"
 msgid "Write User"
 msgstr "Editado por"
 
@@ -177,8 +209,8 @@ msgid "List Price"
 msgstr "Preço de tabela"
 
 msgctxt "field:product.list_price,rec_name:"
-msgid "Name"
-msgstr "Nome"
+msgid "Record Name"
+msgstr "Nome do Registro"
 
 msgctxt "field:product.list_price,template:"
 msgid "Template"
@@ -200,6 +232,10 @@ msgctxt "field:product.product,categories:"
 msgid "Categories"
 msgstr "Categorias"
 
+msgctxt "field:product.product,categories_all:"
+msgid "Categories"
+msgstr "Categorias"
+
 msgctxt "field:product.product,code:"
 msgid "Code"
 msgstr "Código"
@@ -213,8 +249,12 @@ msgid "Cost Price"
 msgstr "Preço de Custo"
 
 msgctxt "field:product.product,cost_price_method:"
-msgid "Cost Method"
-msgstr "Método de Custo"
+msgid "Cost Price Method"
+msgstr "Método do preço de custo"
+
+msgctxt "field:product.product,cost_price_methods:"
+msgid "Cost Price Methods"
+msgstr "Métodos dos preços de custo"
 
 msgctxt "field:product.product,cost_price_uom:"
 msgid "Cost Price"
@@ -265,8 +305,8 @@ msgid "Name"
 msgstr "Nome"
 
 msgctxt "field:product.product,rec_name:"
-msgid "Name"
-msgstr "Nome"
+msgid "Record Name"
+msgstr "Nome do Registro"
 
 msgctxt "field:product.product,template:"
 msgid "Product Template"
@@ -292,6 +332,10 @@ msgctxt "field:product.template,categories:"
 msgid "Categories"
 msgstr "Categorias"
 
+msgctxt "field:product.template,categories_all:"
+msgid "Categories"
+msgstr "Categorias"
+
 msgctxt "field:product.template,consumable:"
 msgid "Consumable"
 msgstr "Consumível"
@@ -301,12 +345,12 @@ msgid "Cost Price"
 msgstr "Preço de custo"
 
 msgctxt "field:product.template,cost_price_method:"
-msgid "Cost Method"
-msgstr "Método de custo"
+msgid "Cost Price Method"
+msgstr "Método do preço de custo"
 
-msgctxt "field:product.template,cost_prices:"
-msgid "Cost Prices"
-msgstr "Preços de custo"
+msgctxt "field:product.template,cost_price_methods:"
+msgid "Cost Price Methods"
+msgstr "Métodos dos preços de custo "
 
 msgctxt "field:product.template,create_date:"
 msgid "Create Date"
@@ -345,8 +389,8 @@ msgid "Variants"
 msgstr "Variante"
 
 msgctxt "field:product.template,rec_name:"
-msgid "Name"
-msgstr "Nome"
+msgid "Record Name"
+msgstr "Nome do Registro"
 
 msgctxt "field:product.template,type:"
 msgid "Type"
@@ -377,8 +421,8 @@ msgid "ID"
 msgstr "ID"
 
 msgctxt "field:product.template-product.category,rec_name:"
-msgid "Name"
-msgstr "Nome"
+msgid "Record Name"
+msgstr "Nome do Registro"
 
 msgctxt "field:product.template-product.category,template:"
 msgid "Template"
@@ -392,6 +436,38 @@ msgctxt "field:product.template-product.category,write_uid:"
 msgid "Write User"
 msgstr "Editado por"
 
+msgctxt "field:product.template-product.category.all,category:"
+msgid "Category"
+msgstr "Categoria"
+
+msgctxt "field:product.template-product.category.all,create_date:"
+msgid "Create Date"
+msgstr "Data de criação"
+
+msgctxt "field:product.template-product.category.all,create_uid:"
+msgid "Create User"
+msgstr "Criado por"
+
+msgctxt "field:product.template-product.category.all,id:"
+msgid "ID"
+msgstr "ID"
+
+msgctxt "field:product.template-product.category.all,rec_name:"
+msgid "Record Name"
+msgstr "Nome do Registro"
+
+msgctxt "field:product.template-product.category.all,template:"
+msgid "Template"
+msgstr "Modelo"
+
+msgctxt "field:product.template-product.category.all,write_date:"
+msgid "Write Date"
+msgstr "Data de edição"
+
+msgctxt "field:product.template-product.category.all,write_uid:"
+msgid "Write User"
+msgstr "Editado por"
+
 msgctxt "field:product.uom,active:"
 msgid "Active"
 msgstr "Ativo"
@@ -429,8 +505,8 @@ msgid "Rate"
 msgstr "Taxa"
 
 msgctxt "field:product.uom,rec_name:"
-msgid "Name"
-msgstr "Nome"
+msgid "Record Name"
+msgstr "Nome do Registro"
 
 msgctxt "field:product.uom,rounding:"
 msgid "Rounding Precision"
@@ -465,8 +541,8 @@ msgid "Name"
 msgstr "Nome"
 
 msgctxt "field:product.uom.category,rec_name:"
-msgid "Name"
-msgstr "Nome"
+msgid "Record Name"
+msgstr "Nome do Registro"
 
 msgctxt "field:product.uom.category,uoms:"
 msgid "Unit of Measures"
@@ -584,6 +660,10 @@ msgctxt "model:product.cost_price,name:"
 msgid "Product Cost Price"
 msgstr "Preço de Custo do Produto"
 
+msgctxt "model:product.cost_price_method,name:"
+msgid "Product Cost Price Method"
+msgstr "Método do preço de custo do produto"
+
 msgctxt "model:product.list_price,name:"
 msgid "Product List Price"
 msgstr "Preço de Tabela do Produto"
@@ -600,6 +680,10 @@ msgctxt "model:product.template-product.category,name:"
 msgid "Template - Category"
 msgstr "Modelo - Categoria"
 
+msgctxt "model:product.template-product.category.all,name:"
+msgid "Template - Category All"
+msgstr "Modelo - Todas as Categorias"
+
 msgctxt "model:product.uom,name:"
 msgid "Unit of measure"
 msgstr "Unidade de medida"
diff --git a/locale/ru.po b/locale/ru.po
index 99b3ef9..92b80bf 100644
--- a/locale/ru.po
+++ b/locale/ru.po
@@ -1,4 +1,4 @@
-# 
+#
 msgid ""
 msgstr "Content-Type: text/plain; charset=utf-8\n"
 
@@ -50,8 +50,8 @@ msgid "Parent"
 msgstr "Предок"
 
 msgctxt "field:product.category,rec_name:"
-msgid "Name"
-msgstr "Полное наименование"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:product.category,write_date:"
 msgid "Write Date"
@@ -80,10 +80,9 @@ msgctxt "field:product.configuration,id:"
 msgid "ID"
 msgstr "ID"
 
-#, fuzzy
 msgctxt "field:product.configuration,rec_name:"
-msgid "Name"
-msgstr "Наименование"
+msgid "Record Name"
+msgstr ""
 
 #, fuzzy
 msgctxt "field:product.configuration,write_date:"
@@ -115,10 +114,9 @@ msgctxt "field:product.configuration.default_cost_price_method,id:"
 msgid "ID"
 msgstr "ID"
 
-#, fuzzy
 msgctxt "field:product.configuration.default_cost_price_method,rec_name:"
-msgid "Name"
-msgstr "Наименование"
+msgid "Record Name"
+msgstr ""
 
 #, fuzzy
 msgctxt "field:product.configuration.default_cost_price_method,write_date:"
@@ -140,11 +138,6 @@ msgid "Cost Price"
 msgstr "Себестоимость"
 
 #, fuzzy
-msgctxt "field:product.cost_price,cost_price_method:"
-msgid "Cost Method"
-msgstr "Учет стоимости"
-
-#, fuzzy
 msgctxt "field:product.cost_price,create_date:"
 msgid "Create Date"
 msgstr "Дата создания"
@@ -160,22 +153,63 @@ msgid "ID"
 msgstr "ID"
 
 #, fuzzy
+msgctxt "field:product.cost_price,product:"
+msgid "Product"
+msgstr "Продукция"
+
 msgctxt "field:product.cost_price,rec_name:"
-msgid "Name"
-msgstr "Наименование"
+msgid "Record Name"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:product.cost_price,write_date:"
+msgid "Write Date"
+msgstr "Дата изменения"
+
+#, fuzzy
+msgctxt "field:product.cost_price,write_uid:"
+msgid "Write User"
+msgstr "Изменено пользователем"
+
+msgctxt "field:product.cost_price_method,company:"
+msgid "Company"
+msgstr ""
+
+msgctxt "field:product.cost_price_method,cost_price_method:"
+msgid "Cost Price Method"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:product.cost_price_method,create_date:"
+msgid "Create Date"
+msgstr "Дата создания"
+
+#, fuzzy
+msgctxt "field:product.cost_price_method,create_uid:"
+msgid "Create User"
+msgstr "Создано пользователем"
+
+#, fuzzy
+msgctxt "field:product.cost_price_method,id:"
+msgid "ID"
+msgstr "ID"
+
+msgctxt "field:product.cost_price_method,rec_name:"
+msgid "Record Name"
+msgstr ""
 
 #, fuzzy
-msgctxt "field:product.cost_price,template:"
+msgctxt "field:product.cost_price_method,template:"
 msgid "Template"
 msgstr "Шаблон"
 
 #, fuzzy
-msgctxt "field:product.cost_price,write_date:"
+msgctxt "field:product.cost_price_method,write_date:"
 msgid "Write Date"
 msgstr "Дата изменения"
 
 #, fuzzy
-msgctxt "field:product.cost_price,write_uid:"
+msgctxt "field:product.cost_price_method,write_uid:"
 msgid "Write User"
 msgstr "Изменено пользователем"
 
@@ -203,10 +237,9 @@ msgctxt "field:product.list_price,list_price:"
 msgid "List Price"
 msgstr "Цена"
 
-#, fuzzy
 msgctxt "field:product.list_price,rec_name:"
-msgid "Name"
-msgstr "Наименование"
+msgid "Record Name"
+msgstr ""
 
 #, fuzzy
 msgctxt "field:product.list_price,template:"
@@ -232,6 +265,11 @@ msgctxt "field:product.product,categories:"
 msgid "Categories"
 msgstr "Категории"
 
+#, fuzzy
+msgctxt "field:product.product,categories_all:"
+msgid "Categories"
+msgstr "Категории"
+
 msgctxt "field:product.product,code:"
 msgid "Code"
 msgstr "Код"
@@ -246,10 +284,13 @@ msgctxt "field:product.product,cost_price:"
 msgid "Cost Price"
 msgstr "Себестоимость"
 
-#, fuzzy
 msgctxt "field:product.product,cost_price_method:"
-msgid "Cost Method"
-msgstr "Учет стоимости"
+msgid "Cost Price Method"
+msgstr ""
+
+msgctxt "field:product.product,cost_price_methods:"
+msgid "Cost Price Methods"
+msgstr ""
 
 msgctxt "field:product.product,cost_price_uom:"
 msgid "Cost Price"
@@ -305,8 +346,8 @@ msgid "Name"
 msgstr "Наименование"
 
 msgctxt "field:product.product,rec_name:"
-msgid "Name"
-msgstr "Наименование"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:product.product,template:"
 msgid "Product Template"
@@ -333,6 +374,11 @@ msgctxt "field:product.template,categories:"
 msgid "Categories"
 msgstr "Категории"
 
+#, fuzzy
+msgctxt "field:product.template,categories_all:"
+msgid "Categories"
+msgstr "Категории"
+
 msgctxt "field:product.template,consumable:"
 msgid "Consumable"
 msgstr "Потребляемый"
@@ -342,13 +388,12 @@ msgid "Cost Price"
 msgstr "Себестоимость"
 
 msgctxt "field:product.template,cost_price_method:"
-msgid "Cost Method"
-msgstr "Учет стоимости"
+msgid "Cost Price Method"
+msgstr ""
 
-#, fuzzy
-msgctxt "field:product.template,cost_prices:"
-msgid "Cost Prices"
-msgstr "Себестоимость"
+msgctxt "field:product.template,cost_price_methods:"
+msgid "Cost Price Methods"
+msgstr ""
 
 msgctxt "field:product.template,create_date:"
 msgid "Create Date"
@@ -388,8 +433,8 @@ msgid "Variants"
 msgstr "Разновидности"
 
 msgctxt "field:product.template,rec_name:"
-msgid "Name"
-msgstr "Наименование"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:product.template,type:"
 msgid "Type"
@@ -423,10 +468,9 @@ msgctxt "field:product.template-product.category,id:"
 msgid "ID"
 msgstr "ID"
 
-#, fuzzy
 msgctxt "field:product.template-product.category,rec_name:"
-msgid "Name"
-msgstr "Наименование"
+msgid "Record Name"
+msgstr ""
 
 #, fuzzy
 msgctxt "field:product.template-product.category,template:"
@@ -443,6 +487,45 @@ msgctxt "field:product.template-product.category,write_uid:"
 msgid "Write User"
 msgstr "Изменено пользователем"
 
+#, fuzzy
+msgctxt "field:product.template-product.category.all,category:"
+msgid "Category"
+msgstr "Категория"
+
+#, fuzzy
+msgctxt "field:product.template-product.category.all,create_date:"
+msgid "Create Date"
+msgstr "Дата создания"
+
+#, fuzzy
+msgctxt "field:product.template-product.category.all,create_uid:"
+msgid "Create User"
+msgstr "Создано пользователем"
+
+#, fuzzy
+msgctxt "field:product.template-product.category.all,id:"
+msgid "ID"
+msgstr "ID"
+
+msgctxt "field:product.template-product.category.all,rec_name:"
+msgid "Record Name"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:product.template-product.category.all,template:"
+msgid "Template"
+msgstr "Шаблон"
+
+#, fuzzy
+msgctxt "field:product.template-product.category.all,write_date:"
+msgid "Write Date"
+msgstr "Дата изменения"
+
+#, fuzzy
+msgctxt "field:product.template-product.category.all,write_uid:"
+msgid "Write User"
+msgstr "Изменено пользователем"
+
 msgctxt "field:product.uom,active:"
 msgid "Active"
 msgstr "Действующий"
@@ -481,8 +564,8 @@ msgid "Rate"
 msgstr "Коэфициент основной единицы"
 
 msgctxt "field:product.uom,rec_name:"
-msgid "Name"
-msgstr "Наименование"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:product.uom,rounding:"
 msgid "Rounding Precision"
@@ -517,8 +600,8 @@ msgid "Name"
 msgstr "Наименование"
 
 msgctxt "field:product.uom.category,rec_name:"
-msgid "Name"
-msgstr "Наименование"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:product.uom.category,uoms:"
 msgid "Unit of Measures"
@@ -638,6 +721,10 @@ msgctxt "model:product.cost_price,name:"
 msgid "Product Cost Price"
 msgstr ""
 
+msgctxt "model:product.cost_price_method,name:"
+msgid "Product Cost Price Method"
+msgstr ""
+
 msgctxt "model:product.list_price,name:"
 msgid "Product List Price"
 msgstr ""
@@ -654,6 +741,10 @@ msgctxt "model:product.template-product.category,name:"
 msgid "Template - Category"
 msgstr ""
 
+msgctxt "model:product.template-product.category.all,name:"
+msgid "Template - Category All"
+msgstr ""
+
 msgctxt "model:product.uom,name:"
 msgid "Unit of measure"
 msgstr "Единица измерения"
diff --git a/locale/sl.po b/locale/sl.po
index 729da78..f4d2a38 100644
--- a/locale/sl.po
+++ b/locale/sl.po
@@ -1,4 +1,4 @@
-# 
+#
 msgid ""
 msgstr "Content-Type: text/plain; charset=utf-8\n"
 
@@ -48,8 +48,8 @@ msgid "Parent"
 msgstr "Matična kategorija"
 
 msgctxt "field:product.category,rec_name:"
-msgid "Name"
-msgstr "Ime"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:product.category,write_date:"
 msgid "Write Date"
@@ -76,8 +76,8 @@ msgid "ID"
 msgstr "ID"
 
 msgctxt "field:product.configuration,rec_name:"
-msgid "Name"
-msgstr "Ime"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:product.configuration,write_date:"
 msgid "Write Date"
@@ -105,8 +105,8 @@ msgid "ID"
 msgstr "ID"
 
 msgctxt "field:product.configuration.default_cost_price_method,rec_name:"
-msgid "Name"
-msgstr "Ime"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:product.configuration.default_cost_price_method,write_date:"
 msgid "Write Date"
@@ -124,10 +124,6 @@ msgctxt "field:product.cost_price,cost_price:"
 msgid "Cost Price"
 msgstr "Nabavna cena"
 
-msgctxt "field:product.cost_price,cost_price_method:"
-msgid "Cost Method"
-msgstr "Obračun"
-
 msgctxt "field:product.cost_price,create_date:"
 msgid "Create Date"
 msgstr "Izdelano"
@@ -140,19 +136,63 @@ msgctxt "field:product.cost_price,id:"
 msgid "ID"
 msgstr "ID"
 
+#, fuzzy
+msgctxt "field:product.cost_price,product:"
+msgid "Product"
+msgstr "Izdelek"
+
 msgctxt "field:product.cost_price,rec_name:"
-msgid "Name"
-msgstr "Ime"
+msgid "Record Name"
+msgstr ""
+
+msgctxt "field:product.cost_price,write_date:"
+msgid "Write Date"
+msgstr "Zapisano"
+
+msgctxt "field:product.cost_price,write_uid:"
+msgid "Write User"
+msgstr "Zapisal"
+
+#, fuzzy
+msgctxt "field:product.cost_price_method,company:"
+msgid "Company"
+msgstr "Družba"
 
-msgctxt "field:product.cost_price,template:"
+msgctxt "field:product.cost_price_method,cost_price_method:"
+msgid "Cost Price Method"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:product.cost_price_method,create_date:"
+msgid "Create Date"
+msgstr "Izdelano"
+
+#, fuzzy
+msgctxt "field:product.cost_price_method,create_uid:"
+msgid "Create User"
+msgstr "Izdelal"
+
+#, fuzzy
+msgctxt "field:product.cost_price_method,id:"
+msgid "ID"
+msgstr "ID"
+
+msgctxt "field:product.cost_price_method,rec_name:"
+msgid "Record Name"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:product.cost_price_method,template:"
 msgid "Template"
 msgstr "Predloga"
 
-msgctxt "field:product.cost_price,write_date:"
+#, fuzzy
+msgctxt "field:product.cost_price_method,write_date:"
 msgid "Write Date"
 msgstr "Zapisano"
 
-msgctxt "field:product.cost_price,write_uid:"
+#, fuzzy
+msgctxt "field:product.cost_price_method,write_uid:"
 msgid "Write User"
 msgstr "Zapisal"
 
@@ -177,8 +217,8 @@ msgid "List Price"
 msgstr "Prodajna cena"
 
 msgctxt "field:product.list_price,rec_name:"
-msgid "Name"
-msgstr "Ime"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:product.list_price,template:"
 msgid "Template"
@@ -200,6 +240,11 @@ msgctxt "field:product.product,categories:"
 msgid "Categories"
 msgstr "Kategorije"
 
+#, fuzzy
+msgctxt "field:product.product,categories_all:"
+msgid "Categories"
+msgstr "Kategorije"
+
 msgctxt "field:product.product,code:"
 msgid "Code"
 msgstr "Šifra"
@@ -213,8 +258,12 @@ msgid "Cost Price"
 msgstr "Nabavna cena"
 
 msgctxt "field:product.product,cost_price_method:"
-msgid "Cost Method"
-msgstr "Obračun"
+msgid "Cost Price Method"
+msgstr ""
+
+msgctxt "field:product.product,cost_price_methods:"
+msgid "Cost Price Methods"
+msgstr ""
 
 msgctxt "field:product.product,cost_price_uom:"
 msgid "Cost Price"
@@ -265,8 +314,8 @@ msgid "Name"
 msgstr "Naziv"
 
 msgctxt "field:product.product,rec_name:"
-msgid "Name"
-msgstr "Ime"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:product.product,template:"
 msgid "Product Template"
@@ -292,6 +341,11 @@ msgctxt "field:product.template,categories:"
 msgid "Categories"
 msgstr "Kategorije"
 
+#, fuzzy
+msgctxt "field:product.template,categories_all:"
+msgid "Categories"
+msgstr "Kategorije"
+
 msgctxt "field:product.template,consumable:"
 msgid "Consumable"
 msgstr "Potrošni material"
@@ -301,12 +355,12 @@ msgid "Cost Price"
 msgstr "Nabavna cena"
 
 msgctxt "field:product.template,cost_price_method:"
-msgid "Cost Method"
-msgstr "Obračun"
+msgid "Cost Price Method"
+msgstr ""
 
-msgctxt "field:product.template,cost_prices:"
-msgid "Cost Prices"
-msgstr "Nabavne cene"
+msgctxt "field:product.template,cost_price_methods:"
+msgid "Cost Price Methods"
+msgstr ""
 
 msgctxt "field:product.template,create_date:"
 msgid "Create Date"
@@ -345,8 +399,8 @@ msgid "Variants"
 msgstr "Različice"
 
 msgctxt "field:product.template,rec_name:"
-msgid "Name"
-msgstr "Ime"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:product.template,type:"
 msgid "Type"
@@ -377,8 +431,8 @@ msgid "ID"
 msgstr "ID"
 
 msgctxt "field:product.template-product.category,rec_name:"
-msgid "Name"
-msgstr "Ime"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:product.template-product.category,template:"
 msgid "Template"
@@ -392,6 +446,45 @@ msgctxt "field:product.template-product.category,write_uid:"
 msgid "Write User"
 msgstr "Zapisal"
 
+#, fuzzy
+msgctxt "field:product.template-product.category.all,category:"
+msgid "Category"
+msgstr "Kategorija"
+
+#, fuzzy
+msgctxt "field:product.template-product.category.all,create_date:"
+msgid "Create Date"
+msgstr "Izdelano"
+
+#, fuzzy
+msgctxt "field:product.template-product.category.all,create_uid:"
+msgid "Create User"
+msgstr "Izdelal"
+
+#, fuzzy
+msgctxt "field:product.template-product.category.all,id:"
+msgid "ID"
+msgstr "ID"
+
+msgctxt "field:product.template-product.category.all,rec_name:"
+msgid "Record Name"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:product.template-product.category.all,template:"
+msgid "Template"
+msgstr "Predloga"
+
+#, fuzzy
+msgctxt "field:product.template-product.category.all,write_date:"
+msgid "Write Date"
+msgstr "Zapisano"
+
+#, fuzzy
+msgctxt "field:product.template-product.category.all,write_uid:"
+msgid "Write User"
+msgstr "Zapisal"
+
 msgctxt "field:product.uom,active:"
 msgid "Active"
 msgstr "Aktivno"
@@ -429,8 +522,8 @@ msgid "Rate"
 msgstr "Razmerje"
 
 msgctxt "field:product.uom,rec_name:"
-msgid "Name"
-msgstr "Ime"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:product.uom,rounding:"
 msgid "Rounding Precision"
@@ -465,8 +558,8 @@ msgid "Name"
 msgstr "Naziv"
 
 msgctxt "field:product.uom.category,rec_name:"
-msgid "Name"
-msgstr "Ime"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:product.uom.category,uoms:"
 msgid "Unit of Measures"
@@ -584,6 +677,10 @@ msgctxt "model:product.cost_price,name:"
 msgid "Product Cost Price"
 msgstr "Nabavna cena izdelka"
 
+msgctxt "model:product.cost_price_method,name:"
+msgid "Product Cost Price Method"
+msgstr ""
+
 msgctxt "model:product.list_price,name:"
 msgid "Product List Price"
 msgstr "Prodajna cena izdelka"
@@ -600,6 +697,11 @@ msgctxt "model:product.template-product.category,name:"
 msgid "Template - Category"
 msgstr "Predloga - Kategorija"
 
+#, fuzzy
+msgctxt "model:product.template-product.category.all,name:"
+msgid "Template - Category All"
+msgstr "Predloga - Kategorija"
+
 msgctxt "model:product.uom,name:"
 msgid "Unit of measure"
 msgstr "Merska enota"
diff --git a/locale/zh_CN.po b/locale/zh_CN.po
index 5389919..1017871 100644
--- a/locale/zh_CN.po
+++ b/locale/zh_CN.po
@@ -1,4 +1,4 @@
-# 
+#
 msgid ""
 msgstr "Content-Type: text/plain; charset=utf-8\n"
 
@@ -50,10 +50,9 @@ msgctxt "field:product.category,parent:"
 msgid "Parent"
 msgstr "上级"
 
-#, fuzzy
 msgctxt "field:product.category,rec_name:"
-msgid "Name"
-msgstr "纳木"
+msgid "Record Name"
+msgstr ""
 
 #, fuzzy
 msgctxt "field:product.category,write_date:"
@@ -84,10 +83,9 @@ msgctxt "field:product.configuration,id:"
 msgid "ID"
 msgstr "编号"
 
-#, fuzzy
 msgctxt "field:product.configuration,rec_name:"
-msgid "Name"
-msgstr "纳木"
+msgid "Record Name"
+msgstr ""
 
 #, fuzzy
 msgctxt "field:product.configuration,write_date:"
@@ -119,10 +117,9 @@ msgctxt "field:product.configuration.default_cost_price_method,id:"
 msgid "ID"
 msgstr "编号"
 
-#, fuzzy
 msgctxt "field:product.configuration.default_cost_price_method,rec_name:"
-msgid "Name"
-msgstr "纳木"
+msgid "Record Name"
+msgstr ""
 
 #, fuzzy
 msgctxt "field:product.configuration.default_cost_price_method,write_date:"
@@ -142,10 +139,6 @@ msgctxt "field:product.cost_price,cost_price:"
 msgid "Cost Price"
 msgstr ""
 
-msgctxt "field:product.cost_price,cost_price_method:"
-msgid "Cost Method"
-msgstr ""
-
 #, fuzzy
 msgctxt "field:product.cost_price,create_date:"
 msgid "Create Date"
@@ -161,13 +154,12 @@ msgctxt "field:product.cost_price,id:"
 msgid "ID"
 msgstr "编号"
 
-#, fuzzy
-msgctxt "field:product.cost_price,rec_name:"
-msgid "Name"
-msgstr "纳木"
+msgctxt "field:product.cost_price,product:"
+msgid "Product"
+msgstr ""
 
-msgctxt "field:product.cost_price,template:"
-msgid "Template"
+msgctxt "field:product.cost_price,rec_name:"
+msgid "Record Name"
 msgstr ""
 
 #, fuzzy
@@ -180,6 +172,47 @@ msgctxt "field:product.cost_price,write_uid:"
 msgid "Write User"
 msgstr "写入帐号"
 
+msgctxt "field:product.cost_price_method,company:"
+msgid "Company"
+msgstr ""
+
+msgctxt "field:product.cost_price_method,cost_price_method:"
+msgid "Cost Price Method"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:product.cost_price_method,create_date:"
+msgid "Create Date"
+msgstr "创建日期:"
+
+#, fuzzy
+msgctxt "field:product.cost_price_method,create_uid:"
+msgid "Create User"
+msgstr "添加用户"
+
+#, fuzzy
+msgctxt "field:product.cost_price_method,id:"
+msgid "ID"
+msgstr "编号"
+
+msgctxt "field:product.cost_price_method,rec_name:"
+msgid "Record Name"
+msgstr ""
+
+msgctxt "field:product.cost_price_method,template:"
+msgid "Template"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:product.cost_price_method,write_date:"
+msgid "Write Date"
+msgstr "写入日期"
+
+#, fuzzy
+msgctxt "field:product.cost_price_method,write_uid:"
+msgid "Write User"
+msgstr "写入帐号"
+
 msgctxt "field:product.list_price,company:"
 msgid "Company"
 msgstr ""
@@ -203,10 +236,9 @@ msgctxt "field:product.list_price,list_price:"
 msgid "List Price"
 msgstr ""
 
-#, fuzzy
 msgctxt "field:product.list_price,rec_name:"
-msgid "Name"
-msgstr "纳木"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:product.list_price,template:"
 msgid "Template"
@@ -231,6 +263,10 @@ msgctxt "field:product.product,categories:"
 msgid "Categories"
 msgstr ""
 
+msgctxt "field:product.product,categories_all:"
+msgid "Categories"
+msgstr ""
+
 #, fuzzy
 msgctxt "field:product.product,code:"
 msgid "Code"
@@ -245,7 +281,11 @@ msgid "Cost Price"
 msgstr ""
 
 msgctxt "field:product.product,cost_price_method:"
-msgid "Cost Method"
+msgid "Cost Price Method"
+msgstr ""
+
+msgctxt "field:product.product,cost_price_methods:"
+msgid "Cost Price Methods"
 msgstr ""
 
 msgctxt "field:product.product,cost_price_uom:"
@@ -301,10 +341,9 @@ msgctxt "field:product.product,name:"
 msgid "Name"
 msgstr "纳木"
 
-#, fuzzy
 msgctxt "field:product.product,rec_name:"
-msgid "Name"
-msgstr "纳木"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:product.product,template:"
 msgid "Product Template"
@@ -334,6 +373,10 @@ msgctxt "field:product.template,categories:"
 msgid "Categories"
 msgstr ""
 
+msgctxt "field:product.template,categories_all:"
+msgid "Categories"
+msgstr ""
+
 msgctxt "field:product.template,consumable:"
 msgid "Consumable"
 msgstr ""
@@ -343,11 +386,11 @@ msgid "Cost Price"
 msgstr ""
 
 msgctxt "field:product.template,cost_price_method:"
-msgid "Cost Method"
+msgid "Cost Price Method"
 msgstr ""
 
-msgctxt "field:product.template,cost_prices:"
-msgid "Cost Prices"
+msgctxt "field:product.template,cost_price_methods:"
+msgid "Cost Price Methods"
 msgstr ""
 
 #, fuzzy
@@ -390,10 +433,9 @@ msgctxt "field:product.template,products:"
 msgid "Variants"
 msgstr ""
 
-#, fuzzy
 msgctxt "field:product.template,rec_name:"
-msgid "Name"
-msgstr "纳木"
+msgid "Record Name"
+msgstr ""
 
 #, fuzzy
 msgctxt "field:product.template,type:"
@@ -429,10 +471,9 @@ msgctxt "field:product.template-product.category,id:"
 msgid "ID"
 msgstr "编号"
 
-#, fuzzy
 msgctxt "field:product.template-product.category,rec_name:"
-msgid "Name"
-msgstr "纳木"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:product.template-product.category,template:"
 msgid "Template"
@@ -448,6 +489,43 @@ msgctxt "field:product.template-product.category,write_uid:"
 msgid "Write User"
 msgstr "写入帐号"
 
+msgctxt "field:product.template-product.category.all,category:"
+msgid "Category"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:product.template-product.category.all,create_date:"
+msgid "Create Date"
+msgstr "创建日期:"
+
+#, fuzzy
+msgctxt "field:product.template-product.category.all,create_uid:"
+msgid "Create User"
+msgstr "添加用户"
+
+#, fuzzy
+msgctxt "field:product.template-product.category.all,id:"
+msgid "ID"
+msgstr "编号"
+
+msgctxt "field:product.template-product.category.all,rec_name:"
+msgid "Record Name"
+msgstr ""
+
+msgctxt "field:product.template-product.category.all,template:"
+msgid "Template"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:product.template-product.category.all,write_date:"
+msgid "Write Date"
+msgstr "写入日期"
+
+#, fuzzy
+msgctxt "field:product.template-product.category.all,write_uid:"
+msgid "Write User"
+msgstr "写入帐号"
+
 #, fuzzy
 msgctxt "field:product.uom,active:"
 msgid "Active"
@@ -489,10 +567,9 @@ msgctxt "field:product.uom,rate:"
 msgid "Rate"
 msgstr ""
 
-#, fuzzy
 msgctxt "field:product.uom,rec_name:"
-msgid "Name"
-msgstr "纳木"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:product.uom,rounding:"
 msgid "Rounding Precision"
@@ -532,10 +609,9 @@ msgctxt "field:product.uom.category,name:"
 msgid "Name"
 msgstr "纳木"
 
-#, fuzzy
 msgctxt "field:product.uom.category,rec_name:"
-msgid "Name"
-msgstr "纳木"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:product.uom.category,uoms:"
 msgid "Unit of Measures"
@@ -652,6 +728,10 @@ msgctxt "model:product.cost_price,name:"
 msgid "Product Cost Price"
 msgstr ""
 
+msgctxt "model:product.cost_price_method,name:"
+msgid "Product Cost Price Method"
+msgstr ""
+
 msgctxt "model:product.list_price,name:"
 msgid "Product List Price"
 msgstr ""
@@ -668,6 +748,10 @@ msgctxt "model:product.template-product.category,name:"
 msgid "Template - Category"
 msgstr ""
 
+msgctxt "model:product.template-product.category.all,name:"
+msgid "Template - Category All"
+msgstr ""
+
 msgctxt "model:product.uom,name:"
 msgid "Unit of measure"
 msgstr ""
diff --git a/product.py b/product.py
index 8cb1e76..fe1a7af 100644
--- a/product.py
+++ b/product.py
@@ -2,8 +2,11 @@
 # this repository contains the full copyright notices and license terms.
 import copy
 import logging
+from decimal import Decimal
 
-from trytond.model import ModelView, ModelSQL, Model, fields
+from sql import Null, Column
+
+from trytond.model import ModelView, ModelSQL, Model, UnionMixin, fields
 from trytond.pyson import Eval
 from trytond.transaction import Transaction
 from trytond.pool import Pool
@@ -14,7 +17,8 @@ from trytond.modules.company.model import (
     CompanyMultiValueMixin, CompanyValueMixin)
 
 __all__ = ['Template', 'Product', 'price_digits', 'TemplateFunction',
-    'ProductListPrice', 'ProductCostPrice', 'TemplateCategory']
+    'ProductListPrice', 'ProductCostPriceMethod', 'ProductCostPrice',
+    'TemplateCategory', 'TemplateCategoryAll']
 logger = logging.getLogger(__name__)
 
 STATES = {
@@ -52,14 +56,13 @@ class Template(ModelSQL, ModelView, CompanyMultiValueMixin):
             states=STATES, depends=DEPENDS))
     list_prices = fields.One2Many(
         'product.list_price', 'template', "List Prices")
-    cost_price = fields.MultiValue(fields.Numeric(
-            "Cost Price", required=True, digits=price_digits,
-            states=STATES, depends=DEPENDS))
+    cost_price = fields.Function(fields.Numeric(
+            "Cost Price", digits=price_digits), 'get_cost_price')
     cost_price_method = fields.MultiValue(fields.Selection(
-            COST_PRICE_METHODS, "Cost Method", required=True,
+            COST_PRICE_METHODS, "Cost Price Method", required=True,
             states=STATES, depends=DEPENDS))
-    cost_prices = fields.One2Many(
-        'product.cost_price', 'template', "Cost Prices")
+    cost_price_methods = fields.One2Many(
+        'product.cost_price_method', 'template', "Cost Price Methods")
     default_uom = fields.Many2One('product.uom', 'Default UOM', required=True,
         states=STATES, depends=DEPENDS)
     default_uom_category = fields.Function(
@@ -69,6 +72,9 @@ class Template(ModelSQL, ModelView, CompanyMultiValueMixin):
     active = fields.Boolean('Active', select=True)
     categories = fields.Many2Many('product.template-product.category',
         'template', 'category', 'Categories', states=STATES, depends=DEPENDS)
+    categories_all = fields.Many2Many(
+        'product.template-product.category.all',
+        'template', 'category', "Categories", readonly=True)
     products = fields.One2Many('product.product', 'template', 'Variants',
         states=STATES, depends=DEPENDS)
 
@@ -105,8 +111,8 @@ class Template(ModelSQL, ModelView, CompanyMultiValueMixin):
         pool = Pool()
         if field == 'list_price':
             return pool.get('product.list_price')
-        elif field in {'cost_price', 'cost_price_method'}:
-            return pool.get('product.cost_price')
+        elif field == 'cost_price_method':
+            return pool.get('product.cost_price_method')
         return super(Template, cls).multivalue_model(field)
 
     @staticmethod
@@ -121,6 +127,11 @@ class Template(ModelSQL, ModelView, CompanyMultiValueMixin):
     def default_consumable():
         return False
 
+    def get_cost_price(self, name):
+        if len(self.products) == 1:
+            product, = self.products
+            return product.cost_price
+
     @classmethod
     def default_cost_price_method(cls, **pattern):
         pool = Pool()
@@ -134,6 +145,11 @@ class Template(ModelSQL, ModelView, CompanyMultiValueMixin):
             return []
         return [{}]
 
+    @fields.depends('type', 'cost_price_method')
+    def on_change_type(self):
+        if self.type == 'service':
+            self.cost_price_method = 'fixed'
+
     @fields.depends('default_uom')
     def on_change_with_default_uom_category(self, name=None):
         if self.default_uom:
@@ -141,7 +157,8 @@ class Template(ModelSQL, ModelView, CompanyMultiValueMixin):
 
     @classmethod
     def search_default_uom_category(cls, name, clause):
-        return [('default_uom.category',) + tuple(clause[1:])]
+        return [('default_uom.category' + clause[0].lstrip(name),)
+            + tuple(clause[1:])]
 
     @classmethod
     def create(cls, vlist):
@@ -191,7 +208,7 @@ class TemplateFunction(fields.Function):
         return order
 
 
-class Product(ModelSQL, ModelView):
+class Product(ModelSQL, ModelView, CompanyMultiValueMixin):
     "Product Variant"
     __name__ = "product.product"
     _order_name = 'rec_name'
@@ -200,6 +217,11 @@ class Product(ModelSQL, ModelView):
         depends=DEPENDS)
     code = fields.Char("Code", size=None, select=True, states=STATES,
         depends=DEPENDS)
+    cost_price = fields.MultiValue(fields.Numeric(
+            "Cost Price", required=True, digits=price_digits,
+            states=STATES, depends=DEPENDS))
+    cost_prices = fields.One2Many(
+        'product.cost_price', 'product', "Cost Prices")
     description = fields.Text("Description", translate=True, states=STATES,
         depends=DEPENDS)
     active = fields.Boolean('Active', select=True)
@@ -258,8 +280,19 @@ class Product(ModelSQL, ModelView):
             return value
 
     @classmethod
+    def multivalue_model(cls, field):
+        pool = Pool()
+        if field == 'cost_price':
+            return pool.get('product.cost_price')
+        return super(Product, cls).multivalue_model(field)
+
+    @classmethod
+    def default_cost_price(cls, **pattern):
+        return Decimal(0)
+
+    @classmethod
     def search_template(cls, name, clause):
-        return [('template.%s' % name,) + tuple(clause[1:])]
+        return [('template.' + clause[0],) + tuple(clause[1:])]
 
     @classmethod
     def order_rec_name(cls, tables):
@@ -349,30 +382,46 @@ class ProductListPrice(ModelSQL, CompanyValueMixin):
             parent='template', fields=fields)
 
 
-class ProductCostPrice(ModelSQL, CompanyValueMixin):
-    "Product Cost Price"
-    __name__ = 'product.cost_price'
+class ProductCostPriceMethod(ModelSQL, CompanyValueMixin):
+    "Product Cost Price Method"
+    __name__ = 'product.cost_price_method'
     template = fields.Many2One(
         'product.template', "Template", ondelete='CASCADE', select=True)
-    cost_price = fields.Numeric(
-        "Cost Price", digits=price_digits)
     cost_price_method = fields.Selection(
-        'get_cost_price_methods', "Cost Method")
+        'get_cost_price_methods', "Cost Price Method")
 
     @classmethod
     def __register__(cls, module_name):
+        pool = Pool()
+        ProductCostPrice = pool.get('product.cost_price')
         TableHandler = backend.get('TableHandler')
+        sql_table = cls.__table__()
+        cost_price = ProductCostPrice.__table__()
+        cursor = Transaction().connection.cursor()
+
         exist = TableHandler.table_exist(cls._table)
+        cost_price_exist = TableHandler.table_exist(ProductCostPrice._table)
 
-        super(ProductCostPrice, cls).__register__(module_name)
+        super(ProductCostPriceMethod, cls).__register__(module_name)
 
-        if not exist:
+        # Migrate from 4.4: move cost_price_method from ProductCostPrice
+        if not exist and not cost_price_exist:
             cls._migrate_property([], [], [])
+        elif not exist and cost_price_exist:
+            cost_price_table = TableHandler(ProductCostPrice, module_name)
+            if cost_price_table.column_exist('template'):
+                columns = ['create_uid', 'create_date',
+                    'write_uid', 'write_date',
+                    'template', 'cost_price_method']
+                cursor.execute(*sql_table.insert(
+                        columns=[Column(sql_table, c) for c in columns],
+                        values=cost_price.select(
+                            *[Column(cost_price, c) for c in columns])))
 
     @classmethod
     def _migrate_property(cls, field_names, value_names, fields):
-        field_names.extend(['cost_price', 'cost_price_method'])
-        value_names.extend(['cost_price', 'cost_price_method'])
+        field_names.append('cost_price_method')
+        value_names.append('cost_price_method')
         fields.append('company')
         migrate_property(
             'product.template', field_names, cls, value_names,
@@ -388,6 +437,62 @@ class ProductCostPrice(ModelSQL, CompanyValueMixin):
         return methods
 
 
+class ProductCostPrice(ModelSQL, CompanyValueMixin):
+    "Product Cost Price"
+    __name__ = 'product.cost_price'
+    product = fields.Many2One(
+        'product.product', "Product", ondelete='CASCADE', select=True)
+    cost_price = fields.Numeric(
+        "Cost Price", digits=price_digits)
+
+    @classmethod
+    def __register__(cls, module_name):
+        pool = Pool()
+        Product = pool.get('product.product')
+        TableHandler = backend.get('TableHandler')
+        sql_table = cls.__table__()
+        product = Product.__table__()
+        cursor = Transaction().connection.cursor()
+
+        exist = TableHandler.table_exist(cls._table)
+
+        super(ProductCostPrice, cls).__register__(module_name)
+
+        table = TableHandler(cls, module_name)
+        if not exist:
+            # Create template column for property migration
+            table.add_column('template', 'INTEGER')
+            cls._migrate_property([], [], [])
+
+        # Migration from 4.4: replace template by product
+        if table.column_exist('template'):
+            columns = ['create_uid', 'create_date',
+                'write_uid', 'write_date', 'cost_price']
+            cursor.execute(*sql_table.insert(
+                    columns=[Column(sql_table, c) for c in columns]
+                    + [sql_table.product],
+                    values=sql_table.join(product,
+                        condition=sql_table.template == product.template
+                        ).select(
+                        *[Column(sql_table, c) for c in columns]
+                        + [product.id],
+                        where=(sql_table.template != Null)
+                        & (sql_table.product == Null))))
+            cursor.execute(*sql_table.delete(
+                    where=(sql_table.template != Null)
+                    & (sql_table.product == Null)))
+            table.drop_column('template')
+
+    @classmethod
+    def _migrate_property(cls, field_names, value_names, fields):
+        field_names.append('cost_price')
+        value_names.append('cost_price')
+        fields.append('company')
+        migrate_property(
+            'product.template', field_names, cls, value_names,
+            parent='template', fields=fields)
+
+
 class TemplateCategory(ModelSQL):
     'Template - Category'
     __name__ = 'product.template-product.category'
@@ -395,3 +500,14 @@ class TemplateCategory(ModelSQL):
         ondelete='CASCADE', required=True, select=True)
     category = fields.Many2One('product.category', 'Category',
         ondelete='CASCADE', required=True, select=True)
+
+
+class TemplateCategoryAll(UnionMixin, ModelSQL):
+    "Template - Category All"
+    __name__ = 'product.template-product.category.all'
+    template = fields.Many2One('product.template', "Template")
+    category = fields.Many2One('product.category', "Category")
+
+    @classmethod
+    def union_models(cls):
+        return ['product.template-product.category']
diff --git a/product.xml b/product.xml
index 42c8bd4..9f851a5 100644
--- a/product.xml
+++ b/product.xml
@@ -67,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="[('categories','child_of', [Eval('active_id')], 'parent')]"
+                eval="[('categories_all','child_of', [Eval('active_id')], 'parent')]"
                 pyson="1"/>
         </record>
         <record model="ir.action.act_window.view" id="act_template_by_category_view1">
diff --git a/setup.py b/setup.py
index cbabf51..27ff092 100644
--- a/setup.py
+++ b/setup.py
@@ -97,9 +97,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 :: 3.6',
         'Programming Language :: Python :: Implementation :: CPython',
         'Programming Language :: Python :: Implementation :: PyPy',
         'Topic :: Office/Business',
diff --git a/tests/test_product.py b/tests/test_product.py
index 88d7089..bdc48ed 100644
--- a/tests/test_product.py
+++ b/tests/test_product.py
@@ -226,7 +226,6 @@ class ProductTestCase(ModuleTestCase):
                     'name': 'P1',
                     'type': 'goods',
                     'list_price': Decimal(20),
-                    'cost_price': Decimal(10),
                     'default_uom': kilogram.id,
                     'products': [('create', [{
                                     'code': '1',
@@ -235,7 +234,6 @@ class ProductTestCase(ModuleTestCase):
                     'name': 'P2',
                     'type': 'goods',
                     'list_price': Decimal(20),
-                    'cost_price': Decimal(10),
                     'default_uom': millimeter.id,
                     'products': [('create', [{
                                     'code': '2',
@@ -267,7 +265,6 @@ class ProductTestCase(ModuleTestCase):
             'categories': [('add', [category1.id])],
             'type': 'goods',
             'list_price': Decimal('10'),
-            'cost_price': Decimal('5'),
             'default_uom': uom.id,
             'products': [('create', [{}])],
             }
@@ -276,7 +273,6 @@ class ProductTestCase(ModuleTestCase):
             'categories': [('add', [category2.id])],
             'type': 'goods',
             'list_price': Decimal('10'),
-            'cost_price': Decimal('5'),
             'default_uom': uom.id,
             'products': [('create', [{}])],
             }
@@ -348,7 +344,6 @@ class ProductTestCase(ModuleTestCase):
             'name': 'Product A',
             'type': 'assets',
             'list_price': Decimal('10'),
-            'cost_price': Decimal('5'),
             'default_uom': uom.id,
             'products': [('create', [{'code': 'AA'}])],
             }
@@ -356,7 +351,6 @@ class ProductTestCase(ModuleTestCase):
             'name': 'Product B',
             'type': 'goods',
             'list_price': Decimal('10'),
-            'cost_price': Decimal('5'),
             'default_uom': uom.id,
             'products': [('create', [{'code': 'BB'}])],
             }
diff --git a/tox.ini b/tox.ini
new file mode 100644
index 0000000..527d859
--- /dev/null
+++ b/tox.ini
@@ -0,0 +1,18 @@
+[tox]
+envlist = {py27,py34,py35,py36}-{sqlite,postgresql,mysql},pypy-{sqlite,postgresql}
+
+[testenv]
+commands = {envpython} setup.py test
+deps =
+    {py27,py34,py35,py36}-postgresql: psycopg2 >= 2.5
+    pypy-postgresql: psycopg2cffi >= 2.5
+    mysql: MySQL-python
+    sqlite: sqlitebck
+setenv =
+    sqlite: TRYTOND_DATABASE_URI={env:SQLITE_URI:sqlite://}
+    postgresql: TRYTOND_DATABASE_URI={env:POSTGRESQL_URI:postgresql://}
+    mysql: TRYTOND_DATABASE_URI={env:MYSQL_URI:mysql://}
+    sqlite: DB_NAME={env:SQLITE_NAME::memory:}
+    postgresql: DB_NAME={env:POSTGRESQL_NAME:test}
+    mysql: DB_NAME={env:MYSQL_NAME:test}
+install_command = pip install --pre --find-links https://trydevpi.tryton.org/ {opts} {packages}
diff --git a/tryton.cfg b/tryton.cfg
index 182afb1..f911b56 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
 [tryton]
-version=4.4.1
+version=4.6.0
 depends:
     company
     ir
diff --git a/trytond_product.egg-info/PKG-INFO b/trytond_product.egg-info/PKG-INFO
index 7ef5b65..3cc2945 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: 4.4.1
+Version: 4.6.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/4.4/
+Download-URL: http://downloads.tryton.org/4.6/
 Description: trytond_product
         ===============
         
@@ -70,9 +70,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 :: 3.6
 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 770e979..71f58fb 100644
--- a/trytond_product.egg-info/SOURCES.txt
+++ b/trytond_product.egg-info/SOURCES.txt
@@ -1,14 +1,22 @@
+.drone.yml
+.hgtags
 CHANGELOG
 COPYRIGHT
 INSTALL
 LICENSE
 MANIFEST.in
 README
+__init__.py
+category.py
 category.xml
+configuration.py
 configuration.xml
+product.py
 product.xml
 setup.py
+tox.ini
 tryton.cfg
+uom.py
 uom.xml
 ./__init__.py
 ./category.py
@@ -75,6 +83,8 @@ locale/pt_BR.po
 locale/ru.po
 locale/sl.po
 locale/zh_CN.po
+tests/__init__.py
+tests/test_product.py
 trytond_product.egg-info/PKG-INFO
 trytond_product.egg-info/SOURCES.txt
 trytond_product.egg-info/dependency_links.txt
diff --git a/trytond_product.egg-info/requires.txt b/trytond_product.egg-info/requires.txt
index 8f57eb3..dffe5ec 100644
--- a/trytond_product.egg-info/requires.txt
+++ b/trytond_product.egg-info/requires.txt
@@ -1,3 +1,3 @@
 python-sql
-trytond_company >= 4.4, < 4.5
-trytond >= 4.4, < 4.5
+trytond_company >= 4.6, < 4.7
+trytond >= 4.6, < 4.7
diff --git a/view/product_form_simple.xml b/view/product_form_simple.xml
index 4665bde..e46feb3 100644
--- a/view/product_form_simple.xml
+++ b/view/product_form_simple.xml
@@ -1,13 +1,16 @@
 <?xml version="1.0"?>
 <!-- This file is part of Tryton.  The COPYRIGHT file at the top level of
 this repository contains the full copyright notices and license terms. -->
-<form col="6">
+<form>
     <label name="template"/>
     <field name="template"/>
+    <newline/>
     <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"/>
+    <label name="cost_price"/>
+    <field name="cost_price"/>
+    <separator name="description" colspan="4"/>
+    <field name="description" colspan="4"/>
 </form>
-- 
tryton-modules-product



More information about the tryton-debian-vcs mailing list