From d27e588672fb854c21502f5c81f91b19f6119afc Mon Sep 17 00:00:00 2001 From: ruthra kumar Date: Mon, 4 Dec 2023 12:17:28 +0530 Subject: [PATCH] chore: resolve conflicts --- .../payment_reconciliation.json | 6 ------ erpnext/patches.txt | 11 ----------- 2 files changed, 17 deletions(-) diff --git a/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.json b/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.json index 19b146494c1..e8985de4e1e 100644 --- a/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.json +++ b/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.json @@ -231,11 +231,5 @@ ], "sort_field": "modified", "sort_order": "DESC", -<<<<<<< HEAD - "states": [], - "track_changes": 1 -} -======= "states": [] } ->>>>>>> 3a51a3f37e (refactor: convert payment reconciliation tool to virtual doctype) diff --git a/erpnext/patches.txt b/erpnext/patches.txt index bf3c6291c4a..94e3569abcf 100644 --- a/erpnext/patches.txt +++ b/erpnext/patches.txt @@ -344,23 +344,12 @@ 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 -<<<<<<< HEAD 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") -======= erpnext.patches.v14_0.clear_reconciliation_values_from_singles -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 ->>>>>>> f31002636b (chore: clear singles table and reconciliation related tables) # below migration patch should always run last erpnext.patches.v14_0.migrate_gl_to_payment_ledger