From 1e5fc17c9d3b23b0465fa9f61fdd341758c97dd5 Mon Sep 17 00:00:00 2001 From: "Mayur Maheshwari (OpenERP)" Date: Tue, 26 Jul 2011 19:02:55 +0530 Subject: [PATCH 01/13] [IMP]hr_expense,hr_recruitment:Remove a configure your services and improve Config Review Your Expenses bzr revid: mma@tinyerp.com-20110726133255-jhx0zwcisp2ql3h3 --- .../hr_expense/hr_expense_installer_view.xml | 19 ++++++++- addons/hr_recruitment/hr_recruitment_view.xml | 2 +- addons/hr_timesheet_invoice/__openerp__.py | 1 - .../hr_timesheet_invoice_installer_view.xml | 42 ------------------- 4 files changed, 18 insertions(+), 46 deletions(-) delete mode 100644 addons/hr_timesheet_invoice/hr_timesheet_invoice_installer_view.xml diff --git a/addons/hr_expense/hr_expense_installer_view.xml b/addons/hr_expense/hr_expense_installer_view.xml index aa0ecbd1ae1..ec466f37dd2 100644 --- a/addons/hr_expense/hr_expense_installer_view.xml +++ b/addons/hr_expense/hr_expense_installer_view.xml @@ -1,14 +1,29 @@ - + + product.product.tree + product.product + tree + + + + + + + + + + + + Review Your Expenses Products ir.actions.act_window product.product form tree,form - + diff --git a/addons/hr_recruitment/hr_recruitment_view.xml b/addons/hr_recruitment/hr_recruitment_view.xml index 28c69394e96..0e98ea03030 100644 --- a/addons/hr_recruitment/hr_recruitment_view.xml +++ b/addons/hr_recruitment/hr_recruitment_view.xml @@ -330,7 +330,7 @@ - + diff --git a/addons/hr_timesheet_invoice/__openerp__.py b/addons/hr_timesheet_invoice/__openerp__.py index 5d5e41ecbb0..95682d00ef0 100644 --- a/addons/hr_timesheet_invoice/__openerp__.py +++ b/addons/hr_timesheet_invoice/__openerp__.py @@ -47,7 +47,6 @@ reports, etc.""", 'wizard/hr_timesheet_invoice_create_view.xml', 'wizard/hr_timesheet_invoice_create_final_view.xml', 'board_hr_timesheet_invoice.xml', - 'hr_timesheet_invoice_installer_view.xml' ], 'demo': [ 'hr_timesheet_invoice_demo.xml', diff --git a/addons/hr_timesheet_invoice/hr_timesheet_invoice_installer_view.xml b/addons/hr_timesheet_invoice/hr_timesheet_invoice_installer_view.xml deleted file mode 100644 index 22d12db6ec8..00000000000 --- a/addons/hr_timesheet_invoice/hr_timesheet_invoice_installer_view.xml +++ /dev/null @@ -1,42 +0,0 @@ - - - - - - - - product.product.tree - product.product - tree - - - - - - - - - - - - - Configure Your Services - ir.actions.act_window - product.product - form - tree,form - [('type','=','service')] - - - - - - - - 3 - normal - skip - - - - \ No newline at end of file From 2d28fb862b94def06b04eff780aec938ce9c0a8b Mon Sep 17 00:00:00 2001 From: "Mayur Maheshwari (OpenERP)" Date: Wed, 27 Jul 2011 11:20:35 +0530 Subject: [PATCH 02/13] [IMP]all:rename features done bzr revid: mma@tinyerp.com-20110727055035-a8t2sxyuqcpjtsci --- addons/crm/crm_installer.py | 10 +++++----- addons/hr/installer.py | 2 +- addons/sale/sale_installer.py | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/addons/crm/crm_installer.py b/addons/crm/crm_installer.py index 1ca212d0525..e8d3a22f2b0 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."), - '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."), + 'crm_caldav': fields.boolean('Calendar Synchronizing', help="Helps you to synchronize the meetings with other calendar clients and mobiles."), + 'sale_crm': fields.boolean('Opportunity to Quotation', help="Create a Quotation from an Opportunity ."), + 'fetchmail': fields.boolean('Fetch Emails', help="Allows you to receive E-Mails from POP/IMAP server."), + 'thunderbird': fields.boolean('Thunderbird Plug-In', 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 Plug-In', 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."), 'import_google': fields.boolean('Google Import', help="Imports contacts and events from your google account."), } diff --git a/addons/hr/installer.py b/addons/hr/installer.py index 93f920f3cb8..3916acaeb1e 100644 --- a/addons/hr/installer.py +++ b/addons/hr/installer.py @@ -24,7 +24,7 @@ class hr_installer(osv.osv_memory): _inherit = 'base.setup.installer' _columns = { # Human Resources Management - 'hr_holidays': fields.boolean('Holidays / Leaves Management', + 'hr_holidays': fields.boolean('Leaves Management', help="Tracks employee leaves, allocation requests and planning."), 'hr_expense': fields.boolean('Expenses', help="Tracks and manages employee expenses, and can " diff --git a/addons/sale/sale_installer.py b/addons/sale/sale_installer.py index fa7dffc9d6d..dcac79270b2 100644 --- a/addons/sale/sale_installer.py +++ b/addons/sale/sale_installer.py @@ -29,12 +29,12 @@ class sale_installer(osv.osv_memory): help="Allows you to compute delivery costs on your quotations."), 'sale_journal': fields.boolean('Invoicing journals', help="Allows you to group and invoice your delivery orders according to different invoicing types: daily, weekly, etc."), - 'sale_layout': fields.boolean('Sales Order Layout Improvement', + 'sale_layout': fields.boolean('Sales Orders Print Layout', help="Provides some features to improve the layout of the Sales Order reports."), 'sale_margin': fields.boolean('Margins in Sales Orders', help="Gives the margin of profitability by calculating " "the difference between Unit Price and Cost Price."), - 'sale_order_dates': fields.boolean('Sales Order Dates', + 'sale_order_dates': fields.boolean('Full Dates on Sales Orders', help="Adds commitment, requested and effective dates on Sales Orders."), } From dd02c9fdb5a13a455ad862674588b7c0bf10f418 Mon Sep 17 00:00:00 2001 From: "Mayur Maheshwari (OpenERP)" Date: Wed, 27 Jul 2011 12:30:32 +0530 Subject: [PATCH 03/13] [IMP]crm:remove sapce as per suggestion bzr revid: mma@tinyerp.com-20110727070032-08ovpw83tm09txo9 --- addons/crm/crm_installer.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/crm/crm_installer.py b/addons/crm/crm_installer.py index e8d3a22f2b0..595cfbc2382 100644 --- a/addons/crm/crm_installer.py +++ b/addons/crm/crm_installer.py @@ -31,7 +31,7 @@ class crm_installer(osv.osv_memory): '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."), - 'sale_crm': fields.boolean('Opportunity to Quotation', help="Create a Quotation from an Opportunity ."), + 'sale_crm': fields.boolean('Opportunity to Quotation', help="Create a Quotation from an Opportunity."), 'fetchmail': fields.boolean('Fetch Emails', help="Allows you to receive E-Mails from POP/IMAP server."), 'thunderbird': fields.boolean('Thunderbird Plug-In', 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 Plug-In', 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."), From a79f1c67bd0f0a6941018b9be209c111cdf95cdb Mon Sep 17 00:00:00 2001 From: "Mayur Maheshwari (OpenERP)" Date: Wed, 27 Jul 2011 14:38:02 +0530 Subject: [PATCH 04/13] [IMP]hr_expense:Improvement is done as per suggestion bzr revid: mma@tinyerp.com-20110727090802-eskarem75xfwyf1k --- addons/hr_expense/hr_expense_installer_view.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/addons/hr_expense/hr_expense_installer_view.xml b/addons/hr_expense/hr_expense_installer_view.xml index ec466f37dd2..f93493e94fe 100644 --- a/addons/hr_expense/hr_expense_installer_view.xml +++ b/addons/hr_expense/hr_expense_installer_view.xml @@ -7,7 +7,7 @@ tree - + @@ -23,6 +23,7 @@ form tree,form + [('hr_expense_ok','=',True)] From fd361f326e1762662130ef86c651bcd48596e269 Mon Sep 17 00:00:00 2001 From: "Rucha (Open ERP)" Date: Wed, 27 Jul 2011 15:19:53 +0530 Subject: [PATCH 05/13] [IMP]: hr_expense: Minor Improvement in demo bzr revid: rpa@tinyerp.com-20110727094953-l0zx1c3o231xqn1r --- addons/hr_expense/hr_expense_demo.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/addons/hr_expense/hr_expense_demo.xml b/addons/hr_expense/hr_expense_demo.xml index 49afbd8523c..ea19a396b3e 100644 --- a/addons/hr_expense/hr_expense_demo.xml +++ b/addons/hr_expense/hr_expense_demo.xml @@ -27,13 +27,13 @@ - 0.30 - 0.30 + 0.32 + 0.32 consu - Car Travel - CAR + Travel Expenses + TRA From f2d03121ab3cc6b7df09f582505820d4cb511652 Mon Sep 17 00:00:00 2001 From: "Atik Agewan (OpenERP)" Date: Wed, 27 Jul 2011 15:33:12 +0530 Subject: [PATCH 06/13] [IMP] Assosiation: When Assosiation install -project_gtd and hr_expense fields are shown only one time bzr revid: aag@tinyerp.com-20110727100312-ls17y3s9oyxm5lgl --- addons/association/profile_association.py | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/addons/association/profile_association.py b/addons/association/profile_association.py index 8a528177a30..605601da739 100644 --- a/addons/association/profile_association.py +++ b/addons/association/profile_association.py @@ -18,7 +18,7 @@ # along with this program. If not, see . # ############################################################################## - +from lxml import etree from osv import fields, osv class profile_association_config_install_modules_wizard(osv.osv_memory): @@ -35,5 +35,24 @@ class profile_association_config_install_modules_wizard(osv.osv_memory): "to keep track of business knowledge and share it with " "and between your employees."), } + + def fields_view_get(self, cr, user, view_id=None, view_type='form', context=None, toolbar=False, submenu=False): + res = super(profile_association_config_install_modules_wizard, self).fields_view_get(cr, user, view_id, view_type, context, toolbar=toolbar, submenu=submenu) + doc = etree.XML(res['arch']) + nodes_gtd = doc.xpath("//field[@name='project_gtd']") + nodes_exp = doc.xpath("//field[@name='hr_expense']") + count_gtd = 0.0 + count_exp = 0.0 + for node in nodes_gtd: + count_gtd = count_gtd + 1 + if count_gtd > 1 : + node.set('invisible', '1') + for node in nodes_exp: + count_exp = count_exp + 1 + if count_exp > 1 : + node.set('invisible', '1') + res['arch'] = etree.tostring(doc) + return res + profile_association_config_install_modules_wizard() # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: From 0a1054f6c072c1d8b313aa4b24d7b2190a4c49e4 Mon Sep 17 00:00:00 2001 From: "Mayur Maheshwari (OpenERP)" Date: Wed, 27 Jul 2011 17:06:34 +0530 Subject: [PATCH 07/13] [IMP]product:Improvement is done bzr revid: mma@tinyerp.com-20110727113634-awvvlblz2xbbfw1d --- addons/product/product.py | 2 +- addons/product/wizard/product_installer.xml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/addons/product/product.py b/addons/product/product.py index 9deaf3398b1..8e6e132296d 100644 --- a/addons/product/product.py +++ b/addons/product/product.py @@ -266,7 +266,7 @@ class product_template(osv.osv): 'description': fields.text('Description',translate=True), 'description_purchase': fields.text('Purchase Description',translate=True), 'description_sale': fields.text('Sale Description',translate=True), - 'type': fields.selection([('product','Stockable Product'),('consu', 'Consumable'),('service','Service')], 'Product Type', required=True, help="Will change the way procurements are processed. Consumables are stockable products with infinite stock, or for use when you have no inventory management in the system."), + 'type': fields.selection([('product','Stockable Product'),('consu', 'Consumable'),('service','Service')], 'Product Type', required=True, help="Will change the way procurements are processed. Consumable are product where you don't manage stock."), 'supply_method': fields.selection([('produce','Produce'),('buy','Buy')], 'Supply method', required=True, help="Produce will generate production order or tasks, according to the product type. Buy will trigger purchase orders when requested."), 'sale_delay': fields.float('Customer Lead Time', help="This is the average delay in days between the confirmation of the customer order and the delivery of the finished products. It's the time you promise to your customers."), 'produce_delay': fields.float('Manufacturing Lead Time', help="Average delay in days to produce this product. This is only for the production order and, if it is a multi-level bill of material, it's only for the level of this product. Different lead times will be summed for all levels and purchase orders."), diff --git a/addons/product/wizard/product_installer.xml b/addons/product/wizard/product_installer.xml index aefab59dde8..c35b96caf17 100644 --- a/addons/product/wizard/product_installer.xml +++ b/addons/product/wizard/product_installer.xml @@ -7,8 +7,8 @@ ir.actions.act_window product.product form - form - + tree,form + Create a product form for everything you buy or sell. Specify a supplier if the product can be purchased. From 7a2c4c59a7ac481618b411f9e5c65ca82483c0b3 Mon Sep 17 00:00:00 2001 From: "Mayur Maheshwari (OpenERP)" Date: Wed, 27 Jul 2011 17:48:34 +0530 Subject: [PATCH 08/13] [IMP]base_setup: Label Name Improved in terminology bzr revid: mma@tinyerp.com-20110727121834-o57c5bs8v7a4yhn9 --- addons/base_setup/installer.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/base_setup/installer.py b/addons/base_setup/installer.py index 381164e69d0..16bf6cf5555 100644 --- a/addons/base_setup/installer.py +++ b/addons/base_setup/installer.py @@ -262,7 +262,7 @@ class specify_partner_terminology(osv.osv_memory): ('Guest','Guest'), ('Tenant','Tenant') ], - 'Choose how to call a customer', required=True ), + 'Customer / Partner / Patient ?', required=True ), } _defaults={ 'partner' :'Partner', From e96061b31a287854f985cc9b9bfccae9f0a75199 Mon Sep 17 00:00:00 2001 From: "Atik Agewan (OpenERP)" Date: Wed, 27 Jul 2011 18:55:17 +0530 Subject: [PATCH 09/13] [IMP] Assosiation: Optimize code of field_view_get bzr revid: aag@tinyerp.com-20110727132517-j32ctm6550zn7f4w --- addons/association/profile_association.py | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) diff --git a/addons/association/profile_association.py b/addons/association/profile_association.py index 605601da739..9f2f03f2db6 100644 --- a/addons/association/profile_association.py +++ b/addons/association/profile_association.py @@ -21,6 +21,7 @@ from lxml import etree from osv import fields, osv + class profile_association_config_install_modules_wizard(osv.osv_memory): _inherit = 'base.setup.installer' @@ -39,18 +40,12 @@ class profile_association_config_install_modules_wizard(osv.osv_memory): def fields_view_get(self, cr, user, view_id=None, view_type='form', context=None, toolbar=False, submenu=False): res = super(profile_association_config_install_modules_wizard, self).fields_view_get(cr, user, view_id, view_type, context, toolbar=toolbar, submenu=submenu) doc = etree.XML(res['arch']) - nodes_gtd = doc.xpath("//field[@name='project_gtd']") - nodes_exp = doc.xpath("//field[@name='hr_expense']") - count_gtd = 0.0 - count_exp = 0.0 - for node in nodes_gtd: - count_gtd = count_gtd + 1 - if count_gtd > 1 : - node.set('invisible', '1') - for node in nodes_exp: - count_exp = count_exp + 1 - if count_exp > 1 : - node.set('invisible', '1') + for module in ['project_gtd','hr_expense']: + count = 0 + for node in doc.xpath("//field[@name='%s']" % (module)): + count = count + 1 + if count > 1: + node.set('invisible', '1') res['arch'] = etree.tostring(doc) return res From 0703b995ad81c23182af26085dfa870114075072 Mon Sep 17 00:00:00 2001 From: "Atik Agewan (OpenERP)" Date: Wed, 27 Jul 2011 19:00:25 +0530 Subject: [PATCH 10/13] [IMP] Assosiation: Optimize code of field_view_get bzr revid: aag@tinyerp.com-20110727133025-st0dbcof70x3eip0 --- addons/association/profile_association.py | 1 - 1 file changed, 1 deletion(-) diff --git a/addons/association/profile_association.py b/addons/association/profile_association.py index 9f2f03f2db6..a25b82f8de1 100644 --- a/addons/association/profile_association.py +++ b/addons/association/profile_association.py @@ -21,7 +21,6 @@ from lxml import etree from osv import fields, osv - class profile_association_config_install_modules_wizard(osv.osv_memory): _inherit = 'base.setup.installer' From 1addfdc3258e21b42d76f7207974eee54ad19dc7 Mon Sep 17 00:00:00 2001 From: "Mayur Maheshwari (OpenERP)" Date: Thu, 28 Jul 2011 17:45:48 +0530 Subject: [PATCH 11/13] [IMP]base_setup: Improvement is done bzr revid: mma@tinyerp.com-20110728121548-lfbq6gx7m7bkqx0h --- addons/base_setup/base_setup_installer.xml | 2 +- addons/base_setup/installer.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/base_setup/base_setup_installer.xml b/addons/base_setup/base_setup_installer.xml index e8168a69ea9..f418a47ad93 100644 --- a/addons/base_setup/base_setup_installer.xml +++ b/addons/base_setup/base_setup_installer.xml @@ -268,7 +268,7 @@ - Specify Your Terminology + Customer / Partner / Patient ? ir.actions.act_window specify.partner.terminology form diff --git a/addons/base_setup/installer.py b/addons/base_setup/installer.py index 16bf6cf5555..fed316eb39e 100644 --- a/addons/base_setup/installer.py +++ b/addons/base_setup/installer.py @@ -262,7 +262,7 @@ class specify_partner_terminology(osv.osv_memory): ('Guest','Guest'), ('Tenant','Tenant') ], - 'Customer / Partner / Patient ?', required=True ), + 'Choose how to call a Customer', required=True ), } _defaults={ 'partner' :'Partner', From 3dc62dcb6f86c9e3ddfb503df53d72bd479e6704 Mon Sep 17 00:00:00 2001 From: "Mayur Maheshwari (OpenERP)" Date: Fri, 29 Jul 2011 16:18:00 +0530 Subject: [PATCH 12/13] [IMP]base_setup:Improvement is done in the proper branch bzr revid: mma@tinyerp.com-20110729104800-8cy1r1u7c5vjviam --- 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 f418a47ad93..722f7a6de45 100644 --- a/addons/base_setup/base_setup_installer.xml +++ b/addons/base_setup/base_setup_installer.xml @@ -132,13 +132,13 @@ - Import or create customers + Import or Create Customers ir.actions.act_window res.partner form tree,form - Create some customers, suppliers and their contacts manually or import a CSV spreadsheet by clicking on the import link + Create some Customers, Suppliers and their contacts manually from this form or you can import your existing partners by CSV spreadsheet from "Import Data" wizard From 916f440f4a541d9c692b1717c37bb17fa6460539 Mon Sep 17 00:00:00 2001 From: "Mayur Maheshwari (OpenERP)" Date: Thu, 4 Aug 2011 15:57:23 +0530 Subject: [PATCH 13/13] [IMP]hr_expense,hr_recruitment:added data in hr_expenses bzr revid: mma@tinyerp.com-20110804102723-4l6gtnv8ux2sy235 --- addons/hr_expense/hr_expense_data.xml | 12 ++++++++++++ addons/hr_expense/hr_expense_demo.xml | 12 ------------ addons/hr_recruitment/hr_recruitment_view.xml | 2 +- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/addons/hr_expense/hr_expense_data.xml b/addons/hr_expense/hr_expense_data.xml index 33a7ec7604c..9660dbb2543 100644 --- a/addons/hr_expense/hr_expense_data.xml +++ b/addons/hr_expense/hr_expense_data.xml @@ -8,6 +8,18 @@ Expenses + + + 0.32 + 0.32 + + + consu + Travel Expenses + TRA + + + \ No newline at end of file diff --git a/addons/hr_expense/hr_expense_demo.xml b/addons/hr_expense/hr_expense_demo.xml index ea19a396b3e..80c9cd66694 100644 --- a/addons/hr_expense/hr_expense_demo.xml +++ b/addons/hr_expense/hr_expense_demo.xml @@ -26,18 +26,6 @@ - - 0.32 - 0.32 - - - consu - Travel Expenses - TRA - - - - diff --git a/addons/hr_recruitment/hr_recruitment_view.xml b/addons/hr_recruitment/hr_recruitment_view.xml index 0e98ea03030..125d61979e9 100644 --- a/addons/hr_recruitment/hr_recruitment_view.xml +++ b/addons/hr_recruitment/hr_recruitment_view.xml @@ -314,7 +314,7 @@ - +