From cb64f90d7d3a9e350b74773c9841b5dad39f1afe Mon Sep 17 00:00:00 2001 From: ruthra kumar Date: Thu, 5 Sep 2024 17:22:47 +0530 Subject: [PATCH] chore: resolve conflict --- .../accounts/report/accounts_payable/accounts_payable.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/erpnext/accounts/report/accounts_payable/accounts_payable.js b/erpnext/accounts/report/accounts_payable/accounts_payable.js index ee37c1a2153..4f3ffd6b839 100644 --- a/erpnext/accounts/report/accounts_payable/accounts_payable.js +++ b/erpnext/accounts/report/accounts_payable/accounts_payable.js @@ -158,13 +158,13 @@ frappe.query_reports["Accounts Payable"] = { fieldtype: "Check", }, { -<<<<<<< HEAD fieldname: "in_party_currency", label: __("In Party Currency"), -======= + fieldtype: "Check", + }, + { fieldname: "handle_employee_advances", label: __("Handle Employee Advances"), ->>>>>>> 257e13c299 (refactor: filter to toggle employee advance scenario in AP) fieldtype: "Check", }, ],