[IMP] accunt : small improvments like renaming variable
bzr revid: psi@tinyerp.com-20110819054014-bh4cut8jd3d3nwv0
This commit is contained in:
parent
56ca812f04
commit
e111108320
|
@ -13,22 +13,22 @@
|
|||
<blockTableStyle id="Table1">
|
||||
<blockAlignment value="LEFT"/>
|
||||
<blockValign value="TOP"/>
|
||||
<lineStyle kind="GRID" colorName="black"/>
|
||||
<lineStyle kind="GRID" colorName="#cccccc"/>
|
||||
</blockTableStyle>
|
||||
<blockTableStyle id="Table2">
|
||||
<blockAlignment value="LEFT"/>
|
||||
<blockValign value="TOP"/>
|
||||
<lineStyle kind="GRID" colorName="black"/>
|
||||
<lineStyle kind="GRID" colorName="#cccccc"/>xtly
|
||||
</blockTableStyle>
|
||||
<blockTableStyle id="Table8">
|
||||
<blockAlignment value="LEFT"/>
|
||||
<blockValign value="TOP"/>
|
||||
<lineStyle kind="GRID" colorName="black"/>
|
||||
<lineStyle kind="GRID" colorName="#cccccc"/>
|
||||
</blockTableStyle>
|
||||
<blockTableStyle id="Table10">
|
||||
<blockAlignment value="LEFT"/>
|
||||
<blockValign value="TOP"/>
|
||||
<lineStyle kind="GRID" colorName="black"/>
|
||||
<lineStyle kind="GRID" colorName="#cccccc"/>
|
||||
</blockTableStyle>
|
||||
<blockTableStyle id="Table11">
|
||||
<blockAlignment value="LEFT"/>
|
||||
|
@ -37,7 +37,7 @@
|
|||
<blockTableStyle id="Table3">
|
||||
<blockAlignment value="LEFT"/>
|
||||
<blockValign value="TOP"/>
|
||||
<lineStyle kind="GRID" colorName="black"/>
|
||||
<lineStyle kind="GRID" colorName="#cccccc"/>
|
||||
</blockTableStyle>
|
||||
<initialize>
|
||||
<paraStyle name="all" alignment="justify"/>
|
||||
|
|
|
@ -27,8 +27,8 @@ class accounting_report(osv.osv_memory):
|
|||
_description = "Account Report"
|
||||
|
||||
_columns = {
|
||||
'enable_comparison': fields.boolean('Enable Comparison'),
|
||||
'display_details_per_account': fields.boolean('Display Details per Account'),
|
||||
'comparison': fields.boolean('Enable Comparison'),
|
||||
'account_details': fields.boolean('Details by Account'),
|
||||
'account_report_id': fields.many2one('account.report', 'Account Reports', required=True),
|
||||
}
|
||||
|
||||
|
@ -39,7 +39,7 @@ class accounting_report(osv.osv_memory):
|
|||
def _print_report(self, cr, uid, ids, data, context=None):
|
||||
if context is None:
|
||||
context = {}
|
||||
data['form'].update(self.read(cr, uid, ids, ['account_report_id', 'enable_comparison', 'display_details_per_account'], context=context)[0])
|
||||
data['form'].update(self.read(cr, uid, ids, ['account_report_id', 'comparison', 'account_details'], context=context)[0])
|
||||
return {
|
||||
'type': 'ir.actions.report.xml',
|
||||
'report_name': 'account.common',
|
||||
|
|
|
@ -10,11 +10,11 @@
|
|||
<field name="arch" type="xml">
|
||||
<xpath expr="//field[@name='target_move']" position="after">
|
||||
<field name="account_report_id" domain="[('parent_id','=',False)]"/>
|
||||
<field name="enable_comparison"/>
|
||||
<field name="display_details_per_account"/>
|
||||
<field name="comparison"/>
|
||||
<field name="account_details"/>
|
||||
</xpath>
|
||||
<xpath expr="//notebook/page[@string='Filters']" position="replace">
|
||||
<page string="Comparison" attrs="{'invisible': [('enable_comparison','=',False)]}">
|
||||
<page string="Comparison" attrs="{'invisible': [('comparison','=',False)]}">
|
||||
<field name="filter" on_change="onchange_filter(filter, fiscalyear_id)" colspan="4"/>
|
||||
<separator string="Dates" colspan="4"/>
|
||||
<field name="date_from" attrs="{'readonly':[('filter', '!=', 'filter_date')], 'required':[('filter', '=', 'filter_date')]}" colspan="4"/>
|
||||
|
|
Loading…
Reference in New Issue