commit 0d66579e832cbb84da7d7c0a9ed35dbc5a0bad18
author Nabin Hait <nabinhait@gmail.com> Mon Feb 20 19:22:03 2017 +0530
committer GitHub <noreply@github.com> Mon Feb 20 19:22:03 2017 +0530
tree c4102cde4e2d76793103c5aeb54436a7a41cdb1c
parent 90818080b18c6593512b373178cd2cbbb1cb9971
parent aa968cd12e2ad3ed188ef0264180f967b37fa2eb

Merge branch 'develop' into develop

erpnext/patches.txt

diff --git a/erpnext/patches.txt b/erpnext/patches.txt
index eaa2b67..6fff4ce 100644
--- a/erpnext/patches.txt
+++ b/erpnext/patches.txt
@@ -371,4 +371,6 @@
 erpnext.patches.v7_2.update_abbr_in_salary_slips
 erpnext.patches.v7_2.rename_evaluation_criteria
 erpnext.patches.v7_2.update_party_type
-erpnext.patches.v7_2.setup_auto_close_settings
\ No newline at end of file
+erpnext.patches.v7_2.setup_auto_close_settings
+erpnext.patches.v7_2.empty_supplied_items_for_non_subcontracted
+erpnext.patches.v7_2.arrear_leave_encashment_as_salary_component