[MERGE]

bzr revid: uco@tinyerp.com-20100920055730-1tlsthrcos7p7bgi

3 files changed, 31 insertions, 27 deletions

diff --git a/addons/base_setup/base_setup_installer.xml b/addons/base_setup/base_setup_installer.xml
index db890c2dfdf..4245f3da206 100644
--- a/addons/base_setup/base_setup_installer.xml
+++ b/addons/base_setup/base_setup_installer.xml
@@ -8,38 +8,41 @@
       <field name="arch" type="xml">
         <data>
           <form position="attributes">
-            <attribute name="string">Install OpenERP Modules</attribute>
+            <attribute name="string">Install Applications</attribute>
           </form>
-          <xpath expr="//label[@string='description']"
-                 position="attributes">
-            <attribute name="string">Select applications you want to install. If you don't think you need any of these right now, you can easily install them later.</attribute>
+          <xpath expr="//label[@string='description']" position="attributes">
+                <attribute name="string">Select the Applications you want your system to cover. If you are not sure about your exact needs at this stage, you can easily install them later.</attribute>
           </xpath>
           <xpath expr='//separator[@string="vsep"]' position='attributes'>
                     <attribute name='string'></attribute>
                     <attribute name='rowspan'>15</attribute>
           </xpath>
+          <xpath expr="//button[@string='Install Modules']" position="attributes">
+                    <attribute name="string">Install</attribute>
+          </xpath>
           <separator string="title" position="attributes">
-            <attribute name="string">Install Generic Modules</attribute>
+            <attribute name="string">Install Applications</attribute>
           </separator>
+            
           <group colspan="8">
-            <field name="crm" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account,purchase,hr,point_of_sale,marketing,profile_tools,report_designer,association,auction)"/> <field name="sale" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account,purchase,hr,point_of_sale,marketing,profile_tools,report_designer,association,auction)"/>
-            <field name="project" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account,purchase,hr,point_of_sale,marketing,profile_tools,report_designer,association,auction)"/> <field name="knowledge" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account,purchase,hr,point_of_sale,marketing,profile_tools,report_designer,association,auction)"/>
-            <field name="stock" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account,purchase,hr,point_of_sale,marketing,profile_tools,report_designer,association,auction)"/> <field name="mrp" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account,purchase,hr,point_of_sale,marketing,profile_tools,report_designer,association,auction)"/>
-            <field name="account" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account,purchase,hr,point_of_sale,marketing,profile_tools,report_designer,association,auction)"/> <field name="purchase" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account,purchase,hr,point_of_sale,marketing,profile_tools,report_designer,association,auction)"/>
-            <field name="hr" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account,purchase,hr,point_of_sale,marketing,profile_tools,report_designer,association,auction)"/> <field name="point_of_sale" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account,purchase,hr,point_of_sale,marketing,profile_tools,report_designer,association,auction)"/>
-            <field name="marketing" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account,purchase,hr,point_of_sale,marketing,profile_tools,report_designer,association,auction)"/> <field name="profile_tools" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account,purchase,hr,point_of_sale,marketing,profile_tools,report_designer,association,auction)"/>
-            <field name="report_designer" groups="base.group_extended" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account,purchase,hr,point_of_sale,marketing,profile_tools,report_designer,association,auction)"/>
-            <separator string="Install Specific Business Modules" colspan="4"/>
-            <field name="association" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account,purchase,hr,point_of_sale,marketing,profile_tools,report_designer,association,auction)"/>
-            <field name="auction" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account,purchase,hr,point_of_sale,marketing,profile_tools,report_designer,association,auction)"/>
-            <field name="product_expiry" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account,purchase,hr,point_of_sale,marketing,profile_tools,report_designer,association,auction)"/>
+            <field name="crm" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account,purchase,hr,point_of_sale,marketing,profile_tools,report_designer,association,auction,product_expiry)"/> <field name="sale" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account,purchase,hr,point_of_sale,marketing,profile_tools,report_designer,association,auction,product_expiry)"/>
+            <field name="project" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account,purchase,hr,point_of_sale,marketing,profile_tools,report_designer,association,auction,product_expiry)"/> <field name="knowledge" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account,purchase,hr,point_of_sale,marketing,profile_tools,report_designer,association,auction,product_expiry)"/>
+            <field name="stock" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account,purchase,hr,point_of_sale,marketing,profile_tools,report_designer,association,auction,product_expiry)"/> <field name="mrp" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account,purchase,hr,point_of_sale,marketing,profile_tools,report_designer,association,auction,product_expiry)"/>
+            <field name="account" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account,purchase,hr,point_of_sale,marketing,profile_tools,report_designer,association,auction,product_expiry)"/> <field name="purchase" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account,purchase,hr,point_of_sale,marketing,profile_tools,report_designer,association,auction,product_expiry)"/>
+            <field name="hr" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account,purchase,hr,point_of_sale,marketing,profile_tools,report_designer,association,auction,product_expiry)"/> <field name="point_of_sale" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account,purchase,hr,point_of_sale,marketing,profile_tools,report_designer,association,auction,product_expiry)"/>
+            <field name="marketing" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account,purchase,hr,point_of_sale,marketing,profile_tools,report_designer,association,auction,product_expiry)"/> <field name="profile_tools" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account,purchase,hr,point_of_sale,marketing,profile_tools,report_designer,association,auction,product_expiry)"/>
+            <field name="report_designer" groups="base.group_extended" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account,purchase,hr,point_of_sale,marketing,profile_tools,report_designer,association,auction,product_expiry)"/>
+            <separator string="Install Specific Industry Sector Applications" colspan="4"/>
+            <field name="association" attrs="{'readonly':['|',('auction','=',True),('product_expiry','=',True)]}" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account,purchase,hr,point_of_sale,marketing,profile_tools,report_designer,association,auction,product_expiry)"/>
+            <field name="auction" attrs="{'readonly':['|',('association','=',True),('product_expiry','=',True)]}" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account,purchase,hr,point_of_sale,marketing,profile_tools,report_designer,association,auction,product_expiry)"/>
+            <field name="product_expiry" attrs="{'readonly':['|',('association','=',True),('auction','=',True)]}" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account,purchase,hr,point_of_sale,marketing,profile_tools,report_designer,association,auction,product_expiry)"/>
           </group>
         </data>
       </field>
     </record>
 
     <record id="action_base_setup_installer" model="ir.actions.act_window">
-      <field name="name">Base Setup Modules Installation</field>
+      <field name="name">Install Applications</field>
       <field name="type">ir.actions.act_window</field>
       <field name="res_model">base.setup.installer</field>
       <field name="view_id" ref="view_base_setup_installer"/>
diff --git a/addons/base_setup/base_setup_todo.xml b/addons/base_setup/base_setup_todo.xml
index 59543200076..8151442855b 100644
--- a/addons/base_setup/base_setup_todo.xml
+++ b/addons/base_setup/base_setup_todo.xml
@@ -1,20 +1,20 @@
 <openerp>
   <data>
     <record id="view_base_setup_company" model="ir.ui.view">
-      <field name="name">Setup company information</field>
+      <field name="name">Company Configuration</field>
       <field name="model">base.setup.company</field>
       <field name="type">form</field>
       <field name="inherit_id" ref="base.res_config_view_base"/>
       <field name="arch" type="xml">
         <data>
           <form position="attributes">
-            <attribute name="string">Main Company Setup</attribute>
+            <attribute name="string">Company Configuration</attribute>
           </form>
           <xpath expr="//label[@string='description']" position="attributes">
-                <attribute name="string">Information of your company will be used to customize your documents like Invoices, Sale Orders and many more.</attribute>
+                <attribute name="string">Your company information will be used to personalize documents issued with OpenERP such as invoices, sales orders and much more.</attribute>
           </xpath>
           <xpath expr='//separator[@string="title"]' position='attributes'>
-                    <attribute name='string'>Configure Your Company</attribute>
+                    <attribute name='string'>Configure Your Company Information</attribute>
           </xpath>
           <xpath expr='//separator[@string="vsep"]' position='attributes'>
                     <attribute name='rowspan'>25</attribute>
@@ -55,7 +55,7 @@
     </record>
 
     <record id="action_base_setup_company" model="ir.actions.act_window">
-      <field name="name">Setup company information</field>
+      <field name="name">Company Configuration</field>
       <field name="type">ir.actions.act_window</field>
       <field name="res_model">base.setup.company</field>
       <field name="view_id" ref="view_base_setup_company"/>
diff --git a/addons/base_setup/installer.py b/addons/base_setup/installer.py
index eb111ecb943..0c8478ba57d 100644
--- a/addons/base_setup/installer.py
+++ b/addons/base_setup/installer.py
@@ -65,13 +65,12 @@ class base_setup_installer(osv.osv_memory):
                  "automatic picking lists generation and more."),
         'marketing':fields.boolean('Marketing',
             help="Helps you manage your marketing campaigns step by step."),
-        'profile_tools':fields.boolean('Miscellaneous Tools',
+        'profile_tools':fields.boolean('Extra Tools',
             help="Lets you install various interesting but non-essential tools "
                 "like Survey, Lunch and Ideas box."),
         'report_designer':fields.boolean('Advanced Reporting',
             help="Lets you install various tools to simplify and enhance "
                  "OpenERP's report creation."),
-        'thunderbird' :fields.boolean('Thunderbird'),
         # Vertical modules
         'product_expiry':fields.boolean('Food Industry',
             help="Installs a preselected set of OpenERP applications "
@@ -107,11 +106,13 @@ class base_setup_installer(osv.osv_memory):
             return ['account_voucher']
         return None
 
-    def onchange_moduleselection(self, cr, uid, ids, *args):
+    def onchange_moduleselection(self, cr, uid, ids, *args, **kargs):
+        value = {}
+        # Calculate progress
         closed, total = self.get_current_progress(cr, uid)
-
         progress = round(100. * closed / (total + len(filter(None, args))))
+        value.update({'progress':progress})
         if progress < 10.:
             progress = 10.
-        return {'value':{'progress':progress}}
+        return {'value':value}
 base_setup_installer()