openerp-dev-web team mailing list archive

["Rucha \(Open ERP\)" <rpa@xxxxxxxxxxx>]

Rucha (Open ERP) has proposed merging lp:~openerp-dev/openobject-addons/trunk-configuration-reworknew-changesrpa into lp:~openerp-dev/openobject-addons/trunk-configuration-rework.

Requested reviews:
  qdp (OpenERP) (qdp)

For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-configuration-reworknew-changesrpa/+merge/59332

Improved view of Application Installation wizard
Improvement in design of view of project config wizard
-- 
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-configuration-reworknew-changesrpa/+merge/59332
Your team OpenERP R&D Team is subscribed to branch lp:~openerp-dev/openobject-addons/trunk-configuration-rework.

=== modified file 'base_setup/base_setup_installer.xml'
--- base_setup/base_setup_installer.xml	2011-04-27 13:35:18 +0000
+++ base_setup/base_setup_installer.xml	2011-04-28 08:46:27 +0000
@@ -26,24 +26,42 @@
           </separator>
             
           <group colspan="8">
-            <field name="crm" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account_accountant,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_accountant,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_accountant,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_accountant,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_accountant,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_accountant,purchase,hr,point_of_sale,marketing,profile_tools,report_designer,association,auction,product_expiry)"/>
-            <field name="account_voucher" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account_accountant,purchase,hr,point_of_sale,marketing,profile_tools,report_designer,association,auction,product_expiry)"/>
-            <field name="account_accountant" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account_accountant,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_accountant,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_accountant,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_accountant,purchase,hr,point_of_sale,marketing,profile_tools,report_designer,association,auction,product_expiry)"/>
-            <field name="marketing" groups="base.group_extended" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account_accountant,purchase,hr,point_of_sale,marketing,profile_tools,report_designer,association,auction,product_expiry)"/>
-            <field name="point_of_sale" groups="base.group_extended" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account_accountant,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_accountant,purchase,hr,point_of_sale,marketing,profile_tools,report_designer,association,auction,product_expiry)"/>
+            <field name="crm" colspan="2" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account_accountant,purchase,hr,point_of_sale,marketing,profile_tools,report_designer,association,auction,product_expiry)"/>
+<newline/>
+            <field name="sale" colspan="2" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account_accountant,purchase,hr,point_of_sale,marketing,profile_tools,report_designer,association,auction,product_expiry)"/>
+<newline/>
+            <field name="project" colspan="2" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account_accountant,purchase,hr,point_of_sale,marketing,profile_tools,report_designer,association,auction,product_expiry)"/>
+<newline/>
+            <field name="knowledge" colspan="2" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account_accountant,purchase,hr,point_of_sale,marketing,profile_tools,report_designer,association,auction,product_expiry)"/>
+<newline/>
+            <field name="stock" colspan="2" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account_accountant,purchase,hr,point_of_sale,marketing,profile_tools,report_designer,association,auction,product_expiry)"/>
+<newline/>
+            <field name="mrp" colspan="2" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account_accountant,purchase,hr,point_of_sale,marketing,profile_tools,report_designer,association,auction,product_expiry)"/>
+<newline/>
+            <field name="account_voucher" colspan="2" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account_accountant,purchase,hr,point_of_sale,marketing,profile_tools,report_designer,association,auction,product_expiry)"/>
+<newline/>
+            <field name="account_accountant" colspan="2" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account_accountant,purchase,hr,point_of_sale,marketing,profile_tools,report_designer,association,auction,product_expiry)"/>
+<newline/>
+            <field name="purchase" colspan="2" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account_accountant,purchase,hr,point_of_sale,marketing,profile_tools,report_designer,association,auction,product_expiry)"/>
+<newline/>
+            <field name="hr" colspan="2" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account_accountant,purchase,hr,point_of_sale,marketing,profile_tools,report_designer,association,auction,product_expiry)"/>
+<newline/>
+            <field name="profile_tools" colspan="2" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account_accountant,purchase,hr,point_of_sale,marketing,profile_tools,report_designer,association,auction,product_expiry)"/>
+<newline/>
+            <field name="marketing" groups="base.group_extended" colspan="2" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account_accountant,purchase,hr,point_of_sale,marketing,profile_tools,report_designer,association,auction,product_expiry)"/>
+<newline/>
+            <field name="point_of_sale" groups="base.group_extended" colspan="2" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account_accountant,purchase,hr,point_of_sale,marketing,profile_tools,report_designer,association,auction,product_expiry)"/>
+<newline/>
+            <field name="report_designer" groups="base.group_extended" colspan="2" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account_accountant,purchase,hr,point_of_sale,marketing,profile_tools,report_designer,association,auction,product_expiry)"/>
+<newline/>
             <separator string="Install Specific Industry Applications" colspan="4"/>
-            <field name="association" attrs="{'readonly':['|',('auction','=',True),('product_expiry','=',True)]}" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account_accountant,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_accountant,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_accountant,purchase,hr,point_of_sale,marketing,profile_tools,report_designer,association,auction,product_expiry)"/>
+<newline/>
+            <field name="association" attrs="{'readonly':['|',('auction','=',True),('product_expiry','=',True)]}" colspan="2" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account_accountant,purchase,hr,point_of_sale,marketing,profile_tools,report_designer,association,auction,product_expiry)"/>
+<newline/>
+            <field name="auction" attrs="{'readonly':['|',('association','=',True),('product_expiry','=',True)]}" colspan="2" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account_accountant,purchase,hr,point_of_sale,marketing,profile_tools,report_designer,association,auction,product_expiry)"/>
+<newline/>
+            <field name="product_expiry" attrs="{'readonly':['|',('association','=',True),('auction','=',True)]}" colspan="2" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account_accountant,purchase,hr,point_of_sale,marketing,profile_tools,report_designer,association,auction,product_expiry)"/>
+<newline/>
           </group>
         </data>
       </field>

=== modified file 'project/installer.py'
--- project/installer.py	2011-01-14 00:11:01 +0000
+++ project/installer.py	2011-04-28 08:46:27 +0000
@@ -22,8 +22,7 @@
 from osv import fields, osv
 
 class project_installer(osv.osv_memory):
-    _name = 'project.installer'
-    _inherit = 'res.config.installer'
+    _inherit = 'base.setup.installer'
 
     _columns = {
         # Project Management

=== modified file 'project/project_installer.xml'
--- project/project_installer.xml	2011-04-08 12:28:11 +0000
+++ project/project_installer.xml	2011-04-28 08:46:27 +0000
@@ -3,56 +3,37 @@
 
     <record id="view_project_installer" model="ir.ui.view">
       <field name="name">project.installer.view</field>
-      <field name="model">project.installer</field>
+      <field name="model">base.setup.installer</field>
       <field name="type">form</field>
-      <field name="inherit_id" ref="base.res_config_installer"/>
+      <field name="inherit_id" ref="base_setup.view_base_setup_installer"/>
       <field name="arch" type="xml">
-          <data>
-          <form position="attributes">
-            <attribute name="string">Project Application Configuration</attribute>
-          </form>
-          <separator string="title" position="attributes">
-            <attribute name="string">Configure Your Project Management Application</attribute>
-          </separator>
-           <xpath expr='//separator[@string="vsep"]' position='attributes'>
-                <attribute name='string'></attribute>
-             </xpath>
-          <xpath expr="//label[@string='description']" position="attributes">
-              <attribute name="string">Various OpenERP applications are available to manage your projects with different level of control and flexibility.</attribute>
-          </xpath>
-          <xpath expr="//button[@string='Install Modules']" position="attributes">
-              <attribute name="string">Configure</attribute>
-          </xpath>
-          <group colspan="8">
-            <field name="project_issue"/>
-            <field name="project_long_term" groups="base.group_extended"/>
-            <field name="hr_timesheet_sheet"/>
-            <field name="project_timesheet"/>
-            <field name="account_budget" groups="base.group_extended"/>
-            <newline/>
-            <separator string="Methodologies" colspan="4"/>
-            <field name="project_scrum"/>
-            <field name="project_gtd"/>
-          </group>
+        <data>
+            <xpath expr="//field[@name='project']" position="after">
+                <newline/>
+                <group attrs="{'invisible': [('project', '=', False)]}" colspan="4">
+                    <separator string="Project Management Application" colspan="4"/>
+                </group>
+                <newline/>
+                <field colspan="2" attrs="{'invisible': [('project', '=', False)]}" name="project_issue"/>
+                <field colspan="2" attrs="{'invisible': [('project', '=', False)]}" name="project_long_term" groups="base.group_extended"/>
+                <field colspan="2" attrs="{'invisible': [('project', '=', False)]}" name="hr_timesheet_sheet"/>
+                <field colspan="2" attrs="{'invisible': [('project', '=', False)]}" name="project_timesheet"/>
+                <field colspan="2" attrs="{'invisible': [('project', '=', False)]}" name="account_budget" groups="base.group_extended"/>
+                <newline/>
+                <group attrs="{'invisible': [('project', '=', False)]}" colspan="4">
+                    <separator string="Methodologies" colspan="4" />
+                </group>
+                <newline/>
+                <field colspan="2" attrs="{'invisible': [('project', '=', False)]}" name="project_scrum"/>
+                <field colspan="2" attrs="{'invisible': [('project', '=', False)]}" name="project_gtd"/>
+                <newline/>
+                <group attrs="{'invisible': [('project', '=', False)]}" colspan="4">
+                    <separator string="" colspan="4"/>
+                </group>
+            </xpath>
         </data>
       </field>
     </record>
 
-    <record id="action_project_installer" model="ir.actions.act_window">
-      <field name="name">Project Application Configuration</field>
-      <field name="type">ir.actions.act_window</field>
-      <field name="res_model">project.installer</field>
-      <field name="view_id" ref="view_project_installer"/>
-      <field name="view_type">form</field>
-      <field name="view_mode">form</field>
-      <field name="target">new</field>
-    </record>
-
-    <record id="project_installer_todo" model="ir.actions.todo">
-        <field name="action_id" ref="action_project_installer"/>
-        <field name="type">special</field>
-        <field name="sequence">3</field>
-    </record>
-
   </data>
 </openerp>