From 7d7ac1812dd712dc916c3abe901b8424b674074b Mon Sep 17 00:00:00 2001
From: "saz(OpenERP)" <>
Date: Wed, 15 Sep 2010 16:30:07 +0530
Subject: [PATCH] =?UTF-8?q?Accounting/Payment/=20Print=20Payment=20Order?=
 =?UTF-8?q?=20=20*=20Display=20currency=20symbol=20(=E2=82=AC)=20instead?=
 =?UTF-8?q?=20of=20currency=20name=20(EUR)=20=20*=20use=20external=20or=20?=
 =?UTF-8?q?internal=20header=3F=3F=20confused..=20=20*=20Total=20should=20?=
 =?UTF-8?q?be=20like=20in=20other=20report.(sale=20order,=20invoice=20etc.?=
 =?UTF-8?q?.)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

bzr revid: apa@tinyerp.com-20100915110007-ee2zb86uvespx7n3
---
 addons/account_payment/report/order.rml       | 224 +++++++++---------
 .../account_payment/report/payment_order.py   |  14 +-
 2 files changed, 116 insertions(+), 122 deletions(-)

diff --git a/addons/account_payment/report/order.rml b/addons/account_payment/report/order.rml
index e2f52c07b7d..792897fb782 100644
--- a/addons/account_payment/report/order.rml
+++ b/addons/account_payment/report/order.rml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <document filename="test.pdf">
-  <template pageSize="(595.0,842.0)" title="Payment" author="OpenERP S.A. (sales@openerp.com)" allowSplitting="20">
+  <template pageSize="(595.0,842.0)" title="Payment Order" author="OpenERP S.A. (sales@openerp.com)" allowSplitting="20">
     <pageTemplate id="first">
       <frame id="first" x1="34.0" y1="34.0" width="527" height="774"/>
     </pageTemplate>
@@ -10,15 +10,51 @@
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
     </blockTableStyle>
-    <blockTableStyle id="Table3">
-      <blockAlignment value="LEFT"/>
-      <blockValign value="TOP"/>
-    </blockTableStyle>
     <blockTableStyle id="Table1">
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
     </blockTableStyle>
-    <blockTableStyle id="Table2">
+    <blockTableStyle id="Table6">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="0,0" stop="0,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="0,0" stop="0,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="1,0" stop="1,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="1,0" stop="1,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="1,-1" stop="1,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="2,0" stop="2,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="2,0" stop="2,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="2,-1" stop="2,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="3,0" stop="3,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="3,0" stop="3,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="3,-1" stop="3,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="4,0" stop="4,-1"/>
+      <lineStyle kind="LINEAFTER" colorName="#cccccc" start="4,0" stop="4,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="4,0" stop="4,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="4,-1" stop="4,-1"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table7">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="0,0" stop="0,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="0,0" stop="0,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="1,0" stop="1,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="1,0" stop="1,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="1,-1" stop="1,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="2,0" stop="2,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="2,0" stop="2,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="2,-1" stop="2,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="3,0" stop="3,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="3,0" stop="3,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="3,-1" stop="3,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="4,0" stop="4,-1"/>
+      <lineStyle kind="LINEAFTER" colorName="#cccccc" start="4,0" stop="4,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="4,0" stop="4,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="4,-1" stop="4,-1"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table3">
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
       <lineStyle kind="LINEBELOW" colorName="#000000" start="0,-1" stop="0,-1"/>
@@ -41,28 +77,25 @@
     <blockTableStyle id="Table5">
       <blockAlignment value="LEFT"/>
       <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"/>
-      <lineStyle kind="LINEBELOW" colorName="#000000" start="5,-1" stop="5,-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="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"/>
     </blockTableStyle>
     <initialize>
       <paraStyle name="all" alignment="justify"/>
     </initialize>
-    <paraStyle name="P1" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="P2" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="Standard" fontName="Times-Roman"/>
+    <paraStyle name="Standard" fontName="Helvetica"/>
     <paraStyle name="Heading" fontName="Helvetica" fontSize="12.0" leading="15" spaceBefore="12.0" spaceAfter="6.0"/>
-    <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="Caption" fontName="Times-Roman" fontSize="12.0" leading="15" spaceBefore="6.0" spaceAfter="6.0"/>
-    <paraStyle name="Index" fontName="Times-Roman"/>
-    <paraStyle name="Table Contents" fontName="Times-Roman"/>
-    <paraStyle name="Table Heading" fontName="Times-Roman" alignment="CENTER"/>
-    <paraStyle name="Footer" fontName="Times-Roman"/>
-    <paraStyle name="Horizontal Line" fontName="Times-Roman" fontSize="6.0" leading="8" spaceBefore="0.0" spaceAfter="14.0"/>
+    <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="Caption" fontName="Helvetica" fontSize="12.0" leading="15" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="Index" fontName="Helvetica"/>
+    <paraStyle name="Table Contents" fontName="Helvetica"/>
+    <paraStyle name="Table Heading" fontName="Helvetica" alignment="CENTER"/>
+    <paraStyle name="Footer" fontName="Helvetica"/>
+    <paraStyle name="Horizontal Line" fontName="Helvetica" fontSize="6.0" leading="8" spaceBefore="0.0" spaceAfter="14.0"/>
     <paraStyle name="terp_header" fontName="Helvetica-Bold" fontSize="12.0" leading="15" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/>
     <paraStyle name="Heading 9" fontName="Helvetica-Bold" fontSize="75%" leading="NaN" spaceBefore="12.0" spaceAfter="6.0"/>
     <paraStyle name="terp_tblheader_General" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.0"/>
@@ -92,7 +125,7 @@
     <para style="terp_default_8">
       <font color="white"> </font>
     </para>
-    <blockTable colWidths="264.0,264.0" style="Table3">
+    <blockTable colWidths="318.0,210.0" style="Table1">
       <tr>
         <td>
           <para style="terp_default_9">
@@ -102,113 +135,82 @@
         <td>
           <para style="terp_default_address">[[ o.mode and o.mode.bank_id.bank and o.mode.bank_id.bank.name or '']]</para>
           <para style="terp_default_address">[[ o.mode and o.mode.bank_id.bank and o.mode.bank_id.bank.street or '']]</para>
-          <para style="terp_default_address">[[ o.mode and o.mode.bank_id.bank and o.mode.bank_id.bank.street2 or '']]</para>
+          <para style="terp_default_address">[[ o.mode and o.mode.bank_id.bank and o.mode.bank_id.bank.street2 or removeParentNode('para')]]</para>
           <para style="terp_default_address">[[ o.mode and o.mode.bank_id.bank and o.mode.bank_id.bank.zip or '']] [[ o.mode and o.mode.bank_id.bank and o.mode.bank_id.bank.city or '']]</para>
-          <para style="terp_default_address">[[ o.mode and o.mode.bank_id.bank and o.mode.bank_id.bank.state and o.mode.bank_id.bank.state.name or '' ]]</para>
+          <para style="terp_default_address">[[ o.mode and o.mode.bank_id.bank and o.mode.bank_id.bank.state and o.mode.bank_id.bank.state.name or removeParentNode('para') ]]</para>
           <para style="terp_default_address">[[ o.mode and o.mode.bank_id.bank and o.mode.bank_id.bank.country and o.mode.bank_id.bank.country.name or '']]</para>
         </td>
       </tr>
     </blockTable>
-    <para style="terp_default_Space">
-      <font color="white"> </font>
-    </para>
-    <para style="Standard">
+    <para style="terp_default_8">
       <font color="white"> </font>
     </para>
     <para style="terp_header">Payment Order / Payment</para>
-    <para style="terp_default_9">
+    <para style="terp_default_8">
       <font color="white"> </font>
     </para>
-    <blockTable colWidths="94.0,434.0" style="Table1">
+    <blockTable colWidths="106.0,106.0,106.0,106.0,106.0" style="Table6">
       <tr>
         <td>
-          <para style="terp_default_9">Payment Type</para>
+          <para style="terp_tblheader_General_Centre">Payment Type</para>
         </td>
         <td>
-          <para style="P1">[[ o.mode and o.mode.name or '-' ]]</para>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <para style="terp_default_9">Reference</para>
+          <para style="terp_tblheader_General_Centre">Reference</para>
         </td>
         <td>
-          <para style="P1">[[ o.reference or '-' ]]</para>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <para style="terp_default_9">Used Account </para>
+          <para style="terp_tblheader_General_Centre">Used Account</para>
         </td>
         <td>
-          <para style="P1">[[ get_account_name(o.mode.bank_id.id) ]]</para>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <para style="terp_default_9">Execution Type</para>
+          <para style="terp_tblheader_General_Centre">Execution Type</para>
         </td>
         <td>
-          <para style="P1">[[ o.date_prefered == 'now' and 'Now' or removeParentNode('para') ]]</para>
-          <para style="P1">[[ o.date_prefered == 'due' and 'Due date' or removeParentNode('para') ]]</para>
-          <para style="P1">[[ o.date_prefered == 'fixed' and 'Fixed date' or removeParentNode('para') ]]</para>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <para style="terp_default_9">Company Currency</para>
-        </td>
-        <td>
-          <para style="P1">[[ get_company_currency() ]]</para>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <para style="terp_default_9">
-            <font color="white"> </font>
-          </para>
-        </td>
-        <td>
-          <para style="P1">
-            <font color="white"> </font>
-          </para>
+          <para style="terp_tblheader_General_Centre">Company Currency</para>
+        </td>
+      </tr>
+    </blockTable>
+    <blockTable colWidths="106.0,106.0,106.0,106.0,106.0" style="Table7">
+      <tr>
+        <td>
+          <para style="terp_default_Centre_8">[[ o.mode and o.mode.name or '-' ]]</para>
+        </td>
+        <td>
+          <para style="terp_default_Centre_8">[[ o.reference or '-' ]]</para>
+        </td>
+        <td>
+          <para style="terp_default_Centre_8">[[get_account_name(o.mode.bank_id.id)]]</para>
+        </td>
+        <td>
+          <para style="terp_default_Centre_8">[[ o.date_prefered == 'now' and 'Now' or removeParentNode('para') ]]</para>
+          <para style="terp_default_Centre_8">[[ o.date_prefered == 'due' and 'Due date' or removeParentNode('para') ]]</para>
+          <para style="terp_default_Centre_8">[[ o.date_prefered == 'fixed' and 'Fixed date' or removeParentNode('para') ]]</para>
+        </td>
+        <td>
+          <para style="terp_default_Centre_8">[[ get_company_currency() ]]</para>
         </td>
       </tr>
     </blockTable>
-    <para style="terp_default_2">
-      <font color="white"> </font>
-    </para>
     <para style="terp_default_9">
       <font color="white"> </font>
     </para>
-    <para style="terp_default_space_0.2">
-      <font color="white"> </font>
-    </para>
-    <para style="terp_default_9">
-      <font color="white"> </font>
-    </para>
-    <para style="terp_default_space_0.2">
-      <font color="white"> </font>
-    </para>
-    <blockTable colWidths="72.0,85.0,111.0,83.0,62.0,115.0" style="Table2">
+    <blockTable colWidths="112.0,86.0,106.0,63.0,85.0,75.0" style="Table3">
       <tr>
         <td>
           <para style="terp_tblheader_Details">Partner</para>
         </td>
         <td>
-          <para style="terp_tblheader_Details">Bank account</para>
+          <para style="terp_tblheader_Details_Centre">Bank Account</para>
         </td>
         <td>
-          <para style="terp_tblheader_Details">Invoice reference</para>
+          <para style="terp_tblheader_Details_Centre">Invoice Ref</para>
         </td>
         <td>
-          <para style="terp_tblheader_Details_Right">Value date</para>
+          <para style="terp_tblheader_Details_Centre">Value Date</para>
         </td>
         <td>
-          <para style="terp_tblheader_Details_Right">Amount</para>
+          <para style="terp_tblheader_Details_Right">Amount([[ get_company_currency() ]])</para>
         </td>
         <td>
-          <para style="terp_tblheader_Details_Right">Amount in currency</para>
+          <para style="terp_tblheader_Details_Right">Currency</para>
         </td>
       </tr>
     </blockTable>
@@ -217,63 +219,49 @@
     </para>
     <section>
       <para style="terp_default_9">[[repeatIn(o.line_ids, 'line') ]]</para>
-      <blockTable colWidths="72.0,85.0,111.0,84.0,62.0,114.0" style="Table4">
+      <blockTable colWidths="112.0,86.0,106.0,64.0,85.0,75.0" style="Table4">
         <tr>
           <td>
             <para style="terp_default_9">[[line.partner_id and line.partner_id.name or '-' ]]</para>
           </td>
           <td>
-            <para style="terp_default_9">[[ get_account_name(line.bank_id.id) or '-']]</para>
+            <para style="terp_default_Centre_9">[[get_account_name(line.bank_id.id) or '-']]</para>
           </td>
           <td>
-            <para style="terp_default_9">[[ get_invoice_name(line.ml_inv_ref.id) or '-' ]]</para>
+            <para style="terp_default_Centre_9">[[ get_invoice_name(line.ml_inv_ref.id) or '-' ]]</para>
           </td>
           <td>
-            <para style="terp_default_Right_9">[[line.date=='False' and '-' or line.date ]]</para>
+            <para style="terp_default_Centre_9">[[line.date=='False' and '-' or formatLang(line.date,date=True) ]]</para>
           </td>
           <td>
-            <para style="terp_default_Right_9">[[formatLang(line.amount) or '-' ]]</para>
+            <para style="terp_default_Right_9">[[formatLang(line.amount) or '-' ]] [[get_company_currency_symbol()]] </para>
           </td>
           <td>
-            <para style="terp_default_Right_9">[[ formatLang(line.amount_currency) ]] [[ line.currency.name ]]</para>
+            <para style="terp_default_Right_9">[[ formatLang(line.amount_currency) ]] [[ line.currency.name ]] </para>
           </td>
         </tr>
       </blockTable>
-      <para style="terp_default_2">
-        <font color="white"> </font>
-      </para>
     </section>
-    <para style="Standard">
-      <font color="white"> </font>
-    </para>
-    <blockTable colWidths="72.0,85.0,111.0,84.0,62.0,114.0" style="Table5">
+    <blockTable colWidths="304.0,64.0,85.0,75.0" style="Table5">
       <tr>
-        <td>
-          <para style="terp_default_9"/>
-        </td>
         <td>
           <para style="terp_default_9">
             <font color="white"> </font>
           </para>
         </td>
         <td>
-          <para style="terp_default_9">
-            <font color="white"> </font>
-          </para>
+          <para style="terp_default_Bold_9">Total:([[ get_company_currency() ]])</para>
         </td>
         <td>
-          <para style="P2">Total:</para>
+          <para style="terp_default_Right_9">[[ formatLang(get_amount_total(o)) or '' ]] [[get_company_currency_symbol()]] </para>
         </td>
         <td>
-          <para style="terp_default_Right_9">[[ formatLang(get_amount_total(o)) or '' ]]</para>
-        </td>
-        <td>
-          <para style="terp_default_Right_9">[[ formatLang(get_amount_total_in_currency(o)) or '' ]] [[ get_amount_total_in_currency(o) and line.currency.name ]]</para>
+          <para style="terp_default_Right_9">[[ formatLang(get_amount_total_in_currency(o)) or '' ]] [[ line.currency.name ]] </para>
         </td>
       </tr>
     </blockTable>
-    <para style="Standard">
+    <para style="terp_default_8">
       <font color="white"> </font>
     </para>
   </story>
-</document>
+</document>
\ No newline at end of file
diff --git a/addons/account_payment/report/payment_order.py b/addons/account_payment/report/payment_order.py
index e82bae991df..a00c7a7871b 100644
--- a/addons/account_payment/report/payment_order.py
+++ b/addons/account_payment/report/payment_order.py
@@ -32,6 +32,7 @@ class payment_order(report_sxw.rml_parse):
             'time': time,
             'get_invoice_name': self._get_invoice_name,
             'get_company_currency' : self._get_company_currency,
+            'get_company_currency_symbol': self._get_company_currency_symbol,         
             'get_amount_total_in_currency' : self._get_amount_total_in_currency,
             'get_amount_total' : self._get_amount_total,
             'get_account_name' : self._get_account_name,
@@ -69,8 +70,13 @@ class payment_order(report_sxw.rml_parse):
     def _get_company_currency(self):
         pool = pooler.get_pool(self.cr.dbname)
         user = pool.get('res.users').browse(self.cr, self.uid, self.uid)
-        return user.company_id and user.company_id.currency_id and user.company_id.currency_id.name or False
-    
+        return user.company_id and user.company_id.currency_id and user.company_id.currency_id.code or False
+
+    def _get_company_currency_symbol(self):
+        pool = pooler.get_pool(self.cr.dbname)
+        user = pool.get('res.users').browse(self.cr, self.uid, self.uid)
+        return user.company_id and user.company_id.currency_id and user.company_id.currency_id.symbol or False
+
     def _get_account_name(self,bank_id):
         if bank_id:
             pool = pooler.get_pool(self.cr.dbname)
@@ -79,6 +85,6 @@ class payment_order(report_sxw.rml_parse):
                 return value_name[0][1]
         return False
 
-report_sxw.report_sxw('report.payment.order', 'payment.order', 'addons/account_payment/report/payment_order.rml', parser=payment_order, header="internal")
+report_sxw.report_sxw('report.payment.order', 'payment.order', 'addons/account_payment/report/payment_order.rml', parser=payment_order, header="external")
 
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: