[IMP] Account: Improve the General Journals report

bzr revid: sbh@tinyerp.com-20100714120420-0wifmgpbdnajxv11

diff --git a/addons/account/account_report.xml b/addons/account/account_report.xml
index 39d25b2..5e9f30c 100644 (file)
--- a/addons/account/account_report.xml
+++ b/addons/account/account_report.xml
@@ -7,7 +7,7 @@
         <report auto="False" id="account_account_balance" menu="False" model="account.account" name="account.account.balance" rml="account/report/account_balance.rml" string="Account Balance"/>
         <report auto="False" id="account_3rdparty_account_balance" menu="False" model="account.account" name="account.partner.balance" rml="account/report/partner_balance.rml" string="Partner Balance"/>
         <report auto="False" id="account_central_journal" model="account.journal.period" name="account.central.journal" rml="account/report/central_journal.rml" string="Central Journal"/>
-        <report auto="False" id="account_general_journal" model="account.journal.period" name="account.general.journal" rml="account/report/general_journal.rml" string="General Journal"/>
+        <report auto="False" id="account_general_journal" model="account.journal.period" name="account.general.journal" rml="account/report/general_journal.rml" string="General Journal" header="False"/>
         <report auto="False" id="account_journal" model="account.journal.period" name="account.journal.period.print" rml="account/report/account_journal.rml" string="Journal" header="False"/>
         <report auto="False" id="account_overdue" model="res.partner" name="account.overdue" rml="account/report/overdue.rml" string="Overdue Payments"/>
         <report

diff --git a/addons/account/report/general_journal.py b/addons/account/report/general_journal.py
index 262b2d4..3ce4b33 100644 (file)
--- a/addons/account/report/general_journal.py
+++ b/addons/account/report/general_journal.py
@@ -43,9 +43,11 @@ class journal_print(report_sxw.rml_parse, account_journal_common_default):
             'sum_credit_period': self._sum_credit_period,
             'sum_debit': self._sum_debit,
             'sum_credit': self._sum_credit,
-            'get_start_date': self._get_start_date,
-            'get_end_date': self._get_end_date,
-            'get_filter': self._get_filter
+            'get_fiscalyear': self._get_fiscalyear,
+            'get_account': self._get_account,
+            'get_start_period': self.get_start_period,
+            'get_end_period': self.get_end_period,
+            'get_sortby': self._get_sortby                    
         })
 
     def set_context(self, objects, data, ids, report_type=None): # Improve move to common default?

diff --git a/addons/account/report/general_journal.rml b/addons/account/report/general_journal.rml
index 8837c93..d003c57 100644 (file)
--- a/addons/account/report/general_journal.rml
+++ b/addons/account/report/general_journal.rml
@@ -3,6 +3,32 @@
   <template pageSize="(596.0,842.0)" title="General Journal" author="OpenERP" allowSplitting="20">
     <pageTemplate id="first">
       <frame id="first" x1="28.0" y1="42.0" width="540" height="758"/>
+                       <pageGraphics>
+                               <!--logo-->
+                               <!--<fill color="darkblue"/>-->
+                               <!--<stroke color="darkblue"/>-->
+
+                               <!--TITLE COMPANY-->
+                               <!-- <drawString x="4.6cm" y="28.7cm">[[ company.partner_id.name ]]</drawString> -->
+
+                               <setFont name="Helvetica-Bold" size="9"/>
+
+
+                               <!--COL 1-->
+                               <drawString x="1.0cm" y="28.1cm">[[ company.name ]]</drawString>
+                               <drawString x="16.7cm" y="28.1cm">General Journal - [[ company.currency_id.name ]]</drawString>
+
+                               <!--COL 2-->
+                               <setFont name="Helvetica" size="9"/>
+                               <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>-->
+
+
+                           <lineMode width="0.7"/>
+                               <lines>0.88cm 27.7cm 20.12cm 27.7cm</lines>
+                               <setFont name="Helvetica" size="8"/>
+                               </pageGraphics>      
     </pageTemplate>
   </template>
   <stylesheet>
@@ -43,6 +69,80 @@
       <lineStyle kind="LINEBELOW" colorName="#b3b3b3" start="1,-1" stop="1,-1"/>
       <lineStyle kind="LINEBELOW" colorName="#b3b3b3" start="2,-1" stop="2,-1"/>
     </blockTableStyle>
+
+    <blockTableStyle id="Table_Subheader_Content_detail">
+      <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="LINEAFTER" 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="LINEAFTER" 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="LINEABOVE" colorName="#cccccc" start="4,0" stop="4,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="4,-1" stop="4,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="5,0" stop="5,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="5,0" stop="5,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="5,-1" stop="5,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="6,0" stop="6,-1"/>
+      <lineStyle kind="LINEAFTER" colorName="#cccccc" start="6,0" stop="6,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="6,0" stop="6,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="6,-1" stop="6,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="7,0" stop="7,-1"/>
+      <lineStyle kind="LINEAFTER" colorName="#cccccc" start="7,0" stop="7,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="7,0" stop="7,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="7,-1" stop="7,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="8,0" stop="8,-1"/>
+      <lineStyle kind="LINEAFTER" colorName="#cccccc" start="8,0" stop="8,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="8,0" stop="8,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="8,-1" stop="8,-1"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table_Sub_Header_Content">
+      <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="LINEAFTER" 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="LINEAFTER" 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="LINEABOVE" colorName="#cccccc" start="4,0" stop="4,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="4,-1" stop="4,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="5,0" stop="5,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="5,0" stop="5,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="5,-1" stop="5,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="6,0" stop="6,-1"/>
+      <lineStyle kind="LINEAFTER" colorName="#cccccc" start="6,0" stop="6,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="6,0" stop="6,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="6,-1" stop="6,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="7,0" stop="7,-1"/>
+      <lineStyle kind="LINEAFTER" colorName="#cccccc" start="7,0" stop="7,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="7,0" stop="7,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="7,-1" stop="7,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="8,0" stop="8,-1"/>
+      <lineStyle kind="LINEAFTER" colorName="#cccccc" start="8,0" stop="8,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="8,0" stop="8,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="8,-1" stop="8,-1"/>
+    </blockTableStyle>
+    
     <blockTableStyle id="Table_Journal_Detail">
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
@@ -108,20 +208,36 @@
         </td>
       </tr>
     </blockTable>
-    <para style="P9">
+       <para style="P9">
       <font color="white"> </font>
     </para>
-    <blockTable colWidths="88.0,451.0" style="Table_Print_Current_datetime">
+    <blockTable colWidths="60.0,60.0,60.0,60.0,59.0,59.0,59.0,59.0,59.0" style="Table_Sub_Header_Content">
       <tr>
-        <td>
-          <para style="terp_default_Bold_9">Printing Date :</para>
-        </td>
-        <td>
-          <para style="terp_default_Bold_9">[[ formatLang(time.strftime('%Y-%m-%d %H:%M:%S'),date_time=True) ]] </para>
-        </td>
+        <td><para style="terp_tblheader_General_Centre">Start Date</para></td>
+        <td><para style="terp_tblheader_General_Centre">End Date</para></td>
+        <td><para style="terp_tblheader_General_Centre">Fiscal Year</para></td>
+         <td><para style="terp_tblheader_General_Centre">Entries Sorted By</para></td>
+        <td><para style="terp_tblheader_General_Centre">Account</para></td>
+        <td><para style="terp_tblheader_General_Centre">Start Period</para></td>
+        <td><para style="terp_tblheader_General_Centre">End Period</para></td>
+         <td><para style="terp_tblheader_General_Centre">Filters By</para></td>
+        <td><para style="terp_tblheader_General_Centre">Printing Date</para></td>
       </tr>
     </blockTable>
-    <para style="P9">
+    <blockTable colWidths="60.0,60.0,60.0,60.0,59.0,59.0,59.0,59.0,59.0" style="Table_Subheader_Content_detail">
+      <tr>
+        <td><para style="terp_default_Centre_8">[[ data['form']['date_from'] ]]</para></td>
+        <td><para style="terp_default_Centre_8">[[ data['form']['date_to'] ]]</para></td>
+        <td><para style="terp_default_Centre_8">[[ get_fiscalyear(data['form'])  or removeParentNode('para') ]]</para></td>
+        <td><para style="terp_default_Centre_8"></para></td>
+        <td><para style="terp_default_Centre_8">[[ get_account(data['form']) or removeParentNode('para') ]]</para></td>
+        <td><para style="terp_default_Centre_8">[[ get_start_period(data['form']) or removeParentNode('para') ]]</para></td>
+        <td><para style="terp_default_Centre_8">[[ get_end_period(data['form']) or removeParentNode('para') ]]</para></td>
+        <td><para style="terp_default_Centre_8">[[ data['form']['filter'] ]]</para></td>
+        <td><para style="terp_default_Centre_8">[[ formatLang(time.strftime('%Y-%m-%d %H:%M:%S'),date_time = True) ]] </para></td>
+      </tr>
+    </blockTable>    
+       <para style="P9">
       <font color="white"> </font>
     </para>
     <blockTable colWidths="72.0,218.0,89.0,83.0,77.0" style="Table_Journal_Title">
@@ -142,6 +258,7 @@
         <td><para style="terp_default_Bold_9_Right">[[ formatLang( sum_credit()) ]]</para></td>
       </tr>
     </blockTable>
+    
     <section>
       <para style="terp_default_8">[[ repeatIn( periods(objects), 'o') ]]</para>
       <blockTable colWidths="176.0,115.0,89.0,83.0,76.0" style="Table_Sub_Total">