From d9f15e96b55b674de3e3aba96c1307fa49257760 Mon Sep 17 00:00:00 2001 From: Florian HENRY Date: Sun, 10 Sep 2023 17:18:42 +0200 Subject: [PATCH 1/5] refactor(region): Splitting of France Regional logic from ERPNext --- erpnext/patches/v14_0/france_depreciation_warning.py | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 erpnext/patches/v14_0/france_depreciation_warning.py diff --git a/erpnext/patches/v14_0/france_depreciation_warning.py b/erpnext/patches/v14_0/france_depreciation_warning.py new file mode 100644 index 00000000000..8d8719f8623 --- /dev/null +++ b/erpnext/patches/v14_0/france_depreciation_warning.py @@ -0,0 +1,12 @@ +import click +import frappe + + +def execute(): + if "erpnext_france" in frappe.get_installed_apps(): + return + click.secho( + "Feature for Feature Region will be remove in version-15 and moved to a separate app\n" + "Please install the app to continue using the regionnal France features: git@github.com:scopen-coop/erpnext_france.git", + fg="yellow", + ) From fb7ca8fca2a5a24b73435ee22b261e53d1a2c174 Mon Sep 17 00:00:00 2001 From: Florian HENRY Date: Sun, 10 Sep 2023 17:19:35 +0200 Subject: [PATCH 2/5] refactor(region): Splitting of France Regional logic from ERPNext --- erpnext/patches/v14_0/france_depreciation_warning.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/erpnext/patches/v14_0/france_depreciation_warning.py b/erpnext/patches/v14_0/france_depreciation_warning.py index 8d8719f8623..45ec07e7737 100644 --- a/erpnext/patches/v14_0/france_depreciation_warning.py +++ b/erpnext/patches/v14_0/france_depreciation_warning.py @@ -7,6 +7,6 @@ def execute(): return click.secho( "Feature for Feature Region will be remove in version-15 and moved to a separate app\n" - "Please install the app to continue using the regionnal France features: git@github.com:scopen-coop/erpnext_france.git", + "Please install the app to continue using the regionnal France features: https://github.com/scopen-coop/erpnext_france.git", fg="yellow", ) From 7de3d08ce39e4722495c49756579ea9461a92935 Mon Sep 17 00:00:00 2001 From: Florian HENRY Date: Sun, 10 Sep 2023 17:23:35 +0200 Subject: [PATCH 3/5] refactor(region): Splitting of France Regional logic from ERPNext --- erpnext/patches/v14_0/france_depreciation_warning.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/erpnext/patches/v14_0/france_depreciation_warning.py b/erpnext/patches/v14_0/france_depreciation_warning.py index 45ec07e7737..27acfd94703 100644 --- a/erpnext/patches/v14_0/france_depreciation_warning.py +++ b/erpnext/patches/v14_0/france_depreciation_warning.py @@ -6,7 +6,7 @@ def execute(): if "erpnext_france" in frappe.get_installed_apps(): return click.secho( - "Feature for Feature Region will be remove in version-15 and moved to a separate app\n" + "Feature for Region France will be remove in version-15 and moved to a separate app\n" "Please install the app to continue using the regionnal France features: https://github.com/scopen-coop/erpnext_france.git", fg="yellow", ) From 5c0a232e0fc4c6cb67fbdb4b76747fbd0878b109 Mon Sep 17 00:00:00 2001 From: Florian HENRY Date: Sun, 10 Sep 2023 17:24:01 +0200 Subject: [PATCH 4/5] refactor(region): Splitting of France Regional logic from ERPNext --- erpnext/patches/v14_0/france_depreciation_warning.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/erpnext/patches/v14_0/france_depreciation_warning.py b/erpnext/patches/v14_0/france_depreciation_warning.py index 27acfd94703..5efbc5bd7fb 100644 --- a/erpnext/patches/v14_0/france_depreciation_warning.py +++ b/erpnext/patches/v14_0/france_depreciation_warning.py @@ -6,7 +6,7 @@ def execute(): if "erpnext_france" in frappe.get_installed_apps(): return click.secho( - "Feature for Region France will be remove in version-15 and moved to a separate app\n" + "Feature for region France will be remove in version-15 and moved to a separate app\n" "Please install the app to continue using the regionnal France features: https://github.com/scopen-coop/erpnext_france.git", fg="yellow", ) From c9ba777e3cf71dd2b30bc3a5a9d22ede0cebe12a Mon Sep 17 00:00:00 2001 From: Florian HENRY Date: Mon, 25 Sep 2023 10:24:32 +0200 Subject: [PATCH 5/5] refactor(region): Splitting of France Regional logic from ERPNext --- erpnext/patches.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/erpnext/patches.txt b/erpnext/patches.txt index 19f8dab9a17..37e70967388 100644 --- a/erpnext/patches.txt +++ b/erpnext/patches.txt @@ -269,6 +269,7 @@ erpnext.patches.v13_0.show_hr_payroll_deprecation_warning erpnext.patches.v13_0.reset_corrupt_defaults erpnext.patches.v13_0.create_accounting_dimensions_for_asset_repair erpnext.patches.v14_0.update_reference_due_date_in_journal_entry +erpnext.patches.v14_0.france_depreciation_warning [post_model_sync] execute:frappe.delete_doc_if_exists('Workspace', 'ERPNext Integrations Settings') @@ -333,7 +334,7 @@ erpnext.patches.v14_0.update_company_in_ldc erpnext.patches.v14_0.set_packed_qty_in_draft_delivery_notes erpnext.patches.v14_0.cleanup_workspaces erpnext.patches.v14_0.enable_allow_existing_serial_no -erpnext.patches.v14_0.set_report_in_process_SOA +erpnext.patches.v14_0.set_report_in_process_SOA erpnext.patches.v14_0.create_accounting_dimensions_for_closing_balance erpnext.patches.v14_0.update_closing_balances #15-07-2023 execute:frappe.defaults.clear_default("fiscal_year")