diff --git a/addons/hr/res_config.py b/addons/hr/res_config.py
index bdef8bb5cf8..743b485bf92 100644
--- a/addons/hr/res_config.py
+++ b/addons/hr/res_config.py
@@ -31,10 +31,6 @@ class human_resources_configuration(osv.osv_memory):
help ="""It installs the hr_timesheet_sheet module."""),
'module_hr_holidays': fields.boolean('Manage Holidays',
help ="""It installs the hr_holidays module."""),
- 'module_hr_payroll_account': fields.boolean('Manage Account Payroll',
- help ="""It installs the hr_payroll_account module."""),
- 'module_hr_payroll': fields.boolean('Manage HR Payroll',
- help ="""It installs the hr_payroll module."""),
'module_hr_expense': fields.boolean('Manage Employees Expenses',
help ="""It installs the hr_expense module."""),
'module_hr_recruitment': fields.boolean('Manage Recruitment Process',
diff --git a/addons/hr/res_config_view.xml b/addons/hr/res_config_view.xml
index a4056f302d3..a19520438e7 100644
--- a/addons/hr/res_config_view.xml
+++ b/addons/hr/res_config_view.xml
@@ -22,21 +22,17 @@
-
-
+
-
-
-
-
+
diff --git a/addons/hr_payroll/__init__.py b/addons/hr_payroll/__init__.py
index bf7fc8a67e4..b19a4f587d0 100644
--- a/addons/hr_payroll/__init__.py
+++ b/addons/hr_payroll/__init__.py
@@ -24,4 +24,6 @@ import hr_payroll
import report
import wizard
+import res_config
+
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/hr_payroll/__openerp__.py b/addons/hr_payroll/__openerp__.py
index 5469b1fb423..560bec7093c 100644
--- a/addons/hr_payroll/__openerp__.py
+++ b/addons/hr_payroll/__openerp__.py
@@ -59,6 +59,7 @@ Generic Payroll system.
'hr_payroll_data.xml',
'security/ir.model.access.csv',
'wizard/hr_payroll_contribution_register_report.xml',
+ 'res_config_view.xml',
],
'test': [
'test/payslip.yml',
diff --git a/addons/hr_payroll/res_config.py b/addons/hr_payroll/res_config.py
new file mode 100644
index 00000000000..f05c8ea580a
--- /dev/null
+++ b/addons/hr_payroll/res_config.py
@@ -0,0 +1,29 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+# OpenERP, Open Source Management Solution
+# Copyright (C) 2004-2010 Tiny SPRL ().
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as
+# published by the Free Software Foundation, either version 3 of the
+# License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program. If not, see .
+#
+##############################################################################
+
+from osv import osv, fields
+
+class human_resources_configuration(osv.osv_memory):
+ _inherit = 'human.resources.configuration'
+ _columns = {
+ 'module_hr_payroll_account': fields.boolean('Manage Account Payroll',
+ help ="""It installs the hr_payroll_account module."""),
+ }
diff --git a/addons/hr_payroll/res_config_view.xml b/addons/hr_payroll/res_config_view.xml
new file mode 100644
index 00000000000..3fe3981c581
--- /dev/null
+++ b/addons/hr_payroll/res_config_view.xml
@@ -0,0 +1,19 @@
+
+
+
+
+ Account Payroll Application
+ human.resources.configuration
+ form
+
+
+
+
+
+
+
+
+
+
+
+