| commit | 38bd62d82d496c7c17aa35421c35a2b8a5c7beae | [log] [tgz] |
|---|---|---|
| author | Neil Trini Lasrado <neil@frappe.io> | Mon Jan 16 12:23:51 2017 +0530 |
| committer | GitHub <noreply@github.com> | Mon Jan 16 12:23:51 2017 +0530 |
| tree | c81a8dbb7edf95ce03ca0117d6aa6cc0d79d98b6 | |
| parent | 2a9e0f6fd895e822876f1e9a8eb21a0724bd0667 [diff] [blame] | |
| parent | 4ad121e1a43f7ac1049118414f1f77300002ffd3 [diff] [blame] |
Merge branch 'develop' into assessment
diff --git a/erpnext/patches.txt b/erpnext/patches.txt index 1221a4f..14be685 100644 --- a/erpnext/patches.txt +++ b/erpnext/patches.txt
@@ -361,4 +361,5 @@ 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 \ No newline at end of file