From 7551ba3851abc560980e6234bd8d33069c94a2ea Mon Sep 17 00:00:00 2001 From: ruthra kumar Date: Thu, 23 Nov 2023 10:39:41 +0530 Subject: [PATCH] chore: move reconciliation cleanup patch to pre-model (cherry picked from commit f258ab5e98f323303276aeca98dcc644f6611a70) # Conflicts: # erpnext/patches.txt --- erpnext/patches.txt | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/erpnext/patches.txt b/erpnext/patches.txt index 94e3569abcf..624b3d3a330 100644 --- a/erpnext/patches.txt +++ b/erpnext/patches.txt @@ -269,7 +269,15 @@ 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 +<<<<<<< HEAD erpnext.patches.v14_0.france_depreciation_warning +======= +erpnext.patches.v15_0.saudi_depreciation_warning +erpnext.patches.v15_0.delete_saudi_doctypes +erpnext.patches.v14_0.show_loan_management_deprecation_warning +erpnext.patches.v14_0.clear_reconciliation_values_from_singles +execute:frappe.rename_doc("Report", "TDS Payable Monthly", "Tax Withholding Details", force=True) +>>>>>>> f258ab5e98 (chore: move reconciliation cleanup patch to pre-model) [post_model_sync] execute:frappe.delete_doc_if_exists('Workspace', 'ERPNext Integrations Settings') @@ -347,6 +355,12 @@ erpnext.patches.v14_0.migrate_delivery_stop_lock_field erpnext.patches.v14_0.rename_daily_depreciation_to_depreciation_amount_based_on_num_days_in_month erpnext.patches.v14_0.rename_depreciation_amount_based_on_num_days_in_month_to_daily_prorata_based erpnext.patches.v14_0.add_default_for_repost_settings +<<<<<<< HEAD +======= +erpnext.patches.v15_0.rename_daily_depreciation_to_depreciation_amount_based_on_num_days_in_month +erpnext.patches.v15_0.rename_depreciation_amount_based_on_num_days_in_month_to_daily_prorata_based +erpnext.patches.v15_0.set_reserved_stock_in_bin +>>>>>>> f258ab5e98 (chore: move reconciliation cleanup patch to pre-model) erpnext.patches.v14_0.create_accounting_dimensions_in_supplier_quotation erpnext.patches.v14_0.update_zero_asset_quantity_field execute:frappe.db.set_single_value("Buying Settings", "project_update_frequency", "Each Transaction")