mirror of
https://github.com/frappe/erpnext.git
synced 2026-02-14 10:13:57 +00:00
fix: filter sales team to show only active individual salespersons
(cherry picked from commit 2fcd406b18)
# Conflicts:
# erpnext/accounts/doctype/sales_invoice/sales_invoice.js
This commit is contained in:
@@ -797,7 +797,20 @@ frappe.ui.form.on("Sales Invoice", {
|
||||
is_group: 0,
|
||||
},
|
||||
};
|
||||
<<<<<<< HEAD
|
||||
};
|
||||
=======
|
||||
});
|
||||
|
||||
frm.set_query("sales_person", "sales_team", function () {
|
||||
return {
|
||||
filters: {
|
||||
is_group: 0,
|
||||
enabled: 1,
|
||||
},
|
||||
};
|
||||
});
|
||||
>>>>>>> 2fcd406b18 (fix: filter sales team to show only active individual salespersons)
|
||||
},
|
||||
onload: function (frm) {
|
||||
frm.redemption_conversion_factor = null;
|
||||
|
||||
@@ -44,6 +44,15 @@ frappe.ui.form.on("Sales Order", {
|
||||
};
|
||||
});
|
||||
|
||||
frm.set_query("sales_person", "sales_team", function () {
|
||||
return {
|
||||
filters: {
|
||||
is_group: 0,
|
||||
enabled: 1,
|
||||
},
|
||||
};
|
||||
});
|
||||
|
||||
frm.set_df_property("packed_items", "cannot_add_rows", true);
|
||||
frm.set_df_property("packed_items", "cannot_delete_rows", true);
|
||||
},
|
||||
|
||||
Reference in New Issue
Block a user