diff --git a/addons/account/account.py b/addons/account/account.py index 3587a1e5424..5826aedb7e6 100755 --- a/addons/account/account.py +++ b/addons/account/account.py @@ -418,11 +418,11 @@ class account_account(osv.osv): c_ids = s_ids ids = child_ids return True - + def _check_type(self, cr, uid, ids, context=None): if context is None: - context = {} - accounts = self.browse(cr, uid, ids, context=context) + context = {} + accounts = self.browse(cr, uid, ids, context=context) for account in accounts: if account.child_id and account.type != 'view': return False @@ -430,7 +430,7 @@ class account_account(osv.osv): _constraints = [ (_check_recursion, 'Error ! You can not create recursive accounts.', ['parent_id']), - (_check_type, 'You cannot create a account! \nMake sure if the account has children then it should be type "View"! ', ['type']), + (_check_type, 'You cannot create an account! \nMake sure if the account has children then it should be type "View"! ', ['type']), ] _sql_constraints = [ ('code_company_uniq', 'unique (code,company_id)', 'The code of the account must be unique per company !') @@ -2307,8 +2307,8 @@ class account_account_template(osv.osv): def _check_type(self, cr, uid, ids, context=None): if context is None: - context = {} - accounts = self.browse(cr, uid, ids, context=context) + context = {} + accounts = self.browse(cr, uid, ids, context=context) for account in accounts: if account.parent_id and account.parent_id.type != 'view': return False @@ -2317,8 +2317,8 @@ class account_account_template(osv.osv): _check_recursion = check_cycle _constraints = [ (_check_recursion, 'Error ! You can not create recursive account templates.', ['parent_id']), - (_check_type, 'You cannot create a account template! \nMake sure if the account template has parent then it should be type "View"! ', ['type']), - + (_check_type, 'You cannot create an account template! \nMake sure if the account template has parent then it should be type "View"! ', ['type']), + ] def name_get(self, cr, uid, ids, context=None): diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml index d80d95a4bb8..f01c94a07ea 100755 --- a/addons/account/account_view.xml +++ b/addons/account/account_view.xml @@ -603,7 +603,7 @@ - account.bank.statement.form + account.bank.statement.reconcile.form account.bank.statement form @@ -1520,70 +1520,6 @@ - - account.bank.statement.form - account.bank.statement - - form - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - -