From fc81ca6a690b53996e814a00c4f624fbd77c4278 Mon Sep 17 00:00:00 2001
From: "ARA (OpenERP)" <ara@tinyerp.com>
Date: Mon, 27 Dec 2010 18:15:30 +0530
Subject: [PATCH 1/2] [REF] account :Improve fields_view_get

bzr revid: ara@tinyerp.com-20101227124530-pnzjbkknemkt2ppy
---
 .../wizard/account_report_account_balance.py      | 11 -----------
 .../account_report_account_balance_view.xml       |  3 +++
 .../wizard/account_report_aged_partner_balance.py | 10 ----------
 .../account_report_aged_partner_balance_view.xml  |  2 +-
 .../account/wizard/account_report_profit_loss.py  | 15 ---------------
 .../wizard/account_report_profit_loss_view.xml    |  6 ++++++
 6 files changed, 10 insertions(+), 37 deletions(-)

diff --git a/addons/account/wizard/account_report_account_balance.py b/addons/account/wizard/account_report_account_balance.py
index 6b8c4371dd2..1c3743bf3c7 100644
--- a/addons/account/wizard/account_report_account_balance.py
+++ b/addons/account/wizard/account_report_account_balance.py
@@ -32,17 +32,6 @@ class account_balance_report(osv.osv_memory):
         'journal_ids': [],
     }
 
-    def fields_view_get(self, cr, uid, view_id=None, view_type='form', context=None, toolbar=False, submenu=False):
-        mod_obj = self.pool.get('ir.model.data')
-        res = super(account_balance_report, self).fields_view_get(cr, uid, view_id=view_id, view_type=view_type, context=context, toolbar=toolbar, submenu=False)
-        doc = etree.XML(res['arch'])
-        nodes = doc.xpath("//field[@name='journal_ids']")
-        for node in nodes:
-            node.set('readonly', '1')
-            node.set('required', '0')
-        res['arch'] = etree.tostring(doc)
-        return res
-
     def _print_report(self, cr, uid, ids, data, context=None):
         data = self.pre_print_report(cr, uid, ids, data, context=context)
         return {'type': 'ir.actions.report.xml', 'report_name': 'account.account.balance', 'datas': data}
diff --git a/addons/account/wizard/account_report_account_balance_view.xml b/addons/account/wizard/account_report_account_balance_view.xml
index 9438a6f9216..e14c11dcb3c 100644
--- a/addons/account/wizard/account_report_account_balance_view.xml
+++ b/addons/account/wizard/account_report_account_balance_view.xml
@@ -10,6 +10,9 @@
           <field name="inherit_id" ref="account_common_report_view" />
           <field name="arch" type="xml">
             <data>
+            <xpath expr="//field[@name='journal_ids']" position="replace">
+                <field name="journal_ids" colspan="4" nolabel="1" readonly="1"/>
+            </xpath>
             <xpath expr="/form/label[@string='']" position="replace">
                 <separator string="Trial Balance" colspan="4"/>
                 <label nolabel="1" colspan="4" string="This report allows you to print or generate a pdf of your trial balance allowing you to quickly check the balance of each of your accounts in a single report"/>
diff --git a/addons/account/wizard/account_report_aged_partner_balance.py b/addons/account/wizard/account_report_aged_partner_balance.py
index 5eb1f0f5a2e..f76beb6bee1 100644
--- a/addons/account/wizard/account_report_aged_partner_balance.py
+++ b/addons/account/wizard/account_report_aged_partner_balance.py
@@ -44,16 +44,6 @@ class account_aged_trial_balance(osv.osv_memory):
         'direction_selection': 'past',
     }
 
-    def fields_view_get(self, cr, uid, view_id=None, view_type='form', context=None, toolbar=False, submenu=False):
-        res = super(account_aged_trial_balance, self).fields_view_get(cr, uid, view_id=view_id, view_type=view_type, context=context, toolbar=toolbar, submenu=False)
-        doc = etree.XML(res['arch'])
-        nodes = doc.xpath("//field[@name='journal_ids']")
-        for node in nodes:
-            node.set('invisible', '1')
-            node.set('required', '0')
-        res['arch'] = etree.tostring(doc)
-        return res
-
     def _print_report(self, cr, uid, ids, data, context=None):
         res = {}
         if context is None:
diff --git a/addons/account/wizard/account_report_aged_partner_balance_view.xml b/addons/account/wizard/account_report_aged_partner_balance_view.xml
index aea2fba2528..0e38fbe7a71 100644
--- a/addons/account/wizard/account_report_aged_partner_balance_view.xml
+++ b/addons/account/wizard/account_report_aged_partner_balance_view.xml
@@ -20,7 +20,7 @@
                     <newline/>
                     <field name="result_selection"/>
                     <field name="direction_selection"/>
-                    <field name="journal_ids"/>
+                    <field name="journal_ids" invisible="1"/>
                     <newline/>
                     <separator colspan="4"/>
                     <group col="4" colspan="4">
diff --git a/addons/account/wizard/account_report_profit_loss.py b/addons/account/wizard/account_report_profit_loss.py
index 94487c4f567..444d91fa8fd 100644
--- a/addons/account/wizard/account_report_profit_loss.py
+++ b/addons/account/wizard/account_report_profit_loss.py
@@ -40,21 +40,6 @@ class account_pl_report(osv.osv_memory):
         'target_move': False
     }
 
-    def fields_view_get(self, cr, uid, view_id=None, view_type='form', context=None, toolbar=False, submenu=False):
-        mod_obj = self.pool.get('ir.model.data')
-        res = super(account_pl_report, self).fields_view_get(cr, uid, view_id=view_id, view_type=view_type, context=context, toolbar=toolbar, submenu=False)
-        doc = etree.XML(res['arch'])
-        nodes = doc.xpath("//field[@name='journal_ids']")
-        for node in nodes:
-            node.set('readonly', '1')
-            node.set('required', '0')
-        nodes = doc.xpath("//field[@name='target_move']")
-        for node in nodes:
-            node.set('readonly', '1')
-            node.set('required', '0')
-        res['arch'] = etree.tostring(doc)
-        return res
-
     def _print_report(self, cr, uid, ids, data, context=None):
         if context is None:
             context = {}
diff --git a/addons/account/wizard/account_report_profit_loss_view.xml b/addons/account/wizard/account_report_profit_loss_view.xml
index be0ced5c787..1b69dc111d2 100644
--- a/addons/account/wizard/account_report_profit_loss_view.xml
+++ b/addons/account/wizard/account_report_profit_loss_view.xml
@@ -9,6 +9,12 @@
             <field name="inherit_id" ref="account.account_common_report_view" />
             <field name="arch" type="xml">
             <data>
+            <xpath expr="//field[@name='target_move']" position="replace">
+                <field name="target_move" readonly="1"/>
+            </xpath>
+            <xpath expr="//field[@name='journal_ids']" position="replace">
+                <field name="journal_ids" colspan="4" nolabel="1" readonly="1"/>
+            </xpath>
             <xpath expr="/form/label[@string='']" position="replace">
                 <separator string="Profit And Loss" colspan="4"/>
                 <label nolabel="1" colspan="4" string="The Profit and Loss report gives you an overview of your company profit and loss in a single document"/>

From ec96c8481822b93c0d8638a3ca02d368edef3068 Mon Sep 17 00:00:00 2001
From: "ARA (OpenERP)" <ara@tinyerp.com>
Date: Tue, 28 Dec 2010 10:35:12 +0530
Subject: [PATCH 2/2] [REF] account :Improve fields_view_get

bzr revid: ara@tinyerp.com-20101228050512-05egnczwozxfuo4a
---
 addons/account/wizard/account_report_account_balance_view.xml | 2 +-
 .../wizard/account_report_aged_partner_balance_view.xml       | 2 +-
 addons/account/wizard/account_report_profit_loss_view.xml     | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/addons/account/wizard/account_report_account_balance_view.xml b/addons/account/wizard/account_report_account_balance_view.xml
index e14c11dcb3c..38f456f7d15 100644
--- a/addons/account/wizard/account_report_account_balance_view.xml
+++ b/addons/account/wizard/account_report_account_balance_view.xml
@@ -11,7 +11,7 @@
           <field name="arch" type="xml">
             <data>
             <xpath expr="//field[@name='journal_ids']" position="replace">
-                <field name="journal_ids" colspan="4" nolabel="1" readonly="1"/>
+                <field name="journal_ids" colspan="4" nolabel="1" required="0" readonly="1"/>
             </xpath>
             <xpath expr="/form/label[@string='']" position="replace">
                 <separator string="Trial Balance" colspan="4"/>
diff --git a/addons/account/wizard/account_report_aged_partner_balance_view.xml b/addons/account/wizard/account_report_aged_partner_balance_view.xml
index 0e38fbe7a71..195ccbef111 100644
--- a/addons/account/wizard/account_report_aged_partner_balance_view.xml
+++ b/addons/account/wizard/account_report_aged_partner_balance_view.xml
@@ -20,7 +20,7 @@
                     <newline/>
                     <field name="result_selection"/>
                     <field name="direction_selection"/>
-                    <field name="journal_ids" invisible="1"/>
+                    <field name="journal_ids" required="0" invisible="1"/>
                     <newline/>
                     <separator colspan="4"/>
                     <group col="4" colspan="4">
diff --git a/addons/account/wizard/account_report_profit_loss_view.xml b/addons/account/wizard/account_report_profit_loss_view.xml
index 1b69dc111d2..d9876f57454 100644
--- a/addons/account/wizard/account_report_profit_loss_view.xml
+++ b/addons/account/wizard/account_report_profit_loss_view.xml
@@ -10,10 +10,10 @@
             <field name="arch" type="xml">
             <data>
             <xpath expr="//field[@name='target_move']" position="replace">
-                <field name="target_move" readonly="1"/>
+                <field name="target_move" required="0" readonly="1"/>
             </xpath>
             <xpath expr="//field[@name='journal_ids']" position="replace">
-                <field name="journal_ids" colspan="4" nolabel="1" readonly="1"/>
+                <field name="journal_ids" required="0" colspan="4" nolabel="1" readonly="1"/>
             </xpath>
             <xpath expr="/form/label[@string='']" position="replace">
                 <separator string="Profit And Loss" colspan="4"/>