From a0ed63ce0af08bd2f14c37321ee2516f25c713e4 Mon Sep 17 00:00:00 2001
From: ced <>
Date: Fri, 22 Jun 2007 10:54:10 +0000
Subject: [PATCH] BASE, ACCOUNT, SALE, etc ...: better fix for vat display with
 updated sxw

bzr revid: ced-7ff784289b79f3ff01eb5697f3f4747f961bd697
---
 addons/account/partner_view.xml                      |  2 +-
 addons/account/report/invoice.rml                    |  6 +++---
 addons/account/report/rappel.rml                     |  4 ++--
 addons/account_followup/report/rappel.rml            |  2 +-
 addons/base_vat/__terp__.py                          |  2 +-
 addons/base_vat/base_vat_data.xml                    | 10 ++++------
 addons/sale/report/order.rml                         |  6 +++---
 addons/sale_category/report/sale_category_report.rml |  6 +++---
 8 files changed, 18 insertions(+), 20 deletions(-)

diff --git a/addons/account/partner_view.xml b/addons/account/partner_view.xml
index b0d0cf42620..b5cc0b3477c 100644
--- a/addons/account/partner_view.xml
+++ b/addons/account/partner_view.xml
@@ -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>
diff --git a/addons/account/report/invoice.rml b/addons/account/report/invoice.rml
index 4a6137524be..50d6e35a28c 100644
--- a/addons/account/report/invoice.rml
+++ b/addons/account/report/invoice.rml
@@ -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>
diff --git a/addons/account/report/rappel.rml b/addons/account/report/rappel.rml
index 99e33afdabe..c1d61a0d29d 100644
--- a/addons/account/report/rappel.rml
+++ b/addons/account/report/rappel.rml
@@ -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>
diff --git a/addons/account_followup/report/rappel.rml b/addons/account_followup/report/rappel.rml
index 7dbcd8df9aa..9ae9bfec3d7 100644
--- a/addons/account_followup/report/rappel.rml
+++ b/addons/account_followup/report/rappel.rml
@@ -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>
diff --git a/addons/base_vat/__terp__.py b/addons/base_vat/__terp__.py
index 57957265046..dd5f55ab29c 100644
--- a/addons/base_vat/__terp__.py
+++ b/addons/base_vat/__terp__.py
@@ -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
 }
diff --git a/addons/base_vat/base_vat_data.xml b/addons/base_vat/base_vat_data.xml
index 2f85e0fcc6d..71474177086 100644
--- a/addons/base_vat/base_vat_data.xml
+++ b/addons/base_vat/base_vat_data.xml
@@ -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>
 
diff --git a/addons/sale/report/order.rml b/addons/sale/report/order.rml
index 6a25fe6767d..5f501789cf2 100644
--- a/addons/sale/report/order.rml
+++ b/addons/sale/report/order.rml
@@ -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>
diff --git a/addons/sale_category/report/sale_category_report.rml b/addons/sale_category/report/sale_category_report.rml
index bccba1e33e1..3d23994601a 100644
--- a/addons/sale_category/report/sale_category_report.rml
+++ b/addons/sale_category/report/sale_category_report.rml
@@ -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>