Merge branch 'develop' into whitelist-query

This commit is contained in:
Marica 2020-07-07 14:29:24 +05:30 committed by GitHub
commit 8dbdf0902f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -113,6 +113,14 @@ cur_frm.cscript.calculate_total_amount = function(doc,cdt,cdn){
cur_frm.cscript.calculate_total(doc,cdt,cdn); cur_frm.cscript.calculate_total(doc,cdt,cdn);
}; };
cur_frm.fields_dict['cost_center'].get_query = function(doc) {
return {
filters: {
"company": doc.company
}
}
};
erpnext.expense_claim = { erpnext.expense_claim = {
set_title: function(frm) { set_title: function(frm) {
if (!frm.doc.task) { if (!frm.doc.task) {