CalvinBackup/erpnext
1
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-02-16 11:13:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: resolve conflict

Browse Source
This commit is contained in:
Khushi Rawat
2025-10-14 17:25:48 +05:30
committed by GitHub
parent 38efd5cb0b
commit dccc561eec
1 changed files with 0 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
erpnext/accounts/doctype/sales_invoice/sales_invoice.js
View File

@@ -797,10 +797,7 @@ frappe.ui.form.on("Sales Invoice", {
is_group: 0, is_group: 0,
}, },
}; };
<<<<<<< HEAD
}; };
=======
});
frm.set_query("sales_person", "sales_team", function () { frm.set_query("sales_person", "sales_team", function () {
return { return {
@@ -810,7 +807,6 @@ frappe.ui.form.on("Sales Invoice", {
}, },
}; };
}); });
>>>>>>> 2fcd406b18 (fix: filter sales team to show only active individual salespersons)
}, },
onload: function (frm) { onload: function (frm) {
frm.redemption_conversion_factor = null; frm.redemption_conversion_factor = null;