From fb838181dab5069d838a34d2517a2d4bb6dd7744 Mon Sep 17 00:00:00 2001
From: "Bharat Devnani (OpenERP)" <bde@tinyerp.com>
Date: Mon, 25 Jun 2012 19:03:53 +0530
Subject: [PATCH 1/2] [IMP] improved the views of Periodical
 Processing/Recurring Entries/ Define Recurring Entries and Genereate entries
 menus

bzr revid: bde@tinyerp.com-20120625133353-6ncjph9hijgpsxop
---
 addons/account/account.py                             |  2 +-
 addons/account/account_view.xml                       | 11 ++++-------
 .../account/wizard/account_subscription_generate.py   |  2 +-
 .../wizard/account_subscription_generate_view.xml     |  3 ---
 4 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/addons/account/account.py b/addons/account/account.py
index 6e96ce73962..1804c7835ad 100644
--- a/addons/account/account.py
+++ b/addons/account/account.py
@@ -2347,7 +2347,7 @@ class account_subscription(osv.osv):
         'ref': fields.char('Reference', size=16),
         'model_id': fields.many2one('account.model', 'Model', required=True),
         'date_start': fields.date('Start Date', required=True),
-        'period_total': fields.integer('Number of Periods', required=True),
+        'period_total': fields.integer('Number of Period(s)', required=True),
         'period_nbr': fields.integer('Period', required=True),
         'period_type': fields.selection([('day','days'),('month','month'),('year','year')], 'Period Type', required=True),
         'state': fields.selection([('draft','Draft'),('running','Running'),('done','Done')], 'Status', required=True, readonly=True),
diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index ab46f7519f8..18b5e88899b 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -1830,22 +1830,19 @@
                     </header>
                     <sheet>
                         <group>
-                            <group>
+                            <group col="2">
                                 <field name="name"/>
                                 <field name="model_id"/>
                                 <field name="ref"/>
                             </group>
-                            <newline/>
     
-                            <group string="Starts on">
+                            <group col="2">
                                 <field name="date_start"/>
+                                <field name="period_type"/>
+                                <field name="period_nbr"/>
                                 <field name="period_total"/>
                             </group>
     
-                            <group string="Valid Up to">
-                                <field name="period_nbr"/>
-                                <field name="period_type"/>
-                            </group>
                         </group>
                         <separator string="Subscription Lines"/>
                         <field name="lines_id" widget="one2many_list"/>
diff --git a/addons/account/wizard/account_subscription_generate.py b/addons/account/wizard/account_subscription_generate.py
index 8efcd25b789..dc5209ebea0 100644
--- a/addons/account/wizard/account_subscription_generate.py
+++ b/addons/account/wizard/account_subscription_generate.py
@@ -28,7 +28,7 @@ class account_subscription_generate(osv.osv_memory):
     _name = "account.subscription.generate"
     _description = "Subscription Compute"
     _columns = {
-       'date': fields.date('Date', required=True),
+       'date': fields.date('Generate Entries Before', required=True),
     }
     _defaults = {
         'date': lambda *a: time.strftime('%Y-%m-%d'),
diff --git a/addons/account/wizard/account_subscription_generate_view.xml b/addons/account/wizard/account_subscription_generate_view.xml
index bf848bb3776..bd5ba404cdd 100644
--- a/addons/account/wizard/account_subscription_generate_view.xml
+++ b/addons/account/wizard/account_subscription_generate_view.xml
@@ -9,12 +9,9 @@
             <field name="arch" type="xml">
                 <form string="Subscription Compute" version="7.0">
                     <header>
-                        <button icon="gtk-cancel" special="cancel" string="Cancel" />
                         <button icon="gtk-execute" string="Generate Entries"
                             name="action_generate" type="object" />
                     </header>
-                    <separator string="Generate Entries before:"/>
-                    <label string ="Automatically generate entries based on what has been entered in the  system before a specific date."/>
                     <group>
                         <field name="date"/>
                     </group>

From 022d717f1016c3c040f33f69f6e27c31d0068cab Mon Sep 17 00:00:00 2001
From: "Bharat Devnani (OpenERP)" <bde@tinyerp.com>
Date: Tue, 26 Jun 2012 14:46:51 +0530
Subject: [PATCH 2/2] [IMP] improved views of menus under Periodical Processing
 from useability point of view

bzr revid: bde@tinyerp.com-20120626091651-4cugzyz1dj2n4mb1
---
 addons/account/account_view.xml               | 21 ++++++++++++-------
 .../wizard/account_fiscalyear_close_state.py  |  2 +-
 .../wizard/account_fiscalyear_close_state.xml |  4 +---
 .../wizard/account_fiscalyear_close_view.xml  |  2 --
 .../account_open_closed_fiscalyear_view.xml   |  1 -
 .../account/wizard/account_use_model_view.xml |  4 +---
 .../wizard/account_validate_move_view.xml     |  4 +---
 .../wizard/wizard_asset_compute_view.xml      |  3 ---
 .../wizard/account_followup_print.py          |  6 +++---
 .../wizard/account_followup_print_view.xml    | 15 +++++--------
 10 files changed, 26 insertions(+), 36 deletions(-)

diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index 18b5e88899b..9a77a9286e3 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -105,13 +105,20 @@
                 </header>
                 <sheet>
                     <group col="4">
-                        <field name="name"/>
-                        <field name="code"/>
-                        <field name="date_start"/>
-                        <field name="date_stop"/>
-                        <field name="company_id" widget="selection" groups="base.group_multi_company"/>
-                        <field name="fiscalyear_id" widget="selection"/>
-                        <field name="special"/>
+                        <group>
+                            <field name="name"/>
+                            <field name="fiscalyear_id" widget="selection"/>
+                            <label for="date_start" string="Duration"/>
+                            <div>
+                                <field name="date_start"/>- 
+                                <field name="date_stop" nolabel="1"/>
+                            </div>
+                        </group>
+                        <group>
+                            <field name="code"/>
+                            <field name="special"/>
+                            <field name="company_id" widget="selection" groups="base.group_multi_company"/>
+                        </group>
                     </group>
                 </sheet>
                 </form>
diff --git a/addons/account/wizard/account_fiscalyear_close_state.py b/addons/account/wizard/account_fiscalyear_close_state.py
index 68c758eb495..1d73c852a8d 100644
--- a/addons/account/wizard/account_fiscalyear_close_state.py
+++ b/addons/account/wizard/account_fiscalyear_close_state.py
@@ -29,7 +29,7 @@ class account_fiscalyear_close_state(osv.osv_memory):
     _description = "Fiscalyear Close state"
     _columns = {
        'fy_id': fields.many2one('account.fiscalyear', \
-                                 'Fiscal Year to close', required=True, help="Select a fiscal year to close"),
+                                 'Fiscal Year to Close', required=True, help="Select a fiscal year to close"),
     }
 
     def data_save(self, cr, uid, ids, context=None):
diff --git a/addons/account/wizard/account_fiscalyear_close_state.xml b/addons/account/wizard/account_fiscalyear_close_state.xml
index e141b4fc911..5c9e1dea50d 100644
--- a/addons/account/wizard/account_fiscalyear_close_state.xml
+++ b/addons/account/wizard/account_fiscalyear_close_state.xml
@@ -8,10 +8,8 @@
             <field name="arch" type="xml">
                 <form string="Close states of Fiscal year and periods" version="7.0">
                 <header>
-                    <button icon="gtk-cancel" special="cancel" string="Cancel"/>
-                    <button icon="terp-locked" string="Close Fiscalyear" name="data_save" type="object"/>
+                    <button icon="terp-locked" string="Close Fiscal Year" name="data_save" type="object"/>
                 </header>
-                <separator string="Close states of Fiscal year and periods"/>
                 <label string ="If no additional entries should be recorded on a fiscal year, you can close it from here. It will close all opened periods in this year that will make impossible any new entry record. Close a fiscal year when you need to finalize your end of year results definitive "/>
                 <group>
                     <field name="fy_id"  domain="[('state','=','draft')]"/>
diff --git a/addons/account/wizard/account_fiscalyear_close_view.xml b/addons/account/wizard/account_fiscalyear_close_view.xml
index aa34fefd128..b27a0279fb3 100644
--- a/addons/account/wizard/account_fiscalyear_close_view.xml
+++ b/addons/account/wizard/account_fiscalyear_close_view.xml
@@ -9,9 +9,7 @@
                 <form string="Generate Fiscal Year Opening Entries" version="7.0">
                     <header>
                         <button icon="gtk-execute" string="Create" name="data_save" type="object"/>
-                        <button icon="gtk-cancel" special="cancel" string="Cancel"/>
                     </header>
-                    <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">
diff --git a/addons/account/wizard/account_open_closed_fiscalyear_view.xml b/addons/account/wizard/account_open_closed_fiscalyear_view.xml
index a4e338f3b9e..6df9e848411 100644
--- a/addons/account/wizard/account_open_closed_fiscalyear_view.xml
+++ b/addons/account/wizard/account_open_closed_fiscalyear_view.xml
@@ -8,7 +8,6 @@
             <field name="arch" type="xml">
                 <form string="Choose Fiscal Year " version="7.0">
                     <header>
-                        <button icon="gtk-cancel" special="cancel" string="Cancel"/>
                         <button icon="terp-gtk-go-back-rtl" string="Open" name="remove_entries" type="object"/>
                     </header>
                     <group>
diff --git a/addons/account/wizard/account_use_model_view.xml b/addons/account/wizard/account_use_model_view.xml
index 682236a0610..bf069b3f16b 100644
--- a/addons/account/wizard/account_use_model_view.xml
+++ b/addons/account/wizard/account_use_model_view.xml
@@ -10,12 +10,10 @@
             <form string="Create Entries From Models" version="7.0">
                 <header>
                     <button icon="gtk-execute" string="Create Entries" name="create_entries" type="object"/>
-                    <button icon="gtk-cancel" special="cancel" string="Cancel"/>
                 </header>
-                <separator string="This wizard will create recurring accounting entries"/>
                 <label string="Create manual recurring entries in a chosen journal."/>
                 <group>
-                    <field name="model"/>
+                    <field name="model" nolabel="1"/>
                 </group>
             </form>
             </field>
diff --git a/addons/account/wizard/account_validate_move_view.xml b/addons/account/wizard/account_validate_move_view.xml
index 2ee826fe1f7..8f991257f9a 100644
--- a/addons/account/wizard/account_validate_move_view.xml
+++ b/addons/account/wizard/account_validate_move_view.xml
@@ -11,9 +11,7 @@
             <form string="Post Journal Entries" version="7.0">
                 <header>
                     <button icon="terp-camera_test" string="Approve" name="validate_move" type="object"/>
-                    <button icon="gtk-cancel" special="cancel" string="Cancel"/>
                 </header>
-                <separator string="Post Journal Entries of a Journal"/>
                 <label string="All draft account entries in this journal and period will be validated. It means you won't be able to modify their accounting fields anymore."/>
                 <group>
                     <field name="journal_id"/>
@@ -24,7 +22,7 @@
         </record>
 
         <record id="action_validate_account_move" model="ir.actions.act_window">
-            <field name="name">Open Journal</field>
+            <field name="name">Post Journal Entries</field>
             <field name="res_model">validate.account.move</field>
             <field name="view_type">form</field>
             <field name="view_mode">form</field>
diff --git a/addons/account_asset/wizard/wizard_asset_compute_view.xml b/addons/account_asset/wizard/wizard_asset_compute_view.xml
index 5d2bc39a751..6c517d5ed14 100644
--- a/addons/account_asset/wizard/wizard_asset_compute_view.xml
+++ b/addons/account_asset/wizard/wizard_asset_compute_view.xml
@@ -9,10 +9,7 @@
                 <form string="Compute Asset" version="7.0">
                     <header>
                         <button icon="gtk-execute" string="Compute" name="asset_compute" type="object"/>
-                        <button icon="gtk-cancel" special="cancel" string="Cancel"/>
                     </header>
-                    <separator string="Post Depreciation Lines"/>
-                    <label string="This wizard will post the depreciation lines of running assets that belong to the selected period."/>
                     <group>
                         <field name="period_id"/>
                     </group>
diff --git a/addons/account_followup/wizard/account_followup_print.py b/addons/account_followup/wizard/account_followup_print.py
index 088ff868ca0..555ba1a34cf 100644
--- a/addons/account_followup/wizard/account_followup_print.py
+++ b/addons/account_followup/wizard/account_followup_print.py
@@ -31,7 +31,7 @@ class account_followup_print(osv.osv_memory):
     _description = 'Print Followup & Send Mail to Customers'
     _columns = {
         'date': fields.date('Follow-up Sending Date', required=True, help="This field allow you to select a forecast date to plan your follow-ups"),
-        'followup_id': fields.many2one('account_followup.followup', 'Follow-up', required=True),
+        'followup_id': fields.many2one('account_followup.followup', 'Follow-Up', required=True),
     }
 
     def _get_followup(self, cr, uid, context=None):
@@ -121,10 +121,10 @@ class account_followup_print_all(osv.osv_memory):
     _description = 'Print Followup & Send Mail to Customers'
     _columns = {
         'partner_ids': fields.many2many('account_followup.stat.by.partner', 'partner_stat_rel', 'osv_memory_id', 'partner_id', 'Partners', required=True),
-        'email_conf': fields.boolean('Send email confirmation'),
+        'email_conf': fields.boolean('Send Email Confirmation'),
         'email_subject': fields.char('Email Subject', size=64),
         'partner_lang': fields.boolean('Send Email in Partner Language', help='Do not change message text, if you want to send email in partner language, or configure from company'),
-        'email_body': fields.text('Email body'),
+        'email_body': fields.text('Email Body'),
         'summary': fields.text('Summary', required=True, readonly=True),
         'test_print': fields.boolean('Test Print', help='Check if you want to print followups without changing followups level.')
     }
diff --git a/addons/account_followup/wizard/account_followup_print_view.xml b/addons/account_followup/wizard/account_followup_print_view.xml
index 32b6383a8cc..9f0474ca8b7 100644
--- a/addons/account_followup/wizard/account_followup_print_view.xml
+++ b/addons/account_followup/wizard/account_followup_print_view.xml
@@ -7,13 +7,10 @@
             <field name="model">account.followup.print</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-            <form string="Send followups" version="7.0">
+            <form string="Send Follow-Ups" version="7.0">
                 <header>
                     <button name="do_continue" string="Continue" colspan="1" type="object" icon="gtk-ok"/>
-                    <button special="cancel"  string="Cancel" icon='gtk-cancel'/>
                 </header>
-                <separator string="Send Follow-Ups"/>
-                <label string ="This feature allows you to send reminders to partners with pending invoices. You can send them the default message for unpaid invoices or manually enter a message should you need to remind them of a specific information."/>
                 <group col="4">
                     <field name="followup_id"/>
                     <field name="date"/>
@@ -23,7 +20,7 @@
         </record>
 
         <record id="action_account_followup_print" model="ir.actions.act_window">
-            <field name="name">Send followups</field>
+            <field name="name">Send Follow-Ups</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">account.followup.print</field>
             <field name="view_type">form</field>
@@ -75,11 +72,10 @@
             <field name="model">account.followup.print.all</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-            <form string="Send followups" version="7.0">
+            <form string="Send Follow-Ups" version="7.0">
                 <header>
                     <button name="do_mail" string="Send Mails" colspan="1" type="object" icon="gtk-execute"/>
-                    <button name="do_print" string="Print Follow Ups" colspan="1" type="object" icon="gtk-print"/>
-                    <button special="cancel" string="Cancel" icon='gtk-cancel'/>
+                    <button name="do_print" string="Print Follow-Ups" colspan="1" type="object" icon="gtk-print"/>
                 </header>
                 <notebook>
                     <page string="Partner Selection">
@@ -91,7 +87,6 @@
                             <field name="partner_lang" colspan="4"/>
                             <field name="test_print" colspan="4"/>
                             <field name="email_subject" colspan="4"/>
-                            <separator string="Email Body" colspan="4" />
                             <field name="email_body" colspan="4" nolabel="1"/>
                         </group>
                         <group string="Legend">
@@ -126,7 +121,7 @@
         </record>
 
         <record id="action_account_followup_print_all" model="ir.actions.act_window">
-            <field name="name">Send followups</field>
+            <field name="name">Send Follow-Ups</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">account.followup.print.all</field>
             <field name="view_type">form</field>