commit 705b7dc9c24cbf653138091a11f7b41ca50a7090
author Mangesh-Khairnar <mkhairnar10@gmail.com> Mon May 27 11:21:06 2019 +0530
committer Mangesh-Khairnar <mkhairnar10@gmail.com> Mon May 27 11:21:06 2019 +0530
tree 261aa41b194e9aa69666b9b0f575b06a1282f553
parent 71cdcb35930e37befd227fc6e0200041eb26aec1
parent 2d7993592fbb4c084e2b282865c0570fc5e69f70

Merge branch 'develop' of https://github.com/frappe/erpnext into leave-management

erpnext/patches.txt

diff --git a/erpnext/patches.txt b/erpnext/patches.txt
index a7fb7a2..31f407a 100644
--- a/erpnext/patches.txt
+++ b/erpnext/patches.txt
@@ -602,4 +602,5 @@
 erpnext.patches.v11_1.rename_depends_on_lwp
 execute:frappe.delete_doc("Report", "Inactive Items")
 erpnext.patches.v11_1.delete_scheduling_tool
-erpnext.patches.v12_0.generate_leave_ledger_entries
\ No newline at end of file
+erpnext.patches.v12_0.generate_leave_ledger_entries
+erpnext.patches.v12_0.make_custom_fields_for_bank_remittance