From e3514034d406394bb6be621a88ec582b6f7e0e3a Mon Sep 17 00:00:00 2001
From: Humberto Arocha <humbertoarocha@gmail.com>
Date: Tue, 7 Aug 2012 03:05:23 -0530
Subject: [PATCH] [IMP] Se agrega Titulo Personalizado al Reporte. [RM] Se
 elimina archivo innecesario.

---
 .../report/account_report_report.xml          | 35 -------------------
 account_financial_report/report/parser.py     |  7 ++--
 2 files changed, 5 insertions(+), 37 deletions(-)
 delete mode 100644 account_financial_report/report/account_report_report.xml

diff --git a/account_financial_report/report/account_report_report.xml b/account_financial_report/report/account_report_report.xml
deleted file mode 100644
index 37f26d48..00000000
--- a/account_financial_report/report/account_report_report.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<openerp>
-  <data >
-        <report 
-            auto="False"
-            id="wizard_report_reporte_4_col"
-            menu="True"
-            model="wizard.report"
-            name="wizard.report.reporte"
-            rml="account_financial_report/report/balance_full_4_cols.rml"
-            string="Balance de Comprobacion Wizard 4 Columnas"
-            header="False"
-        />
-        <report 
-            auto="False"
-            id="wizard_report_reporte_2_col"
-            menu="True"
-            model="wizard.report.account.balance.gene.2"
-            name="account.account.balance.gene.2"
-            rml="account_financial_report/report/balance_full_2_cols.rml"
-            string="Balance de Comprobacion Wizard 2 Columnas"
-            header="False"
-        />
-        <report 
-            auto="False"
-            id="wizard_report_reporte"
-            menu="True"
-            model="wizard.report.account.balance.gene"
-            name="account.account.balance.gene"
-            rml="account_financial_report/report/balance_full.rml"
-            string="Balance de Comprobacion Wizard"
-            header="False"
-        />
-  </data>
-</openerp>
diff --git a/account_financial_report/report/parser.py b/account_financial_report/report/parser.py
index e48655e4..6b08cb28 100644
--- a/account_financial_report/report/parser.py
+++ b/account_financial_report/report/parser.py
@@ -76,11 +76,14 @@ class account_balance(report_sxw.rml_parse):
         """
         Returns the header text used on the report.
         """
+        afr_id = form['afr_id'] and type(form['afr_id']) in (list,tuple) and form['afr_id'][0] or form['afr_id']
+        if afr_id:
+            name = self.pool.get('afr').browse(self.cr, self.uid, afr_id).name
         inf_type = {
             'BS' : _('Balance Sheet'),
             'IS'   : _('Income Statement'),
         }
-        return inf_type[form['inf_type']]
+        return afr_id and name or inf_type[form['inf_type']]
 
     def get_month(self, form):
         '''
@@ -615,7 +618,7 @@ class account_balance(report_sxw.rml_parse):
                             bal3 = tot_bal3,
                             bal4 = tot_bal4,
                             bal5 = tot_bal5,))
-            if form['columns'] == 'thirteen':
+            elif form['columns'] == 'thirteen':
                 res2.update(dict(
                             bal1 = tot_bal1,
                             bal2 = tot_bal2,