[FIX] Account :'note' field on Fiscal position,added on invoice report
lp bug: https://launchpad.net/bugs/391673 fixed bzr revid: jvo@tinyerp.com-20090630120654-6a6y3pd1yalgsj96
This commit is contained in:
parent
81b9288a07
commit
9263c6b2bf
|
@ -30,7 +30,8 @@ class account_fiscal_position(osv.osv):
|
||||||
'name': fields.char('Fiscal Position', size=64, translate=True, required=True),
|
'name': fields.char('Fiscal Position', size=64, translate=True, required=True),
|
||||||
'company_id': fields.many2one('res.company', 'Company'),
|
'company_id': fields.many2one('res.company', 'Company'),
|
||||||
'account_ids': fields.one2many('account.fiscal.position.account', 'position_id', 'Account Mapping'),
|
'account_ids': fields.one2many('account.fiscal.position.account', 'position_id', 'Account Mapping'),
|
||||||
'tax_ids': fields.one2many('account.fiscal.position.tax', 'position_id', 'Tax Mapping')
|
'tax_ids': fields.one2many('account.fiscal.position.tax', 'position_id', 'Tax Mapping'),
|
||||||
|
'note': fields.text('Notes', translate=True),
|
||||||
}
|
}
|
||||||
|
|
||||||
def map_tax(self, cr, uid, fposition_id, taxes, context={}):
|
def map_tax(self, cr, uid, fposition_id, taxes, context={}):
|
||||||
|
|
|
@ -11,7 +11,8 @@
|
||||||
<field name="name" select="1"/>
|
<field name="name" select="1"/>
|
||||||
<field name="company_id"/>
|
<field name="company_id"/>
|
||||||
<newline/>
|
<newline/>
|
||||||
<field name="tax_ids" colspan="4">
|
<field name="note" colspan="4"/>
|
||||||
|
<field name="tax_ids" colspan="4" widget="one2many_list">
|
||||||
<tree string="Tax Mapping" editable="bottom">
|
<tree string="Tax Mapping" editable="bottom">
|
||||||
<field name="tax_src_id" domain="[('parent_id','=',False)]"/>
|
<field name="tax_src_id" domain="[('parent_id','=',False)]"/>
|
||||||
<field name="tax_dest_id" domain="[('parent_id','=',False)]"/>
|
<field name="tax_dest_id" domain="[('parent_id','=',False)]"/>
|
||||||
|
@ -21,7 +22,7 @@
|
||||||
<field name="tax_dest_id" domain="[('parent_id','=',False)]"/>
|
<field name="tax_dest_id" domain="[('parent_id','=',False)]"/>
|
||||||
</form>
|
</form>
|
||||||
</field>
|
</field>
|
||||||
<field name="account_ids" colspan="4">
|
<field name="account_ids" colspan="4" widget="one2many_list">
|
||||||
<tree string="Account Mapping" editable="bottom">
|
<tree string="Account Mapping" editable="bottom">
|
||||||
<field name="account_src_id"/>
|
<field name="account_src_id"/>
|
||||||
<field name="account_dest_id"/>
|
<field name="account_dest_id"/>
|
||||||
|
|
|
@ -404,5 +404,19 @@
|
||||||
<para style="terp_default_2">
|
<para style="terp_default_2">
|
||||||
<font color="white"> </font>
|
<font color="white"> </font>
|
||||||
</para>
|
</para>
|
||||||
|
<blockTable colWidths="128.0,402.0" style="Table1">
|
||||||
|
<tr>
|
||||||
|
<td>
|
||||||
|
<para style="terp_default_Bold_9">Fiscal Position Remark :</para>
|
||||||
|
</td>
|
||||||
|
<td>
|
||||||
|
<para style="terp_default_9">[[ o.fiscal_position and format(o.fiscal_position.note) or removeParentNode('blockTable') ]]</para>
|
||||||
|
</td>
|
||||||
|
</tr>
|
||||||
|
</blockTable>
|
||||||
|
<para style="terp_default_2">
|
||||||
|
<font color="white"> </font>
|
||||||
|
</para>
|
||||||
|
|
||||||
</story>
|
</story>
|
||||||
</document>
|
</document>
|
||||||
|
|
Loading…
Reference in New Issue