diff --git a/addons/association/profile_association.py b/addons/association/profile_association.py index 2b73dd69885..6aa3ebdd13d 100644 --- a/addons/association/profile_association.py +++ b/addons/association/profile_association.py @@ -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 " diff --git a/addons/association/profile_association.xml b/addons/association/profile_association.xml index bc155733595..e693bf6ae99 100644 --- a/addons/association/profile_association.xml +++ b/addons/association/profile_association.xml @@ -3,56 +3,23 @@ Association Application Configuration - profile.association.config.install_modules_wizard + base.setup.installer form - + -
- Association Application Configuration -
- - - - - Here are specific applications related to the Association Profile you selected. + + + + + + + + - - Configure - - - - - - - - - - - - - - - Association Application Configuration - ir.actions.act_window - profile.association.config.install_modules_wizard - - form - form - new - - - - - 3 - special - - - - - diff --git a/addons/base_setup/todo.py b/addons/base_setup/todo.py index f5c8c8d09a6..5cf3eb0c43c 100644 --- a/addons/base_setup/todo.py +++ b/addons/base_setup/todo.py @@ -72,7 +72,7 @@ class base_setup_company(osv.osv_memory): return defaults defaults['currency'] = company.currency_id.id - for field in ['name','logo','rml_header1','rml_footer1','rml_footer2']: + for field in ['name','rml_header1','rml_footer1','rml_footer2']: defaults[field] = company[field] if company.partner_id.address: @@ -109,7 +109,6 @@ Web: http://openerp.com - Fax: +32.81.73.35.01 - Fortis Bank: 126-2013269-07''') help='''This sentence will appear at the bottom of your reports. We suggest you to put bank information here: IBAN: BE74 1262 0121 6907 - SWIFT: CPDF BE71 - VAT: BE0477.472.701'''), - 'logo':fields.binary('Logo'), 'account_no':fields.char('Bank Account No', size=64), 'website': fields.char('Company Website', size=64, help="Example: http://openerp.com"), } @@ -126,7 +125,6 @@ IBAN: BE74 1262 0121 6907 - SWIFT: CPDF BE71 - VAT: BE0477.472.701'''), 'rml_header1':payload.rml_header1, 'rml_footer1':payload.rml_footer1, 'rml_footer2':payload.rml_footer2, - 'logo':payload.logo, 'currency_id':payload.currency.id, 'account_no':payload.account_no, }) diff --git a/addons/crm/crm_installer.py b/addons/crm/crm_installer.py index 32551d438c4..9d32ff93ea5 100644 --- a/addons/crm/crm_installer.py +++ b/addons/crm/crm_installer.py @@ -23,19 +23,18 @@ from lxml import etree 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."), } diff --git a/addons/crm/crm_installer_view.xml b/addons/crm/crm_installer_view.xml index 7b7717a1fe1..d8d73f3f9a8 100644 --- a/addons/crm/crm_installer_view.xml +++ b/addons/crm/crm_installer_view.xml @@ -2,69 +2,28 @@ crm.installer.view - crm.installer + base.setup.installer form - + -
- CRM Application Configuration -
- - - Configure Your CRM Application - - - Enhance your core CRM Application with additional functionalities. + + + + + + + + + + + + - - 13 - - - - Configure - - - - - - - - - - - - - - - - - - - - - - - CRM Application Configuration - ir.actions.act_window - crm.installer - - form - form - new - - - - - 3 - special - - - + Create sales team ir.actions.act_window @@ -77,7 +36,8 @@ 10 - special + normal + skip @@ -92,7 +52,8 @@ 10 - special + normal + skip diff --git a/addons/document/wizard/document_configuration_view.xml b/addons/document/wizard/document_configuration_view.xml index 21855b21ede..3c39f6a7fb2 100644 --- a/addons/document/wizard/document_configuration_view.xml +++ b/addons/document/wizard/document_configuration_view.xml @@ -46,6 +46,7 @@ special + skip diff --git a/addons/document_ftp/wizard/ftp_configuration_view.xml b/addons/document_ftp/wizard/ftp_configuration_view.xml index 151e2ce49c6..e93153e25fe 100644 --- a/addons/document_ftp/wizard/ftp_configuration_view.xml +++ b/addons/document_ftp/wizard/ftp_configuration_view.xml @@ -48,6 +48,7 @@ + skip diff --git a/addons/hr/hr_installer.xml b/addons/hr/hr_installer.xml index 60bf243300a..86103b5f233 100644 --- a/addons/hr/hr_installer.xml +++ b/addons/hr/hr_installer.xml @@ -4,73 +4,26 @@ hr.installer.view - hr.installer + base.setup.installer form - + -
- Human Resources Application Configuration -
- - Configure Your Human Resources Application - - - - - - You can enhance the base HR Application by installing few HR-related functionalities. - - + + + - - - - - - - - - - - Configure - + + + + + + + + + - - - Human Resources Application Configuration - ir.actions.act_window - hr.installer - - form - form - new - - - - - 3 - special - - - - Create Your Employees - ir.actions.act_window - hr.employee - form - tree,form - - - - - - 3 - normal - skip - - - diff --git a/addons/hr/installer.py b/addons/hr/installer.py index cdeb2ca77a3..93f920f3cb8 100644 --- a/addons/hr/installer.py +++ b/addons/hr/installer.py @@ -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', diff --git a/addons/knowledge/installer.py b/addons/knowledge/installer.py index e74c37f80d0..0f6b29597de 100644 --- a/addons/knowledge/installer.py +++ b/addons/knowledge/installer.py @@ -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 @@ class knowledge_installer(osv.osv_memory): "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 = { diff --git a/addons/knowledge/knowledge_installer.xml b/addons/knowledge/knowledge_installer.xml index 1366a211e92..e5fe851fcdd 100644 --- a/addons/knowledge/knowledge_installer.xml +++ b/addons/knowledge/knowledge_installer.xml @@ -2,59 +2,22 @@ knowledge.installer.view - knowledge.installer + base.setup.installer form - + -
- Knowledge Application Configuration -
- - - Configure Your Knowledge Application - - - - - - Share information within the company with these specific Addons. + + + + + + + + - - - - - - - - - - - - Configure - - - - Knowledge Application Configuration - ir.actions.act_window - knowledge.installer - - form - form - new - - - - - 3 - - special - - diff --git a/addons/marketing/marketing_view.xml b/addons/marketing/marketing_view.xml index 7acc9806a63..7d3175b9811 100644 --- a/addons/marketing/marketing_view.xml +++ b/addons/marketing/marketing_view.xml @@ -14,52 +14,20 @@ marketing.installer.view - marketing.installer + base.setup.installer form - + -
- Marketing Application Configuration -
- - Configure Your Marketing Application - - - OpenERP provides Addons to better manage your sales and marketing processes. Select the ones you would be interested in. - - - 13 - - - - Configure - - + + + - + - - - Marketing Applications Configuration - ir.actions.act_window - marketing.installer - - form - form - new - - - - - 3 - special - - diff --git a/addons/marketing/marketing_wizard.py b/addons/marketing/marketing_wizard.py index a97d0ca16bc..cedba8151c9 100644 --- a/addons/marketing/marketing_wizard.py +++ b/addons/marketing/marketing_wizard.py @@ -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."), diff --git a/addons/mrp/installer.py b/addons/mrp/installer.py index 407d401e463..7fc7fea9c1e 100644 --- a/addons/mrp/installer.py +++ b/addons/mrp/installer.py @@ -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 diff --git a/addons/mrp/mrp_installer.xml b/addons/mrp/mrp_installer.xml index 47c7aadfe89..9f80ef733aa 100644 --- a/addons/mrp/mrp_installer.xml +++ b/addons/mrp/mrp_installer.xml @@ -2,55 +2,22 @@ mrp.installer.view - mrp.installer + base.setup.installer form - + -
- MRP Application Configuration -
- - - Configure Your Manufacturing Resource Planning Application - - - Add more functionalities to the core Manufacturing Application with the following addons. + + + + + + + + - - - - - Configure - - - - - - - - - - - MRP Applications Configuration - ir.actions.act_window - mrp.installer - - form - form - new - - - - - 3 - special - - - diff --git a/addons/profile_tools/installer.py b/addons/profile_tools/installer.py index 6f68b63cc02..44258234d11 100644 --- a/addons/profile_tools/installer.py +++ b/addons/profile_tools/installer.py @@ -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.'), diff --git a/addons/profile_tools/misc_tools_installer.xml b/addons/profile_tools/misc_tools_installer.xml index d1bfcd259c4..6daba8f0650 100644 --- a/addons/profile_tools/misc_tools_installer.xml +++ b/addons/profile_tools/misc_tools_installer.xml @@ -2,54 +2,23 @@ misc_tools.installer.view - misc_tools.installer + base.setup.installer form - + -
- Extra Tools Configuration -
- - + + + + + + + + + - - - Configure Extra Tools - - - Extra Tools are applications that can help you improve your organization although they are not key for company management. - - - Configure - - - - - - - - - - - - Tools Configuration - ir.actions.act_window - misc_tools.installer - - form - form - new - - - - - special - 3 - diff --git a/addons/project/installer.py b/addons/project/installer.py index 693e2d58018..36b458da296 100644 --- a/addons/project/installer.py +++ b/addons/project/installer.py @@ -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 @@ class project_installer(osv.osv_memory): '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() diff --git a/addons/project/project_installer.xml b/addons/project/project_installer.xml index c704a980000..47021df8c7f 100644 --- a/addons/project/project_installer.xml +++ b/addons/project/project_installer.xml @@ -3,56 +3,25 @@ project.installer.view - project.installer + base.setup.installer form - + -
- Project Application Configuration -
- - Configure Your Project Management Application - - - - - - Various OpenERP applications are available to manage your projects with different level of control and flexibility. - - - Configure - - - - - - - + - - - - + + + + + + + + + - - Project Application Configuration - ir.actions.act_window - project.installer - - form - form - new - - - - - special - 3 - - diff --git a/addons/purchase/wizard/purchase_installer.py b/addons/purchase/wizard/purchase_installer.py index bf106adc3ac..be99a41a3cc 100644 --- a/addons/purchase/wizard/purchase_installer.py +++ b/addons/purchase/wizard/purchase_installer.py @@ -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."), diff --git a/addons/purchase/wizard/purchase_installer.xml b/addons/purchase/wizard/purchase_installer.xml index 7c6864a8d5b..bb759a60b00 100644 --- a/addons/purchase/wizard/purchase_installer.xml +++ b/addons/purchase/wizard/purchase_installer.xml @@ -3,51 +3,19 @@ Purchases Application Configuration - purchase.installer + base.setup.installer form - + -
- Purchases Application Configuration -
- - - - - Configure Your Purchases Management Application - - - Extend your Purchases Management Application with additional functionalities. - - - Configure - - - - - + + + + + + - - - Purchases Application Configuration - ir.actions.act_window - purchase.installer - - form - form - new - - - - - 3 - special - - diff --git a/addons/report_designer/installer.py b/addons/report_designer/installer.py index f849392d328..e4bbc4ffa93 100644 --- a/addons/report_designer/installer.py +++ b/addons/report_designer/installer.py @@ -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 diff --git a/addons/report_designer/report_designer_installer.xml b/addons/report_designer/report_designer_installer.xml index fc720c8d466..18505a95930 100644 --- a/addons/report_designer/report_designer_installer.xml +++ b/addons/report_designer/report_designer_installer.xml @@ -2,52 +2,19 @@ report_designer.installer.view - report_designer.installer + base.setup.installer form - + -
- Reporting Tools Configuration -
- - + + + + + - - Configure Reporting Tools - - - OpenERP's built-in reporting abilities can be improved even further with some of the following applications - - - Configure - - - - - - - - Reporting Tools Configuration - ir.actions.act_window - report_designer.installer - - form - form - new - - - - - normal - skip - 3 - diff --git a/addons/sale/sale_installer.py b/addons/sale/sale_installer.py index a8cc5432020..fa7dffc9d6d 100644 --- a/addons/sale/sale_installer.py +++ b/addons/sale/sale_installer.py @@ -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', diff --git a/addons/sale/sale_installer.xml b/addons/sale/sale_installer.xml index 6d67b105578..d0abc57f548 100644 --- a/addons/sale/sale_installer.xml +++ b/addons/sale/sale_installer.xml @@ -2,55 +2,22 @@ sale.installer.view - sale.installer + base.setup.installer form - + -
- Sales Application Configuration -
- - - Configure Your Sales Management Application - - - Enhance your core Sales Application with additional functionalities. - - - - - - Configure - - - - - - - - + + + + + + + + + - - - Sales Application Configuration - ir.actions.act_window - sale.installer - - form - form - new - - - - - special - 3 - - - diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml index 2024bac8dda..5a1ab176970 100644 --- a/addons/sale/sale_view.xml +++ b/addons/sale/sale_view.xml @@ -574,7 +574,8 @@ - special + normal + skip