[IMP] Account: General ledger report and wizard => Key name change of display account...

bzr revid: mra@mra-laptop-20100726100351-h41nmsnyd2ie2on4

diff --git a/addons/account/report/general_ledger.py b/addons/account/report/general_ledger.py
index cd7aa34..e43c125 100644 (file)
--- a/addons/account/report/general_ledger.py
+++ b/addons/account/report/general_ledger.py
@@ -71,7 +71,7 @@ class general_ledger(rml_parse.rml_parse, common_report_header):
             'get_filter': self._get_filter,
             'get_sortby': self._get_sortby,
             'get_start_date':self._get_start_date,
-            'get_end_date':self._get_end_date,            
+            'get_end_date':self._get_end_date,
         })
         self.context = context
 
@@ -88,7 +88,7 @@ class general_ledger(rml_parse.rml_parse, common_report_header):
             num_entry = self.cr.fetchone()[0] or 0
             sold_account = self._sum_balance_account(child_account,form)
             self.sold_accounts[child_account.id] = sold_account
-            if form['display_account'] == 'mouvement':
+            if form['display_account'] == 'movement':
                 if child_account.type != 'view' and num_entry <> 0 :
                     res.append(child_account)
             elif form['display_account'] == 'balance':

diff --git a/addons/account/report/general_ledger.rml b/addons/account/report/general_ledger.rml
index ffe6348..a01698a 100644 (file)
--- a/addons/account/report/general_ledger.rml
+++ b/addons/account/report/general_ledger.rml
@@ -157,12 +157,12 @@
       <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="LINEABOVE" colorName="#cccccc" start="7,0" stop="7,0"/>
     </blockTableStyle>
      <blockTableStyle id="Table3">
       <blockAlignment value="LEFT"/>
       <lineStyle kind="LINEBELOW" colorName="#cccccc" start="0,0" stop="-1,0"/>
-    </blockTableStyle>  
+    </blockTableStyle>
 
     <initialize>
       <paraStyle name="all" alignment="justify"/>
@@ -201,7 +201,7 @@
     <paraStyle name="Caption" fontName="Helvetica" fontSize="10.0" leading="13" spaceBefore="6.0" spaceAfter="6.0"/>
     <paraStyle name="terp_header_Centre" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="CENTER" spaceBefore="12.0" spaceAfter="6.0"/>
     <paraStyle name="Index" fontName="Helvetica"/>
-       <paraStyle name="terp_tblheader_Details_Centre" fontName="Helvetica-Bold" fontSize="8.0" leading="11" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>    
+       <paraStyle name="terp_tblheader_Details_Centre" fontName="Helvetica-Bold" fontSize="8.0" leading="11" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>
   </stylesheet>
   <story>
   <para style="P9">
@@ -222,10 +222,10 @@
 
     <blockTable colWidths="80.0,70.0,70.0,80.0,110.0,80.0,80.0" style="Table2">
       <tr>
-       <td><para style="terp_tblheader_General_Centre">Chat Account</para></td>        
+       <td><para style="terp_tblheader_General_Centre">Chat Account</para></td>
         <td><para style="terp_tblheader_General_Centre">Fiscal Year</para></td>
-               <td><para style="terp_tblheader_General_Centre">Journals</para></td>        
-               <td><para style="terp_tblheader_General_Centre">Display Account </para></td>        
+               <td><para style="terp_tblheader_General_Centre">Journals</para></td>
+               <td><para style="terp_tblheader_General_Centre">Display Account </para></td>
         <td><para style="terp_tblheader_General_Centre">Filters By <font color="white">[[ get_filter(data)!='No Filter' and '' or removeParentNode('font') ]]</font><font>[[ get_filter(data) ]]</font></para></td>
          <td><para style="terp_tblheader_General_Centre">Entries Sorted By</para></td>
         <td><para style="terp_tblheader_General_Centre">Printing Date</para></td>
@@ -234,28 +234,28 @@
           <td><para style="terp_default_Centre_8">[[ get_account(data) or removeParentNode('para') ]]</para></td>
        <td><para style="terp_default_Centre_8">[[ get_fiscalyear(data)  or '' ]]</para></td>
                <td> <para style="terp_default_Centre_8">[[', '.join([ lt or '' for lt in get_journal(data) ]) ]] </para></td>
-               <td><para style="terp_default_Centre_8">[[ (data['form']['display_account']=='all' and 'All') or  (data['form']['display_account']=='mouvement' and 'With movements') or 'With balance is not equal to 0']]</para></td>
+               <td><para style="terp_default_Centre_8">[[ (data['form']['display_account']=='all' and 'All') or  (data['form']['display_account']=='movement' and 'With movements') or 'With balance is not equal to 0']]</para></td>
         <td><para style="terp_default_Centre_8">[[ get_filter(data)=='No Filter' and get_filter(data) or removeParentNode('para') ]] </para>
                <blockTable colWidths="50.0,50.0" style="Table3">[[ get_filter(data)=='Date' or removeParentNode('blockTable') ]]
                                <tr>
                       <td><para style="terp_tblheader_Details_Centre">Start Date</para></td>
-                               <td><para style="terp_tblheader_Details_Centre">End Date</para></td>            
-                       </tr>           
+                               <td><para style="terp_tblheader_Details_Centre">End Date</para></td>
+                       </tr>
                        <tr>
                        <td><para style="terp_default_Centre_8">[[ get_start_date(data) ]]</para></td>
-                               <td><para style="terp_default_Centre_8">[[get_end_date(data) ]]</para></td>             
+                               <td><para style="terp_default_Centre_8">[[get_end_date(data) ]]</para></td>
                        </tr>
                </blockTable>
                <blockTable colWidths="50.0,50.0" style="Table3">[[ get_filter(data)=='Periods' or removeParentNode('blockTable') ]]
                                <tr>
                                <td><para style="terp_tblheader_Details_Centre">Start Period</para></td>
-                               <td><para style="terp_tblheader_Details_Centre">End Period</para></td>          
-                       </tr>           
+                               <td><para style="terp_tblheader_Details_Centre">End Period</para></td>
+                       </tr>
                        <tr>
                                <td><para style="terp_default_Centre_8">[[ get_start_period(data) or removeParentNode('para') ]]</para></td>
                                <td><para style="terp_default_Centre_8">[[ get_end_period(data) or removeParentNode('para') ]]</para></td>
                        </tr>
-                </blockTable>           
+                </blockTable>
                </td>
         <td><para style="terp_default_Centre_8">[[ get_sortby(data) ]]</para></td>
        <td><para style="terp_default_Centre_8">[[ formatLang(time.strftime('%Y-%m-%d %H:%M:%S'), date_time = True) ]] </para></td>

diff --git a/addons/account/wizard/account_report_general_ledger.py b/addons/account/wizard/account_report_general_ledger.py
index 9d81e44..d1ed811 100644 (file)
--- a/addons/account/wizard/account_report_general_ledger.py
+++ b/addons/account/wizard/account_report_general_ledger.py
@@ -28,7 +28,7 @@ class account_report_general_ledger(osv.osv_memory):
     _description = "General Ledger Report"
 
     _columns = {
-        'display_account': fields.selection([('all','All'), ('mouvement','With movements'),
+        'display_account': fields.selection([('all','All'), ('movement','With movements'),
                          ('balance','With balance is not equal to 0'),
                          ],'Display accounts', required=True),
         'landscape': fields.boolean("Landscape Mode"),