nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-24 23:49:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: resolve conflicts

Browse Source
This commit is contained in:
Deepesh Garg
2022-05-03 12:21:06 +05:30
committed by GitHub
parent 0df96e1084
commit 366cd6171c
1 changed files with 2 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js
View File

@@ -38,10 +38,7 @@ erpnext.accounts.PaymentReconciliationController = frappe.ui.form.Controller.ext
] ]
}; };
}); });
<<<<<<< HEAD
},
=======
this.frm.set_query("cost_center", () => { this.frm.set_query("cost_center", () => {
return { return {
"filters": { "filters": {
@@ -50,8 +47,7 @@ erpnext.accounts.PaymentReconciliationController = frappe.ui.form.Controller.ext
} }
} }
}); });
} },
>>>>>>> ab94b73e93 (fix: Cost center filter on payment reconciliation)
refresh: function() { refresh: function() {
this.frm.disable_save(); this.frm.disable_save();