diff --git a/addons/account/account_installer.xml b/addons/account/account_installer.xml index d3acde730a9..151f7bbc0f0 100644 --- a/addons/account/account_installer.xml +++ b/addons/account/account_installer.xml @@ -19,9 +19,9 @@ Configure - - 23 - + + 23 + @@ -52,7 +52,7 @@ - + @@ -82,7 +82,7 @@ 3 - special + automatic diff --git a/addons/account/configurable_account_chart.xml b/addons/account/configurable_account_chart.xml index fbae77349af..b2936955246 100644 --- a/addons/account/configurable_account_chart.xml +++ b/addons/account/configurable_account_chart.xml @@ -1,15 +1,14 @@ - - + Receivable receivable income unreconciled - + Payable payable expense @@ -43,7 +42,7 @@ liability - + Income income income @@ -591,15 +590,15 @@ - - - + + + - - - + + + @@ -617,7 +616,7 @@ Generate Chart of Accounts from a Chart Template - special + automatic diff --git a/addons/account/installer.py b/addons/account/installer.py index 764809d2cf0..1f16e066578 100644 --- a/addons/account/installer.py +++ b/addons/account/installer.py @@ -19,6 +19,7 @@ # ############################################################################## +import logging import time import datetime from dateutil.relativedelta import relativedelta @@ -33,6 +34,7 @@ import tools class account_installer(osv.osv_memory): _name = 'account.installer' _inherit = 'res.config.installer' + __logger = logging.getLogger(_name) def _get_charts(self, cr, uid, context=None): modules = self.pool.get('ir.module.module') @@ -232,9 +234,7 @@ class account_installer(osv.osv_memory): cr, uid, ids, context=context) chart = self.read(cr, uid, ids, ['charts'], context=context)[0]['charts'] - self.logger.notifyChannel( - 'installer', netsvc.LOG_DEBUG, - 'Installing chart of accounts %s'%chart) + self.__logger.debug('Installing chart of accounts %s', chart) return modules | set([chart]) account_installer() diff --git a/addons/account_analytic_plans/account_analytic_plans_installer_view.xml b/addons/account_analytic_plans/account_analytic_plans_installer_view.xml index 3543539debb..fa40ef1e618 100644 --- a/addons/account_analytic_plans/account_analytic_plans_installer_view.xml +++ b/addons/account_analytic_plans/account_analytic_plans_installer_view.xml @@ -1,4 +1,3 @@ - @@ -15,11 +14,7 @@ 15 - normal - skip - - diff --git a/addons/account_asset/account_asset_view.xml b/addons/account_asset/account_asset_view.xml index aa26fc79141..f9bbf551330 100644 --- a/addons/account_asset/account_asset_view.xml +++ b/addons/account_asset/account_asset_view.xml @@ -1,4 +1,3 @@ - @@ -14,29 +13,29 @@
- + - + - + - + - + @@ -100,28 +99,22 @@ - + -