diff --git a/erpnext/hr/doctype/payroll_entry/payroll_entry.json b/erpnext/hr/doctype/payroll_entry/payroll_entry.json index 07e743433c7..562b999b827 100644 --- a/erpnext/hr/doctype/payroll_entry/payroll_entry.json +++ b/erpnext/hr/doctype/payroll_entry/payroll_entry.json @@ -862,6 +862,7 @@ "bold": 0, "collapsible": 0, "columns": 0, + "default": ":Company", "fetch_from": "", "fieldname": "cost_center", "fieldtype": "Link", @@ -1190,7 +1191,7 @@ "issingle": 0, "istable": 0, "max_attachments": 0, - "modified": "2019-02-02 12:37:07.846885", + "modified": "2019-02-05 10:41:08.865842", "modified_by": "Administrator", "module": "HR", "name": "Payroll Entry", diff --git a/erpnext/hr/doctype/payroll_entry/test_payroll_entry.py b/erpnext/hr/doctype/payroll_entry/test_payroll_entry.py index ada8e3d86fe..3cf13226db9 100644 --- a/erpnext/hr/doctype/payroll_entry/test_payroll_entry.py +++ b/erpnext/hr/doctype/payroll_entry/test_payroll_entry.py @@ -21,6 +21,8 @@ class TestPayrollEntry(unittest.TestCase): make_earning_salary_component(setup=True) make_deduction_salary_component(setup=True) + frappe.db.set_value("HR Settings", None, "email_salary_slip_to_employee", 0) + def test_payroll_entry(self): # pylint: disable=no-self-use company = erpnext.get_default_company() for data in frappe.get_all('Salary Component', fields = ["name"]):