diff options
| author | Bhumi Thakkar (Open ERP) <bth@tinyerp.com> | 2012-09-05 16:01:36 +0530 |
|---|---|---|
| committer | Bhumi Thakkar (Open ERP) <bth@tinyerp.com> | 2012-09-05 16:01:36 +0530 |
| commit | dc331c76eeeba1c4f1dadb07a2c6ccbdef28ff6f (patch) | |
| tree | 77eab4077acea9debb7bbc9edbed2da964fc8510 | |
| parent | 2d6829b70ecbac0008aba3c525f9642733c43d82 (diff) | |
[IMP] If not journal_id then return {} and parent is removed.
bzr revid: bth@tinyerp.com-20120905103136-pp94j3xnb64c2edo
| -rw-r--r-- | addons/account/account_bank_statement.py | 2 | ||||
| -rw-r--r-- | addons/account_bank_statement_extensions/account_bank_statement_view.xml | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/addons/account/account_bank_statement.py b/addons/account/account_bank_statement.py index 8df291a98d1..85826e13b69 100644 --- a/addons/account/account_bank_statement.py +++ b/addons/account/account_bank_statement.py @@ -455,6 +455,8 @@ class account_bank_statement(osv.osv): return res and res[0] or 0.0 def onchange_journal_id(self, cr, uid, statement_id, journal_id, context=None): + if not journal_id: + return {} balance_start = self._compute_balance_end_real(cr, uid, journal_id, context=context) journal_data = self.pool.get('account.journal').read(cr, uid, journal_id, ['default_debit_account_id', 'company_id'], context=context) diff --git a/addons/account_bank_statement_extensions/account_bank_statement_view.xml b/addons/account_bank_statement_extensions/account_bank_statement_view.xml index 30b2778817c..1c076426752 100644 --- a/addons/account_bank_statement_extensions/account_bank_statement_view.xml +++ b/addons/account_bank_statement_extensions/account_bank_statement_view.xml @@ -76,7 +76,7 @@ <field name="ref" readonly="1"/> <field name="partner_id" on_change="onchange_partner_id(partner_id)"/> <field name="type" on_change="onchange_type(partner_id, type)"/> - <field name="account_id" domain="[('journal_id','=',parent.journal_id)]"/> + <field name="account_id" domain="[('journal_id','=',journal_id)]"/> <field name="analytic_account_id" groups="analytic.group_analytic_accounting" domain="[('company_id', '=', parent.company_id), ('type', '<>', 'view')]"/> <field name="amount" readonly="1" sum="Total Amount"/> <field name="globalisation_id" string="Glob. Id"/> @@ -100,7 +100,7 @@ <field name="ref" readonly="0"/> <field name="partner_id" on_change="onchange_partner_id(partner_id)"/> <field name="type" on_change="onchange_type(partner_id, type)"/> - <field domain="[('journal_id', '=', parent.journal_id), ('type', '<>', 'view')]" name="account_id"/> + <field domain="[('journal_id', '=', journal_id), ('type', '<>', 'view')]" name="account_id"/> <field name="analytic_account_id" groups="analytic.group_analytic_accounting" domain="[('company_id', '=', parent.company_id), ('type', '<>', 'view')]"/> <field name="amount"/> <field name="globalisation_id"/> |