[tryton-debian-vcs] tryton-modules-product branch upstream updated. upstream/4.2.1-1-g52d0cef

Mathias Behrle tryton-debian-vcs at alioth.debian.org
Wed Jun 7 13:34:08 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.2.1-1-g52d0cef

commit 52d0cefb25b4b8cadf4366a0904d202f3be7a587
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Wed Jun 7 15:26:46 2017 +0200

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

diff --git a/CHANGELOG b/CHANGELOG
index 0e3441d..b9eaa85 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,5 +1,6 @@
-Version 4.2.1 - 2017-01-03
+Version 4.4.0 - 2017-05-01
 * Bug fixes (see mercurial logs for details)
+* Add ceil and floor as uom rounding
 
 Version 4.2.0 - 2016-11-28
 * Bug fixes (see mercurial logs for details)
diff --git a/COPYRIGHT b/COPYRIGHT
index 48f96af..dba4452 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -1,6 +1,6 @@
-Copyright (C) 2008-2016 Cédric Krier.
+Copyright (C) 2008-2017 Cédric Krier.
 Copyright (C) 2008-2013 Bertrand Chenal.
-Copyright (C) 2008-2016 B2CK SPRL.
+Copyright (C) 2008-2017 B2CK SPRL.
 Copyright (C) 2004-2008 Tiny SPRL.
 
 This program is free software: you can redistribute it and/or modify
diff --git a/PKG-INFO b/PKG-INFO
index b36f214..a4f28bd 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,12 +1,12 @@
 Metadata-Version: 1.1
 Name: trytond_product
-Version: 4.2.1
+Version: 4.4.0
 Summary: Tryton module with products
 Home-page: http://www.tryton.org/
 Author: Tryton
 Author-email: issue_tracker at tryton.org
 License: GPL-3
-Download-URL: http://downloads.tryton.org/4.2/
+Download-URL: http://downloads.tryton.org/4.4/
 Description: trytond_product
         ===============
         
@@ -52,7 +52,7 @@ Classifier: Intended Audience :: Developers
 Classifier: Intended Audience :: Financial and Insurance Industry
 Classifier: Intended Audience :: Legal Industry
 Classifier: Intended Audience :: Manufacturing
-Classifier: License :: OSI Approved :: GNU General Public License (GPL)
+Classifier: License :: OSI Approved :: GNU General Public License v3 or later (GPLv3+)
 Classifier: Natural Language :: Bulgarian
 Classifier: Natural Language :: Catalan
 Classifier: Natural Language :: Chinese (Simplified)
diff --git a/__init__.py b/__init__.py
index ffbe78e..f567154 100644
--- a/__init__.py
+++ b/__init__.py
@@ -15,6 +15,9 @@ def register():
         Category,
         Template,
         Product,
+        ProductListPrice,
+        ProductCostPrice,
         TemplateCategory,
         Configuration,
+        ConfigurationDefaultCostPriceMethod,
         module='product', type_='model')
diff --git a/configuration.py b/configuration.py
index 4207ec4..051bbe9 100644
--- a/configuration.py
+++ b/configuration.py
@@ -1,76 +1,63 @@
 # This file is part of Tryton.  The COPYRIGHT file at the top level of
 # this repository contains the full copyright notices and license terms.
-from trytond.model import ModelView, ModelSQL, ModelSingleton, fields
+from trytond import backend
+from trytond.model import (ModelView, ModelSQL, ModelSingleton,
+    MultiValueMixin, ValueMixin, fields)
 from trytond.pool import Pool
-from trytond.rpc import RPC
+from trytond.tools.multivalue import migrate_property
 
-__all__ = ['Configuration']
+__all__ = ['Configuration', 'ConfigurationDefaultCostPriceMethod']
+default_cost_price_method = fields.Selection(
+    'get_cost_price_methods', "Default Cost Method")
 
 
-class Configuration(ModelSingleton, ModelSQL, ModelView):
+ at classmethod
+def get_cost_price_methods(cls):
+    pool = Pool()
+    Template = pool.get('product.template')
+    field_name = 'cost_price_method'
+    return (Template.fields_get([field_name])[field_name]['selection']
+        + [(None, '')])
+
+
+class Configuration(ModelSingleton, ModelSQL, ModelView, MultiValueMixin):
     'Product Configuration'
     __name__ = 'product.configuration'
 
-    default_cost_price_method = fields.Function(fields.Selection(
-            'get_cost_price_methods', 'Default Cost Method'),
-        'get_default_cost_price_method',
-        setter='set_default_cost_price_method')
+    default_cost_price_method = fields.MultiValue(default_cost_price_method)
+    get_cost_price_methods = get_cost_price_methods
 
     @classmethod
-    def __setup__(cls):
-        super(Configuration, cls).__setup__()
-        cls.__rpc__['get_cost_price_methods'] = RPC()
+    def default_default_cost_price_method(cls, **pattern):
+        return cls.multivalue_model(
+            'default_cost_price_method').default_default_cost_price_method()
 
-    @classmethod
-    def default_default_cost_price_method(cls):
-        return cls().get_default_cost_price_method('default_cost_price_method')
 
-    @classmethod
-    def get_cost_price_methods(cls):
-        pool = Pool()
-        Template = pool.get('product.template')
-        return (Template.fields_get(
-                ['cost_price_method'])['cost_price_method']['selection']
-            + [(None, '')])
+class ConfigurationDefaultCostPriceMethod(ModelSQL, ValueMixin):
+    "Product Configuration Default Cost Price Method"
+    __name__ = 'product.configuration.default_cost_price_method'
+    default_cost_price_method = default_cost_price_method
+    get_cost_price_methods = get_cost_price_methods
 
     @classmethod
-    def _get_product_field(cls, name):
-        pool = Pool()
-        ModelField = pool.get('ir.model.field')
+    def __register__(cls, module_name):
+        TableHandler = backend.get('TableHandler')
+        exist = TableHandler.table_exist(cls._table)
+
+        super(ConfigurationDefaultCostPriceMethod, cls).__register__(
+            module_name)
 
-        for model in ['product.product', 'product.template']:
-            fields = ModelField.search([
-                    ('model.model', '=', model),
-                    ('name', '=', name),
-                    ], limit=1)
-            if fields:
-                return fields[0]
+        if not exist:
+            cls._migrate_property([], [], [])
 
-    def get_default_cost_price_method(self, name):
-        pool = Pool()
-        Property = pool.get('ir.property')
-        field = self._get_product_field('cost_price_method')
-        properties = Property.search([
-                ('field', '=', field.id),
-                ('res', '=', None),
-                ], limit=1)
-        if properties:
-            prop, = properties
-            if prop.value:
-                return prop.value.split(',')[1]
+    @classmethod
+    def _migrate_property(cls, field_names, value_names, fields):
+        field_names.append('default_cost_price_method')
+        value_names.append('default_cost_price_method')
+        migrate_property(
+            'product.configuration', field_names, cls, value_names,
+            fields=fields)
 
     @classmethod
-    def set_default_cost_price_method(cls, configurations, name, value):
-        pool = Pool()
-        Property = pool.get('ir.property')
-        field = cls._get_product_field('cost_price_method')
-        properties = Property.search([
-                ('field', '=', field.id),
-                ('res', '=', None),
-                ])
-        Property.delete(properties)
-        if value:
-            Property.create([{
-                        'field': field.id,
-                        'value': ',%s' % value,
-                        }])
+    def default_default_cost_price_method(cls):
+        return 'fixed'
diff --git a/configuration.xml b/configuration.xml
index dfabb43..a764ecd 100644
--- a/configuration.xml
+++ b/configuration.xml
@@ -30,10 +30,9 @@ this repository contains the full copyright notices and license terms. -->
         </record>
     </data>
     <data noupdate="1">
-        <record model="ir.property" id="property_cost_price_method">
-            <field name="field"
-                search="[('model.model', '=', 'product.template'), ('name', '=', 'cost_price_method')]"/>
-            <field name="value">,fixed</field>
+        <record model="product.configuration.default_cost_price_method"
+            id="cost_price_method">
+            <field name="default_cost_price_method">fixed</field>
         </record>
     </data>
 </tryton>
diff --git a/locale/bg.po b/locale/bg.po
index 8198b01..c2d3dcc 100644
--- a/locale/bg.po
+++ b/locale/bg.po
@@ -95,6 +95,134 @@ msgid "Write User"
 msgstr "Променено от"
 
 #, fuzzy
+msgctxt "field:product.configuration.default_cost_price_method,create_date:"
+msgid "Create Date"
+msgstr "Създадено на"
+
+#, fuzzy
+msgctxt "field:product.configuration.default_cost_price_method,create_uid:"
+msgid "Create User"
+msgstr "Създадено от"
+
+msgctxt ""
+"field:product.configuration.default_cost_price_method,default_cost_price_method:"
+msgid "Default Cost Method"
+msgstr ""
+
+#, 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 "Име"
+
+#, fuzzy
+msgctxt "field:product.configuration.default_cost_price_method,write_date:"
+msgid "Write Date"
+msgstr "Променено на"
+
+#, fuzzy
+msgctxt "field:product.configuration.default_cost_price_method,write_uid:"
+msgid "Write User"
+msgstr "Променено от"
+
+msgctxt "field:product.cost_price,company:"
+msgid "Company"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:product.cost_price,cost_price:"
+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 "Създадено на"
+
+#, fuzzy
+msgctxt "field:product.cost_price,create_uid:"
+msgid "Create User"
+msgstr "Създадено от"
+
+#, fuzzy
+msgctxt "field:product.cost_price,id:"
+msgid "ID"
+msgstr "ID"
+
+#, fuzzy
+msgctxt "field:product.cost_price,rec_name:"
+msgid "Name"
+msgstr "Име"
+
+#, fuzzy
+msgctxt "field:product.cost_price,template:"
+msgid "Template"
+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.list_price,company:"
+msgid "Company"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:product.list_price,create_date:"
+msgid "Create Date"
+msgstr "Създадено на"
+
+#, fuzzy
+msgctxt "field:product.list_price,create_uid:"
+msgid "Create User"
+msgstr "Създадено от"
+
+#, fuzzy
+msgctxt "field:product.list_price,id:"
+msgid "ID"
+msgstr "ID"
+
+#, fuzzy
+msgctxt "field:product.list_price,list_price:"
+msgid "List Price"
+msgstr "Каталожна цена"
+
+#, fuzzy
+msgctxt "field:product.list_price,rec_name:"
+msgid "Name"
+msgstr "Име"
+
+#, fuzzy
+msgctxt "field:product.list_price,template:"
+msgid "Template"
+msgstr "Шаблон"
+
+#, fuzzy
+msgctxt "field:product.list_price,write_date:"
+msgid "Write Date"
+msgstr "Променено на"
+
+#, fuzzy
+msgctxt "field:product.list_price,write_uid:"
+msgid "Write User"
+msgstr "Променено от"
+
+#, fuzzy
 msgctxt "field:product.product,active:"
 msgid "Active"
 msgstr "Активен"
@@ -128,6 +256,11 @@ msgctxt "field:product.product,cost_price_uom:"
 msgid "Cost Price"
 msgstr "Фабрична цена"
 
+#, fuzzy
+msgctxt "field:product.product,cost_prices:"
+msgid "Cost Prices"
+msgstr "Фабрична цена"
+
 msgctxt "field:product.product,create_date:"
 msgid "Create Date"
 msgstr "Създадено на"
@@ -165,6 +298,11 @@ msgid "List Price"
 msgstr "Каталожна цена"
 
 #, fuzzy
+msgctxt "field:product.product,list_prices:"
+msgid "List Prices"
+msgstr "Каталожна цена"
+
+#, fuzzy
 msgctxt "field:product.product,name:"
 msgid "Name"
 msgstr "Име"
@@ -211,6 +349,11 @@ msgctxt "field:product.template,cost_price_method:"
 msgid "Cost Method"
 msgstr "Начин на остойностяване"
 
+#, fuzzy
+msgctxt "field:product.template,cost_prices:"
+msgid "Cost Prices"
+msgstr "Фабрична цена"
+
 msgctxt "field:product.template,create_date:"
 msgid "Create Date"
 msgstr "Създадено на"
@@ -235,6 +378,11 @@ msgctxt "field:product.template,list_price:"
 msgid "List Price"
 msgstr "Каталожна цена"
 
+#, fuzzy
+msgctxt "field:product.template,list_prices:"
+msgid "List Prices"
+msgstr "Каталожна цена"
+
 msgctxt "field:product.template,name:"
 msgid "Name"
 msgstr "Име"
@@ -492,6 +640,18 @@ msgctxt "model:product.configuration,name:"
 msgid "Product Configuration"
 msgstr ""
 
+msgctxt "model:product.configuration.default_cost_price_method,name:"
+msgid "Product Configuration Default Cost Price Method"
+msgstr ""
+
+msgctxt "model:product.cost_price,name:"
+msgid "Product Cost Price"
+msgstr ""
+
+msgctxt "model:product.list_price,name:"
+msgid "Product List Price"
+msgstr ""
+
 #, fuzzy
 msgctxt "model:product.product,name:"
 msgid "Product Variant"
diff --git a/locale/ca.po b/locale/ca.po
index f39f80a..d33c2b8 100644
--- a/locale/ca.po
+++ b/locale/ca.po
@@ -88,6 +88,111 @@ msgctxt "field:product.configuration,write_uid:"
 msgid "Write User"
 msgstr "Usuari de modificació"
 
+msgctxt "field:product.configuration.default_cost_price_method,create_date:"
+msgid "Create Date"
+msgstr "Data de creació"
+
+msgctxt "field:product.configuration.default_cost_price_method,create_uid:"
+msgid "Create User"
+msgstr "Usuari de creació"
+
+msgctxt ""
+"field:product.configuration.default_cost_price_method,default_cost_price_method:"
+msgid "Default Cost Method"
+msgstr "Mètode de cost per defecte"
+
+msgctxt "field:product.configuration.default_cost_price_method,id:"
+msgid "ID"
+msgstr "ID"
+
+msgctxt "field:product.configuration.default_cost_price_method,rec_name:"
+msgid "Name"
+msgstr "Nom"
+
+msgctxt "field:product.configuration.default_cost_price_method,write_date:"
+msgid "Write Date"
+msgstr "Data de modificació"
+
+msgctxt "field:product.configuration.default_cost_price_method,write_uid:"
+msgid "Write User"
+msgstr "Usuari de modificació"
+
+msgctxt "field:product.cost_price,company:"
+msgid "Company"
+msgstr "Empresa"
+
+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ó"
+
+msgctxt "field:product.cost_price,create_uid:"
+msgid "Create User"
+msgstr "Usuari de creació"
+
+msgctxt "field:product.cost_price,id:"
+msgid "ID"
+msgstr "ID"
+
+msgctxt "field:product.cost_price,rec_name:"
+msgid "Name"
+msgstr "Nom"
+
+msgctxt "field:product.cost_price,template:"
+msgid "Template"
+msgstr "Plantilla"
+
+msgctxt "field:product.cost_price,write_date:"
+msgid "Write Date"
+msgstr "Data de modificació"
+
+msgctxt "field:product.cost_price,write_uid:"
+msgid "Write User"
+msgstr "Usuari de modificació"
+
+msgctxt "field:product.list_price,company:"
+msgid "Company"
+msgstr "Empresa"
+
+msgctxt "field:product.list_price,create_date:"
+msgid "Create Date"
+msgstr "Data de creació"
+
+msgctxt "field:product.list_price,create_uid:"
+msgid "Create User"
+msgstr "Usuari de creació"
+
+msgctxt "field:product.list_price,id:"
+msgid "ID"
+msgstr "ID"
+
+msgctxt "field:product.list_price,list_price:"
+msgid "List Price"
+msgstr "Preu de venda"
+
+msgctxt "field:product.list_price,rec_name:"
+msgid "Name"
+msgstr "Nom"
+
+msgctxt "field:product.list_price,template:"
+msgid "Template"
+msgstr "Plantilla"
+
+msgctxt "field:product.list_price,write_date:"
+msgid "Write Date"
+msgstr "Data de modificació"
+
+msgctxt "field:product.list_price,write_uid:"
+msgid "Write User"
+msgstr "Usuari de modificació"
+
 msgctxt "field:product.product,active:"
 msgid "Active"
 msgstr "Actiu"
@@ -116,6 +221,10 @@ msgctxt "field:product.product,cost_price_uom:"
 msgid "Cost Price"
 msgstr "Preu de cost"
 
+msgctxt "field:product.product,cost_prices:"
+msgid "Cost Prices"
+msgstr "Preu de cost"
+
 msgctxt "field:product.product,create_date:"
 msgid "Create Date"
 msgstr "Data de creació"
@@ -148,6 +257,10 @@ msgctxt "field:product.product,list_price_uom:"
 msgid "List Price"
 msgstr "Preu de venda"
 
+msgctxt "field:product.product,list_prices:"
+msgid "List Prices"
+msgstr "Preu de venda"
+
 msgctxt "field:product.product,name:"
 msgid "Name"
 msgstr "Nom"
@@ -192,6 +305,10 @@ msgctxt "field:product.template,cost_price_method:"
 msgid "Cost Method"
 msgstr "Mètode de cost"
 
+msgctxt "field:product.template,cost_prices:"
+msgid "Cost Prices"
+msgstr "Preu de cost"
+
 msgctxt "field:product.template,create_date:"
 msgid "Create Date"
 msgstr "Data de creació"
@@ -216,6 +333,10 @@ msgctxt "field:product.template,list_price:"
 msgid "List Price"
 msgstr "Preu de venda"
 
+msgctxt "field:product.template,list_prices:"
+msgid "List Prices"
+msgstr "Preu de venda"
+
 msgctxt "field:product.template,name:"
 msgid "Name"
 msgstr "Nom"
@@ -456,6 +577,18 @@ msgctxt "model:product.configuration,name:"
 msgid "Product Configuration"
 msgstr "Configuració de productes"
 
+msgctxt "model:product.configuration.default_cost_price_method,name:"
+msgid "Product Configuration Default Cost Price Method"
+msgstr "Configuració del mètode de cost per defecte del producte"
+
+msgctxt "model:product.cost_price,name:"
+msgid "Product Cost Price"
+msgstr "Preu de cost del producte"
+
+msgctxt "model:product.list_price,name:"
+msgid "Product List Price"
+msgstr "Preu de venda del producte"
+
 msgctxt "model:product.product,name:"
 msgid "Product Variant"
 msgstr "Variant de producte"
diff --git a/locale/cs.po b/locale/cs.po
index c0a2f2d..b197137 100644
--- a/locale/cs.po
+++ b/locale/cs.po
@@ -87,6 +87,114 @@ msgctxt "field:product.configuration,write_uid:"
 msgid "Write User"
 msgstr ""
 
+msgctxt "field:product.configuration.default_cost_price_method,create_date:"
+msgid "Create Date"
+msgstr ""
+
+msgctxt "field:product.configuration.default_cost_price_method,create_uid:"
+msgid "Create User"
+msgstr ""
+
+msgctxt ""
+"field:product.configuration.default_cost_price_method,default_cost_price_method:"
+msgid "Default Cost Method"
+msgstr ""
+
+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"
+
+msgctxt "field:product.configuration.default_cost_price_method,write_date:"
+msgid "Write Date"
+msgstr ""
+
+msgctxt "field:product.configuration.default_cost_price_method,write_uid:"
+msgid "Write User"
+msgstr ""
+
+msgctxt "field:product.cost_price,company:"
+msgid "Company"
+msgstr ""
+
+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 ""
+
+msgctxt "field:product.cost_price,create_uid:"
+msgid "Create User"
+msgstr ""
+
+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,template:"
+msgid "Template"
+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.list_price,company:"
+msgid "Company"
+msgstr ""
+
+msgctxt "field:product.list_price,create_date:"
+msgid "Create Date"
+msgstr ""
+
+msgctxt "field:product.list_price,create_uid:"
+msgid "Create User"
+msgstr ""
+
+msgctxt "field:product.list_price,id:"
+msgid "ID"
+msgstr ""
+
+msgctxt "field:product.list_price,list_price:"
+msgid "List Price"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:product.list_price,rec_name:"
+msgid "Name"
+msgstr "Namu"
+
+msgctxt "field:product.list_price,template:"
+msgid "Template"
+msgstr ""
+
+msgctxt "field:product.list_price,write_date:"
+msgid "Write Date"
+msgstr ""
+
+msgctxt "field:product.list_price,write_uid:"
+msgid "Write User"
+msgstr ""
+
 msgctxt "field:product.product,active:"
 msgid "Active"
 msgstr ""
@@ -115,6 +223,10 @@ msgctxt "field:product.product,cost_price_uom:"
 msgid "Cost Price"
 msgstr ""
 
+msgctxt "field:product.product,cost_prices:"
+msgid "Cost Prices"
+msgstr ""
+
 msgctxt "field:product.product,create_date:"
 msgid "Create Date"
 msgstr ""
@@ -147,6 +259,10 @@ msgctxt "field:product.product,list_price_uom:"
 msgid "List Price"
 msgstr ""
 
+msgctxt "field:product.product,list_prices:"
+msgid "List Prices"
+msgstr ""
+
 #, fuzzy
 msgctxt "field:product.product,name:"
 msgid "Name"
@@ -193,6 +309,10 @@ msgctxt "field:product.template,cost_price_method:"
 msgid "Cost Method"
 msgstr ""
 
+msgctxt "field:product.template,cost_prices:"
+msgid "Cost Prices"
+msgstr ""
+
 msgctxt "field:product.template,create_date:"
 msgid "Create Date"
 msgstr ""
@@ -217,6 +337,10 @@ msgctxt "field:product.template,list_price:"
 msgid "List Price"
 msgstr ""
 
+msgctxt "field:product.template,list_prices:"
+msgid "List Prices"
+msgstr ""
+
 #, fuzzy
 msgctxt "field:product.template,name:"
 msgid "Name"
@@ -460,6 +584,18 @@ msgctxt "model:product.configuration,name:"
 msgid "Product Configuration"
 msgstr ""
 
+msgctxt "model:product.configuration.default_cost_price_method,name:"
+msgid "Product Configuration Default Cost Price Method"
+msgstr ""
+
+msgctxt "model:product.cost_price,name:"
+msgid "Product Cost Price"
+msgstr ""
+
+msgctxt "model:product.list_price,name:"
+msgid "Product List Price"
+msgstr ""
+
 msgctxt "model:product.product,name:"
 msgid "Product Variant"
 msgstr ""
diff --git a/locale/de.po b/locale/de.po
index d8d57fc..2f40ee2 100644
--- a/locale/de.po
+++ b/locale/de.po
@@ -88,6 +88,111 @@ msgctxt "field:product.configuration,write_uid:"
 msgid "Write User"
 msgstr "Letzte Änderung durch"
 
+msgctxt "field:product.configuration.default_cost_price_method,create_date:"
+msgid "Create Date"
+msgstr "Erstellungsdatum"
+
+msgctxt "field:product.configuration.default_cost_price_method,create_uid:"
+msgid "Create User"
+msgstr "Erstellt durch"
+
+msgctxt ""
+"field:product.configuration.default_cost_price_method,default_cost_price_method:"
+msgid "Default Cost Method"
+msgstr "Standardkostenmethode"
+
+msgctxt "field:product.configuration.default_cost_price_method,id:"
+msgid "ID"
+msgstr "ID"
+
+msgctxt "field:product.configuration.default_cost_price_method,rec_name:"
+msgid "Name"
+msgstr "Name"
+
+msgctxt "field:product.configuration.default_cost_price_method,write_date:"
+msgid "Write Date"
+msgstr "Zuletzt geändert"
+
+msgctxt "field:product.configuration.default_cost_price_method,write_uid:"
+msgid "Write User"
+msgstr "Letzte Änderung durch"
+
+msgctxt "field:product.cost_price,company:"
+msgid "Company"
+msgstr "Unternehmen"
+
+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"
+
+msgctxt "field:product.cost_price,create_uid:"
+msgid "Create User"
+msgstr "Erstellt durch"
+
+msgctxt "field:product.cost_price,id:"
+msgid "ID"
+msgstr "ID"
+
+msgctxt "field:product.cost_price,rec_name:"
+msgid "Name"
+msgstr "Name"
+
+msgctxt "field:product.cost_price,template:"
+msgid "Template"
+msgstr "Vorlage"
+
+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"
+
+msgctxt "field:product.list_price,company:"
+msgid "Company"
+msgstr "Unternehmen"
+
+msgctxt "field:product.list_price,create_date:"
+msgid "Create Date"
+msgstr "Erstellungsdatum"
+
+msgctxt "field:product.list_price,create_uid:"
+msgid "Create User"
+msgstr "Erstellt durch"
+
+msgctxt "field:product.list_price,id:"
+msgid "ID"
+msgstr "ID"
+
+msgctxt "field:product.list_price,list_price:"
+msgid "List Price"
+msgstr "Listenpreis"
+
+msgctxt "field:product.list_price,rec_name:"
+msgid "Name"
+msgstr "Name"
+
+msgctxt "field:product.list_price,template:"
+msgid "Template"
+msgstr "Vorlage"
+
+msgctxt "field:product.list_price,write_date:"
+msgid "Write Date"
+msgstr "Zuletzt geändert"
+
+msgctxt "field:product.list_price,write_uid:"
+msgid "Write User"
+msgstr "Letzte Änderung durch"
+
 msgctxt "field:product.product,active:"
 msgid "Active"
 msgstr "Aktiv"
@@ -116,6 +221,10 @@ msgctxt "field:product.product,cost_price_uom:"
 msgid "Cost Price"
 msgstr "Kostenpreis"
 
+msgctxt "field:product.product,cost_prices:"
+msgid "Cost Prices"
+msgstr "Kostenpreis"
+
 msgctxt "field:product.product,create_date:"
 msgid "Create Date"
 msgstr "Erstellungsdatum"
@@ -148,6 +257,10 @@ msgctxt "field:product.product,list_price_uom:"
 msgid "List Price"
 msgstr "Listenpreis"
 
+msgctxt "field:product.product,list_prices:"
+msgid "List Prices"
+msgstr "Listenpreis"
+
 msgctxt "field:product.product,name:"
 msgid "Name"
 msgstr "Name"
@@ -192,6 +305,10 @@ msgctxt "field:product.template,cost_price_method:"
 msgid "Cost Method"
 msgstr "Kostenmethode"
 
+msgctxt "field:product.template,cost_prices:"
+msgid "Cost Prices"
+msgstr "Kostenpreis"
+
 msgctxt "field:product.template,create_date:"
 msgid "Create Date"
 msgstr "Erstellungsdatum"
@@ -216,6 +333,10 @@ msgctxt "field:product.template,list_price:"
 msgid "List Price"
 msgstr "Listenpreis"
 
+msgctxt "field:product.template,list_prices:"
+msgid "List Prices"
+msgstr "Listenpreis"
+
 msgctxt "field:product.template,name:"
 msgid "Name"
 msgstr "Name"
@@ -458,6 +579,18 @@ msgctxt "model:product.configuration,name:"
 msgid "Product Configuration"
 msgstr "Einstellungen Artikel"
 
+msgctxt "model:product.configuration.default_cost_price_method,name:"
+msgid "Product Configuration Default Cost Price Method"
+msgstr "Einstellungen Produkt Standard-Kostenpreis-Methode"
+
+msgctxt "model:product.cost_price,name:"
+msgid "Product Cost Price"
+msgstr "Produkt Kostenpreis"
+
+msgctxt "model:product.list_price,name:"
+msgid "Product List Price"
+msgstr "Variante Listenpreis"
+
 msgctxt "model:product.product,name:"
 msgid "Product Variant"
 msgstr "Variante"
diff --git a/locale/es.po b/locale/es.po
index 1cfed7a..8d196e4 100644
--- a/locale/es.po
+++ b/locale/es.po
@@ -88,6 +88,111 @@ msgctxt "field:product.configuration,write_uid:"
 msgid "Write User"
 msgstr "Usuario de modificación"
 
+msgctxt "field:product.configuration.default_cost_price_method,create_date:"
+msgid "Create Date"
+msgstr "Fecha de creación"
+
+msgctxt "field:product.configuration.default_cost_price_method,create_uid:"
+msgid "Create User"
+msgstr "Usuario de creación"
+
+msgctxt ""
+"field:product.configuration.default_cost_price_method,default_cost_price_method:"
+msgid "Default Cost Method"
+msgstr "Método de coste por defecto"
+
+msgctxt "field:product.configuration.default_cost_price_method,id:"
+msgid "ID"
+msgstr "ID"
+
+msgctxt "field:product.configuration.default_cost_price_method,rec_name:"
+msgid "Name"
+msgstr "Nombre"
+
+msgctxt "field:product.configuration.default_cost_price_method,write_date:"
+msgid "Write Date"
+msgstr "Fecha de modificación"
+
+msgctxt "field:product.configuration.default_cost_price_method,write_uid:"
+msgid "Write User"
+msgstr "Usuario de modificación"
+
+msgctxt "field:product.cost_price,company:"
+msgid "Company"
+msgstr "Empresa"
+
+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"
+
+msgctxt "field:product.cost_price,create_uid:"
+msgid "Create User"
+msgstr "Usuario de creación"
+
+msgctxt "field:product.cost_price,id:"
+msgid "ID"
+msgstr "ID"
+
+msgctxt "field:product.cost_price,rec_name:"
+msgid "Name"
+msgstr "Nombre"
+
+msgctxt "field:product.cost_price,template:"
+msgid "Template"
+msgstr "Plantilla"
+
+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.list_price,company:"
+msgid "Company"
+msgstr "Empresa"
+
+msgctxt "field:product.list_price,create_date:"
+msgid "Create Date"
+msgstr "Fecha de creación"
+
+msgctxt "field:product.list_price,create_uid:"
+msgid "Create User"
+msgstr "Usuario de creación"
+
+msgctxt "field:product.list_price,id:"
+msgid "ID"
+msgstr "ID"
+
+msgctxt "field:product.list_price,list_price:"
+msgid "List Price"
+msgstr "Precio de venta"
+
+msgctxt "field:product.list_price,rec_name:"
+msgid "Name"
+msgstr "Nombre"
+
+msgctxt "field:product.list_price,template:"
+msgid "Template"
+msgstr "Plantilla"
+
+msgctxt "field:product.list_price,write_date:"
+msgid "Write Date"
+msgstr "Fecha de modificación"
+
+msgctxt "field:product.list_price,write_uid:"
+msgid "Write User"
+msgstr "Usuario de modificación"
+
 msgctxt "field:product.product,active:"
 msgid "Active"
 msgstr "Activo"
@@ -116,6 +221,10 @@ msgctxt "field:product.product,cost_price_uom:"
 msgid "Cost Price"
 msgstr "Precio de coste"
 
+msgctxt "field:product.product,cost_prices:"
+msgid "Cost Prices"
+msgstr "Precio de coste"
+
 msgctxt "field:product.product,create_date:"
 msgid "Create Date"
 msgstr "Fecha de creación"
@@ -148,6 +257,10 @@ msgctxt "field:product.product,list_price_uom:"
 msgid "List Price"
 msgstr "Precio de venta"
 
+msgctxt "field:product.product,list_prices:"
+msgid "List Prices"
+msgstr "Precio de venta"
+
 msgctxt "field:product.product,name:"
 msgid "Name"
 msgstr "Nombre"
@@ -192,6 +305,10 @@ msgctxt "field:product.template,cost_price_method:"
 msgid "Cost Method"
 msgstr "Método de coste"
 
+msgctxt "field:product.template,cost_prices:"
+msgid "Cost Prices"
+msgstr "Precio de coste"
+
 msgctxt "field:product.template,create_date:"
 msgid "Create Date"
 msgstr "Fecha de creación"
@@ -216,6 +333,10 @@ msgctxt "field:product.template,list_price:"
 msgid "List Price"
 msgstr "Precio de venta"
 
+msgctxt "field:product.template,list_prices:"
+msgid "List Prices"
+msgstr "Precio de venta"
+
 msgctxt "field:product.template,name:"
 msgid "Name"
 msgstr "Nombre"
@@ -456,6 +577,18 @@ msgctxt "model:product.configuration,name:"
 msgid "Product Configuration"
 msgstr "Configuración de productos"
 
+msgctxt "model:product.configuration.default_cost_price_method,name:"
+msgid "Product Configuration Default Cost Price Method"
+msgstr "Configuración del método de coste por defecto del producto"
+
+msgctxt "model:product.cost_price,name:"
+msgid "Product Cost Price"
+msgstr "Precio de coste del producto"
+
+msgctxt "model:product.list_price,name:"
+msgid "Product List Price"
+msgstr "Precio de venta del producto"
+
 msgctxt "model:product.product,name:"
 msgid "Product Variant"
 msgstr "Variante de producto"
diff --git a/locale/es_419.po b/locale/es_419.po
index 9fe353f..ff9bb92 100644
--- a/locale/es_419.po
+++ b/locale/es_419.po
@@ -11,6 +11,7 @@ msgstr ""
 msgctxt "error:product.uom:"
 msgid "Invalid Factor and Rate values in UOM \"%s\"."
 msgstr ""
+"Los valores de factor y tasa de conversión de la UdM \"%s\" no son válidos."
 
 msgctxt "error:product.uom:"
 msgid "Rate and factor can not be both equal to zero."
@@ -30,7 +31,7 @@ msgstr ""
 
 msgctxt "field:product.category,create_uid:"
 msgid "Create User"
-msgstr ""
+msgstr "Creado por usuario"
 
 msgctxt "field:product.category,id:"
 msgid "ID"
@@ -54,7 +55,7 @@ msgstr ""
 
 msgctxt "field:product.category,write_uid:"
 msgid "Write User"
-msgstr ""
+msgstr "Modificado por usuario"
 
 msgctxt "field:product.configuration,create_date:"
 msgid "Create Date"
@@ -62,11 +63,11 @@ msgstr ""
 
 msgctxt "field:product.configuration,create_uid:"
 msgid "Create User"
-msgstr ""
+msgstr "Creado por usuario"
 
 msgctxt "field:product.configuration,default_cost_price_method:"
 msgid "Default Cost Method"
-msgstr ""
+msgstr "Método de costo por defecto"
 
 msgctxt "field:product.configuration,id:"
 msgid "ID"
@@ -82,8 +83,123 @@ msgstr ""
 
 msgctxt "field:product.configuration,write_uid:"
 msgid "Write User"
+msgstr "Modificado por usuario"
+
+msgctxt "field:product.configuration.default_cost_price_method,create_date:"
+msgid "Create Date"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:product.configuration.default_cost_price_method,create_uid:"
+msgid "Create User"
+msgstr "Creado por usuario"
+
+#, fuzzy
+msgctxt ""
+"field:product.configuration.default_cost_price_method,default_cost_price_method:"
+msgid "Default Cost Method"
+msgstr "Método de costo por defecto"
+
+msgctxt "field:product.configuration.default_cost_price_method,id:"
+msgid "ID"
+msgstr ""
+
+msgctxt "field:product.configuration.default_cost_price_method,rec_name:"
+msgid "Name"
+msgstr ""
+
+msgctxt "field:product.configuration.default_cost_price_method,write_date:"
+msgid "Write Date"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:product.configuration.default_cost_price_method,write_uid:"
+msgid "Write User"
+msgstr "Modificado por usuario"
+
+msgctxt "field:product.cost_price,company:"
+msgid "Company"
+msgstr ""
+
+#, fuzzy
+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 ""
+
+#, fuzzy
+msgctxt "field:product.cost_price,create_uid:"
+msgid "Create User"
+msgstr "Creado por usuario"
+
+msgctxt "field:product.cost_price,id:"
+msgid "ID"
+msgstr ""
+
+msgctxt "field:product.cost_price,rec_name:"
+msgid "Name"
+msgstr ""
+
+msgctxt "field:product.cost_price,template:"
+msgid "Template"
+msgstr ""
+
+msgctxt "field:product.cost_price,write_date:"
+msgid "Write Date"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:product.cost_price,write_uid:"
+msgid "Write User"
+msgstr "Modificado por usuario"
+
+msgctxt "field:product.list_price,company:"
+msgid "Company"
+msgstr ""
+
+msgctxt "field:product.list_price,create_date:"
+msgid "Create Date"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:product.list_price,create_uid:"
+msgid "Create User"
+msgstr "Creado por usuario"
+
+msgctxt "field:product.list_price,id:"
+msgid "ID"
 msgstr ""
 
+#, fuzzy
+msgctxt "field:product.list_price,list_price:"
+msgid "List Price"
+msgstr "Precio de costo"
+
+msgctxt "field:product.list_price,rec_name:"
+msgid "Name"
+msgstr ""
+
+msgctxt "field:product.list_price,template:"
+msgid "Template"
+msgstr ""
+
+msgctxt "field:product.list_price,write_date:"
+msgid "Write Date"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:product.list_price,write_uid:"
+msgid "Write User"
+msgstr "Modificado por usuario"
+
 msgctxt "field:product.product,active:"
 msgid "Active"
 msgstr ""
@@ -91,7 +207,7 @@ msgstr ""
 #, fuzzy
 msgctxt "field:product.product,categories:"
 msgid "Categories"
-msgstr "Categories"
+msgstr "Categorías"
 
 msgctxt "field:product.product,code:"
 msgid "Code"
@@ -103,15 +219,20 @@ msgstr ""
 
 msgctxt "field:product.product,cost_price:"
 msgid "Cost Price"
-msgstr ""
+msgstr "Precio de costo"
 
 msgctxt "field:product.product,cost_price_method:"
 msgid "Cost Method"
-msgstr ""
+msgstr "Método de costo"
 
 msgctxt "field:product.product,cost_price_uom:"
 msgid "Cost Price"
-msgstr ""
+msgstr "Precio de costo"
+
+#, fuzzy
+msgctxt "field:product.product,cost_prices:"
+msgid "Cost Prices"
+msgstr "Precio de costo"
 
 msgctxt "field:product.product,create_date:"
 msgid "Create Date"
@@ -119,7 +240,7 @@ msgstr ""
 
 msgctxt "field:product.product,create_uid:"
 msgid "Create User"
-msgstr ""
+msgstr "Creado por usuario"
 
 msgctxt "field:product.product,default_uom:"
 msgid "Default UOM"
@@ -127,7 +248,7 @@ msgstr ""
 
 msgctxt "field:product.product,default_uom_category:"
 msgid "Default UOM Category"
-msgstr ""
+msgstr "Categoría de UdM por defecto"
 
 msgctxt "field:product.product,description:"
 msgid "Description"
@@ -137,13 +258,20 @@ msgctxt "field:product.product,id:"
 msgid "ID"
 msgstr ""
 
+#, fuzzy
 msgctxt "field:product.product,list_price:"
 msgid "List Price"
-msgstr ""
+msgstr "Precio de costo"
 
+#, fuzzy
 msgctxt "field:product.product,list_price_uom:"
 msgid "List Price"
-msgstr ""
+msgstr "Precio de costo"
+
+#, fuzzy
+msgctxt "field:product.product,list_prices:"
+msgid "List Prices"
+msgstr "Precio de costo"
 
 msgctxt "field:product.product,name:"
 msgid "Name"
@@ -167,7 +295,7 @@ msgstr ""
 
 msgctxt "field:product.product,write_uid:"
 msgid "Write User"
-msgstr ""
+msgstr "Modificado por usuario"
 
 msgctxt "field:product.template,active:"
 msgid "Active"
@@ -176,7 +304,7 @@ msgstr ""
 #, fuzzy
 msgctxt "field:product.template,categories:"
 msgid "Categories"
-msgstr "Categories"
+msgstr "Categorías"
 
 msgctxt "field:product.template,consumable:"
 msgid "Consumable"
@@ -184,11 +312,16 @@ msgstr ""
 
 msgctxt "field:product.template,cost_price:"
 msgid "Cost Price"
-msgstr ""
+msgstr "Precio de costo"
 
 msgctxt "field:product.template,cost_price_method:"
 msgid "Cost Method"
-msgstr ""
+msgstr "Método de costo"
+
+#, fuzzy
+msgctxt "field:product.template,cost_prices:"
+msgid "Cost Prices"
+msgstr "Precio de costo"
 
 msgctxt "field:product.template,create_date:"
 msgid "Create Date"
@@ -196,7 +329,7 @@ msgstr ""
 
 msgctxt "field:product.template,create_uid:"
 msgid "Create User"
-msgstr ""
+msgstr "Creado por usuario"
 
 msgctxt "field:product.template,default_uom:"
 msgid "Default UOM"
@@ -204,15 +337,21 @@ msgstr ""
 
 msgctxt "field:product.template,default_uom_category:"
 msgid "Default UOM Category"
-msgstr ""
+msgstr "Categoría de UdM por defecto"
 
 msgctxt "field:product.template,id:"
 msgid "ID"
 msgstr ""
 
+#, fuzzy
 msgctxt "field:product.template,list_price:"
 msgid "List Price"
-msgstr ""
+msgstr "Precio de costo"
+
+#, fuzzy
+msgctxt "field:product.template,list_prices:"
+msgid "List Prices"
+msgstr "Precio de costo"
 
 msgctxt "field:product.template,name:"
 msgid "Name"
@@ -221,7 +360,7 @@ msgstr ""
 #, fuzzy
 msgctxt "field:product.template,products:"
 msgid "Variants"
-msgstr "Variants"
+msgstr "Variantes"
 
 msgctxt "field:product.template,rec_name:"
 msgid "Name"
@@ -237,7 +376,7 @@ msgstr ""
 
 msgctxt "field:product.template,write_uid:"
 msgid "Write User"
-msgstr ""
+msgstr "Modificado por usuario"
 
 msgctxt "field:product.template-product.category,category:"
 msgid "Category"
@@ -249,7 +388,7 @@ msgstr ""
 
 msgctxt "field:product.template-product.category,create_uid:"
 msgid "Create User"
-msgstr ""
+msgstr "Creado por usuario"
 
 msgctxt "field:product.template-product.category,id:"
 msgid "ID"
@@ -269,7 +408,7 @@ msgstr ""
 
 msgctxt "field:product.template-product.category,write_uid:"
 msgid "Write User"
-msgstr ""
+msgstr "Modificado por usuario"
 
 msgctxt "field:product.uom,active:"
 msgid "Active"
@@ -285,7 +424,7 @@ msgstr ""
 
 msgctxt "field:product.uom,create_uid:"
 msgid "Create User"
-msgstr ""
+msgstr "Creado por usuario"
 
 msgctxt "field:product.uom,digits:"
 msgid "Display Digits"
@@ -325,7 +464,7 @@ msgstr ""
 
 msgctxt "field:product.uom,write_uid:"
 msgid "Write User"
-msgstr ""
+msgstr "Modificado por usuario"
 
 msgctxt "field:product.uom.category,create_date:"
 msgid "Create Date"
@@ -333,7 +472,7 @@ msgstr ""
 
 msgctxt "field:product.uom.category,create_uid:"
 msgid "Create User"
-msgstr ""
+msgstr "Creado por usuario"
 
 msgctxt "field:product.uom.category,id:"
 msgid "ID"
@@ -347,10 +486,9 @@ msgctxt "field:product.uom.category,rec_name:"
 msgid "Name"
 msgstr ""
 
-#, fuzzy
 msgctxt "field:product.uom.category,uoms:"
 msgid "Unit of Measures"
-msgstr "Units of Measure"
+msgstr ""
 
 msgctxt "field:product.uom.category,write_date:"
 msgid "Write Date"
@@ -358,7 +496,7 @@ msgstr ""
 
 msgctxt "field:product.uom.category,write_uid:"
 msgid "Write User"
-msgstr ""
+msgstr "Modificado por usuario"
 
 msgctxt "help:product.uom,factor:"
 msgid ""
@@ -372,87 +510,105 @@ msgid ""
 "1 (base unit) = coef (this unit)"
 msgstr ""
 
+#, fuzzy
 msgctxt "model:ir.action,name:act_category_list"
 msgid "Categories"
-msgstr "Categories"
+msgstr "Categorías"
 
+#, fuzzy
 msgctxt "model:ir.action,name:act_category_tree"
 msgid "Categories"
-msgstr "Categories"
+msgstr "Categorías"
 
+#, fuzzy
 msgctxt "model:ir.action,name:act_product_configuration_form"
 msgid "Product Configuration"
-msgstr "Product Configuration"
+msgstr "Configuración de producto"
 
 msgctxt "model:ir.action,name:act_product_form"
 msgid "Variants"
-msgstr "Variants"
+msgstr "Variantes"
 
+#, fuzzy
 msgctxt "model:ir.action,name:act_product_from_template"
 msgid "Variants"
-msgstr "Variants"
+msgstr "Variantes"
 
 msgctxt "model:ir.action,name:act_template_by_category"
 msgid "Product by Category"
-msgstr "Product by Category"
+msgstr ""
 
 msgctxt "model:ir.action,name:act_template_form"
 msgid "Products"
-msgstr "Products"
+msgstr ""
 
 msgctxt "model:ir.action,name:act_uom_category_form"
 msgid "Categories of Unit of Measure"
-msgstr "Categories of Unit of Measure"
+msgstr ""
 
 msgctxt "model:ir.action,name:act_uom_form"
 msgid "Units of Measure"
-msgstr "Units of Measure"
+msgstr ""
 
+#, fuzzy
 msgctxt "model:ir.ui.menu,name:menu_category_list"
 msgid "Categories"
-msgstr "Categories"
+msgstr "Categorías"
 
 msgctxt "model:ir.ui.menu,name:menu_category_tree"
 msgid "Categories"
-msgstr "Categories"
+msgstr "Categorías"
 
 msgctxt "model:ir.ui.menu,name:menu_configuration"
 msgid "Configuration"
-msgstr "Configuration"
+msgstr ""
 
 msgctxt "model:ir.ui.menu,name:menu_main_product"
 msgid "Product"
-msgstr "Product"
+msgstr ""
 
+#, fuzzy
 msgctxt "model:ir.ui.menu,name:menu_product"
 msgid "Variants"
-msgstr "Variants"
+msgstr "Variantes"
 
 msgctxt "model:ir.ui.menu,name:menu_product_configuration"
 msgid "Product Configuration"
-msgstr "Product Configuration"
+msgstr "Configuración de producto"
 
 msgctxt "model:ir.ui.menu,name:menu_template"
 msgid "Products"
-msgstr "Products"
+msgstr ""
 
+#, fuzzy
 msgctxt "model:ir.ui.menu,name:menu_uom_category_form"
 msgid "Categories"
-msgstr "Categories"
+msgstr "Categorías"
 
 msgctxt "model:ir.ui.menu,name:menu_uom_form"
 msgid "Units of Measure"
-msgstr "Units of Measure"
+msgstr ""
 
-#, fuzzy
 msgctxt "model:product.category,name:"
 msgid "Product Category"
-msgstr "Product by Category"
+msgstr ""
 
 #, fuzzy
 msgctxt "model:product.configuration,name:"
 msgid "Product Configuration"
-msgstr "Product Configuration"
+msgstr "Configuración de producto"
+
+msgctxt "model:product.configuration.default_cost_price_method,name:"
+msgid "Product Configuration Default Cost Price Method"
+msgstr ""
+
+msgctxt "model:product.cost_price,name:"
+msgid "Product Cost Price"
+msgstr ""
+
+msgctxt "model:product.list_price,name:"
+msgid "Product List Price"
+msgstr ""
 
 msgctxt "model:product.product,name:"
 msgid "Product Variant"
@@ -466,138 +622,137 @@ msgctxt "model:product.template-product.category,name:"
 msgid "Template - Category"
 msgstr ""
 
-#, fuzzy
 msgctxt "model:product.uom,name:"
 msgid "Unit of measure"
-msgstr "Units of Measure"
+msgstr ""
 
 msgctxt "model:product.uom,name:uom_are"
 msgid "Are"
-msgstr "Are"
+msgstr ""
 
 msgctxt "model:product.uom,name:uom_carat"
 msgid "Carat"
-msgstr "Carat"
+msgstr ""
 
 msgctxt "model:product.uom,name:uom_centimeter"
 msgid "centimeter"
-msgstr "centimeter"
+msgstr ""
 
 msgctxt "model:product.uom,name:uom_cubic_centimeter"
 msgid "Cubic centimeter"
-msgstr "Cubic centimeter"
+msgstr ""
 
 msgctxt "model:product.uom,name:uom_cubic_foot"
 msgid "Cubic foot"
-msgstr "Cubic foot"
+msgstr ""
 
 msgctxt "model:product.uom,name:uom_cubic_inch"
 msgid "Cubic inch"
-msgstr "Cubic inch"
+msgstr ""
 
 msgctxt "model:product.uom,name:uom_cubic_meter"
 msgid "Cubic meter"
-msgstr "Cubic meter"
+msgstr ""
 
 msgctxt "model:product.uom,name:uom_day"
 msgid "Day"
-msgstr "Day"
+msgstr ""
 
 msgctxt "model:product.uom,name:uom_foot"
 msgid "Foot"
-msgstr "Foot"
+msgstr ""
 
 msgctxt "model:product.uom,name:uom_gallon"
 msgid "Gallon"
-msgstr "Gallon"
+msgstr ""
 
 msgctxt "model:product.uom,name:uom_gram"
 msgid "Gram"
-msgstr "Gram"
+msgstr ""
 
 msgctxt "model:product.uom,name:uom_hectare"
 msgid "Hectare"
-msgstr "Hectare"
+msgstr ""
 
 msgctxt "model:product.uom,name:uom_hour"
 msgid "Hour"
-msgstr "Hour"
+msgstr ""
 
 msgctxt "model:product.uom,name:uom_inch"
 msgid "Inch"
-msgstr "Inch"
+msgstr ""
 
 msgctxt "model:product.uom,name:uom_kilogram"
 msgid "Kilogram"
-msgstr "Kilogram"
+msgstr ""
 
 msgctxt "model:product.uom,name:uom_kilometer"
 msgid "Kilometer"
-msgstr "Kilometer"
+msgstr ""
 
 msgctxt "model:product.uom,name:uom_liter"
 msgid "Liter"
-msgstr "Liter"
+msgstr ""
 
 msgctxt "model:product.uom,name:uom_meter"
 msgid "Meter"
-msgstr "Meter"
+msgstr ""
 
 msgctxt "model:product.uom,name:uom_mile"
 msgid "Mile"
-msgstr "Mile"
+msgstr ""
 
 msgctxt "model:product.uom,name:uom_millimeter"
 msgid "Millimeter"
-msgstr "Millimeter"
+msgstr ""
 
 msgctxt "model:product.uom,name:uom_minute"
 msgid "Minute"
-msgstr "Minute"
+msgstr ""
 
 msgctxt "model:product.uom,name:uom_ounce"
 msgid "Ounce"
-msgstr "Ounce"
+msgstr ""
 
 msgctxt "model:product.uom,name:uom_pound"
 msgid "Pound"
-msgstr "Pound"
+msgstr ""
 
 msgctxt "model:product.uom,name:uom_second"
 msgid "Second"
-msgstr "Second"
+msgstr ""
 
 msgctxt "model:product.uom,name:uom_square_centimeter"
 msgid "Square centimeter"
-msgstr "Square centimeter"
+msgstr ""
 
 msgctxt "model:product.uom,name:uom_square_foot"
 msgid "Square foot"
-msgstr "Square foot"
+msgstr ""
 
 msgctxt "model:product.uom,name:uom_square_inch"
 msgid "Square inch"
-msgstr "Square inch"
+msgstr ""
 
 msgctxt "model:product.uom,name:uom_square_meter"
 msgid "Square meter"
-msgstr "Square meter"
+msgstr ""
 
 msgctxt "model:product.uom,name:uom_square_yard"
 msgid "Square yard"
-msgstr "Square yard"
+msgstr ""
 
 msgctxt "model:product.uom,name:uom_unit"
 msgid "Unit"
-msgstr "Unit"
+msgstr ""
 
 msgctxt "model:product.uom,name:uom_work_day"
 msgid "Work Day"
-msgstr "Work Day"
+msgstr ""
 
 msgctxt "model:product.uom,name:uom_yard"
 msgid "Yard"
-msgstr "Yard"
+msgstr ""
 
 msgctxt "model:product.uom,symbol:uom_are"
 msgid "a"
@@ -605,160 +760,159 @@ msgstr "a"
 
 msgctxt "model:product.uom,symbol:uom_carat"
 msgid "c"
-msgstr "c"
+msgstr "ct"
 
 msgctxt "model:product.uom,symbol:uom_centimeter"
 msgid "cm"
-msgstr "cm"
+msgstr ""
 
 msgctxt "model:product.uom,symbol:uom_cubic_centimeter"
 msgid "cm³"
-msgstr "cm³"
+msgstr ""
 
 msgctxt "model:product.uom,symbol:uom_cubic_foot"
 msgid "ft³"
-msgstr "ft³"
+msgstr ""
 
 msgctxt "model:product.uom,symbol:uom_cubic_inch"
 msgid "in³"
-msgstr "in³"
+msgstr ""
 
 msgctxt "model:product.uom,symbol:uom_cubic_meter"
 msgid "m³"
-msgstr "m³"
+msgstr ""
 
 msgctxt "model:product.uom,symbol:uom_day"
 msgid "d"
-msgstr "d"
+msgstr ""
 
 msgctxt "model:product.uom,symbol:uom_foot"
 msgid "ft"
-msgstr "ft"
+msgstr ""
 
 msgctxt "model:product.uom,symbol:uom_gallon"
 msgid "gal"
-msgstr "gal"
+msgstr ""
 
 msgctxt "model:product.uom,symbol:uom_gram"
 msgid "g"
-msgstr "g"
+msgstr ""
 
 msgctxt "model:product.uom,symbol:uom_hectare"
 msgid "ha"
-msgstr "ha"
+msgstr ""
 
 msgctxt "model:product.uom,symbol:uom_hour"
 msgid "h"
-msgstr "h"
+msgstr ""
 
 msgctxt "model:product.uom,symbol:uom_inch"
 msgid "in"
-msgstr "in"
+msgstr ""
 
 msgctxt "model:product.uom,symbol:uom_kilogram"
 msgid "kg"
-msgstr "kg"
+msgstr ""
 
 msgctxt "model:product.uom,symbol:uom_kilometer"
 msgid "km"
-msgstr "km"
+msgstr ""
 
 msgctxt "model:product.uom,symbol:uom_liter"
 msgid "l"
-msgstr "l"
+msgstr ""
 
 msgctxt "model:product.uom,symbol:uom_meter"
 msgid "m"
-msgstr "m"
+msgstr ""
 
 msgctxt "model:product.uom,symbol:uom_mile"
 msgid "mi"
-msgstr "mi"
+msgstr ""
 
 msgctxt "model:product.uom,symbol:uom_millimeter"
 msgid "mm"
-msgstr "mm"
+msgstr ""
 
 msgctxt "model:product.uom,symbol:uom_minute"
 msgid "min"
-msgstr "min"
+msgstr ""
 
 msgctxt "model:product.uom,symbol:uom_ounce"
 msgid "oz"
-msgstr "oz"
+msgstr ""
 
 msgctxt "model:product.uom,symbol:uom_pound"
 msgid "lb"
-msgstr "lb"
+msgstr ""
 
 msgctxt "model:product.uom,symbol:uom_second"
 msgid "s"
-msgstr "s"
+msgstr ""
 
 msgctxt "model:product.uom,symbol:uom_square_centimeter"
 msgid "cm²"
-msgstr "cm²"
+msgstr ""
 
 msgctxt "model:product.uom,symbol:uom_square_foot"
 msgid "ft²"
-msgstr "ft²"
+msgstr ""
 
 msgctxt "model:product.uom,symbol:uom_square_inch"
 msgid "in²"
-msgstr "in²"
+msgstr ""
 
 msgctxt "model:product.uom,symbol:uom_square_meter"
 msgid "m²"
-msgstr "m²"
+msgstr ""
 
 msgctxt "model:product.uom,symbol:uom_square_yard"
 msgid "yd²"
-msgstr "yd²"
+msgstr ""
 
 msgctxt "model:product.uom,symbol:uom_unit"
 msgid "u"
-msgstr "u"
+msgstr ""
 
 msgctxt "model:product.uom,symbol:uom_work_day"
 msgid "wd"
-msgstr "wd"
+msgstr ""
 
 msgctxt "model:product.uom,symbol:uom_yard"
 msgid "yd"
-msgstr "yd"
+msgstr ""
 
-#, fuzzy
 msgctxt "model:product.uom.category,name:"
 msgid "Product uom category"
-msgstr "Product by Category"
+msgstr ""
 
 msgctxt "model:product.uom.category,name:uom_cat_length"
 msgid "Length"
-msgstr "Length"
+msgstr ""
 
 msgctxt "model:product.uom.category,name:uom_cat_surface"
 msgid "Surface"
-msgstr "Surface"
+msgstr ""
 
 msgctxt "model:product.uom.category,name:uom_cat_time"
 msgid "Time"
-msgstr "Time"
+msgstr ""
 
 msgctxt "model:product.uom.category,name:uom_cat_unit"
 msgid "Units"
-msgstr "Units"
+msgstr ""
 
 msgctxt "model:product.uom.category,name:uom_cat_volume"
 msgid "Volume"
-msgstr "Volume"
+msgstr ""
 
 msgctxt "model:product.uom.category,name:uom_cat_weight"
 msgid "Weight"
-msgstr "Weight"
+msgstr ""
 
 msgctxt "model:res.group,name:group_product_admin"
 msgid "Product Administration"
-msgstr "Product Administration"
+msgstr ""
 
 msgctxt "selection:product.product,cost_price_method:"
 msgid "Average"
@@ -774,11 +928,11 @@ msgstr ""
 
 msgctxt "selection:product.product,type:"
 msgid "Goods"
-msgstr ""
+msgstr "Artículos"
 
 msgctxt "selection:product.product,type:"
 msgid "Service"
-msgstr ""
+msgstr "Servicio"
 
 msgctxt "selection:product.template,cost_price_method:"
 msgid "Average"
@@ -794,11 +948,11 @@ msgstr ""
 
 msgctxt "selection:product.template,type:"
 msgid "Goods"
-msgstr ""
+msgstr "Artículos"
 
 msgctxt "selection:product.template,type:"
 msgid "Service"
-msgstr ""
+msgstr "Servicio"
 
 msgctxt "view:product.category:"
 msgid "Children"
diff --git a/locale/fr.po b/locale/fr.po
index 5f083ef..36e4b9f 100644
--- a/locale/fr.po
+++ b/locale/fr.po
@@ -88,6 +88,111 @@ msgctxt "field:product.configuration,write_uid:"
 msgid "Write User"
 msgstr "Mis à jour par"
 
+msgctxt "field:product.configuration.default_cost_price_method,create_date:"
+msgid "Create Date"
+msgstr "Date de création"
+
+msgctxt "field:product.configuration.default_cost_price_method,create_uid:"
+msgid "Create User"
+msgstr "Créé par"
+
+msgctxt ""
+"field:product.configuration.default_cost_price_method,default_cost_price_method:"
+msgid "Default Cost Method"
+msgstr "Méthode de coût par défaut"
+
+msgctxt "field:product.configuration.default_cost_price_method,id:"
+msgid "ID"
+msgstr "ID"
+
+msgctxt "field:product.configuration.default_cost_price_method,rec_name:"
+msgid "Name"
+msgstr "Nom"
+
+msgctxt "field:product.configuration.default_cost_price_method,write_date:"
+msgid "Write Date"
+msgstr "Date de mise à jour"
+
+msgctxt "field:product.configuration.default_cost_price_method,write_uid:"
+msgid "Write User"
+msgstr "Mis à jour par"
+
+msgctxt "field:product.cost_price,company:"
+msgid "Company"
+msgstr "Société"
+
+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"
+
+msgctxt "field:product.cost_price,create_uid:"
+msgid "Create User"
+msgstr "Créé par"
+
+msgctxt "field:product.cost_price,id:"
+msgid "ID"
+msgstr "ID"
+
+msgctxt "field:product.cost_price,rec_name:"
+msgid "Name"
+msgstr "Nom"
+
+msgctxt "field:product.cost_price,template:"
+msgid "Template"
+msgstr "Modèle"
+
+msgctxt "field:product.cost_price,write_date:"
+msgid "Write Date"
+msgstr "Date de mise à jour"
+
+msgctxt "field:product.cost_price,write_uid:"
+msgid "Write User"
+msgstr "Mis à jour par"
+
+msgctxt "field:product.list_price,company:"
+msgid "Company"
+msgstr "Société"
+
+msgctxt "field:product.list_price,create_date:"
+msgid "Create Date"
+msgstr "Date de création"
+
+msgctxt "field:product.list_price,create_uid:"
+msgid "Create User"
+msgstr "Créé par"
+
+msgctxt "field:product.list_price,id:"
+msgid "ID"
+msgstr "ID"
+
+msgctxt "field:product.list_price,list_price:"
+msgid "List Price"
+msgstr "Prix listé"
+
+msgctxt "field:product.list_price,rec_name:"
+msgid "Name"
+msgstr "Nom"
+
+msgctxt "field:product.list_price,template:"
+msgid "Template"
+msgstr "Modèle"
+
+msgctxt "field:product.list_price,write_date:"
+msgid "Write Date"
+msgstr "Date de mise à jour"
+
+msgctxt "field:product.list_price,write_uid:"
+msgid "Write User"
+msgstr "Mis à jour par"
+
 msgctxt "field:product.product,active:"
 msgid "Active"
 msgstr "Actif"
@@ -116,6 +221,10 @@ msgctxt "field:product.product,cost_price_uom:"
 msgid "Cost Price"
 msgstr "Prix de revient"
 
+msgctxt "field:product.product,cost_prices:"
+msgid "Cost Prices"
+msgstr "Prix de revient"
+
 msgctxt "field:product.product,create_date:"
 msgid "Create Date"
 msgstr "Date de création"
@@ -148,6 +257,10 @@ msgctxt "field:product.product,list_price_uom:"
 msgid "List Price"
 msgstr "Prix listé"
 
+msgctxt "field:product.product,list_prices:"
+msgid "List Prices"
+msgstr "Prix listés"
+
 msgctxt "field:product.product,name:"
 msgid "Name"
 msgstr "Nom"
@@ -192,6 +305,10 @@ msgctxt "field:product.template,cost_price_method:"
 msgid "Cost Method"
 msgstr "Méthode de coût"
 
+msgctxt "field:product.template,cost_prices:"
+msgid "Cost Prices"
+msgstr "Prix de revient"
+
 msgctxt "field:product.template,create_date:"
 msgid "Create Date"
 msgstr "Date de création"
@@ -216,6 +333,10 @@ msgctxt "field:product.template,list_price:"
 msgid "List Price"
 msgstr "Prix listé"
 
+msgctxt "field:product.template,list_prices:"
+msgid "List Prices"
+msgstr "Prix listés"
+
 msgctxt "field:product.template,name:"
 msgid "Name"
 msgstr "Nom"
@@ -456,6 +577,18 @@ msgctxt "model:product.configuration,name:"
 msgid "Product Configuration"
 msgstr "Configuration produit"
 
+msgctxt "model:product.configuration.default_cost_price_method,name:"
+msgid "Product Configuration Default Cost Price Method"
+msgstr "Configuration produit de la méthode de coût par défaut"
+
+msgctxt "model:product.cost_price,name:"
+msgid "Product Cost Price"
+msgstr "Produit Prix de revient"
+
+msgctxt "model:product.list_price,name:"
+msgid "Product List Price"
+msgstr "Produit Prix listé"
+
 msgctxt "model:product.product,name:"
 msgid "Product Variant"
 msgstr "Variante produit"
diff --git a/locale/hu_HU.po b/locale/hu_HU.po
index 9124474..944ea02 100644
--- a/locale/hu_HU.po
+++ b/locale/hu_HU.po
@@ -95,6 +95,134 @@ msgctxt "field:product.configuration,write_uid:"
 msgid "Write User"
 msgstr "Által módosítva"
 
+#, fuzzy
+msgctxt "field:product.configuration.default_cost_price_method,create_date:"
+msgid "Create Date"
+msgstr "Létrehozás dátuma"
+
+#, fuzzy
+msgctxt "field:product.configuration.default_cost_price_method,create_uid:"
+msgid "Create User"
+msgstr "Által létrehozva"
+
+msgctxt ""
+"field:product.configuration.default_cost_price_method,default_cost_price_method:"
+msgid "Default Cost Method"
+msgstr ""
+
+#, 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 "Név"
+
+#, fuzzy
+msgctxt "field:product.configuration.default_cost_price_method,write_date:"
+msgid "Write Date"
+msgstr "Utolsó módosítás dátuma"
+
+#, fuzzy
+msgctxt "field:product.configuration.default_cost_price_method,write_uid:"
+msgid "Write User"
+msgstr "Által módosítva"
+
+msgctxt "field:product.cost_price,company:"
+msgid "Company"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:product.cost_price,cost_price:"
+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"
+
+#, fuzzy
+msgctxt "field:product.cost_price,create_uid:"
+msgid "Create User"
+msgstr "Által létrehozva"
+
+#, fuzzy
+msgctxt "field:product.cost_price,id:"
+msgid "ID"
+msgstr "ID"
+
+#, fuzzy
+msgctxt "field:product.cost_price,rec_name:"
+msgid "Name"
+msgstr "Név"
+
+#, fuzzy
+msgctxt "field:product.cost_price,template:"
+msgid "Template"
+msgstr "Űrlap adószámlához"
+
+#, 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,write_uid:"
+msgid "Write User"
+msgstr "Által módosítva"
+
+msgctxt "field:product.list_price,company:"
+msgid "Company"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:product.list_price,create_date:"
+msgid "Create Date"
+msgstr "Létrehozás dátuma"
+
+#, fuzzy
+msgctxt "field:product.list_price,create_uid:"
+msgid "Create User"
+msgstr "Által létrehozva"
+
+#, fuzzy
+msgctxt "field:product.list_price,id:"
+msgid "ID"
+msgstr "ID"
+
+#, fuzzy
+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"
+
+#, fuzzy
+msgctxt "field:product.list_price,template:"
+msgid "Template"
+msgstr "Űrlap adószámlához"
+
+#, fuzzy
+msgctxt "field:product.list_price,write_date:"
+msgid "Write Date"
+msgstr "Utolsó módosítás dátuma"
+
+#, fuzzy
+msgctxt "field:product.list_price,write_uid:"
+msgid "Write User"
+msgstr "Által módosítva"
+
 msgctxt "field:product.product,active:"
 msgid "Active"
 msgstr "Aktív"
@@ -127,6 +255,11 @@ msgctxt "field:product.product,cost_price_uom:"
 msgid "Cost Price"
 msgstr "Beszerzési ár"
 
+#, fuzzy
+msgctxt "field:product.product,cost_prices:"
+msgid "Cost Prices"
+msgstr "Beszerzési ár"
+
 msgctxt "field:product.product,create_date:"
 msgid "Create Date"
 msgstr "Létrehozás dátuma"
@@ -162,6 +295,11 @@ msgid "List Price"
 msgstr "Árlista szerinti ár"
 
 #, fuzzy
+msgctxt "field:product.product,list_prices:"
+msgid "List Prices"
+msgstr "Árlista szerinti ár"
+
+#, fuzzy
 msgctxt "field:product.product,name:"
 msgid "Name"
 msgstr "Név"
@@ -207,6 +345,11 @@ msgctxt "field:product.template,cost_price_method:"
 msgid "Cost Method"
 msgstr "Költségmódszer"
 
+#, fuzzy
+msgctxt "field:product.template,cost_prices:"
+msgid "Cost Prices"
+msgstr "Beszerzési ár"
+
 msgctxt "field:product.template,create_date:"
 msgid "Create Date"
 msgstr "Létrehozás dátuma"
@@ -231,6 +374,11 @@ msgctxt "field:product.template,list_price:"
 msgid "List Price"
 msgstr "Árlista szerinti ár"
 
+#, fuzzy
+msgctxt "field:product.template,list_prices:"
+msgid "List Prices"
+msgstr "Árlista szerinti ár"
+
 msgctxt "field:product.template,name:"
 msgid "Name"
 msgstr "Név"
@@ -483,6 +631,18 @@ msgctxt "model:product.configuration,name:"
 msgid "Product Configuration"
 msgstr ""
 
+msgctxt "model:product.configuration.default_cost_price_method,name:"
+msgid "Product Configuration Default Cost Price Method"
+msgstr ""
+
+msgctxt "model:product.cost_price,name:"
+msgid "Product Cost Price"
+msgstr ""
+
+msgctxt "model:product.list_price,name:"
+msgid "Product List Price"
+msgstr ""
+
 msgctxt "model:product.product,name:"
 msgid "Product Variant"
 msgstr "Cikk változat"
diff --git a/locale/it_IT.po b/locale/it_IT.po
index edfd37c..396b620 100644
--- a/locale/it_IT.po
+++ b/locale/it_IT.po
@@ -100,6 +100,129 @@ msgid "Write User"
 msgstr "modificato da"
 
 #, fuzzy
+msgctxt "field:product.configuration.default_cost_price_method,create_date:"
+msgid "Create Date"
+msgstr "Data di creazione"
+
+#, fuzzy
+msgctxt "field:product.configuration.default_cost_price_method,create_uid:"
+msgid "Create User"
+msgstr "Utente creazione"
+
+msgctxt ""
+"field:product.configuration.default_cost_price_method,default_cost_price_method:"
+msgid "Default Cost Method"
+msgstr ""
+
+#, fuzzy
+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"
+
+#, fuzzy
+msgctxt "field:product.configuration.default_cost_price_method,write_date:"
+msgid "Write Date"
+msgstr "Utente scrittura"
+
+#, fuzzy
+msgctxt "field:product.configuration.default_cost_price_method,write_uid:"
+msgid "Write User"
+msgstr "modificato da"
+
+msgctxt "field:product.cost_price,company:"
+msgid "Company"
+msgstr ""
+
+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"
+msgstr "Data di creazione"
+
+#, fuzzy
+msgctxt "field:product.cost_price,create_uid:"
+msgid "Create User"
+msgstr "Utente creazione"
+
+#, fuzzy
+msgctxt "field:product.cost_price,id:"
+msgid "ID"
+msgstr "Movimento contabile"
+
+#, fuzzy
+msgctxt "field:product.cost_price,rec_name:"
+msgid "Name"
+msgstr "Nome"
+
+msgctxt "field:product.cost_price,template:"
+msgid "Template"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:product.cost_price,write_date:"
+msgid "Write Date"
+msgstr "Utente scrittura"
+
+#, fuzzy
+msgctxt "field:product.cost_price,write_uid:"
+msgid "Write User"
+msgstr "modificato da"
+
+msgctxt "field:product.list_price,company:"
+msgid "Company"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:product.list_price,create_date:"
+msgid "Create Date"
+msgstr "Data di creazione"
+
+#, fuzzy
+msgctxt "field:product.list_price,create_uid:"
+msgid "Create User"
+msgstr "Utente creazione"
+
+#, fuzzy
+msgctxt "field:product.list_price,id:"
+msgid "ID"
+msgstr "Movimento contabile"
+
+msgctxt "field:product.list_price,list_price:"
+msgid "List Price"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:product.list_price,rec_name:"
+msgid "Name"
+msgstr "Nome"
+
+msgctxt "field:product.list_price,template:"
+msgid "Template"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:product.list_price,write_date:"
+msgid "Write Date"
+msgstr "Utente scrittura"
+
+#, fuzzy
+msgctxt "field:product.list_price,write_uid:"
+msgid "Write User"
+msgstr "modificato da"
+
+#, fuzzy
 msgctxt "field:product.product,active:"
 msgid "Active"
 msgstr "Attivo"
@@ -130,6 +253,10 @@ msgctxt "field:product.product,cost_price_uom:"
 msgid "Cost Price"
 msgstr ""
 
+msgctxt "field:product.product,cost_prices:"
+msgid "Cost Prices"
+msgstr ""
+
 #, fuzzy
 msgctxt "field:product.product,create_date:"
 msgid "Create Date"
@@ -166,6 +293,10 @@ msgctxt "field:product.product,list_price_uom:"
 msgid "List Price"
 msgstr ""
 
+msgctxt "field:product.product,list_prices:"
+msgid "List Prices"
+msgstr ""
+
 #, fuzzy
 msgctxt "field:product.product,name:"
 msgid "Name"
@@ -218,6 +349,10 @@ msgctxt "field:product.template,cost_price_method:"
 msgid "Cost Method"
 msgstr ""
 
+msgctxt "field:product.template,cost_prices:"
+msgid "Cost Prices"
+msgstr ""
+
 #, fuzzy
 msgctxt "field:product.template,create_date:"
 msgid "Create Date"
@@ -245,6 +380,10 @@ msgctxt "field:product.template,list_price:"
 msgid "List Price"
 msgstr ""
 
+msgctxt "field:product.template,list_prices:"
+msgid "List Prices"
+msgstr ""
+
 #, fuzzy
 msgctxt "field:product.template,name:"
 msgid "Name"
@@ -521,6 +660,18 @@ msgctxt "model:product.configuration,name:"
 msgid "Product Configuration"
 msgstr ""
 
+msgctxt "model:product.configuration.default_cost_price_method,name:"
+msgid "Product Configuration Default Cost Price Method"
+msgstr ""
+
+msgctxt "model:product.cost_price,name:"
+msgid "Product Cost Price"
+msgstr ""
+
+msgctxt "model:product.list_price,name:"
+msgid "Product List Price"
+msgstr ""
+
 msgctxt "model:product.product,name:"
 msgid "Product Variant"
 msgstr ""
diff --git a/locale/ja_JP.po b/locale/ja_JP.po
index 9fe353f..05c843e 100644
--- a/locale/ja_JP.po
+++ b/locale/ja_JP.po
@@ -84,6 +84,111 @@ msgctxt "field:product.configuration,write_uid:"
 msgid "Write User"
 msgstr ""
 
+msgctxt "field:product.configuration.default_cost_price_method,create_date:"
+msgid "Create Date"
+msgstr ""
+
+msgctxt "field:product.configuration.default_cost_price_method,create_uid:"
+msgid "Create User"
+msgstr ""
+
+msgctxt ""
+"field:product.configuration.default_cost_price_method,default_cost_price_method:"
+msgid "Default Cost Method"
+msgstr ""
+
+msgctxt "field:product.configuration.default_cost_price_method,id:"
+msgid "ID"
+msgstr ""
+
+msgctxt "field:product.configuration.default_cost_price_method,rec_name:"
+msgid "Name"
+msgstr ""
+
+msgctxt "field:product.configuration.default_cost_price_method,write_date:"
+msgid "Write Date"
+msgstr ""
+
+msgctxt "field:product.configuration.default_cost_price_method,write_uid:"
+msgid "Write User"
+msgstr ""
+
+msgctxt "field:product.cost_price,company:"
+msgid "Company"
+msgstr ""
+
+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 ""
+
+msgctxt "field:product.cost_price,create_uid:"
+msgid "Create User"
+msgstr ""
+
+msgctxt "field:product.cost_price,id:"
+msgid "ID"
+msgstr ""
+
+msgctxt "field:product.cost_price,rec_name:"
+msgid "Name"
+msgstr ""
+
+msgctxt "field:product.cost_price,template:"
+msgid "Template"
+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.list_price,company:"
+msgid "Company"
+msgstr ""
+
+msgctxt "field:product.list_price,create_date:"
+msgid "Create Date"
+msgstr ""
+
+msgctxt "field:product.list_price,create_uid:"
+msgid "Create User"
+msgstr ""
+
+msgctxt "field:product.list_price,id:"
+msgid "ID"
+msgstr ""
+
+msgctxt "field:product.list_price,list_price:"
+msgid "List Price"
+msgstr ""
+
+msgctxt "field:product.list_price,rec_name:"
+msgid "Name"
+msgstr ""
+
+msgctxt "field:product.list_price,template:"
+msgid "Template"
+msgstr ""
+
+msgctxt "field:product.list_price,write_date:"
+msgid "Write Date"
+msgstr ""
+
+msgctxt "field:product.list_price,write_uid:"
+msgid "Write User"
+msgstr ""
+
 msgctxt "field:product.product,active:"
 msgid "Active"
 msgstr ""
@@ -113,6 +218,10 @@ msgctxt "field:product.product,cost_price_uom:"
 msgid "Cost Price"
 msgstr ""
 
+msgctxt "field:product.product,cost_prices:"
+msgid "Cost Prices"
+msgstr ""
+
 msgctxt "field:product.product,create_date:"
 msgid "Create Date"
 msgstr ""
@@ -145,6 +254,10 @@ msgctxt "field:product.product,list_price_uom:"
 msgid "List Price"
 msgstr ""
 
+msgctxt "field:product.product,list_prices:"
+msgid "List Prices"
+msgstr ""
+
 msgctxt "field:product.product,name:"
 msgid "Name"
 msgstr ""
@@ -190,6 +303,10 @@ msgctxt "field:product.template,cost_price_method:"
 msgid "Cost Method"
 msgstr ""
 
+msgctxt "field:product.template,cost_prices:"
+msgid "Cost Prices"
+msgstr ""
+
 msgctxt "field:product.template,create_date:"
 msgid "Create Date"
 msgstr ""
@@ -214,6 +331,10 @@ msgctxt "field:product.template,list_price:"
 msgid "List Price"
 msgstr ""
 
+msgctxt "field:product.template,list_prices:"
+msgid "List Prices"
+msgstr ""
+
 msgctxt "field:product.template,name:"
 msgid "Name"
 msgstr ""
@@ -454,6 +575,18 @@ msgctxt "model:product.configuration,name:"
 msgid "Product Configuration"
 msgstr "Product Configuration"
 
+msgctxt "model:product.configuration.default_cost_price_method,name:"
+msgid "Product Configuration Default Cost Price Method"
+msgstr ""
+
+msgctxt "model:product.cost_price,name:"
+msgid "Product Cost Price"
+msgstr ""
+
+msgctxt "model:product.list_price,name:"
+msgid "Product List Price"
+msgstr ""
+
 msgctxt "model:product.product,name:"
 msgid "Product Variant"
 msgstr ""
diff --git a/locale/lo.po b/locale/lo.po
index d784302..64eb952 100644
--- a/locale/lo.po
+++ b/locale/lo.po
@@ -7,32 +7,32 @@ msgid ""
 "If the UOM is still not used, you can delete it otherwise you can deactivate"
 " it and create a new one."
 msgstr ""
-"ຖ້າໜ່ວຍວັດແທກນີ້ຍັງບໍ່ຖຶກໃຊ້,ໃຫ້ລືບຖິ້ມຫຼືບໍ່ກໍ່ໝາຍໃສ່ບໍ່ໃຊ້ອິກຫຼືສ້າງຂຶ້ນໃໝ່."
+"ຖ້າຫົວໜ່ວຍວັດແທກນີ້ຍັງບໍ່ຖືກໃຊ້, ໃຫ້ລຶບຖິ້ມ ຫຼື ບໍ່ກໍ່ໝາຍໃສ່ບໍ່ໃຊ້ອີກ ຫຼື "
+"ສ້າງຂຶ້ນໃໝ່."
 
 msgctxt "error:product.uom:"
 msgid "Invalid Factor and Rate values in UOM \"%s\"."
-msgstr "ປັດໄຈຄູນ ແລະ ຄ່າອັດຕາ ໃນຫົວໜ່ວຍ \"%s\" ບໍ່ຖຶກຕ້ອງ."
+msgstr "ປັດໄຈ ແລະ ຄ່າອັດຕາ ໃນຫົວໜ່ວຍ \"%s\" ບໍ່ຖືກຕ້ອງ."
 
 msgctxt "error:product.uom:"
 msgid "Rate and factor can not be both equal to zero."
 msgstr "ອັດຕາ ແລະ ປັດໄຈຄູນ ທັງສອງບໍ່ສາມາດເທົ່າກັບສູນໄດ້."
 
-#, fuzzy
 msgctxt "error:product.uom:"
 msgid "You cannot change Rate, Factor or Category on a Unit of Measure."
-msgstr "ເຈົ້າບໍ່ສາມາດປ່ຽນອັດຕາ,ທະວີຄູນຫຼືປະເພດຂອງໜ່ວຍວັດແທກ."
+msgstr "ທ່ານບໍ່ສາມາດປ່ຽນອັດຕາ, ປັດໄຈ ຫຼື ປະເພດຫົວໜ່ວຍ ຂອງ ການວັດແທກ."
 
 msgctxt "field:product.category,childs:"
 msgid "Children"
-msgstr "ບັນຊີລູກ"
+msgstr "ໝວດຍ່ອຍ"
 
 msgctxt "field:product.category,create_date:"
 msgid "Create Date"
-msgstr "ສ້າງວັນທີ"
+msgstr "ວັນທີສ້າງ"
 
 msgctxt "field:product.category,create_uid:"
 msgid "Create User"
-msgstr "ສ້າງຜູ້ໃຊ້"
+msgstr "ຜູ້ສ້າງ"
 
 msgctxt "field:product.category,id:"
 msgid "ID"
@@ -52,51 +52,173 @@ msgstr "ຊື່"
 
 msgctxt "field:product.category,write_date:"
 msgid "Write Date"
-msgstr "ຂຽນວັນທີ"
+msgstr "ວັນທີບັນທຶກ"
 
 msgctxt "field:product.category,write_uid:"
 msgid "Write User"
-msgstr "ສ້າງຜູ້ໃຊ້"
+msgstr "ຜູ້ບັນທຶກ"
 
-#, fuzzy
 msgctxt "field:product.configuration,create_date:"
 msgid "Create Date"
-msgstr "ສ້າງວັນທີ"
+msgstr "ວັນທີສ້າງ"
 
-#, fuzzy
 msgctxt "field:product.configuration,create_uid:"
 msgid "Create User"
-msgstr "ສ້າງຜູ້ໃຊ້"
+msgstr "ຜູ້ສ້າງ"
 
 msgctxt "field:product.configuration,default_cost_price_method:"
 msgid "Default Cost Method"
+msgstr "ວິທີຄິດໄລ່ລາຄາເດີມ"
+
+msgctxt "field:product.configuration,id:"
+msgid "ID"
+msgstr "ເລກລຳດັບ"
+
+msgctxt "field:product.configuration,rec_name:"
+msgid "Name"
+msgstr "ຊື່"
+
+msgctxt "field:product.configuration,write_date:"
+msgid "Write Date"
+msgstr "ວັນທີບັນທຶກ"
+
+msgctxt "field:product.configuration,write_uid:"
+msgid "Write User"
+msgstr "ຜູ້ບັນທຶກ"
+
+#, fuzzy
+msgctxt "field:product.configuration.default_cost_price_method,create_date:"
+msgid "Create Date"
+msgstr "ວັນທີສ້າງ"
+
+#, fuzzy
+msgctxt "field:product.configuration.default_cost_price_method,create_uid:"
+msgid "Create User"
+msgstr "ຜູ້ສ້າງ"
+
+#, fuzzy
+msgctxt ""
+"field:product.configuration.default_cost_price_method,default_cost_price_method:"
+msgid "Default Cost Method"
+msgstr "ວິທີຄິດໄລ່ລາຄາເດີມ"
+
+#, fuzzy
+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 "ຊື່"
+
+#, fuzzy
+msgctxt "field:product.configuration.default_cost_price_method,write_date:"
+msgid "Write Date"
+msgstr "ວັນທີບັນທຶກ"
+
+#, fuzzy
+msgctxt "field:product.configuration.default_cost_price_method,write_uid:"
+msgid "Write User"
+msgstr "ຜູ້ບັນທຶກ"
+
+msgctxt "field:product.cost_price,company:"
+msgid "Company"
 msgstr ""
 
 #, fuzzy
-msgctxt "field:product.configuration,id:"
+msgctxt "field:product.cost_price,cost_price:"
+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 "ວັນທີສ້າງ"
+
+#, fuzzy
+msgctxt "field:product.cost_price,create_uid:"
+msgid "Create User"
+msgstr "ຜູ້ສ້າງ"
+
+#, fuzzy
+msgctxt "field:product.cost_price,id:"
 msgid "ID"
 msgstr "ເລກທີ"
 
 #, fuzzy
-msgctxt "field:product.configuration,rec_name:"
+msgctxt "field:product.cost_price,rec_name:"
 msgid "Name"
 msgstr "ຊື່"
 
 #, fuzzy
-msgctxt "field:product.configuration,write_date:"
+msgctxt "field:product.cost_price,template:"
+msgid "Template"
+msgstr "ຮ່າງແບບ"
+
+#, fuzzy
+msgctxt "field:product.cost_price,write_date:"
 msgid "Write Date"
-msgstr "ຂຽນວັນທີ"
+msgstr "ວັນທີບັນທຶກ"
 
 #, fuzzy
-msgctxt "field:product.configuration,write_uid:"
+msgctxt "field:product.cost_price,write_uid:"
+msgid "Write User"
+msgstr "ຜູ້ບັນທຶກ"
+
+msgctxt "field:product.list_price,company:"
+msgid "Company"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:product.list_price,create_date:"
+msgid "Create Date"
+msgstr "ວັນທີສ້າງ"
+
+#, fuzzy
+msgctxt "field:product.list_price,create_uid:"
+msgid "Create User"
+msgstr "ຜູ້ສ້າງ"
+
+#, fuzzy
+msgctxt "field:product.list_price,id:"
+msgid "ID"
+msgstr "ເລກທີ"
+
+#, fuzzy
+msgctxt "field:product.list_price,list_price:"
+msgid "List Price"
+msgstr "ລາຄາຂາຍ"
+
+#, fuzzy
+msgctxt "field:product.list_price,rec_name:"
+msgid "Name"
+msgstr "ຊື່"
+
+#, fuzzy
+msgctxt "field:product.list_price,template:"
+msgid "Template"
+msgstr "ຮ່າງແບບ"
+
+#, fuzzy
+msgctxt "field:product.list_price,write_date:"
+msgid "Write Date"
+msgstr "ວັນທີບັນທຶກ"
+
+#, fuzzy
+msgctxt "field:product.list_price,write_uid:"
 msgid "Write User"
-msgstr "ສ້າງຜູ້ໃຊ້"
+msgstr "ຜູ້ບັນທຶກ"
 
 msgctxt "field:product.product,active:"
 msgid "Active"
 msgstr "ຍັງໃຊ້ຢູ່"
 
-#, fuzzy
 msgctxt "field:product.product,categories:"
 msgid "Categories"
 msgstr "ປະເພດ"
@@ -105,17 +227,14 @@ msgctxt "field:product.product,code:"
 msgid "Code"
 msgstr "ລະຫັດ"
 
-#, fuzzy
 msgctxt "field:product.product,consumable:"
 msgid "Consumable"
 msgstr "ວັດຖຸສິ້ນເປືອງ"
 
-#, fuzzy
 msgctxt "field:product.product,cost_price:"
 msgid "Cost Price"
 msgstr "ລາຄາຄິດໄລ່"
 
-#, fuzzy
 msgctxt "field:product.product,cost_price_method:"
 msgid "Cost Method"
 msgstr "ວິທີຄິດໄລ່"
@@ -124,32 +243,35 @@ msgctxt "field:product.product,cost_price_uom:"
 msgid "Cost Price"
 msgstr "ລາຄາຄິດໄລ່"
 
+#, fuzzy
+msgctxt "field:product.product,cost_prices:"
+msgid "Cost Prices"
+msgstr "ລາຄາຄິດໄລ່"
+
 msgctxt "field:product.product,create_date:"
 msgid "Create Date"
-msgstr "ສ້າງວັນທີ"
+msgstr "ວັນທີສ້າງ"
 
 msgctxt "field:product.product,create_uid:"
 msgid "Create User"
-msgstr "ສ້າງຜູ້ໃຊ້"
+msgstr "ຜູ້ສ້າງ"
 
 msgctxt "field:product.product,default_uom:"
 msgid "Default UOM"
-msgstr "ໜ່ວຍເດີມ"
+msgstr "ຫົວໜ່ວຍເດີມ"
 
-#, fuzzy
 msgctxt "field:product.product,default_uom_category:"
 msgid "Default UOM Category"
-msgstr "ໝວດຫົວໜ່ວຍເດີມ"
+msgstr "ປະເພດຫົວໜ່ວຍເດີມ"
 
 msgctxt "field:product.product,description:"
 msgid "Description"
-msgstr "ລາຍລະອຽດ"
+msgstr "ຄຳອະທິບາຍ"
 
 msgctxt "field:product.product,id:"
 msgid "ID"
 msgstr "ເລກທີ"
 
-#, fuzzy
 msgctxt "field:product.product,list_price:"
 msgid "List Price"
 msgstr "ລາຄາຂາຍ"
@@ -159,6 +281,10 @@ msgid "List Price"
 msgstr "ລາຄາຂາຍ"
 
 #, fuzzy
+msgctxt "field:product.product,list_prices:"
+msgid "List Prices"
+msgstr "ລາຄາຂາຍ"
+
 msgctxt "field:product.product,name:"
 msgid "Name"
 msgstr "ຊື່"
@@ -177,17 +303,16 @@ msgstr "ຊະນິດ"
 
 msgctxt "field:product.product,write_date:"
 msgid "Write Date"
-msgstr "ຂຽນວັນທີ"
+msgstr "ວັນທີບັນທຶກ"
 
 msgctxt "field:product.product,write_uid:"
 msgid "Write User"
-msgstr "ຂຽນຊື່ຜູ້ໃຊ້"
+msgstr "ຜູ້ບັນທຶກ"
 
 msgctxt "field:product.template,active:"
 msgid "Active"
 msgstr "ຍັງໃຊ້ຢູ່"
 
-#, fuzzy
 msgctxt "field:product.template,categories:"
 msgid "Categories"
 msgstr "ປະເພດ"
@@ -204,13 +329,18 @@ msgctxt "field:product.template,cost_price_method:"
 msgid "Cost Method"
 msgstr "ວິທີຄິດໄລ່"
 
+#, fuzzy
+msgctxt "field:product.template,cost_prices:"
+msgid "Cost Prices"
+msgstr "ລາຄາຄິດໄລ່"
+
 msgctxt "field:product.template,create_date:"
 msgid "Create Date"
-msgstr "ສ້າງວັນທີ"
+msgstr "ວັນທີສ້າງ"
 
 msgctxt "field:product.template,create_uid:"
 msgid "Create User"
-msgstr "ສ້າງຜູ້ໃຊ້"
+msgstr "ຜູ້ສ້າງ"
 
 msgctxt "field:product.template,default_uom:"
 msgid "Default UOM"
@@ -218,7 +348,7 @@ msgstr "ຫົວໜ່ວຍເດີມ"
 
 msgctxt "field:product.template,default_uom_category:"
 msgid "Default UOM Category"
-msgstr "ໝວດຫົວໜ່ວຍເດີມ"
+msgstr "ປະເພດຫົວໜ່ວຍເດີມ"
 
 msgctxt "field:product.template,id:"
 msgid "ID"
@@ -228,6 +358,11 @@ msgctxt "field:product.template,list_price:"
 msgid "List Price"
 msgstr "ລາຍການລາຄາ"
 
+#, fuzzy
+msgctxt "field:product.template,list_prices:"
+msgid "List Prices"
+msgstr "ລາຄາຂາຍ"
+
 msgctxt "field:product.template,name:"
 msgid "Name"
 msgstr "ຊື່"
@@ -246,72 +381,63 @@ msgstr "ປະເພດ"
 
 msgctxt "field:product.template,write_date:"
 msgid "Write Date"
-msgstr "ຂຽນວັນທີ"
+msgstr "ວັນທີບັນທຶກ"
 
 msgctxt "field:product.template,write_uid:"
 msgid "Write User"
-msgstr "ສ້າງຜູ້ໃຊ້"
+msgstr "ຜູ້ບັນທຶກ"
 
-#, fuzzy
 msgctxt "field:product.template-product.category,category:"
 msgid "Category"
-msgstr "ໝວດ"
+msgstr "ປະເພດ"
 
-#, fuzzy
 msgctxt "field:product.template-product.category,create_date:"
 msgid "Create Date"
-msgstr "ສ້າງວັນທີ"
+msgstr "ວັນທີສ້າງ"
 
-#, fuzzy
 msgctxt "field:product.template-product.category,create_uid:"
 msgid "Create User"
-msgstr "ສ້າງຜູ້ໃຊ້"
+msgstr "ຜູ້ສ້າງ"
 
-#, fuzzy
 msgctxt "field:product.template-product.category,id:"
 msgid "ID"
 msgstr "ເລກທີ"
 
-#, fuzzy
 msgctxt "field:product.template-product.category,rec_name:"
 msgid "Name"
 msgstr "ຊື່"
 
-#, fuzzy
 msgctxt "field:product.template-product.category,template:"
 msgid "Template"
 msgstr "ຮ່າງແບບ"
 
-#, fuzzy
 msgctxt "field:product.template-product.category,write_date:"
 msgid "Write Date"
-msgstr "ຂຽນວັນທີ"
+msgstr "ວັນທີບັນທຶກ"
 
-#, fuzzy
 msgctxt "field:product.template-product.category,write_uid:"
 msgid "Write User"
-msgstr "ສ້າງຜູ້ໃຊ້"
+msgstr "ຜູ້ບັນທຶກ"
 
 msgctxt "field:product.uom,active:"
 msgid "Active"
 msgstr "ຍັງໃຊ້ຢູ່"
 
-#, fuzzy
 msgctxt "field:product.uom,category:"
 msgid "Category"
-msgstr "ໝວດ"
+msgstr "ປະເພດ"
 
 msgctxt "field:product.uom,create_date:"
 msgid "Create Date"
-msgstr "ສ້າງວັນທີ"
+msgstr "ວັນທີສ້າງ"
 
 msgctxt "field:product.uom,create_uid:"
 msgid "Create User"
-msgstr "ສ້າງຜູ້ໃຊ້"
+msgstr "ຜູ້ສ້າງ"
 
 msgctxt "field:product.uom,digits:"
 msgid "Display Digits"
-msgstr "ສະແດງໂຕເລກ"
+msgstr "ສະແດງເລກເສດ"
 
 msgctxt "field:product.uom,factor:"
 msgid "Factor"
@@ -319,7 +445,7 @@ msgstr "ປັດໄຈຄູນ"
 
 msgctxt "field:product.uom,id:"
 msgid "ID"
-msgstr "ບັດ"
+msgstr "ເລກລຳດັບ"
 
 msgctxt "field:product.uom,name:"
 msgid "Name"
@@ -343,23 +469,23 @@ msgstr "ສັນຍະລັກ"
 
 msgctxt "field:product.uom,write_date:"
 msgid "Write Date"
-msgstr "ຂຽນວັນທີ"
+msgstr "ວັນທີບັນທຶກ"
 
 msgctxt "field:product.uom,write_uid:"
 msgid "Write User"
-msgstr "ສ້າງຜູ້ໃຊ້"
+msgstr "ຜູ້ບັນທຶກ"
 
 msgctxt "field:product.uom.category,create_date:"
 msgid "Create Date"
-msgstr "ສ້າງວັນທີ"
+msgstr "ວັນທີສ້າງ"
 
 msgctxt "field:product.uom.category,create_uid:"
 msgid "Create User"
-msgstr "ສ້າງຜູ້ໃຊ້"
+msgstr "ຜູ້ສ້າງ"
 
 msgctxt "field:product.uom.category,id:"
 msgid "ID"
-msgstr "ບັດ"
+msgstr "ເລກລຳດັບ"
 
 msgctxt "field:product.uom.category,name:"
 msgid "Name"
@@ -375,27 +501,27 @@ msgstr "ຫົວໜ່ວຍວັດແທກ"
 
 msgctxt "field:product.uom.category,write_date:"
 msgid "Write Date"
-msgstr "ຂຽນວັນທີ"
+msgstr "ວັນທີບັນທຶກ"
 
 msgctxt "field:product.uom.category,write_uid:"
 msgid "Write User"
-msgstr "ສ້າງຜູ້ໃຊ້"
+msgstr "ຜູ້ບັນທຶກ"
 
 msgctxt "help:product.uom,factor:"
 msgid ""
 "The coefficient for the formula:\n"
 "coef (base unit) = 1 (this unit)"
 msgstr ""
-"ຄ່າຄູນຂອງສູດ:\n"
-"ຄ່າຄູນ (ໜ່ວຍພຶ້ນຖານ)= 1 (ໜ່ວຍນີ້) "
+"ຄ່າສຳປະສິດຂອງສູດ:\n"
+"coef (ໜ່ວຍພຶ້ນຖານ)= 1 (ໜ່ວຍນີ້) "
 
 msgctxt "help:product.uom,rate:"
 msgid ""
 "The coefficient for the formula:\n"
 "1 (base unit) = coef (this unit)"
 msgstr ""
-"ຄ່າຄູນຂອງສູດ:\n"
-"ຄ່າຄູນ (ໜ່ວຍພຶ້ນຖານ)= 1 (ໜ່ວຍນີ້) "
+"ຄ່າສຳປະສິດຂອງສູດ:\n"
+"1 (ໜ່ວຍພຶ້ນຖານ)= coef (ໜ່ວຍນີ້)"
 
 msgctxt "model:ir.action,name:act_category_list"
 msgid "Categories"
@@ -407,16 +533,15 @@ msgstr "ປະເພດ"
 
 msgctxt "model:ir.action,name:act_product_configuration_form"
 msgid "Product Configuration"
-msgstr ""
+msgstr "ກຳນົດຄ່າຜະລິດຕະພັນ"
 
 msgctxt "model:ir.action,name:act_product_form"
 msgid "Variants"
-msgstr "ໜ່ວຍວັດແທກ"
+msgstr "ຜະລິດຕະພັນຍ່ອຍ"
 
-#, fuzzy
 msgctxt "model:ir.action,name:act_product_from_template"
 msgid "Variants"
-msgstr "ໜ່ວຍວັດແທກ"
+msgstr "ຜະລິດຕະພັນໃນກຸ່ມດຽວກັນ"
 
 msgctxt "model:ir.action,name:act_template_by_category"
 msgid "Product by Category"
@@ -436,16 +561,15 @@ msgstr "ໜ່ວຍວັດແທກ"
 
 msgctxt "model:ir.ui.menu,name:menu_category_list"
 msgid "Categories"
-msgstr "ໝວດ"
+msgstr "ປະເພດ"
 
 msgctxt "model:ir.ui.menu,name:menu_category_tree"
 msgid "Categories"
-msgstr "ໝວດ"
+msgstr "ປະເພດ"
 
-#, fuzzy
 msgctxt "model:ir.ui.menu,name:menu_configuration"
 msgid "Configuration"
-msgstr "ການຕັ້ງຄ່າ"
+msgstr "ການກຳນົດຄ່າ"
 
 msgctxt "model:ir.ui.menu,name:menu_main_product"
 msgid "Product"
@@ -457,7 +581,7 @@ msgstr "ຜະລິດຕະພັນຍ່ອຍ"
 
 msgctxt "model:ir.ui.menu,name:menu_product_configuration"
 msgid "Product Configuration"
-msgstr ""
+msgstr "ກຳນົດຄ່າຜະລິດຕະພັນ"
 
 msgctxt "model:ir.ui.menu,name:menu_template"
 msgid "Products"
@@ -465,7 +589,7 @@ msgstr "ຜະລິດຕະພັນ"
 
 msgctxt "model:ir.ui.menu,name:menu_uom_category_form"
 msgid "Categories"
-msgstr "ໝວດ"
+msgstr "ປະເພດ"
 
 msgctxt "model:ir.ui.menu,name:menu_uom_form"
 msgid "Units of Measure"
@@ -477,6 +601,18 @@ msgstr "ປະເພດຜະລິດຕະພັນ"
 
 msgctxt "model:product.configuration,name:"
 msgid "Product Configuration"
+msgstr "ກຳນົດຄ່າຜະລິດຕະພັນ"
+
+msgctxt "model:product.configuration.default_cost_price_method,name:"
+msgid "Product Configuration Default Cost Price Method"
+msgstr ""
+
+msgctxt "model:product.cost_price,name:"
+msgid "Product Cost Price"
+msgstr ""
+
+msgctxt "model:product.list_price,name:"
+msgid "Product List Price"
 msgstr ""
 
 msgctxt "model:product.product,name:"
@@ -489,7 +625,7 @@ msgstr "ຮ່າງຂໍ້ມູນຜະລິດຕະພັນ"
 
 msgctxt "model:product.template-product.category,name:"
 msgid "Template - Category"
-msgstr ""
+msgstr "ຮ່າງແບບ - ປະເພດ"
 
 msgctxt "model:product.uom,name:"
 msgid "Unit of measure"
@@ -501,7 +637,7 @@ msgstr "ອາຣ໌"
 
 msgctxt "model:product.uom,name:uom_carat"
 msgid "Carat"
-msgstr "ກາລັດ"
+msgstr "ກາຣັດ"
 
 msgctxt "model:product.uom,name:uom_centimeter"
 msgid "centimeter"
@@ -525,7 +661,7 @@ msgstr "ແມັດກ້ອນ"
 
 msgctxt "model:product.uom,name:uom_day"
 msgid "Day"
-msgstr "ມຶ້"
+msgstr "ມື້"
 
 msgctxt "model:product.uom,name:uom_foot"
 msgid "Foot"
@@ -617,7 +753,7 @@ msgstr "ໜ່ວຍ"
 
 msgctxt "model:product.uom,name:uom_work_day"
 msgid "Work Day"
-msgstr "ມື້ເຮັດວຽກ"
+msgstr "ມື້ວຽກ"
 
 msgctxt "model:product.uom,name:uom_yard"
 msgid "Yard"
@@ -637,7 +773,7 @@ msgstr "ຊມ"
 
 msgctxt "model:product.uom,symbol:uom_cubic_centimeter"
 msgid "cm³"
-msgstr "ຊມ2"
+msgstr "ຊມ3"
 
 msgctxt "model:product.uom,symbol:uom_cubic_foot"
 msgid "ft³"
@@ -649,7 +785,7 @@ msgstr "ກຸບບິກນິ້ວ"
 
 msgctxt "model:product.uom,symbol:uom_cubic_meter"
 msgid "m³"
-msgstr "ມ2"
+msgstr "ມ3"
 
 msgctxt "model:product.uom,symbol:uom_day"
 msgid "d"
@@ -713,7 +849,7 @@ msgstr "ອອນ"
 
 msgctxt "model:product.uom,symbol:uom_pound"
 msgid "lb"
-msgstr ""
+msgstr "ພາວ"
 
 msgctxt "model:product.uom,symbol:uom_second"
 msgid "s"
@@ -753,7 +889,7 @@ msgstr "ຫລາ"
 
 msgctxt "model:product.uom.category,name:"
 msgid "Product uom category"
-msgstr "ປະເພດຫົວໜ່ວຍວັດແທກຜະລິດຕະພັນ"
+msgstr "ປະເພດໜ່ວຍວັດແທກຜະລິດຕະພັນ"
 
 msgctxt "model:product.uom.category,name:uom_cat_length"
 msgid "Length"
@@ -761,7 +897,7 @@ msgstr "ຄວາມຍາວ"
 
 msgctxt "model:product.uom.category,name:uom_cat_surface"
 msgid "Surface"
-msgstr "ໜ້າພຽງ"
+msgstr "ເນື້ອທີ່"
 
 msgctxt "model:product.uom.category,name:uom_cat_time"
 msgid "Time"
@@ -783,19 +919,17 @@ msgctxt "model:res.group,name:group_product_admin"
 msgid "Product Administration"
 msgstr "ບໍລິຫານຜະລິດຕະພັນ"
 
-#, fuzzy
 msgctxt "selection:product.product,cost_price_method:"
 msgid "Average"
 msgstr "ສະເລັ່ຍ"
 
-#, fuzzy
 msgctxt "selection:product.product,cost_price_method:"
 msgid "Fixed"
 msgstr "ຄົງທີ່"
 
 msgctxt "selection:product.product,type:"
 msgid "Assets"
-msgstr "ຊັບສົມສິນ"
+msgstr "ຊັບສິນ"
 
 msgctxt "selection:product.product,type:"
 msgid "Goods"
@@ -833,10 +967,9 @@ msgctxt "view:product.template:"
 msgid "General"
 msgstr "ທົ່ວໄປ"
 
-#, fuzzy
 msgctxt "view:product.configuration:"
 msgid "Party Configuration"
-msgstr "ການຕັ້ງຄ່າພາກສ່ວນ"
+msgstr "ກຳນົດຄ່າພາກສ່ວນ"
 
 msgctxt "view:product.product:"
 msgid "Product"
diff --git a/locale/lt.po b/locale/lt.po
index c0a2f2d..b197137 100644
--- a/locale/lt.po
+++ b/locale/lt.po
@@ -87,6 +87,114 @@ msgctxt "field:product.configuration,write_uid:"
 msgid "Write User"
 msgstr ""
 
+msgctxt "field:product.configuration.default_cost_price_method,create_date:"
+msgid "Create Date"
+msgstr ""
+
+msgctxt "field:product.configuration.default_cost_price_method,create_uid:"
+msgid "Create User"
+msgstr ""
+
+msgctxt ""
+"field:product.configuration.default_cost_price_method,default_cost_price_method:"
+msgid "Default Cost Method"
+msgstr ""
+
+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"
+
+msgctxt "field:product.configuration.default_cost_price_method,write_date:"
+msgid "Write Date"
+msgstr ""
+
+msgctxt "field:product.configuration.default_cost_price_method,write_uid:"
+msgid "Write User"
+msgstr ""
+
+msgctxt "field:product.cost_price,company:"
+msgid "Company"
+msgstr ""
+
+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 ""
+
+msgctxt "field:product.cost_price,create_uid:"
+msgid "Create User"
+msgstr ""
+
+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,template:"
+msgid "Template"
+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.list_price,company:"
+msgid "Company"
+msgstr ""
+
+msgctxt "field:product.list_price,create_date:"
+msgid "Create Date"
+msgstr ""
+
+msgctxt "field:product.list_price,create_uid:"
+msgid "Create User"
+msgstr ""
+
+msgctxt "field:product.list_price,id:"
+msgid "ID"
+msgstr ""
+
+msgctxt "field:product.list_price,list_price:"
+msgid "List Price"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:product.list_price,rec_name:"
+msgid "Name"
+msgstr "Namu"
+
+msgctxt "field:product.list_price,template:"
+msgid "Template"
+msgstr ""
+
+msgctxt "field:product.list_price,write_date:"
+msgid "Write Date"
+msgstr ""
+
+msgctxt "field:product.list_price,write_uid:"
+msgid "Write User"
+msgstr ""
+
 msgctxt "field:product.product,active:"
 msgid "Active"
 msgstr ""
@@ -115,6 +223,10 @@ msgctxt "field:product.product,cost_price_uom:"
 msgid "Cost Price"
 msgstr ""
 
+msgctxt "field:product.product,cost_prices:"
+msgid "Cost Prices"
+msgstr ""
+
 msgctxt "field:product.product,create_date:"
 msgid "Create Date"
 msgstr ""
@@ -147,6 +259,10 @@ msgctxt "field:product.product,list_price_uom:"
 msgid "List Price"
 msgstr ""
 
+msgctxt "field:product.product,list_prices:"
+msgid "List Prices"
+msgstr ""
+
 #, fuzzy
 msgctxt "field:product.product,name:"
 msgid "Name"
@@ -193,6 +309,10 @@ msgctxt "field:product.template,cost_price_method:"
 msgid "Cost Method"
 msgstr ""
 
+msgctxt "field:product.template,cost_prices:"
+msgid "Cost Prices"
+msgstr ""
+
 msgctxt "field:product.template,create_date:"
 msgid "Create Date"
 msgstr ""
@@ -217,6 +337,10 @@ msgctxt "field:product.template,list_price:"
 msgid "List Price"
 msgstr ""
 
+msgctxt "field:product.template,list_prices:"
+msgid "List Prices"
+msgstr ""
+
 #, fuzzy
 msgctxt "field:product.template,name:"
 msgid "Name"
@@ -460,6 +584,18 @@ msgctxt "model:product.configuration,name:"
 msgid "Product Configuration"
 msgstr ""
 
+msgctxt "model:product.configuration.default_cost_price_method,name:"
+msgid "Product Configuration Default Cost Price Method"
+msgstr ""
+
+msgctxt "model:product.cost_price,name:"
+msgid "Product Cost Price"
+msgstr ""
+
+msgctxt "model:product.list_price,name:"
+msgid "Product List Price"
+msgstr ""
+
 msgctxt "model:product.product,name:"
 msgid "Product Variant"
 msgstr ""
diff --git a/locale/nl.po b/locale/nl.po
index 9bd704f..19ac389 100644
--- a/locale/nl.po
+++ b/locale/nl.po
@@ -100,6 +100,134 @@ msgid "Write User"
 msgstr "Gebruiker"
 
 #, fuzzy
+msgctxt "field:product.configuration.default_cost_price_method,create_date:"
+msgid "Create Date"
+msgstr "Datum"
+
+#, fuzzy
+msgctxt "field:product.configuration.default_cost_price_method,create_uid:"
+msgid "Create User"
+msgstr "Gebruiker"
+
+msgctxt ""
+"field:product.configuration.default_cost_price_method,default_cost_price_method:"
+msgid "Default Cost Method"
+msgstr ""
+
+#, 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 "Naam"
+
+#, fuzzy
+msgctxt "field:product.configuration.default_cost_price_method,write_date:"
+msgid "Write Date"
+msgstr "Schrijfdatum"
+
+#, fuzzy
+msgctxt "field:product.configuration.default_cost_price_method,write_uid:"
+msgid "Write User"
+msgstr "Gebruiker"
+
+msgctxt "field:product.cost_price,company:"
+msgid "Company"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:product.cost_price,cost_price:"
+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"
+
+#, fuzzy
+msgctxt "field:product.cost_price,create_uid:"
+msgid "Create User"
+msgstr "Gebruiker"
+
+#, fuzzy
+msgctxt "field:product.cost_price,id:"
+msgid "ID"
+msgstr "ID"
+
+#, fuzzy
+msgctxt "field:product.cost_price,rec_name:"
+msgid "Name"
+msgstr "Naam"
+
+#, fuzzy
+msgctxt "field:product.cost_price,template:"
+msgid "Template"
+msgstr "Sjabloon"
+
+#, fuzzy
+msgctxt "field:product.cost_price,write_date:"
+msgid "Write Date"
+msgstr "Schrijfdatum"
+
+#, fuzzy
+msgctxt "field:product.cost_price,write_uid:"
+msgid "Write User"
+msgstr "Gebruiker"
+
+msgctxt "field:product.list_price,company:"
+msgid "Company"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:product.list_price,create_date:"
+msgid "Create Date"
+msgstr "Datum"
+
+#, fuzzy
+msgctxt "field:product.list_price,create_uid:"
+msgid "Create User"
+msgstr "Gebruiker"
+
+#, fuzzy
+msgctxt "field:product.list_price,id:"
+msgid "ID"
+msgstr "ID"
+
+#, fuzzy
+msgctxt "field:product.list_price,list_price:"
+msgid "List Price"
+msgstr "Catalogusprijs"
+
+#, fuzzy
+msgctxt "field:product.list_price,rec_name:"
+msgid "Name"
+msgstr "Naam"
+
+#, fuzzy
+msgctxt "field:product.list_price,template:"
+msgid "Template"
+msgstr "Sjabloon"
+
+#, fuzzy
+msgctxt "field:product.list_price,write_date:"
+msgid "Write Date"
+msgstr "Schrijfdatum"
+
+#, fuzzy
+msgctxt "field:product.list_price,write_uid:"
+msgid "Write User"
+msgstr "Gebruiker"
+
+#, fuzzy
 msgctxt "field:product.product,active:"
 msgid "Active"
 msgstr "Actief"
@@ -133,6 +261,11 @@ msgid "Cost Price"
 msgstr "Kostprijs"
 
 #, fuzzy
+msgctxt "field:product.product,cost_prices:"
+msgid "Cost Prices"
+msgstr "Kostprijs"
+
+#, fuzzy
 msgctxt "field:product.product,create_date:"
 msgid "Create Date"
 msgstr "Datum"
@@ -171,6 +304,11 @@ msgid "List Price"
 msgstr "Catalogusprijs"
 
 #, fuzzy
+msgctxt "field:product.product,list_prices:"
+msgid "List Prices"
+msgstr "Catalogusprijs"
+
+#, fuzzy
 msgctxt "field:product.product,name:"
 msgid "Name"
 msgstr "Naam"
@@ -220,6 +358,11 @@ msgid "Cost Method"
 msgstr "Kostprijsmethode"
 
 #, fuzzy
+msgctxt "field:product.template,cost_prices:"
+msgid "Cost Prices"
+msgstr "Kostprijs"
+
+#, fuzzy
 msgctxt "field:product.template,create_date:"
 msgid "Create Date"
 msgstr "Datum"
@@ -246,6 +389,11 @@ msgctxt "field:product.template,list_price:"
 msgid "List Price"
 msgstr "Catalogusprijs"
 
+#, fuzzy
+msgctxt "field:product.template,list_prices:"
+msgid "List Prices"
+msgstr "Catalogusprijs"
+
 msgctxt "field:product.template,name:"
 msgid "Name"
 msgstr "Naam"
@@ -517,6 +665,18 @@ msgctxt "model:product.configuration,name:"
 msgid "Product Configuration"
 msgstr ""
 
+msgctxt "model:product.configuration.default_cost_price_method,name:"
+msgid "Product Configuration Default Cost Price Method"
+msgstr ""
+
+msgctxt "model:product.cost_price,name:"
+msgid "Product Cost Price"
+msgstr ""
+
+msgctxt "model:product.list_price,name:"
+msgid "Product List Price"
+msgstr ""
+
 #, fuzzy
 msgctxt "model:product.product,name:"
 msgid "Product Variant"
diff --git a/locale/pl.po b/locale/pl.po
index 650f707..af9698d 100644
--- a/locale/pl.po
+++ b/locale/pl.po
@@ -86,6 +86,135 @@ 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"
+
+#, 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 ""
+
+#, fuzzy
+msgctxt "field:product.cost_price,cost_price:"
+msgid "Cost Price"
+msgstr "Cena fabryczna"
+
+#, 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,rec_name:"
+msgid "Name"
+msgstr "Nazwa"
+
+#, fuzzy
+msgctxt "field:product.cost_price,template:"
+msgid "Template"
+msgstr "Szablon"
+
+#, fuzzy
+msgctxt "field:product.cost_price,write_date:"
+msgid "Write Date"
+msgstr "Data zapisu"
+
+#, fuzzy
+msgctxt "field:product.cost_price,write_uid:"
+msgid "Write User"
+msgstr "Zapisał"
+
+msgctxt "field:product.list_price,company:"
+msgid "Company"
+msgstr ""
+
+#, 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"
+
+#, fuzzy
+msgctxt "field:product.list_price,rec_name:"
+msgid "Name"
+msgstr "Nazwa"
+
+#, 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"
@@ -114,6 +243,11 @@ msgctxt "field:product.product,cost_price_uom:"
 msgid "Cost Price"
 msgstr "Cena fabryczna"
 
+#, fuzzy
+msgctxt "field:product.product,cost_prices:"
+msgid "Cost Prices"
+msgstr "Cena fabryczna"
+
 msgctxt "field:product.product,create_date:"
 msgid "Create Date"
 msgstr "Data utworzenia"
@@ -146,6 +280,11 @@ msgctxt "field:product.product,list_price_uom:"
 msgid "List Price"
 msgstr "Cena katalogowa"
 
+#, fuzzy
+msgctxt "field:product.product,list_prices:"
+msgid "List Prices"
+msgstr "Cena katalogowa"
+
 msgctxt "field:product.product,name:"
 msgid "Name"
 msgstr "Nazwa"
@@ -190,6 +329,11 @@ msgctxt "field:product.template,cost_price_method:"
 msgid "Cost Method"
 msgstr "Metoda kosztowa"
 
+#, fuzzy
+msgctxt "field:product.template,cost_prices:"
+msgid "Cost Prices"
+msgstr "Cena fabryczna"
+
 msgctxt "field:product.template,create_date:"
 msgid "Create Date"
 msgstr "Data utworzenia"
@@ -214,6 +358,11 @@ msgctxt "field:product.template,list_price:"
 msgid "List Price"
 msgstr "Cena katalogowa"
 
+#, fuzzy
+msgctxt "field:product.template,list_prices:"
+msgid "List Prices"
+msgstr "Cena katalogowa"
+
 msgctxt "field:product.template,name:"
 msgid "Name"
 msgstr "Nazwa"
@@ -450,6 +599,18 @@ msgctxt "model:product.configuration,name:"
 msgid "Product Configuration"
 msgstr "Konfiguracja ustawień produktu"
 
+msgctxt "model:product.configuration.default_cost_price_method,name:"
+msgid "Product Configuration Default Cost Price Method"
+msgstr ""
+
+msgctxt "model:product.cost_price,name:"
+msgid "Product Cost Price"
+msgstr ""
+
+msgctxt "model:product.list_price,name:"
+msgid "Product List Price"
+msgstr ""
+
 msgctxt "model:product.product,name:"
 msgid "Product Variant"
 msgstr "Wariant produktu"
diff --git a/locale/pt_BR.po b/locale/pt_BR.po
index 17e6771..b7afdaf 100644
--- a/locale/pt_BR.po
+++ b/locale/pt_BR.po
@@ -18,11 +18,10 @@ msgctxt "error:product.uom:"
 msgid "Rate and factor can not be both equal to zero."
 msgstr "Taxa e Fator não podem ser ambos iguais a zero."
 
-#, fuzzy
 msgctxt "error:product.uom:"
 msgid "You cannot change Rate, Factor or Category on a Unit of Measure."
 msgstr ""
-"Você não pode mudar Taxa, Fator ou Categoria em uma unidade de medida."
+"Você não pode mudar Taxa, Fator ou Categoria em uma Unidade de Medida."
 
 msgctxt "field:product.category,childs:"
 msgid "Children"
@@ -60,45 +59,143 @@ msgctxt "field:product.category,write_uid:"
 msgid "Write User"
 msgstr "Gravado pelo usuário"
 
-#, fuzzy
 msgctxt "field:product.configuration,create_date:"
 msgid "Create Date"
 msgstr "Data de criação"
 
-#, fuzzy
 msgctxt "field:product.configuration,create_uid:"
 msgid "Create User"
-msgstr "Criado pelo usuário"
+msgstr "Criado por"
 
 msgctxt "field:product.configuration,default_cost_price_method:"
 msgid "Default Cost Method"
-msgstr ""
+msgstr "Método de Custo Padrão"
 
-#, fuzzy
 msgctxt "field:product.configuration,id:"
 msgid "ID"
 msgstr "ID"
 
-#, fuzzy
 msgctxt "field:product.configuration,rec_name:"
 msgid "Name"
 msgstr "Nome"
 
-#, fuzzy
 msgctxt "field:product.configuration,write_date:"
 msgid "Write Date"
-msgstr "Data de gravação"
+msgstr "Data de edição"
 
-#, fuzzy
 msgctxt "field:product.configuration,write_uid:"
 msgid "Write User"
-msgstr "Gravado pelo usuário"
+msgstr "Editado por"
+
+msgctxt "field:product.configuration.default_cost_price_method,create_date:"
+msgid "Create Date"
+msgstr "Data de criação"
+
+msgctxt "field:product.configuration.default_cost_price_method,create_uid:"
+msgid "Create User"
+msgstr "Criado por"
+
+msgctxt ""
+"field:product.configuration.default_cost_price_method,default_cost_price_method:"
+msgid "Default Cost Method"
+msgstr "Método de Custo Padrão"
+
+msgctxt "field:product.configuration.default_cost_price_method,id:"
+msgid "ID"
+msgstr "ID"
+
+msgctxt "field:product.configuration.default_cost_price_method,rec_name:"
+msgid "Name"
+msgstr "Nome"
+
+msgctxt "field:product.configuration.default_cost_price_method,write_date:"
+msgid "Write Date"
+msgstr "Data de edição"
+
+msgctxt "field:product.configuration.default_cost_price_method,write_uid:"
+msgid "Write User"
+msgstr "Editado por"
+
+msgctxt "field:product.cost_price,company:"
+msgid "Company"
+msgstr "Empresa"
+
+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"
+
+msgctxt "field:product.cost_price,create_uid:"
+msgid "Create User"
+msgstr "Criado por"
+
+msgctxt "field:product.cost_price,id:"
+msgid "ID"
+msgstr "ID"
+
+msgctxt "field:product.cost_price,rec_name:"
+msgid "Name"
+msgstr "Nome"
+
+msgctxt "field:product.cost_price,template:"
+msgid "Template"
+msgstr "Modelo"
+
+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.list_price,company:"
+msgid "Company"
+msgstr "Empresa"
+
+msgctxt "field:product.list_price,create_date:"
+msgid "Create Date"
+msgstr "Data de criação"
+
+msgctxt "field:product.list_price,create_uid:"
+msgid "Create User"
+msgstr "Criado por"
+
+msgctxt "field:product.list_price,id:"
+msgid "ID"
+msgstr "ID"
+
+msgctxt "field:product.list_price,list_price:"
+msgid "List Price"
+msgstr "Preço de tabela"
+
+msgctxt "field:product.list_price,rec_name:"
+msgid "Name"
+msgstr "Nome"
+
+msgctxt "field:product.list_price,template:"
+msgid "Template"
+msgstr "Modelo"
+
+msgctxt "field:product.list_price,write_date:"
+msgid "Write Date"
+msgstr "Data de edição"
+
+msgctxt "field:product.list_price,write_uid:"
+msgid "Write User"
+msgstr "Editado por"
 
 msgctxt "field:product.product,active:"
 msgid "Active"
 msgstr "Ativo"
 
-#, fuzzy
 msgctxt "field:product.product,categories:"
 msgid "Categories"
 msgstr "Categorias"
@@ -107,25 +204,26 @@ msgctxt "field:product.product,code:"
 msgid "Code"
 msgstr "Código"
 
-#, fuzzy
 msgctxt "field:product.product,consumable:"
 msgid "Consumable"
 msgstr "Consumível"
 
-#, fuzzy
 msgctxt "field:product.product,cost_price:"
 msgid "Cost Price"
-msgstr "Preço de custo"
+msgstr "Preço de Custo"
 
-#, fuzzy
 msgctxt "field:product.product,cost_price_method:"
 msgid "Cost Method"
-msgstr "Método de custo"
+msgstr "Método de Custo"
 
 msgctxt "field:product.product,cost_price_uom:"
 msgid "Cost Price"
 msgstr "Preço de custo"
 
+msgctxt "field:product.product,cost_prices:"
+msgid "Cost Prices"
+msgstr "Preço de Custo"
+
 msgctxt "field:product.product,create_date:"
 msgid "Create Date"
 msgstr "Data de criação"
@@ -138,10 +236,9 @@ msgctxt "field:product.product,default_uom:"
 msgid "Default UOM"
 msgstr "UDM padrão"
 
-#, fuzzy
 msgctxt "field:product.product,default_uom_category:"
 msgid "Default UOM Category"
-msgstr "Categoria padrão para UDM"
+msgstr "Categoria Padrão para UDM"
 
 msgctxt "field:product.product,description:"
 msgid "Description"
@@ -151,16 +248,18 @@ msgctxt "field:product.product,id:"
 msgid "ID"
 msgstr "ID"
 
-#, fuzzy
 msgctxt "field:product.product,list_price:"
 msgid "List Price"
-msgstr "Preço de tabela"
+msgstr "Preço de Tabela"
 
 msgctxt "field:product.product,list_price_uom:"
 msgid "List Price"
 msgstr "Preço de tabela"
 
-#, fuzzy
+msgctxt "field:product.product,list_prices:"
+msgid "List Prices"
+msgstr "Preços de tabela"
+
 msgctxt "field:product.product,name:"
 msgid "Name"
 msgstr "Nome"
@@ -189,7 +288,6 @@ msgctxt "field:product.template,active:"
 msgid "Active"
 msgstr "Ativo"
 
-#, fuzzy
 msgctxt "field:product.template,categories:"
 msgid "Categories"
 msgstr "Categorias"
@@ -206,6 +304,10 @@ msgctxt "field:product.template,cost_price_method:"
 msgid "Cost Method"
 msgstr "Método de custo"
 
+msgctxt "field:product.template,cost_prices:"
+msgid "Cost Prices"
+msgstr "Preços de custo"
+
 msgctxt "field:product.template,create_date:"
 msgid "Create Date"
 msgstr "Data de criação"
@@ -230,6 +332,10 @@ msgctxt "field:product.template,list_price:"
 msgid "List Price"
 msgstr "Preço de tabela"
 
+msgctxt "field:product.template,list_prices:"
+msgid "List Prices"
+msgstr "Preços de tabela"
+
 msgctxt "field:product.template,name:"
 msgid "Name"
 msgstr "Nome"
@@ -254,45 +360,37 @@ msgctxt "field:product.template,write_uid:"
 msgid "Write User"
 msgstr "Gravado pelo usuário"
 
-#, fuzzy
 msgctxt "field:product.template-product.category,category:"
 msgid "Category"
 msgstr "Categoria"
 
-#, fuzzy
 msgctxt "field:product.template-product.category,create_date:"
 msgid "Create Date"
 msgstr "Data de criação"
 
-#, fuzzy
 msgctxt "field:product.template-product.category,create_uid:"
 msgid "Create User"
-msgstr "Criado pelo usuário"
+msgstr "Criado por"
 
-#, fuzzy
 msgctxt "field:product.template-product.category,id:"
 msgid "ID"
 msgstr "ID"
 
-#, fuzzy
 msgctxt "field:product.template-product.category,rec_name:"
 msgid "Name"
 msgstr "Nome"
 
-#, fuzzy
 msgctxt "field:product.template-product.category,template:"
 msgid "Template"
 msgstr "Modelo"
 
-#, fuzzy
 msgctxt "field:product.template-product.category,write_date:"
 msgid "Write Date"
-msgstr "Data de gravação"
+msgstr "Data de edição"
 
-#, fuzzy
 msgctxt "field:product.template-product.category,write_uid:"
 msgid "Write User"
-msgstr "Gravado pelo usuário"
+msgstr "Editado por"
 
 msgctxt "field:product.uom,active:"
 msgid "Active"
@@ -408,13 +506,12 @@ msgstr "Categorias"
 
 msgctxt "model:ir.action,name:act_product_configuration_form"
 msgid "Product Configuration"
-msgstr ""
+msgstr "Configuração do Produto"
 
 msgctxt "model:ir.action,name:act_product_form"
 msgid "Variants"
 msgstr "Variantes"
 
-#, fuzzy
 msgctxt "model:ir.action,name:act_product_from_template"
 msgid "Variants"
 msgstr "Variantes"
@@ -443,7 +540,6 @@ msgctxt "model:ir.ui.menu,name:menu_category_tree"
 msgid "Categories"
 msgstr "Categorias"
 
-#, fuzzy
 msgctxt "model:ir.ui.menu,name:menu_configuration"
 msgid "Configuration"
 msgstr "Configuração"
@@ -458,7 +554,7 @@ msgstr "Variantes"
 
 msgctxt "model:ir.ui.menu,name:menu_product_configuration"
 msgid "Product Configuration"
-msgstr ""
+msgstr "Configuração do Produto"
 
 msgctxt "model:ir.ui.menu,name:menu_template"
 msgid "Products"
@@ -478,7 +574,19 @@ msgstr "Categoria do produto"
 
 msgctxt "model:product.configuration,name:"
 msgid "Product Configuration"
-msgstr ""
+msgstr "Configuração do Produto"
+
+msgctxt "model:product.configuration.default_cost_price_method,name:"
+msgid "Product Configuration Default Cost Price Method"
+msgstr "Configuração do Produto Método de Preço de Custo Padrão"
+
+msgctxt "model:product.cost_price,name:"
+msgid "Product Cost Price"
+msgstr "Preço de Custo do Produto"
+
+msgctxt "model:product.list_price,name:"
+msgid "Product List Price"
+msgstr "Preço de Tabela do Produto"
 
 msgctxt "model:product.product,name:"
 msgid "Product Variant"
@@ -490,7 +598,7 @@ msgstr "Modelo de produto"
 
 msgctxt "model:product.template-product.category,name:"
 msgid "Template - Category"
-msgstr ""
+msgstr "Modelo - Categoria"
 
 msgctxt "model:product.uom,name:"
 msgid "Unit of measure"
@@ -784,12 +892,10 @@ msgctxt "model:res.group,name:group_product_admin"
 msgid "Product Administration"
 msgstr "Administração de produtos"
 
-#, fuzzy
 msgctxt "selection:product.product,cost_price_method:"
 msgid "Average"
 msgstr "Média"
 
-#, fuzzy
 msgctxt "selection:product.product,cost_price_method:"
 msgid "Fixed"
 msgstr "Fixo"
@@ -834,7 +940,6 @@ msgctxt "view:product.template:"
 msgid "General"
 msgstr "Geral"
 
-#, fuzzy
 msgctxt "view:product.configuration:"
 msgid "Party Configuration"
 msgstr "Configuração de Pessoas"
diff --git a/locale/ru.po b/locale/ru.po
index 65fe6ce..99b3ef9 100644
--- a/locale/ru.po
+++ b/locale/ru.po
@@ -95,6 +95,134 @@ msgctxt "field:product.configuration,write_uid:"
 msgid "Write User"
 msgstr "Изменено пользователем"
 
+#, fuzzy
+msgctxt "field:product.configuration.default_cost_price_method,create_date:"
+msgid "Create Date"
+msgstr "Дата создания"
+
+#, fuzzy
+msgctxt "field:product.configuration.default_cost_price_method,create_uid:"
+msgid "Create User"
+msgstr "Создано пользователем"
+
+msgctxt ""
+"field:product.configuration.default_cost_price_method,default_cost_price_method:"
+msgid "Default Cost Method"
+msgstr ""
+
+#, 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 "Наименование"
+
+#, fuzzy
+msgctxt "field:product.configuration.default_cost_price_method,write_date:"
+msgid "Write Date"
+msgstr "Дата изменения"
+
+#, fuzzy
+msgctxt "field:product.configuration.default_cost_price_method,write_uid:"
+msgid "Write User"
+msgstr "Изменено пользователем"
+
+msgctxt "field:product.cost_price,company:"
+msgid "Company"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:product.cost_price,cost_price:"
+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 "Дата создания"
+
+#, fuzzy
+msgctxt "field:product.cost_price,create_uid:"
+msgid "Create User"
+msgstr "Создано пользователем"
+
+#, fuzzy
+msgctxt "field:product.cost_price,id:"
+msgid "ID"
+msgstr "ID"
+
+#, fuzzy
+msgctxt "field:product.cost_price,rec_name:"
+msgid "Name"
+msgstr "Наименование"
+
+#, fuzzy
+msgctxt "field:product.cost_price,template:"
+msgid "Template"
+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.list_price,company:"
+msgid "Company"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:product.list_price,create_date:"
+msgid "Create Date"
+msgstr "Дата создания"
+
+#, fuzzy
+msgctxt "field:product.list_price,create_uid:"
+msgid "Create User"
+msgstr "Создано пользователем"
+
+#, fuzzy
+msgctxt "field:product.list_price,id:"
+msgid "ID"
+msgstr "ID"
+
+#, fuzzy
+msgctxt "field:product.list_price,list_price:"
+msgid "List Price"
+msgstr "Цена"
+
+#, fuzzy
+msgctxt "field:product.list_price,rec_name:"
+msgid "Name"
+msgstr "Наименование"
+
+#, fuzzy
+msgctxt "field:product.list_price,template:"
+msgid "Template"
+msgstr "Шаблон"
+
+#, fuzzy
+msgctxt "field:product.list_price,write_date:"
+msgid "Write Date"
+msgstr "Дата изменения"
+
+#, fuzzy
+msgctxt "field:product.list_price,write_uid:"
+msgid "Write User"
+msgstr "Изменено пользователем"
+
 msgctxt "field:product.product,active:"
 msgid "Active"
 msgstr "Действующий"
@@ -127,6 +255,11 @@ msgctxt "field:product.product,cost_price_uom:"
 msgid "Cost Price"
 msgstr "Себестоимость"
 
+#, fuzzy
+msgctxt "field:product.product,cost_prices:"
+msgid "Cost Prices"
+msgstr "Себестоимость"
+
 msgctxt "field:product.product,create_date:"
 msgid "Create Date"
 msgstr "Дата создания"
@@ -162,6 +295,11 @@ msgid "List Price"
 msgstr "Цена"
 
 #, fuzzy
+msgctxt "field:product.product,list_prices:"
+msgid "List Prices"
+msgstr "Цена"
+
+#, fuzzy
 msgctxt "field:product.product,name:"
 msgid "Name"
 msgstr "Наименование"
@@ -207,6 +345,11 @@ msgctxt "field:product.template,cost_price_method:"
 msgid "Cost Method"
 msgstr "Учет стоимости"
 
+#, fuzzy
+msgctxt "field:product.template,cost_prices:"
+msgid "Cost Prices"
+msgstr "Себестоимость"
+
 msgctxt "field:product.template,create_date:"
 msgid "Create Date"
 msgstr "Дата создания"
@@ -231,6 +374,11 @@ msgctxt "field:product.template,list_price:"
 msgid "List Price"
 msgstr "Цена"
 
+#, fuzzy
+msgctxt "field:product.template,list_prices:"
+msgid "List Prices"
+msgstr "Цена"
+
 msgctxt "field:product.template,name:"
 msgid "Name"
 msgstr "Наименование"
@@ -482,6 +630,18 @@ msgctxt "model:product.configuration,name:"
 msgid "Product Configuration"
 msgstr ""
 
+msgctxt "model:product.configuration.default_cost_price_method,name:"
+msgid "Product Configuration Default Cost Price Method"
+msgstr ""
+
+msgctxt "model:product.cost_price,name:"
+msgid "Product Cost Price"
+msgstr ""
+
+msgctxt "model:product.list_price,name:"
+msgid "Product List Price"
+msgstr ""
+
 msgctxt "model:product.product,name:"
 msgid "Product Variant"
 msgstr "Вид продукта"
diff --git a/locale/sl.po b/locale/sl.po
index a9f15f6..729da78 100644
--- a/locale/sl.po
+++ b/locale/sl.po
@@ -87,6 +87,111 @@ msgctxt "field:product.configuration,write_uid:"
 msgid "Write User"
 msgstr "Zapisal"
 
+msgctxt "field:product.configuration.default_cost_price_method,create_date:"
+msgid "Create Date"
+msgstr "Izdelano"
+
+msgctxt "field:product.configuration.default_cost_price_method,create_uid:"
+msgid "Create User"
+msgstr "Izdelal"
+
+msgctxt ""
+"field:product.configuration.default_cost_price_method,default_cost_price_method:"
+msgid "Default Cost Method"
+msgstr "Privzeti obračun"
+
+msgctxt "field:product.configuration.default_cost_price_method,id:"
+msgid "ID"
+msgstr "ID"
+
+msgctxt "field:product.configuration.default_cost_price_method,rec_name:"
+msgid "Name"
+msgstr "Ime"
+
+msgctxt "field:product.configuration.default_cost_price_method,write_date:"
+msgid "Write Date"
+msgstr "Zapisano"
+
+msgctxt "field:product.configuration.default_cost_price_method,write_uid:"
+msgid "Write User"
+msgstr "Zapisal"
+
+msgctxt "field:product.cost_price,company:"
+msgid "Company"
+msgstr "Družba"
+
+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"
+
+msgctxt "field:product.cost_price,create_uid:"
+msgid "Create User"
+msgstr "Izdelal"
+
+msgctxt "field:product.cost_price,id:"
+msgid "ID"
+msgstr "ID"
+
+msgctxt "field:product.cost_price,rec_name:"
+msgid "Name"
+msgstr "Ime"
+
+msgctxt "field:product.cost_price,template:"
+msgid "Template"
+msgstr "Predloga"
+
+msgctxt "field:product.cost_price,write_date:"
+msgid "Write Date"
+msgstr "Zapisano"
+
+msgctxt "field:product.cost_price,write_uid:"
+msgid "Write User"
+msgstr "Zapisal"
+
+msgctxt "field:product.list_price,company:"
+msgid "Company"
+msgstr "Družba"
+
+msgctxt "field:product.list_price,create_date:"
+msgid "Create Date"
+msgstr "Izdelano"
+
+msgctxt "field:product.list_price,create_uid:"
+msgid "Create User"
+msgstr "Izdelal"
+
+msgctxt "field:product.list_price,id:"
+msgid "ID"
+msgstr "ID"
+
+msgctxt "field:product.list_price,list_price:"
+msgid "List Price"
+msgstr "Prodajna cena"
+
+msgctxt "field:product.list_price,rec_name:"
+msgid "Name"
+msgstr "Ime"
+
+msgctxt "field:product.list_price,template:"
+msgid "Template"
+msgstr "Predloga"
+
+msgctxt "field:product.list_price,write_date:"
+msgid "Write Date"
+msgstr "Zapisano"
+
+msgctxt "field:product.list_price,write_uid:"
+msgid "Write User"
+msgstr "Zapisal"
+
 msgctxt "field:product.product,active:"
 msgid "Active"
 msgstr "Aktivno"
@@ -115,6 +220,10 @@ msgctxt "field:product.product,cost_price_uom:"
 msgid "Cost Price"
 msgstr "Nabavna cena"
 
+msgctxt "field:product.product,cost_prices:"
+msgid "Cost Prices"
+msgstr "Nabavne cene"
+
 msgctxt "field:product.product,create_date:"
 msgid "Create Date"
 msgstr "Izdelano"
@@ -147,6 +256,10 @@ msgctxt "field:product.product,list_price_uom:"
 msgid "List Price"
 msgstr "Prodajna cena"
 
+msgctxt "field:product.product,list_prices:"
+msgid "List Prices"
+msgstr "Prodajne cene"
+
 msgctxt "field:product.product,name:"
 msgid "Name"
 msgstr "Naziv"
@@ -191,6 +304,10 @@ msgctxt "field:product.template,cost_price_method:"
 msgid "Cost Method"
 msgstr "Obračun"
 
+msgctxt "field:product.template,cost_prices:"
+msgid "Cost Prices"
+msgstr "Nabavne cene"
+
 msgctxt "field:product.template,create_date:"
 msgid "Create Date"
 msgstr "Izdelano"
@@ -215,6 +332,10 @@ msgctxt "field:product.template,list_price:"
 msgid "List Price"
 msgstr "Prodajna cena"
 
+msgctxt "field:product.template,list_prices:"
+msgid "List Prices"
+msgstr "Prodajne cene"
+
 msgctxt "field:product.template,name:"
 msgid "Name"
 msgstr "Naziv"
@@ -455,6 +576,18 @@ msgctxt "model:product.configuration,name:"
 msgid "Product Configuration"
 msgstr "Konfiguracija izdelkov"
 
+msgctxt "model:product.configuration.default_cost_price_method,name:"
+msgid "Product Configuration Default Cost Price Method"
+msgstr "Konfiguracija privzetega obračuna nabavne cene"
+
+msgctxt "model:product.cost_price,name:"
+msgid "Product Cost Price"
+msgstr "Nabavna cena izdelka"
+
+msgctxt "model:product.list_price,name:"
+msgid "Product List Price"
+msgstr "Prodajna cena izdelka"
+
 msgctxt "model:product.product,name:"
 msgid "Product Variant"
 msgstr "Različica"
diff --git a/locale/zh_CN.po b/locale/zh_CN.po
index bb61b4e..5389919 100644
--- a/locale/zh_CN.po
+++ b/locale/zh_CN.po
@@ -100,6 +100,129 @@ msgid "Write User"
 msgstr "写入帐号"
 
 #, fuzzy
+msgctxt "field:product.configuration.default_cost_price_method,create_date:"
+msgid "Create Date"
+msgstr "创建日期:"
+
+#, fuzzy
+msgctxt "field:product.configuration.default_cost_price_method,create_uid:"
+msgid "Create User"
+msgstr "添加用户"
+
+msgctxt ""
+"field:product.configuration.default_cost_price_method,default_cost_price_method:"
+msgid "Default Cost Method"
+msgstr ""
+
+#, fuzzy
+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 "纳木"
+
+#, fuzzy
+msgctxt "field:product.configuration.default_cost_price_method,write_date:"
+msgid "Write Date"
+msgstr "写入日期"
+
+#, fuzzy
+msgctxt "field:product.configuration.default_cost_price_method,write_uid:"
+msgid "Write User"
+msgstr "写入帐号"
+
+msgctxt "field:product.cost_price,company:"
+msgid "Company"
+msgstr ""
+
+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"
+msgstr "创建日期:"
+
+#, fuzzy
+msgctxt "field:product.cost_price,create_uid:"
+msgid "Create User"
+msgstr "添加用户"
+
+#, fuzzy
+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,template:"
+msgid "Template"
+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.list_price,company:"
+msgid "Company"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:product.list_price,create_date:"
+msgid "Create Date"
+msgstr "创建日期:"
+
+#, fuzzy
+msgctxt "field:product.list_price,create_uid:"
+msgid "Create User"
+msgstr "添加用户"
+
+#, fuzzy
+msgctxt "field:product.list_price,id:"
+msgid "ID"
+msgstr "编号"
+
+msgctxt "field:product.list_price,list_price:"
+msgid "List Price"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:product.list_price,rec_name:"
+msgid "Name"
+msgstr "纳木"
+
+msgctxt "field:product.list_price,template:"
+msgid "Template"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:product.list_price,write_date:"
+msgid "Write Date"
+msgstr "写入日期"
+
+#, fuzzy
+msgctxt "field:product.list_price,write_uid:"
+msgid "Write User"
+msgstr "写入帐号"
+
+#, fuzzy
 msgctxt "field:product.product,active:"
 msgid "Active"
 msgstr "启用"
@@ -129,6 +252,10 @@ msgctxt "field:product.product,cost_price_uom:"
 msgid "Cost Price"
 msgstr ""
 
+msgctxt "field:product.product,cost_prices:"
+msgid "Cost Prices"
+msgstr ""
+
 #, fuzzy
 msgctxt "field:product.product,create_date:"
 msgid "Create Date"
@@ -165,6 +292,10 @@ msgctxt "field:product.product,list_price_uom:"
 msgid "List Price"
 msgstr ""
 
+msgctxt "field:product.product,list_prices:"
+msgid "List Prices"
+msgstr ""
+
 #, fuzzy
 msgctxt "field:product.product,name:"
 msgid "Name"
@@ -215,6 +346,10 @@ msgctxt "field:product.template,cost_price_method:"
 msgid "Cost Method"
 msgstr ""
 
+msgctxt "field:product.template,cost_prices:"
+msgid "Cost Prices"
+msgstr ""
+
 #, fuzzy
 msgctxt "field:product.template,create_date:"
 msgid "Create Date"
@@ -242,6 +377,10 @@ msgctxt "field:product.template,list_price:"
 msgid "List Price"
 msgstr ""
 
+msgctxt "field:product.template,list_prices:"
+msgid "List Prices"
+msgstr ""
+
 #, fuzzy
 msgctxt "field:product.template,name:"
 msgid "Name"
@@ -505,6 +644,18 @@ msgctxt "model:product.configuration,name:"
 msgid "Product Configuration"
 msgstr ""
 
+msgctxt "model:product.configuration.default_cost_price_method,name:"
+msgid "Product Configuration Default Cost Price Method"
+msgstr ""
+
+msgctxt "model:product.cost_price,name:"
+msgid "Product Cost Price"
+msgstr ""
+
+msgctxt "model:product.list_price,name:"
+msgid "Product List Price"
+msgstr ""
+
 msgctxt "model:product.product,name:"
 msgid "Product Variant"
 msgstr ""
diff --git a/product.py b/product.py
index 8a96f7f..3976e21 100644
--- a/product.py
+++ b/product.py
@@ -3,17 +3,18 @@
 import copy
 import logging
 
-from sql import Column
-
 from trytond.model import ModelView, ModelSQL, Model, fields
 from trytond.pyson import Eval
 from trytond.transaction import Transaction
 from trytond.pool import Pool
 from trytond import backend
 from trytond.config import config
+from trytond.tools.multivalue import migrate_property
+from trytond.modules.company.model import (
+    CompanyMultiValueMixin, CompanyValueMixin)
 
 __all__ = ['Template', 'Product', 'price_digits', 'TemplateFunction',
-    'TemplateCategory']
+    'ProductListPrice', 'ProductCostPrice', 'TemplateCategory']
 logger = logging.getLogger(__name__)
 
 STATES = {
@@ -33,7 +34,7 @@ COST_PRICE_METHODS = [
 price_digits = (16, config.getint('product', 'price_decimal', default=4))
 
 
-class Template(ModelSQL, ModelView):
+class Template(ModelSQL, ModelView, CompanyMultiValueMixin):
     "Product Template"
     __name__ = "product.template"
     name = fields.Char('Name', size=None, required=True, translate=True,
@@ -46,12 +47,19 @@ class Template(ModelSQL, ModelView):
             'invisible': Eval('type', 'goods') != 'goods',
             },
         depends=['active', 'type'])
-    list_price = fields.Property(fields.Numeric('List Price', states=STATES,
-            digits=price_digits, depends=DEPENDS, required=True))
-    cost_price = fields.Property(fields.Numeric('Cost Price', states=STATES,
-            digits=price_digits, depends=DEPENDS, required=True))
-    cost_price_method = fields.Property(fields.Selection(COST_PRICE_METHODS,
-            'Cost Method', required=True, states=STATES, depends=DEPENDS))
+    list_price = fields.MultiValue(fields.Numeric(
+            "List Price", required=True, digits=price_digits,
+            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_method = fields.MultiValue(fields.Selection(
+            COST_PRICE_METHODS, "Cost Method", required=True,
+            states=STATES, depends=DEPENDS))
+    cost_prices = fields.One2Many(
+        'product.cost_price', 'template', "Cost Prices")
     default_uom = fields.Many2One('product.uom', 'Default UOM', required=True,
         states=STATES, depends=DEPENDS)
     default_uom_category = fields.Function(
@@ -92,6 +100,15 @@ class Template(ModelSQL, ModelView):
                 'The column "category" on table "%s" must be dropped manually',
                 cls._table)
 
+    @classmethod
+    def multivalue_model(cls, field):
+        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')
+        return super(Template, cls).multivalue_model(field)
+
     @staticmethod
     def default_active():
         return True
@@ -104,16 +121,17 @@ class Template(ModelSQL, ModelView):
     def default_consumable():
         return False
 
+    @classmethod
+    def default_cost_price_method(cls):
+        pool = Pool()
+        Configuration = pool.get('product.configuration')
+        return Configuration(1).default_cost_price_method
+
     @staticmethod
     def default_products():
-        pool = Pool()
-        Product = pool.get('product.product')
         if Transaction().user == 0:
             return []
-        fields_names = list(f for f in Product._fields.keys()
-            if f not in ('id', 'create_uid', 'create_date',
-                'write_uid', 'write_date'))
-        return [Product.default_get(fields_names)]
+        return [{}]
 
     @fields.depends('default_uom')
     def on_change_with_default_uom_category(self, name=None):
@@ -143,6 +161,9 @@ class TemplateFunction(fields.Function):
     def __init__(self, field):
         super(TemplateFunction, self).__init__(
             field, 'get_template', searcher='search_template')
+        # Disable on_change as it is managed by on_change_template
+        self.on_change = set()
+        self.on_change_with = set()
 
     def __copy__(self):
         return TemplateFunction(copy.copy(self._field))
@@ -282,12 +303,15 @@ class Product(ModelSQL, ModelView):
         field = name[:-4]
         if Transaction().context.get('uom'):
             to_uom = Uom(Transaction().context['uom'])
-            for product in products:
-                res[product.id] = Uom.compute_price(
-                    product.default_uom, getattr(product, field), to_uom)
         else:
-            for product in products:
-                res[product.id] = getattr(product, field)
+            to_uom = None
+        for product in products:
+            price = getattr(product, field)
+            if to_uom and product.default_uom.category == to_uom.category:
+                res[product.id] = Uom.compute_price(
+                    product.default_uom, price, to_uom)
+            else:
+                res[product.id] = price
         return res
 
     @classmethod
@@ -297,6 +321,72 @@ class Product(ModelSQL, ModelView):
             yield id_, rec_name, icon
 
 
+class ProductListPrice(ModelSQL, CompanyValueMixin):
+    "Product List Price"
+    __name__ = 'product.list_price'
+    template = fields.Many2One(
+        'product.template', "Template", ondelete='CASCADE', select=True)
+    list_price = fields.Numeric("List Price", digits=price_digits)
+
+    @classmethod
+    def __register__(cls, module_name):
+        TableHandler = backend.get('TableHandler')
+        exist = TableHandler.table_exist(cls._table)
+
+        super(ProductListPrice, cls).__register__(module_name)
+
+        if not exist:
+            cls._migrate_property([], [], [])
+
+    @classmethod
+    def _migrate_property(cls, field_names, value_names, fields):
+        field_names.append('list_price')
+        value_names.append('list_price')
+        fields.append('company')
+        migrate_property(
+            'product.template', field_names, cls, value_names,
+            parent='template', fields=fields)
+
+
+class ProductCostPrice(ModelSQL, CompanyValueMixin):
+    "Product Cost Price"
+    __name__ = 'product.cost_price'
+    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")
+
+    @classmethod
+    def __register__(cls, module_name):
+        TableHandler = backend.get('TableHandler')
+        exist = TableHandler.table_exist(cls._table)
+
+        super(ProductCostPrice, cls).__register__(module_name)
+
+        if not exist:
+            cls._migrate_property([], [], [])
+
+    @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'])
+        fields.append('company')
+        migrate_property(
+            'product.template', field_names, cls, value_names,
+            parent='template', fields=fields)
+
+    @classmethod
+    def get_cost_price_methods(cls):
+        pool = Pool()
+        Template = pool.get('product.template')
+        field_name = 'cost_price_method'
+        methods = Template.fields_get([field_name])[field_name]['selection']
+        methods.append((None, ''))
+        return methods
+
+
 class TemplateCategory(ModelSQL):
     'Template - Category'
     __name__ = 'product.template-product.category'
diff --git a/product.xml b/product.xml
index e305db2..42c8bd4 100644
--- a/product.xml
+++ b/product.xml
@@ -170,7 +170,7 @@ this repository contains the full copyright notices and license terms. -->
             <field name="name">Variants</field>
             <field name="res_model">product.product</field>
             <field name="domain" pyson="1"
-                eval="[If(Len(Eval('active_ids', [])) == 1, ('template', '=', Eval('active_id')), ('template', 'in', Eval('active_ids')))]"/>
+                eval="[If(Eval('active_ids', []) == [Eval('active_id')], ('template', '=', Eval('active_id')), ('template', 'in', Eval('active_ids')))]"/>
         </record>
         <record model="ir.action.act_window.view"
                 id="act_product_from_template_list_view">
@@ -192,11 +192,4 @@ this repository contains the full copyright notices and license terms. -->
         </record>
 
     </data>
-    <data noupdate="1">
-        <record model="ir.property" id="property_product_cost_price_method">
-            <field name="field"
-                search="[('model.model', '=', 'product.template'), ('name', '=', 'cost_price_method')]"/>
-            <field name="value">,fixed</field>
-        </record>
-    </data>
 </tryton>
diff --git a/setup.py b/setup.py
index 7a3694b..cbabf51 100644
--- a/setup.py
+++ b/setup.py
@@ -79,7 +79,7 @@ setup(name=name,
         'Intended Audience :: Financial and Insurance Industry',
         'Intended Audience :: Legal Industry',
         'Intended Audience :: Manufacturing',
-        'License :: OSI Approved :: GNU General Public License (GPL)',
+        'License :: OSI Approved :: GNU General Public License v3 or later (GPLv3+)',
         'Natural Language :: Bulgarian',
         'Natural Language :: Catalan',
         'Natural Language :: Chinese (Simplified)',
diff --git a/tests/test_product.py b/tests/test_product.py
index 84e81fa..88d7089 100644
--- a/tests/test_product.py
+++ b/tests/test_product.py
@@ -313,24 +313,92 @@ class ProductTestCase(ModuleTestCase):
                     ], count=True), 2)
 
     @with_transaction()
-    def test_uom_round(self):
-        'Test uom round function'
+    def test_uom_rounding(self):
+        'Test uom rounding functions'
         pool = Pool()
         Uom = pool.get('product.uom')
         tests = [
-            (2.53, .1, 2.5),
-            (3.8, .1, 3.8),
-            (3.7, .1, 3.7),
-            (1.3, .5, 1.5),
-            (1.1, .3, 1.2),
-            (17, 10, 20),
-            (7, 10, 10),
-            (4, 10, 0),
-            (17, 15, 15),
-            (2.5, 1.4, 2.8),
+            (2.53, .1, 2.5, 2.6, 2.5),
+            (3.8, .1, 3.8, 3.8, 3.8),
+            (3.7, .1, 3.7, 3.7, 3.7),
+            (1.3, .5, 1.5, 1.5, 1.0),
+            (1.1, .3, 1.2, 1.2, 0.9),
+            (17, 10, 20, 20, 10),
+            (7, 10, 10, 10, 0),
+            (4, 10, 0, 10, 0),
+            (17, 15, 15, 30, 15),
+            (2.5, 1.4, 2.8, 2.8, 1.4),
             ]
-        for number, precision, result in tests:
-            self.assertEqual(Uom(rounding=precision).round(number), result)
+        for number, precision, round, ceil, floor in tests:
+            uom = Uom(rounding=precision)
+            self.assertEqual(uom.round(number), round)
+            self.assertEqual(uom.ceil(number), ceil)
+            self.assertEqual(uom.floor(number), floor)
+
+    @with_transaction()
+    def test_product_order(self):
+        'Test product field order'
+        pool = Pool()
+        Template = pool.get('product.template')
+        Product = pool.get('product.product')
+        Uom = pool.get('product.uom')
+
+        uom, = Uom.search([], limit=1)
+        values1 = {
+            'name': 'Product A',
+            'type': 'assets',
+            'list_price': Decimal('10'),
+            'cost_price': Decimal('5'),
+            'default_uom': uom.id,
+            'products': [('create', [{'code': 'AA'}])],
+            }
+        values2 = {
+            'name': 'Product B',
+            'type': 'goods',
+            'list_price': Decimal('10'),
+            'cost_price': Decimal('5'),
+            'default_uom': uom.id,
+            'products': [('create', [{'code': 'BB'}])],
+            }
+
+        template1, template2 = Template.create([values1, values2])
+        product1, product2 = Product.search([])
+
+        # Non-inherited field.
+        self.assertEqual(
+            Product.search([], order=[('code', 'ASC')]), [product1, product2])
+        self.assertEqual(
+            Product.search([], order=[('code', 'DESC')]), [product2, product1])
+        self.assertEqual(Product.search(
+                [('name', 'like', '%')], order=[('code', 'ASC')]),
+                [product1, product2])
+        self.assertEqual(Product.search(
+                [('name', 'like', '%')], order=[('code', 'DESC')]),
+                [product2, product1])
+
+        # Inherited field with custom order.
+        self.assertEqual(
+            Product.search([], order=[('name', 'ASC')]), [product1, product2])
+        self.assertEqual(
+            Product.search([], order=[('name', 'DESC')]), [product2, product1])
+        self.assertEqual(Product.search(
+                [('name', 'like', '%')], order=[('name', 'ASC')]),
+                [product1, product2])
+        self.assertEqual(Product.search(
+                [('name', 'like', '%')], order=[('name', 'DESC')]),
+                [product2, product1])
+
+        # Inherited field without custom order.
+        self.assertEqual(
+            Product.search([], order=[('type', 'ASC')]), [product1, product2])
+        self.assertEqual(
+            Product.search([], order=[('type', 'DESC')]), [product2, product1])
+        self.assertEqual(Product.search(
+                [('name', 'like', '%')], order=[('type', 'ASC')]),
+                [product1, product2])
+        self.assertEqual(Product.search(
+                [('name', 'like', '%')], order=[('type', 'DESC')]),
+                [product2, product1])
 
 
 def suite():
diff --git a/tryton.cfg b/tryton.cfg
index fabf0e6..bb7a21c 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,6 +1,7 @@
 [tryton]
-version=4.2.1
+version=4.4.0
 depends:
+    company
     ir
     res
 xml:
diff --git a/trytond_product.egg-info/PKG-INFO b/trytond_product.egg-info/PKG-INFO
index b242f01..e7d66eb 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.2.1
+Version: 4.4.0
 Summary: Tryton module with products
 Home-page: http://www.tryton.org/
 Author: Tryton
 Author-email: issue_tracker at tryton.org
 License: GPL-3
-Download-URL: http://downloads.tryton.org/4.2/
+Download-URL: http://downloads.tryton.org/4.4/
 Description: trytond_product
         ===============
         
@@ -52,7 +52,7 @@ Classifier: Intended Audience :: Developers
 Classifier: Intended Audience :: Financial and Insurance Industry
 Classifier: Intended Audience :: Legal Industry
 Classifier: Intended Audience :: Manufacturing
-Classifier: License :: OSI Approved :: GNU General Public License (GPL)
+Classifier: License :: OSI Approved :: GNU General Public License v3 or later (GPLv3+)
 Classifier: Natural Language :: Bulgarian
 Classifier: Natural Language :: Catalan
 Classifier: Natural Language :: Chinese (Simplified)
diff --git a/trytond_product.egg-info/requires.txt b/trytond_product.egg-info/requires.txt
index b14f345..8f57eb3 100644
--- a/trytond_product.egg-info/requires.txt
+++ b/trytond_product.egg-info/requires.txt
@@ -1,2 +1,3 @@
 python-sql
-trytond >= 4.2, < 4.3
+trytond_company >= 4.4, < 4.5
+trytond >= 4.4, < 4.5
diff --git a/uom.py b/uom.py
index df6ad87..338b781 100644
--- a/uom.py
+++ b/uom.py
@@ -3,6 +3,7 @@
 from __future__ import division
 from decimal import Decimal
 from sql import Table
+from math import ceil, floor, log10
 
 from trytond.model import ModelView, ModelSQL, fields, Check
 from trytond.pyson import Eval
@@ -135,12 +136,13 @@ class Uom(ModelSQL, ModelView):
             ]
 
     def round(self, number):
-        precision = self.rounding
-        i, d = divmod(precision, 1)
-        base = round(number / precision)
-        # Instead of multiply by the decimal part, we must divide by the
-        # integer to avoid precision lost due to float
-        return (base * i) + ((base / (1 / d)) if d != 0 else 0)
+        return _round(self, number, func=round)
+
+    def ceil(self, number):
+        return _round(self, number, func=ceil)
+
+    def floor(self, number):
+        return _round(self, number, func=floor)
 
     @classmethod
     def validate(cls, uoms):
@@ -265,3 +267,24 @@ class Uom(ModelSQL, ModelView):
             new_price = new_price / Decimal(rate_format % to_uom.rate)
 
         return new_price
+
+
+def _round(uom, number, func=round):
+    precision = uom.rounding
+    # Convert precision into an integer greater than 1 to avoid precision lost.
+    # This works for most cases because rounding is often: n * 10**i
+    if precision < 1:
+        exp = -floor(log10(precision))
+        factor = 10 ** exp
+        number *= factor
+        precision *= factor
+    else:
+        factor = 1
+    # Divide by factor which is an integer to avoid precision lost due to
+    # multiplication by float < 1.
+    # example:
+    # >>> 3 * 0.1
+    # 0.30000000000000004
+    # >>> 3 / 10.
+    # 0.3
+    return func(number / precision) * precision / factor
diff --git a/uom.xml b/uom.xml
index c84cd4e..bb85e99 100644
--- a/uom.xml
+++ b/uom.xml
@@ -94,8 +94,8 @@ this repository contains the full copyright notices and license terms. -->
             <field name="name">Carat</field>
             <field name="symbol">c</field>
             <field name="category" ref="uom_cat_weight"/>
-            <field name="factor" eval="5000."/>
-            <field name="rate" eval="0.0002"/>
+            <field name="factor" eval="0.0002"/>
+            <field name="rate" eval="5000."/>
         </record>
         <record model="product.uom" id="uom_pound">
             <field name="name">Pound</field>
diff --git a/view/category_form.xml b/view/category_form.xml
index 80d0197..a8b9aac 100644
--- a/view/category_form.xml
+++ b/view/category_form.xml
@@ -6,11 +6,9 @@ this repository contains the full copyright notices and license terms. -->
     <field name="name"/>
     <label name="parent"/>
     <field name="parent"/>
-    <group colspan="4" col="20" id="checkboxes">
+    <group colspan="4" col="-1" id="checkboxes">
         <!-- Add here some checkboxes ! -->
     </group>
-    <label name="rec_name"/>
-    <field name="rec_name" colspan="3"/>
     <notebook colspan="4">
         <page string="Children" col="1" id="childs">
             <field name="childs"/>
diff --git a/view/template_form.xml b/view/template_form.xml
index 7b05953..eef3399 100644
--- a/view/template_form.xml
+++ b/view/template_form.xml
@@ -11,8 +11,10 @@ this repository contains the full copyright notices and license terms. -->
       <page string="General" id="general">
           <label name="type"/>
           <field name="type"/>
-          <label name="consumable"/>
-          <field name="consumable"/>
+          <group colspan="2" col="-1" id="checkboxes">
+              <label name="consumable"/>
+              <field name="consumable" xexpand="0" width="25"/>
+          </group>
           <label name="default_uom"/>
           <field name="default_uom" />
           <newline/>
-- 
tryton-modules-product



More information about the tryton-debian-vcs mailing list