commit cfb68dee34c5ea1f1d37dfcb290b07576f8b0f1f
author Nabin Hait <nabinhait@gmail.com> Wed Oct 18 11:16:17 2017 +0530
committer GitHub <noreply@github.com> Wed Oct 18 11:16:17 2017 +0530
tree f71301c80744fb40498c01225c4e2861006eb371
parent e9f2b176bc71bb808b8f19f1b5a687324f0d3d92
parent 3e02d8063678e763b1528de772c4d07caff53206

Merge branch 'develop' into develop

erpnext/hr/doctype/salary_slip/salary_slip.py

diff --git a/erpnext/hr/doctype/salary_slip/salary_slip.py b/erpnext/hr/doctype/salary_slip/salary_slip.py
index f769d6f..7581624 100644
--- a/erpnext/hr/doctype/salary_slip/salary_slip.py
+++ b/erpnext/hr/doctype/salary_slip/salary_slip.py
@@ -70,6 +70,7 @@
 				'default_amount': amount,
 				'depends_on_lwp' : struct_row.depends_on_lwp,
 				'salary_component' : struct_row.salary_component,
+				'abbr' : struct_row.abbr,
 				'do_not_include_in_total' : struct_row.do_not_include_in_total
 			})
 		else: