nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-27 17:04:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: resolve conflict

Browse Source
This commit is contained in:
ruthra kumar
2024-09-05 17:22:47 +05:30
parent efdc2173b2
commit cb64f90d7d
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
erpnext/accounts/report/accounts_payable/accounts_payable.js
View File

@@ -158,13 +158,13 @@ frappe.query_reports["Accounts Payable"] = {
fieldtype: "Check", fieldtype: "Check",
}, },
{ {
<<<<<<< HEAD
fieldname: "in_party_currency", fieldname: "in_party_currency",
label: __("In Party Currency"), label: __("In Party Currency"),
======= fieldtype: "Check",
},
{
fieldname: "handle_employee_advances", fieldname: "handle_employee_advances",
label: __("Handle Employee Advances"), label: __("Handle Employee Advances"),
>>>>>>> 257e13c299 (refactor: filter to toggle employee advance scenario in AP)
fieldtype: "Check", fieldtype: "Check",
}, },
], ],