From 294319e71b2fd36d55ef81e39685811105933951 Mon Sep 17 00:00:00 2001
From: Nabin Hait <nabinhait@gmail.com>
Date: Sat, 2 Feb 2019 12:39:15 +0530
Subject: [PATCH 1/2] fix: Don't force fetch cost center from company in
 payroll entry

---
 erpnext/hr/doctype/payroll_entry/payroll_entry.js   | 2 ++
 erpnext/hr/doctype/payroll_entry/payroll_entry.json | 5 +++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/erpnext/hr/doctype/payroll_entry/payroll_entry.js b/erpnext/hr/doctype/payroll_entry/payroll_entry.js
index fa1b63cee8d..e4ab68068c4 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 a898f8896b9..07e743433c7 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", 

From 38b05a129672f139a2158e1caf3cf7d61e05d871 Mon Sep 17 00:00:00 2001
From: Nabin Hait <nabinhait@gmail.com>
Date: Tue, 5 Feb 2019 10:46:41 +0530
Subject: [PATCH 2/2] fix: Set default cost center in payroll entry

---
 erpnext/hr/doctype/payroll_entry/payroll_entry.json    | 3 ++-
 erpnext/hr/doctype/payroll_entry/test_payroll_entry.py | 2 ++
 2 files changed, 4 insertions(+), 1 deletion(-)

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"]):