set formatLang function for header/footer date in account report

bzr revid: apa@tinyerp.com-20090124074311-33ibntguf7a48pfm

diff --git a/addons/account/report/account_balance.rml b/addons/account/report/account_balance.rml
index e63ab03..64f448c 100644 (file)
--- a/addons/account/report/account_balance.rml
+++ b/addons/account/report/account_balance.rml
@@ -13,7 +13,7 @@
 
                                <!--COL 2-->
                                <setFont name="Helvetica" size="9"/>
-                               <drawString x="1.0cm" y="1cm"> [[ time.strftime("%m-%d-%y %H:%M", time.localtime()) ]]</drawString>
+                               <drawString x="1.0cm" y="1cm"> [[ formatLang(time.strftime("%Y-%m-%d %H:%M:%S", time.localtime()),date_time = True) ]]</drawString>
                                <drawString x="19.0cm" y="1cm">Page <pageNumber/></drawString>
 
                            <lineMode width="0.7"/>

diff --git a/addons/account/report/account_journal.rml b/addons/account/report/account_journal.rml
index 66bee05..9e782e5 100644 (file)
--- a/addons/account/report/account_journal.rml
+++ b/addons/account/report/account_journal.rml
@@ -24,7 +24,7 @@
 
 
                                <setFont name="Helvetica" size="9"/>
-                               <drawString x="1.0cm" y="1cm"> [[ time.strftime("%Y-%m-%d %H:%M", time.localtime()) ]]</drawString>
+                               <drawString x="1.0cm" y="1cm"> [[ formatLang(time.strftime("%Y-%m-%d %H:%M:%S", time.localtime()),date_time = True) ]]</drawString>
                                <drawString x="19.0cm" y="1cm">Page <pageNumber/></drawString>
                                <!--<drawRightString x="19.8cm" y="28cm">[[ company.rml_header1 ]]</drawRightString>-->
 

diff --git a/addons/account/report/account_tax_code.rml b/addons/account/report/account_tax_code.rml
index 2a4a6bb..72bbf56 100644 (file)
--- a/addons/account/report/account_tax_code.rml
+++ b/addons/account/report/account_tax_code.rml
@@ -16,7 +16,7 @@
                                
                                
                                <setFont name="Helvetica" size="9"/>
-                               <drawString x="1.0cm" y="1cm"> [[ time.strftime("%m-%d-%Y %H:%M", time.localtime()) ]]</drawString>
+                               <drawString x="1.0cm" y="1cm"> [[ formatLang(time.strftime("%Y-%m-%d %H:%M:%S", time.localtime()),date_time = True) ]]</drawString>
                                <drawString x="19.0cm" y="1cm">Page <pageNumber/></drawString>
                                <!--<drawRightString x="19.8cm" y="28cm">[[ company.rml_header1 ]]</drawRightString>-->
                                

diff --git a/addons/account/report/aged_trial_balance.rml b/addons/account/report/aged_trial_balance.rml
index d3658c6..e566cb4 100644 (file)
--- a/addons/account/report/aged_trial_balance.rml
+++ b/addons/account/report/aged_trial_balance.rml
@@ -21,7 +21,7 @@
                                <!--COL 2-->
                                <setFont name="Helvetica" size="9"/>
                                
-                               <drawString x="1.5cm" y="0.90cm"> [[ time.strftime('%Y-%m-%d %H:%M', time.localtime()) ]]</drawString>
+                               <drawString x="1.5cm" y="0.90cm"> [[ formatLang(time.strftime("%Y-%m-%d %H:%M:%S", time.localtime()),date_time = True) ]]</drawString>
                                <drawString x="36.90cm" y="0.90cm">Page <pageNumber/></drawString>
                                
                                <!--<drawRightString x="19.8cm" y="28cm">[[ company.rml_header1 ]]</drawRightString>-->

diff --git a/addons/account/report/general_journal.py b/addons/account/report/general_journal.py
index b61e09c..9aa8b45 100644 (file)
--- a/addons/account/report/general_journal.py
+++ b/addons/account/report/general_journal.py
@@ -123,7 +123,7 @@ class journal_print(report_sxw.rml_parse):
             return 0.0
         self.cr.execute('select sum(credit) from account_move_line where period_id in (' + self.period_ids + ') and journal_id in (' + self.journal_ids + ') and state<>\'draft\'')
         return self.cr.fetchone()[0] or 0.0
-report_sxw.report_sxw('report.account.general.journal', 'account.journal.period', 'addons/account/report/general_journal.rml',parser=journal_print, header=False)
+report_sxw.report_sxw('report.account.general.journal', 'account.journal.period', 'addons/account/report/general_journal.rml',parser=journal_print)
 report_sxw.report_sxw('report.account.general.journal.wiz', 'account.journal.period', 'addons/account/report/wizard_general_journal.rml',parser=journal_print, header=False)
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

diff --git a/addons/account/report/general_journal.rml b/addons/account/report/general_journal.rml
index 365967e..5a9ccff 100644 (file)
--- a/addons/account/report/general_journal.rml
+++ b/addons/account/report/general_journal.rml
@@ -93,18 +93,20 @@
     <para style="terp_default_8">
       <font color="white"> </font>
     </para>
-    <blockTable colWidths="180.0,180.0,180.0" style="Table_Header_Title">
+    <blockTable colWidths="180.0,180.0,179.0" style="Table_Header_Title">
       <tr>
         <td>
-          <para style="terp_header">[[ company.name ]]</para>
-        </td>
-        <td>
           <para style="terp_header">
             <font color="white"> </font>
           </para>
         </td>
         <td>
-          <para style="terp_header">General Journal - [[ company.currency_id.name ]]</para>
+          <para style="terp_header_Centre">General Journal</para>
+        </td>
+        <td>
+          <para style="terp_header">
+            <font color="white"> </font>
+          </para>
         </td>
       </tr>
     </blockTable>

diff --git a/addons/account/report/general_ledger.rml b/addons/account/report/general_ledger.rml
index c2a5fc7..09c071f 100644 (file)
--- a/addons/account/report/general_ledger.rml
+++ b/addons/account/report/general_ledger.rml
@@ -20,7 +20,7 @@
 
                                <!--COL 2-->
                                <setFont name="Helvetica" size="9"/>
-                               <drawString x="1.0cm" y="1cm"> [[ time.strftime("%d-%m-%Y %H:%M", time.localtime()) ]]</drawString>
+                               <drawString x="1.0cm" y="1cm"> [[ formatLang(time.strftime("%Y-%m-%d %H:%M:%S", time.localtime()),date_time = True) ]]</drawString>
                                <drawString x="19.0cm" y="1cm">Page <pageNumber/></drawString>
                                <!--<drawRightString x="19.8cm" y="28cm">[[ company.rml_header1 ]]</drawRightString>-->
 

diff --git a/addons/account/report/general_ledger_landscape.rml b/addons/account/report/general_ledger_landscape.rml
index 51593ea..c7f9555 100644 (file)
--- a/addons/account/report/general_ledger_landscape.rml
+++ b/addons/account/report/general_ledger_landscape.rml
@@ -20,7 +20,7 @@
 
                                <!--COL 2-->
                                <setFont name="Helvetica" size="9"/>
-                               <drawString x="1.3cm" y="0.90cm"> [[ time.strftime("%d-%m-%Y %H:%M", time.localtime()) ]]</drawString>
+                               <drawString x="1.3cm" y="0.90cm"> [[ formatLang(time.strftime("%Y-%m-%d %H:%M:%S", time.localtime()),date_time = True) ]]</drawString>
                                <drawString x="37.20cm" y="0.90cm">Page <pageNumber/></drawString>
 
                                <!--<drawRightString x="19.8cm" y="28cm">[[ company.rml_header1 ]]</drawRightString>-->

diff --git a/addons/account/report/partner_balance.rml b/addons/account/report/partner_balance.rml
index 55947fa..a096b5a 100644 (file)
--- a/addons/account/report/partner_balance.rml
+++ b/addons/account/report/partner_balance.rml
@@ -24,7 +24,7 @@
 
 
                                <setFont name="Helvetica" size="9"/>
-                               <drawString x="1.0cm" y="1cm"> [[ time.strftime("%Y-%m-%d %H:%M", time.localtime()) ]]</drawString>
+                               <drawString x="1.0cm" y="1cm"> [[ formatLang(time.strftime("%Y-%m-%d %H:%M:%S", time.localtime()),date_time = True) ]]</drawString>
                                <drawString x="19.0cm" y="1cm">Page <pageNumber/></drawString>
                                <!--<drawRightString x="19.8cm" y="28cm">[[ company.rml_header1 ]]</drawRightString>-->
 

diff --git a/addons/account/report/tax_report.rml b/addons/account/report/tax_report.rml
index aa2f25b..1f17874 100644 (file)
--- a/addons/account/report/tax_report.rml
+++ b/addons/account/report/tax_report.rml
@@ -20,7 +20,7 @@
                                
                                
                                <setFont name="Helvetica" size="9"/>
-                               <drawString x="1.0cm" y="1cm"> [[ time.strftime("%Y-%m-%d %H:%M", time.localtime()) ]]</drawString>
+                               <drawString x="1.0cm" y="1cm"> [[ formatLang(time.strftime("%Y-%m-%d %H:%M:%S", time.localtime()),date_time = True) ]]</drawString>
                                <drawString x="19.0cm" y="1cm">Page <pageNumber/></drawString>
                                <!--<drawRightString x="19.8cm" y="28cm">[[ company.rml_header1 ]]</drawRightString>-->
                                

diff --git a/addons/account/report/third_party_ledger.rml b/addons/account/report/third_party_ledger.rml
index d4cfd53..91a9b67 100644 (file)
--- a/addons/account/report/third_party_ledger.rml
+++ b/addons/account/report/third_party_ledger.rml
@@ -24,7 +24,7 @@
 
 
                                <setFont name="Helvetica" size="9"/>
-                               <drawString x="1.0cm" y="1cm"> [[ time.strftime("%Y-%m-%d %H:%M", time.localtime()) ]]</drawString>
+                               <drawString x="1.0cm" y="1cm"> [[ formatLang(time.strftime("%Y-%m-%d %H:%M:%S", time.localtime()),date_time = True) ]]</drawString>
                                <drawString x="19.0cm" y="1cm">Page <pageNumber/></drawString>
                                <!--<drawRightString x="19.8cm" y="28cm">[[ company.rml_header1 ]]</drawRightString>-->