From 90aaaa3c890ae59fede254399331fc06892f669e Mon Sep 17 00:00:00 2001 From: "Rucha (Open ERP)" Date: Tue, 7 Jun 2011 17:24:47 +0530 Subject: [PATCH 1/3] [IMP]: hr_holidays: Improved warning message and added proper tooltip for remaining_leaves field bzr revid: rpa@tinyerp.com-20110607115447-ktyc2dufwgzt7rmp --- addons/hr_holidays/hr_holidays.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/addons/hr_holidays/hr_holidays.py b/addons/hr_holidays/hr_holidays.py index 9ff647b0231..839c635c896 100644 --- a/addons/hr_holidays/hr_holidays.py +++ b/addons/hr_holidays/hr_holidays.py @@ -334,7 +334,7 @@ class hr_employee(osv.osv): # Find for holidays status status_ids = type_obj.search(cr, uid, [('limit', '=', False)], context=context) if len(status_ids) != 1 : - raise osv.except_osv(('warning !'),_("To use this feature, you should have only one leave type without the option 'Allow to Override Limit' set (%s Found).") % (len(status_ids))) + raise osv.except_osv(('Warning !'),_("To use this feature, you must have only one leave type without the option 'Allow to Override Limit' set. (%s Found).") % (len(status_ids))) status_id = status_ids and status_ids[0] or False if not status_id: return False @@ -349,7 +349,7 @@ class hr_employee(osv.osv): return True def _get_remaining_days(self, cr, uid, ids, name, args, context=None): - cr.execute("SELECT sum(h.number_of_days_temp) as days, h.employee_id from hr_holidays h join hr_holidays_status s on (s.id=h.holiday_status_id) where h.type='add' and h.state='validate' and s.limit=False group by h.employee_id") + cr.execute("SELECT sum(h.number_of_days_temp) as days, h.employee_id from hr_holidays h join hr_holidays_status s on (s.id=h.holiday_status_id) where h.type='add' and h.state='validate' and s.limit=False group by h.employee_id") res = cr.dictfetchall() remaining = {} for r in res: @@ -361,7 +361,7 @@ class hr_employee(osv.osv): _columns = { - 'remaining_leaves': fields.function(_get_remaining_days, method=True, string='Remaining Leaves', fnct_inv=_set_remaining_days, type="float", help='Remaining Leaves', store=True), + 'remaining_leaves': fields.function(_get_remaining_days, method=True, string='Remaining Leaves', fnct_inv=_set_remaining_days, type="float", help='Total number of legal leaves allocated to this employee, change this value to create allocation request.', store=True), } hr_employee() From d2da9b15b2cab8650582eb48fc4a82e35db5f7e4 Mon Sep 17 00:00:00 2001 From: "Rucha (Open ERP)" Date: Tue, 7 Jun 2011 17:25:53 +0530 Subject: [PATCH 2/3] [IMP]: Replaces two spaces by one in the help message * Improved action String bzr revid: rpa@tinyerp.com-20110607115553-cgd6bbrfig0yuirg --- addons/crm/crm_installer_view.xml | 4 ++-- addons/product/wizard/product_installer.xml | 4 ++-- addons/sale/sale_view.xml | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/addons/crm/crm_installer_view.xml b/addons/crm/crm_installer_view.xml index 91ccab5fc60..8f15a71ccd8 100644 --- a/addons/crm/crm_installer_view.xml +++ b/addons/crm/crm_installer_view.xml @@ -31,7 +31,7 @@ form tree,form - Define sales teams to structure your sales organization and assign users to each team. You should also define the sales stage to each team. As an example, if you use Solutions Selling techniques to track your opportunities, you can assign the following stage to the team: Territory, Qualified, Qualified Sponsors, Proposition, Negociaton, Won/Lost. + Define sales teams to structure your sales organization and assign users to each team. You should also define the sales stage to each team. As an example, if you use Solutions Selling techniques to track your opportunities, you can assign the following stage to the team: Territory, Qualified, Qualified Sponsors, Proposition, Negociaton, Won/Lost. @@ -48,7 +48,7 @@ form tree,form - Stages will allow salesmen to easily track how a specific opportunity is positioned in the sales cycle. In order to efficiently manage your sales pipeline, it's important to define conditions to go to the next step. Example: to set an opportunity as 'Qualified', you must set the "Expected Revenue" and the "Expected Closing Date." You should also have a look at the tooltip of the field "Change Probability Automatically". + Stages will allow salesmen to easily track how a specific opportunity is positioned in the sales cycle. In order to efficiently manage your sales pipeline, it's important to define conditions to go to the next step. Example: to set an opportunity as 'Qualified', you must set the "Expected Revenue" and the "Expected Closing Date." You should also have a look at the tooltip of the field "Change Probability Automatically". diff --git a/addons/product/wizard/product_installer.xml b/addons/product/wizard/product_installer.xml index d6a5c83d232..1fcc062d2b8 100644 --- a/addons/product/wizard/product_installer.xml +++ b/addons/product/wizard/product_installer.xml @@ -3,13 +3,13 @@ - Create some products + Create some Products ir.actions.act_window product.product form form - Create a product form for everything you buy or sell. Specify a supplier if the product can be purchased. + Create a product form for everything you buy or sell. Specify a supplier if the product can be purchased. diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml index d08681e8d36..7800c844bfe 100644 --- a/addons/sale/sale_view.xml +++ b/addons/sale/sale_view.xml @@ -562,7 +562,7 @@ - Set Up Your Invoicing Method + Set up your Invoicing Method ir.actions.act_window sale.config.picking_policy From ee0797a7a4075bcaa9573c3e144e03b9cebf5b0f Mon Sep 17 00:00:00 2001 From: "Rucha (Open ERP)" Date: Tue, 7 Jun 2011 17:33:21 +0530 Subject: [PATCH 3/3] [IMP]: crm: remove extra spaces in menu help bzr revid: rpa@tinyerp.com-20110607120321-lg0mn3kia3a1ew0u --- 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 8f15a71ccd8..d824a90296b 100644 --- a/addons/crm/crm_installer_view.xml +++ b/addons/crm/crm_installer_view.xml @@ -31,7 +31,7 @@ form tree,form - Define sales teams to structure your sales organization and assign users to each team. You should also define the sales stage to each team. As an example, if you use Solutions Selling techniques to track your opportunities, you can assign the following stage to the team: Territory, Qualified, Qualified Sponsors, Proposition, Negociaton, Won/Lost. + Define sales teams to structure your sales organization and assign users to each team. You should also define the sales stage to each team. As an example, if you use Solutions Selling techniques to track your opportunities, you can assign the following stage to the team: Territory, Qualified, Qualified Sponsors, Proposition, Negociaton, Won/Lost.