From 4de03def4fae60ae0a4b511d8b4e3d74830133ad Mon Sep 17 00:00:00 2001
From: Vinay Rana <vinusoft85@gmail.com>
Date: Mon, 8 Sep 2008 17:42:50 +0530
Subject: [PATCH 2/7] doing some changes related to format condition in tax
 table content in invoice sxw and rml

bzr revid: vinusoft85@gmail.com-20080908121250-fvvtxddremgcq7li
---
 addons/account/report/invoice.rml | 41 ++++++++++++++++++++++---------
 1 file changed, 29 insertions(+), 12 deletions(-)

diff --git a/addons/account/report/invoice.rml b/addons/account/report/invoice.rml
index dff9be57f68..4d72db95ec5 100644
--- a/addons/account/report/invoice.rml
+++ b/addons/account/report/invoice.rml
@@ -152,15 +152,20 @@
       <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="5,-1" stop="5,-1"/>
       <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="6,-1" stop="6,-1"/>
       <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="7,-1" stop="7,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#ffffff" start="8,0" stop="8,-1"/>
       <lineStyle kind="LINEABOVE" colorName="#ffffff" start="8,0" stop="8,0"/>
       <lineStyle kind="LINEBELOW" colorName="#ffffff" start="8,-1" stop="8,-1"/>
       <lineStyle kind="LINEBEFORE" colorName="#ffffff" start="9,0" stop="9,-1"/>
+      <lineStyle kind="LINEAFTER" colorName="#ffffff" start="9,0" stop="9,-1"/>
       <lineStyle kind="LINEABOVE" colorName="#ffffff" start="9,0" stop="9,0"/>
       <lineStyle kind="LINEBELOW" colorName="#ffffff" start="9,-1" stop="9,-1"/>
       <lineStyle kind="LINEBEFORE" colorName="#ffffff" start="10,0" stop="10,-1"/>
-      <lineStyle kind="LINEAFTER" colorName="#ffffff" start="10,0" stop="10,-1"/>
       <lineStyle kind="LINEABOVE" colorName="#ffffff" start="10,0" stop="10,0"/>
       <lineStyle kind="LINEBELOW" colorName="#ffffff" start="10,-1" stop="10,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#ffffff" start="11,0" stop="11,-1"/>
+      <lineStyle kind="LINEAFTER" colorName="#ffffff" start="11,0" stop="11,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#ffffff" start="11,0" stop="11,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#ffffff" start="11,-1" stop="11,-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"/>
@@ -174,8 +179,13 @@
       <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="LINEBEFORE" colorName="#ffffff" start="0,5" stop="0,-1"/>
       <lineStyle kind="LINEABOVE" colorName="#ffffff" start="0,5" stop="0,5"/>
       <lineStyle kind="LINEBELOW" colorName="#ffffff" start="0,-1" stop="0,-1"/>
@@ -215,8 +225,13 @@
     <blockTableStyle id="Table_Format_Line_2">
       <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_Format_Table_Line_1">
       <blockAlignment value="LEFT"/>
@@ -509,14 +524,11 @@
         </td>
       </tr>
     </blockTable>
-    <para style="terp_default_2">
-      <font color="white"> </font>
-    </para>
-    <blockTable colWidths="520.0" style="Table_Main_Tax_Table">
+    <blockTable colWidths="519.0" style="Table_Main_Tax_Table">
       <tr>
         <td>
-          <para style="terp_default_White_2">[[ o.amount_tax  or removeParentNode('blockTable') ]]</para>
-          <blockTable colWidths="79.0,85.0,75.0" style="Table_Tax_Header">
+          <para style="terp_default_8">[[ format(o.amount_tax or removeParentNode('blockTable')) ]]</para>
+          <blockTable colWidths="70.0,72.0,72.0" style="Table_Tax_Header">
             <tr>
               <td>
                 <para style="terp_tblheader_Details_Centre">Tax</para>
@@ -536,7 +548,7 @@
             <tr>
               <td>
                 <para style="terp_default_8">[[ repeatIn(o.tax_line,'t') ]]</para>
-                <blockTable colWidths="70.0,88.0,75.0" style="Table_Tex_Content_Table">
+                <blockTable colWidths="59.0,75.0,73.0" style="Table_Tex_Content_Table">
                   <tr>
                     <td>
                       <para style="terp_default_Centre_8">[[ t.name ]]</para>
@@ -552,19 +564,24 @@
               </td>
             </tr>
           </blockTable>
-          <blockTable colWidths="527.0" style="Table_Format_Line_2">
+          <blockTable colWidths="258.0,258.0" style="Table_Format_Line_2">
             <tr>
               <td>
                 <para style="terp_default_2">
                   <font color="white"> </font>
                 </para>
               </td>
+              <td>
+                <para style="terp_default_2">
+                  <font color="white"> </font>
+                </para>
+              </td>
             </tr>
           </blockTable>
-          <para style="terp_default_8">
+          <para style="terp_default_2">
             <font color="white"> </font>
           </para>
-          <blockTable colWidths="258.0,258.0" style="Table_Format_Table_Line_1">
+          <blockTable colWidths="257.0,261.0" style="Table_Format_Table_Line_1">
             <tr>
               <td>
                 <para style="terp_default_2">
@@ -578,7 +595,7 @@
               </td>
             </tr>
           </blockTable>
-          <para style="terp_default_8">
+          <para style="terp_default_2">
             <font color="white"> </font>
           </para>
         </td>

From ad1d8c3292b1efaa4f37381da8fa2bad5e318add Mon Sep 17 00:00:00 2001
From: Vinay Rana <vinusoft85@gmail.com>
Date: Mon, 8 Sep 2008 19:26:26 +0530
Subject: [PATCH 4/7] Some Changes done in Invoice Report sxw and rml Format
 using Pluginn.

bzr revid: vinusoft85@gmail.com-20080908135626-adb8q51j67aopl4r
---
 addons/account/report/invoice.rml | 173 +++++++-----------------------
 1 file changed, 38 insertions(+), 135 deletions(-)

diff --git a/addons/account/report/invoice.rml b/addons/account/report/invoice.rml
index 4d72db95ec5..d14482d1680 100644
--- a/addons/account/report/invoice.rml
+++ b/addons/account/report/invoice.rml
@@ -135,7 +135,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_Main_Tax_Table">
+    <blockTableStyle id="Table_Tax_Content_Table">
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
       <lineStyle kind="LINEBEFORE" colorName="#ffffff" start="0,0" stop="0,-1"/>
@@ -145,33 +145,11 @@
       <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="LINEBEFORE" colorName="#ffffff" start="4,0" stop="4,-1"/>
-      <lineStyle kind="LINEAFTER" colorName="#ffffff" start="4,0" stop="4,-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="#e6e6e6" start="5,-1" stop="5,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="6,-1" stop="6,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="7,-1" stop="7,-1"/>
-      <lineStyle kind="LINEBEFORE" colorName="#ffffff" start="8,0" stop="8,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#ffffff" start="8,0" stop="8,0"/>
-      <lineStyle kind="LINEBELOW" colorName="#ffffff" start="8,-1" stop="8,-1"/>
-      <lineStyle kind="LINEBEFORE" colorName="#ffffff" start="9,0" stop="9,-1"/>
-      <lineStyle kind="LINEAFTER" colorName="#ffffff" start="9,0" stop="9,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#ffffff" start="9,0" stop="9,0"/>
-      <lineStyle kind="LINEBELOW" colorName="#ffffff" start="9,-1" stop="9,-1"/>
-      <lineStyle kind="LINEBEFORE" colorName="#ffffff" start="10,0" stop="10,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#ffffff" start="10,0" stop="10,0"/>
-      <lineStyle kind="LINEBELOW" colorName="#ffffff" start="10,-1" stop="10,-1"/>
-      <lineStyle kind="LINEBEFORE" colorName="#ffffff" start="11,0" stop="11,-1"/>
-      <lineStyle kind="LINEAFTER" colorName="#ffffff" start="11,0" stop="11,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#ffffff" start="11,0" stop="11,0"/>
-      <lineStyle kind="LINEBELOW" colorName="#ffffff" start="11,-1" stop="11,-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"/>
       <lineStyle kind="LINEBEFORE" colorName="#ffffff" start="0,2" stop="0,-1"/>
       <lineStyle kind="LINEAFTER" colorName="#ffffff" start="0,2" stop="0,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#ffffff" start="0,2" stop="0,2"/>
       <lineStyle kind="LINEBELOW" colorName="#ffffff" 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"/>
@@ -179,20 +157,6 @@
       <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="LINEBEFORE" colorName="#ffffff" start="0,5" stop="0,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#ffffff" start="0,5" stop="0,5"/>
-      <lineStyle kind="LINEBELOW" colorName="#ffffff" start="0,-1" stop="0,-1"/>
-      <lineStyle kind="LINEBEFORE" colorName="#ffffff" start="1,5" stop="1,-1"/>
-      <lineStyle kind="LINEAFTER" colorName="#ffffff" start="1,5" stop="1,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#ffffff" start="1,5" stop="1,5"/>
-      <lineStyle kind="LINEBELOW" colorName="#ffffff" start="1,-1" stop="1,-1"/>
     </blockTableStyle>
     <blockTableStyle id="Table_Tax_Header">
       <blockAlignment value="LEFT"/>
@@ -201,68 +165,31 @@
       <lineStyle kind="LINEBELOW" colorName="#000000" start="1,-1" stop="1,-1"/>
       <lineStyle kind="LINEBELOW" colorName="#000000" start="2,-1" stop="2,-1"/>
     </blockTableStyle>
-    <blockTableStyle id="Table_Detail_Outer_Content">
-      <blockAlignment value="LEFT"/>
-      <blockValign value="TOP"/>
-      <lineStyle kind="LINEBEFORE" colorName="#ffffff" start="0,0" stop="0,-1"/>
-      <lineStyle kind="LINEAFTER" 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="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="#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"/>
-    </blockTableStyle>
-    <blockTableStyle id="Table_Tex_Content_Table">
+    <blockTableStyle id="Table_Tax_Content">
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
       <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"/>
     </blockTableStyle>
-    <blockTableStyle id="Table_Format_Line_2">
+    <blockTableStyle id="Table_Border_Style">
       <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_Format_Table_Line_1">
-      <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="LINEBEFORE" colorName="#e6e6e6" start="0,0" stop="0,-1"/>
-      <lineStyle kind="LINEAFTER" colorName="#e6e6e6" start="0,0" stop="0,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="0,0" stop="0,0"/>
-      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
     </blockTableStyle>
     <blockTableStyle id="Table_Payment_Terms">
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
-      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="0,0" stop="0,-1"/>
-      <lineStyle kind="LINEAFTER" colorName="#e6e6e6" start="0,0" stop="0,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="0,0" stop="0,0"/>
-      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
     </blockTableStyle>
     <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" fontName="Helvetica" fontSize="2.0" leading="3" alignment="LEFT" spaceBefore="0.0" spaceAfter="6.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"/>
@@ -416,7 +343,7 @@
         </tr>
         <tr>
           <td>
-            <para style="terp_default_8">[[ repeatIn((l.note and l.note.splitlines()) or [], 'note') ]]</para>
+            <para style="terp_default_9">[[ repeatIn((l.note and l.note.splitlines()) or [], 'note') ]]</para>
             <para style="terp_default_9">[[ note or removeParentNode('para') ]]</para>
           </td>
           <td>
@@ -425,32 +352,32 @@
             </para>
           </td>
           <td>
-            <para style="terp_default_Right_9">
+            <para style="terp_default_9">
               <font color="white"> </font>
             </para>
           </td>
           <td>
-            <para style="terp_default_Right_9">
+            <para style="terp_default_9">
               <font color="white"> </font>
             </para>
           </td>
           <td>
-            <para style="terp_default_Right_9">
+            <para style="terp_default_9">
               <font color="white"> </font>
             </para>
           </td>
           <td>
-            <para style="terp_default_Right_9">
+            <para style="terp_default_9">
               <font color="white"> </font>
             </para>
           </td>
           <td>
-            <para style="terp_default_Right_9">
+            <para style="terp_default_9">
               <font color="white"> </font>
             </para>
           </td>
           <td>
-            <para style="terp_default_Right_9">
+            <para style="terp_default_9">
               <font color="white"> </font>
             </para>
           </td>
@@ -524,11 +451,11 @@
         </td>
       </tr>
     </blockTable>
-    <blockTable colWidths="519.0" style="Table_Main_Tax_Table">
+    <blockTable colWidths="530.0" style="Table_Tax_Content_Table">
       <tr>
         <td>
           <para style="terp_default_8">[[ format(o.amount_tax or removeParentNode('blockTable')) ]]</para>
-          <blockTable colWidths="70.0,72.0,72.0" style="Table_Tax_Header">
+          <blockTable colWidths="65.0,62.0,68.0" style="Table_Tax_Header">
             <tr>
               <td>
                 <para style="terp_tblheader_Details_Centre">Tax</para>
@@ -544,57 +471,30 @@
           <para style="terp_default_2">
             <font color="white"> </font>
           </para>
-          <blockTable colWidths="257.0" style="Table_Detail_Outer_Content">
+        </td>
+      </tr>
+      <tr>
+        <td>
+          <para style="terp_default_8">[[ repeatIn(o.tax_line,'t') ]]</para>
+          <blockTable colWidths="62.0,61.0,67.0" style="Table_Tax_Content">
             <tr>
               <td>
-                <para style="terp_default_8">[[ repeatIn(o.tax_line,'t') ]]</para>
-                <blockTable colWidths="59.0,75.0,73.0" style="Table_Tex_Content_Table">
-                  <tr>
-                    <td>
-                      <para style="terp_default_Centre_8">[[ t.name ]]</para>
-                    </td>
-                    <td>
-                      <para style="terp_default_Right_8">[[ formatLang(t.base) ]]</para>
-                    </td>
-                    <td>
-                      <para style="terp_default_Right_8">[[ formatLang(t.amount) or 0.00 ]]</para>
-                    </td>
-                  </tr>
-                </blockTable>
-              </td>
-            </tr>
-          </blockTable>
-          <blockTable colWidths="258.0,258.0" style="Table_Format_Line_2">
-            <tr>
-              <td>
-                <para style="terp_default_2">
-                  <font color="white"> </font>
-                </para>
-              </td>
-              <td>
-                <para style="terp_default_2">
-                  <font color="white"> </font>
-                </para>
-              </td>
-            </tr>
-          </blockTable>
-          <para style="terp_default_2">
-            <font color="white"> </font>
-          </para>
-          <blockTable colWidths="257.0,261.0" style="Table_Format_Table_Line_1">
-            <tr>
-              <td>
-                <para style="terp_default_2">
-                  <font color="white"> </font>
-                </para>
-              </td>
-              <td>
-                <para style="terp_default_2">
-                  <font color="white"> </font>
-                </para>
+                <para style="terp_default_Centre_8">[[ t.name ]]</para>
+              </td>
+              <td>
+                <para style="terp_default_Right_8">[[ formatLang(t.base) ]]</para>
+              </td>
+              <td>
+                <para style="terp_default_Right_8">[[ formatLang(t.amount) or 0.00 ]]</para>
               </td>
             </tr>
           </blockTable>
+        </td>
+      </tr>
+    </blockTable>
+    <blockTable colWidths="530.0" style="Table_Border_Style">
+      <tr>
+        <td>
           <para style="terp_default_2">
             <font color="white"> </font>
           </para>
@@ -604,7 +504,7 @@
     <blockTable colWidths="530.0" style="Table_Coment_Payment_Term">
       <tr>
         <td>
-          <para style="terp_default_8">[[ format(o.comment or removeParentNode('blockTable')) ]]</para>
+          <para style="terp_default_9">[[ format(o.comment or removeParentNode('blockTable')) ]]</para>
         </td>
       </tr>
     </blockTable>
@@ -618,7 +518,10 @@
         </td>
       </tr>
     </blockTable>
-    <para style="terp_default_9">
+    <para style="terp_default_2">
+      <font color="white"> </font>
+    </para>
+    <para style="terp_default_2">
       <font color="white"> </font>
     </para>
   </story>

From 94ebe97f77eb0a53cd6498b741b665a1192dbbe6 Mon Sep 17 00:00:00 2001
From: Vinay Rana <vinusoft85@gmail.com>
Date: Tue, 9 Sep 2008 11:05:11 +0530
Subject: [PATCH 6/7] doing some changes related to table border setting in
 invoice sxw and rml

bzr revid: vinusoft85@gmail.com-20080909053511-gbu7oyt5meqtuood
---
 addons/account/report/invoice.rml | 53 ++++++++++++++++++++++++-------
 1 file changed, 42 insertions(+), 11 deletions(-)

diff --git a/addons/account/report/invoice.rml b/addons/account/report/invoice.rml
index d14482d1680..f7de4757242 100644
--- a/addons/account/report/invoice.rml
+++ b/addons/account/report/invoice.rml
@@ -138,25 +138,28 @@
     <blockTableStyle id="Table_Tax_Content_Table">
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
-      <lineStyle kind="LINEBEFORE" colorName="#ffffff" start="0,0" stop="0,-1"/>
-      <lineStyle kind="LINEAFTER" 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="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"/>
-      <lineStyle kind="LINEBEFORE" colorName="#ffffff" start="0,2" stop="0,-1"/>
-      <lineStyle kind="LINEAFTER" colorName="#ffffff" start="0,2" stop="0,-1"/>
       <lineStyle kind="LINEBELOW" colorName="#ffffff" 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="LINEBELOW" colorName="#e6e6e6" start="3,-1" stop="3,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#ffffff" start="4,-1" stop="4,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#ffffff" start="5,-1" stop="5,-1"/>
+      <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="LINEBELOW" colorName="#ffffff" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#ffffff" start="1,-1" stop="1,-1"/>
     </blockTableStyle>
     <blockTableStyle id="Table_Tax_Header">
       <blockAlignment value="LEFT"/>
@@ -172,10 +175,19 @@
       <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_Border_Style">
+    <blockTableStyle id="Table_Format_Border">
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
+      <lineStyle kind="LINEBELOW" colorName="#ffffff" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#ffffff" start="1,-1" stop="1,-1"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table_Format_Border_2">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEBEFORE" colorName="#ffffff" start="0,0" stop="0,-1"/>
+      <lineStyle kind="LINEAFTER" 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"/>
     </blockTableStyle>
     <blockTableStyle id="Table_Coment_Payment_Term">
       <blockAlignment value="LEFT"/>
@@ -188,8 +200,6 @@
     <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" fontName="Helvetica" fontSize="2.0" leading="3" alignment="LEFT" spaceBefore="0.0" spaceAfter="6.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"/>
@@ -317,7 +327,7 @@
       <blockTable colWidths="211.0,62.0,36.0,27.0,63.0,51.0,46.0,26.0" style="Table_Invoice_Line_Content">
         <tr>
           <td>
-            <para style="terp_default_8">[[ l.name ]]</para>
+            <para style="terp_default_9">[[ l.name ]]</para>
           </td>
           <td>
             <para style="terp_default_9">[[ ', '.join([lt.name for lt in l.invoice_line_tax_id]) ]]</para>
@@ -451,7 +461,7 @@
         </td>
       </tr>
     </blockTable>
-    <blockTable colWidths="530.0" style="Table_Tax_Content_Table">
+    <blockTable colWidths="196.0,334.0" style="Table_Tax_Content_Table">
       <tr>
         <td>
           <para style="terp_default_8">[[ format(o.amount_tax or removeParentNode('blockTable')) ]]</para>
@@ -472,11 +482,16 @@
             <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="62.0,61.0,67.0" style="Table_Tax_Content">
+          <blockTable colWidths="64.0,63.0,69.0" style="Table_Tax_Content">
             <tr>
               <td>
                 <para style="terp_default_Centre_8">[[ t.name ]]</para>
@@ -490,9 +505,25 @@
             </tr>
           </blockTable>
         </td>
+        <td>
+          <blockTable colWidths="167.0,167.0" style="Table_Format_Border">
+            <tr>
+              <td>
+                <para style="terp_default_8">
+                  <font color="white"> </font>
+                </para>
+              </td>
+              <td>
+                <para style="terp_default_8">
+                  <font color="white"> </font>
+                </para>
+              </td>
+            </tr>
+          </blockTable>
+        </td>
       </tr>
     </blockTable>
-    <blockTable colWidths="530.0" style="Table_Border_Style">
+    <blockTable colWidths="530.0" style="Table_Format_Border_2">
       <tr>
         <td>
           <para style="terp_default_2">