pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[REF] account :In balance sheet report wizard add reserve_account_id as per xrg patch

Browse Source 
bzr revid: ara@tinyerp.com-20101227100458-r09ksc03jkiaesin
This commit is contained in:
ARA (OpenERP)
2010-12-27 15:34:58 +05:30
parent 242616ebe8
commit 2210c4cd4e
2 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/account/wizard/account_report_balance_sheet.py
+4 -6
View File
@@ -34,8 +34,7 @@ class account_bs_report(osv.osv_memory):
def _get_def_reserve_account(self, cr, uid, context=None):
chart_id = self._get_account(cr, uid, context=context)
# Reuse the onchange function, for symmetry
res = self.onchange_chart_id(cr, uid, chart_id, context=context)
res = self.onchange_chart_id(cr, uid, [], chart_id, context=context)
if not res:
return False
return res['value']['reserve_account_id']
@@ -56,12 +55,12 @@ class account_bs_report(osv.osv_memory):
'reserve_account_id': _get_def_reserve_account,
}
def onchange_chart_id(self, cr, uid, chart_id, context=None):
def onchange_chart_id(self, cr, uid, ids, chart_id, context=None):
if not chart_id:
return False
return {}
account = self.pool.get('account.account').browse(cr, uid, chart_id , context=context)
if not account.company_id.property_reserve_and_surplus_account:
return False # We cannot raise an exception, because that's before the wizard
return { 'value': {'reserve_account_id': False}}
return { 'value': {'reserve_account_id': account.company_id.property_reserve_and_surplus_account.id}}
@@ -70,7 +69,6 @@ class account_bs_report(osv.osv_memory):
context = {}
data['form'].update(self.read(cr, uid, ids, ['display_type','reserve_account_id'])[0])
if not data['form']['reserve_account_id']:
# only in < v6.1, where orm_memory does not honor required fields
raise osv.except_osv(_('Warning'),_('Please define the Reserve and Profit/Loss account for current user company !'))
data = self.pre_print_report(cr, uid, ids, data, context=context)
if data['form']['display_type']:
addons/account/wizard/account_report_balance_sheet_view.xml
+2 -2
View File
@@ -10,7 +10,7 @@
<field name="arch" type="xml">
<data>
<xpath expr="//field[@name='chart_account_id']" position="replace">
<field name="chart_account_id" widget='selection' onchange="onchange_chart_id"/>
<field name="chart_account_id" widget="selection" on_change="onchange_chart_id(chart_account_id)"/>
</xpath>
<xpath expr="//field[@name='journal_ids']" position="replace">
<field name="journal_ids" colspan="4" nolabel="1" required="0" readonly="1"/>
@@ -21,8 +21,8 @@
</xpath>
<xpath expr="//field[@name='target_move']" position="after">
<field name="display_account"/>
<field name="display_type"/>
<field name="reserve_account_id" required="1"/>
<field name="display_type"/>
<newline/>
</xpath>
</data>