From 7f3bf1c5d22bab7a11456a930ea0f33d372855e0 Mon Sep 17 00:00:00 2001
From: Dhara Shah <dsh@tinyerp.com>
Date: Fri, 11 May 2007 06:45:54 +0000
Subject: [PATCH] with indentation

bzr revid: dsh@tinyerp.com-6218996c58be07484586dd9f8e8f338e2ca1b6c4
---
 .../report/accounting_report.py               |   7 +-
 .../report/accounting_report.rml              | 115 ++++++++++++++----
 2 files changed, 97 insertions(+), 25 deletions(-)

diff --git a/addons/account_report/report/accounting_report.py b/addons/account_report/report/accounting_report.py
index cb8f13abceb..2d85966a116 100755
--- a/addons/account_report/report/accounting_report.py
+++ b/addons/account_report/report/accounting_report.py
@@ -38,18 +38,21 @@ class accounting_report(report_sxw.rml_parse):
 			'childs':self.process
 		})
 
-	def process(self,id):
+	def process(self,id,level=0):
 		res = pooler.get_pool(self.cr.dbname).get('account.report.report').read(self.cr,self.uid,[id])
 		ret_dict={
 				  'name':res[0]['name'],
 				  'code':res[0]['code'],
 				  'amount':res[0]['amount'],
 				  'note':res[0]['note'],
+				  'level': level,
+				  'color_font':res[0]['color_font'],
 				  }
 
 		self.ret_list.append(ret_dict)
 		for child_id in res[0]['child_ids']:
-				self.process(child_id)
+				self.process(child_id,level+1)
+		print "====return list=========",self.ret_list
 		return self.ret_list
 
 
diff --git a/addons/account_report/report/accounting_report.rml b/addons/account_report/report/accounting_report.rml
index 6600624a457..2f485c27662 100644
--- a/addons/account_report/report/accounting_report.rml
+++ b/addons/account_report/report/accounting_report.rml
@@ -11,25 +11,50 @@
       <blockValign value="TOP"/>
     </blockTableStyle>
     <blockTableStyle id="Table2">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <blockBackground colorName="#e6e6e6" start="0,0" stop="0,0"/>
+      <blockBackground colorName="#e6e6e6" start="1,0" stop="1,0"/>
+      <blockBackground colorName="#e6e6e6" start="2,0" stop="2,0"/>
+      <blockBackground colorName="#e6e6e6" start="0,1" stop="0,1"/>
+      <blockBackground colorName="#e6e6e6" start="1,1" stop="1,1"/>
+      <blockBackground colorName="#e6e6e6" start="2,1" stop="2,1"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table4">
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
       <lineStyle kind="GRID" colorName="black"/>
       <blockBackground colorName="#e6e6e6" start="0,0" stop="0,0"/>
       <blockBackground colorName="#e6e6e6" start="1,0" stop="1,0"/>
       <blockBackground colorName="#e6e6e6" start="2,0" stop="2,0"/>
-      <blockBackground colorName="#e6e6e6" start="3,0" stop="3,0"/>
     </blockTableStyle>
-    <blockTableStyle id="Table1">
+    <blockTableStyle id="Table3">
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
+      <blockBackground colorName="#ffffcc" start="0,0" stop="0,0"/>
+      <blockBackground colorName="#ffffcc" start="1,0" stop="1,0"/>
+      <blockBackground colorName="#ffffcc" start="2,0" stop="2,0"/>
+      <blockBackground colorName="#ffffcc" start="0,1" stop="0,1"/>
+      <blockBackground colorName="#ffffcc" start="1,1" stop="1,1"/>
+      <blockBackground colorName="#ffffcc" start="2,1" stop="2,1"/>
     </blockTableStyle>
     <initialize>
       <paraStyle name="all" alignment="justify"/>
     </initialize>
-    <paraStyle name="P1" fontName="Times-Roman" fontSize="10.0" leading="13" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="P2" fontName="Times-Bold" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="P3" fontName="Times-Bold" fontSize="10.0" leading="13" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="P4" fontName="Times-Bold" fontSize="8.0" leading="10" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="P1" fontName="Times-Roman" fontSize="8.0" leading="10" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P2" fontName="Times-Roman" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P3" fontName="Times-Roman" fontSize="16.0" leading="20" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P4" fontName="Times-Roman" fontSize="10.0" leading="13" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P5" fontName="Times-Roman" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P6" fontName="Times-Bold" fontSize="18.0" leading="22" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P7" fontName="Times-BoldItalic" fontSize="10.0" leading="13" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P8" fontName="Times-Roman" fontSize="13.0" leading="16" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P9" fontName="Times-Roman" fontSize="10.0" leading="13" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P10" fontName="Times-Roman" fontSize="11.0" leading="14" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P11" fontName="Times-Roman" fontSize="11.0" leading="14" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P12" fontName="Times-Roman" fontSize="11.0" leading="14" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P13" fontName="Times-Roman" fontSize="11.0" leading="14" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P14" fontName="Times-Bold" fontSize="11.0" leading="14" 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"/>
@@ -39,38 +64,82 @@
     <paraStyle name="Index" fontName="Times-Roman"/>
   </stylesheet>
   <story>
-    <para style="P1">[[repeatIn(objects,'o')]]</para>
+    <para style="P1">[[ repeatIn(objects,'o') ]]</para>
+    <blockTable colWidths="146.0,223.0,158.0" repeatRows="1" style="Table2">
+      <tr>
+        <td>
+          <para style="P2">
+            <font color="white"> </font>
+          </para>
+        </td>
+        <td>
+          <para style="P3">Accounting Report</para>
+        </td>
+        <td>
+          <para style="P4">
+            <font color="white"> </font>
+          </para>
+        </td>
+      </tr>
+      <tr>
+        <td>
+          <para style="P5">[[ company.name ]]</para>
+        </td>
+        <td>
+          <para style="P6">
+            <font color="white"> </font>
+          </para>
+        </td>
+        <td>
+          <para style="P4">Currency: <font face="Times-Roman" size="11.0">[[ company.currency_id.name]]</font></para>
+        </td>
+      </tr>
+    </blockTable>
+    <para style="P7">Printing date: [[ time.strftime('%Y-%m-%d') ]] at [[ time.strftime('%H:%M:%S') ]]</para>
+    <blockTable colWidths="361.0,73.0,93.0" repeatRows="1" style="Table4">
+      <tr>
+        <td>
+          <para style="P8">Name</para>
+        </td>
+        <td>
+          <para style="P8">Code</para>
+        </td>
+        <td>
+          <para style="P8">Amount</para>
+        </td>
+      </tr>
+    </blockTable>
+    <para style="P7">
+      <font color="white"> </font>
+    </para>
     <section>
-      <blockTable colWidths="165.0,81.0,87.0,195.0" repeatRows="1" style="Table2">
+      <para style="P9">[[repeatIn(childs(o.id),'obj')]]</para>
+      <blockTable colWidths="362.0,73.0,93.0" repeatRows="1" style="Table3">
         <tr>
           <td>
-            <para style="P2">Name</para>
+            <para style="P10">[[ "        "*(obj['level']) + obj['name'] ]][[ setTag('para','xpre') ]]</para>
           </td>
           <td>
-            <para style="P2">Code </para>
+            <para style="P10">[[obj['code'] ]]</para>
           </td>
           <td>
-            <para style="P2">Amount</para>
-          </td>
-          <td>
-            <para style="P2">Notes</para>
+            <para style="P11">[['%.2f' % obj['amount'] ]]</para>
           </td>
         </tr>
-      </blockTable>
-      <blockTable colWidths="165.0,81.0,87.0,195.0" repeatRows="1" style="Table1">
         <tr>
           <td>
-            <para style="P3">[[ repeatIn(childs(o.id),'obj') ]]</para>
-            <para style="P3">[[ obj['name'] ]]</para>
+            <para style="P12">[[ repeatIn((obj['note'] and obj['note'].splitlines()) or [], 'l') ]]</para>
+            <para style="P13">[[ l or removeParentNode('table') ]]</para>
           </td>
           <td>
-            <para style="P3">[[ obj['code'] ]]</para>
+            <para style="P13">
+              <font color="white"> </font>
+            </para>
           </td>
           <td>
-            <para style="P3">[[ obj['amount'] ]]</para>
-          </td>
-          <td>
-            <para style="P4">[[ obj['note'] ]]</para>
+            <para style="P14">
+              <font color="white"> </font>
+            </para>
           </td>
         </tr>
       </blockTable>