From af07511006b679fcfb05af76ae0d6c4afb638da9 Mon Sep 17 00:00:00 2001
From: "qdp-launchpad@tinyerp.com" <>
Date: Mon, 28 Jun 2010 09:43:55 +0200
Subject: [PATCH] [IMP] account: common wizard view improved

bzr revid: qdp-launchpad@tinyerp.com-20100628074355-25hdkrtpaxcl9pke
---
 .../account/wizard/account_common_report.xml  | 71 ++++++-------------
 .../wizard/account_report_general_ledger.py   |  4 +-
 .../account_report_general_ledger_view.xml    | 18 ++++-
 3 files changed, 39 insertions(+), 54 deletions(-)

diff --git a/addons/account/wizard/account_common_report.xml b/addons/account/wizard/account_common_report.xml
index d138c8ec2de..bc47381f564 100644
--- a/addons/account/wizard/account_common_report.xml
+++ b/addons/account/wizard/account_common_report.xml
@@ -8,59 +8,32 @@
             <field name="arch" type="xml">
             <form string="Select Date-Period">
 
-                <group colspan="4" col="6">
-                    <field name="chart_account_id" colspan="2" widget='selection'/>
-                    <field name="fiscalyear_id"/>
-                    <field name="filter"/>
-                </group>
-
-                <notebook tabpos="up" colspan="6">
-                    <page string="Journals">
+               <field name="chart_account_id" widget='selection'/>
+               <field name="fiscalyear_id"/>
+               <group colspan="2" name='Journals'>
+               <notebook tabpos="up">
+                    <page string="Journals" >
                         <field name="journal_ids" colspan="4" nolabel="1"/>
                     </page>
-                    <page string="Periods" attrs="{'invisible':[('filter','!=','filter_period')]}">
-                        <field name="period_from"/>
-                        <field name="period_to"/>
-                    </page>
-                    <page string="Date" attrs="{'invisible':[('filter','!=','filter_date')]}">
-                        <field name="date_from"/>
-                        <field name="date_to"/>
+                </notebook>
+                </group>
+
+                <group colspan="2" name='Filters'>
+                <notebook tabpos="up">
+                    <page string="Filters">
+                        <field name="filter"/>
+                        <separator string="Dates" colspan="4"/>
+                        <field name="date_from" attrs="{'readonly':[('filter', '!=', 'filter_date')], 'required':[('filter', '=', 'filter_date')]}" colspan="4"/>
+                        <field name="date_to" attrs="{'readonly':[('filter', '!=', 'filter_date')], 'required':[('filter', '=', 'filter_date')]}"  colspan="4"/>
+                        <separator string="Periods"  colspan="4"/>
+                        <field name="period_from" attrs="{'readonly':[('filter','!=','filter_period')], 'required':[('filter', '=', 'filter_period')]}" colspan="4"/>
+                        <field name="period_to" attrs="{'readonly':[('filter','!=','filter_period')], 'required':[('filter', '=', 'filter_period')]}" colspan="4"/>
                     </page>
                 </notebook>
-
-<!--
-                <group colspan="4" col="4" attrs="{'invisible':[('state','!=','bydate')]}">
-                    <group colspan="2" col="4">
-                    </group>
-                    <group colspan="2" col="4">
-                        <separator string="Periods" colspan="4"/>
-                        <field name="state" required="True" colspan="2"/>
-                        <newline/>
-                        <group attrs="{'invisible':[('state','!=','bydate')]}" colspan="4">
-                        </group>
-                        <group attrs="{'invisible':[('state','!=','byperiod')]}" colspan="4">
-                        </group>
-                    </group>
-                    <group colspan="2" >
-                    </group>
-                </group>
-
-                <separator string="" colspan="4"/>
-
-                <label string="" colspan="2"/>
-
-                <newline/>
-                <field name="sortbydate" required="True"/>
-                <field name="display_account" required="True"/>
-                <field name="soldeinit" invisible="1"/>
-                <field name="landscape"/>
-                <field name="amount_currency"/>
-                <newline/>
-               -->
-                <group colspan="4" col="6">
-                    <button icon="gtk-cancel" special="cancel" string="Cancel"/>
-                    <button icon="gtk-print" name="check_report" string="Print" type="object"/>
-                </group>
+               </group>
+               <newline/>
+                <button icon="gtk-cancel" special="cancel" string="Cancel" colspan="2"/>
+                <button icon="gtk-print" name="check_report" string="Print" type="object" colspan="2"/>
             </form>
             </field>
         </record>
diff --git a/addons/account/wizard/account_report_general_ledger.py b/addons/account/wizard/account_report_general_ledger.py
index f63bbe4dac4..04d6714dab6 100644
--- a/addons/account/wizard/account_report_general_ledger.py
+++ b/addons/account/wizard/account_report_general_ledger.py
@@ -30,11 +30,11 @@ class account_report_general_ledger(osv.osv_memory):
     _description = "General Ledger Report"
 
     _columns = {
-        'display_account': fields.selection([('bal_mouvement','With movements'), ('bal_all','All'), ('bal_solde','With balance is not equal to 0')],"Display accounts"),
+        'display_account': fields.selection([('bal_mouvement','With movements'), ('bal_all','All'), ('bal_solde','With balance is not equal to 0')],"Display accounts", required=True),
         'landscape': fields.boolean("Landscape Mode"),
         'soldeinit': fields.boolean("Include initial balances"),
         'amount_currency': fields.boolean("With Currency"),
-        'sortby': fields.selection([('sort_date', 'Date'), ('sort_journal_partner', 'Journal & Partner')], 'Sort By'),
+        'sortby': fields.selection([('sort_date', 'Date'), ('sort_journal_partner', 'Journal & Partner')], 'Sort By', required=True),
     }
 
     _defaults = {
diff --git a/addons/account/wizard/account_report_general_ledger_view.xml b/addons/account/wizard/account_report_general_ledger_view.xml
index f4f27f350f6..b6f3a32dd67 100644
--- a/addons/account/wizard/account_report_general_ledger_view.xml
+++ b/addons/account/wizard/account_report_general_ledger_view.xml
@@ -2,18 +2,30 @@
 <openerp>
     <data>
 
+<!--        <record id="account_report_general_ledger_view_journal_removal" model="ir.ui.view">
+            <field name="name">General Ledger</field>
+            <field name="model">account.report.general.ledger</field>
+            <field name="type">form</field>
+            <field name="inherit_id" ref="account_common_report_view" />
+            <field name="arch" type="xml">
+               <xpath expr="/form/group[@name='Journals']" position="replace">
+               </xpath>
+            </field>
+        </record>
+-->
+
         <record id="account_report_general_ledger_view" model="ir.ui.view">
             <field name="name">General Ledger</field>
             <field name="model">account.report.general.ledger</field>
             <field name="type">form</field>
             <field name="inherit_id" ref="account_common_report_view" />
             <field name="arch" type="xml">
-               <field name="journal_ids" position="after">
+               <field name="fiscalyear_id" position="after">
                    <field name="display_account"/>
                    <field name="landscape"/>
-                   <field name="soldeinit"/>
-                   <field name="amount_currency"/>
+<!--                   <field name="soldeinit"/>-->
                    <field name="sortby"/>
+                   <field name="amount_currency"/>
                </field>
             </field>
         </record>