From 70a34a7773b5ec8e1e14d455a0f82ba623f8acd3 Mon Sep 17 00:00:00 2001 From: "Julien Alardot (jual)" Date: Mon, 21 Feb 2022 18:56:30 +0000 Subject: [PATCH] [MOV]: l10n_sa l10n_sa_invoices: merge l10n_sa_invoices into l10n_sa The l10n_sa_invoices changes do not need to be in a separate module as they are always required for l10n_sa. This merges the two modules into l10n_sa closes odoo/odoo#85215 Task: task-2723443 Related: odoo/upgrade#3303 Signed-off-by: Julien Alardot (jual) Signed-off-by: Florian Gilbert --- addons/l10n_sa/__manifest__.py | 15 +++++++------- addons/l10n_sa/models/__init__.py | 1 + .../models/account_move.py | 0 .../views/report_invoice.xml | 0 .../views/view_move_form.xml | 0 addons/l10n_sa_invoice/__init__.py | 4 ---- addons/l10n_sa_invoice/__manifest__.py | 18 ----------------- addons/l10n_sa_invoice/models/__init__.py | 4 ---- addons/l10n_sa_pos/__manifest__.py | 5 ++++- odoo/addons/base/i18n/base.pot | 20 ++----------------- 10 files changed, 15 insertions(+), 52 deletions(-) rename addons/{l10n_sa_invoice => l10n_sa}/models/account_move.py (100%) rename addons/{l10n_sa_invoice => l10n_sa}/views/report_invoice.xml (100%) rename addons/{l10n_sa_invoice => l10n_sa}/views/view_move_form.xml (100%) delete mode 100644 addons/l10n_sa_invoice/__init__.py delete mode 100644 addons/l10n_sa_invoice/__manifest__.py delete mode 100644 addons/l10n_sa_invoice/models/__init__.py diff --git a/addons/l10n_sa/__manifest__.py b/addons/l10n_sa/__manifest__.py index 49ac8286bb4..8a30d6c8b92 100644 --- a/addons/l10n_sa/__manifest__.py +++ b/addons/l10n_sa/__manifest__.py @@ -3,17 +3,16 @@ { 'name': 'Saudi Arabia - Accounting', 'version': '2.0', - 'author': 'DVIT.ME', + 'author': 'Odoo S.A., DVIT.ME', 'category': 'Accounting/Localizations/Account Charts', 'description': """ -Odoo Arabic localization for most arabic countries and Saudi Arabia. - -This initially includes chart of accounts of USA translated to Arabic. - -In future this module will include some payroll rules for ME . +Odoo Arabic localization for most Saudi Arabia. """, 'website': 'http://www.dvit.me', - 'depends': ['account', 'l10n_multilang'], + 'depends': [ + 'l10n_multilang', + 'l10n_gcc_invoice', + ], 'data': [ 'data/account_data.xml', 'data/account_chart_template_data.xml', @@ -24,6 +23,8 @@ In future this module will include some payroll rules for ME . 'data/account_tax_template_data.xml', 'data/account_fiscal_position_template_data.xml', 'data/account_chart_template_configure_data.xml', + 'views/view_move_form.xml', + 'views/report_invoice.xml', ], 'demo': [ 'demo/demo_company.xml', diff --git a/addons/l10n_sa/models/__init__.py b/addons/l10n_sa/models/__init__.py index a1c9c5793ef..c653f82073c 100644 --- a/addons/l10n_sa/models/__init__.py +++ b/addons/l10n_sa/models/__init__.py @@ -1,3 +1,4 @@ # -*- encoding: utf-8 -*- # Part of Odoo. See LICENSE file for full copyright and licensing details. from . import account_chart_template +from . import account_move diff --git a/addons/l10n_sa_invoice/models/account_move.py b/addons/l10n_sa/models/account_move.py similarity index 100% rename from addons/l10n_sa_invoice/models/account_move.py rename to addons/l10n_sa/models/account_move.py diff --git a/addons/l10n_sa_invoice/views/report_invoice.xml b/addons/l10n_sa/views/report_invoice.xml similarity index 100% rename from addons/l10n_sa_invoice/views/report_invoice.xml rename to addons/l10n_sa/views/report_invoice.xml diff --git a/addons/l10n_sa_invoice/views/view_move_form.xml b/addons/l10n_sa/views/view_move_form.xml similarity index 100% rename from addons/l10n_sa_invoice/views/view_move_form.xml rename to addons/l10n_sa/views/view_move_form.xml diff --git a/addons/l10n_sa_invoice/__init__.py b/addons/l10n_sa_invoice/__init__.py deleted file mode 100644 index 8134f974fbf..00000000000 --- a/addons/l10n_sa_invoice/__init__.py +++ /dev/null @@ -1,4 +0,0 @@ -# -*- encoding: utf-8 -*- -# Part of Odoo. See LICENSE file for full copyright and licensing details. - -from . import models diff --git a/addons/l10n_sa_invoice/__manifest__.py b/addons/l10n_sa_invoice/__manifest__.py deleted file mode 100644 index 7a73534f5e9..00000000000 --- a/addons/l10n_sa_invoice/__manifest__.py +++ /dev/null @@ -1,18 +0,0 @@ -# -*- encoding: utf-8 -*- -# Part of Odoo. See LICENSE file for full copyright and licensing details. -{ - 'name': 'K.S.A - Invoice', - 'version': '1.0.0', - 'author': 'Odoo S.A.', - 'category': 'Accounting/Localizations', - 'license': 'LGPL-3', - 'description': """ - Invoices for the Kingdom of Saudi Arabia -""", - 'depends': ['l10n_sa', 'l10n_gcc_invoice'], - 'auto_install': ['l10n_sa'], - 'data': [ - 'views/view_move_form.xml', - 'views/report_invoice.xml', - ], -} diff --git a/addons/l10n_sa_invoice/models/__init__.py b/addons/l10n_sa_invoice/models/__init__.py deleted file mode 100644 index 6825e16989f..00000000000 --- a/addons/l10n_sa_invoice/models/__init__.py +++ /dev/null @@ -1,4 +0,0 @@ -# -*- encoding: utf-8 -*- -# Part of Odoo. See LICENSE file for full copyright and licensing details. - -from . import account_move diff --git a/addons/l10n_sa_pos/__manifest__.py b/addons/l10n_sa_pos/__manifest__.py index 810133d885b..8da56a115de 100644 --- a/addons/l10n_sa_pos/__manifest__.py +++ b/addons/l10n_sa_pos/__manifest__.py @@ -9,7 +9,10 @@ K.S.A. POS Localization ======================================================= """, 'license': 'LGPL-3', - 'depends': ['l10n_gcc_pos', 'l10n_sa_invoice'], + 'depends': [ + 'l10n_gcc_pos', + 'l10n_sa', + ], 'data': [ ], 'assets': { diff --git a/odoo/addons/base/i18n/base.pot b/odoo/addons/base/i18n/base.pot index 887edebbea4..9701a7860d9 100644 --- a/odoo/addons/base/i18n/base.pot +++ b/odoo/addons/base/i18n/base.pot @@ -1146,13 +1146,6 @@ msgid "" " " msgstr "" -#. module: base -#: model:ir.module.module,description:base.module_l10n_sa_invoice -msgid "" -"\n" -" Invoices for the Kingdom of Saudi Arabia\n" -msgstr "" - #. module: base #: model:ir.module.module,description:base.module_account_lock msgid "" @@ -4165,11 +4158,7 @@ msgstr "" #: model:ir.module.module,description:base.module_l10n_sa msgid "" "\n" -"Odoo Arabic localization for most arabic countries and Saudi Arabia.\n" -"\n" -"This initially includes chart of accounts of USA translated to Arabic.\n" -"\n" -"In future this module will include some payroll rules for ME .\n" +"Odoo Arabic localization for Saudi Arabia." msgstr "" #. module: base @@ -16549,7 +16538,7 @@ msgid "K FINANCIAL AND INSURANCE ACTIVITIES" msgstr "" #. module: base -#: model:ir.module.module,shortdesc:base.module_l10n_sa_invoice +#: model:ir.module.module,shortdesc:base.module_l10n_sa msgid "K.S.A - Invoice" msgstr "" @@ -23389,11 +23378,6 @@ msgstr "" msgid "Saudi Arabia" msgstr "" -#. module: base -#: model:ir.module.module,shortdesc:base.module_l10n_sa -msgid "Saudi Arabia - Accounting" -msgstr "" - #. module: base #. openerp-web #: code:addons/base/static/src/js/res_config_settings.js:0