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

BASE, ACCOUNT, SALE, etc ...: better fix for vat display with updated sxw 

bzr revid: ced-7ff784289b79f3ff01eb5697f3f4747f961bd697
This commit is contained in:
ced 2007-06-22 10:54:10 +00:00
parent 242ad8fc2a
commit a0ed63ce0a
8 changed files with 18 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
addons/account/partner_view.xml
View File

@ -12,9 +12,9 @@
<field name="inherit_id" ref="base.view_partner_form"/>
<field name="arch" type="xml">
<field name="credit_limit" position="after">
<newline/>
<field name="credit" select="2"/>
<field name="debit" select="2"/>
<newline/>
</field>
</field>
</record>

6
addons/account/report/invoice.rml
View File

@ -108,9 +108,9 @@
<para style="Standard">
<font color="white"> </font>
</para>
<para style="Standard">Tel. : [[ o.address_invoice_id.phone or '' ]]</para>
<para style="Standard">Fax : [[ o.address_invoice_id.fax or '' ]]</para>
<para style="Standard">[[ o.partner_id.vat or '' ]]</para>
<para style="Standard">Tel. : [[ o.address_invoice_id.phone or removeParentNode('para') ]]</para>
<para style="Standard">Fax : [[ o.address_invoice_id.fax or removeParentNode('para') ]]</para>
<para style="Standard">VAT : [[ o.partner_id.vat or removeParentNode('para') ]]</para>
</td>
</tr>
</blockTable>

4
addons/account/report/rappel.rml
View File

@ -81,7 +81,7 @@
<para style="P4">
<font color="white"> </font>
</para>
<para style="P4">[[ o.vat or '' ]]</para>
<para style="P4">VAT: [[ o.vat or removeParentNode('para') ]]</para>
</td>
</tr>
</blockTable>
@ -224,7 +224,7 @@
</para>
<para style="P20">
<font face="Times-Roman">Total amount due: </font>
<font face="Times-Roman">[[ '%.2f' % (reduce(lambda x,y: x+(y['debit']-y['credit']), getLines(o), 0)) ]] [[ company.currency_id.code ]].</font>
<font face="Times-Roman">[[ '%.2f' % (reduce(lambda x,y: x+(y['debit']-y['credit']), getLines(o), 0)) ]] EUR.</font>
</para>
<para style="P4">
<font color="white"> </font>

2
addons/account_followup/report/rappel.rml
View File

@ -81,7 +81,7 @@
<para style="P4">
<font color="white"> </font>
</para>
<para style="P4">[[ o.vat or '' ]]</para>
<para style="P4">VAT: [[ o.vat or removeParentNode('para') ]]</para>
</td>
</tr>
</blockTable>

2
addons/base_vat/__terp__.py
View File

@ -4,7 +4,7 @@
"author" : "Tiny",
"category" : "Generic Modules/Base",
"depends" : ["base"],
"init_xml" : ["base_vat_data.xml"],
"update_xml" : ["base_vat_data.xml"],
"active": False,
"installable": True
}

10
addons/base_vat/base_vat_data.xml
View File

@ -3,15 +3,13 @@
<data>
<record model="ir.ui.view" id="view_partner_form">
<field name="name">res.partner.bank.vat.inherit</field>
<field name="model">res.partner.bank.vat</field>
<field name="name">res.partner.vat.inherit</field>
<field name="model">res.partner</field>
<field name="inherit_id" ref="base.view_partner_form"/>
<field name="type">form</field>
<field name="arch" type="xml">
<page string="Extra Info" position="inside">
<field name="active" position="after">
<field name="vat"/>
<newline/>
</page>
</field>
</field>
</record>

6
addons/sale/report/order.rml
View File

@ -117,9 +117,9 @@
<para style="P9">
<font color="white"> </font>
</para>
<para style="P3">Tel. : [[ o.partner_order_id.phone or '' ]]</para>
<para style="P3">Fax : [[ o.partner_order_id.fax or '' ]]</para>
<para style="P3">[[ o.partner_id.vat or '' ]]</para>
<para style="P3">Tel. : [[ o.partner_order_id.phone or removeParentNode('para') ]]</para>
<para style="P3">Fax : [[ o.partner_order_id.fax or removeParentNode('para') ]]</para>
<para style="P3">VAT : [[ o.partner_id.vat or removeParentNode('para') ]]</para>
</td>
</tr>
</blockTable>

6
addons/sale_category/report/sale_category_report.rml
View File

@ -121,9 +121,9 @@
<para style="P9">
<font color="white"> </font>
</para>
<para style="P3">Tél. : [[ o.partner_order_id.phone or '' ]]</para>
<para style="P3">Fax : [[ o.partner_order_id.fax or '' ]]</para>
<para style="P3">[[ o.partner_id.vat or '' ]]</para>
<para style="P3">Tél. : [[ o.partner_order_id.phone or removeParentNode('para') ]]</para>
<para style="P3">Fax : [[ o.partner_order_id.fax or removeParentNode('para') ]]</para>
<para style="P3">TVA : [[ o.partner_id.vat or removeParentNode('para') ]]</para>
</td>
</tr>
</blockTable>