[IMP]: Improve report 'Auction Management / Objects /Objects / Buyer list' - date format , title ,color ,font ,currency symbol.

bzr revid: rch_open_erp-20100920121943-c8e228nljaym7w5x

1 files changed, 53 insertions, 46 deletions

diff --git a/addons/auction/report/buyer_list.rml b/addons/auction/report/buyer_list.rml
index 245617a7f86..4ac6e6694e1 100644
--- a/addons/auction/report/buyer_list.rml
+++ b/addons/auction/report/buyer_list.rml
@@ -12,85 +12,93 @@
     </blockTableStyle>
     <blockTableStyle id="Table2">
       <blockAlignment value="LEFT"/>
-     <lineStyle kind="LINEBELOW" colorName="red" start="0,0" stop="-1,0"/>
       <blockValign value="TOP"/>
+      <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="LINEBELOW" colorName="#000000" start="3,-1" stop="3,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="4,-1" stop="4,-1"/>
     </blockTableStyle>
-    <blockTableStyle id="Tableau1">
+    <blockTableStyle id="Table1">
       <blockAlignment value="LEFT"/>
-       <lineStyle kind="LINEABOVE" colorName="red" start="0,0" stop="-1,0"/>
       <blockValign value="TOP"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="0,0" stop="0,0"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="1,0" stop="1,0"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="2,0" stop="2,0"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="3,0" stop="3,0"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="4,0" stop="4,0"/>
     </blockTableStyle>
     <initialize>
       <paraStyle name="all" alignment="justify"/>
     </initialize>
-    <paraStyle name="P1" fontName="Courier-BoldOblique" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="P2" fontName="Times-Roman" fontSize="7.0" leading="9"/>
-    <paraStyle name="P3" fontName="Times-Bold" fontSize="7.0" leading="9" alignment="LEFT" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="P4" fontName="Times-Bold" fontSize="11.0" leading="14" alignment="center" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="P5" fontName="Times-Bold" fontSize="11.0" leading="14" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="P6" fontName="Times-Bold" fontSize="11.0" leading="14" alignment="center" 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="Addressee" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="3.0"/>
-    <paraStyle name="Index" fontName="Times-Roman"/>
-      <paraStyle name="P61" fontName="Times-Bold" fontSize="11.0" leading="14" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P1" fontName="Helvetica" fontSize="7.0" leading="9"/>
+    <paraStyle name="P2" fontName="Helvetica-Bold" fontSize="7.0" leading="9" alignment="LEFT" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="P3" fontName="Helvetica-Bold" fontSize="11.0" leading="14" alignment="LEFT" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="P4" fontName="Helvetica-Bold" fontSize="11.0" leading="14" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="P5" fontName="Helvetica-Bold" fontSize="11.0" leading="14" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="P6" fontName="Helvetica-Bold" fontSize="11.0" leading="14" alignment="LEFT" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="P7" fontName="Helvetica-Bold" fontSize="11.0" leading="14" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="P8" fontName="Courier-BoldOblique" fontSize="8.0" leading="10" 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="Addressee" fontName="Helvetica" spaceBefore="0.0" spaceAfter="3.0"/>
+    <paraStyle name="Index" fontName="Helvetica"/>
+
   </stylesheet>
   <story>
-    <para style="P3">
+    <para style="P2">
       <font color="white"> </font>
     </para>
-    <para style="P5">[[ time.strftime('%d/%m/%Y')]]</para>
-    <para style="P4">[[ repeatIn(lines_lots_from_auction(objects),'o') ]]</para>
-    <para style="P4">
+    <para style="P4">Date: [[ formatLang(time.strftime('%Y-%m-%d'),date=True)]]</para>
+    <para style="P3">[[ repeatIn(lines_lots_from_auction(objects),'o') ]]</para>
+    <para style="P3">
       <font color="white"> </font>
     </para>
-    <para style="P6">[[o['name'] or False]]</para>
-    <para style="P2">
+    <para style="P5">[[o['name'] or False]]</para>
+    <para style="P1">
       <font color="white"> </font>
     </para>
     <section>
-      <para style="P2">
+      <para style="P1">
         <font color="white"> </font>
       </para>
       <blockTable colWidths="131.0,39.0,89.0,121.0,140.0" style="Table2">
         <tr>
           <td>
-            <para style="P6">Buyer </para>
+            <para style="P5">Buyer </para>
           </td>
           <td>
-            <para style="P6">#</para>
+            <para style="P5">Lot</para>
           </td>
           <td>
-            <para style="P6">Adj(EUR)</para>
+            <para style="P5">Adj.([[ company.currency_id.code ]])</para>
           </td>
           <td>
-            <para style="P6">Buyer costs([[ o['amount' ]*100 ]]%)</para>
+            <para style="P5">Buyer costs([[ o['amount' ]*100 ]]%)</para>
           </td>
           <td>
-            <para style="P6">To pay</para>
+            <para style="P5">To pay ([[ company.currency_id.code ]])</para>
           </td>
         </tr>
         <tr>
           <td>
-            <para style="P61">[[ repeatIn(lines_lots_auct_lot(o),'a') ]] </para>
-             <para style="P61">[[ a['ach_uid'] ]]</para>
+            <para style="P5">[[ repeatIn(lines_lots_auct_lot(o),'a') ]][[ a['ach_uid'] ]]</para>
           </td>
           <td>
-            <para style="P4">[[ a['no_lot'] or '0.0' ]]</para>
+            <para style="P3">[[ a['no_lot'] or '0.0' ]]</para>
           </td>
           <td>
-            <para style="P4">[[ a['adj_price'] or '0.0' ]]</para>
-
+            <para style="P5">[[ a['adj_price']) or '0.0' ]][[ company.currency_id.symbol ]]</para>
           </td>
           <td>
-            <para style="P4">[[ a['buyer_cost'] or '0.0' ]]</para>
+            <para style="P5">[[ a['buyer_cost'] or '0.0' ]][[ company.currency_id.symbol ]]</para>
           </td>
           <td>
-            <para style="P4">[[a['to_pay'] or '0.0' ]]</para>
+            <para style="P5">[[a['to_pay'] or '0.0' ]][[ company.currency_id.symbol ]]</para>
           </td>
         </tr>
       </blockTable>
@@ -100,28 +108,27 @@
         <font color="white"> .........</font>
       </para>
     </section>
-    <blockTable colWidths="127.0,43.0,87.0,122.0,140.0" style="Tableau1">
+    <blockTable colWidths="127.0,43.0,87.0,122.0,140.0" style="Table1">
       <tr>
         <td>
-          <para style="P6">Total:</para>
+          <para style="P5">Total:</para>
         </td>
         <td>
-          <para style="P4">[[ '%.0f' % (sum_lots() or 0.0)  ]]</para>
+          <para style="P3">[[ '%.0f' % (sum_lots() or 0.0) ]]</para>
         </td>
         <td>
-          <para style="P6">[[  '%.2f' % (sum_adj_price() or 0.0)  ]]</para>
+          <para style="P5">[[ '%.2f' % (sum_adj_price() or 0.0 )]][[ company.currency_id.symbol ]]</para>
         </td>
         <td>
-          <para style="P6">[[ '%.2f' % (sum_buyer_obj_price() or 0.0)  ]]</para>
+          <para style="P5">[[ '%.2f' % (sum_buyer_obj_price() or 0.0) ]][[ company.currency_id.symbol ]]</para>
         </td>
         <td>
-          <para style="P6">[[ '%.2f' % (sum_buyer_price() or 0.0)   ]]</para>
+          <para style="P5">[[ '%.2f' % (sum_buyer_price() or 0.0) ]][[ company.currency_id.symbol ]]</para>
         </td>
       </tr>
     </blockTable>
-    <para style="P1">
+    <para style="P8">
       <font color="white"> </font>
     </para>
   </story>
-</document>
-
+</document>
\ No newline at end of file