[tryton-debian-vcs] tryton-modules-account-stock-continental branch debian updated. debian/4.2.0-1-2-g4b62fa6

[Mathias Behrle]

The following commit has been merged in the debian branch:
https://alioth.debian.org/plugins/scmgit/cgi-bin/gitweb.cgi/?p=tryton/tryton-modules-account-stock-continental.git;a=commitdiff;h=debian/4.2.0-1-2-g4b62fa6

commit 4b62fa61b50dde04c8a5fb34842f64c762119df3
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Wed Jun 7 15:25:59 2017 +0200

    Merging upstream version 4.4.0.

diff --git a/CHANGELOG b/CHANGELOG
index a59051f..0370484 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 4.4.0 - 2017-05-01
+* Bug fixes (see mercurial logs for details)
+
 Version 4.2.0 - 2016-11-28
 * Bug fixes (see mercurial logs for details)
 
diff --git a/COPYRIGHT b/COPYRIGHT
index 29a4a55..46e36ff 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -1,5 +1,5 @@
-Copyright (C) 2010-2016 Cédric Krier.
-Copyright (C) 2010-2016 B2CK SPRL.
+Copyright (C) 2010-2017 Cédric Krier.
+Copyright (C) 2010-2017 B2CK SPRL.
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
diff --git a/PKG-INFO b/PKG-INFO
index 3d4bd76..9591644 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,12 +1,12 @@
 Metadata-Version: 1.1
 Name: trytond_account_stock_continental
-Version: 4.2.0
+Version: 4.4.0
 Summary: Tryton module for continental real-time stock valuation
 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_account_stock_continental
         =================================
         
@@ -51,7 +51,7 @@ Classifier: Framework :: Tryton
 Classifier: Intended Audience :: Developers
 Classifier: Intended Audience :: Financial and Insurance Industry
 Classifier: Intended Audience :: Legal Industry
-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 5f9a732..5d56a6f 100644
--- a/__init__.py
+++ b/__init__.py
@@ -11,9 +11,13 @@ def register():
     Pool.register(
         Move,
         Category,
+        CategoryAccount,
         Template,
+        TemplateAccount,
         Product,
         Configuration,
+        ConfigurationStockJournal,
+        ConfigurationCostPriceCounterpartAccount,
         FiscalYear,
         AccountMove,
         UpdateCostPriceAsk,
diff --git a/account.py b/account.py
index c986257..22168e0 100644
--- a/account.py
+++ b/account.py
@@ -1,25 +1,57 @@
 # This file is part of Tryton.  The COPYRIGHT file at the top level of
 # this repository contains the full copyright notices and license terms.
-from trytond.model import fields
-from trytond.pyson import Eval, Bool, Get
-from trytond.pool import PoolMeta
+from trytond.model import ModelSQL, ValueMixin, fields
+from trytond.pyson import Eval, Get
+from trytond.pool import PoolMeta, Pool
+from trytond.modules.company.model import CompanyValueMixin
 
-__all__ = ['Configuration', 'FiscalYear', 'AccountMove']
+__all__ = ['Configuration', 'ConfigurationStockJournal',
+    'ConfigurationCostPriceCounterpartAccount',
+    'FiscalYear', 'AccountMove']
+stock_journal = fields.Many2One(
+    'account.journal', "Stock Journal", required=True)
 
 
 class Configuration:
     __metaclass__ = PoolMeta
     __name__ = 'account.configuration'
-    stock_journal = fields.Property(fields.Many2One(
-            'account.journal', 'Stock Journal',
-            states={
-                'required': Bool(Eval('context', {}).get('company')),
-                }))
-    cost_price_counterpart_account = fields.Property(fields.Many2One(
-            'account.account', 'Cost Price Counterpart Account', domain=[
+    stock_journal = fields.MultiValue(stock_journal)
+    cost_price_counterpart_account = fields.MultiValue(fields.Many2One(
+            'account.account', "Cost Price Counterpart Account",
+            domain=[
                 ('company', 'in', [Get(Eval('context', {}), 'company'), None]),
                 ]))
 
+    @classmethod
+    def default_stock_journal(cls, **pattern):
+        return cls.multivalue_model('stock_journal').default_stock_journal()
+
+
+class ConfigurationStockJournal(ModelSQL, ValueMixin):
+    "Account Configuration Stock Journal"
+    __name__ = 'account.configuration.stock_journal'
+    stock_journal = stock_journal
+
+    @classmethod
+    def default_stock_journal(cls):
+        pool = Pool()
+        ModelData = pool.get('ir.model.data')
+        try:
+            return ModelData.get_id('account', 'journal_stock')
+        except KeyError:
+            return None
+
+
+class ConfigurationCostPriceCounterpartAccount(ModelSQL, CompanyValueMixin):
+    "Account Configuration Cost Price Counterpart Account"
+    __name__ = 'account.configuration.cost_price_counterpart_account'
+    cost_price_counterpart_account = fields.Many2One(
+        'account.account', "Cost Price Counterpart Account",
+        domain=[
+            ('company', '=', Eval('company', -1)),
+            ],
+        depends=['company'])
+
 
 class FiscalYear:
     __metaclass__ = PoolMeta
diff --git a/account.xml b/account.xml
index ade9f12..add0fdf 100644
--- a/account.xml
+++ b/account.xml
@@ -26,11 +26,4 @@ this repository contains the full copyright notices and license terms. -->
         </record>
 
     </data>
-    <data noupdate="1">
-        <record model="ir.property" id="property_stock_journal">
-            <field name="field"
-                search="[('model.model', '=', 'account.configuration'), ('name', '=', 'stock_journal')]"/>
-            <field name="value" eval="'account.journal,' + str(ref('account.journal_stock'))"/>
-        </record>
-    </data>
 </tryton>
diff --git a/locale/bg.po b/locale/bg.po
index a5ae3bb..bc43729 100644
--- a/locale/bg.po
+++ b/locale/bg.po
@@ -20,6 +20,73 @@ msgctxt "field:account.configuration,stock_journal:"
 msgid "Stock Journal"
 msgstr ""
 
+msgctxt "field:account.configuration.cost_price_counterpart_account,company:"
+msgid "Company"
+msgstr ""
+
+msgctxt ""
+"field:account.configuration.cost_price_counterpart_account,cost_price_counterpart_account:"
+msgid "Cost Price Counterpart Account"
+msgstr ""
+
+msgctxt ""
+"field:account.configuration.cost_price_counterpart_account,create_date:"
+msgid "Create Date"
+msgstr ""
+
+msgctxt ""
+"field:account.configuration.cost_price_counterpart_account,create_uid:"
+msgid "Create User"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:account.configuration.cost_price_counterpart_account,id:"
+msgid "ID"
+msgstr "ID"
+
+msgctxt "field:account.configuration.cost_price_counterpart_account,rec_name:"
+msgid "Name"
+msgstr ""
+
+msgctxt ""
+"field:account.configuration.cost_price_counterpart_account,write_date:"
+msgid "Write Date"
+msgstr ""
+
+msgctxt ""
+"field:account.configuration.cost_price_counterpart_account,write_uid:"
+msgid "Write User"
+msgstr ""
+
+msgctxt "field:account.configuration.stock_journal,create_date:"
+msgid "Create Date"
+msgstr ""
+
+msgctxt "field:account.configuration.stock_journal,create_uid:"
+msgid "Create User"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:account.configuration.stock_journal,id:"
+msgid "ID"
+msgstr "ID"
+
+msgctxt "field:account.configuration.stock_journal,rec_name:"
+msgid "Name"
+msgstr ""
+
+msgctxt "field:account.configuration.stock_journal,stock_journal:"
+msgid "Stock Journal"
+msgstr ""
+
+msgctxt "field:account.configuration.stock_journal,write_date:"
+msgid "Write Date"
+msgstr ""
+
+msgctxt "field:account.configuration.stock_journal,write_uid:"
+msgid "Write User"
+msgstr ""
+
 msgctxt "field:account.fiscalyear,account_stock_method:"
 msgid "Account Stock Method"
 msgstr ""
@@ -64,6 +131,26 @@ msgctxt "field:product.category,account_stock_used:"
 msgid "Account Stock Used"
 msgstr ""
 
+msgctxt "field:product.category.account,account_stock:"
+msgid "Account Stock"
+msgstr ""
+
+msgctxt "field:product.category.account,account_stock_customer:"
+msgid "Account Stock Customer"
+msgstr ""
+
+msgctxt "field:product.category.account,account_stock_lost_found:"
+msgid "Account Stock Lost and Found"
+msgstr ""
+
+msgctxt "field:product.category.account,account_stock_production:"
+msgid "Account Stock Production"
+msgstr ""
+
+msgctxt "field:product.category.account,account_stock_supplier:"
+msgid "Account Stock Supplier"
+msgstr ""
+
 msgctxt "field:product.product,account_stock:"
 msgid "Account Stock"
 msgstr ""
@@ -144,6 +231,26 @@ msgctxt "field:product.template,account_stock_used:"
 msgid "Account Stock Used"
 msgstr ""
 
+msgctxt "field:product.template.account,account_stock:"
+msgid "Account Stock"
+msgstr ""
+
+msgctxt "field:product.template.account,account_stock_customer:"
+msgid "Account Stock Customer"
+msgstr ""
+
+msgctxt "field:product.template.account,account_stock_lost_found:"
+msgid "Account Stock Lost and Found"
+msgstr ""
+
+msgctxt "field:product.template.account,account_stock_production:"
+msgid "Account Stock Production"
+msgstr ""
+
+msgctxt "field:product.template.account,account_stock_supplier:"
+msgid "Account Stock Supplier"
+msgstr ""
+
 #, fuzzy
 msgctxt "field:product.update_cost_price.ask,cost_price:"
 msgid "Cost Price"
@@ -251,6 +358,14 @@ msgctxt "help:product.template,account_stock_supplier:"
 msgid "This account will be used instead of the one defined on the category."
 msgstr "Ще се използва тази сметка вместо тази зададена за категорията"
 
+msgctxt "model:account.configuration.cost_price_counterpart_account,name:"
+msgid "Account Configuration Cost Price Counterpart Account"
+msgstr ""
+
+msgctxt "model:account.configuration.stock_journal,name:"
+msgid "Account Configuration Stock Journal"
+msgstr ""
+
 msgctxt "model:ir.action,name:wizard_update_cost_price"
 msgid "Update Cost Price"
 msgstr ""
diff --git a/locale/ca.po b/locale/ca.po
index 72f2aae..5b58438 100644
--- a/locale/ca.po
+++ b/locale/ca.po
@@ -7,12 +7,13 @@ msgid ""
 "You cannot change the cost price for a product which is associated to stock moves.\n"
 "You must use the \"Update Cost Price\" wizard."
 msgstr ""
-"No podeu canviar el preu de cost d'un producte que està associat amb moviments d'estoc.\n"
+"No podeu canviar el preu de cost d'un producte que està associat amb moviments d'existències.\n"
 "Per actualitzar el cost heu d'utilitzar l'assistent \"Actualitza preu de cost\"."
 
 msgctxt "error:product.update_cost_price:"
 msgid "The stock account and the counterpart can not be the same account"
-msgstr "El compte d'estoc i la contrapartida no poden ser el mateix compte."
+msgstr ""
+"El compte d'existències i la contrapartida no poden ser el mateix compte."
 
 msgctxt "field:account.configuration,cost_price_counterpart_account:"
 msgid "Cost Price Counterpart Account"
@@ -20,131 +21,236 @@ msgstr "Compte contrapartida preu de cost"
 
 msgctxt "field:account.configuration,stock_journal:"
 msgid "Stock Journal"
-msgstr "Diari d'estoc"
+msgstr "Diari d'existències"
+
+msgctxt "field:account.configuration.cost_price_counterpart_account,company:"
+msgid "Company"
+msgstr "Empresa"
+
+msgctxt ""
+"field:account.configuration.cost_price_counterpart_account,cost_price_counterpart_account:"
+msgid "Cost Price Counterpart Account"
+msgstr "Compte contrapartida preu de cost"
+
+msgctxt ""
+"field:account.configuration.cost_price_counterpart_account,create_date:"
+msgid "Create Date"
+msgstr "Data de creació"
+
+msgctxt ""
+"field:account.configuration.cost_price_counterpart_account,create_uid:"
+msgid "Create User"
+msgstr "Usuari de creació"
+
+msgctxt "field:account.configuration.cost_price_counterpart_account,id:"
+msgid "ID"
+msgstr "ID"
+
+msgctxt "field:account.configuration.cost_price_counterpart_account,rec_name:"
+msgid "Name"
+msgstr "Nom"
+
+msgctxt ""
+"field:account.configuration.cost_price_counterpart_account,write_date:"
+msgid "Write Date"
+msgstr "Data de modificació"
+
+msgctxt ""
+"field:account.configuration.cost_price_counterpart_account,write_uid:"
+msgid "Write User"
+msgstr "Usuari de modificació"
+
+msgctxt "field:account.configuration.stock_journal,create_date:"
+msgid "Create Date"
+msgstr "Data de creació"
+
+msgctxt "field:account.configuration.stock_journal,create_uid:"
+msgid "Create User"
+msgstr "Usuari de creació"
+
+msgctxt "field:account.configuration.stock_journal,id:"
+msgid "ID"
+msgstr "ID"
+
+msgctxt "field:account.configuration.stock_journal,rec_name:"
+msgid "Name"
+msgstr "Nom"
+
+msgctxt "field:account.configuration.stock_journal,stock_journal:"
+msgid "Stock Journal"
+msgstr "Diari d'existències"
+
+msgctxt "field:account.configuration.stock_journal,write_date:"
+msgid "Write Date"
+msgstr "Data de modificació"
+
+msgctxt "field:account.configuration.stock_journal,write_uid:"
+msgid "Write User"
+msgstr "Usuari de modificació"
 
 msgctxt "field:account.fiscalyear,account_stock_method:"
 msgid "Account Stock Method"
-msgstr "Mètode comptabilització de l'estoc"
+msgstr "Mètode comptabilització de les existències"
 
 msgctxt "field:product.category,account_stock:"
 msgid "Account Stock"
-msgstr "Compte d'estoc"
+msgstr "Compte d'existències"
 
 msgctxt "field:product.category,account_stock_customer:"
 msgid "Account Stock Customer"
-msgstr "Compte d'estoc client"
+msgstr "Compte d'existències de client"
 
 msgctxt "field:product.category,account_stock_customer_used:"
 msgid "Account Stock Customer Used"
-msgstr "Compte d'estoc client usat"
+msgstr "Compte d'existències de client usat"
 
 msgctxt "field:product.category,account_stock_lost_found:"
 msgid "Account Stock Lost and Found"
-msgstr "Compte d'estoc perdut-trobat"
+msgstr "Compte d'existències de perdut-trobat"
 
 msgctxt "field:product.category,account_stock_lost_found_used:"
 msgid "Account Stock Lost and Found"
-msgstr "Compte d'estoc perdut-trobat"
+msgstr "Compte d'existències de perdut-trobat"
 
 msgctxt "field:product.category,account_stock_production:"
 msgid "Account Stock Production"
-msgstr "Compte d'estoc producció"
+msgstr "Compte d'existències de producció"
 
 msgctxt "field:product.category,account_stock_production_used:"
 msgid "Account Stock Production Used"
-msgstr "Compte d'estoc producció usat"
+msgstr "Compte d'existències de producció usat"
 
 msgctxt "field:product.category,account_stock_supplier:"
 msgid "Account Stock Supplier"
-msgstr "Compte d'estoc proveïdor"
+msgstr "Compte d'existències de proveïdor"
 
 msgctxt "field:product.category,account_stock_supplier_used:"
 msgid "Account Stock Supplier Used"
-msgstr "Compte d'estoc proveïdor usat"
+msgstr "Compte d'existències de proveïdor usat"
 
 msgctxt "field:product.category,account_stock_used:"
 msgid "Account Stock Used"
-msgstr "Compte d'estoc usat"
+msgstr "Compte d'existències usat"
+
+msgctxt "field:product.category.account,account_stock:"
+msgid "Account Stock"
+msgstr "Compte d'existències"
+
+msgctxt "field:product.category.account,account_stock_customer:"
+msgid "Account Stock Customer"
+msgstr "Compte d'existències de client"
+
+msgctxt "field:product.category.account,account_stock_lost_found:"
+msgid "Account Stock Lost and Found"
+msgstr "Compte d'existències de perdut-trobat"
+
+msgctxt "field:product.category.account,account_stock_production:"
+msgid "Account Stock Production"
+msgstr "Compte d'existències de producció"
+
+msgctxt "field:product.category.account,account_stock_supplier:"
+msgid "Account Stock Supplier"
+msgstr "Compte d'existències de proveïdor"
 
 msgctxt "field:product.product,account_stock:"
 msgid "Account Stock"
-msgstr "Compte d'estoc"
+msgstr "Compte d'existències"
 
 msgctxt "field:product.product,account_stock_customer:"
 msgid "Account Stock Customer"
-msgstr "Compte d'estoc client"
+msgstr "Compte d'existències de client"
 
 msgctxt "field:product.product,account_stock_customer_used:"
 msgid "Account Stock Customer Used"
-msgstr "Compte d'estoc client usat"
+msgstr "Compte d'existències de client usat"
 
 msgctxt "field:product.product,account_stock_lost_found:"
 msgid "Account Stock Lost and Found"
-msgstr "Compte d'estoc perdut-trobat"
+msgstr "Compte d'existències de perdut-trobat"
 
 msgctxt "field:product.product,account_stock_lost_found_used:"
 msgid "Account Stock Lost and Found"
-msgstr "Compte d'estoc perdut-trobat"
+msgstr "Compte d'existències de perdut-trobat"
 
 msgctxt "field:product.product,account_stock_production:"
 msgid "Account Stock Production"
-msgstr "Compte d'estoc producció"
+msgstr "Compte d'existències de producció"
 
 msgctxt "field:product.product,account_stock_production_used:"
 msgid "Account Stock Production Used"
-msgstr "Compte d'estoc producció usat"
+msgstr "Compte d'existències de producció usat"
 
 msgctxt "field:product.product,account_stock_supplier:"
 msgid "Account Stock Supplier"
-msgstr "Compte d'estoc proveïdor"
+msgstr "Compte d'existències de proveïdor"
 
 msgctxt "field:product.product,account_stock_supplier_used:"
 msgid "Account Stock Supplier Used"
-msgstr "Compte d'estoc proveïdor usat"
+msgstr "Compte d'existències de proveïdor usat"
 
 msgctxt "field:product.product,account_stock_used:"
 msgid "Account Stock Used"
-msgstr "Compte d'estoc usat"
+msgstr "Compte d'existències usat"
 
 msgctxt "field:product.template,account_stock:"
 msgid "Account Stock"
-msgstr "Compte d'estoc"
+msgstr "Compte d'existències"
 
 msgctxt "field:product.template,account_stock_customer:"
 msgid "Account Stock Customer"
-msgstr "Compte d'estoc client"
+msgstr "Compte d'existències de client"
 
 msgctxt "field:product.template,account_stock_customer_used:"
 msgid "Account Stock Customer Used"
-msgstr "Compte d'estoc client usat"
+msgstr "Compte d'existències de client usat"
 
 msgctxt "field:product.template,account_stock_lost_found:"
 msgid "Account Stock Lost and Found"
-msgstr "Compte d'estoc perdut-trobat"
+msgstr "Compte d'existències de perdut-trobat"
 
 msgctxt "field:product.template,account_stock_lost_found_used:"
 msgid "Account Stock Lost and Found"
-msgstr "Compte d'estoc perdut-trobat"
+msgstr "Compte d'existències de perdut-trobat"
 
 msgctxt "field:product.template,account_stock_production:"
 msgid "Account Stock Production"
-msgstr "Compte d'estoc producció"
+msgstr "Compte d'existències de producció"
 
 msgctxt "field:product.template,account_stock_production_used:"
 msgid "Account Stock Production Used"
-msgstr "Compte d'estoc producció usat"
+msgstr "Compte d'existències de producció usat"
 
 msgctxt "field:product.template,account_stock_supplier:"
 msgid "Account Stock Supplier"
-msgstr "Compte d'estoc proveïdor"
+msgstr "Compte d'existències de proveïdor"
 
 msgctxt "field:product.template,account_stock_supplier_used:"
 msgid "Account Stock Supplier Used"
-msgstr "Compte d'estoc proveïdor usat"
+msgstr "Compte d'existències de proveïdor usat"
 
 msgctxt "field:product.template,account_stock_used:"
 msgid "Account Stock Used"
-msgstr "Compte d'estoc usat"
+msgstr "Compte d'existències usat"
+
+msgctxt "field:product.template.account,account_stock:"
+msgid "Account Stock"
+msgstr "Compte d'existències"
+
+msgctxt "field:product.template.account,account_stock_customer:"
+msgid "Account Stock Customer"
+msgstr "Compte d'existències de client"
+
+msgctxt "field:product.template.account,account_stock_lost_found:"
+msgid "Account Stock Lost and Found"
+msgstr "Compte d'existències de perdut-trobat"
+
+msgctxt "field:product.template.account,account_stock_production:"
+msgid "Account Stock Production"
+msgstr "Compte d'existències de producció"
+
+msgctxt "field:product.template.account,account_stock_supplier:"
+msgid "Account Stock Supplier"
+msgstr "Compte d'existències de proveïdor"
 
 msgctxt "field:product.update_cost_price.ask,cost_price:"
 msgid "Cost Price"
@@ -192,7 +298,7 @@ msgstr "Diferència de preu"
 
 msgctxt "field:product.update_cost_price.show_move,stock_account:"
 msgid "Stock Account"
-msgstr "Compte d'estoc"
+msgstr "Compte d'existències"
 
 msgctxt "help:product.product,account_stock:"
 msgid "This account will be used instead of the one defined on the category."
@@ -234,6 +340,14 @@ msgctxt "help:product.template,account_stock_supplier:"
 msgid "This account will be used instead of the one defined on the category."
 msgstr "S'utilitzarà aquest compte en lloc del definit a la categoria."
 
+msgctxt "model:account.configuration.cost_price_counterpart_account,name:"
+msgid "Account Configuration Cost Price Counterpart Account"
+msgstr "Configuració del compte contrapartida de preu de cost"
+
+msgctxt "model:account.configuration.stock_journal,name:"
+msgid "Account Configuration Stock Journal"
+msgstr "Configuració del diari d'existències"
+
 msgctxt "model:ir.action,name:wizard_update_cost_price"
 msgid "Update Cost Price"
 msgstr "Actualitza preu de cost"
@@ -260,7 +374,7 @@ msgstr "Logística"
 
 msgctxt "view:account.fiscalyear:"
 msgid "Account Stock"
-msgstr "Comptabilització de l'estoc"
+msgstr "Comptabilització de l'existències"
 
 msgctxt "wizard_button:product.update_cost_price,ask_price,end:"
 msgid "Cancel"
diff --git a/locale/cs.po b/locale/cs.po
index 7d59ca7..c447aa5 100644
--- a/locale/cs.po
+++ b/locale/cs.po
@@ -20,6 +20,71 @@ msgctxt "field:account.configuration,stock_journal:"
 msgid "Stock Journal"
 msgstr ""
 
+msgctxt "field:account.configuration.cost_price_counterpart_account,company:"
+msgid "Company"
+msgstr ""
+
+msgctxt ""
+"field:account.configuration.cost_price_counterpart_account,cost_price_counterpart_account:"
+msgid "Cost Price Counterpart Account"
+msgstr ""
+
+msgctxt ""
+"field:account.configuration.cost_price_counterpart_account,create_date:"
+msgid "Create Date"
+msgstr ""
+
+msgctxt ""
+"field:account.configuration.cost_price_counterpart_account,create_uid:"
+msgid "Create User"
+msgstr ""
+
+msgctxt "field:account.configuration.cost_price_counterpart_account,id:"
+msgid "ID"
+msgstr ""
+
+msgctxt "field:account.configuration.cost_price_counterpart_account,rec_name:"
+msgid "Name"
+msgstr ""
+
+msgctxt ""
+"field:account.configuration.cost_price_counterpart_account,write_date:"
+msgid "Write Date"
+msgstr ""
+
+msgctxt ""
+"field:account.configuration.cost_price_counterpart_account,write_uid:"
+msgid "Write User"
+msgstr ""
+
+msgctxt "field:account.configuration.stock_journal,create_date:"
+msgid "Create Date"
+msgstr ""
+
+msgctxt "field:account.configuration.stock_journal,create_uid:"
+msgid "Create User"
+msgstr ""
+
+msgctxt "field:account.configuration.stock_journal,id:"
+msgid "ID"
+msgstr ""
+
+msgctxt "field:account.configuration.stock_journal,rec_name:"
+msgid "Name"
+msgstr ""
+
+msgctxt "field:account.configuration.stock_journal,stock_journal:"
+msgid "Stock Journal"
+msgstr ""
+
+msgctxt "field:account.configuration.stock_journal,write_date:"
+msgid "Write Date"
+msgstr ""
+
+msgctxt "field:account.configuration.stock_journal,write_uid:"
+msgid "Write User"
+msgstr ""
+
 msgctxt "field:account.fiscalyear,account_stock_method:"
 msgid "Account Stock Method"
 msgstr ""
@@ -64,6 +129,26 @@ msgctxt "field:product.category,account_stock_used:"
 msgid "Account Stock Used"
 msgstr ""
 
+msgctxt "field:product.category.account,account_stock:"
+msgid "Account Stock"
+msgstr ""
+
+msgctxt "field:product.category.account,account_stock_customer:"
+msgid "Account Stock Customer"
+msgstr ""
+
+msgctxt "field:product.category.account,account_stock_lost_found:"
+msgid "Account Stock Lost and Found"
+msgstr ""
+
+msgctxt "field:product.category.account,account_stock_production:"
+msgid "Account Stock Production"
+msgstr ""
+
+msgctxt "field:product.category.account,account_stock_supplier:"
+msgid "Account Stock Supplier"
+msgstr ""
+
 msgctxt "field:product.product,account_stock:"
 msgid "Account Stock"
 msgstr ""
@@ -144,6 +229,26 @@ msgctxt "field:product.template,account_stock_used:"
 msgid "Account Stock Used"
 msgstr ""
 
+msgctxt "field:product.template.account,account_stock:"
+msgid "Account Stock"
+msgstr ""
+
+msgctxt "field:product.template.account,account_stock_customer:"
+msgid "Account Stock Customer"
+msgstr ""
+
+msgctxt "field:product.template.account,account_stock_lost_found:"
+msgid "Account Stock Lost and Found"
+msgstr ""
+
+msgctxt "field:product.template.account,account_stock_production:"
+msgid "Account Stock Production"
+msgstr ""
+
+msgctxt "field:product.template.account,account_stock_supplier:"
+msgid "Account Stock Supplier"
+msgstr ""
+
 msgctxt "field:product.update_cost_price.ask,cost_price:"
 msgid "Cost Price"
 msgstr ""
@@ -232,6 +337,14 @@ msgctxt "help:product.template,account_stock_supplier:"
 msgid "This account will be used instead of the one defined on the category."
 msgstr ""
 
+msgctxt "model:account.configuration.cost_price_counterpart_account,name:"
+msgid "Account Configuration Cost Price Counterpart Account"
+msgstr ""
+
+msgctxt "model:account.configuration.stock_journal,name:"
+msgid "Account Configuration Stock Journal"
+msgstr ""
+
 msgctxt "model:ir.action,name:wizard_update_cost_price"
 msgid "Update Cost Price"
 msgstr ""
diff --git a/locale/de.po b/locale/de.po
index bc37cf1..a19ed12 100644
--- a/locale/de.po
+++ b/locale/de.po
@@ -22,6 +22,71 @@ msgctxt "field:account.configuration,stock_journal:"
 msgid "Stock Journal"
 msgstr "Journal Lager"
 
+msgctxt "field:account.configuration.cost_price_counterpart_account,company:"
+msgid "Company"
+msgstr "Unternehmen"
+
+msgctxt ""
+"field:account.configuration.cost_price_counterpart_account,cost_price_counterpart_account:"
+msgid "Cost Price Counterpart Account"
+msgstr "Gegenkonto Kostenpreis"
+
+msgctxt ""
+"field:account.configuration.cost_price_counterpart_account,create_date:"
+msgid "Create Date"
+msgstr "Erstellungsdatum"
+
+msgctxt ""
+"field:account.configuration.cost_price_counterpart_account,create_uid:"
+msgid "Create User"
+msgstr "Erstellt durch"
+
+msgctxt "field:account.configuration.cost_price_counterpart_account,id:"
+msgid "ID"
+msgstr "ID"
+
+msgctxt "field:account.configuration.cost_price_counterpart_account,rec_name:"
+msgid "Name"
+msgstr "Name"
+
+msgctxt ""
+"field:account.configuration.cost_price_counterpart_account,write_date:"
+msgid "Write Date"
+msgstr "Zuletzt geändert"
+
+msgctxt ""
+"field:account.configuration.cost_price_counterpart_account,write_uid:"
+msgid "Write User"
+msgstr "Letzte Änderung durch"
+
+msgctxt "field:account.configuration.stock_journal,create_date:"
+msgid "Create Date"
+msgstr "Erstellungsdatum"
+
+msgctxt "field:account.configuration.stock_journal,create_uid:"
+msgid "Create User"
+msgstr "Erstellt durch"
+
+msgctxt "field:account.configuration.stock_journal,id:"
+msgid "ID"
+msgstr "ID"
+
+msgctxt "field:account.configuration.stock_journal,rec_name:"
+msgid "Name"
+msgstr "Name"
+
+msgctxt "field:account.configuration.stock_journal,stock_journal:"
+msgid "Stock Journal"
+msgstr "Journal Lager"
+
+msgctxt "field:account.configuration.stock_journal,write_date:"
+msgid "Write Date"
+msgstr "Zuletzt geändert"
+
+msgctxt "field:account.configuration.stock_journal,write_uid:"
+msgid "Write User"
+msgstr "Letzte Änderung durch"
+
 msgctxt "field:account.fiscalyear,account_stock_method:"
 msgid "Account Stock Method"
 msgstr "Lagerbewertungsmethode"
@@ -66,6 +131,26 @@ msgctxt "field:product.category,account_stock_used:"
 msgid "Account Stock Used"
 msgstr "Verwendetes Konto Lager"
 
+msgctxt "field:product.category.account,account_stock:"
+msgid "Account Stock"
+msgstr "Konto Lager"
+
+msgctxt "field:product.category.account,account_stock_customer:"
+msgid "Account Stock Customer"
+msgstr "Konto Lager Kunde"
+
+msgctxt "field:product.category.account,account_stock_lost_found:"
+msgid "Account Stock Lost and Found"
+msgstr "Konto Lager Inventurdifferenz"
+
+msgctxt "field:product.category.account,account_stock_production:"
+msgid "Account Stock Production"
+msgstr "Konto Lager Produktion"
+
+msgctxt "field:product.category.account,account_stock_supplier:"
+msgid "Account Stock Supplier"
+msgstr "Konto Lager Lieferant"
+
 msgctxt "field:product.product,account_stock:"
 msgid "Account Stock"
 msgstr "Lagerkonto"
@@ -146,6 +231,26 @@ msgctxt "field:product.template,account_stock_used:"
 msgid "Account Stock Used"
 msgstr "Verwendetes Konto Lager"
 
+msgctxt "field:product.template.account,account_stock:"
+msgid "Account Stock"
+msgstr "Konto Lager"
+
+msgctxt "field:product.template.account,account_stock_customer:"
+msgid "Account Stock Customer"
+msgstr "Konto Lager Kunde"
+
+msgctxt "field:product.template.account,account_stock_lost_found:"
+msgid "Account Stock Lost and Found"
+msgstr "Konto Lager Inventurdifferenz"
+
+msgctxt "field:product.template.account,account_stock_production:"
+msgid "Account Stock Production"
+msgstr "Konto Lager Produktion"
+
+msgctxt "field:product.template.account,account_stock_supplier:"
+msgid "Account Stock Supplier"
+msgstr "Konto Lager Lieferant"
+
 msgctxt "field:product.update_cost_price.ask,cost_price:"
 msgid "Cost Price"
 msgstr "Kostenpreis"
@@ -254,6 +359,14 @@ msgstr ""
 "Dieses Konto wird benutzt anstelle des Kontos, welches in der Kategorie "
 "eingestellt ist."
 
+msgctxt "model:account.configuration.cost_price_counterpart_account,name:"
+msgid "Account Configuration Cost Price Counterpart Account"
+msgstr "Einstellungen Buchhaltung Gegenkonto Kostenpreis"
+
+msgctxt "model:account.configuration.stock_journal,name:"
+msgid "Account Configuration Stock Journal"
+msgstr "Einstellungen Buchhaltung Journal Lager"
+
 msgctxt "model:ir.action,name:wizard_update_cost_price"
 msgid "Update Cost Price"
 msgstr "Kostenpreis aktualisieren"
diff --git a/locale/es.po b/locale/es.po
index 0b7ee36..0f3d88e 100644
--- a/locale/es.po
+++ b/locale/es.po
@@ -7,12 +7,13 @@ msgid ""
 "You cannot change the cost price for a product which is associated to stock moves.\n"
 "You must use the \"Update Cost Price\" wizard."
 msgstr ""
-"No se puede cambiar el precio de coste de un producto que está asociado a movimientos de stock.\n"
+"No se puede cambiar el precio de coste de un producto que está asociado a movimientos de existencias.\n"
 "Para actualizar el coste debe utilizar el asistente \"Actualizar precio de coste\"."
 
 msgctxt "error:product.update_cost_price:"
 msgid "The stock account and the counterpart can not be the same account"
-msgstr "La cuenta de stock y la contrapartida no pueden ser la misma cuenta."
+msgstr ""
+"La cuenta de existencias y la contrapartida no pueden ser la misma cuenta."
 
 msgctxt "field:account.configuration,cost_price_counterpart_account:"
 msgid "Cost Price Counterpart Account"
@@ -20,131 +21,236 @@ msgstr "Cuenta contrapartida precio de coste"
 
 msgctxt "field:account.configuration,stock_journal:"
 msgid "Stock Journal"
-msgstr "Diario de stock"
+msgstr "Diario de existencias"
+
+msgctxt "field:account.configuration.cost_price_counterpart_account,company:"
+msgid "Company"
+msgstr "Empresa"
+
+msgctxt ""
+"field:account.configuration.cost_price_counterpart_account,cost_price_counterpart_account:"
+msgid "Cost Price Counterpart Account"
+msgstr "Cuenta contrapartida precio de coste"
+
+msgctxt ""
+"field:account.configuration.cost_price_counterpart_account,create_date:"
+msgid "Create Date"
+msgstr "Fecha de creación"
+
+msgctxt ""
+"field:account.configuration.cost_price_counterpart_account,create_uid:"
+msgid "Create User"
+msgstr "Usuario de creción"
+
+msgctxt "field:account.configuration.cost_price_counterpart_account,id:"
+msgid "ID"
+msgstr "ID"
+
+msgctxt "field:account.configuration.cost_price_counterpart_account,rec_name:"
+msgid "Name"
+msgstr "Nombre"
+
+msgctxt ""
+"field:account.configuration.cost_price_counterpart_account,write_date:"
+msgid "Write Date"
+msgstr "Fecha de modificación"
+
+msgctxt ""
+"field:account.configuration.cost_price_counterpart_account,write_uid:"
+msgid "Write User"
+msgstr "Usuario de modificación"
+
+msgctxt "field:account.configuration.stock_journal,create_date:"
+msgid "Create Date"
+msgstr "Fecha de creación"
+
+msgctxt "field:account.configuration.stock_journal,create_uid:"
+msgid "Create User"
+msgstr "Usuario de creación"
+
+msgctxt "field:account.configuration.stock_journal,id:"
+msgid "ID"
+msgstr "ID"
+
+msgctxt "field:account.configuration.stock_journal,rec_name:"
+msgid "Name"
+msgstr "Nombre"
+
+msgctxt "field:account.configuration.stock_journal,stock_journal:"
+msgid "Stock Journal"
+msgstr "Diario de existencias"
+
+msgctxt "field:account.configuration.stock_journal,write_date:"
+msgid "Write Date"
+msgstr "Fecha de modificación"
+
+msgctxt "field:account.configuration.stock_journal,write_uid:"
+msgid "Write User"
+msgstr "Usuario de modificación"
 
 msgctxt "field:account.fiscalyear,account_stock_method:"
 msgid "Account Stock Method"
-msgstr "Método contabilización del stock"
+msgstr "Método contabilización de existencias"
 
 msgctxt "field:product.category,account_stock:"
 msgid "Account Stock"
-msgstr "Cuenta de stock"
+msgstr "Cuenta de existencias"
 
 msgctxt "field:product.category,account_stock_customer:"
 msgid "Account Stock Customer"
-msgstr "Cuenta de stock cliente"
+msgstr "Cuenta de existencias del cliente"
 
 msgctxt "field:product.category,account_stock_customer_used:"
 msgid "Account Stock Customer Used"
-msgstr "Cuenta de stock cliente usada"
+msgstr "Cuenta de existencias del cliente usada"
 
 msgctxt "field:product.category,account_stock_lost_found:"
 msgid "Account Stock Lost and Found"
-msgstr "Cuenta de stock perdido-encontrado"
+msgstr "Cuenta de existencias de perdido-encontrado"
 
 msgctxt "field:product.category,account_stock_lost_found_used:"
 msgid "Account Stock Lost and Found"
-msgstr "Cuenta de stock perdido-encontrado"
+msgstr "Cuenta de existencias de perdido-encontrado"
 
 msgctxt "field:product.category,account_stock_production:"
 msgid "Account Stock Production"
-msgstr "Cuenta de stock producción"
+msgstr "Cuenta de existencias de producción"
 
 msgctxt "field:product.category,account_stock_production_used:"
 msgid "Account Stock Production Used"
-msgstr "Cuenta de stock producción usada"
+msgstr "Cuenta de existencias de producción usada"
 
 msgctxt "field:product.category,account_stock_supplier:"
 msgid "Account Stock Supplier"
-msgstr "Cuenta de stock proveedor"
+msgstr "Cuenta de existencias de proveedor"
 
 msgctxt "field:product.category,account_stock_supplier_used:"
 msgid "Account Stock Supplier Used"
-msgstr "Cuenta de stock proveedor usada"
+msgstr "Cuenta de existencias de proveedor usada"
 
 msgctxt "field:product.category,account_stock_used:"
 msgid "Account Stock Used"
-msgstr "Cuenta de stock usada"
+msgstr "Cuenta de existencias de usada"
+
+msgctxt "field:product.category.account,account_stock:"
+msgid "Account Stock"
+msgstr "Cuenta de existencias"
+
+msgctxt "field:product.category.account,account_stock_customer:"
+msgid "Account Stock Customer"
+msgstr "Cuenta de existencias cliente"
+
+msgctxt "field:product.category.account,account_stock_lost_found:"
+msgid "Account Stock Lost and Found"
+msgstr "Cuenta de existencias perdido-encontrado"
+
+msgctxt "field:product.category.account,account_stock_production:"
+msgid "Account Stock Production"
+msgstr "Cuenta de existencias producción"
+
+msgctxt "field:product.category.account,account_stock_supplier:"
+msgid "Account Stock Supplier"
+msgstr "Cuenta de existencias proveedor"
 
 msgctxt "field:product.product,account_stock:"
 msgid "Account Stock"
-msgstr "Cuenta de stock"
+msgstr "Cuenta de existencias"
 
 msgctxt "field:product.product,account_stock_customer:"
 msgid "Account Stock Customer"
-msgstr "Cuenta de stock cliente"
+msgstr "Cuenta de existencias de cliente"
 
 msgctxt "field:product.product,account_stock_customer_used:"
 msgid "Account Stock Customer Used"
-msgstr "Cuenta de stock cliente usada"
+msgstr "Cuenta de existencias de cliente usada"
 
 msgctxt "field:product.product,account_stock_lost_found:"
 msgid "Account Stock Lost and Found"
-msgstr "Cuenta de stock perdido-encontrado"
+msgstr "Cuenta de existencias de perdido-encontrado"
 
 msgctxt "field:product.product,account_stock_lost_found_used:"
 msgid "Account Stock Lost and Found"
-msgstr "Cuenta de stock perdido-encontrado"
+msgstr "Cuenta de existencias de perdido-encontrado"
 
 msgctxt "field:product.product,account_stock_production:"
 msgid "Account Stock Production"
-msgstr "Cuenta de stock producción"
+msgstr "Cuenta de existencias de producción"
 
 msgctxt "field:product.product,account_stock_production_used:"
 msgid "Account Stock Production Used"
-msgstr "Cuenta de stock producción usada"
+msgstr "Cuenta de existencias de producción usada"
 
 msgctxt "field:product.product,account_stock_supplier:"
 msgid "Account Stock Supplier"
-msgstr "Cuenta de stock proveedor"
+msgstr "Cuenta de existencias de proveedor"
 
 msgctxt "field:product.product,account_stock_supplier_used:"
 msgid "Account Stock Supplier Used"
-msgstr "Cuenta de stock proveedor usada"
+msgstr "Cuenta de existencias de proveedor usada"
 
 msgctxt "field:product.product,account_stock_used:"
 msgid "Account Stock Used"
-msgstr "Cuenta de stock usada"
+msgstr "Cuenta de existencias usada"
 
 msgctxt "field:product.template,account_stock:"
 msgid "Account Stock"
-msgstr "Cuenta de stock"
+msgstr "Cuenta de existencias"
 
 msgctxt "field:product.template,account_stock_customer:"
 msgid "Account Stock Customer"
-msgstr "Cuenta de stock cliente"
+msgstr "Cuenta de existencias de cliente"
 
 msgctxt "field:product.template,account_stock_customer_used:"
 msgid "Account Stock Customer Used"
-msgstr "Cuenta de stock cliente usada"
+msgstr "Cuenta de existencias de cliente usada"
 
 msgctxt "field:product.template,account_stock_lost_found:"
 msgid "Account Stock Lost and Found"
-msgstr "Cuenta de stock perdido-encontrado"
+msgstr "Cuenta de existencias de perdido-encontrado"
 
 msgctxt "field:product.template,account_stock_lost_found_used:"
 msgid "Account Stock Lost and Found"
-msgstr "Cuenta de stock perdido-encontrado"
+msgstr "Cuenta de existencias de perdido-encontrado"
 
 msgctxt "field:product.template,account_stock_production:"
 msgid "Account Stock Production"
-msgstr "Cuenta de stock producción"
+msgstr "Cuenta de existencias de producción"
 
 msgctxt "field:product.template,account_stock_production_used:"
 msgid "Account Stock Production Used"
-msgstr "Cuenta de stock producción usada"
+msgstr "Cuenta de existencias de producción usada"
 
 msgctxt "field:product.template,account_stock_supplier:"
 msgid "Account Stock Supplier"
-msgstr "Cuenta de stock proveedor"
+msgstr "Cuenta de existencias de proveedor"
 
 msgctxt "field:product.template,account_stock_supplier_used:"
 msgid "Account Stock Supplier Used"
-msgstr "Cuenta de stock proveedor usada"
+msgstr "Cuenta de existencias de proveedor usada"
 
 msgctxt "field:product.template,account_stock_used:"
 msgid "Account Stock Used"
-msgstr "Cuenta de stock usada"
+msgstr "Cuenta de existencias de usada"
+
+msgctxt "field:product.template.account,account_stock:"
+msgid "Account Stock"
+msgstr "Cuenta de existencias"
+
+msgctxt "field:product.template.account,account_stock_customer:"
+msgid "Account Stock Customer"
+msgstr "Cuenta de existencias cliente"
+
+msgctxt "field:product.template.account,account_stock_lost_found:"
+msgid "Account Stock Lost and Found"
+msgstr "Cuenta de existencias perdido-encontrado"
+
+msgctxt "field:product.template.account,account_stock_production:"
+msgid "Account Stock Production"
+msgstr "Cuenta de existencias producción"
+
+msgctxt "field:product.template.account,account_stock_supplier:"
+msgid "Account Stock Supplier"
+msgstr "Cuenta de existencias proveedor"
 
 msgctxt "field:product.update_cost_price.ask,cost_price:"
 msgid "Cost Price"
@@ -192,7 +298,7 @@ msgstr "Diferencia de precio"
 
 msgctxt "field:product.update_cost_price.show_move,stock_account:"
 msgid "Stock Account"
-msgstr "Cuenta de stock"
+msgstr "Cuenta de existencias"
 
 msgctxt "help:product.product,account_stock:"
 msgid "This account will be used instead of the one defined on the category."
@@ -234,6 +340,14 @@ msgctxt "help:product.template,account_stock_supplier:"
 msgid "This account will be used instead of the one defined on the category."
 msgstr "Se usará esta cuenta en lugar de la definida en la categoría."
 
+msgctxt "model:account.configuration.cost_price_counterpart_account,name:"
+msgid "Account Configuration Cost Price Counterpart Account"
+msgstr "Configuración de la cuenta contrapartida del precio de coste"
+
+msgctxt "model:account.configuration.stock_journal,name:"
+msgid "Account Configuration Stock Journal"
+msgstr "Configuración del diario de estoc"
+
 msgctxt "model:ir.action,name:wizard_update_cost_price"
 msgid "Update Cost Price"
 msgstr "Actualizar precio de coste"
@@ -260,7 +374,7 @@ msgstr "Logística"
 
 msgctxt "view:account.fiscalyear:"
 msgid "Account Stock"
-msgstr "Contabilización del stock"
+msgstr "Contabilización del existencias"
 
 msgctxt "wizard_button:product.update_cost_price,ask_price,end:"
 msgid "Cancel"
diff --git a/locale/es_419.po b/locale/es_419.po
index 646610b..bb86b08 100644
--- a/locale/es_419.po
+++ b/locale/es_419.po
@@ -7,22 +7,90 @@ msgid ""
 "You cannot change the cost price for a product which is associated to stock moves.\n"
 "You must use the \"Update Cost Price\" wizard."
 msgstr ""
+"No puede cambiar el precio de costo de un producto el cual está asociado a movimientos de stock.\n"
+"Para actualizar el costo debe utilizar el asistente \"Actualizar precio de costo\"."
 
 msgctxt "error:product.update_cost_price:"
 msgid "The stock account and the counterpart can not be the same account"
 msgstr ""
+"La cuenta de inventario y la de contrapartida no pueden ser la misma cuenta"
 
 msgctxt "field:account.configuration,cost_price_counterpart_account:"
 msgid "Cost Price Counterpart Account"
-msgstr ""
+msgstr "Cuenta contrapartida del precio de costo"
 
 msgctxt "field:account.configuration,stock_journal:"
 msgid "Stock Journal"
+msgstr "Libro diario de inventario"
+
+msgctxt "field:account.configuration.cost_price_counterpart_account,company:"
+msgid "Company"
+msgstr ""
+
+msgctxt ""
+"field:account.configuration.cost_price_counterpart_account,cost_price_counterpart_account:"
+msgid "Cost Price Counterpart Account"
+msgstr "Cuenta contrapartida del precio de costo"
+
+msgctxt ""
+"field:account.configuration.cost_price_counterpart_account,create_date:"
+msgid "Create Date"
+msgstr ""
+
+msgctxt ""
+"field:account.configuration.cost_price_counterpart_account,create_uid:"
+msgid "Create User"
+msgstr ""
+
+msgctxt "field:account.configuration.cost_price_counterpart_account,id:"
+msgid "ID"
+msgstr ""
+
+msgctxt "field:account.configuration.cost_price_counterpart_account,rec_name:"
+msgid "Name"
+msgstr ""
+
+msgctxt ""
+"field:account.configuration.cost_price_counterpart_account,write_date:"
+msgid "Write Date"
+msgstr ""
+
+msgctxt ""
+"field:account.configuration.cost_price_counterpart_account,write_uid:"
+msgid "Write User"
+msgstr ""
+
+msgctxt "field:account.configuration.stock_journal,create_date:"
+msgid "Create Date"
+msgstr ""
+
+msgctxt "field:account.configuration.stock_journal,create_uid:"
+msgid "Create User"
+msgstr ""
+
+msgctxt "field:account.configuration.stock_journal,id:"
+msgid "ID"
+msgstr ""
+
+msgctxt "field:account.configuration.stock_journal,rec_name:"
+msgid "Name"
+msgstr ""
+
+msgctxt "field:account.configuration.stock_journal,stock_journal:"
+msgid "Stock Journal"
+msgstr "Libro diario de inventario"
+
+msgctxt "field:account.configuration.stock_journal,write_date:"
+msgid "Write Date"
+msgstr ""
+
+msgctxt "field:account.configuration.stock_journal,write_uid:"
+msgid "Write User"
 msgstr ""
 
 msgctxt "field:account.fiscalyear,account_stock_method:"
 msgid "Account Stock Method"
-msgstr ""
+msgstr "Método de contabilización de inventario"
 
 msgctxt "field:product.category,account_stock:"
 msgid "Account Stock"
@@ -60,8 +128,29 @@ msgctxt "field:product.category,account_stock_supplier_used:"
 msgid "Account Stock Supplier Used"
 msgstr ""
 
+#, fuzzy
 msgctxt "field:product.category,account_stock_used:"
 msgid "Account Stock Used"
+msgstr "Método de contabilización de inventario"
+
+msgctxt "field:product.category.account,account_stock:"
+msgid "Account Stock"
+msgstr ""
+
+msgctxt "field:product.category.account,account_stock_customer:"
+msgid "Account Stock Customer"
+msgstr ""
+
+msgctxt "field:product.category.account,account_stock_lost_found:"
+msgid "Account Stock Lost and Found"
+msgstr ""
+
+msgctxt "field:product.category.account,account_stock_production:"
+msgid "Account Stock Production"
+msgstr ""
+
+msgctxt "field:product.category.account,account_stock_supplier:"
+msgid "Account Stock Supplier"
 msgstr ""
 
 msgctxt "field:product.product,account_stock:"
@@ -100,9 +189,10 @@ msgctxt "field:product.product,account_stock_supplier_used:"
 msgid "Account Stock Supplier Used"
 msgstr ""
 
+#, fuzzy
 msgctxt "field:product.product,account_stock_used:"
 msgid "Account Stock Used"
-msgstr ""
+msgstr "Método de contabilización de inventario"
 
 msgctxt "field:product.template,account_stock:"
 msgid "Account Stock"
@@ -140,13 +230,34 @@ msgctxt "field:product.template,account_stock_supplier_used:"
 msgid "Account Stock Supplier Used"
 msgstr ""
 
+#, fuzzy
 msgctxt "field:product.template,account_stock_used:"
 msgid "Account Stock Used"
+msgstr "Método de contabilización de inventario"
+
+msgctxt "field:product.template.account,account_stock:"
+msgid "Account Stock"
+msgstr ""
+
+msgctxt "field:product.template.account,account_stock_customer:"
+msgid "Account Stock Customer"
+msgstr ""
+
+msgctxt "field:product.template.account,account_stock_lost_found:"
+msgid "Account Stock Lost and Found"
+msgstr ""
+
+msgctxt "field:product.template.account,account_stock_production:"
+msgid "Account Stock Production"
+msgstr ""
+
+msgctxt "field:product.template.account,account_stock_supplier:"
+msgid "Account Stock Supplier"
 msgstr ""
 
 msgctxt "field:product.update_cost_price.ask,cost_price:"
 msgid "Cost Price"
-msgstr ""
+msgstr "Precio de costo"
 
 msgctxt "field:product.update_cost_price.ask,id:"
 msgid "ID"
@@ -182,7 +293,7 @@ msgstr ""
 
 msgctxt "field:product.update_cost_price.show_move,journal:"
 msgid "Journal"
-msgstr ""
+msgstr "Libro diario"
 
 msgctxt "field:product.update_cost_price.show_move,price_difference:"
 msgid "Price Difference"
@@ -232,18 +343,25 @@ msgctxt "help:product.template,account_stock_supplier:"
 msgid "This account will be used instead of the one defined on the category."
 msgstr ""
 
+msgctxt "model:account.configuration.cost_price_counterpart_account,name:"
+msgid "Account Configuration Cost Price Counterpart Account"
+msgstr "Configuración de cuenta de la contrapartida del precio de costo"
+
+msgctxt "model:account.configuration.stock_journal,name:"
+msgid "Account Configuration Stock Journal"
+msgstr "Configuración del diario de existencias"
+
 msgctxt "model:ir.action,name:wizard_update_cost_price"
 msgid "Update Cost Price"
-msgstr "Update Cost Price"
+msgstr "Actualizar precio de costo"
 
-#, fuzzy
 msgctxt "model:product.update_cost_price.ask,name:"
 msgid "Update Cost Price Ask"
-msgstr "Update Cost Price"
+msgstr "Solicitar actualizar precio de costo"
 
 msgctxt "model:product.update_cost_price.show_move,name:"
 msgid "Update Cost Price Show Move"
-msgstr ""
+msgstr "Actualizar precio de costo - Mostrar asiento"
 
 msgctxt "selection:account.fiscalyear,account_stock_method:"
 msgid "Continental"
diff --git a/locale/fr.po b/locale/fr.po
index dd3a4ba..3d1aa48 100644
--- a/locale/fr.po
+++ b/locale/fr.po
@@ -22,6 +22,71 @@ msgctxt "field:account.configuration,stock_journal:"
 msgid "Stock Journal"
 msgstr "Journal de stock"
 
+msgctxt "field:account.configuration.cost_price_counterpart_account,company:"
+msgid "Company"
+msgstr "Société"
+
+msgctxt ""
+"field:account.configuration.cost_price_counterpart_account,cost_price_counterpart_account:"
+msgid "Cost Price Counterpart Account"
+msgstr "Compte de contrepartie du prix de revient"
+
+msgctxt ""
+"field:account.configuration.cost_price_counterpart_account,create_date:"
+msgid "Create Date"
+msgstr "Date de création"
+
+msgctxt ""
+"field:account.configuration.cost_price_counterpart_account,create_uid:"
+msgid "Create User"
+msgstr "Créé par"
+
+msgctxt "field:account.configuration.cost_price_counterpart_account,id:"
+msgid "ID"
+msgstr "ID"
+
+msgctxt "field:account.configuration.cost_price_counterpart_account,rec_name:"
+msgid "Name"
+msgstr "Nom"
+
+msgctxt ""
+"field:account.configuration.cost_price_counterpart_account,write_date:"
+msgid "Write Date"
+msgstr "Date de mise à jour"
+
+msgctxt ""
+"field:account.configuration.cost_price_counterpart_account,write_uid:"
+msgid "Write User"
+msgstr "Mis à jour par"
+
+msgctxt "field:account.configuration.stock_journal,create_date:"
+msgid "Create Date"
+msgstr "Date de création"
+
+msgctxt "field:account.configuration.stock_journal,create_uid:"
+msgid "Create User"
+msgstr "Créé par"
+
+msgctxt "field:account.configuration.stock_journal,id:"
+msgid "ID"
+msgstr "ID"
+
+msgctxt "field:account.configuration.stock_journal,rec_name:"
+msgid "Name"
+msgstr "Nom"
+
+msgctxt "field:account.configuration.stock_journal,stock_journal:"
+msgid "Stock Journal"
+msgstr "Journal de stock"
+
+msgctxt "field:account.configuration.stock_journal,write_date:"
+msgid "Write Date"
+msgstr "Date de mise à jour"
+
+msgctxt "field:account.configuration.stock_journal,write_uid:"
+msgid "Write User"
+msgstr "Mis à jour par"
+
 msgctxt "field:account.fiscalyear,account_stock_method:"
 msgid "Account Stock Method"
 msgstr "Méthode de comptabilité de stock"
@@ -40,11 +105,11 @@ msgstr "Compte de stock client utilisé"
 
 msgctxt "field:product.category,account_stock_lost_found:"
 msgid "Account Stock Lost and Found"
-msgstr "Compte de stock « pertes et surplus »"
+msgstr "Compte de stock de pertes et surplus"
 
 msgctxt "field:product.category,account_stock_lost_found_used:"
 msgid "Account Stock Lost and Found"
-msgstr "Compte de stock « pertes et surplus »"
+msgstr "Compte de stock de pertes et surplus"
 
 msgctxt "field:product.category,account_stock_production:"
 msgid "Account Stock Production"
@@ -66,6 +131,26 @@ msgctxt "field:product.category,account_stock_used:"
 msgid "Account Stock Used"
 msgstr "Compte de stock utilisé"
 
+msgctxt "field:product.category.account,account_stock:"
+msgid "Account Stock"
+msgstr "Compte de stock"
+
+msgctxt "field:product.category.account,account_stock_customer:"
+msgid "Account Stock Customer"
+msgstr "Compte de stock client"
+
+msgctxt "field:product.category.account,account_stock_lost_found:"
+msgid "Account Stock Lost and Found"
+msgstr "Compte de stock de pertes et surplus"
+
+msgctxt "field:product.category.account,account_stock_production:"
+msgid "Account Stock Production"
+msgstr "Compte de stock de production"
+
+msgctxt "field:product.category.account,account_stock_supplier:"
+msgid "Account Stock Supplier"
+msgstr "Compte de stock fournisseur"
+
 msgctxt "field:product.product,account_stock:"
 msgid "Account Stock"
 msgstr "Compte de stock"
@@ -80,11 +165,11 @@ msgstr "Compte de stock client utilisé"
 
 msgctxt "field:product.product,account_stock_lost_found:"
 msgid "Account Stock Lost and Found"
-msgstr "Compte de stock « pertes et surplus »"
+msgstr "Compte de stock de pertes et surplus"
 
 msgctxt "field:product.product,account_stock_lost_found_used:"
 msgid "Account Stock Lost and Found"
-msgstr "Compte de stock « pertes et surplus »"
+msgstr "Compte de stock de pertes et surplus"
 
 msgctxt "field:product.product,account_stock_production:"
 msgid "Account Stock Production"
@@ -120,11 +205,11 @@ msgstr "Compte de stock client utilisé"
 
 msgctxt "field:product.template,account_stock_lost_found:"
 msgid "Account Stock Lost and Found"
-msgstr "Compte de stock « pertes et surplus »"
+msgstr "Compte de stock de pertes et surplus"
 
 msgctxt "field:product.template,account_stock_lost_found_used:"
 msgid "Account Stock Lost and Found"
-msgstr "Compte de stock « pertes et surplus »"
+msgstr "Compte de stock de pertes et surplus"
 
 msgctxt "field:product.template,account_stock_production:"
 msgid "Account Stock Production"
@@ -146,6 +231,26 @@ msgctxt "field:product.template,account_stock_used:"
 msgid "Account Stock Used"
 msgstr "Compte de stock utilisé"
 
+msgctxt "field:product.template.account,account_stock:"
+msgid "Account Stock"
+msgstr "Compte de stock"
+
+msgctxt "field:product.template.account,account_stock_customer:"
+msgid "Account Stock Customer"
+msgstr "Compte de stock client"
+
+msgctxt "field:product.template.account,account_stock_lost_found:"
+msgid "Account Stock Lost and Found"
+msgstr "Compte de stock de pertes et surplus"
+
+msgctxt "field:product.template.account,account_stock_production:"
+msgid "Account Stock Production"
+msgstr "Compte de stock de production"
+
+msgctxt "field:product.template.account,account_stock_supplier:"
+msgid "Account Stock Supplier"
+msgstr "Compte de stock fournisseur"
+
 msgctxt "field:product.update_cost_price.ask,cost_price:"
 msgid "Cost Price"
 msgstr "Prix de revient"
@@ -234,6 +339,14 @@ msgctxt "help:product.template,account_stock_supplier:"
 msgid "This account will be used instead of the one defined on the category."
 msgstr "Ce compte sera utilisé au lieu de celui défini sur la catégorie."
 
+msgctxt "model:account.configuration.cost_price_counterpart_account,name:"
+msgid "Account Configuration Cost Price Counterpart Account"
+msgstr "Configuration comptable Compte de contrepartie du prix de revient"
+
+msgctxt "model:account.configuration.stock_journal,name:"
+msgid "Account Configuration Stock Journal"
+msgstr "Configuration comptable Journal de stock"
+
 msgctxt "model:ir.action,name:wizard_update_cost_price"
 msgid "Update Cost Price"
 msgstr "Mise à jour du prix de revient"
diff --git a/locale/hu_HU.po b/locale/hu_HU.po
index 64f18c1..06a6fbb 100644
--- a/locale/hu_HU.po
+++ b/locale/hu_HU.po
@@ -20,6 +20,73 @@ msgctxt "field:account.configuration,stock_journal:"
 msgid "Stock Journal"
 msgstr ""
 
+msgctxt "field:account.configuration.cost_price_counterpart_account,company:"
+msgid "Company"
+msgstr ""
+
+msgctxt ""
+"field:account.configuration.cost_price_counterpart_account,cost_price_counterpart_account:"
+msgid "Cost Price Counterpart Account"
+msgstr ""
+
+msgctxt ""
+"field:account.configuration.cost_price_counterpart_account,create_date:"
+msgid "Create Date"
+msgstr ""
+
+msgctxt ""
+"field:account.configuration.cost_price_counterpart_account,create_uid:"
+msgid "Create User"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:account.configuration.cost_price_counterpart_account,id:"
+msgid "ID"
+msgstr "ID"
+
+msgctxt "field:account.configuration.cost_price_counterpart_account,rec_name:"
+msgid "Name"
+msgstr ""
+
+msgctxt ""
+"field:account.configuration.cost_price_counterpart_account,write_date:"
+msgid "Write Date"
+msgstr ""
+
+msgctxt ""
+"field:account.configuration.cost_price_counterpart_account,write_uid:"
+msgid "Write User"
+msgstr ""
+
+msgctxt "field:account.configuration.stock_journal,create_date:"
+msgid "Create Date"
+msgstr ""
+
+msgctxt "field:account.configuration.stock_journal,create_uid:"
+msgid "Create User"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:account.configuration.stock_journal,id:"
+msgid "ID"
+msgstr "ID"
+
+msgctxt "field:account.configuration.stock_journal,rec_name:"
+msgid "Name"
+msgstr ""
+
+msgctxt "field:account.configuration.stock_journal,stock_journal:"
+msgid "Stock Journal"
+msgstr ""
+
+msgctxt "field:account.configuration.stock_journal,write_date:"
+msgid "Write Date"
+msgstr ""
+
+msgctxt "field:account.configuration.stock_journal,write_uid:"
+msgid "Write User"
+msgstr ""
+
 msgctxt "field:account.fiscalyear,account_stock_method:"
 msgid "Account Stock Method"
 msgstr ""
@@ -64,6 +131,26 @@ msgctxt "field:product.category,account_stock_used:"
 msgid "Account Stock Used"
 msgstr ""
 
+msgctxt "field:product.category.account,account_stock:"
+msgid "Account Stock"
+msgstr ""
+
+msgctxt "field:product.category.account,account_stock_customer:"
+msgid "Account Stock Customer"
+msgstr ""
+
+msgctxt "field:product.category.account,account_stock_lost_found:"
+msgid "Account Stock Lost and Found"
+msgstr ""
+
+msgctxt "field:product.category.account,account_stock_production:"
+msgid "Account Stock Production"
+msgstr ""
+
+msgctxt "field:product.category.account,account_stock_supplier:"
+msgid "Account Stock Supplier"
+msgstr ""
+
 msgctxt "field:product.product,account_stock:"
 msgid "Account Stock"
 msgstr ""
@@ -144,6 +231,26 @@ msgctxt "field:product.template,account_stock_used:"
 msgid "Account Stock Used"
 msgstr ""
 
+msgctxt "field:product.template.account,account_stock:"
+msgid "Account Stock"
+msgstr ""
+
+msgctxt "field:product.template.account,account_stock_customer:"
+msgid "Account Stock Customer"
+msgstr ""
+
+msgctxt "field:product.template.account,account_stock_lost_found:"
+msgid "Account Stock Lost and Found"
+msgstr ""
+
+msgctxt "field:product.template.account,account_stock_production:"
+msgid "Account Stock Production"
+msgstr ""
+
+msgctxt "field:product.template.account,account_stock_supplier:"
+msgid "Account Stock Supplier"
+msgstr ""
+
 #, fuzzy
 msgctxt "field:product.update_cost_price.ask,cost_price:"
 msgid "Cost Price"
@@ -237,6 +344,14 @@ msgctxt "help:product.template,account_stock_supplier:"
 msgid "This account will be used instead of the one defined on the category."
 msgstr ""
 
+msgctxt "model:account.configuration.cost_price_counterpart_account,name:"
+msgid "Account Configuration Cost Price Counterpart Account"
+msgstr ""
+
+msgctxt "model:account.configuration.stock_journal,name:"
+msgid "Account Configuration Stock Journal"
+msgstr ""
+
 msgctxt "model:ir.action,name:wizard_update_cost_price"
 msgid "Update Cost Price"
 msgstr ""
diff --git a/locale/it_IT.po b/locale/it_IT.po
index 3b00409..48f6416 100644
--- a/locale/it_IT.po
+++ b/locale/it_IT.po
@@ -23,6 +23,75 @@ msgctxt "field:account.configuration,stock_journal:"
 msgid "Stock Journal"
 msgstr "Registro di magazzino"
 
+msgctxt "field:account.configuration.cost_price_counterpart_account,company:"
+msgid "Company"
+msgstr ""
+
+#, fuzzy
+msgctxt ""
+"field:account.configuration.cost_price_counterpart_account,cost_price_counterpart_account:"
+msgid "Cost Price Counterpart Account"
+msgstr "Contropartita del conto di costo."
+
+msgctxt ""
+"field:account.configuration.cost_price_counterpart_account,create_date:"
+msgid "Create Date"
+msgstr ""
+
+msgctxt ""
+"field:account.configuration.cost_price_counterpart_account,create_uid:"
+msgid "Create User"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:account.configuration.cost_price_counterpart_account,id:"
+msgid "ID"
+msgstr "Movimento contabile"
+
+msgctxt "field:account.configuration.cost_price_counterpart_account,rec_name:"
+msgid "Name"
+msgstr ""
+
+msgctxt ""
+"field:account.configuration.cost_price_counterpart_account,write_date:"
+msgid "Write Date"
+msgstr ""
+
+msgctxt ""
+"field:account.configuration.cost_price_counterpart_account,write_uid:"
+msgid "Write User"
+msgstr ""
+
+msgctxt "field:account.configuration.stock_journal,create_date:"
+msgid "Create Date"
+msgstr ""
+
+msgctxt "field:account.configuration.stock_journal,create_uid:"
+msgid "Create User"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:account.configuration.stock_journal,id:"
+msgid "ID"
+msgstr "Movimento contabile"
+
+msgctxt "field:account.configuration.stock_journal,rec_name:"
+msgid "Name"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:account.configuration.stock_journal,stock_journal:"
+msgid "Stock Journal"
+msgstr "Registro di magazzino"
+
+msgctxt "field:account.configuration.stock_journal,write_date:"
+msgid "Write Date"
+msgstr ""
+
+msgctxt "field:account.configuration.stock_journal,write_uid:"
+msgid "Write User"
+msgstr ""
+
 msgctxt "field:account.fiscalyear,account_stock_method:"
 msgid "Account Stock Method"
 msgstr "Metodo contabile del magazzino"
@@ -63,13 +132,36 @@ msgctxt "field:product.category,account_stock_supplier_used:"
 msgid "Account Stock Supplier Used"
 msgstr ""
 
+#, fuzzy
 msgctxt "field:product.category,account_stock_used:"
 msgid "Account Stock Used"
+msgstr "Metodo contabile del magazzino"
+
+#, fuzzy
+msgctxt "field:product.category.account,account_stock:"
+msgid "Account Stock"
+msgstr "Conto di magazzino"
+
+msgctxt "field:product.category.account,account_stock_customer:"
+msgid "Account Stock Customer"
+msgstr ""
+
+msgctxt "field:product.category.account,account_stock_lost_found:"
+msgid "Account Stock Lost and Found"
+msgstr ""
+
+msgctxt "field:product.category.account,account_stock_production:"
+msgid "Account Stock Production"
+msgstr ""
+
+msgctxt "field:product.category.account,account_stock_supplier:"
+msgid "Account Stock Supplier"
 msgstr ""
 
+#, fuzzy
 msgctxt "field:product.product,account_stock:"
 msgid "Account Stock"
-msgstr ""
+msgstr "Conto di magazzino"
 
 msgctxt "field:product.product,account_stock_customer:"
 msgid "Account Stock Customer"
@@ -103,13 +195,15 @@ msgctxt "field:product.product,account_stock_supplier_used:"
 msgid "Account Stock Supplier Used"
 msgstr ""
 
+#, fuzzy
 msgctxt "field:product.product,account_stock_used:"
 msgid "Account Stock Used"
-msgstr ""
+msgstr "Metodo contabile del magazzino"
 
+#, fuzzy
 msgctxt "field:product.template,account_stock:"
 msgid "Account Stock"
-msgstr ""
+msgstr "Conto di magazzino"
 
 msgctxt "field:product.template,account_stock_customer:"
 msgid "Account Stock Customer"
@@ -143,8 +237,30 @@ msgctxt "field:product.template,account_stock_supplier_used:"
 msgid "Account Stock Supplier Used"
 msgstr ""
 
+#, fuzzy
 msgctxt "field:product.template,account_stock_used:"
 msgid "Account Stock Used"
+msgstr "Metodo contabile del magazzino"
+
+#, fuzzy
+msgctxt "field:product.template.account,account_stock:"
+msgid "Account Stock"
+msgstr "Conto di magazzino"
+
+msgctxt "field:product.template.account,account_stock_customer:"
+msgid "Account Stock Customer"
+msgstr ""
+
+msgctxt "field:product.template.account,account_stock_lost_found:"
+msgid "Account Stock Lost and Found"
+msgstr ""
+
+msgctxt "field:product.template.account,account_stock_production:"
+msgid "Account Stock Production"
+msgstr ""
+
+msgctxt "field:product.template.account,account_stock_supplier:"
+msgid "Account Stock Supplier"
 msgstr ""
 
 msgctxt "field:product.update_cost_price.ask,cost_price:"
@@ -247,6 +363,14 @@ msgid "This account will be used instead of the one defined on the category."
 msgstr ""
 "Questo conto verrà utilizzato al posto di quello definito per la categoria"
 
+msgctxt "model:account.configuration.cost_price_counterpart_account,name:"
+msgid "Account Configuration Cost Price Counterpart Account"
+msgstr ""
+
+msgctxt "model:account.configuration.stock_journal,name:"
+msgid "Account Configuration Stock Journal"
+msgstr ""
+
 msgctxt "model:ir.action,name:wizard_update_cost_price"
 msgid "Update Cost Price"
 msgstr ""
@@ -271,9 +395,10 @@ msgctxt "view:account.configuration:"
 msgid "Stock"
 msgstr ""
 
+#, fuzzy
 msgctxt "view:account.fiscalyear:"
 msgid "Account Stock"
-msgstr ""
+msgstr "Conto di magazzino"
 
 msgctxt "wizard_button:product.update_cost_price,ask_price,end:"
 msgid "Cancel"
diff --git a/locale/ja_JP.po b/locale/ja_JP.po
index 646610b..0fdbeff 100644
--- a/locale/ja_JP.po
+++ b/locale/ja_JP.po
@@ -20,6 +20,71 @@ msgctxt "field:account.configuration,stock_journal:"
 msgid "Stock Journal"
 msgstr ""
 
+msgctxt "field:account.configuration.cost_price_counterpart_account,company:"
+msgid "Company"
+msgstr ""
+
+msgctxt ""
+"field:account.configuration.cost_price_counterpart_account,cost_price_counterpart_account:"
+msgid "Cost Price Counterpart Account"
+msgstr ""
+
+msgctxt ""
+"field:account.configuration.cost_price_counterpart_account,create_date:"
+msgid "Create Date"
+msgstr ""
+
+msgctxt ""
+"field:account.configuration.cost_price_counterpart_account,create_uid:"
+msgid "Create User"
+msgstr ""
+
+msgctxt "field:account.configuration.cost_price_counterpart_account,id:"
+msgid "ID"
+msgstr ""
+
+msgctxt "field:account.configuration.cost_price_counterpart_account,rec_name:"
+msgid "Name"
+msgstr ""
+
+msgctxt ""
+"field:account.configuration.cost_price_counterpart_account,write_date:"
+msgid "Write Date"
+msgstr ""
+
+msgctxt ""
+"field:account.configuration.cost_price_counterpart_account,write_uid:"
+msgid "Write User"
+msgstr ""
+
+msgctxt "field:account.configuration.stock_journal,create_date:"
+msgid "Create Date"
+msgstr ""
+
+msgctxt "field:account.configuration.stock_journal,create_uid:"
+msgid "Create User"
+msgstr ""
+
+msgctxt "field:account.configuration.stock_journal,id:"
+msgid "ID"
+msgstr ""
+
+msgctxt "field:account.configuration.stock_journal,rec_name:"
+msgid "Name"
+msgstr ""
+
+msgctxt "field:account.configuration.stock_journal,stock_journal:"
+msgid "Stock Journal"
+msgstr ""
+
+msgctxt "field:account.configuration.stock_journal,write_date:"
+msgid "Write Date"
+msgstr ""
+
+msgctxt "field:account.configuration.stock_journal,write_uid:"
+msgid "Write User"
+msgstr ""
+
 msgctxt "field:account.fiscalyear,account_stock_method:"
 msgid "Account Stock Method"
 msgstr ""
@@ -64,6 +129,26 @@ msgctxt "field:product.category,account_stock_used:"
 msgid "Account Stock Used"
 msgstr ""
 
+msgctxt "field:product.category.account,account_stock:"
+msgid "Account Stock"
+msgstr ""
+
+msgctxt "field:product.category.account,account_stock_customer:"
+msgid "Account Stock Customer"
+msgstr ""
+
+msgctxt "field:product.category.account,account_stock_lost_found:"
+msgid "Account Stock Lost and Found"
+msgstr ""
+
+msgctxt "field:product.category.account,account_stock_production:"
+msgid "Account Stock Production"
+msgstr ""
+
+msgctxt "field:product.category.account,account_stock_supplier:"
+msgid "Account Stock Supplier"
+msgstr ""
+
 msgctxt "field:product.product,account_stock:"
 msgid "Account Stock"
 msgstr ""
@@ -144,6 +229,26 @@ msgctxt "field:product.template,account_stock_used:"
 msgid "Account Stock Used"
 msgstr ""
 
+msgctxt "field:product.template.account,account_stock:"
+msgid "Account Stock"
+msgstr ""
+
+msgctxt "field:product.template.account,account_stock_customer:"
+msgid "Account Stock Customer"
+msgstr ""
+
+msgctxt "field:product.template.account,account_stock_lost_found:"
+msgid "Account Stock Lost and Found"
+msgstr ""
+
+msgctxt "field:product.template.account,account_stock_production:"
+msgid "Account Stock Production"
+msgstr ""
+
+msgctxt "field:product.template.account,account_stock_supplier:"
+msgid "Account Stock Supplier"
+msgstr ""
+
 msgctxt "field:product.update_cost_price.ask,cost_price:"
 msgid "Cost Price"
 msgstr ""
@@ -232,6 +337,14 @@ msgctxt "help:product.template,account_stock_supplier:"
 msgid "This account will be used instead of the one defined on the category."
 msgstr ""
 
+msgctxt "model:account.configuration.cost_price_counterpart_account,name:"
+msgid "Account Configuration Cost Price Counterpart Account"
+msgstr ""
+
+msgctxt "model:account.configuration.stock_journal,name:"
+msgid "Account Configuration Stock Journal"
+msgstr ""
+
 msgctxt "model:ir.action,name:wizard_update_cost_price"
 msgid "Update Cost Price"
 msgstr "Update Cost Price"
diff --git a/locale/lo.po b/locale/lo.po
index 21241aa..ed2446a 100644
--- a/locale/lo.po
+++ b/locale/lo.po
@@ -20,6 +20,73 @@ msgctxt "field:account.configuration,stock_journal:"
 msgid "Stock Journal"
 msgstr ""
 
+msgctxt "field:account.configuration.cost_price_counterpart_account,company:"
+msgid "Company"
+msgstr ""
+
+msgctxt ""
+"field:account.configuration.cost_price_counterpart_account,cost_price_counterpart_account:"
+msgid "Cost Price Counterpart Account"
+msgstr ""
+
+msgctxt ""
+"field:account.configuration.cost_price_counterpart_account,create_date:"
+msgid "Create Date"
+msgstr ""
+
+msgctxt ""
+"field:account.configuration.cost_price_counterpart_account,create_uid:"
+msgid "Create User"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:account.configuration.cost_price_counterpart_account,id:"
+msgid "ID"
+msgstr "ເລດລຳດັບ"
+
+msgctxt "field:account.configuration.cost_price_counterpart_account,rec_name:"
+msgid "Name"
+msgstr ""
+
+msgctxt ""
+"field:account.configuration.cost_price_counterpart_account,write_date:"
+msgid "Write Date"
+msgstr ""
+
+msgctxt ""
+"field:account.configuration.cost_price_counterpart_account,write_uid:"
+msgid "Write User"
+msgstr ""
+
+msgctxt "field:account.configuration.stock_journal,create_date:"
+msgid "Create Date"
+msgstr ""
+
+msgctxt "field:account.configuration.stock_journal,create_uid:"
+msgid "Create User"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:account.configuration.stock_journal,id:"
+msgid "ID"
+msgstr "ເລດລຳດັບ"
+
+msgctxt "field:account.configuration.stock_journal,rec_name:"
+msgid "Name"
+msgstr ""
+
+msgctxt "field:account.configuration.stock_journal,stock_journal:"
+msgid "Stock Journal"
+msgstr ""
+
+msgctxt "field:account.configuration.stock_journal,write_date:"
+msgid "Write Date"
+msgstr ""
+
+msgctxt "field:account.configuration.stock_journal,write_uid:"
+msgid "Write User"
+msgstr ""
+
 msgctxt "field:account.fiscalyear,account_stock_method:"
 msgid "Account Stock Method"
 msgstr ""
@@ -64,6 +131,26 @@ msgctxt "field:product.category,account_stock_used:"
 msgid "Account Stock Used"
 msgstr ""
 
+msgctxt "field:product.category.account,account_stock:"
+msgid "Account Stock"
+msgstr ""
+
+msgctxt "field:product.category.account,account_stock_customer:"
+msgid "Account Stock Customer"
+msgstr ""
+
+msgctxt "field:product.category.account,account_stock_lost_found:"
+msgid "Account Stock Lost and Found"
+msgstr ""
+
+msgctxt "field:product.category.account,account_stock_production:"
+msgid "Account Stock Production"
+msgstr ""
+
+msgctxt "field:product.category.account,account_stock_supplier:"
+msgid "Account Stock Supplier"
+msgstr ""
+
 msgctxt "field:product.product,account_stock:"
 msgid "Account Stock"
 msgstr ""
@@ -144,6 +231,26 @@ msgctxt "field:product.template,account_stock_used:"
 msgid "Account Stock Used"
 msgstr ""
 
+msgctxt "field:product.template.account,account_stock:"
+msgid "Account Stock"
+msgstr ""
+
+msgctxt "field:product.template.account,account_stock_customer:"
+msgid "Account Stock Customer"
+msgstr ""
+
+msgctxt "field:product.template.account,account_stock_lost_found:"
+msgid "Account Stock Lost and Found"
+msgstr ""
+
+msgctxt "field:product.template.account,account_stock_production:"
+msgid "Account Stock Production"
+msgstr ""
+
+msgctxt "field:product.template.account,account_stock_supplier:"
+msgid "Account Stock Supplier"
+msgstr ""
+
 #, fuzzy
 msgctxt "field:product.update_cost_price.ask,cost_price:"
 msgid "Cost Price"
@@ -250,6 +357,14 @@ msgctxt "help:product.template,account_stock_supplier:"
 msgid "This account will be used instead of the one defined on the category."
 msgstr "ບັນຊີນີ້ຈະໃຊ້ແທນໃຫ້ບັນຊີໂຕທີ່ມີໃນໝວດນັ້ນ."
 
+msgctxt "model:account.configuration.cost_price_counterpart_account,name:"
+msgid "Account Configuration Cost Price Counterpart Account"
+msgstr ""
+
+msgctxt "model:account.configuration.stock_journal,name:"
+msgid "Account Configuration Stock Journal"
+msgstr ""
+
 msgctxt "model:ir.action,name:wizard_update_cost_price"
 msgid "Update Cost Price"
 msgstr ""
diff --git a/locale/lt.po b/locale/lt.po
index 7d59ca7..c447aa5 100644
--- a/locale/lt.po
+++ b/locale/lt.po
@@ -20,6 +20,71 @@ msgctxt "field:account.configuration,stock_journal:"
 msgid "Stock Journal"
 msgstr ""
 
+msgctxt "field:account.configuration.cost_price_counterpart_account,company:"
+msgid "Company"
+msgstr ""
+
+msgctxt ""
+"field:account.configuration.cost_price_counterpart_account,cost_price_counterpart_account:"
+msgid "Cost Price Counterpart Account"
+msgstr ""
+
+msgctxt ""
+"field:account.configuration.cost_price_counterpart_account,create_date:"
+msgid "Create Date"
+msgstr ""
+
+msgctxt ""
+"field:account.configuration.cost_price_counterpart_account,create_uid:"
+msgid "Create User"
+msgstr ""
+
+msgctxt "field:account.configuration.cost_price_counterpart_account,id:"
+msgid "ID"
+msgstr ""
+
+msgctxt "field:account.configuration.cost_price_counterpart_account,rec_name:"
+msgid "Name"
+msgstr ""
+
+msgctxt ""
+"field:account.configuration.cost_price_counterpart_account,write_date:"
+msgid "Write Date"
+msgstr ""
+
+msgctxt ""
+"field:account.configuration.cost_price_counterpart_account,write_uid:"
+msgid "Write User"
+msgstr ""
+
+msgctxt "field:account.configuration.stock_journal,create_date:"
+msgid "Create Date"
+msgstr ""
+
+msgctxt "field:account.configuration.stock_journal,create_uid:"
+msgid "Create User"
+msgstr ""
+
+msgctxt "field:account.configuration.stock_journal,id:"
+msgid "ID"
+msgstr ""
+
+msgctxt "field:account.configuration.stock_journal,rec_name:"
+msgid "Name"
+msgstr ""
+
+msgctxt "field:account.configuration.stock_journal,stock_journal:"
+msgid "Stock Journal"
+msgstr ""
+
+msgctxt "field:account.configuration.stock_journal,write_date:"
+msgid "Write Date"
+msgstr ""
+
+msgctxt "field:account.configuration.stock_journal,write_uid:"
+msgid "Write User"
+msgstr ""
+
 msgctxt "field:account.fiscalyear,account_stock_method:"
 msgid "Account Stock Method"
 msgstr ""
@@ -64,6 +129,26 @@ msgctxt "field:product.category,account_stock_used:"
 msgid "Account Stock Used"
 msgstr ""
 
+msgctxt "field:product.category.account,account_stock:"
+msgid "Account Stock"
+msgstr ""
+
+msgctxt "field:product.category.account,account_stock_customer:"
+msgid "Account Stock Customer"
+msgstr ""
+
+msgctxt "field:product.category.account,account_stock_lost_found:"
+msgid "Account Stock Lost and Found"
+msgstr ""
+
+msgctxt "field:product.category.account,account_stock_production:"
+msgid "Account Stock Production"
+msgstr ""
+
+msgctxt "field:product.category.account,account_stock_supplier:"
+msgid "Account Stock Supplier"
+msgstr ""
+
 msgctxt "field:product.product,account_stock:"
 msgid "Account Stock"
 msgstr ""
@@ -144,6 +229,26 @@ msgctxt "field:product.template,account_stock_used:"
 msgid "Account Stock Used"
 msgstr ""
 
+msgctxt "field:product.template.account,account_stock:"
+msgid "Account Stock"
+msgstr ""
+
+msgctxt "field:product.template.account,account_stock_customer:"
+msgid "Account Stock Customer"
+msgstr ""
+
+msgctxt "field:product.template.account,account_stock_lost_found:"
+msgid "Account Stock Lost and Found"
+msgstr ""
+
+msgctxt "field:product.template.account,account_stock_production:"
+msgid "Account Stock Production"
+msgstr ""
+
+msgctxt "field:product.template.account,account_stock_supplier:"
+msgid "Account Stock Supplier"
+msgstr ""
+
 msgctxt "field:product.update_cost_price.ask,cost_price:"
 msgid "Cost Price"
 msgstr ""
@@ -232,6 +337,14 @@ msgctxt "help:product.template,account_stock_supplier:"
 msgid "This account will be used instead of the one defined on the category."
 msgstr ""
 
+msgctxt "model:account.configuration.cost_price_counterpart_account,name:"
+msgid "Account Configuration Cost Price Counterpart Account"
+msgstr ""
+
+msgctxt "model:account.configuration.stock_journal,name:"
+msgid "Account Configuration Stock Journal"
+msgstr ""
+
 msgctxt "model:ir.action,name:wizard_update_cost_price"
 msgid "Update Cost Price"
 msgstr ""
diff --git a/locale/nl.po b/locale/nl.po
index 73c0d39..7137d13 100644
--- a/locale/nl.po
+++ b/locale/nl.po
@@ -20,6 +20,73 @@ msgctxt "field:account.configuration,stock_journal:"
 msgid "Stock Journal"
 msgstr ""
 
+msgctxt "field:account.configuration.cost_price_counterpart_account,company:"
+msgid "Company"
+msgstr ""
+
+msgctxt ""
+"field:account.configuration.cost_price_counterpart_account,cost_price_counterpart_account:"
+msgid "Cost Price Counterpart Account"
+msgstr ""
+
+msgctxt ""
+"field:account.configuration.cost_price_counterpart_account,create_date:"
+msgid "Create Date"
+msgstr ""
+
+msgctxt ""
+"field:account.configuration.cost_price_counterpart_account,create_uid:"
+msgid "Create User"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:account.configuration.cost_price_counterpart_account,id:"
+msgid "ID"
+msgstr "ID"
+
+msgctxt "field:account.configuration.cost_price_counterpart_account,rec_name:"
+msgid "Name"
+msgstr ""
+
+msgctxt ""
+"field:account.configuration.cost_price_counterpart_account,write_date:"
+msgid "Write Date"
+msgstr ""
+
+msgctxt ""
+"field:account.configuration.cost_price_counterpart_account,write_uid:"
+msgid "Write User"
+msgstr ""
+
+msgctxt "field:account.configuration.stock_journal,create_date:"
+msgid "Create Date"
+msgstr ""
+
+msgctxt "field:account.configuration.stock_journal,create_uid:"
+msgid "Create User"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:account.configuration.stock_journal,id:"
+msgid "ID"
+msgstr "ID"
+
+msgctxt "field:account.configuration.stock_journal,rec_name:"
+msgid "Name"
+msgstr ""
+
+msgctxt "field:account.configuration.stock_journal,stock_journal:"
+msgid "Stock Journal"
+msgstr ""
+
+msgctxt "field:account.configuration.stock_journal,write_date:"
+msgid "Write Date"
+msgstr ""
+
+msgctxt "field:account.configuration.stock_journal,write_uid:"
+msgid "Write User"
+msgstr ""
+
 msgctxt "field:account.fiscalyear,account_stock_method:"
 msgid "Account Stock Method"
 msgstr ""
@@ -64,6 +131,26 @@ msgctxt "field:product.category,account_stock_used:"
 msgid "Account Stock Used"
 msgstr ""
 
+msgctxt "field:product.category.account,account_stock:"
+msgid "Account Stock"
+msgstr ""
+
+msgctxt "field:product.category.account,account_stock_customer:"
+msgid "Account Stock Customer"
+msgstr ""
+
+msgctxt "field:product.category.account,account_stock_lost_found:"
+msgid "Account Stock Lost and Found"
+msgstr ""
+
+msgctxt "field:product.category.account,account_stock_production:"
+msgid "Account Stock Production"
+msgstr ""
+
+msgctxt "field:product.category.account,account_stock_supplier:"
+msgid "Account Stock Supplier"
+msgstr ""
+
 msgctxt "field:product.product,account_stock:"
 msgid "Account Stock"
 msgstr ""
@@ -144,6 +231,26 @@ msgctxt "field:product.template,account_stock_used:"
 msgid "Account Stock Used"
 msgstr ""
 
+msgctxt "field:product.template.account,account_stock:"
+msgid "Account Stock"
+msgstr ""
+
+msgctxt "field:product.template.account,account_stock_customer:"
+msgid "Account Stock Customer"
+msgstr ""
+
+msgctxt "field:product.template.account,account_stock_lost_found:"
+msgid "Account Stock Lost and Found"
+msgstr ""
+
+msgctxt "field:product.template.account,account_stock_production:"
+msgid "Account Stock Production"
+msgstr ""
+
+msgctxt "field:product.template.account,account_stock_supplier:"
+msgid "Account Stock Supplier"
+msgstr ""
+
 #, fuzzy
 msgctxt "field:product.update_cost_price.ask,cost_price:"
 msgid "Cost Price"
@@ -261,6 +368,14 @@ msgid "This account will be used instead of the one defined on the category."
 msgstr ""
 "Deze rekening zal gebruikt worden in de plaats van die van de categorie."
 
+msgctxt "model:account.configuration.cost_price_counterpart_account,name:"
+msgid "Account Configuration Cost Price Counterpart Account"
+msgstr ""
+
+msgctxt "model:account.configuration.stock_journal,name:"
+msgid "Account Configuration Stock Journal"
+msgstr ""
+
 msgctxt "model:ir.action,name:wizard_update_cost_price"
 msgid "Update Cost Price"
 msgstr ""
diff --git a/locale/pl.po b/locale/pl.po
index 646610b..0fdbeff 100644
--- a/locale/pl.po
+++ b/locale/pl.po
@@ -20,6 +20,71 @@ msgctxt "field:account.configuration,stock_journal:"
 msgid "Stock Journal"
 msgstr ""
 
+msgctxt "field:account.configuration.cost_price_counterpart_account,company:"
+msgid "Company"
+msgstr ""
+
+msgctxt ""
+"field:account.configuration.cost_price_counterpart_account,cost_price_counterpart_account:"
+msgid "Cost Price Counterpart Account"
+msgstr ""
+
+msgctxt ""
+"field:account.configuration.cost_price_counterpart_account,create_date:"
+msgid "Create Date"
+msgstr ""
+
+msgctxt ""
+"field:account.configuration.cost_price_counterpart_account,create_uid:"
+msgid "Create User"
+msgstr ""
+
+msgctxt "field:account.configuration.cost_price_counterpart_account,id:"
+msgid "ID"
+msgstr ""
+
+msgctxt "field:account.configuration.cost_price_counterpart_account,rec_name:"
+msgid "Name"
+msgstr ""
+
+msgctxt ""
+"field:account.configuration.cost_price_counterpart_account,write_date:"
+msgid "Write Date"
+msgstr ""
+
+msgctxt ""
+"field:account.configuration.cost_price_counterpart_account,write_uid:"
+msgid "Write User"
+msgstr ""
+
+msgctxt "field:account.configuration.stock_journal,create_date:"
+msgid "Create Date"
+msgstr ""
+
+msgctxt "field:account.configuration.stock_journal,create_uid:"
+msgid "Create User"
+msgstr ""
+
+msgctxt "field:account.configuration.stock_journal,id:"
+msgid "ID"
+msgstr ""
+
+msgctxt "field:account.configuration.stock_journal,rec_name:"
+msgid "Name"
+msgstr ""
+
+msgctxt "field:account.configuration.stock_journal,stock_journal:"
+msgid "Stock Journal"
+msgstr ""
+
+msgctxt "field:account.configuration.stock_journal,write_date:"
+msgid "Write Date"
+msgstr ""
+
+msgctxt "field:account.configuration.stock_journal,write_uid:"
+msgid "Write User"
+msgstr ""
+
 msgctxt "field:account.fiscalyear,account_stock_method:"
 msgid "Account Stock Method"
 msgstr ""
@@ -64,6 +129,26 @@ msgctxt "field:product.category,account_stock_used:"
 msgid "Account Stock Used"
 msgstr ""
 
+msgctxt "field:product.category.account,account_stock:"
+msgid "Account Stock"
+msgstr ""
+
+msgctxt "field:product.category.account,account_stock_customer:"
+msgid "Account Stock Customer"
+msgstr ""
+
+msgctxt "field:product.category.account,account_stock_lost_found:"
+msgid "Account Stock Lost and Found"
+msgstr ""
+
+msgctxt "field:product.category.account,account_stock_production:"
+msgid "Account Stock Production"
+msgstr ""
+
+msgctxt "field:product.category.account,account_stock_supplier:"
+msgid "Account Stock Supplier"
+msgstr ""
+
 msgctxt "field:product.product,account_stock:"
 msgid "Account Stock"
 msgstr ""
@@ -144,6 +229,26 @@ msgctxt "field:product.template,account_stock_used:"
 msgid "Account Stock Used"
 msgstr ""
 
+msgctxt "field:product.template.account,account_stock:"
+msgid "Account Stock"
+msgstr ""
+
+msgctxt "field:product.template.account,account_stock_customer:"
+msgid "Account Stock Customer"
+msgstr ""
+
+msgctxt "field:product.template.account,account_stock_lost_found:"
+msgid "Account Stock Lost and Found"
+msgstr ""
+
+msgctxt "field:product.template.account,account_stock_production:"
+msgid "Account Stock Production"
+msgstr ""
+
+msgctxt "field:product.template.account,account_stock_supplier:"
+msgid "Account Stock Supplier"
+msgstr ""
+
 msgctxt "field:product.update_cost_price.ask,cost_price:"
 msgid "Cost Price"
 msgstr ""
@@ -232,6 +337,14 @@ msgctxt "help:product.template,account_stock_supplier:"
 msgid "This account will be used instead of the one defined on the category."
 msgstr ""
 
+msgctxt "model:account.configuration.cost_price_counterpart_account,name:"
+msgid "Account Configuration Cost Price Counterpart Account"
+msgstr ""
+
+msgctxt "model:account.configuration.stock_journal,name:"
+msgid "Account Configuration Stock Journal"
+msgstr ""
+
 msgctxt "model:ir.action,name:wizard_update_cost_price"
 msgid "Update Cost Price"
 msgstr "Update Cost Price"
diff --git a/locale/pt_BR.po b/locale/pt_BR.po
index 6685b89..0f435b8 100644
--- a/locale/pt_BR.po
+++ b/locale/pt_BR.po
@@ -22,6 +22,71 @@ msgctxt "field:account.configuration,stock_journal:"
 msgid "Stock Journal"
 msgstr "Diário de Estoque"
 
+msgctxt "field:account.configuration.cost_price_counterpart_account,company:"
+msgid "Company"
+msgstr "Empresa"
+
+msgctxt ""
+"field:account.configuration.cost_price_counterpart_account,cost_price_counterpart_account:"
+msgid "Cost Price Counterpart Account"
+msgstr "Conta de Contrapartida de Preço de Custo"
+
+msgctxt ""
+"field:account.configuration.cost_price_counterpart_account,create_date:"
+msgid "Create Date"
+msgstr "Data de criação"
+
+msgctxt ""
+"field:account.configuration.cost_price_counterpart_account,create_uid:"
+msgid "Create User"
+msgstr "Criado por"
+
+msgctxt "field:account.configuration.cost_price_counterpart_account,id:"
+msgid "ID"
+msgstr "ID"
+
+msgctxt "field:account.configuration.cost_price_counterpart_account,rec_name:"
+msgid "Name"
+msgstr "Nome"
+
+msgctxt ""
+"field:account.configuration.cost_price_counterpart_account,write_date:"
+msgid "Write Date"
+msgstr "Data de edição"
+
+msgctxt ""
+"field:account.configuration.cost_price_counterpart_account,write_uid:"
+msgid "Write User"
+msgstr "Editado por"
+
+msgctxt "field:account.configuration.stock_journal,create_date:"
+msgid "Create Date"
+msgstr "Data de criação"
+
+msgctxt "field:account.configuration.stock_journal,create_uid:"
+msgid "Create User"
+msgstr "Criado por"
+
+msgctxt "field:account.configuration.stock_journal,id:"
+msgid "ID"
+msgstr "ID"
+
+msgctxt "field:account.configuration.stock_journal,rec_name:"
+msgid "Name"
+msgstr "Nome"
+
+msgctxt "field:account.configuration.stock_journal,stock_journal:"
+msgid "Stock Journal"
+msgstr "Diário de Estoque"
+
+msgctxt "field:account.configuration.stock_journal,write_date:"
+msgid "Write Date"
+msgstr "Data de edição"
+
+msgctxt "field:account.configuration.stock_journal,write_uid:"
+msgid "Write User"
+msgstr "Editado por"
+
 msgctxt "field:account.fiscalyear,account_stock_method:"
 msgid "Account Stock Method"
 msgstr "Método de Contabilização de Estoque"
@@ -66,52 +131,62 @@ msgctxt "field:product.category,account_stock_used:"
 msgid "Account Stock Used"
 msgstr "Conta de Estoque Utilizada"
 
-#, fuzzy
+msgctxt "field:product.category.account,account_stock:"
+msgid "Account Stock"
+msgstr "Conta de Estoque"
+
+msgctxt "field:product.category.account,account_stock_customer:"
+msgid "Account Stock Customer"
+msgstr "Conta de Estoque do Cliente"
+
+msgctxt "field:product.category.account,account_stock_lost_found:"
+msgid "Account Stock Lost and Found"
+msgstr "Conta de Estoque de Achados e Perdidos"
+
+msgctxt "field:product.category.account,account_stock_production:"
+msgid "Account Stock Production"
+msgstr "Conta de Estoque de Produção"
+
+msgctxt "field:product.category.account,account_stock_supplier:"
+msgid "Account Stock Supplier"
+msgstr "Conta de Estoque do Fornecedor"
+
 msgctxt "field:product.product,account_stock:"
 msgid "Account Stock"
 msgstr "Conta de Estoque"
 
-#, fuzzy
 msgctxt "field:product.product,account_stock_customer:"
 msgid "Account Stock Customer"
 msgstr "Conta de Estoque do Cliente"
 
-#, fuzzy
 msgctxt "field:product.product,account_stock_customer_used:"
 msgid "Account Stock Customer Used"
-msgstr "Conta de Estoque do Cliente Utilizada"
+msgstr "Conta de Estoque Utilizada do Cliente"
 
-#, fuzzy
 msgctxt "field:product.product,account_stock_lost_found:"
 msgid "Account Stock Lost and Found"
 msgstr "Conta de Estoque de Achados e Perdidos"
 
-#, fuzzy
 msgctxt "field:product.product,account_stock_lost_found_used:"
 msgid "Account Stock Lost and Found"
 msgstr "Conta de Estoque de Achados e Perdidos"
 
-#, fuzzy
 msgctxt "field:product.product,account_stock_production:"
 msgid "Account Stock Production"
 msgstr "Conta de Estoque de Produção"
 
-#, fuzzy
 msgctxt "field:product.product,account_stock_production_used:"
 msgid "Account Stock Production Used"
-msgstr "Conta de Estoque de Produção Utilizada"
+msgstr "Conta de Estoque Utilizada para Produção"
 
-#, fuzzy
 msgctxt "field:product.product,account_stock_supplier:"
 msgid "Account Stock Supplier"
-msgstr "Conta de Estoque de Fornecedor"
+msgstr "Conta de Estoque do Fornecedor"
 
-#, fuzzy
 msgctxt "field:product.product,account_stock_supplier_used:"
 msgid "Account Stock Supplier Used"
-msgstr "Conta de Estoque de Fornecedor Utilizada"
+msgstr "Conta de Estoque Utilizada do Fornecedor"
 
-#, fuzzy
 msgctxt "field:product.product,account_stock_used:"
 msgid "Account Stock Used"
 msgstr "Conta de Estoque Utilizada"
@@ -156,6 +231,26 @@ msgctxt "field:product.template,account_stock_used:"
 msgid "Account Stock Used"
 msgstr "Conta de Estoque Utilizada"
 
+msgctxt "field:product.template.account,account_stock:"
+msgid "Account Stock"
+msgstr "Conta de Estoque"
+
+msgctxt "field:product.template.account,account_stock_customer:"
+msgid "Account Stock Customer"
+msgstr "Conta de Estoque do Cliente"
+
+msgctxt "field:product.template.account,account_stock_lost_found:"
+msgid "Account Stock Lost and Found"
+msgstr "Conta de Estoque de Achados e Perdidos"
+
+msgctxt "field:product.template.account,account_stock_production:"
+msgid "Account Stock Production"
+msgstr "Conta de Estoque de Produção"
+
+msgctxt "field:product.template.account,account_stock_supplier:"
+msgid "Account Stock Supplier"
+msgstr "Conta de Estoque do Fornecedor"
+
 msgctxt "field:product.update_cost_price.ask,cost_price:"
 msgid "Cost Price"
 msgstr "Preço de custo"
@@ -204,27 +299,22 @@ msgctxt "field:product.update_cost_price.show_move,stock_account:"
 msgid "Stock Account"
 msgstr "Conta de Estoque"
 
-#, fuzzy
 msgctxt "help:product.product,account_stock:"
 msgid "This account will be used instead of the one defined on the category."
 msgstr "Esta conta será utilizada no lugar daquela definida na categoria."
 
-#, fuzzy
 msgctxt "help:product.product,account_stock_customer:"
 msgid "This account will be used instead of the one defined on the category."
 msgstr "Esta conta será utilizada no lugar daquela definida na categoria."
 
-#, fuzzy
 msgctxt "help:product.product,account_stock_lost_found:"
 msgid "This account will be used instead of the one defined on the category."
 msgstr "Esta conta será utilizada no lugar daquela definida na categoria."
 
-#, fuzzy
 msgctxt "help:product.product,account_stock_production:"
 msgid "This account will be used instead of the one defined on the category."
 msgstr "Esta conta será utilizada no lugar daquela definida na categoria."
 
-#, fuzzy
 msgctxt "help:product.product,account_stock_supplier:"
 msgid "This account will be used instead of the one defined on the category."
 msgstr "Esta conta será utilizada no lugar daquela definida na categoria."
@@ -249,6 +339,15 @@ msgctxt "help:product.template,account_stock_supplier:"
 msgid "This account will be used instead of the one defined on the category."
 msgstr "Esta conta será utilizada no lugar daquela definida na categoria."
 
+msgctxt "model:account.configuration.cost_price_counterpart_account,name:"
+msgid "Account Configuration Cost Price Counterpart Account"
+msgstr ""
+"Configurações de Contabilidade Preço de Custo da Conta de Contrapartida"
+
+msgctxt "model:account.configuration.stock_journal,name:"
+msgid "Account Configuration Stock Journal"
+msgstr "Configurações de Contabilidade Diário de Estoque"
+
 msgctxt "model:ir.action,name:wizard_update_cost_price"
 msgid "Update Cost Price"
 msgstr "Atualizar Preço de Custo"
@@ -271,7 +370,7 @@ msgstr "Nenhum"
 
 msgctxt "view:account.configuration:"
 msgid "Stock"
-msgstr ""
+msgstr "Estoque"
 
 msgctxt "view:account.fiscalyear:"
 msgid "Account Stock"
diff --git a/locale/ru.po b/locale/ru.po
index ef3812a..ca882f4 100644
--- a/locale/ru.po
+++ b/locale/ru.po
@@ -20,6 +20,73 @@ msgctxt "field:account.configuration,stock_journal:"
 msgid "Stock Journal"
 msgstr ""
 
+msgctxt "field:account.configuration.cost_price_counterpart_account,company:"
+msgid "Company"
+msgstr ""
+
+msgctxt ""
+"field:account.configuration.cost_price_counterpart_account,cost_price_counterpart_account:"
+msgid "Cost Price Counterpart Account"
+msgstr ""
+
+msgctxt ""
+"field:account.configuration.cost_price_counterpart_account,create_date:"
+msgid "Create Date"
+msgstr ""
+
+msgctxt ""
+"field:account.configuration.cost_price_counterpart_account,create_uid:"
+msgid "Create User"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:account.configuration.cost_price_counterpart_account,id:"
+msgid "ID"
+msgstr "ID"
+
+msgctxt "field:account.configuration.cost_price_counterpart_account,rec_name:"
+msgid "Name"
+msgstr ""
+
+msgctxt ""
+"field:account.configuration.cost_price_counterpart_account,write_date:"
+msgid "Write Date"
+msgstr ""
+
+msgctxt ""
+"field:account.configuration.cost_price_counterpart_account,write_uid:"
+msgid "Write User"
+msgstr ""
+
+msgctxt "field:account.configuration.stock_journal,create_date:"
+msgid "Create Date"
+msgstr ""
+
+msgctxt "field:account.configuration.stock_journal,create_uid:"
+msgid "Create User"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:account.configuration.stock_journal,id:"
+msgid "ID"
+msgstr "ID"
+
+msgctxt "field:account.configuration.stock_journal,rec_name:"
+msgid "Name"
+msgstr ""
+
+msgctxt "field:account.configuration.stock_journal,stock_journal:"
+msgid "Stock Journal"
+msgstr ""
+
+msgctxt "field:account.configuration.stock_journal,write_date:"
+msgid "Write Date"
+msgstr ""
+
+msgctxt "field:account.configuration.stock_journal,write_uid:"
+msgid "Write User"
+msgstr ""
+
 msgctxt "field:account.fiscalyear,account_stock_method:"
 msgid "Account Stock Method"
 msgstr ""
@@ -64,6 +131,26 @@ msgctxt "field:product.category,account_stock_used:"
 msgid "Account Stock Used"
 msgstr ""
 
+msgctxt "field:product.category.account,account_stock:"
+msgid "Account Stock"
+msgstr ""
+
+msgctxt "field:product.category.account,account_stock_customer:"
+msgid "Account Stock Customer"
+msgstr ""
+
+msgctxt "field:product.category.account,account_stock_lost_found:"
+msgid "Account Stock Lost and Found"
+msgstr ""
+
+msgctxt "field:product.category.account,account_stock_production:"
+msgid "Account Stock Production"
+msgstr ""
+
+msgctxt "field:product.category.account,account_stock_supplier:"
+msgid "Account Stock Supplier"
+msgstr ""
+
 msgctxt "field:product.product,account_stock:"
 msgid "Account Stock"
 msgstr ""
@@ -144,6 +231,26 @@ msgctxt "field:product.template,account_stock_used:"
 msgid "Account Stock Used"
 msgstr ""
 
+msgctxt "field:product.template.account,account_stock:"
+msgid "Account Stock"
+msgstr ""
+
+msgctxt "field:product.template.account,account_stock_customer:"
+msgid "Account Stock Customer"
+msgstr ""
+
+msgctxt "field:product.template.account,account_stock_lost_found:"
+msgid "Account Stock Lost and Found"
+msgstr ""
+
+msgctxt "field:product.template.account,account_stock_production:"
+msgid "Account Stock Production"
+msgstr ""
+
+msgctxt "field:product.template.account,account_stock_supplier:"
+msgid "Account Stock Supplier"
+msgstr ""
+
 #, fuzzy
 msgctxt "field:product.update_cost_price.ask,cost_price:"
 msgid "Cost Price"
@@ -251,6 +358,14 @@ msgctxt "help:product.template,account_stock_supplier:"
 msgid "This account will be used instead of the one defined on the category."
 msgstr "Этот счет будет использован вместо указанного в категории."
 
+msgctxt "model:account.configuration.cost_price_counterpart_account,name:"
+msgid "Account Configuration Cost Price Counterpart Account"
+msgstr ""
+
+msgctxt "model:account.configuration.stock_journal,name:"
+msgid "Account Configuration Stock Journal"
+msgstr ""
+
 msgctxt "model:ir.action,name:wizard_update_cost_price"
 msgid "Update Cost Price"
 msgstr ""
diff --git a/locale/sl.po b/locale/sl.po
index f062d4e..53a905d 100644
--- a/locale/sl.po
+++ b/locale/sl.po
@@ -22,6 +22,71 @@ msgctxt "field:account.configuration,stock_journal:"
 msgid "Stock Journal"
 msgstr "Dnevnik zaloge"
 
+msgctxt "field:account.configuration.cost_price_counterpart_account,company:"
+msgid "Company"
+msgstr "Družba"
+
+msgctxt ""
+"field:account.configuration.cost_price_counterpart_account,cost_price_counterpart_account:"
+msgid "Cost Price Counterpart Account"
+msgstr "Protikonto nabavne cene"
+
+msgctxt ""
+"field:account.configuration.cost_price_counterpart_account,create_date:"
+msgid "Create Date"
+msgstr "Izdelano"
+
+msgctxt ""
+"field:account.configuration.cost_price_counterpart_account,create_uid:"
+msgid "Create User"
+msgstr "Izdelal"
+
+msgctxt "field:account.configuration.cost_price_counterpart_account,id:"
+msgid "ID"
+msgstr "ID"
+
+msgctxt "field:account.configuration.cost_price_counterpart_account,rec_name:"
+msgid "Name"
+msgstr "Ime"
+
+msgctxt ""
+"field:account.configuration.cost_price_counterpart_account,write_date:"
+msgid "Write Date"
+msgstr "Zapisano"
+
+msgctxt ""
+"field:account.configuration.cost_price_counterpart_account,write_uid:"
+msgid "Write User"
+msgstr "Zapisal"
+
+msgctxt "field:account.configuration.stock_journal,create_date:"
+msgid "Create Date"
+msgstr "Izdelano"
+
+msgctxt "field:account.configuration.stock_journal,create_uid:"
+msgid "Create User"
+msgstr "Izdelal"
+
+msgctxt "field:account.configuration.stock_journal,id:"
+msgid "ID"
+msgstr "ID"
+
+msgctxt "field:account.configuration.stock_journal,rec_name:"
+msgid "Name"
+msgstr "Ime"
+
+msgctxt "field:account.configuration.stock_journal,stock_journal:"
+msgid "Stock Journal"
+msgstr "Dnevnik zaloge"
+
+msgctxt "field:account.configuration.stock_journal,write_date:"
+msgid "Write Date"
+msgstr "Zapisano"
+
+msgctxt "field:account.configuration.stock_journal,write_uid:"
+msgid "Write User"
+msgstr "Zapisal"
+
 msgctxt "field:account.fiscalyear,account_stock_method:"
 msgid "Account Stock Method"
 msgstr "Način vodenja zaloge"
@@ -66,6 +131,26 @@ msgctxt "field:product.category,account_stock_used:"
 msgid "Account Stock Used"
 msgstr "Uporabljen konto zaloge"
 
+msgctxt "field:product.category.account,account_stock:"
+msgid "Account Stock"
+msgstr "Konto zaloge"
+
+msgctxt "field:product.category.account,account_stock_customer:"
+msgid "Account Stock Customer"
+msgstr "Konto zaloge pri kupcu"
+
+msgctxt "field:product.category.account,account_stock_lost_found:"
+msgid "Account Stock Lost and Found"
+msgstr "Konto zaloge pri izgubljeno/najdeno"
+
+msgctxt "field:product.category.account,account_stock_production:"
+msgid "Account Stock Production"
+msgstr "Konto zaloge pri proizvodnji"
+
+msgctxt "field:product.category.account,account_stock_supplier:"
+msgid "Account Stock Supplier"
+msgstr "Konto zaloge pri dobavitelju"
+
 msgctxt "field:product.product,account_stock:"
 msgid "Account Stock"
 msgstr "Konto zaloge"
@@ -146,6 +231,26 @@ msgctxt "field:product.template,account_stock_used:"
 msgid "Account Stock Used"
 msgstr "Uporabljen konto zaloge"
 
+msgctxt "field:product.template.account,account_stock:"
+msgid "Account Stock"
+msgstr "Konto zaloge"
+
+msgctxt "field:product.template.account,account_stock_customer:"
+msgid "Account Stock Customer"
+msgstr "Konto zaloge pri kupcu"
+
+msgctxt "field:product.template.account,account_stock_lost_found:"
+msgid "Account Stock Lost and Found"
+msgstr "Konto zaloge pri izgubljeno/najdeno"
+
+msgctxt "field:product.template.account,account_stock_production:"
+msgid "Account Stock Production"
+msgstr "Konto zaloge pri proizvodnji"
+
+msgctxt "field:product.template.account,account_stock_supplier:"
+msgid "Account Stock Supplier"
+msgstr "Konto zaloge pri dobavitelju"
+
 msgctxt "field:product.update_cost_price.ask,cost_price:"
 msgid "Cost Price"
 msgstr "Nabavna cena"
@@ -234,6 +339,14 @@ msgctxt "help:product.template,account_stock_supplier:"
 msgid "This account will be used instead of the one defined on the category."
 msgstr "Namesto konta v kategoriji se bo uporabil ta konto prihodkov."
 
+msgctxt "model:account.configuration.cost_price_counterpart_account,name:"
+msgid "Account Configuration Cost Price Counterpart Account"
+msgstr "Konfiguracija protikonta nabavne cene"
+
+msgctxt "model:account.configuration.stock_journal,name:"
+msgid "Account Configuration Stock Journal"
+msgstr "Konfiguracija dnevnika zaloge"
+
 msgctxt "model:ir.action,name:wizard_update_cost_price"
 msgid "Update Cost Price"
 msgstr "Popravek nabavne cene"
diff --git a/locale/zh_CN.po b/locale/zh_CN.po
index 1671138..1705059 100644
--- a/locale/zh_CN.po
+++ b/locale/zh_CN.po
@@ -20,6 +20,73 @@ msgctxt "field:account.configuration,stock_journal:"
 msgid "Stock Journal"
 msgstr ""
 
+msgctxt "field:account.configuration.cost_price_counterpart_account,company:"
+msgid "Company"
+msgstr ""
+
+msgctxt ""
+"field:account.configuration.cost_price_counterpart_account,cost_price_counterpart_account:"
+msgid "Cost Price Counterpart Account"
+msgstr ""
+
+msgctxt ""
+"field:account.configuration.cost_price_counterpart_account,create_date:"
+msgid "Create Date"
+msgstr ""
+
+msgctxt ""
+"field:account.configuration.cost_price_counterpart_account,create_uid:"
+msgid "Create User"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:account.configuration.cost_price_counterpart_account,id:"
+msgid "ID"
+msgstr "编号"
+
+msgctxt "field:account.configuration.cost_price_counterpart_account,rec_name:"
+msgid "Name"
+msgstr ""
+
+msgctxt ""
+"field:account.configuration.cost_price_counterpart_account,write_date:"
+msgid "Write Date"
+msgstr ""
+
+msgctxt ""
+"field:account.configuration.cost_price_counterpart_account,write_uid:"
+msgid "Write User"
+msgstr ""
+
+msgctxt "field:account.configuration.stock_journal,create_date:"
+msgid "Create Date"
+msgstr ""
+
+msgctxt "field:account.configuration.stock_journal,create_uid:"
+msgid "Create User"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:account.configuration.stock_journal,id:"
+msgid "ID"
+msgstr "编号"
+
+msgctxt "field:account.configuration.stock_journal,rec_name:"
+msgid "Name"
+msgstr ""
+
+msgctxt "field:account.configuration.stock_journal,stock_journal:"
+msgid "Stock Journal"
+msgstr ""
+
+msgctxt "field:account.configuration.stock_journal,write_date:"
+msgid "Write Date"
+msgstr ""
+
+msgctxt "field:account.configuration.stock_journal,write_uid:"
+msgid "Write User"
+msgstr ""
+
 msgctxt "field:account.fiscalyear,account_stock_method:"
 msgid "Account Stock Method"
 msgstr ""
@@ -64,6 +131,26 @@ msgctxt "field:product.category,account_stock_used:"
 msgid "Account Stock Used"
 msgstr ""
 
+msgctxt "field:product.category.account,account_stock:"
+msgid "Account Stock"
+msgstr ""
+
+msgctxt "field:product.category.account,account_stock_customer:"
+msgid "Account Stock Customer"
+msgstr ""
+
+msgctxt "field:product.category.account,account_stock_lost_found:"
+msgid "Account Stock Lost and Found"
+msgstr ""
+
+msgctxt "field:product.category.account,account_stock_production:"
+msgid "Account Stock Production"
+msgstr ""
+
+msgctxt "field:product.category.account,account_stock_supplier:"
+msgid "Account Stock Supplier"
+msgstr ""
+
 msgctxt "field:product.product,account_stock:"
 msgid "Account Stock"
 msgstr ""
@@ -144,6 +231,26 @@ msgctxt "field:product.template,account_stock_used:"
 msgid "Account Stock Used"
 msgstr ""
 
+msgctxt "field:product.template.account,account_stock:"
+msgid "Account Stock"
+msgstr ""
+
+msgctxt "field:product.template.account,account_stock_customer:"
+msgid "Account Stock Customer"
+msgstr ""
+
+msgctxt "field:product.template.account,account_stock_lost_found:"
+msgid "Account Stock Lost and Found"
+msgstr ""
+
+msgctxt "field:product.template.account,account_stock_production:"
+msgid "Account Stock Production"
+msgstr ""
+
+msgctxt "field:product.template.account,account_stock_supplier:"
+msgid "Account Stock Supplier"
+msgstr ""
+
 msgctxt "field:product.update_cost_price.ask,cost_price:"
 msgid "Cost Price"
 msgstr ""
@@ -235,6 +342,14 @@ msgctxt "help:product.template,account_stock_supplier:"
 msgid "This account will be used instead of the one defined on the category."
 msgstr ""
 
+msgctxt "model:account.configuration.cost_price_counterpart_account,name:"
+msgid "Account Configuration Cost Price Counterpart Account"
+msgstr ""
+
+msgctxt "model:account.configuration.stock_journal,name:"
+msgid "Account Configuration Stock Journal"
+msgstr ""
+
 msgctxt "model:ir.action,name:wizard_update_cost_price"
 msgid "Update Cost Price"
 msgstr ""
diff --git a/product.py b/product.py
index d6e3ba0..585d50f 100644
--- a/product.py
+++ b/product.py
@@ -3,6 +3,7 @@
 from decimal import Decimal
 from functools import partial
 
+from trytond import backend
 from trytond.model import ModelView, fields
 from trytond.wizard import Wizard, StateView, StateTransition, Button
 from trytond.pyson import Eval
@@ -12,15 +13,20 @@ from trytond.pool import Pool, PoolMeta
 from trytond.modules.account_product import MissingFunction
 from trytond.modules.product import price_digits, TemplateFunction
 
-__all__ = ['Category', 'Template', 'Product', 'UpdateCostPriceAsk',
+__all__ = ['Category', 'CategoryAccount', 'Template', 'TemplateAccount',
+    'Product', 'UpdateCostPriceAsk',
     'UpdateCostPriceShowMove', 'UpdateCostPrice']
+account_names = [
+    'account_stock', 'account_stock_supplier', 'account_stock_customer',
+    'account_stock_production', 'account_stock_lost_found']
 
 
 class Category:
     __metaclass__ = PoolMeta
     __name__ = 'product.category'
-    account_stock = fields.Property(fields.Many2One('account.account',
-            'Account Stock', domain=[
+    account_stock = fields.MultiValue(fields.Many2One(
+            'account.account', "Account Stock",
+            domain=[
                 ('kind', '=', 'stock'),
                 ('company', '=', Eval('context', {}).get('company', -1)),
                 ],
@@ -30,8 +36,9 @@ class Category:
                     | ~Eval('accounting', False)),
                 },
             depends=['account_parent', 'accounting']))
-    account_stock_supplier = fields.Property(fields.Many2One('account.account',
-            'Account Stock Supplier', domain=[
+    account_stock_supplier = fields.MultiValue(fields.Many2One(
+            'account.account', "Account Stock Supplier",
+            domain=[
                 ('kind', '=', 'stock'),
                 ('company', '=', Eval('context', {}).get('company', -1)),
                 ],
@@ -41,8 +48,9 @@ class Category:
                     | ~Eval('accounting', False)),
                 },
             depends=['account_parent', 'accounting']))
-    account_stock_customer = fields.Property(fields.Many2One('account.account',
-            'Account Stock Customer', domain=[
+    account_stock_customer = fields.MultiValue(fields.Many2One(
+            'account.account', "Account Stock Customer",
+            domain=[
                 ('kind', '=', 'stock'),
                 ('company', '=', Eval('context', {}).get('company', -1)),
                 ],
@@ -52,9 +60,9 @@ class Category:
                     | ~Eval('accounting', False)),
                 },
             depends=['account_parent', 'accounting']))
-    account_stock_production = fields.Property(
-        fields.Many2One('account.account',
-            'Account Stock Production', domain=[
+    account_stock_production = fields.MultiValue(fields.Many2One(
+            'account.account', "Account Stock Production",
+            domain=[
                 ('kind', '=', 'stock'),
                 ('company', '=', Eval('context', {}).get('company', -1)),
                 ],
@@ -64,8 +72,9 @@ class Category:
                     | ~Eval('accounting', False)),
                 },
             depends=['account_parent', 'accounting']))
-    account_stock_lost_found = fields.Property(fields.Many2One(
-            'account.account', 'Account Stock Lost and Found', domain=[
+    account_stock_lost_found = fields.MultiValue(fields.Many2One(
+            'account.account', "Account Stock Lost and Found",
+            domain=[
                 ('kind', '=', 'stock'),
                 ('company', '=', Eval('context', {}).get('company', -1)),
                 ],
@@ -90,12 +99,80 @@ class Category:
         'account.account', 'Account Stock Lost and Found'),
         'missing_account', 'get_account')
 
+    @classmethod
+    def multivalue_model(cls, field):
+        pool = Pool()
+        if field in account_names:
+            return pool.get('product.category.account')
+        return super(Category, cls).multivalue_model(field)
+
+
+class CategoryAccount:
+    __metaclass__ = PoolMeta
+    __name__ = 'product.category.account'
+    account_stock = fields.Many2One(
+        'account.account', "Account Stock",
+        domain=[
+            ('kind', '=', 'stock'),
+            ('company', '=', Eval('company', -1)),
+            ],
+        depends=['company'])
+    account_stock_supplier = fields.Many2One(
+        'account.account', "Account Stock Supplier",
+        domain=[
+            ('kind', '=', 'stock'),
+            ('company', '=', Eval('company', -1)),
+            ],
+        depends=['company'])
+    account_stock_customer = fields.Many2One(
+        'account.account', "Account Stock Customer",
+        domain=[
+            ('kind', '=', 'stock'),
+            ('company', '=', Eval('company', -1)),
+            ],
+        depends=['company'])
+    account_stock_production = fields.Many2One(
+        'account.account', "Account Stock Production",
+        domain=[
+            ('kind', '=', 'stock'),
+            ('company', '=', Eval('company', -1)),
+            ],
+        depends=['company'])
+    account_stock_lost_found = fields.Many2One(
+        'account.account', "Account Stock Lost and Found",
+        domain=[
+            ('kind', '=', 'stock'),
+            ('company', '=', Eval('company', -1)),
+            ],
+        depends=['company'])
+
+    @classmethod
+    def __register__(cls, module_name):
+        TableHandler = backend.get('TableHandler')
+        exist = TableHandler.table_exist(cls._table)
+        if exist:
+            table = TableHandler(cls, module_name)
+            exist &= all(table.column_exist(c) for c in account_names)
+
+        super(CategoryAccount, cls).__register__(module_name)
+
+        if not exist:
+            # Re-migration
+            cls._migrate_property([], [], [])
+
+    @classmethod
+    def _migrate_property(cls, field_names, value_names, fields):
+        field_names.extend(account_names)
+        value_names.extend(account_names)
+        super(CategoryAccount, cls)._migrate_property(
+            field_names, value_names, fields)
+
 
 class Template:
     __metaclass__ = PoolMeta
     __name__ = 'product.template'
-    account_stock = fields.Property(fields.Many2One('account.account',
-            'Account Stock',
+    account_stock = fields.MultiValue(fields.Many2One(
+            'account.account', "Account Stock",
             domain=[
                 ('kind', '=', 'stock'),
                 ('company', '=', Eval('context', {}).get('company', -1)),
@@ -107,8 +184,8 @@ class Template:
                 }, help='This account will be used instead of the one defined '
             'on the category.',
             depends=['account_category', 'type']))
-    account_stock_supplier = fields.Property(fields.Many2One('account.account',
-            'Account Stock Supplier',
+    account_stock_supplier = fields.MultiValue(fields.Many2One(
+            'account.account', "Account Stock Supplier",
             domain=[
                 ('kind', '=', 'stock'),
                 ('company', '=', Eval('context', {}).get('company', -1)),
@@ -120,8 +197,8 @@ class Template:
                 }, help='This account will be used instead of the one defined '
             'on the category.',
             depends=['account_category', 'type']))
-    account_stock_customer = fields.Property(fields.Many2One('account.account',
-            'Account Stock Customer',
+    account_stock_customer = fields.MultiValue(fields.Many2One(
+            'account.account', "Account Stock Customer",
             domain=[
                 ('kind', '=', 'stock'),
                 ('company', '=', Eval('context', {}).get('company', -1)),
@@ -133,9 +210,8 @@ class Template:
                 }, help='This account will be used instead of the one defined '
             'on the category.',
             depends=['account_category', 'type']))
-    account_stock_production = fields.Property(
-        fields.Many2One('account.account',
-            'Account Stock Production',
+    account_stock_production = fields.MultiValue(fields.Many2One(
+            'account.account', "Account Stock Production",
             domain=[
                 ('kind', '=', 'stock'),
                 ('company', '=', Eval('context', {}).get('company', -1)),
@@ -147,7 +223,7 @@ class Template:
                 }, help='This account will be used instead of the one defined '
             'on the category.',
             depends=['account_category', 'type']))
-    account_stock_lost_found = fields.Property(fields.Many2One(
+    account_stock_lost_found = fields.MultiValue(fields.Many2One(
             'account.account', 'Account Stock Lost and Found',
             domain=[
                 ('kind', '=', 'stock'),
@@ -185,6 +261,74 @@ class Template:
                     'You must use the "Update Cost Price" wizard.'),
                 })
 
+    @classmethod
+    def multivalue_model(cls, field):
+        pool = Pool()
+        if field in account_names:
+            return pool.get('product.template.account')
+        return super(Template, cls).multivalue_model(field)
+
+
+class TemplateAccount:
+    __metaclass__ = PoolMeta
+    __name__ = 'product.template.account'
+    account_stock = fields.Many2One(
+        'account.account', "Account Stock",
+        domain=[
+            ('kind', '=', 'stock'),
+            ('company', '=', Eval('company', -1)),
+            ],
+        depends=['company'])
+    account_stock_supplier = fields.Many2One(
+        'account.account', "Account Stock Supplier",
+        domain=[
+            ('kind', '=', 'stock'),
+            ('company', '=', Eval('company', -1)),
+            ],
+        depends=['company'])
+    account_stock_customer = fields.Many2One(
+        'account.account', "Account Stock Customer",
+        domain=[
+            ('kind', '=', 'stock'),
+            ('company', '=', Eval('company', -1)),
+            ],
+        depends=['company'])
+    account_stock_production = fields.Many2One(
+        'account.account', "Account Stock Production",
+        domain=[
+            ('kind', '=', 'stock'),
+            ('company', '=', Eval('company', -1)),
+            ],
+        depends=['company'])
+    account_stock_lost_found = fields.Many2One(
+        'account.account', "Account Stock Lost and Found",
+        domain=[
+            ('kind', '=', 'stock'),
+            ('company', '=', Eval('company', -1)),
+            ],
+        depends=['company'])
+
+    @classmethod
+    def __register__(cls, module_name):
+        TableHandler = backend.get('TableHandler')
+        exist = TableHandler.table_exist(cls._table)
+        if exist:
+            table = TableHandler(cls, module_name)
+            exist &= all(table.column_exist(c) for c in account_names)
+
+        super(TemplateAccount, cls).__register__(module_name)
+
+        if not exist:
+            # Re-migration
+            cls._migrate_property([], [], [])
+
+    @classmethod
+    def _migrate_property(cls, field_names, value_names, fields):
+        field_names.extend(account_names)
+        value_names.extend(account_names)
+        super(TemplateAccount, cls)._migrate_property(
+            field_names, value_names, fields)
+
 
 class Product:
     __metaclass__ = PoolMeta
diff --git a/setup.py b/setup.py
index ad901b4..a1ec3d3 100644
--- a/setup.py
+++ b/setup.py
@@ -87,7 +87,7 @@ setup(name=name,
         'Intended Audience :: Developers',
         'Intended Audience :: Financial and Insurance Industry',
         'Intended Audience :: Legal Industry',
-        '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/tryton.cfg b/tryton.cfg
index df9af3d..40e4913 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
 [tryton]
-version=4.2.0
+version=4.4.0
 depends:
     account
     account_product
diff --git a/trytond_account_stock_continental.egg-info/PKG-INFO b/trytond_account_stock_continental.egg-info/PKG-INFO
index 0afb82a..69b6994 100644
--- a/trytond_account_stock_continental.egg-info/PKG-INFO
+++ b/trytond_account_stock_continental.egg-info/PKG-INFO
@@ -1,12 +1,12 @@
 Metadata-Version: 1.1
 Name: trytond-account-stock-continental
-Version: 4.2.0
+Version: 4.4.0
 Summary: Tryton module for continental real-time stock valuation
 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_account_stock_continental
         =================================
         
@@ -51,7 +51,7 @@ Classifier: Framework :: Tryton
 Classifier: Intended Audience :: Developers
 Classifier: Intended Audience :: Financial and Insurance Industry
 Classifier: Intended Audience :: Legal Industry
-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_account_stock_continental.egg-info/requires.txt b/trytond_account_stock_continental.egg-info/requires.txt
index 9472778..bffc184 100644
--- a/trytond_account_stock_continental.egg-info/requires.txt
+++ b/trytond_account_stock_continental.egg-info/requires.txt
@@ -1,4 +1,4 @@
-trytond_account >= 4.2, < 4.3
-trytond_account_product >= 4.2, < 4.3
-trytond_stock >= 4.2, < 4.3
-trytond >= 4.2, < 4.3
+trytond_account >= 4.4, < 4.5
+trytond_account_product >= 4.4, < 4.5
+trytond_stock >= 4.4, < 4.5
+trytond >= 4.4, < 4.5
-- 
tryton-modules-account-stock-continental