From 13f368707df5ebae09d79f87b899a34cf8f62a35 Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Wed, 18 Jul 2012 16:28:10 +0200
Subject: [PATCH] [IMP] accounting: usability, review of form views

bzr revid: qdp-launchpad@openerp.com-20120718142810-guj4aekt9v02jgfw
---
 addons/account/account_view.xml               | 104 ++++++++----------
 addons/account/project/project_view.xml       |   2 +-
 .../account/test/account_cash_statement.yml   |   2 +-
 .../account_automatic_reconcile_view.xml      |   2 +
 .../wizard/account_fiscalyear_close_view.xml  |   2 +
 .../account_payment/account_payment_view.xml  |  13 ++-
 addons/account_sequence/account_sequence.xml  |   2 +-
 7 files changed, 63 insertions(+), 64 deletions(-)

diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index ecdcdaf4924..1e1f7b91851 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -466,62 +466,61 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Account Journal" version="7.0">
+                    <div class="oe_title">
+                        <label for="name" class="oe_edit_only"/>
+                        <h1><field name="name"/></h1>
+                    </div>
                     <group>
-                        <field name="name"/>
-                        <field name="type" on_change="onchange_type(type, currency, context)"/>
+                        <group>
+                            <field name="code"/>
+                            <field name="type" on_change="onchange_type(type, currency, context)"/>
+                        </group>
+                        <group>
+                            <field name="default_debit_account_id" attrs="{'required':[('type','in', ('cash', 'bank'))]}" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]"/>
+                            <field name="default_credit_account_id" attrs="{'required':[('type','in',('cash', 'bank'))]}" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]"/>
+                            <field name="currency"/>
+                            <field name="company_id" groups="base.group_multi_company"/>
+                        </group>
                     </group>
                     <notebook>
-                        <page string="Journal Configuration">
+                        <page string="Advanced Settings">
                             <group>
                                 <group>
-                                    <field name="code"/>
-                                    <field name="currency"/>
-                                </group>
-                                <group>
-                                    <field name="company_id" groups="base.group_multi_company"/>
                                     <field name="user_id"/>
-                                </group>
-                                <group>
-                                    <field name="default_debit_account_id" attrs="{'required':[('type','in', ('cash', 'bank'))]}" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]"/>
-                                    <field name="default_credit_account_id" attrs="{'required':[('type','in',('cash', 'bank'))]}" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]"/>
                                     <field name="view_id" widget="selection"/>
-                                        <field name="sequence_id" required="0"/>
+                                    <field name="sequence_id" required="0"/>
                                 </group>
                                 <group>
                                     <field name="centralisation"/>
                                     <field name="entry_posted"/>
-                                    <field name="with_last_closing_balance" />
                                     <field name="allow_date"/>
                                     <field name="group_invoice_lines"/>
                                 </group>
-                                <group>
-                                    <field name="type_control_ids" widget="many2many_tags"/>
-                                    <field name="account_control_ids" widget="many2many_tags"/>
+                            </group>
+                        </page>
+                        <page string="Entry Controls">
+                            <separator colspan="4" string="Accounts Type Allowed (empty for no control)"/>
+                            <field colspan="4" name="type_control_ids" nolabel="1"/>
+                            <separator colspan="4" string="Accounts Allowed (empty for no control)"/>
+                            <field colspan="4" name="account_control_ids" nolabel="1"/>
+                        </page>
+                        <page string="Cash Registers" attrs="{'invisible':[('type', '!=', 'cash')]}">
+                            <group>
+                                <group string="Accounts">
+                                    <field name="profit_account_id"/>
+                                    <field name="loss_account_id"/>
+                                    <field name="internal_account_id"/>
+                                </group>
+                                <group string="Miscellaneous">
+                                    <field name="with_last_closing_balance"/>
                                 </group>
                             </group>
-                            <page string="Entry Controls">
-                                <separator colspan="4" string="Accounts Type Allowed (empty for no control)"/>
-                                <field colspan="4" name="type_control_ids" nolabel="1"/>
-                                <separator colspan="4" string="Accounts Allowed (empty for no control)"/>
-                                <field colspan="4" name="account_control_ids" nolabel="1"/>
-                            </page>
-                            <page string="Cash">
-                                <group string="Profit &amp; Loss Accounts">
-                                    <field name="profit_account_id" />
-                                    <field name="loss_account_id" />
-                                </group>
-
-                                <group string="Internal Transfer Account">
-                                    <field name="internal_account_id" />
-                                </group>
-
-                                <separator string="Available Currencies" colspan="4" />
-                                <field name="cashbox_line_ids" nolabel="1" string="Unit Of Currency Definition" colspan="4">
-                                    <tree string="CashBox Lines" editable="bottom">
-                                        <field name="pieces" />
-                                    </tree>
-                                </field>
-                            </page>
+                            <separator string="Available Coins" colspan="4" />
+                            <field name="cashbox_line_ids" nolabel="1" string="Unit Of Currency Definition" colspan="4">
+                                <tree string="CashBox Lines" editable="bottom">
+                                    <field name="pieces" />
+                                </tree>
+                            </field>
                         </page>
                     </notebook>
                 </form>
@@ -625,9 +624,9 @@
                     <div class="oe_right oe_button_box" name="import_buttons">
                        <!-- Put here related buttons -->
                     </div>
-                    <label for="name" class="oe_edit_only"/>
+                    <label for="name" class="oe_edit_only" attrs="{'invisible':[('name','=','/')]}"/>
                     <h1>
-                        <field name="name" class="oe_inline"/>
+                        <field name="name" attrs="{'invisible':[('name','=','/')]}"/>
                     </h1>
                     <group>
                         <group>
@@ -1086,40 +1085,33 @@
 	                                    <field name="credit"/>
 	                                    <field name="quantity"/>
 	                                </group>
-	
 	                                <group string="Accounting Documents">
 	                                    <field name="invoice" readonly="True"/>
 	                                    <field name="move_id" required="False"/>
 	                                    <field name="statement_id" readonly="True"/>
 	                                </group>
-	
 	                                <group string="Dates">
 	                                    <field name="date"/>
 	                                    <field name="date_maturity"/>
 	                                    <field name="date_created" readonly="True"/>
 	                                </group>
-	
 	                                <group string="Taxes">
 	                                    <field name="tax_code_id"/>
 	                                    <field name="tax_amount"/>
 	                                    <field name="account_tax_id" domain="[('parent_id','=',False)]"/>
 	                                </group>
-	
 	                                <group attrs="{'readonly':[('state','=','valid')]}" string="Currency">
 	                                    <field name="currency_id"/>
 	                                    <field name="amount_currency"/>
 	                                </group>
-	
 	                                <group string="Reconciliation">
 	                                    <field name="reconcile_id"/>
 	                                    <field name="reconcile_partial_id"/>
 	                                </group>
-	
 	                                <group string="States">
 	                                    <field name="state"/>
 	                                    <field name="blocked"/>
 	                                </group>
-	
 	                                <group groups="analytic.group_analytic_accounting" string="Analytic">
 	                                    <field name="analytic_account_id" domain="[('parent_id','!=',False)]"/>
 	                                </group>
@@ -1330,9 +1322,12 @@
                     <field name="state" widget="statusbar"/>
                 </header>
                 <sheet string="Journal Entries" >
+                    <label for="name" class="oe_edit_only" attrs="{'invisible':[('name','=','/')]}"/>
+                    <h1>
+                        <field name="name" readonly="True" attrs="{'invisible':[('name','=','/')]}"/>
+                    </h1>
                     <group>
                         <group>
-                            <field name="name" readonly="True"/>
                             <field name="journal_id"/>
                             <field name="period_id"/>
                             <field name="company_id" required="1" groups="base.group_multi_company"/>
@@ -2602,14 +2597,11 @@ action = pool.get('res.config').next(cr, uid, [], context)
                     <field name="state" widget="statusbar" nolabel="1" statusbar_visible="draft,confirm"/>
                 </header>
                 <sheet string="Statement">
-                    <label for="name" class="oe_edit_only"/>
-                    <h1><field name="name" class="oe_inline"/></h1>
-                    <label for="journal_id" class="oe_edit_only"/>
-                    <h2>
-                        <field name="journal_id" on_change="onchange_journal_id(journal_id)" widget="selection"/>
-                    </h2>
+                    <label for="name" class="oe_edit_only" attrs="{'invisible':[('name','=','/')]}"/>
+                    <h1><field name="name" class="oe_inline" attrs="{'invisible':[('name','=','/')]}"/></h1>
                     <group>
                         <group>
+                            <field name="journal_id" on_change="onchange_journal_id(journal_id)" widget="selection"/>
                             <field name="user_id" readonly="1" string="Responsible"/>
                             <field name="total_entry_encoding"/>
                             <field name='company_id' widget="selection" groups="base.group_multi_company" />
diff --git a/addons/account/project/project_view.xml b/addons/account/project/project_view.xml
index 492ab249a39..5c1542abc29 100644
--- a/addons/account/project/project_view.xml
+++ b/addons/account/project/project_view.xml
@@ -385,7 +385,7 @@
             <field name="inherit_id" ref="account.view_account_journal_form"/>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <field name="currency" position="after">
+                <field name="type" position="after">
                     <field name="analytic_journal_id"/>
                 </field>
             </field>
diff --git a/addons/account/test/account_cash_statement.yml b/addons/account/test/account_cash_statement.yml
index 5ead46522bd..6bff530bb54 100644
--- a/addons/account/test/account_cash_statement.yml
+++ b/addons/account/test/account_cash_statement.yml
@@ -1,5 +1,5 @@
 -
-  In order to test Cash statement I create a Cash statement and confirm it and check it's move created
+  In order to test Cash statement I create a Cash statement and confirm it and check its move created
 -
  !record {model: account.bank.statement, id: account_bank_statement_1}:
     date: !eval time.strftime('%Y-%m-%d')
diff --git a/addons/account/wizard/account_automatic_reconcile_view.xml b/addons/account/wizard/account_automatic_reconcile_view.xml
index b7a22ea9fa8..be1776497b3 100644
--- a/addons/account/wizard/account_automatic_reconcile_view.xml
+++ b/addons/account/wizard/account_automatic_reconcile_view.xml
@@ -8,6 +8,8 @@
              <field name="type">form</field>
              <field name="arch" type="xml">
                 <form string="Reconciliation" version="7.0">
+                    <separator string="Reconciliation"/>
+                    <label string="For an invoice to be considered as paid, the invoice entries must be reconciled with counterparts, usually payments. With the automatic reconciliation functionality, OpenERP makes its own search for entries to reconcile in a series of accounts. It finds entries for each partner where the amounts correspond."/>
                     <field name="account_ids" domain="[('reconcile','=',1)]"/>
                     <group col="4">
                         <field name="power"/>
diff --git a/addons/account/wizard/account_fiscalyear_close_view.xml b/addons/account/wizard/account_fiscalyear_close_view.xml
index 43850237263..8c4df8548f6 100644
--- a/addons/account/wizard/account_fiscalyear_close_view.xml
+++ b/addons/account/wizard/account_fiscalyear_close_view.xml
@@ -7,6 +7,8 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Generate Fiscal Year Opening Entries" version="7.0">
+                    <separator string="Generate Fiscal Year Opening Entries"/>
+                    <label string="This wizard will generate the end of year journal entries of selected fiscal year. Note that you can run this wizard many times for the same fiscal year: it will simply replace the old opening entries with the new ones."/>
                     <newline/>
                     <group col="4">
                         <field name="fy_id" domain = "[('state','=','draft')]"/>
diff --git a/addons/account_payment/account_payment_view.xml b/addons/account_payment/account_payment_view.xml
index cae9efcd515..1577d1b86bd 100644
--- a/addons/account_payment/account_payment_view.xml
+++ b/addons/account_payment/account_payment_view.xml
@@ -113,13 +113,18 @@
                     <field name="state" widget="statusbar" statusbar_visible="draft,open"/>
                 </header>
                 <sheet string="Payment order">
+                    <div class="oe_button_box">
+                        <button name="%(action_create_payment_order)d" string="Select Invoices to Pay"
+                               type="action" attrs="{'invisible':[('state','=','done')]}" icon="gtk-find"/>
+                    </div>
+                    <div class="oe_title">
+                        <label for="reference" class="oe_edit_only"/>
+                        <h1><field name="reference"/></h1>
+                    </div>
                     <group>
                         <group>
-                            <field name="reference"/>
                             <field name="user_id"/>
                             <field name="mode"/>
-                            <button name="%(action_create_payment_order)d" string="Select Invoices to Pay"
-                               type="action" attrs="{'invisible':[('state','=','done')]}" icon="gtk-find"/>
                         </group>
                         <group>
                             <field name="date_prefered"/>
@@ -181,8 +186,6 @@
                             <field name="amount" sum="Total in Company Currency" invisible="1"/>
                         </tree>
                     </field>
-                    <field name="date_created"/>
-                    <field name="date_done"/>
                     </sheet>
                 </form>
             </field>
diff --git a/addons/account_sequence/account_sequence.xml b/addons/account_sequence/account_sequence.xml
index a82a041d6ec..3ed16cfa58e 100644
--- a/addons/account_sequence/account_sequence.xml
+++ b/addons/account_sequence/account_sequence.xml
@@ -44,7 +44,7 @@
             <field name="inherit_id" ref="account.view_account_move_filter"/>
             <field name="arch" type="xml">
             <data>
-                <xpath expr="//field[@name='name']" position="before">
+                <xpath expr="//field[@name='name']" position="after">
                     <field name="internal_sequence_number"/>
                 </xpath>
             </data>