From 5fb2432893165b2934519b11939bc64db447a746 Mon Sep 17 00:00:00 2001
From: "rch (Open ERP)" <>
Date: Mon, 20 Sep 2010 14:57:59 +0530
Subject: [PATCH] [IMP]: Improve report 'Auction Management/ Objects /Objects /
 Catelog'.

bzr revid: rch_open_erp-20100920092759-yg2hrub0v8hm5hqk
---
 addons/auction/report/auction_catelog.rml | 62 +++++++++++------------
 1 file changed, 29 insertions(+), 33 deletions(-)

diff --git a/addons/auction/report/auction_catelog.rml b/addons/auction/report/auction_catelog.rml
index 02027055131..8a98fcac918 100644
--- a/addons/auction/report/auction_catelog.rml
+++ b/addons/auction/report/auction_catelog.rml
@@ -9,72 +9,69 @@
     <blockTableStyle id="Standard_Outline">
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
-
     </blockTableStyle>
     <blockTableStyle id="Table3">
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
-      <blockAlignment value="RIGHT" start="-1,0" stop="-1,-1"/>
-			 <blockFont name="Helvetica-BoldOblique" size="12" start="0,0" stop="-1,0"/>
-			 <blockBackground colorName="grey" start="0,0" stop="-1,0"/>
-			 <blockTextColor colorName="white" start="0,0" stop="-1,0"/>
-			 <lineStyle kind="LINEBELOW" start="0,0" stop="-1,0"/>
+      <blockBackground colorName="#ffffff" start="0,0" stop="0,-1"/>
+      <blockBackground colorName="#ffffff" start="1,0" stop="1,-1"/>
+      <blockBackground colorName="#ffffff" start="2,0" stop="2,-1"/>
     </blockTableStyle>
     <initialize>
       <paraStyle name="all" alignment="justify"/>
-
-
     </initialize>
-    <paraStyle name="P1" fontName="Times-Roman" alignment="RIGHT"/>
-    <paraStyle name="P2" fontName="Times-Roman" fontSize="8.0" leading="10" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="P3" fontName="Times-Roman" fontSize="12.0" leading="15" alignment="LEFT" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="P4" fontName="Times-Roman" fontSize="12.0" leading="15" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="P5" rightIndent="17.0" leftIndent="0.0" fontName="Times-Roman" fontSize="6.0" leading="8" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="P6" rightIndent="17.0" leftIndent="0.0" fontName="Courier" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="P7" rightIndent="17.0" leftIndent="0.0" fontName="Courier" fontSize="9.0" leading="11" alignment="RIGHT" 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"/>
-    <paraStyle name="Table Contents" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="Table Heading" fontName="Times-Roman" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="Caption" fontName="Times-Roman" fontSize="10.0" leading="13" spaceBefore="6.0" spaceAfter="6.0"/>
-    <paraStyle name="Index" fontName="Times-Roman"/>
+    <paraStyle name="P1" fontName="Helvetica" alignment="RIGHT"/>
+    <paraStyle name="P2" fontName="Helvetica" fontSize="16.0" leading="20" alignment="CENTER"/>
+    <paraStyle name="P3" rightIndent="17.0" leftIndent="0.0" fontName="Helvetica" fontSize="6.0" leading="8" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="P4" rightIndent="17.0" leftIndent="0.0" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="P5" rightIndent="17.0" leftIndent="0.0" fontName="Helvetica" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="P6" fontName="Helvetica-Bold" fontSize="12.0" leading="15" alignment="LEFT" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="P7" fontName="Helvetica-Bold" fontSize="12.0" leading="15" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="Standard" fontName="Helvetica"/>
+    <paraStyle name="Text body" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="List" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="Table Contents" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="Table Heading" fontName="Helvetica" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="Caption" fontName="Helvetica" fontSize="10.0" leading="13" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="Index" fontName="Helvetica"/>
+    <images/>
   </stylesheet>
   <story>
     <para style="Standard">
       <font color="white"> </font>
     </para>
-    <para style="P1">[[ time.strftime('%Y-%m-%d') ]] </para>
+    <para style="P2">Catelog</para>
     <para style="P1">
       <font color="white"> </font>
     </para>
-    <para style="P2">
+    <para style="P1">
       <font color="white"> </font>
     </para>
-    <para style="Standard">
+    <para style="P1"><font face="Helvetica">Date</font>: [[ formatLang(time.strftime('%Y-%m-%d'),date=True) ]] </para>
+    <para style="P1">
       <font color="white"> </font>
     </para>
     <blockTable colWidths="65.0,398.0,94.0" style="Table3">
       <tr>
         <td>
-          <para style="P3">Cat.N</para>
+          <para style="P6">Cat.N</para>
         </td>
         <td>
-          <para style="P3">Description</para>
+          <para style="P6">Description</para>
         </td>
         <td>
-          <para style="P4">Estimate</para>
+          <para style="P7">Estimate</para>
         </td>
       </tr>
       <tr>
         <td>
-          <para style="P5">[[ repeatIn(objects,'o') ]] <font face="Courier" size="9.0">[[o. obj_num ]]</font></para>
+          <para style="P3">[[ repeatIn(objects,'o') ]] <font face="Helvetica" size="9.0">[[o. obj_num ]]</font></para>
         </td>
         <td>
-          <para style="P6">[[o. name]]</para>
+          <para style="P4">[[o. name]]</para>
         </td>
         <td>
-          <para style="P7">[[o. lot_est1 ]]-[[o.lot_est2]]</para>
+          <para style="P5">[[formatLang(o. lot_est1) ]][[ company.currency_id.symbol ]]-[[formatLang(o.lot_est2)]][[ company.currency_id.symbol ]]</para>
         </td>
       </tr>
     </blockTable>
@@ -82,5 +79,4 @@
       <font color="white"> </font>
     </para>
   </story>
-</document>
-
+</document>
\ No newline at end of file