From 8ccdb3c75ebc80fcea628406090784183a64b3eb Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Wed, 9 Jul 2008 17:55:23 +0000
Subject: [PATCH] Imrpovement in wizards

bzr revid: fp@tinyerp.com-60cd6fa546623497dc251ac5ac0b68a87826740d
---
 addons/account/account.py                     |  5 ++--
 addons/account/account_view.xml               |  9 ++++----
 addons/base_setup/wizard/wizard_base_setup.py | 10 ++++----
 addons/profile_service/profile_service.py     |  6 ++---
 addons/profile_service/profile_service.xml    | 23 ++++++-------------
 5 files changed, 23 insertions(+), 30 deletions(-)

diff --git a/addons/account/account.py b/addons/account/account.py
index 75605c1ab14..6eade89acfa 100644
--- a/addons/account/account.py
+++ b/addons/account/account.py
@@ -1548,10 +1548,11 @@ class account_config_fiscalyear(osv.osv_memory):
     _columns = {
 		'name':fields.char('Name', required=True,size=64),
 		'code':fields.char('Code', required=True,size=64),
-        'date1': fields.date('Start of period', required=True),
-        'date2': fields.date('End of period', required=True),
+        'date1': fields.date('Starting Date', required=True),
+        'date2': fields.date('Ending Date', required=True),
     }
     _defaults = {
+        'code': lambda *a: time.strftime('%Y'),
         'date1': lambda *a: time.strftime('%Y-01-01'),
         'date2': lambda *a: time.strftime('%Y-12-31'),
     }
diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index c2048603c14..59ec5f8133c 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -1401,15 +1401,16 @@
             <field name="model">account.config.fiscalyear</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Configure Fiscal Year">
-                    <separator col="4" colspan="4" string="Configure Fiscal Year"/>
-                    <newline/>
+                <form string="Configure Your Fiscal Year">
+                    <separator col="4" colspan="4" string="Configure Your Fiscal Year"/>
                     <field name="name"/>
                     <field name="code"/>
                     <field name="date1"/>
                     <field name="date2"/>
+					<separator string="" colspan="4"/>
+					<label string="" colspan="2"/>
                     <group col="4" colspan="4">
-                        <button icon="gtk-cancel" special="cancel" string="Cancel" name="action_cancel" type="object"/>
+                        <button icon="gtk-cancel" special="cancel" string="Don't Create" name="action_cancel" type="object"/>
                         <button icon="gtk-ok" name="action_create" string="Create" type="object"/>
                     </group>
                 </form>
diff --git a/addons/base_setup/wizard/wizard_base_setup.py b/addons/base_setup/wizard/wizard_base_setup.py
index 4977731d8cc..c24c674b44e 100644
--- a/addons/base_setup/wizard/wizard_base_setup.py
+++ b/addons/base_setup/wizard/wizard_base_setup.py
@@ -105,9 +105,9 @@ view_form_finish = """<?xml version="1.0"?>
 <form string="Setup">
 	<image name="gtk-dialog-info" colspan="2"/>
 	<group colspan="2" col="4">
-		<separator colspan="4" string="Installation done"/>
+		<separator colspan="4" string="Installation Done"/>
 		<label align="0.0" colspan="4" string="Your new database is now fully installed."/>
-		<label align="0.0" colspan="4" string="You can start using the system or continue the configuration using the menu Administration\Configuration"/>
+		<label align="0.0" colspan="4" string="You can start configuring the system or connect directly to the database using the default setup."/>
 	</group>
 </form>
 """
@@ -431,8 +431,8 @@ IBAN: BE74 1262 0121 6907 - SWIFT: CPDF BE71 - VAT: BE0477.472.701""",
 			'actions': [_update],
 			'result': {'type': 'form', 'arch': view_form_finish, 'fields': {},
 				'state': [
-					('menu', 'Ok', 'gtk-ok', True),
-					('config', 'Start configuration', 'gtk-ok', True)
+					('menu', 'Use Directly'),
+					('config', 'Start Configuration', 'gtk-ok', True)
 				]
 			}
 		},
@@ -449,4 +449,4 @@ IBAN: BE74 1262 0121 6907 - SWIFT: CPDF BE71 - VAT: BE0477.472.701""",
 		},
 	}
 
-wizard_base_setup('base_setup.base_setup')
\ No newline at end of file
+wizard_base_setup('base_setup.base_setup')
diff --git a/addons/profile_service/profile_service.py b/addons/profile_service/profile_service.py
index e8f4cd528f7..ac79dd64d32 100644
--- a/addons/profile_service/profile_service.py
+++ b/addons/profile_service/profile_service.py
@@ -87,8 +87,8 @@ class config_install_extra_modules(osv.osv_memory):
     _name='config.install_extra_modules'
     _columns = {
         'name':fields.char('Name', size=64),
-        'timesheets_module':fields.boolean('Timesheets module'),
-        'holidays_module':fields.boolean('Holidays module'),
+        'timesheets_module':fields.boolean('Timesheets Management'),
+        'holidays_module':fields.boolean('Hollidays Management'),
 
     }
     def action_cancel(self,cr,uid,ids,conect=None):
@@ -120,4 +120,4 @@ class config_install_extra_modules(osv.osv_memory):
                 'target':'new',
             }
 
-config_install_extra_modules()
\ No newline at end of file
+config_install_extra_modules()
diff --git a/addons/profile_service/profile_service.xml b/addons/profile_service/profile_service.xml
index 19068597808..3603841cee5 100644
--- a/addons/profile_service/profile_service.xml
+++ b/addons/profile_service/profile_service.xml
@@ -7,21 +7,12 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Install Extra Module">
-                    <separator col="4" colspan="4" string="Install Extra Module"/>
-                    <newline/>
+                    <separator colspan="4" string="Install More Modules"/>
                     <field name="timesheets_module"/>
                     <field name="holidays_module"/>
-                    <!--<field name="module_ids" widget="one2many_list" colspan="4" nolabel="1" mode="tree,graph">
-            	<form string="Module Lines">
-            	<field name="install"/>
-            	<field name="module_id"/>
-            	</form>
-            	<tree string="Module Lines">
-            	<field name="install"/>
-            	<field name="module_id"/>
-            	</tree>
-            </field>-->
-                    <group col="4" colspan="4">
+					<separator string="" colspan="4"/>
+					<label string="" colspan="2"/>
+                    <group col="4" colspan="2">
                         <button special="cancel" string="Cancel" name="action_cancel" type="object" icon='gtk-cancel'/>
                         <button name="action_install" string="Install" icon='gtk-ok' type="object"/>
                     </group>
@@ -30,7 +21,7 @@
         </record>
 
         <record id="action_config_install_module" model="ir.actions.act_window">
-            <field name="name">Install extra modules</field>
+            <field name="name">Install Extra Modules</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">config.install_extra_modules</field>
             <field name="view_type">form</field>
@@ -41,11 +32,11 @@
       <record model="ir.module.module.configuration.step"
             id="config_install_module">
             <field name="name">Install Extra modules</field>
-            <field name="note">Install Extra modules</field>
+            <field name="note">Install more modules. A few modules are proposed according to the service profile you selected. You will be able to install them based on our requirements.</field>
             <field name="action_id" ref="action_config_install_module"/>
             <field name="state">open</field>
         </record>
 
 
     </data>
-</terp>
\ No newline at end of file
+</terp>