nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-08-20 17:59:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: don't reset rates when activity type is cleared

Browse Source
This commit is contained in:
Raffael Meyer
2021-10-21 15:25:02 +02:00
committed by GitHub
parent 2849297471
commit ca6eb0536c
1 changed files with 17 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
erpnext/projects/doctype/timesheet/timesheet.js
View File

@@ -283,22 +283,24 @@ frappe.ui.form.on("Timesheet Detail", {
calculate_time_and_amount(frm);
},
activity_type: function(frm, cdt, cdn) {
frappe.call({
method: "erpnext.projects.doctype.timesheet.timesheet.get_activity_cost",
args: {
employee: frm.doc.employee,
activity_type: frm.selected_doc.activity_type,
currency: frm.doc.currency
},
callback: function(r){
if(r.message){
frappe.model.set_value(cdt, cdn, 'billing_rate', r.message['billing_rate']);
frappe.model.set_value(cdt, cdn, 'costing_rate', r.message['costing_rate']);
calculate_billing_costing_amount(frm, cdt, cdn);
activity_type: function (frm, cdt, cdn) {
if (locals[cdt][cdn].activity_type) {
frappe.call({
method: "erpnext.projects.doctype.timesheet.timesheet.get_activity_cost",
args: {
employee: frm.doc.employee,
activity_type: frm.selected_doc.activity_type,
currency: frm.doc.currency
},
callback: function (r){
if(r.message){
frappe.model.set_value(cdt, cdn, "billing_rate", r.message["billing_rate"]);
frappe.model.set_value(cdt, cdn, "costing_rate", r.message["costing_rate"]);
calculate_billing_costing_amount(frm, cdt, cdn);
}
}
}
});
});
}
}
});