Merge branch 'develop' into develop

This commit is contained in:
Nabin Hait
2017-02-20 19:22:03 +05:30
committed by GitHub
182 changed files with 6910 additions and 1016 deletions

View File

@@ -371,4 +371,6 @@ erpnext.patches.v7_2.update_guardian_name_in_student_master
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
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