From 454d789232ebcdc1b508c6b14d0d7d30c721361b Mon Sep 17 00:00:00 2001 From: ruthra kumar Date: Sat, 18 Nov 2023 08:07:36 +0530 Subject: [PATCH] chore: remove reconciliation defaults from patch (cherry picked from commit b5dd0c8630c59cc38011039e7c7a21976b53ebd8) # Conflicts: # erpnext/patches.txt --- erpnext/patches.txt | 3 +++ 1 file changed, 3 insertions(+) diff --git a/erpnext/patches.txt b/erpnext/patches.txt index b8cda748509..56aca635a8f 100644 --- a/erpnext/patches.txt +++ b/erpnext/patches.txt @@ -344,10 +344,13 @@ erpnext.patches.v14_0.migrate_deferred_accounts_to_item_defaults erpnext.patches.v14_0.create_accounting_dimensions_in_sales_order_item erpnext.patches.v14_0.rename_over_order_allowance_field erpnext.patches.v14_0.migrate_delivery_stop_lock_field +<<<<<<< HEAD execute:frappe.db.set_single_value("Payment Reconciliation", "invoice_limit", 50) execute:frappe.db.set_single_value("Payment Reconciliation", "payment_limit", 50) 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 +======= +>>>>>>> b5dd0c8630 (chore: remove reconciliation defaults from patch) erpnext.patches.v14_0.add_default_for_repost_settings erpnext.patches.v14_0.create_accounting_dimensions_in_supplier_quotation erpnext.patches.v14_0.update_zero_asset_quantity_field