From 25dec3ff0a4fa8cccf14e3b1e1d738cfeaa0f56b Mon Sep 17 00:00:00 2001 From: "aag (OpenERP)" Date: Mon, 2 May 2011 14:21:55 +0530 Subject: [PATCH 01/61] [IMP]Project :Remove Project Application Configuration Wiz and inherit it to INstall Appl wiz bzr revid: aag@tinyerp.co.in-20110502085155-2d9o4yo2l5yl2npl --- addons/project/installer.py | 7 ++-- addons/project/project_installer.xml | 57 +++++++--------------------- 2 files changed, 17 insertions(+), 47 deletions(-) diff --git a/addons/project/installer.py b/addons/project/installer.py index 693e2d58018..470a753c8e0 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..af97fff5018 100644 --- a/addons/project/project_installer.xml +++ b/addons/project/project_installer.xml @@ -3,56 +3,27 @@ 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 - - From 37f826829540be4d74c05c40c73893da8dba499c Mon Sep 17 00:00:00 2001 From: "aag (OpenERP)" Date: Mon, 2 May 2011 14:50:55 +0530 Subject: [PATCH 02/61] [IMP]HR :Remove HR Application Configuration Wiz and inherit it to INstall Appl wiz bzr revid: aag@tinyerp.co.in-20110502092055-8m1xxpde6x7b5pat --- addons/hr/hr_installer.xml | 79 ++++++++------------------------------ addons/hr/installer.py | 3 +- 2 files changed, 18 insertions(+), 64 deletions(-) diff --git a/addons/hr/hr_installer.xml b/addons/hr/hr_installer.xml index 60bf243300a..efad3aa1829 100644 --- a/addons/hr/hr_installer.xml +++ b/addons/hr/hr_installer.xml @@ -4,73 +4,28 @@ 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', From 7f1361a2dd7ea244e0abe5d994f889e760faa528 Mon Sep 17 00:00:00 2001 From: "aag (OpenERP)" Date: Mon, 2 May 2011 14:53:32 +0530 Subject: [PATCH 03/61] [IMP]Project :change Details bzr revid: aag@tinyerp.co.in-20110502092332-x24jiqmvkijmsl3y --- addons/project/project_installer.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/project/project_installer.xml b/addons/project/project_installer.xml index af97fff5018..006919a72e8 100644 --- a/addons/project/project_installer.xml +++ b/addons/project/project_installer.xml @@ -11,7 +11,7 @@ - + From 99d3f87610bc75a4b8ace6c67612daa2f31a5ea0 Mon Sep 17 00:00:00 2001 From: "aag (OpenERP)" Date: Mon, 2 May 2011 15:34:53 +0530 Subject: [PATCH 04/61] [IMP]CRM :Remove CRM Application Configuration Wiz and inherit it to INstall Appl wiz bzr revid: aag@tinyerp.co.in-20110502100453-t6y6s48a4ciqwo7a --- addons/crm/crm_installer.py | 11 +++-- addons/crm/crm_installer_view.xml | 73 +++++++------------------------ 2 files changed, 22 insertions(+), 62 deletions(-) diff --git a/addons/crm/crm_installer.py b/addons/crm/crm_installer.py index 32551d438c4..ee7e9b1b3c4 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..b9378a77202 100644 --- a/addons/crm/crm_installer_view.xml +++ b/addons/crm/crm_installer_view.xml @@ -2,69 +2,30 @@ 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 From b3fdf05c56798e72a10678c8bedb6b19e0f1e6d3 Mon Sep 17 00:00:00 2001 From: "aag (OpenERP)" Date: Mon, 2 May 2011 15:55:57 +0530 Subject: [PATCH 05/61] [IMP]Sale :Remove Sales Application Configuration Wiz and inherit it to INstall Appl wiz bzr revid: aag@tinyerp.co.in-20110502102557-1gwr4o7ebvw2f8m2 --- addons/sale/sale_installer.py | 3 +- addons/sale/sale_installer.xml | 57 ++++++++-------------------------- 2 files changed, 14 insertions(+), 46 deletions(-) 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..44243552a01 100644 --- a/addons/sale/sale_installer.xml +++ b/addons/sale/sale_installer.xml @@ -2,55 +2,24 @@ 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 - - -
From 21a5af084f07d484ac8af6be347607af49ad6be4 Mon Sep 17 00:00:00 2001 From: "aag (OpenERP)" Date: Mon, 2 May 2011 16:19:14 +0530 Subject: [PATCH 06/61] [IMP]knowledge :Remove knowledge Application Configuration Wiz and inherit it to INstall Appl wiz bzr revid: aag@tinyerp.co.in-20110502104914-8gpvo97f15w84agt --- addons/knowledge/installer.py | 7 ++- addons/knowledge/knowledge_installer.xml | 59 +++++------------------- 2 files changed, 15 insertions(+), 51 deletions(-) diff --git a/addons/knowledge/installer.py b/addons/knowledge/installer.py index e74c37f80d0..af12e8ecd0d 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..bc3ac2a00ce 100644 --- a/addons/knowledge/knowledge_installer.xml +++ b/addons/knowledge/knowledge_installer.xml @@ -2,59 +2,24 @@ 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 - -
From c1cfe5d8fbbb3d3a3742406ad718d8e5f6197bb5 Mon Sep 17 00:00:00 2001 From: "aag (OpenERP)" Date: Mon, 2 May 2011 16:41:32 +0530 Subject: [PATCH 07/61] [IMP]MRP :Remove MRP Application Configuration Wiz and inherit it to INstall Appl wiz bzr revid: aag@tinyerp.co.in-20110502111132-32dfxmimsoryk70r --- addons/mrp/installer.py | 3 +- addons/mrp/mrp_installer.xml | 55 ++++++++---------------------------- 2 files changed, 13 insertions(+), 45 deletions(-) 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..32d6730e864 100644 --- a/addons/mrp/mrp_installer.xml +++ b/addons/mrp/mrp_installer.xml @@ -2,55 +2,24 @@ 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 - - -
From bc25c4537d1df2312b348dddecc85a0faff2c98e Mon Sep 17 00:00:00 2001 From: "aag (OpenERP)" Date: Mon, 2 May 2011 17:01:18 +0530 Subject: [PATCH 08/61] [IMP]Purchase :Remove Purchase Application Configuration Wiz and inherit it to INstall Appl wiz bzr revid: aag@tinyerp.co.in-20110502113118-hcsfqemsv8nulxy7 --- addons/purchase/wizard/purchase_installer.py | 3 +- addons/purchase/wizard/purchase_installer.xml | 50 ++++--------------- 2 files changed, 11 insertions(+), 42 deletions(-) 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..9d9a689534b 100644 --- a/addons/purchase/wizard/purchase_installer.xml +++ b/addons/purchase/wizard/purchase_installer.xml @@ -3,51 +3,21 @@ 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 - -
From c35b990f85ade1e1bd4bc6cf8a2b1040d58dc878 Mon Sep 17 00:00:00 2001 From: "aag (OpenERP)" Date: Mon, 2 May 2011 17:14:34 +0530 Subject: [PATCH 09/61] [IMP]profile_tools :Remove Extra Tools Configuration Wiz and inherit it to INstall Appl wiz bzr revid: aag@tinyerp.co.in-20110502114434-3sn3y8n2qvqyolyi --- addons/profile_tools/installer.py | 3 +- addons/profile_tools/misc_tools_installer.xml | 55 +++++-------------- 2 files changed, 14 insertions(+), 44 deletions(-) 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..2513e9e7937 100644 --- a/addons/profile_tools/misc_tools_installer.xml +++ b/addons/profile_tools/misc_tools_installer.xml @@ -2,54 +2,25 @@ 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 -
From db984d61421964346f6f2415a0102a5cca850e1b Mon Sep 17 00:00:00 2001 From: "aag (OpenERP)" Date: Mon, 2 May 2011 17:23:11 +0530 Subject: [PATCH 10/61] [ADD]knowledge :ADD attrs knowledge Application Configuration Wiz Fildes bzr revid: aag@tinyerp.co.in-20110502115311-7xnkop90gicehkwf --- addons/knowledge/knowledge_installer.xml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/addons/knowledge/knowledge_installer.xml b/addons/knowledge/knowledge_installer.xml index bc3ac2a00ce..378bce68085 100644 --- a/addons/knowledge/knowledge_installer.xml +++ b/addons/knowledge/knowledge_installer.xml @@ -12,11 +12,11 @@ - - - - - + + + + + From 0d8c6b91ea97094302cf54f07648f01ffa60b17b Mon Sep 17 00:00:00 2001 From: "aag (OpenERP)" Date: Mon, 2 May 2011 17:42:59 +0530 Subject: [PATCH 11/61] [IMP]Marketing :Remove Marketing Application Configuration Wiz and inherit it to INstall Appl wiz bzr revid: aag@tinyerp.co.in-20110502121259-8ge43kmofonuuw3e --- addons/marketing/marketing_view.xml | 52 ++++++---------------------- addons/marketing/marketing_wizard.py | 3 +- 2 files changed, 12 insertions(+), 43 deletions(-) diff --git a/addons/marketing/marketing_view.xml b/addons/marketing/marketing_view.xml index 7acc9806a63..2193af992a8 100644 --- a/addons/marketing/marketing_view.xml +++ b/addons/marketing/marketing_view.xml @@ -14,52 +14,22 @@ 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."), From 13c009d08d45a819a7479087f9eae5f1ee5144a6 Mon Sep 17 00:00:00 2001 From: "aag (OpenERP)" Date: Mon, 2 May 2011 18:00:00 +0530 Subject: [PATCH 12/61] [IMP]report_designer :Remove Reporting Tools Configuration Wiz and inherit it to INstall Appl wiz bzr revid: aag@tinyerp.co.in-20110502123000-3dvhwc0gak78ojlb --- addons/report_designer/installer.py | 3 +- .../report_designer_installer.xml | 49 ++++--------------- 2 files changed, 10 insertions(+), 42 deletions(-) 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..4b639f03b44 100644 --- a/addons/report_designer/report_designer_installer.xml +++ b/addons/report_designer/report_designer_installer.xml @@ -2,52 +2,21 @@ 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 -
From 908da4e058f14c3496e00fc0a5109e1e9f4526cb Mon Sep 17 00:00:00 2001 From: "aag (OpenERP)" Date: Mon, 2 May 2011 18:29:25 +0530 Subject: [PATCH 13/61] [IMP]association :Remove Association Application Configuration and inherit it to INstall Appl wiz bzr revid: aag@tinyerp.co.in-20110502125925-xf5arvnus5ffzjzo --- addons/association/profile_association.py | 7 ++- addons/association/profile_association.xml | 55 +++++----------------- 2 files changed, 15 insertions(+), 47 deletions(-) diff --git a/addons/association/profile_association.py b/addons/association/profile_association.py index 2b73dd69885..620d4798329 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..291707bc42e 100644 --- a/addons/association/profile_association.xml +++ b/addons/association/profile_association.xml @@ -3,56 +3,25 @@ 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 - - Date: Tue, 3 May 2011 11:24:18 +0530 Subject: [PATCH 14/61] [IMP]CRM :Optimize Crm bzr revid: aag@tinyerp.co.in-20110503055418-x1v0kgnhegm6n8dc --- addons/crm/crm_installer.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/addons/crm/crm_installer.py b/addons/crm/crm_installer.py index ee7e9b1b3c4..9d32ff93ea5 100644 --- a/addons/crm/crm_installer.py +++ b/addons/crm/crm_installer.py @@ -30,11 +30,11 @@ class crm_installer(osv.osv_memory): '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('Synchronization: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('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."), + '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."), } From 82bc15c0c6064702fda234c0f354705c45f80459 Mon Sep 17 00:00:00 2001 From: "aag (OpenERP)" Date: Tue, 3 May 2011 11:30:18 +0530 Subject: [PATCH 15/61] [IMP]knowledge :Optimize knowledge bzr revid: aag@tinyerp.co.in-20110503060018-y6go08dtj058rwi3 --- addons/knowledge/installer.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/knowledge/installer.py b/addons/knowledge/installer.py index af12e8ecd0d..0f6b29597de 100644 --- a/addons/knowledge/installer.py +++ b/addons/knowledge/installer.py @@ -38,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('Template: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('Template:Quality Manual', + 'wiki_quality_manual':fields.boolean('Template: Quality Manual', help="Creates an example skeleton for a standard quality manual."), } _defaults = { From c6366b0486e52011e100a88ce1ec3eb0e2c52cd0 Mon Sep 17 00:00:00 2001 From: "aag (OpenERP)" Date: Tue, 3 May 2011 11:36:30 +0530 Subject: [PATCH 16/61] [IMP]association :Optimize association bzr revid: aag@tinyerp.co.in-20110503060630-tawnbyze65d0jbuu --- addons/association/profile_association.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/association/profile_association.py b/addons/association/profile_association.py index 620d4798329..6aa3ebdd13d 100644 --- a/addons/association/profile_association.py +++ b/addons/association/profile_association.py @@ -25,13 +25,13 @@ class profile_association_config_install_modules_wizard(osv.osv_memory): _inherit = 'base.setup.installer' _columns = { - 'hr_expense':fields.boolean('Resources Management: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('Event Management: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 " From c67ce7f121e9f9ce5560599e7532886896c5cdde Mon Sep 17 00:00:00 2001 From: "aag (OpenERP)" Date: Tue, 3 May 2011 17:32:43 +0530 Subject: [PATCH 17/61] [IMP]Base_setup : Rename Give access to others users to Create New Users Login bzr revid: aag@tinyerp.co.in-20110503120243-1rt5sfeza34v7z7h --- addons/base_setup/base_setup_installer.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/base_setup/base_setup_installer.xml b/addons/base_setup/base_setup_installer.xml index 3fb9eaeb287..ff11696bbb4 100644 --- a/addons/base_setup/base_setup_installer.xml +++ b/addons/base_setup/base_setup_installer.xml @@ -218,10 +218,10 @@ skip
- + - Give access to others users + Create New User's Login ir.actions.act_window res.users form From 607fd1fe37e9bebc29da211b3473440589889f7c Mon Sep 17 00:00:00 2001 From: "aag (OpenERP)" Date: Tue, 3 May 2011 18:19:07 +0530 Subject: [PATCH 18/61] [IMP]CRM : Create sales team - open in list view instead of form view bzr revid: aag@tinyerp.co.in-20110503124907-dygibnjyx88xlor2 --- addons/crm/crm_installer_view.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/crm/crm_installer_view.xml b/addons/crm/crm_installer_view.xml index 7b7717a1fe1..9b94aee82ee 100644 --- a/addons/crm/crm_installer_view.xml +++ b/addons/crm/crm_installer_view.xml @@ -71,7 +71,7 @@ crm.case.section form tree,form - + From 84aad120fab8033c9e0d686c4af601cd9e44e700 Mon Sep 17 00:00:00 2001 From: "aag (OpenERP)" Date: Tue, 3 May 2011 18:24:31 +0530 Subject: [PATCH 19/61] [IMP]CRM : Review Sales Stages - open in list view instead of form view bzr revid: aag@tinyerp.co.in-20110503125431-wgdcgz01df7hl0k0 --- addons/crm/crm_installer_view.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/crm/crm_installer_view.xml b/addons/crm/crm_installer_view.xml index 9b94aee82ee..c46840914f4 100644 --- a/addons/crm/crm_installer_view.xml +++ b/addons/crm/crm_installer_view.xml @@ -86,7 +86,7 @@ crm.case.stage form tree,form - + From 651da049b81d575a1acedab0616f960df4951163 Mon Sep 17 00:00:00 2001 From: "aag (OpenERP)" Date: Tue, 3 May 2011 19:11:31 +0530 Subject: [PATCH 20/61] [IMP]hr_evaluation : Define Your Department Structure - open in list view instead of form view bzr revid: aag@tinyerp.co.in-20110503134131-ff0l8ziygkl1vqzq --- addons/hr_evaluation/hr_evaluation_installer_view.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/hr_evaluation/hr_evaluation_installer_view.xml b/addons/hr_evaluation/hr_evaluation_installer_view.xml index 5b2e149b8d2..c751955e48a 100644 --- a/addons/hr_evaluation/hr_evaluation_installer_view.xml +++ b/addons/hr_evaluation/hr_evaluation_installer_view.xml @@ -7,7 +7,7 @@ hr.department form tree,form - + From f7bcb42370c7b8859a53fb8d05bcb0083800b4f9 Mon Sep 17 00:00:00 2001 From: "aag (OpenERP)" Date: Wed, 4 May 2011 12:00:06 +0530 Subject: [PATCH 21/61] [IMP]Project :Remove attrs Project Management Details bzr revid: aag@tinyerp.co.in-20110504063006-tyr6w5aoj2b3d1co --- addons/project/project_installer.xml | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/addons/project/project_installer.xml b/addons/project/project_installer.xml index 006919a72e8..47021df8c7f 100644 --- a/addons/project/project_installer.xml +++ b/addons/project/project_installer.xml @@ -10,16 +10,14 @@ - - - - - - - - - - + + + + + + + + From f12a40ab2cb6bc8af14496a550be538e1510a0da Mon Sep 17 00:00:00 2001 From: "aag (OpenERP)" Date: Wed, 4 May 2011 12:20:29 +0530 Subject: [PATCH 22/61] [IMP]Project :Remove attrs Associations Details bzr revid: aag@tinyerp.co.in-20110504065029-yjq7qdydp4xisxdu --- addons/association/profile_association.xml | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/addons/association/profile_association.xml b/addons/association/profile_association.xml index 291707bc42e..e693bf6ae99 100644 --- a/addons/association/profile_association.xml +++ b/addons/association/profile_association.xml @@ -10,14 +10,12 @@ - - - - - - - - + + + + + + From cd38f315acb6b00417664bb4bced438a15b97d51 Mon Sep 17 00:00:00 2001 From: "aag (OpenERP)" Date: Wed, 4 May 2011 12:25:49 +0530 Subject: [PATCH 23/61] [IMP]Associations :optimize code bzr revid: aag@tinyerp.co.in-20110504065549-5bxsa00hshmzbl5i --- addons/project/installer.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/project/installer.py b/addons/project/installer.py index 470a753c8e0..36b458da296 100644 --- a/addons/project/installer.py +++ b/addons/project/installer.py @@ -40,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('Methodology: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('Methodology: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() From 854c74df33518698a07af6da344ae0ab9746bd36 Mon Sep 17 00:00:00 2001 From: "aag (OpenERP)" Date: Wed, 4 May 2011 12:29:57 +0530 Subject: [PATCH 24/61] [IMP]HR :Remove attrs from HR Management Details bzr revid: aag@tinyerp.co.in-20110504065957-o713y9d13mp5po2y --- addons/hr/hr_installer.xml | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/addons/hr/hr_installer.xml b/addons/hr/hr_installer.xml index efad3aa1829..86103b5f233 100644 --- a/addons/hr/hr_installer.xml +++ b/addons/hr/hr_installer.xml @@ -11,18 +11,16 @@ - - - - - - - - - - - - + + + + + + + + + + From 2a423822faf3ef2d3d69327e5330f27f17db00fa Mon Sep 17 00:00:00 2001 From: "aag (OpenERP)" Date: Wed, 4 May 2011 12:35:47 +0530 Subject: [PATCH 25/61] [IMP]CRM :Remove attrs from CRM Management Details bzr revid: aag@tinyerp.co.in-20110504070547-iody0ea7oywv1kju --- addons/crm/crm_installer_view.xml | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/addons/crm/crm_installer_view.xml b/addons/crm/crm_installer_view.xml index b9378a77202..4b5bc527b70 100644 --- a/addons/crm/crm_installer_view.xml +++ b/addons/crm/crm_installer_view.xml @@ -9,18 +9,16 @@ - - - - - - - - - - - - + + + + + + + + + + From 9b9ef19d2fccb608651dca802488fa3992b51d1e Mon Sep 17 00:00:00 2001 From: "aag (OpenERP)" Date: Wed, 4 May 2011 12:40:59 +0530 Subject: [PATCH 26/61] [IMP]Sale :Remove attrs from Sale Management Details bzr revid: aag@tinyerp.co.in-20110504071059-l0nuvn6e4004u7ie --- addons/sale/sale_installer.xml | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/addons/sale/sale_installer.xml b/addons/sale/sale_installer.xml index 44243552a01..d0abc57f548 100644 --- a/addons/sale/sale_installer.xml +++ b/addons/sale/sale_installer.xml @@ -9,14 +9,12 @@ - - - - - - - - + + + + + + From c0c7a43784deea21cda7940ec0015da90829c9df Mon Sep 17 00:00:00 2001 From: "aag (OpenERP)" Date: Wed, 4 May 2011 12:56:20 +0530 Subject: [PATCH 27/61] [IMP]knowledge :Remove attrs from knowledge Management Details bzr revid: aag@tinyerp.co.in-20110504072620-dh8e8ff309dus58x --- addons/knowledge/knowledge_installer.xml | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/addons/knowledge/knowledge_installer.xml b/addons/knowledge/knowledge_installer.xml index 378bce68085..e5fe851fcdd 100644 --- a/addons/knowledge/knowledge_installer.xml +++ b/addons/knowledge/knowledge_installer.xml @@ -9,14 +9,12 @@ - - - - - - - - + + + + + + From 14d85874e657821d9f70f2cb1eb1e8d38bbb5ffa Mon Sep 17 00:00:00 2001 From: "aag (OpenERP)" Date: Wed, 4 May 2011 14:32:14 +0530 Subject: [PATCH 28/61] [IMP]MRP :Remove attrs from MRP Management Details bzr revid: aag@tinyerp.co.in-20110504090214-e0qec1kvz2fs3g5t --- addons/mrp/mrp_installer.xml | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/addons/mrp/mrp_installer.xml b/addons/mrp/mrp_installer.xml index 32d6730e864..9f80ef733aa 100644 --- a/addons/mrp/mrp_installer.xml +++ b/addons/mrp/mrp_installer.xml @@ -9,14 +9,12 @@ - - - - - - - - + + + + + + From 435a3ac08822bb338086801452104a50cf155ce8 Mon Sep 17 00:00:00 2001 From: "aag (OpenERP)" Date: Wed, 4 May 2011 14:41:04 +0530 Subject: [PATCH 29/61] [IMP]Purchase :Remove attrs from Purchase Management Details bzr revid: aag@tinyerp.co.in-20110504091104-r1vx1ak3dy6itftt --- addons/purchase/wizard/purchase_installer.xml | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/addons/purchase/wizard/purchase_installer.xml b/addons/purchase/wizard/purchase_installer.xml index 9d9a689534b..bb759a60b00 100644 --- a/addons/purchase/wizard/purchase_installer.xml +++ b/addons/purchase/wizard/purchase_installer.xml @@ -10,11 +10,9 @@ - - - - - + + + From b0dc5a6bf01a7a34e733972235133bb8f7b2fcec Mon Sep 17 00:00:00 2001 From: "aag (OpenERP)" Date: Wed, 4 May 2011 15:04:49 +0530 Subject: [PATCH 30/61] [IMP]profile_tools:Remove attrs from Extra Tools Details bzr revid: aag@tinyerp.co.in-20110504093449-5g6al7nd0ac0lybd --- addons/profile_tools/misc_tools_installer.xml | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/addons/profile_tools/misc_tools_installer.xml b/addons/profile_tools/misc_tools_installer.xml index 2513e9e7937..6daba8f0650 100644 --- a/addons/profile_tools/misc_tools_installer.xml +++ b/addons/profile_tools/misc_tools_installer.xml @@ -9,15 +9,13 @@ - - - - - - - - - + + + + + + + From 49fbf8f950ed70dda61fc2929fc409b9153dab27 Mon Sep 17 00:00:00 2001 From: "aag (OpenERP)" Date: Wed, 4 May 2011 15:13:45 +0530 Subject: [PATCH 31/61] [IMP]Marketing:Remove attrs from Marketing Details bzr revid: aag@tinyerp.co.in-20110504094345-xsn03kt0ilh4uitd --- addons/marketing/marketing_view.xml | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/addons/marketing/marketing_view.xml b/addons/marketing/marketing_view.xml index 2193af992a8..7d3175b9811 100644 --- a/addons/marketing/marketing_view.xml +++ b/addons/marketing/marketing_view.xml @@ -21,12 +21,10 @@ - - - - - - + + + + From 4f1d9b4e47ff5f8808981eef6415783c29b47013 Mon Sep 17 00:00:00 2001 From: "aag (OpenERP)" Date: Wed, 4 May 2011 15:18:55 +0530 Subject: [PATCH 32/61] [IMP]report_designe:Remove attrs from Advanced Reporting Details bzr revid: aag@tinyerp.co.in-20110504094855-qcl4v80khzuv3foo --- addons/report_designer/report_designer_installer.xml | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/addons/report_designer/report_designer_installer.xml b/addons/report_designer/report_designer_installer.xml index 4b639f03b44..18505a95930 100644 --- a/addons/report_designer/report_designer_installer.xml +++ b/addons/report_designer/report_designer_installer.xml @@ -9,11 +9,9 @@ - - - - - + + + From b60cb67171470b59207ba8378038a12e21746562 Mon Sep 17 00:00:00 2001 From: "aag (OpenERP)" Date: Wed, 4 May 2011 18:54:05 +0530 Subject: [PATCH 33/61] [IMP]Base_setup:Improve tooltip -Define default users preferences bzr revid: aag@tinyerp.co.in-20110504132405-rxew8k7a3ncuf020 --- addons/base_setup/base_setup_installer.xml | 2 +- addons/base_setup/installer.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/addons/base_setup/base_setup_installer.xml b/addons/base_setup/base_setup_installer.xml index ff11696bbb4..22408ddc966 100644 --- a/addons/base_setup/base_setup_installer.xml +++ b/addons/base_setup/base_setup_installer.xml @@ -182,7 +182,7 @@ - Specify default values. These data are just default values, each user is free to change his own preferences. + Specify default values.This will set the default values for each new user, each user is free to change his own preferences. diff --git a/addons/base_setup/installer.py b/addons/base_setup/installer.py index 0309318aea0..b03418bd114 100644 --- a/addons/base_setup/installer.py +++ b/addons/base_setup/installer.py @@ -221,8 +221,8 @@ class user_preferences_config(osv.osv_memory): "translations are available"), 'view': fields.selection([('simple','Simplified'), ('extended','Extended')], - 'Interface', required=True ), - 'menu_tips': fields.boolean('Menu Tips', help="Check out this box if you want to always display tips on each menu action"), + 'Interface', required=True, help= "If you use OpenERP for the first time we strongly advise you to select the simplified interface, which has less features but is easier. You can always switch later from the user preferences." ), + 'menu_tips': fields.boolean('Display Tips', help="Check out this box if you want to always display tips on each menu action"), } _defaults={ From 70d029adba43f14c93f79458550ec1ef70a46cf5 Mon Sep 17 00:00:00 2001 From: "aag (OpenERP)" Date: Thu, 5 May 2011 17:58:46 +0530 Subject: [PATCH 34/61] [IMP]Base_setup:Pervious values set as Default -Define default users preferences bzr revid: aag@tinyerp.co.in-20110505122846-660ebx0of6vfn42r --- addons/base_setup/installer.py | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/addons/base_setup/installer.py b/addons/base_setup/installer.py index b03418bd114..0019ff9a4f4 100644 --- a/addons/base_setup/installer.py +++ b/addons/base_setup/installer.py @@ -230,6 +230,15 @@ class user_preferences_config(osv.osv_memory): 'context_lang' : 'en_US', 'menu_tips' : True } + + def default_get(self, cr, uid, fields, context=None): + if context is None: + context = {} + res = super(user_preferences_config, self).default_get(cr, uid, fields, context=context) + res_default = self.pool.get('ir.values').get(cr, uid, 'default', False, ['res.users']) + for val in range(len(res_default)): + res.update({res_default[val][1]:res_default[val][2]}) + return res def execute(self, cr, uid, ids, context=None): for o in self.browse(cr, uid, ids, context=context): From f710164aff427805f8549e65ac4f9f9128171bf3 Mon Sep 17 00:00:00 2001 From: "aag (OpenERP)" Date: Fri, 6 May 2011 12:13:03 +0530 Subject: [PATCH 35/61] [IMP]Base_setup:Add New Config Wiz - Company Configuration Current Form bzr revid: aag@tinyerp.co.in-20110506064303-uvvsuyg2dyh3lzkh --- addons/base_setup/base_setup_todo.xml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/addons/base_setup/base_setup_todo.xml b/addons/base_setup/base_setup_todo.xml index e4beabea3fd..886de220a87 100644 --- a/addons/base_setup/base_setup_todo.xml +++ b/addons/base_setup/base_setup_todo.xml @@ -65,5 +65,22 @@ normal skip + + + Company Configuration Current Form + ir.actions.act_window + res.company + form + form + + + + + + normal + skip + current + + From 578668cd973a7993753e3a1632f961481176819d Mon Sep 17 00:00:00 2001 From: "aag (OpenERP)" Date: Fri, 6 May 2011 14:10:25 +0530 Subject: [PATCH 36/61] [ADD]Base_setup:Add New Config Wiz - Upload Your Company Logo bzr revid: aag@tinyerp.co.in-20110506084025-waa03u3s0hwabz4p --- addons/base_setup/base_setup_installer.xml | 8 ++++++++ addons/base_setup/wizard/res_company_logo.py | 5 +++-- addons/base_setup/wizard/res_company_logo_view.xml | 4 ++-- 3 files changed, 13 insertions(+), 4 deletions(-) diff --git a/addons/base_setup/base_setup_installer.xml b/addons/base_setup/base_setup_installer.xml index 22408ddc966..a41329d6081 100644 --- a/addons/base_setup/base_setup_installer.xml +++ b/addons/base_setup/base_setup_installer.xml @@ -258,6 +258,14 @@ + + + + diff --git a/addons/base_setup/wizard/res_company_logo.py b/addons/base_setup/wizard/res_company_logo.py index df8ace2895c..019b0a256c9 100644 --- a/addons/base_setup/wizard/res_company_logo.py +++ b/addons/base_setup/wizard/res_company_logo.py @@ -37,10 +37,11 @@ class res_company_logo(osv.osv_memory): def execute(self, cr, uid, ids, context=None): if context is None: context = {} - record_id = context.get('active_id', False) or False + user_comp_id = self.pool.get('res.users').browse(cr, uid, uid, context=context).company_id.id comp_obj = self.pool.get("res.company") get_val = self.browse(cr, uid, ids)[0] - comp_obj.write(cr, uid, record_id, {'logo': get_val.logo}, context=context) + if user_comp_id : + comp_obj.write(cr, uid, user_comp_id, {'logo': get_val.logo}, context=context) return {'type': 'ir.actions.act_window_close'} res_company_logo() diff --git a/addons/base_setup/wizard/res_company_logo_view.xml b/addons/base_setup/wizard/res_company_logo_view.xml index c15810ff3d1..c0ed2485752 100644 --- a/addons/base_setup/wizard/res_company_logo_view.xml +++ b/addons/base_setup/wizard/res_company_logo_view.xml @@ -7,7 +7,7 @@ res.company.logo form -
+ @@ -21,7 +21,7 @@ - - - Import or create customers - product.installer - form - - - - - Import or create customers - - - Import or create customers - - - Create some customers, suppliers and their contacts manually or import a CSV spreadsheet by clicking on the import link - - - 15 - - - - - - - - - - - Import or create customers ir.actions.act_window - product.installer - + res.partner form - form - new + tree,form + + Create some customers, suppliers and their contacts manually or import a CSV spreadsheet by clicking on the import link - + normal + current skip From 074b2c108ac77460b4288a88136e35b50bb11616 Mon Sep 17 00:00:00 2001 From: "aag (OpenERP)" Date: Fri, 6 May 2011 16:17:29 +0530 Subject: [PATCH 38/61] [ADD]Sale:In product Form -Sales Order Lines - set upper case bzr revid: aag@tinyerp.co.in-20110506104729-whrx8zetkhudwuua --- addons/sale/sale_view.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml index 2024bac8dda..67503917761 100644 --- a/addons/sale/sale_view.xml +++ b/addons/sale/sale_view.xml @@ -521,7 +521,7 @@ From 5589acd5ffb6624108c1a725064189f1f49081c0 Mon Sep 17 00:00:00 2001 From: "aag (OpenERP)" Date: Fri, 6 May 2011 16:41:49 +0530 Subject: [PATCH 39/61] [IMP]Sale:Rename Setup your sales flow with Set Up Your Invoicing Method bzr revid: aag@tinyerp.co.in-20110506111149-bnzyf3w9qsh4iqys --- addons/sale/sale.py | 2 +- addons/sale/sale_view.xml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/addons/sale/sale.py b/addons/sale/sale.py index 0758fac6c19..4040ca8cc13 100644 --- a/addons/sale/sale.py +++ b/addons/sale/sale.py @@ -1180,7 +1180,7 @@ class sale_config_picking_policy(osv.osv_memory): 'order_policy': fields.selection([ ('manual', 'Invoice Based on Sales Orders'), ('picking', 'Invoice Based on Deliveries'), - ], 'Invoice Method', required=True, + ], 'Invoicing Method', required=True, help="You can generate invoices based on sales orders or based on shippings."), 'step': fields.selection([ ('one', 'Delivery Order Only'), diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml index 67503917761..1cd2d99c0ce 100644 --- a/addons/sale/sale_view.xml +++ b/addons/sale/sale_view.xml @@ -532,7 +532,7 @@ - Setup your sales flow + Set Up Your Invoicing Method sale.config.picking_policy form @@ -562,7 +562,7 @@ - Setup your sales flow + Set Up Your Invoicing Method ir.actions.act_window sale.config.picking_policy From ed0314292ed5b3d4f9fb8bd916684cc46d5616ac Mon Sep 17 00:00:00 2001 From: "aag (OpenERP)" Date: Fri, 6 May 2011 17:58:19 +0530 Subject: [PATCH 40/61] [IMP]account_followup:Improvement in view is Done bzr revid: aag@tinyerp.co.in-20110506122819-1yavcr27fvqxqblm --- addons/account_followup/account_followup.py | 1 - addons/account_followup/account_followup_demo.xml | 3 --- addons/account_followup/account_followup_view.xml | 14 +++++++------- addons/account_followup/test/account_followup.yml | 3 --- .../wizard/account_followup_print.py | 2 +- 5 files changed, 8 insertions(+), 15 deletions(-) diff --git a/addons/account_followup/account_followup.py b/addons/account_followup/account_followup.py index c798c703f37..bf504d0b743 100644 --- a/addons/account_followup/account_followup.py +++ b/addons/account_followup/account_followup.py @@ -41,7 +41,6 @@ class followup_line(osv.osv): _description = 'Follow-Up Criteria' _columns = { 'name': fields.char('Name', size=64, required=True), - 'sequence': fields.integer('Sequence', help="Gives the sequence order when displaying a list of follow-up lines."), 'delay': fields.integer('Days of delay'), 'start': fields.selection([('days','Net Days'),('end_of_month','End of Month')], 'Type of Term', size=64, required=True), 'followup_id': fields.many2one('account_followup.followup', 'Follow Ups', required=True, ondelete="cascade"), diff --git a/addons/account_followup/account_followup_demo.xml b/addons/account_followup/account_followup_demo.xml index 2bf627de9b7..9680a2b6b39 100644 --- a/addons/account_followup/account_followup_demo.xml +++ b/addons/account_followup/account_followup_demo.xml @@ -10,7 +10,6 @@ Level 0 : 15 net days - 0 days 15 @@ -27,7 +26,6 @@ Best Regards, Level 1 : 30 net days - 1 days 30 @@ -49,7 +47,6 @@ Best Regards, Level 2 : 45 days end of month - 2 end_of_month 45 diff --git a/addons/account_followup/account_followup_view.xml b/addons/account_followup/account_followup_view.xml index 326264ffdcd..485b477fb23 100644 --- a/addons/account_followup/account_followup_view.xml +++ b/addons/account_followup/account_followup_view.xml @@ -8,10 +8,9 @@ tree - - + @@ -22,10 +21,9 @@ form
- - + @@ -45,9 +43,7 @@ - - - + @@ -75,6 +71,10 @@ + + + +
diff --git a/addons/account_followup/test/account_followup.yml b/addons/account_followup/test/account_followup.yml index c69fdb112c6..ae0b2e89bec 100644 --- a/addons/account_followup/test/account_followup.yml +++ b/addons/account_followup/test/account_followup.yml @@ -6,7 +6,6 @@ followup_line: - delay: 15 name: 'level 0: 15 days' - sequence: 0 start: days description: Dear %(partner_name)s,\n\nException made if there was a mistake of ours, it seems that the following amount staid unpaid. Please, take appropriate @@ -16,7 +15,6 @@ (+32).10.68.94.39.\n\nBest Regards,\n - delay: 30 name: 'level1: 30 days' - sequence: 1 start: days description: Dear %(partner_name)s,\n\nException made if there was a mistake of ours, it seems that the following amount staid unpaid. Please, take appropriate @@ -26,7 +24,6 @@ (+32).10.68.94.39.\n\nBest Regards,\n - delay: 45 name: 'level 2: 45 days' - sequence: 2 start: days description: Dear %(partner_name)s,\n\nException made if there was a mistake of ours, it seems that the following amount staid unpaid. Please, take appropriate diff --git a/addons/account_followup/wizard/account_followup_print.py b/addons/account_followup/wizard/account_followup_print.py index a8608c2fdd0..18b0fc1b874 100644 --- a/addons/account_followup/wizard/account_followup_print.py +++ b/addons/account_followup/wizard/account_followup_print.py @@ -171,7 +171,7 @@ class account_followup_print_all(osv.osv_memory): "SELECT * "\ "FROM account_followup_followup_line "\ "WHERE followup_id=%s "\ - "ORDER BY sequence", (fup_id,)) + "ORDER BY delay", (fup_id,)) for result in cr.dictfetchall(): delay = datetime.timedelta(days=result['delay']) fups[old] = (current_date - delay, result['id']) From f47615d0f83ab0bf332d707f20197d332eb82b4c Mon Sep 17 00:00:00 2001 From: "aag (OpenERP)" Date: Fri, 6 May 2011 18:17:15 +0530 Subject: [PATCH 41/61] [ADD]account_followup:Add new Configure Follow-Ups config Wizard bzr revid: aag@tinyerp.co.in-20110506124715-juqaut5dkijvr89y --- .../account_followup_view.xml | 21 +++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/addons/account_followup/account_followup_view.xml b/addons/account_followup/account_followup_view.xml index 485b477fb23..07a04cd86d9 100644 --- a/addons/account_followup/account_followup_view.xml +++ b/addons/account_followup/account_followup_view.xml @@ -170,6 +170,27 @@
+ + + + + Configure Follow-Ups + ir.actions.act_window + account_followup.followup + form + form,tree + + + + + + + current + normal + skip + + + From 84ab33f772b7a60ef143e748749eb55c51d04f2c Mon Sep 17 00:00:00 2001 From: "aag (OpenERP)" Date: Mon, 9 May 2011 10:43:27 +0530 Subject: [PATCH 42/61] [IMP]Fetchmail:add tooltip on user - change label of model to object to create bzr revid: aag@tinyerp.co.in-20110509051327-wl60urxkcce3l7yw --- addons/fetchmail/fetchmail.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/fetchmail/fetchmail.py b/addons/fetchmail/fetchmail.py index 41f84cfdedd..9aeddd7ba9b 100644 --- a/addons/fetchmail/fetchmail.py +++ b/addons/fetchmail/fetchmail.py @@ -59,9 +59,9 @@ class email_server(osv.osv): 'password' : fields.char('Password', size=1024, invisible=True, required=True, readonly=True, states={'draft':[('readonly', False)]}), 'note': fields.text('Description'), 'action_id':fields.many2one('ir.actions.server', 'Email Server Action', required=False, domain="[('state','=','email')]", help="An Email Server Action. It will be run whenever an e-mail is fetched from server."), - 'object_id': fields.many2one('ir.model', "Model", required=True, help="OpenObject Model. Generates a record of this model.\nSelect Object with message_new attrbutes."), + 'object_id': fields.many2one('ir.model', "Object To Create", required=True, help="Whenever an email arrives, it automatically creates the object of this type with all the information attached."), 'priority': fields.integer('Server Priority', readonly=True, states={'draft':[('readonly', False)]}, help="Priority between 0 to 10, select define the order of Processing"), - 'user_id':fields.many2one('res.users', 'User', required=False), + 'user_id':fields.many2one('res.users', 'User', required=False, help="This is the user that runs the cron"), 'message_ids': fields.one2many('mailgate.message', 'server_id', 'Messages', readonly=True), } _defaults = { From 172a1e3f075430621ad341b3c44f2946c7eebafd Mon Sep 17 00:00:00 2001 From: "aag (OpenERP)" Date: Mon, 9 May 2011 11:06:36 +0530 Subject: [PATCH 43/61] [IMP]Lunch:remove "description" field from search view bzr revid: aag@tinyerp.co.in-20110509053636-pnf92j8jpdl6ymgk --- addons/lunch/lunch_view.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/addons/lunch/lunch_view.xml b/addons/lunch/lunch_view.xml index a08603b6fa4..20573316915 100644 --- a/addons/lunch/lunch_view.xml +++ b/addons/lunch/lunch_view.xml @@ -292,7 +292,6 @@ -
From 6d1e44f52da92482ed30cddb9a38dddd239ff11c Mon Sep 17 00:00:00 2001 From: "aag (OpenERP)" Date: Mon, 9 May 2011 14:11:29 +0530 Subject: [PATCH 44/61] [IMP]hr_timesheet_invoice: Add config wiz - configure your services bzr revid: aag@tinyerp.co.in-20110509084129-duoujlywlskenbgg --- .../hr_timesheet_invoice_installer_view.xml | 22 +++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/addons/hr_timesheet_invoice/hr_timesheet_invoice_installer_view.xml b/addons/hr_timesheet_invoice/hr_timesheet_invoice_installer_view.xml index cd2bb285f03..a429e8745a9 100644 --- a/addons/hr_timesheet_invoice/hr_timesheet_invoice_installer_view.xml +++ b/addons/hr_timesheet_invoice/hr_timesheet_invoice_installer_view.xml @@ -43,6 +43,28 @@ normal skip + + + + + Configure Your Services + ir.actions.act_window + product.product + form + tree,form + [('type','=','service')] + + + + + + + 3 + normal + skip + + + \ No newline at end of file From fc2dff1f19087a414338d30070d42f7811852240 Mon Sep 17 00:00:00 2001 From: "aag (OpenERP)" Date: Mon, 9 May 2011 15:36:20 +0530 Subject: [PATCH 45/61] [IMP]account_followup: Add Sequence Fields to account_followup bzr revid: aag@tinyerp.co.in-20110509100620-lhkd3cvw3h1zqqq0 --- addons/account_followup/account_followup.py | 1 + addons/account_followup/account_followup_demo.xml | 3 +++ addons/account_followup/test/account_followup.yml | 3 +++ 3 files changed, 7 insertions(+) diff --git a/addons/account_followup/account_followup.py b/addons/account_followup/account_followup.py index bf504d0b743..c798c703f37 100644 --- a/addons/account_followup/account_followup.py +++ b/addons/account_followup/account_followup.py @@ -41,6 +41,7 @@ class followup_line(osv.osv): _description = 'Follow-Up Criteria' _columns = { 'name': fields.char('Name', size=64, required=True), + 'sequence': fields.integer('Sequence', help="Gives the sequence order when displaying a list of follow-up lines."), 'delay': fields.integer('Days of delay'), 'start': fields.selection([('days','Net Days'),('end_of_month','End of Month')], 'Type of Term', size=64, required=True), 'followup_id': fields.many2one('account_followup.followup', 'Follow Ups', required=True, ondelete="cascade"), diff --git a/addons/account_followup/account_followup_demo.xml b/addons/account_followup/account_followup_demo.xml index 9680a2b6b39..2bf627de9b7 100644 --- a/addons/account_followup/account_followup_demo.xml +++ b/addons/account_followup/account_followup_demo.xml @@ -10,6 +10,7 @@ Level 0 : 15 net days + 0 days 15 @@ -26,6 +27,7 @@ Best Regards, Level 1 : 30 net days + 1 days 30 @@ -47,6 +49,7 @@ Best Regards, Level 2 : 45 days end of month + 2 end_of_month 45 diff --git a/addons/account_followup/test/account_followup.yml b/addons/account_followup/test/account_followup.yml index ae0b2e89bec..c69fdb112c6 100644 --- a/addons/account_followup/test/account_followup.yml +++ b/addons/account_followup/test/account_followup.yml @@ -6,6 +6,7 @@ followup_line: - delay: 15 name: 'level 0: 15 days' + sequence: 0 start: days description: Dear %(partner_name)s,\n\nException made if there was a mistake of ours, it seems that the following amount staid unpaid. Please, take appropriate @@ -15,6 +16,7 @@ (+32).10.68.94.39.\n\nBest Regards,\n - delay: 30 name: 'level1: 30 days' + sequence: 1 start: days description: Dear %(partner_name)s,\n\nException made if there was a mistake of ours, it seems that the following amount staid unpaid. Please, take appropriate @@ -24,6 +26,7 @@ (+32).10.68.94.39.\n\nBest Regards,\n - delay: 45 name: 'level 2: 45 days' + sequence: 2 start: days description: Dear %(partner_name)s,\n\nException made if there was a mistake of ours, it seems that the following amount staid unpaid. Please, take appropriate From e00b074445a4da6625362d225b7ace48f7abb98c Mon Sep 17 00:00:00 2001 From: "aag (OpenERP)" Date: Mon, 9 May 2011 15:50:40 +0530 Subject: [PATCH 46/61] [IMP]crm: Add help to Create Sales Team bzr revid: aag@tinyerp.co.in-20110509102040-t84d3dvo8i02c8d9 --- addons/crm/crm_installer_view.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/addons/crm/crm_installer_view.xml b/addons/crm/crm_installer_view.xml index c46840914f4..dd56c61559a 100644 --- a/addons/crm/crm_installer_view.xml +++ b/addons/crm/crm_installer_view.xml @@ -66,12 +66,13 @@ - Create sales team + Create Sales Team ir.actions.act_window crm.case.section form tree,form + Define a Sales Team to organize your different salesmen or sales departments into separate teams. Each team will work in its own list of opportunities, sales orders, etc. Each user can set a default team in his user preferences. The opportunities and sales order displayed, will automatically be filtered according to his team. From d5f14d6e4fd5874f1bbd7532af4ee7680e56aed3 Mon Sep 17 00:00:00 2001 From: "aag (OpenERP)" Date: Mon, 9 May 2011 15:58:05 +0530 Subject: [PATCH 47/61] [IMP]crm: Add help to Review Sales Stages bzr revid: aag@tinyerp.co.in-20110509102805-w3rynor8h4czh32f --- addons/crm/crm_installer_view.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/addons/crm/crm_installer_view.xml b/addons/crm/crm_installer_view.xml index dd56c61559a..bfec6365051 100644 --- a/addons/crm/crm_installer_view.xml +++ b/addons/crm/crm_installer_view.xml @@ -88,6 +88,7 @@ form tree,form + Add specific stages to leads and opportunities allowing your sales to better organise their sales pipeline. Stages will allow them to easily track how a specific lead or opportunity is positioned in the sales cycle. From eb983943d5425da304f70e615114c2191cbe35e5 Mon Sep 17 00:00:00 2001 From: "aag (OpenERP)" Date: Mon, 9 May 2011 16:09:26 +0530 Subject: [PATCH 48/61] [IMP]hr_evaluation: Add help to Define Your Department Structure bzr revid: aag@tinyerp.co.in-20110509103926-g0kz04bzv3uqk3br --- addons/hr_evaluation/hr_evaluation_installer_view.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/addons/hr_evaluation/hr_evaluation_installer_view.xml b/addons/hr_evaluation/hr_evaluation_installer_view.xml index c751955e48a..94a48ae774c 100644 --- a/addons/hr_evaluation/hr_evaluation_installer_view.xml +++ b/addons/hr_evaluation/hr_evaluation_installer_view.xml @@ -8,6 +8,7 @@ form tree,form + Your Company's Department Structure is used to manage all documents related to employees by departments: expenses and timesheet validation, leaves management, recruitments, etc. From 76057abeb2ac675cc4e4f19f1fe56186d2cb2d4c Mon Sep 17 00:00:00 2001 From: "aag (OpenERP)" Date: Mon, 9 May 2011 17:42:45 +0530 Subject: [PATCH 49/61] [IMP]hr_timesheet_invoice:- configure your services open in List View bzr revid: aag@tinyerp.co.in-20110509121245-nnvkgu83kaa5qh79 --- .../hr_timesheet_invoice_installer_view.xml | 21 +++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) diff --git a/addons/hr_timesheet_invoice/hr_timesheet_invoice_installer_view.xml b/addons/hr_timesheet_invoice/hr_timesheet_invoice_installer_view.xml index a429e8745a9..9cf78aebb66 100644 --- a/addons/hr_timesheet_invoice/hr_timesheet_invoice_installer_view.xml +++ b/addons/hr_timesheet_invoice/hr_timesheet_invoice_installer_view.xml @@ -46,6 +46,21 @@ + + product.product.tree + product.product + tree + + + + + + + + + + + Configure Your Services ir.actions.act_window @@ -53,8 +68,8 @@ form tree,form [('type','=','service')] - - + + @@ -63,8 +78,6 @@ normal skip - - \ No newline at end of file From ef362564eb8e786ee34899493efe5a764ee630a4 Mon Sep 17 00:00:00 2001 From: "aag (OpenERP)" Date: Mon, 9 May 2011 18:25:22 +0530 Subject: [PATCH 50/61] [IMP]Base_setup:Optimize code of res_company_logo bzr revid: aag@tinyerp.co.in-20110509125522-9gdgffhbytnm6ryj --- addons/base_setup/wizard/res_company_logo.py | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/addons/base_setup/wizard/res_company_logo.py b/addons/base_setup/wizard/res_company_logo.py index 019b0a256c9..2e1b4b6e2aa 100644 --- a/addons/base_setup/wizard/res_company_logo.py +++ b/addons/base_setup/wizard/res_company_logo.py @@ -37,11 +37,9 @@ class res_company_logo(osv.osv_memory): def execute(self, cr, uid, ids, context=None): if context is None: context = {} - user_comp_id = self.pool.get('res.users').browse(cr, uid, uid, context=context).company_id.id - comp_obj = self.pool.get("res.company") + user_comp = self.pool.get('res.users').browse(cr, uid, uid, context=context).company_id get_val = self.browse(cr, uid, ids)[0] - if user_comp_id : - comp_obj.write(cr, uid, user_comp_id, {'logo': get_val.logo}, context=context) + user_comp.write({'logo': get_val.logo}, context=context) return {'type': 'ir.actions.act_window_close'} res_company_logo() From 363ebceea53caf18be2fc953b46205b77471a438 Mon Sep 17 00:00:00 2001 From: "aag (OpenERP)" Date: Tue, 10 May 2011 10:14:56 +0530 Subject: [PATCH 51/61] [IMP]Base_setup:Remove Upload/Cange Logo btn bzr revid: aag@tinyerp.co.in-20110510044456-ntn6t49zgftlbsds --- addons/base_setup/base_setup_installer.xml | 2 -- 1 file changed, 2 deletions(-) diff --git a/addons/base_setup/base_setup_installer.xml b/addons/base_setup/base_setup_installer.xml index d5d26a8bebd..286aa817289 100644 --- a/addons/base_setup/base_setup_installer.xml +++ b/addons/base_setup/base_setup_installer.xml @@ -221,8 +221,6 @@ -