openerp-dev-web team mailing list archive
-
openerp-dev-web team
-
Mailing list archive
-
Message #06237
lp:~openerp-dev/openobject-addons/trunk-configuration-rework-merging-wizards-aag into lp:~openerp-dev/openobject-addons/trunk-configuration-rework
Atik Agewan(OpenERP) has proposed merging lp:~openerp-dev/openobject-addons/trunk-configuration-rework-merging-wizards-aag into lp:~openerp-dev/openobject-addons/trunk-configuration-rework.
Requested reviews:
Rucha (Open ERP) (rpa-openerp)
For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-configuration-rework-merging-wizards-aag/+merge/59728
Hello ,
In this Merged proposal I have merged configure wizards of HR - 'configure your HR application' with the wizard 'install new application'
same way configure wizard of project,crm,sale,knowledge,mrp,purchase,marketing,report_designer,
profile_tools,association are merged with the wizard 'install new application'
Thanks
--
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-configuration-rework-merging-wizards-aag/+merge/59728
Your team OpenERP R&D Team is subscribed to branch lp:~openerp-dev/openobject-addons/trunk-configuration-rework.
=== modified file 'association/profile_association.py'
--- association/profile_association.py 2011-01-14 00:11:01 +0000
+++ association/profile_association.py 2011-05-03 05:02:25 +0000
@@ -22,17 +22,16 @@
from osv import fields, osv
class profile_association_config_install_modules_wizard(osv.osv_memory):
- _name='profile.association.config.install_modules_wizard'
- _inherit = 'res.config.installer'
+ _inherit = 'base.setup.installer'
_columns = {
- 'hr_expense':fields.boolean('Expenses Tracking', help="Tracks and manages employee expenses, and can "
+ 'hr_expense':fields.boolean('Resources Management:Expenses Tracking', help="Tracks and manages employee expenses, and can "
"automatically re-invoice clients if the expenses are "
"project-related."),
'project':fields.boolean('Project Management',
help="Helps you manage your projects and tasks by tracking them, "
"generating plannings, etc..."),
- 'event_project':fields.boolean('Events', help="Helps you to manage and organize your events."),
+ 'event_project':fields.boolean('Event Management:Events', help="Helps you to manage and organize your events."),
'project_gtd':fields.boolean('Getting Things Done',
help="GTD is a methodology to efficiently organise yourself and your tasks. This module fully integrates GTD principle with OpenERP's project management."),
'wiki': fields.boolean('Wiki', help="Lets you create wiki pages and page groups in order "
=== modified file 'association/profile_association.xml'
--- association/profile_association.xml 2011-04-27 13:35:18 +0000
+++ association/profile_association.xml 2011-05-03 05:02:25 +0000
@@ -3,56 +3,25 @@
<data>
<record id="view_confirm_install_module_form" model="ir.ui.view">
<field name="name">Association Application Configuration</field>
- <field name="model">profile.association.config.install_modules_wizard</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">Association Application Configuration</attribute>
- </form>
- <xpath expr='//separator[@string="vsep"]' position='attributes'>
- <attribute name='string'></attribute>
- </xpath>
- <xpath expr="//label[@string='description']"
- position="attributes">
- <attribute name="string">Here are specific applications related to the Association Profile you selected.</attribute>
- </xpath>
- <xpath expr="//button[@string='Install Modules']" position="attributes">
- <attribute name="string">Configure</attribute>
- </xpath>
- <separator string="title" position="replace"/>
- <group colspan="8">
- <separator string="Project Management" colspan="4"/>
- <field name="project"/>
- <field name="project_gtd"/>
- <field name="wiki"/>
- <separator string="Event Management" colspan="4"/>
- <field name="event_project"/>
- <separator string="Resources Management" colspan="4"/>
- <field name="hr_expense"/>
- </group>
+ <xpath expr="//field[@name='product_expiry']" position="after">
+ <newline/>
+ <group attrs="{'invisible': [('association', '=', False)]}" colspan="4">
+ <separator string="Associations Details" colspan="4" />
+ </group>
+ <field name="project" attrs="{'invisible': [('association', '=', False)]}"/>
+ <field name="project_gtd" attrs="{'invisible': [('association', '=', False)]}"/>
+ <field name="wiki" attrs="{'invisible': [('association', '=', False)]}"/>
+ <field name="event_project" attrs="{'invisible': [('association', '=', False)]}"/>
+ <field name="hr_expense" attrs="{'invisible': [('association', '=', False)]}"/>
+ </xpath>
</data>
</field>
</record>
-
- <record id="action_config_install_module" model="ir.actions.act_window">
- <field name="name">Association Application Configuration</field>
- <field name="type">ir.actions.act_window</field>
- <field name="res_model">profile.association.config.install_modules_wizard</field>
- <field name="view_id" ref="view_confirm_install_module_form"/>
- <field name="view_type">form</field>
- <field name="view_mode">form</field>
- <field name="target">new</field>
- </record>
-
- <record model="ir.actions.todo"
- id="config_install_module">
- <field name="action_id" ref="action_config_install_module"/>
- <field name="sequence">3</field>
- <field name="type">special</field>
- </record>
-
<menuitem
name="Association"
id="base.menu_association"
=== modified file 'crm/crm_installer.py'
--- crm/crm_installer.py 2011-01-14 00:11:01 +0000
+++ crm/crm_installer.py 2011-05-03 05:02:25 +0000
@@ -23,19 +23,18 @@
from osv import fields, osv
class crm_installer(osv.osv_memory):
- _name = 'crm.installer'
- _inherit = 'res.config.installer'
+ _inherit = 'base.setup.installer'
_columns = {
'name': fields.char('Name', size=64),
'crm_helpdesk': fields.boolean('Helpdesk', help="Manages a Helpdesk service."),
'crm_fundraising': fields.boolean('Fundraising', help="This may help associations in their fundraising process and tracking."),
'crm_claim': fields.boolean('Claims', help="Manages the suppliers and customers claims, including your corrective or preventive actions."),
- 'crm_caldav': fields.boolean('Calendar Synchronizing', help="Helps you to synchronize the meetings with other calendar clients and mobiles."),
+ 'crm_caldav': fields.boolean('Synchronization:Calendar Synchronizing', help="Helps you to synchronize the meetings with other calendar clients and mobiles."),
'sale_crm': fields.boolean('Opportunity to Quotation', help="This module relates sale from opportunity cases in the CRM."),
- 'fetchmail': fields.boolean('Fetch Emails', help="Allows you to receive E-Mails from POP/IMAP server."),
- 'thunderbird': fields.boolean('Thunderbird', help="Allows you to link your e-mail to OpenERP's documents. You can attach it to any existing one in OpenERP or create a new one."),
- 'outlook': fields.boolean('MS-Outlook', help="Allows you to link your e-mail to OpenERP's documents. You can attach it to any existing one in OpenERP or create a new one."),
+ 'fetchmail': fields.boolean('Synchronization:Fetch Emails', help="Allows you to receive E-Mails from POP/IMAP server."),
+ 'thunderbird': fields.boolean('Plug-In:Thunderbird', help="Allows you to link your e-mail to OpenERP's documents. You can attach it to any existing one in OpenERP or create a new one."),
+ 'outlook': fields.boolean('Plug-In:MS-Outlook', help="Allows you to link your e-mail to OpenERP's documents. You can attach it to any existing one in OpenERP or create a new one."),
'wiki_sale_faq': fields.boolean('Sale FAQ', help="Helps you manage wiki pages for Frequently Asked Questions on Sales Application."),
}
=== modified file 'crm/crm_installer_view.xml'
--- crm/crm_installer_view.xml 2011-04-27 13:35:18 +0000
+++ crm/crm_installer_view.xml 2011-05-03 05:02:25 +0000
@@ -2,69 +2,30 @@
<data>
<record id="view_crm_installer" model="ir.ui.view">
<field name="name">crm.installer.view</field>
- <field name="model">crm.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">CRM Application Configuration</attribute>
- </form>
-
- <separator string="title" position="attributes">
- <attribute name="string">Configure Your CRM Application</attribute>
- </separator>
- <xpath expr="//label[@string='description']"
- position="attributes">
- <attribute name="string">Enhance your core CRM Application with additional functionalities.</attribute>
- </xpath>
- <xpath expr='//separator[@string="vsep"]' position='attributes'>
- <attribute name='rowspan'>13</attribute>
- <attribute name='string'></attribute>
- </xpath>
- <xpath expr="//button[@string='Install Modules']" position="attributes">
- <attribute name="string">Configure</attribute>
- </xpath>
- <group colspan="8">
- <group colspan="4" col="4" groups="base.group_extended" name="other">
- <field name="crm_claim" />
- <field name="crm_helpdesk" />
- <field name="crm_fundraising" />
- <field name="wiki_sale_faq"/>
- <field name="sale_crm" invisible="1"/>
- </group>
- <group colspan="2" col="2">
- <separator string="Synchronization" colspan="4" />
- <field name="crm_caldav" />
- <field name="fetchmail" />
- </group>
- <group colspan="2" col="2">
- <separator string="Plug-In" colspan="4" />
- <field name="thunderbird" />
- <field name="outlook" />
- </group>
- </group>
+ <xpath expr="//field[@name='product_expiry']" position="after">
+ <newline/>
+ <group attrs="{'invisible': [('crm', '=', False)]}" colspan="4">
+ <separator string="Customer Relationship Management Details" colspan="4" />
+ </group>
+ <field name="crm_claim" groups="base.group_extended" attrs="{'invisible': [('crm', '=', False)]}"/>
+ <field name="crm_helpdesk" groups="base.group_extended" attrs="{'invisible': [('crm', '=', False)]}"/>
+ <field name="crm_fundraising" groups="base.group_extended" attrs="{'invisible': [('crm', '=', False)]}"/>
+ <field name="wiki_sale_faq" groups="base.group_extended" attrs="{'invisible': [('crm', '=', False)]}"/>
+ <field name="sale_crm" invisible="1" groups="base.group_extended" attrs="{'invisible': [('crm', '=', False)]}"/>
+ <field name="crm_caldav" attrs="{'invisible': [('crm', '=', False)]}"/>
+ <field name="fetchmail" attrs="{'invisible': [('crm', '=', False)]}"/>
+ <field name="thunderbird" attrs="{'invisible': [('crm', '=', False)]}"/>
+ <field name="outlook" attrs="{'invisible': [('crm', '=', False)]}"/>
+ </xpath>
</data>
</field>
</record>
-
- <record id="action_crm_installer" model="ir.actions.act_window">
- <field name="name">CRM Application Configuration</field>
- <field name="type">ir.actions.act_window</field>
- <field name="res_model">crm.installer</field>
- <field name="view_id" ref="view_crm_installer"/>
- <field name="view_type">form</field>
- <field name="view_mode">form</field>
- <field name="target">new</field>
- </record>
-
- <record id="crm_installer_todo" model="ir.actions.todo">
- <field name="action_id" ref="action_crm_installer"/>
- <field name="sequence">3</field>
- <field name="type">special</field>
- <field eval="[(6,0,[ref('base.group_extended')])]" name="groups_id"/>
- </record>
-
+
<record model="ir.actions.act_window" id="crm_case_section_view_form_installer">
<field name="name">Create sales team</field>
<field name="type">ir.actions.act_window</field>
=== modified file 'hr/hr_installer.xml'
--- hr/hr_installer.xml 2011-04-27 13:35:18 +0000
+++ hr/hr_installer.xml 2011-05-03 05:02:25 +0000
@@ -4,73 +4,28 @@
<record id="view_hr_installer" model="ir.ui.view">
<field name="name">hr.installer.view</field>
- <field name="model">hr.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">Human Resources Application Configuration</attribute>
- </form>
- <separator string="title" position="attributes">
- <attribute name="string">Configure Your Human Resources 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">You can enhance the base HR Application by installing few HR-related functionalities.</attribute>
- </xpath>
- <group colspan="8">
- <field name="hr_holidays"/>
- <field name="hr_expense"/>
- <field name="hr_recruitment"/>
- <field name="hr_timesheet_sheet"/>
- <field name="hr_contract"/>
- <field name="hr_attendance"/>
- <field name="hr_evaluation" groups="base.group_extended"/>
- <field name="hr_payroll" groups="base.group_extended"/>
- <field name="hr_payroll_account" groups="base.group_extended"/>
- </group>
- <xpath expr="//button[@string='Install Modules']" position="attributes">
- <attribute name="string">Configure</attribute>
- </xpath>
+ <xpath expr="//field[@name='product_expiry']" position="after">
+ <newline/>
+ <group attrs="{'invisible': [('hr', '=', False)]}" colspan="4">
+ <separator string="Human Resources Details" colspan="4" />
+ </group>
+ <field name="hr_holidays" attrs="{'invisible':[('hr','=',False)]}"/>
+ <field name="hr_expense" attrs="{'invisible':[('hr','=',False)]}"/>
+ <field name="hr_recruitment" attrs="{'invisible':[('hr','=',False)]}"/>
+ <field name="hr_timesheet_sheet" attrs="{'invisible':[('hr','=',False)]}"/>
+ <field name="hr_contract" attrs="{'invisible':[('hr','=',False)]}"/>
+ <field name="hr_attendance" attrs="{'invisible':[('hr','=',False)]}"/>
+ <field name="hr_evaluation" groups="base.group_extended" attrs="{'invisible':[('hr','=',False)]}"/>
+ <field name="hr_payroll" groups="base.group_extended" attrs="{'invisible':[('hr','=',False)]}"/>
+ <field name="hr_payroll_account" groups="base.group_extended" attrs="{'invisible':[('hr','=',False)]}"/>
+ </xpath>
</data>
</field>
</record>
-
- <record id="action_hr_installer" model="ir.actions.act_window">
- <field name="name">Human Resources Application Configuration</field>
- <field name="type">ir.actions.act_window</field>
- <field name="res_model">hr.installer</field>
- <field name="view_id" ref="view_hr_installer"/>
- <field name="view_type">form</field>
- <field name="view_mode">form</field>
- <field name="target">new</field>
- </record>
-
- <record id="hr_installer_todo" model="ir.actions.todo">
- <field name="action_id" ref="action_hr_installer"/>
- <field name="sequence">3</field>
- <field name="type">special</field>
- </record>
-
- <record model="ir.actions.act_window" id="view_employee_form_installer">
- <field name="name">Create Your Employees</field>
- <field name="type">ir.actions.act_window</field>
- <field name="res_model">hr.employee</field>
- <field name="view_type">form</field>
- <field name="view_mode">tree,form</field>
- <field name="view_id" ref="hr.view_employee_form"/>
- </record>
-
- <record id="view_employee_form_todo" model="ir.actions.todo">
- <field name="action_id" ref="view_employee_form_installer"/>
- <field name="sequence">3</field>
- <field name="type">normal</field>
- <field name="state">skip</field>
- </record>
-
-
</data>
</openerp>
=== modified file 'hr/installer.py'
--- hr/installer.py 2011-01-14 00:11:01 +0000
+++ hr/installer.py 2011-05-03 05:02:25 +0000
@@ -21,8 +21,7 @@
from osv import fields, osv
class hr_installer(osv.osv_memory):
- _name = 'hr.installer'
- _inherit = 'res.config.installer'
+ _inherit = 'base.setup.installer'
_columns = {
# Human Resources Management
'hr_holidays': fields.boolean('Holidays / Leaves Management',
=== modified file 'knowledge/installer.py'
--- knowledge/installer.py 2011-01-14 00:11:01 +0000
+++ knowledge/installer.py 2011-05-03 05:02:25 +0000
@@ -21,8 +21,7 @@
from osv import fields, osv
class knowledge_installer(osv.osv_memory):
- _name = 'knowledge.installer'
- _inherit = 'res.config.installer'
+ _inherit = 'base.setup.installer'
_columns = {
# Knowledge Management
@@ -39,11 +38,11 @@
"to keep track of business knowledge and share it with "
"and between your employees."),
# Content templates
- 'wiki_faq':fields.boolean('Internal FAQ',
+ 'wiki_faq':fields.boolean('Template:Internal FAQ',
help="Creates a skeleton internal FAQ pre-filled with "
"documentation about OpenERP's Document Management "
"System."),
- 'wiki_quality_manual':fields.boolean('Quality Manual',
+ 'wiki_quality_manual':fields.boolean('Template:Quality Manual',
help="Creates an example skeleton for a standard quality manual."),
}
_defaults = {
=== modified file 'knowledge/knowledge_installer.xml'
--- knowledge/knowledge_installer.xml 2011-04-27 13:35:18 +0000
+++ knowledge/knowledge_installer.xml 2011-05-03 05:02:25 +0000
@@ -2,59 +2,24 @@
<data>
<record id="view_knowledge_installer" model="ir.ui.view">
<field name="name">knowledge.installer.view</field>
- <field name="model">knowledge.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">Knowledge Application Configuration</attribute>
- </form>
-
- <separator string="title" position="attributes">
- <attribute name="string"
- >Configure Your Knowledge 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">Share information within the company with these specific Addons.</attribute>
+ <xpath expr="//field[@name='product_expiry']" position="after">
+ <newline/>
+ <group attrs="{'invisible': [('knowledge', '=', False)]}" colspan="4">
+ <separator string="Knowledge Management Details" colspan="4" />
+ </group>
+ <field name="document_ftp" attrs="{'invisible': [('knowledge', '=', False)]}"/>
+ <field name="document_webdav" attrs="{'invisible': [('knowledge', '=', False)]}"/>
+ <field name="wiki" attrs="{'invisible': [('knowledge', '=', False)]}"/>
+ <field name="wiki_faq" attrs="{'invisible': [('knowledge', '=', False)]}"/>
+ <field name="wiki_quality_manual" attrs="{'invisible': [('knowledge', '=', False)]}"/>
</xpath>
- <group colspan="8" position="replace">
- <group colspan="4">
- <field name="document_ftp"/>
- <field name="document_webdav"/>
- <field name="wiki"/>
- <separator string="Content templates" colspan="4"/>
- <field name="wiki_faq"/>
- <field name="wiki_quality_manual"/>
- </group>
- </group>
- <xpath expr="//button[@string='Install Modules']" position="attributes">
- <attribute name="string">Configure</attribute>
- </xpath>
</data>
</field>
</record>
-
- <record id="action_knowledge_installer" model="ir.actions.act_window">
- <field name="name">Knowledge Application Configuration</field>
- <field name="type">ir.actions.act_window</field>
- <field name="res_model">knowledge.installer</field>
- <field name="view_id" ref="view_knowledge_installer"/>
- <field name="view_type">form</field>
- <field name="view_mode">form</field>
- <field name="target">new</field>
- </record>
-
- <record id="knowledge_installer_todo" model="ir.actions.todo">
- <field name="action_id" ref="action_knowledge_installer"/>
- <field name="sequence">3</field>
- <field name="groups_id" eval="[(6,0,[ref('base.group_extended')])]"/>
- <field name="type">special</field>
- </record>
-
</data>
</openerp>
=== modified file 'marketing/marketing_view.xml'
--- marketing/marketing_view.xml 2011-04-27 13:35:18 +0000
+++ marketing/marketing_view.xml 2011-05-03 05:02:25 +0000
@@ -14,52 +14,22 @@
<record id="view_marketing_installer" model="ir.ui.view">
<field name="name">marketing.installer.view</field>
- <field name="model">marketing.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">Marketing Application Configuration</attribute>
- </form>
- <separator string="title" position="attributes">
- <attribute name="string">Configure Your Marketing Application</attribute>
- </separator>
- <xpath expr="//label[@string='description']"
- position="attributes">
- <attribute name="string">OpenERP provides Addons to better manage your sales and marketing processes. Select the ones you would be interested in.</attribute>
- </xpath>
- <xpath expr='//separator[@string="vsep"]' position='attributes'>
- <attribute name='rowspan'>13</attribute>
- <attribute name='string'></attribute>
- </xpath>
- <xpath expr="//button[@string='Install Modules']" position="attributes">
- <attribute name="string">Configure</attribute>
- </xpath>
- <group colspan="8">
- <field name="marketing_campaign" />
- <field name="email_template" />
- <field name="crm_profiling" />
- </group>
+ <xpath expr="//field[@name='product_expiry']" position="after">
+ <newline/>
+ <group attrs="{'invisible': [('marketing', '=', False)]}" colspan="4">
+ <separator string="Marketing Details" colspan="4" />
+ </group>
+ <field name="marketing_campaign" attrs="{'invisible': [('marketing', '=', False)]}"/>
+ <field name="email_template" attrs="{'invisible': [('marketing', '=', False)]}"/>
+ <field name="crm_profiling" attrs="{'invisible': [('marketing', '=', False)]}"/>
+ </xpath>
</data>
</field>
</record>
-
- <record id="action_marketing_installer" model="ir.actions.act_window">
- <field name="name">Marketing Applications Configuration</field>
- <field name="type">ir.actions.act_window</field>
- <field name="res_model">marketing.installer</field>
- <field name="view_id" ref="view_marketing_installer"/>
- <field name="view_type">form</field>
- <field name="view_mode">form</field>
- <field name="target">new</field>
- </record>
-
- <record id="marketing_installer_todo" model="ir.actions.todo">
- <field name="action_id" ref="action_marketing_installer"/>
- <field name="sequence">3</field>
- <field name="type">special</field>
- </record>
-
</data>
</openerp>
=== modified file 'marketing/marketing_wizard.py'
--- marketing/marketing_wizard.py 2011-01-14 00:11:01 +0000
+++ marketing/marketing_wizard.py 2011-05-03 05:02:25 +0000
@@ -22,8 +22,7 @@
from osv import fields, osv
class marketing_installer(osv.osv_memory):
- _name = 'marketing.installer'
- _inherit = 'res.config.installer'
+ _inherit = 'base.setup.installer'
_columns = {
'email_template':fields.boolean('Automated E-Mails',
help="Helps you to design templates of emails and integrate them in your different processes."),
=== modified file 'mrp/installer.py'
--- mrp/installer.py 2011-01-14 00:11:01 +0000
+++ mrp/installer.py 2011-05-03 05:02:25 +0000
@@ -21,8 +21,7 @@
from osv import fields, osv
class mrp_installer(osv.osv_memory):
- _name = 'mrp.installer'
- _inherit = 'res.config.installer'
+ _inherit = 'base.setup.installer'
_columns = {
# Manufacturing Resource Planning
=== modified file 'mrp/mrp_installer.xml'
--- mrp/mrp_installer.xml 2011-04-08 12:28:11 +0000
+++ mrp/mrp_installer.xml 2011-05-03 05:02:25 +0000
@@ -2,55 +2,24 @@
<data>
<record id="view_mrp_installer" model="ir.ui.view">
<field name="name">mrp.installer.view</field>
- <field name="model">mrp.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">MRP Application Configuration</attribute>
- </form>
-
- <separator string="title" position="attributes">
- <attribute name="string">Configure Your Manufacturing Resource Planning Application</attribute>
- </separator>
- <xpath expr="//label[@string='description']"
- position="attributes">
- <attribute name="string">Add more functionalities to the core Manufacturing Application with the following addons.</attribute>
- </xpath>
- <xpath expr='//separator[@string="vsep"]' position='attributes'>
- <attribute name='string'></attribute>
- </xpath>
- <xpath expr="//button[@string='Install Modules']" position="attributes">
- <attribute name="string">Configure</attribute>
- </xpath>
- <group colspan="8">
- <field name="stock_location"/>
- <field name="mrp_jit"/>
- <field name="mrp_operations"/>
- <field name="mrp_subproduct"/>
- <field name="mrp_repair"/>
- </group>
+ <xpath expr="//field[@name='product_expiry']" position="after">
+ <newline/>
+ <group attrs="{'invisible': [('mrp', '=', False)]}" colspan="4">
+ <separator string="Manufacturing Details" colspan="4" />
+ </group>
+ <field name="stock_location" attrs="{'invisible': [('mrp', '=', False)]}"/>
+ <field name="mrp_jit" attrs="{'invisible': [('mrp', '=', False)]}"/>
+ <field name="mrp_operations" attrs="{'invisible': [('mrp', '=', False)]}"/>
+ <field name="mrp_subproduct" attrs="{'invisible': [('mrp', '=', False)]}"/>
+ <field name="mrp_repair" attrs="{'invisible': [('mrp', '=', False)]}"/>
+ </xpath>
</data>
</field>
</record>
-
- <record id="action_mrp_installer" model="ir.actions.act_window">
- <field name="name">MRP Applications Configuration</field>
- <field name="type">ir.actions.act_window</field>
- <field name="res_model">mrp.installer</field>
- <field name="view_id" ref="view_mrp_installer"/>
- <field name="view_type">form</field>
- <field name="view_mode">form</field>
- <field name="target">new</field>
- </record>
-
- <record id="mrp_installer_todo" model="ir.actions.todo">
- <field name="action_id" ref="action_mrp_installer"/>
- <field name="sequence">3</field>
- <field name="type">special</field>
- <field name="groups_id" eval="[(6,0,[ref('base.group_extended')])]"/>
- </record>
-
</data>
</openerp>
=== modified file 'profile_tools/installer.py'
--- profile_tools/installer.py 2011-01-14 00:11:01 +0000
+++ profile_tools/installer.py 2011-05-03 05:02:25 +0000
@@ -21,8 +21,7 @@
from osv import fields, osv
class misc_tools_installer(osv.osv_memory):
- _name = 'misc_tools.installer'
- _inherit = 'res.config.installer'
+ _inherit = 'base.setup.installer'
_columns = {
'lunch':fields.boolean('Lunch',help='A simple module to help you to manage Lunch orders.'),
=== modified file 'profile_tools/misc_tools_installer.xml'
--- profile_tools/misc_tools_installer.xml 2011-04-08 12:28:11 +0000
+++ profile_tools/misc_tools_installer.xml 2011-05-03 05:02:25 +0000
@@ -2,54 +2,25 @@
<data>
<record id="view_misc_tools_installer" model="ir.ui.view">
<field name="name">misc_tools.installer.view</field>
- <field name="model">misc_tools.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">Extra Tools Configuration</attribute>
- </form>
- <xpath expr='//separator[@string="vsep"]' position='attributes'>
- <attribute name='string'></attribute>
- </xpath>
-
- <separator string="title" position="attributes">
- <attribute name="string">Configure Extra Tools</attribute>
- </separator>
- <xpath expr="//label[@string='description']"
- position="attributes">
- <attribute name="string">Extra Tools are applications that can help you improve your organization although they are not key for company management.</attribute>
- </xpath>
- <xpath expr="//button[@string='Install Modules']" position="attributes">
- <attribute name="string">Configure</attribute>
- </xpath>
- <group colspan="8">
- <field name="share"/>
- <field name="lunch"/>
- <field name="idea"/>
- <field name="survey"/>
- <field name="subscription" groups="base.group_extended"/>
- <field name="pad"/>
- </group>
+ <xpath expr="//field[@name='product_expiry']" position="after">
+ <newline/>
+ <group attrs="{'invisible': [('profile_tools', '=', False)]}" colspan="4">
+ <separator string="Extra Tools Details" colspan="4" />
+ </group>
+ <field name="share" attrs="{'invisible': [('profile_tools', '=', False)]}"/>
+ <field name="lunch" attrs="{'invisible': [('profile_tools', '=', False)]}"/>
+ <field name="idea" attrs="{'invisible': [('profile_tools', '=', False)]}"/>
+ <field name="survey" attrs="{'invisible': [('profile_tools', '=', False)]}"/>
+ <field name="subscription" groups="base.group_extended" attrs="{'invisible': [('profile_tools', '=', False)]}"/>
+ <field name="pad" attrs="{'invisible': [('profile_tools', '=', False)]}"/>
+ </xpath>
</data>
</field>
</record>
-
- <record id="action_misc_tools_installer" model="ir.actions.act_window">
- <field name="name">Tools Configuration</field>
- <field name="type">ir.actions.act_window</field>
- <field name="res_model">misc_tools.installer</field>
- <field name="view_id" ref="view_misc_tools_installer"/>
- <field name="view_type">form</field>
- <field name="view_mode">form</field>
- <field name="target">new</field>
- </record>
-
- <record id="misc_tools_installer_todo" model="ir.actions.todo">
- <field name="action_id" ref="action_misc_tools_installer"/>
- <field name="type">special</field>
- <field name="sequence">3</field>
- </record>
</data>
</openerp>
=== modified file 'project/installer.py'
--- project/installer.py 2011-01-14 00:11:01 +0000
+++ project/installer.py 2011-05-03 05:02:25 +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
@@ -41,10 +40,10 @@
'project_issue': fields.boolean('Issues Tracker',
help="Automatically synchronizes project tasks and crm cases."),
# Methodologies
- 'project_scrum': fields.boolean('SCRUM',
+ 'project_scrum': fields.boolean('Methodology:SCRUM',
help="Implements and tracks the concepts and task types defined "
"in the SCRUM methodology."),
- 'project_gtd': fields.boolean('Getting Things Done',
+ 'project_gtd': fields.boolean('Methodology:Getting Things Done',
help="GTD is a methodology to efficiently organise yourself and your tasks. This module fully integrates GTD principle with OpenERP's project management."),
}
project_installer()
=== modified file 'project/project_installer.xml'
--- project/project_installer.xml 2011-04-08 12:28:11 +0000
+++ project/project_installer.xml 2011-05-03 05:02:25 +0000
@@ -3,56 +3,27 @@
<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"/>
+ <xpath expr="//field[@name='product_expiry']" position="after">
<newline/>
- <separator string="Methodologies" colspan="4"/>
- <field name="project_scrum"/>
- <field name="project_gtd"/>
- </group>
+ <group attrs="{'invisible': [('project', '=', False)]}" colspan="4">
+ <separator string="Project Management Details" colspan="4" />
+ </group>
+ <field name="project_issue" attrs="{'invisible':[('project','=',False)]}"/>
+ <field name="project_long_term" groups="base.group_extended" attrs="{'invisible':[('project','=',False)]}"/>
+ <field name="hr_timesheet_sheet" attrs="{'invisible':[('project','=',False)]}"/>
+ <field name="project_timesheet" attrs="{'invisible':[('project','=',False)]}"/>
+ <field name="account_budget" groups="base.group_extended" attrs="{'invisible':[('project','=',False)]}"/>
+ <field name="project_scrum" attrs="{'invisible':[('project','=',False)]}"/>
+ <field name="project_gtd" attrs="{'invisible':[('project','=',False)]}"/>
+ </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>
=== modified file 'purchase/wizard/purchase_installer.py'
--- purchase/wizard/purchase_installer.py 2011-01-14 00:11:01 +0000
+++ purchase/wizard/purchase_installer.py 2011-05-03 05:02:25 +0000
@@ -21,8 +21,7 @@
from osv import fields, osv
class purchase_installer(osv.osv_memory):
- _name = 'purchase.installer'
- _inherit = 'res.config.installer'
+ _inherit = 'base.setup.installer'
_columns = {
'purchase_requisition':fields.boolean('Purchase Requisition',help="Manages your Purchase Requisition and allows you to easily keep track and manage all your purchase orders."),
=== modified file 'purchase/wizard/purchase_installer.xml'
--- purchase/wizard/purchase_installer.xml 2011-04-27 13:35:18 +0000
+++ purchase/wizard/purchase_installer.xml 2011-05-03 05:02:25 +0000
@@ -3,51 +3,21 @@
<data>
<record id="view_purchase_install_module_form" model="ir.ui.view">
<field name="name">Purchases Application Configuration</field>
- <field name="model">purchase.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">Purchases Application Configuration</attribute>
- </form>
- <xpath expr='//separator[@string="vsep"]' position='attributes'>
- <attribute name='string'></attribute>
- </xpath>
- <separator string="title" position="attributes">
- <attribute name="string"
- >Configure Your Purchases Management Application</attribute>
- </separator>
- <xpath expr="//label[@string='description']"
- position="attributes">
- <attribute name="string">Extend your Purchases Management Application with additional functionalities.</attribute>
- </xpath>
- <xpath expr="//button[@string='Install Modules']" position="attributes">
- <attribute name="string">Configure</attribute>
- </xpath>
- <group colspan="8">
- <field name="purchase_requisition"/>
- <field name="purchase_analytic_plans"/>
- </group>
+ <xpath expr="//field[@name='product_expiry']" position="after">
+ <newline/>
+ <group attrs="{'invisible': [('purchase', '=', False)]}" colspan="4">
+ <separator string="Purchase Management Details" colspan="4" />
+ </group>
+ <field name="purchase_requisition" attrs="{'invisible': [('purchase', '=', False)]}"/>
+ <field name="purchase_analytic_plans" attrs="{'invisible': [('purchase', '=', False)]}"/>
+ </xpath>
</data>
</field>
</record>
-
- <record id="action_purchase_install_module" model="ir.actions.act_window">
- <field name="name">Purchases Application Configuration</field>
- <field name="type">ir.actions.act_window</field>
- <field name="res_model">purchase.installer</field>
- <field name="view_id" ref="view_purchase_install_module_form"/>
- <field name="view_type">form</field>
- <field name="view_mode">form</field>
- <field name="target">new</field>
- </record>
-
- <record id="purchase_installer_todo" model="ir.actions.todo">
- <field name="action_id" ref="action_purchase_install_module"/>
- <field name="sequence">3</field>
- <field name="type">special</field>
- <field name="groups_id" eval="[(6,0,[ref('base.group_extended')])]"/>
- </record>
</data>
</openerp>
=== modified file 'report_designer/installer.py'
--- report_designer/installer.py 2011-01-14 00:11:01 +0000
+++ report_designer/installer.py 2011-05-03 05:02:25 +0000
@@ -21,8 +21,7 @@
from osv import fields, osv
class report_designer_installer(osv.osv_memory):
- _name = 'report_designer.installer'
- _inherit = 'res.config.installer'
+ _inherit = 'base.setup.installer'
_columns = {
# Reporting
=== modified file 'report_designer/report_designer_installer.xml'
--- report_designer/report_designer_installer.xml 2011-04-27 13:35:18 +0000
+++ report_designer/report_designer_installer.xml 2011-05-03 05:02:25 +0000
@@ -2,52 +2,21 @@
<data>
<record id="view_report_designer_installer" model="ir.ui.view">
<field name="name">report_designer.installer.view</field>
- <field name="model">report_designer.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">Reporting Tools Configuration</attribute>
- </form>
- <xpath expr='//separator[@string="vsep"]' position='attributes'>
- <attribute name='string'></attribute>
- </xpath>
- <separator string="title" position="attributes">
- <attribute name="string"
- >Configure Reporting Tools</attribute>
- </separator>
- <xpath expr="//label[@string='description']"
- position="attributes">
- <attribute name="string"
- >OpenERP's built-in reporting abilities can be improved even further with some of the following applications</attribute>
- </xpath>
- <xpath expr="//button[@string='Install Modules']" position="attributes">
- <attribute name="string">Configure</attribute>
- </xpath>
- <group colspan="8">
- <field name="base_report_designer"/>
- <field name="base_report_creator"/>
- </group>
+ <xpath expr="//field[@name='product_expiry']" position="after">
+ <newline/>
+ <group attrs="{'invisible': [('report_designer', '=', False)]}" colspan="4">
+ <separator string="Advanced Reporting Details" colspan="4" />
+ </group>
+ <field name="base_report_designer" attrs="{'invisible': [('report_designer', '=', False)]}"/>
+ <field name="base_report_creator" attrs="{'invisible': [('report_designer', '=', False)]}"/>
+ </xpath>
</data>
</field>
</record>
-
- <record id="action_report_designer_installer" model="ir.actions.act_window">
- <field name="name">Reporting Tools Configuration</field>
- <field name="type">ir.actions.act_window</field>
- <field name="res_model">report_designer.installer</field>
- <field name="view_id" ref="view_report_designer_installer"/>
- <field name="view_type">form</field>
- <field name="view_mode">form</field>
- <field name="target">new</field>
- </record>
-
- <record id="report_designer_installer_todo" model="ir.actions.todo">
- <field name="action_id" ref="action_report_designer_installer"/>
- <field name="type">normal</field>
- <field name="state">skip</field>
- <field name="sequence">3</field>
- </record>
</data>
</openerp>
=== modified file 'sale/sale_installer.py'
--- sale/sale_installer.py 2011-01-14 00:11:01 +0000
+++ sale/sale_installer.py 2011-05-03 05:02:25 +0000
@@ -22,8 +22,7 @@
from osv import fields, osv
class sale_installer(osv.osv_memory):
- _name = 'sale.installer'
- _inherit = 'res.config.installer'
+ _inherit = 'base.setup.installer'
_columns = {
'delivery': fields.boolean('Delivery Costs',
=== modified file 'sale/sale_installer.xml'
--- sale/sale_installer.xml 2011-04-08 12:28:11 +0000
+++ sale/sale_installer.xml 2011-05-03 05:02:25 +0000
@@ -2,55 +2,24 @@
<data>
<record id="view_sale_installer" model="ir.ui.view">
<field name="name">sale.installer.view</field>
- <field name="model">sale.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">Sales Application Configuration</attribute>
- </form>
-
- <separator string="title" position="attributes">
- <attribute name="string">Configure Your Sales Management Application</attribute>
- </separator>
- <xpath expr="//label[@string='description']"
- position="attributes">
- <attribute name="string">Enhance your core Sales Application with additional functionalities.</attribute>
- </xpath>
- <xpath expr='//separator[@string="vsep"]' position='attributes'>
- <attribute name='string'></attribute>
- </xpath>
- <xpath expr="//button[@string='Install Modules']" position="attributes">
- <attribute name="string">Configure</attribute>
- </xpath>
- <group colspan="8">
- <field name="delivery"/>
- <field name="sale_journal"/>
- <field name="sale_layout"/>
- <field name="sale_margin"/>
- <field name="sale_order_dates"/>
- </group>
+ <xpath expr="//field[@name='product_expiry']" position="after">
+ <newline/>
+ <group attrs="{'invisible': [('sale', '=', False)]}" colspan="4">
+ <separator string="Sales Management Details" colspan="4" />
+ </group>
+ <field name="delivery" attrs="{'invisible':[('sale','=',False)]}"/>
+ <field name="sale_journal" attrs="{'invisible':[('sale','=',False)]}"/>
+ <field name="sale_layout" attrs="{'invisible':[('sale','=',False)]}"/>
+ <field name="sale_margin" attrs="{'invisible':[('sale','=',False)]}"/>
+ <field name="sale_order_dates" attrs="{'invisible':[('sale','=',False)]}"/>
+ </xpath>
</data>
</field>
</record>
-
- <record id="action_sale_installer" model="ir.actions.act_window">
- <field name="name">Sales Application Configuration</field>
- <field name="type">ir.actions.act_window</field>
- <field name="res_model">sale.installer</field>
- <field name="view_id" ref="view_sale_installer"/>
- <field name="view_type">form</field>
- <field name="view_mode">form</field>
- <field name="target">new</field>
- </record>
-
- <record id="sale_installer_todo" model="ir.actions.todo">
- <field name="action_id" ref="action_sale_installer"/>
- <field name="type">special</field>
- <field name="sequence">3</field>
- <field name="groups_id" eval="[(6,0,[ref('base.group_extended')])]"/>
- </record>
-
</data>
</openerp>
Follow ups
