From f3c9b3cd89ec3e2a92e67403835553228e84cdf8 Mon Sep 17 00:00:00 2001
From: Vinay Rana <vinusoft85@gmail.com>
Date: Thu, 11 Sep 2008 11:53:49 +0530
Subject: [PATCH] doing some changes in invoice report sxw and rml

bzr revid: vinusoft85@gmail.com-20080911062349-lrt64zr1smdn3uqq
---
 addons/account/report/invoice.rml | 71 ++++++++++++-------------------
 1 file changed, 28 insertions(+), 43 deletions(-)

diff --git a/addons/account/report/invoice.rml b/addons/account/report/invoice.rml
index 1962a14a20b..ef8924373fc 100644
--- a/addons/account/report/invoice.rml
+++ b/addons/account/report/invoice.rml
@@ -127,7 +127,7 @@
       <lineStyle kind="LINEABOVE" colorName="#000000" start="1,0" stop="1,0"/>
       <lineStyle kind="LINEABOVE" colorName="#000000" start="2,0" stop="2,0"/>
     </blockTableStyle>
-    <blockTableStyle id="Table_Tax_Content_Table">
+    <blockTableStyle id="Table_Main_Table">
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
       <lineStyle kind="LINEBEFORE" colorName="#ffffff" start="0,0" stop="0,-1"/>
@@ -137,8 +137,6 @@
       <lineStyle kind="LINEBELOW" colorName="#000000" start="1,-1" stop="1,-1"/>
       <lineStyle kind="LINEBELOW" colorName="#000000" start="2,-1" stop="2,-1"/>
       <lineStyle kind="LINEBELOW" colorName="#000000" start="3,-1" stop="3,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#ffffff" start="4,0" stop="4,0"/>
-      <lineStyle kind="LINEBELOW" colorName="#ffffff" start="4,-1" stop="4,-1"/>
       <lineStyle kind="LINEBELOW" colorName="#000000" start="0,-1" stop="0,-1"/>
       <lineStyle kind="LINEBELOW" colorName="#000000" start="1,-1" stop="1,-1"/>
       <lineStyle kind="LINEBELOW" colorName="#000000" start="2,-1" stop="2,-1"/>
@@ -148,24 +146,16 @@
       <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/>
       <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="2,-1" stop="2,-1"/>
       <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="3,-1" stop="3,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#ffffff" start="4,-1" stop="4,-1"/>
-      <lineStyle kind="LINEBEFORE" colorName="#ffffff" start="5,2" stop="5,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#ffffff" start="5,2" stop="5,2"/>
-      <lineStyle kind="LINEBELOW" colorName="#ffffff" start="5,-1" stop="5,-1"/>
-      <lineStyle kind="LINEBEFORE" colorName="#ffffff" start="6,2" stop="6,-1"/>
-      <lineStyle kind="LINEAFTER" colorName="#ffffff" start="6,2" stop="6,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#ffffff" start="6,2" stop="6,2"/>
-      <lineStyle kind="LINEBELOW" colorName="#ffffff" start="6,-1" stop="6,-1"/>
       <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
       <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/>
       <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="2,-1" stop="2,-1"/>
-      <lineStyle kind="LINEBEFORE" colorName="#ffffff" start="0,4" stop="0,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#ffffff" start="0,4" stop="0,4"/>
       <lineStyle kind="LINEBELOW" colorName="#ffffff" start="0,-1" stop="0,-1"/>
-      <lineStyle kind="LINEBEFORE" colorName="#ffffff" start="1,4" stop="1,-1"/>
-      <lineStyle kind="LINEAFTER" colorName="#ffffff" start="1,4" stop="1,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#ffffff" start="1,4" stop="1,4"/>
       <lineStyle kind="LINEBELOW" colorName="#ffffff" start="1,-1" stop="1,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#ffffff" start="2,-1" stop="2,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#ffffff" start="3,-1" stop="3,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#ffffff" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#ffffff" start="1,-1" stop="1,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#ffffff" start="2,-1" stop="2,-1"/>
     </blockTableStyle>
     <blockTableStyle id="Table_Tax_Header">
       <blockAlignment value="LEFT"/>
@@ -181,32 +171,22 @@
       <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/>
       <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="2,-1" stop="2,-1"/>
     </blockTableStyle>
-    <blockTableStyle id="Table_Format_Border">
+    <blockTableStyle id="Table_Table_Border_White">
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
-      <lineStyle kind="LINEBEFORE" colorName="#ffffff" start="0,0" stop="0,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#ffffff" start="0,0" stop="0,0"/>
       <lineStyle kind="LINEBELOW" colorName="#ffffff" start="0,-1" stop="0,-1"/>
-      <lineStyle kind="LINEBEFORE" colorName="#ffffff" start="1,0" stop="1,-1"/>
-      <lineStyle kind="LINEAFTER" colorName="#ffffff" start="1,0" stop="1,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#ffffff" start="1,0" stop="1,0"/>
       <lineStyle kind="LINEBELOW" colorName="#ffffff" start="1,-1" stop="1,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#ffffff" start="2,-1" stop="2,-1"/>
     </blockTableStyle>
-    <blockTableStyle id="Table_Border_Color_Formating">
+    <blockTableStyle id="Table_Final_Border">
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
-      <lineStyle kind="LINEBEFORE" colorName="#ffffff" start="0,0" stop="0,-1"/>
       <lineStyle kind="LINEABOVE" colorName="#ffffff" start="0,0" stop="0,0"/>
-      <lineStyle kind="LINEBELOW" colorName="#ffffff" start="0,-1" stop="0,-1"/>
-      <lineStyle kind="LINEBEFORE" colorName="#ffffff" start="1,0" stop="1,-1"/>
-      <lineStyle kind="LINEAFTER" colorName="#ffffff" start="1,0" stop="1,-1"/>
       <lineStyle kind="LINEABOVE" colorName="#ffffff" start="1,0" stop="1,0"/>
-      <lineStyle kind="LINEBELOW" colorName="#ffffff" start="1,-1" stop="1,-1"/>
     </blockTableStyle>
     <blockTableStyle id="Table_Coment_Payment_Term">
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
-      <lineStyle kind="LINEABOVE" colorName="#ffffff" start="0,0" stop="0,0"/>
     </blockTableStyle>
     <blockTableStyle id="Table_Payment_Terms">
       <blockAlignment value="LEFT"/>
@@ -215,6 +195,9 @@
     <initialize>
       <paraStyle name="all" alignment="justify"/>
     </initialize>
+    <paraStyle name="P1" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="P2" rightIndent="0.0" leftIndent="-88.0" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="P3" rightIndent="26.0" leftIndent="0.0" fontName="Helvetica" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="Standard" fontName="Times-Roman"/>
     <paraStyle name="Text body" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/>
     <paraStyle name="List" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/>
@@ -477,11 +460,11 @@
         </td>
       </tr>
     </blockTable>
-    <blockTable colWidths="196.0,334.0" style="Table_Tax_Content_Table">
+    <blockTable colWidths="530.0" style="Table_Main_Table">
       <tr>
         <td>
           <para style="terp_default_8">[[ format(o.amount_tax or removeParentNode('blockTable')) ]]</para>
-          <blockTable colWidths="65.0,62.0,68.0" style="Table_Tax_Header">
+          <blockTable colWidths="54.0,58.0,67.0" style="Table_Tax_Header">
             <tr>
               <td>
                 <para style="terp_tblheader_Details_Centre">Tax</para>
@@ -498,16 +481,11 @@
             <font color="white"> </font>
           </para>
         </td>
-        <td>
-          <para style="terp_default_8">
-            <font color="white"> </font>
-          </para>
-        </td>
       </tr>
       <tr>
         <td>
           <para style="terp_default_8">[[ repeatIn(o.tax_line,'t') ]]</para>
-          <blockTable colWidths="64.0,63.0,69.0" style="Table_Tax_Content">
+          <blockTable colWidths="53.0,60.0,65.0" style="Table_Tax_Content">
             <tr>
               <td>
                 <para style="terp_default_Centre_8">[[ t.name ]]</para>
@@ -521,16 +499,23 @@
             </tr>
           </blockTable>
         </td>
+      </tr>
+      <tr>
         <td>
-          <blockTable colWidths="167.0,167.0" style="Table_Format_Border">
+          <blockTable colWidths="53.0,61.0,65.0" style="Table_Table_Border_White">
             <tr>
               <td>
-                <para style="terp_default_8">
+                <para style="terp_default_2">
                   <font color="white"> </font>
                 </para>
               </td>
               <td>
-                <para style="terp_default_8">
+                <para style="terp_default_2">
+                  <font color="white"> </font>
+                </para>
+              </td>
+              <td>
+                <para style="terp_default_2">
                   <font color="white"> </font>
                 </para>
               </td>
@@ -539,15 +524,15 @@
         </td>
       </tr>
     </blockTable>
-    <blockTable colWidths="196.0,334.0" style="Table_Border_Color_Formating">
+    <blockTable colWidths="180.0,350.0" style="Table_Final_Border">
       <tr>
         <td>
-          <para style="terp_default_8">
+          <para style="terp_default_2">
             <font color="white"> </font>
           </para>
         </td>
         <td>
-          <para style="terp_default_8">
+          <para style="terp_default_2">
             <font color="white"> </font>
           </para>
         </td>