From bac90d6afda5c92b74f17bcfe4f1e50731a9dc5f Mon Sep 17 00:00:00 2001 From: Yannick Tivisse Date: Tue, 4 Dec 2018 13:56:17 +0100 Subject: [PATCH 01/13] [IMP] l10n_be_hr_payroll: Add dependency to l10n_be --- addons/l10n_be_hr_payroll/__manifest__.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/l10n_be_hr_payroll/__manifest__.py b/addons/l10n_be_hr_payroll/__manifest__.py index 676717cca55..f6cd23958e2 100644 --- a/addons/l10n_be_hr_payroll/__manifest__.py +++ b/addons/l10n_be_hr_payroll/__manifest__.py @@ -3,8 +3,8 @@ { 'name': 'Belgium - Payroll', - 'category': 'Human Resources', - 'depends': ['hr_payroll'], + 'category': 'Payroll Localization', + 'depends': ['hr_payroll', 'l10n_be'], 'description': """ Belgian Payroll Rules. ====================== From 19b6129e902d8f1a95cdbc11c69081cbac60c0e8 Mon Sep 17 00:00:00 2001 From: Yannick Tivisse Date: Tue, 4 Dec 2018 13:57:05 +0100 Subject: [PATCH 02/13] [IMP] l10n_in_hr_payroll: Add dependency to l10n_in --- addons/l10n_in_hr_payroll/__manifest__.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/l10n_in_hr_payroll/__manifest__.py b/addons/l10n_in_hr_payroll/__manifest__.py index f69663a9f42..f2775273033 100644 --- a/addons/l10n_in_hr_payroll/__manifest__.py +++ b/addons/l10n_in_hr_payroll/__manifest__.py @@ -3,8 +3,8 @@ { 'name': 'Indian Payroll', - 'category': 'Human Resources', - 'depends': ['hr_payroll'], + 'category': 'Payroll Localization', + 'depends': ['hr_payroll', 'l10n_in'], 'description': """ Indian Payroll Salary Rules. ============================ From c45bb4abda70303bb4be1d9fae696adb609b9f22 Mon Sep 17 00:00:00 2001 From: Yannick Tivisse Date: Tue, 4 Dec 2018 13:57:58 +0100 Subject: [PATCH 03/13] [IMP] l10n_br_hr_payroll_account: Remove useless dependency --- addons/l10n_be_hr_payroll_account/__manifest__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/l10n_be_hr_payroll_account/__manifest__.py b/addons/l10n_be_hr_payroll_account/__manifest__.py index d260de535e1..9bacfa4504d 100644 --- a/addons/l10n_be_hr_payroll_account/__manifest__.py +++ b/addons/l10n_be_hr_payroll_account/__manifest__.py @@ -4,7 +4,7 @@ { 'name': 'Belgium - Payroll with Accounting', 'category': 'Human Resources', - 'depends': ['l10n_be_hr_payroll', 'hr_payroll_account', 'l10n_be'], + 'depends': ['l10n_be_hr_payroll', 'hr_payroll_account'], 'description': """ Accounting Data for Belgian Payroll Rules. ========================================== From 82d4a9a88556dfb3d58e6cd441a9b597fb8933e0 Mon Sep 17 00:00:00 2001 From: Yannick Tivisse Date: Tue, 4 Dec 2018 13:59:14 +0100 Subject: [PATCH 04/13] [IMP] hr_payroll: Install the correct module when enabling accounting Closes #29207 --- addons/hr_payroll/models/res_config_settings.py | 2 +- addons/hr_payroll/views/res_config_settings_views.xml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/addons/hr_payroll/models/res_config_settings.py b/addons/hr_payroll/models/res_config_settings.py index 7653675c378..f02a9830d5b 100644 --- a/addons/hr_payroll/models/res_config_settings.py +++ b/addons/hr_payroll/models/res_config_settings.py @@ -7,7 +7,7 @@ from odoo import fields, models class ResConfigSettings(models.TransientModel): _inherit = 'res.config.settings' - module_account_accountant = fields.Boolean(string='Account Accountant') module_l10n_fr_hr_payroll = fields.Boolean(string='French Payroll') module_l10n_be_hr_payroll = fields.Boolean(string='Belgium Payroll') module_l10n_in_hr_payroll = fields.Boolean(string='Indian Payroll') + module_hr_payroll_account = fields.Boolean(string='Payroll with Accounting') diff --git a/addons/hr_payroll/views/res_config_settings_views.xml b/addons/hr_payroll/views/res_config_settings_views.xml index 42d5e608d05..9c43bdecedf 100644 --- a/addons/hr_payroll/views/res_config_settings_views.xml +++ b/addons/hr_payroll/views/res_config_settings_views.xml @@ -37,10 +37,10 @@
- +
-