[IMP] account: Remove the chart_account from object and set the company_id

bzr revid: sbh@tinyerp.com-20100730070822-22xs52u8ep1ljzqo

diff --git a/addons/account/report/account_balance.py b/addons/account/report/account_balance.py
index e93eb92..4c192a6 100644 (file)
--- a/addons/account/report/account_balance.py
+++ b/addons/account/report/account_balance.py
@@ -61,7 +61,11 @@ class account_balance(report_sxw.rml_parse, common_report_header):
         if header == 0:
             self.rml_header = ""
         return True
-
+    def _get_account(self, data):
+        if data['model']=='account.account':
+            return self.pool.get('account.account').browse(self.cr, self.uid, data['form']['id']).company_id.name
+        return super(account_balance ,self)._get_account(data)
+    
     def lines(self, form, ids=[], done=None, level=1):
         obj_account = self.pool.get('account.account')
         if not ids:

diff --git a/addons/account/report/account_balance.rml b/addons/account/report/account_balance.rml
index e461ae8..faaa13a 100644 (file)
--- a/addons/account/report/account_balance.rml
+++ b/addons/account/report/account_balance.rml
@@ -211,9 +211,8 @@
     </para>    
     <blockTable colWidths="81.0,56.0,64.0,88.0,140.0,90.0" style="Table8">
       <tr>
-        <td>
-          <para style="terp_tblheader_General_Centre">Chart of Account</para>
-        </td>
+        <td><para style="terp_tblheader_General_Right">Company <font color="white"> [[ data['model']=='account.account' or removeParentNode('para') ]]</font></para>        
+       <para style="terp_tblheader_General_Centre">Chart of Account <font color="white"> [[ data['model']=='ir.ui.menu' or removeParentNode('para') ]]</font></para></td>       
         <td>
           <para style="terp_tblheader_General_Centre">Fiscal Year</para>
         </td>

diff --git a/addons/account/report/general_ledger.py b/addons/account/report/general_ledger.py
index 1e5343d..25b0490 100644 (file)
--- a/addons/account/report/general_ledger.py
+++ b/addons/account/report/general_ledger.py
@@ -230,6 +230,10 @@ class general_ledger(rml_parse.rml_parse, common_report_header):
             sum_balance += self.cr.fetchone()[0] or 0.0
         return sum_balance
 
+    def _get_account(self, data):
+        if data['model']=='account.account':
+            return self.pool.get('account.account').browse(self.cr, self.uid, data['form']['id']).company_id.name
+        return super(general_ledger ,self)._get_account(data)
 
     def _get_sortby(self, data):
         if self.sortby == 'sort_date':

diff --git a/addons/account/report/general_ledger_landscape.rml b/addons/account/report/general_ledger_landscape.rml
index 3095b31..2ca1209 100644 (file)
--- a/addons/account/report/general_ledger_landscape.rml
+++ b/addons/account/report/general_ledger_landscape.rml
@@ -5,8 +5,7 @@
       <frame id="first" x1="22.0" y1="31.0" width="1080" height="680"/>
                        <pageGraphics>
                
-                           </pageGraphics>
-
+                       </pageGraphics>
     </pageTemplate>
   </template>
    <stylesheet>
@@ -177,7 +176,7 @@
     <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_default_8" fontName="Helvetica" fontSize="8.0" leading="10" spaceBefore="0.0" spaceAfter="0.0"/>
-
+       <paraStyle name="terp_tblheader_General_Right" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="6.0" spaceAfter="6.0"/>
   </stylesheet>
   <story>
   <para style="P9">
@@ -207,7 +206,8 @@
 
       <blockTable colWidths="100.0,80.0,100.0,80.0,150.0,80.0,100.0" style="Table2">
       <tr>
-       <td><para style="terp_tblheader_General_Centre">Chat Account</para></td>        
+      <td><para style="terp_tblheader_General_Right">Company <font color="white"> [[ data['model']=='account.account' or removeParentNode('para') ]]</font></para>        
+       <para style="terp_tblheader_General_Centre">Chart of Account <font color="white"> [[ data['model']=='ir.ui.menu' or removeParentNode('para') ]]</font></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>