commit 6a85752ead7984b92f1a140452bd883b9faa072f
author Nabin Hait <nabinhait@gmail.com> Mon Feb 20 19:31:38 2017 +0530
committer GitHub <noreply@github.com> Mon Feb 20 19:31:38 2017 +0530
tree fab62b531af1bc1df0589870371bbfdb6f61fb46
parent e17519accbecdc2dbca04681ad30328d27d70aeb
parent f8cff128b3a866cc811c2b7545b23791933f2506

Merge branch 'hotfix' into remove-joining-datep-validation

erpnext/patches.txt

diff --git a/erpnext/patches.txt b/erpnext/patches.txt
index 4c5cb7f..4887e3f 100644
--- a/erpnext/patches.txt
+++ b/erpnext/patches.txt
@@ -364,4 +364,5 @@
 erpnext.patches.v7_2.update_salary_slips
 erpnext.patches.v7_2.set_null_value_to_fields
 erpnext.patches.v7_2.update_abbr_in_salary_slips
-erpnext.patches.v7_2.move_dates_from_salary_structure_to_employee
\ No newline at end of file
+erpnext.patches.v7_2.move_dates_from_salary_structure_to_employee
+erpnext.patches.v7_2.empty_supplied_items_for_non_subcontracted