diff --git a/__init__.py b/__init__.py
index 5f9a732282..5d56a6f147 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 c986257b02..daa6008cf5 100644
--- a/account.py
+++ b/account.py
@@ -1,25 +1,54 @@
 # 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')
+        return ModelData.get_id('account', 'journal_stock')
+
+
+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 ade9f12f21..add0fdf0f5 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/product.py b/product.py
index d6e3ba058d..585d50f601 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