odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[IMP] account: Improved field description and changed view. 

bzr revid: uco@tinyerp.com-20110823103718-00po1r135nrkbahj
This commit is contained in:
Ujjvala Collins (OpenERP) 2011-08-23 16:07:18 +05:30
parent d37d1595a8
commit 3d8ced3196
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
addons/account/report/account_report_common.py
View File

@ -101,7 +101,7 @@ class report_account_common(report_sxw.rml_parse, common_report_header):
if child.type == 'account_report' and child.account_report_id:
for a in child.account_report_id.account_ids:
balance += a.balance
#it's the sum of balance of the children of this account.report (if there isn't, then it's 0.0)
# it's the sum of balance of the children of this account.report (if there isn't, then it's 0.0)
if child.type == 'sum':
for child in report_obj.browse(cr, uid, child_ids, context=context):
for a in child.account_ids:

2
addons/account/wizard/account_report.py
View File

@ -30,7 +30,7 @@ class accounting_report(osv.osv_memory):
'enable_filter': fields.boolean('Enable Comparison'),
'account_details': fields.boolean('Details by Account', help="Print Report with the account details."),
'account_report_id': fields.many2one('account.report', 'Account Reports', required=True),
'label_filter': fields.char('Label', size=32, help="This label will be displayed on report to show the balance computed for the given comparison filter."),
'label_filter': fields.char('Filters Label', size=32, help="This label will be displayed on report to show the balance computed for the given comparison filter."),
}
def _print_report(self, cr, uid, ids, data, context=None):
data['form'].update(self.read(cr, uid, ids, ['account_report_id', 'enable_filter', 'account_details', 'label_filter'], context=context)[0])

6
addons/account/wizard/account_report_view.xml
View File

@ -12,15 +12,15 @@
</xpath>
<xpath expr="//field[@name='target_move']" position="replace">
<field name="account_report_id" domain="[('parent_id','=',False)]"/>
<field name="label_filter"/>
<field name="account_details"/>
<field name="enable_filter"/>
</xpath>
<xpath expr="//notebook/page[@string='Filters']" position="replace">
<page string="Comparison" attrs="{'invisible': [('enable_filter','=',False)]}">
<page string="Filters" attrs="{'invisible': [('enable_filter','=',False)]}">
<field name="fiscalyear_id"/>
<field name="target_move"/>
<field name="filter" on_change="onchange_filter(filter, fiscalyear_id)" colspan="4"/>
<field name="filter" on_change="onchange_filter(filter, fiscalyear_id)"/>
<field name="label_filter"/>
<separator string="Dates" colspan="4"/>
<field name="date_from" attrs="{'readonly':[('filter', '!=', 'filter_date')], 'required':[('filter', '=', 'filter_date')]}" colspan="4"/>
<field name="date_to" attrs="{'readonly':[('filter', '!=', 'filter_date')], 'required':[('filter', '=', 'filter_date')]}" colspan="4"/>