diff --git a/addons/hr/res_config.py b/addons/hr/res_config.py index c9e5b7a8628..4973417ec88 100644 --- a/addons/hr/res_config.py +++ b/addons/hr/res_config.py @@ -26,23 +26,23 @@ class hr_config_settings(osv.osv_memory): _inherit = 'res.config.settings' _columns = { - 'module_hr_timesheet_sheet': fields.boolean('Timesheet Validation by Manager', + 'module_hr_timesheet_sheet': fields.boolean('allow timesheets validation by managers', help ="""This installs the module hr_timesheet_sheet."""), - 'module_hr_attendance': fields.boolean('Track Attendances', + 'module_hr_attendance': fields.boolean('track attendances', help ="""This installs the module hr_attendance."""), - 'module_hr_timesheet': fields.boolean('Manage Timesheets', + 'module_hr_timesheet': fields.boolean('manage timesheets', help ="""This installs the module hr_timesheet."""), - 'module_hr_holidays': fields.boolean('Leaves & Holidays', + 'module_hr_holidays': fields.boolean('manage leaves and allocation requests', help ="""This installs the module hr_holidays."""), - 'module_hr_expense': fields.boolean('Expenses', + 'module_hr_expense': fields.boolean('manage employees expenses', help ="""This installs the module hr_expense."""), - 'module_hr_recruitment': fields.boolean('Recruitment', + 'module_hr_recruitment': fields.boolean('manage the recruitment pipe', help ="""This installs the module hr_recruitment."""), - 'module_hr_contract': fields.boolean('Employees Contracts', + 'module_hr_contract': fields.boolean('manage contract per employee', help ="""This installs the module hr_contract."""), - 'module_hr_evaluation': fields.boolean('Periodic Appraisals', + 'module_hr_evaluation': fields.boolean('manage employees periodic evaluation', help ="""This installs the module hr_evaluation."""), - 'module_hr_payroll': fields.boolean('Payroll', + 'module_hr_payroll': fields.boolean('manage payroll', help ="""This installs the module hr_payroll."""), } diff --git a/addons/hr/res_config_view.xml b/addons/hr/res_config_view.xml index 68a35653fc2..6c160b60915 100644 --- a/addons/hr/res_config_view.xml +++ b/addons/hr/res_config_view.xml @@ -40,10 +40,6 @@ diff --git a/addons/hr_payroll/res_config.py b/addons/hr_payroll/res_config.py index d1e33173f77..c39295dd925 100644 --- a/addons/hr_payroll/res_config.py +++ b/addons/hr_payroll/res_config.py @@ -24,6 +24,6 @@ from osv import osv, fields class human_resources_configuration(osv.osv_memory): _inherit = 'hr.config.settings' _columns = { - 'module_hr_payroll_account': fields.boolean('Manage Account Payroll', + 'module_hr_payroll_account': fields.boolean('link your payroll to accounting system', help ="""Create Journal Entries from Payslips"""), } diff --git a/addons/hr_recruitment/res_config.py b/addons/hr_recruitment/res_config.py index 4818d280879..bf247f303f1 100644 --- a/addons/hr_recruitment/res_config.py +++ b/addons/hr_recruitment/res_config.py @@ -26,10 +26,10 @@ class hr_applicant_settings(osv.osv_memory): _inherit = ['hr.config.settings', 'fetchmail.config.settings'] _columns = { - 'module_document_ftp': fields.boolean('Automatic Indexation of Resumes', + 'module_document_ftp': fields.boolean('allow the automatic indexation of resumes', help="""Manage your CV's and motivation letter related to all applicants. This installs the module document_ftp. This will install the knowledge management module in order to allow you to search using specific keywords through the content of all documents (PDF, .DOCx...)"""), - 'fetchmail_applicants': fields.boolean('Create Applicants from Incoming Mails', + 'fetchmail_applicants': fields.boolean('create applicants from an incoming email account', fetchmail_model='hr.applicant', fetchmail_name='Incoming HR Applications', help ="""Allow applicants to send their job application to an email address (jobs@mycompany.com), and create automatically application documents in the system."""), diff --git a/addons/hr_recruitment/res_config_view.xml b/addons/hr_recruitment/res_config_view.xml index 61ce127794a..aaee81f97bb 100644 --- a/addons/hr_recruitment/res_config_view.xml +++ b/addons/hr_recruitment/res_config_view.xml @@ -7,23 +7,18 @@ form - - - - +
+
+ +
+
+ +
+
diff --git a/addons/hr_timesheet_sheet/res_config.py b/addons/hr_timesheet_sheet/res_config.py index 24566d668da..0334cedd0f5 100644 --- a/addons/hr_timesheet_sheet/res_config.py +++ b/addons/hr_timesheet_sheet/res_config.py @@ -26,8 +26,8 @@ class hr_timesheet_settings(osv.osv_memory): _columns = { 'timesheet_range': fields.selection([('day','Day'),('week','Week'),('month','Month')], - 'Validate Timesheets Every', help="Periodicity on which you validate your timesheets."), - 'timesheet_max_difference': fields.float('Timesheet Allowed Difference (Hours)', + 'Validate timesheets every', help="Periodicity on which you validate your timesheets."), + 'timesheet_max_difference': fields.float('allow a difference of time between timesheets and attendances of (Hours)', help="""Allowed difference in hours between the sign in/out and the timesheet computation for one sheet. Set this to 0 if you do not want any control."""), }