[IMP]: improve view and remove TAB from some of the lines

bzr revid: mga@tinyerp.com-20100803184346-md8jam65dcxmq372

diff --git a/addons/account/demo/account_minimal.xml b/addons/account/demo/account_minimal.xml
index d0a2eb7..f28e08c 100644 (file)
--- a/addons/account/demo/account_minimal.xml
+++ b/addons/account/demo/account_minimal.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data noupdate="1">
-
-
         <!--
         Account Type
         -->
@@ -363,7 +361,7 @@
         <record id="bank_journal" model="account.journal">
             <field name="name">Bank Journal - (test)</field>
             <field name="code">BNK</field>
-            <field name="type">cash</field>
+            <field name="type">bank</field>
             <field name="view_id" ref="account_journal_bank_view"/>
             <field name="sequence_id" ref="sequence_journal"/>
             <field model="account.account" name="default_debit_account_id" ref="cash"/>
@@ -373,6 +371,16 @@
         <record id="check_journal" model="account.journal">
             <field name="name">Checks Journal - (test)</field>
             <field name="code">CHK</field>
+            <field name="type">bank</field>
+            <field name="view_id" ref="account_journal_bank_view"/>
+            <field name="sequence_id" ref="sequence_journal"/>
+            <field model="account.account" name="default_debit_account_id" ref="cash"/>
+            <field model="account.account" name="default_credit_account_id" ref="cash"/>
+            <field name="user_id" ref="base.user_root"/>
+        </record>
+        <record id="cash_journal" model="account.journal">
+            <field name="name">Cash Journal - (test)</field>
+            <field name="code">CHK</field>
             <field name="type">cash</field>
             <field name="view_id" ref="account_journal_bank_view"/>
             <field name="sequence_id" ref="sequence_journal"/>

diff --git a/addons/account/wizard/account_report_common_view.xml b/addons/account/wizard/account_report_common_view.xml
index 1ab425f..0c6a24c 100644 (file)
--- a/addons/account/wizard/account_report_common_view.xml
+++ b/addons/account/wizard/account_report_common_view.xml
@@ -8,40 +8,42 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
             <form string="Report Options">
-               <group colspan="4" expand="1">
-                      <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>
-                               </notebook>
-                       </group>
-                       <group colspan="2" name='Filters'>
-                               <notebook tabpos="up">
-                                   <page string="Filters">
-                                       <field name="filter" on_change="onchange_filter(filter, fiscalyear_id)" />
-                                       <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"  domain="[('fiscalyear_id', '=', fiscalyear_id)]" attrs="{'readonly':[('filter','!=','filter_period')], 'required':[('filter', '=', 'filter_period')]}" colspan="4"/>
-                                       <field name="period_to" domain="[('fiscalyear_id', '=', fiscalyear_id)]" attrs="{'readonly':[('filter','!=','filter_period')], 'required':[('filter', '=', 'filter_period')]}" colspan="4"/>
-                                   </page>
-                               </notebook>
-                      </group>
-                       <separator colspan="4"/>
-                       <button icon="gtk-cancel" special="cancel" string="Cancel" colspan="2"/>
-                       <button icon="gtk-print" name="check_report" string="Print" type="object" colspan="2" default_focus="1" />
+                <group colspan="4" expand="1">
+                   <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>
+                        </notebook>
+                    </group>
+                    <group colspan="2" name='Filters'>
+                        <notebook tabpos="up">
+                            <page string="Filters">
+                                <field name="filter" on_change="onchange_filter(filter, fiscalyear_id)" />
+                                <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"  domain="[('fiscalyear_id', '=', fiscalyear_id)]" attrs="{'readonly':[('filter','!=','filter_period')], 'required':[('filter', '=', 'filter_period')]}" colspan="4"/>
+                                <field name="period_to" domain="[('fiscalyear_id', '=', fiscalyear_id)]" attrs="{'readonly':[('filter','!=','filter_period')], 'required':[('filter', '=', 'filter_period')]}" colspan="4"/>
+                            </page>
+                        </notebook>
+                    </group>
+                    <separator colspan="4"/>
+                    <group col="4" colspan="4">
+                        <button icon="gtk-cancel" special="cancel" string="Cancel" colspan="2"/>
+                        <button icon="gtk-print" name="check_report" string="Print" type="object" colspan="2" default_focus="1" />
+                    </group>
                 </group>
             </form>
             </field>
         </record>
 
         <record id="action_account_common_menu" model="ir.actions.act_window">
-            <field name="name">Common report</field>
-            <field name="type">ir.actions.act_window</field>
+            <field name="name">Common Report</field>
+<!--            <field name="type">ir.actions.act_window</field>-->
             <field name="res_model">account.common.report</field>
             <field name="view_type">form</field>
             <field name="view_mode">form</field>
@@ -50,4 +52,4 @@
         </record>
 
     </data>
-</openerp>
\ No newline at end of file
+</openerp>