diff --git a/addons/hr/res_config.py b/addons/hr/res_config.py
index 4f794c55a83..5f92f2db5a6 100644
--- a/addons/hr/res_config.py
+++ b/addons/hr/res_config.py
@@ -20,27 +20,24 @@
##############################################################################
from osv import fields, osv
-from lxml import etree
-class human_resources_configuration(osv.osv_memory):
+class hr_config_settings(osv.osv_memory):
_name = 'hr.config.settings'
_inherit = 'res.config.settings'
_columns = {
- 'module_hr_timesheet_sheet': fields.boolean('Manage Timesheet and Attendances',
- help ="""It installs the hr_timesheet_sheet module."""),
+ 'module_hr_timesheet_sheet': fields.boolean('Manage Timesheets and Attendances',
+ help ="""This installs the module hr_timesheet_sheet."""),
'module_hr_holidays': fields.boolean('Manage Holidays',
- help ="""It installs the hr_holidays module."""),
+ help ="""This installs the module hr_holidays."""),
'module_hr_expense': fields.boolean('Manage Employees Expenses',
- help ="""It installs the hr_expense module."""),
+ help ="""This installs the module hr_expense."""),
'module_hr_recruitment': fields.boolean('Manage Recruitment Process',
- help ="""It installs the hr_payroll module."""),
+ help ="""This installs the module hr_recruitment."""),
'module_hr_contract': fields.boolean('Manage Employees Contracts',
- help ="""It installs the hr_contract module."""),
+ help ="""This installs the module hr_contract."""),
'module_hr_evaluation': fields.boolean('Manage Appraisals Process',
- help ="""It installs the hr_evaluation module."""),
- }
-
-human_resources_configuration()
+ help ="""This installs the module hr_evaluation."""),
+ }
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/hr/res_config_view.xml b/addons/hr/res_config_view.xml
index ee90372f22d..4dc13bb9dab 100644
--- a/addons/hr/res_config_view.xml
+++ b/addons/hr/res_config_view.xml
@@ -5,7 +5,7 @@
Payroll
ir.module.module
kanban,tree,form
- [('shortdesc','ilike','Payroll'),('state','=','uninstalled'),('name','!=','hr_payroll_account')]
+ [('state','=','uninstalled'), ('name','ilike','payroll'), ('name','!=','hr_payroll_account')]
@@ -15,23 +15,38 @@
-
hr settings for evaluations
hr.config.settings
@@ -24,13 +23,11 @@
-
-
-
-
+
-
+
diff --git a/addons/hr_expense/hr_expense_installer_view.xml b/addons/hr_expense/hr_expense_installer_view.xml
index b5d0a11251e..779071cba3f 100644
--- a/addons/hr_expense/hr_expense_installer_view.xml
+++ b/addons/hr_expense/hr_expense_installer_view.xml
@@ -34,7 +34,6 @@
-
hr settings for expenses
hr.config.settings
@@ -42,13 +41,11 @@
-
-
-
-
+
-
-
+
+
diff --git a/addons/hr_holidays/hr_holidays_view.xml b/addons/hr_holidays/hr_holidays_view.xml
index e11caf8eb0c..109123bc9a5 100644
--- a/addons/hr_holidays/hr_holidays_view.xml
+++ b/addons/hr_holidays/hr_holidays_view.xml
@@ -491,7 +491,6 @@
-
hr settings for holidays
hr.config.settings
@@ -499,13 +498,11 @@
-
-
diff --git a/addons/hr_payroll/res_config.py b/addons/hr_payroll/res_config.py
index b1523e460b1..23ae902148b 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',
- help ="""It installs the hr_payroll_account module."""),
- }
+ 'module_hr_payroll_account': fields.boolean('Manage Account Payroll',
+ help ="""This installs the module hr_payroll_account."""),
+ }
diff --git a/addons/hr_payroll/res_config_view.xml b/addons/hr_payroll/res_config_view.xml
index e380622943d..f2d5886865d 100644
--- a/addons/hr_payroll/res_config_view.xml
+++ b/addons/hr_payroll/res_config_view.xml
@@ -7,12 +7,10 @@
form
-
-
-
-
-
-
+
+
+
+
diff --git a/addons/hr_recruitment/res_config.py b/addons/hr_recruitment/res_config.py
index b4ade57e383..2afec802689 100644
--- a/addons/hr_recruitment/res_config.py
+++ b/addons/hr_recruitment/res_config.py
@@ -26,10 +26,13 @@ class hr_applicant_settings(osv.osv_memory):
_inherit = ['hr.config.settings', 'fetchmail.config.settings']
_columns = {
- 'fetchmail_applicants': fields.boolean('Create Applicants from an email account',
- fetchmail_model='hr.applicant', fetchmail_name='Incoming Application',
- help ="""It allow to create applicant from an email account."""),
-
+ 'module_document_ftp': fields.boolean('Index & Track Documents',
+ help="""Manage your CV's and motivation letter related to all applicants.
+ This installs the module document_ftp."""),
+ 'fetchmail_applicants': fields.boolean('Create Applicants from an 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."""),
'applicants_server': fields.char('Server', size=256),
'applicants_port': fields.integer('Port'),
'applicants_type': fields.selection([
@@ -41,7 +44,6 @@ class hr_applicant_settings(osv.osv_memory):
help="Connections are encrypted with SSL/TLS through a dedicated port (default: IMAPS=993, POP=995)"),
'applicants_user': fields.char('Username', size=256),
'applicants_password': fields.char('Password', size=1024),
-
}
_defaults = {
diff --git a/addons/hr_recruitment/res_config_view.xml b/addons/hr_recruitment/res_config_view.xml
index 2d0c2e01728..cb4a03b3b49 100644
--- a/addons/hr_recruitment/res_config_view.xml
+++ b/addons/hr_recruitment/res_config_view.xml
@@ -1,33 +1,30 @@
-
hr settings for recruitment
hr.config.settings
form
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
diff --git a/addons/hr_timesheet_sheet/res_config.py b/addons/hr_timesheet_sheet/res_config.py
index 8b7b411636f..d7df5950200 100644
--- a/addons/hr_timesheet_sheet/res_config.py
+++ b/addons/hr_timesheet_sheet/res_config.py
@@ -20,30 +20,29 @@
##############################################################################
from osv import osv, fields
-import pooler
-class hr_timeshee_settings(osv.osv_memory):
+
+class hr_timesheet_settings(osv.osv_memory):
_inherit = 'hr.config.settings'
_columns = {
- 'timesheet_range': fields.selection(
- [('day','Day'),('week','Week'),('month','Month')], 'Timesheet range',
- help="Periodicity on which you validate your timesheets."),
- 'timesheet_max_difference': fields.float('Timesheet allowed difference(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."),
+ 'timesheet_range': fields.selection([('day','Day'),('week','Week'),('month','Month')],
+ 'Timesheet Range', help="Periodicity on which you validate your timesheets."),
+ 'timesheet_max_difference': fields.float('Timesheet Allowed Difference (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."""),
}
-
- def default_get(self, cr, uid, fields, context=None):
- res = super(hr_timeshee_settings, self).default_get(cr, uid, fields, context)
- user = self.pool.get('res.users').browse(cr, uid, uid, context=context)
- res['timesheet_range']=user.company_id.timesheet_range
- res['timesheet_max_difference']=user.company_id.timesheet_max_difference
- return res
- def set_timesheet_defaults(self, cr, uid, ids, context=None):
- wizard = self.browse(cr, uid, ids)[0]
- tm_range = wizard.timesheet_range
- tm_diff = wizard.timesheet_max_difference
+ def get_default_timesheet(self, cr, uid, fields, context=None):
+ user = self.pool.get('res.users').browse(cr, uid, uid, context=context)
+ return {
+ 'timesheet_range': user.company_id.timesheet_range,
+ 'timesheet_max_difference': user.company_id.timesheet_max_difference,
+ }
+
+ def set_default_timesheet(self, cr, uid, ids, context=None):
+ config = self.browse(cr, uid, ids[0], context)
user = self.pool.get('res.users').browse(cr, uid, uid, context)
- user.company_id.write({'timesheet_range': tm_range,'timesheet_max_difference': tm_diff})
- return {}
+ user.company_id.write({
+ 'timesheet_range': config.timesheet_range,
+ 'timesheet_max_difference': config.timesheet_max_difference,
+ })
diff --git a/addons/hr_timesheet_sheet/res_config_view.xml b/addons/hr_timesheet_sheet/res_config_view.xml
index fe0cfd46024..72dd5b8d504 100644
--- a/addons/hr_timesheet_sheet/res_config_view.xml
+++ b/addons/hr_timesheet_sheet/res_config_view.xml
@@ -1,25 +1,20 @@
-
hr settings for timesheets
hr.config.settings
form
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+