diff --git a/erpnext/hr/doctype/payroll_entry/payroll_entry.js b/erpnext/hr/doctype/payroll_entry/payroll_entry.js index fa1b63cee8..e4ab68068c 100644 --- a/erpnext/hr/doctype/payroll_entry/payroll_entry.js +++ b/erpnext/hr/doctype/payroll_entry/payroll_entry.js @@ -95,6 +95,8 @@ frappe.ui.form.on('Payroll Entry', { }, setup: function (frm) { + frm.add_fetch('company', 'cost_center', 'cost_center'); + frm.set_query("payment_account", function () { var account_types = ["Bank", "Cash"]; return { diff --git a/erpnext/hr/doctype/payroll_entry/payroll_entry.json b/erpnext/hr/doctype/payroll_entry/payroll_entry.json index a898f8896b..07e743433c 100644 --- a/erpnext/hr/doctype/payroll_entry/payroll_entry.json +++ b/erpnext/hr/doctype/payroll_entry/payroll_entry.json @@ -1,5 +1,6 @@ { "allow_copy": 1, + "allow_events_in_timeline": 0, "allow_guest_to_view": 0, "allow_import": 0, "allow_rename": 0, @@ -861,7 +862,7 @@ "bold": 0, "collapsible": 0, "columns": 0, - "fetch_from": "company.cost_center", + "fetch_from": "", "fieldname": "cost_center", "fieldtype": "Link", "hidden": 0, @@ -1189,7 +1190,7 @@ "issingle": 0, "istable": 0, "max_attachments": 0, - "modified": "2018-08-21 16:15:45.276711", + "modified": "2019-02-02 12:37:07.846885", "modified_by": "Administrator", "module": "HR", "name": "Payroll Entry",