Merge branch 'develop' into fleet-moved-to-hr

This commit is contained in:
Nabin Hait
2017-01-17 11:05:39 +05:30
committed by GitHub
65 changed files with 2965 additions and 915 deletions

View File

@@ -360,6 +360,7 @@ erpnext.patches.v7_1.set_sales_person_status
erpnext.patches.v7_1.repost_stock_for_deleted_bins_for_merging_items
execute:frappe.delete_doc('Desktop Icon', {'module_name': 'Profit and Loss Statment'})
erpnext.patches.v7_2.update_website_for_variant
erpnext.patches.v7_2.update_assessment_modules
erpnext.patches.v7_2.update_doctype_status
erpnext.patches.v7_2.update_salary_slips
erpnext.patches.v7_2.delete_fleet_management_module_def
erpnext.patches.v7_2.delete_fleet_management_module_def