From a03d8dcc84102ead06e0cec27b66e4631448cad7 Mon Sep 17 00:00:00 2001
From: Thomas Rehn <thomas.rehn@initos.com>
Date: Wed, 27 Apr 2016 19:01:02 +0200
Subject: [PATCH] [FIX] activate date_range and fix installation errors

---
 account_financial_report_qweb/__openerp__.py     |  5 +++--
 .../wizard/balance_common_wizard.py              | 16 ++++++++--------
 .../wizard/balance_common_wizard_view.xml        |  4 ++--
 .../wizard/balance_sheet_wizard_view.xml         | 10 ++++++----
 4 files changed, 19 insertions(+), 16 deletions(-)

diff --git a/account_financial_report_qweb/__openerp__.py b/account_financial_report_qweb/__openerp__.py
index 6a6eceea..fc7bc309 100644
--- a/account_financial_report_qweb/__openerp__.py
+++ b/account_financial_report_qweb/__openerp__.py
@@ -21,12 +21,13 @@
         'wizard/aged_partner_balance_wizard_view.xml',
         'wizard/general_ledger_wizard.xml',
         'wizard/open_invoice_wizard_view.xml',
-        'report_menus.xml',
+        'wizard/partner_ledger_wizard.xml',
+        'wizard/partner_balance_wizard_view.xml',
         'wizard/balance_common_wizard_view.xml',
         'wizard/partner_balance_wizard_view.xml',
         'wizard/trial_balance_wizard_view.xml',
         'wizard/balance_sheet_wizard_view.xml',
-        #'wizard/profit_loss_wizard_view.xml',
+        # 'wizard/profit_loss_wizard_view.xml',
         'views/report_menus.xml',
         'menuitems.xml',
         'reports.xml',
diff --git a/account_financial_report_qweb/wizard/balance_common_wizard.py b/account_financial_report_qweb/wizard/balance_common_wizard.py
index a52e0a24..710c7ac3 100644
--- a/account_financial_report_qweb/wizard/balance_common_wizard.py
+++ b/account_financial_report_qweb/wizard/balance_common_wizard.py
@@ -29,14 +29,14 @@ class AccountBalanceCommonWizard(models.TransientModel):
         print all accounts.",
         default=_get_account_ids
     )
-    # date_range = fields.Many2one(
-    #     comodel_name='date.range',
-    #     string='Date Range',
-    # )
-    # comparison_date_range = fields.Many2one(
-    #     comodel_name='date.range',
-    #     string='Date Range',
-    # )
+    date_range_id = fields.Many2one(
+         comodel_name='date.range',
+         string='Date Range',
+     )
+    comparison_date_range_id = fields.Many2one(
+         comodel_name='date.range',
+         string='Date Range',
+    )
     comparison_date_start = fields.Datetime(
         string='Start Date'
     )
diff --git a/account_financial_report_qweb/wizard/balance_common_wizard_view.xml b/account_financial_report_qweb/wizard/balance_common_wizard_view.xml
index 7794524c..af870dfb 100644
--- a/account_financial_report_qweb/wizard/balance_common_wizard_view.xml
+++ b/account_financial_report_qweb/wizard/balance_common_wizard_view.xml
@@ -15,7 +15,7 @@
                         </group>
                     </field>
                     <field name="target_move" position="after">
-                        <!--<field name="date_range"/>-->
+                        <field name="date_range_id"/>
                         <newline/>
                     </field>
                     <field name="date_to" position="after">
@@ -41,7 +41,7 @@
                             </page>
                             <page string="Comparison" name="comparison">
                                 <group>
-                                    <!--<field name="comparison_date_range"/>-->
+                                    <field name="comparison_date_range_id"/>
                                     <field name="comparison_date_start"/>
                                     <field name="comparison_date_end"/>
                                 </group>
diff --git a/account_financial_report_qweb/wizard/balance_sheet_wizard_view.xml b/account_financial_report_qweb/wizard/balance_sheet_wizard_view.xml
index 5de6ad11..393a97bd 100644
--- a/account_financial_report_qweb/wizard/balance_sheet_wizard_view.xml
+++ b/account_financial_report_qweb/wizard/balance_sheet_wizard_view.xml
@@ -3,7 +3,7 @@
     <data>
 
         <record id="account_balance_sheet_wizard_view" model="ir.ui.view">
-            <field name="name">Trial Balance Wizard</field>
+            <field name="name">Balance Sheet Wizard</field>
             <field name="model">account.common.balance.report</field>
             <field name="mode">primary</field>
             <field name="inherit_id" ref="account_balance_common_wizard_view"/>
@@ -12,9 +12,11 @@
                     <notebook position="attributes">
                         <attribute name="invisible">True</attribute>
                     </notebook>
+                    <!-- Replicate group here because hiding all tabs except Comparison
+                         does not work well. -->
                     <notebook position="before">
-                        <group>
-                            <!--<field name="comparison_date_range"/>-->
+                        <group string="Compare with other date range">
+                            <field name="comparison_date_range_id"/>
                             <field name="comparison_date_start"/>
                             <field name="comparison_date_end"/>
                         </group>
@@ -24,7 +26,7 @@
         </record>
 
         <record id="action_account_balance_sheet_wizard_view" model="ir.actions.act_window">
-            <!--field name="name">Balance Sheet </field -->
+            <field name="name">Balance Sheet</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">account.common.balance.report</field>
             <field name="view_type">form</field>