commit 5797565dd0e3d64984faf6e952dc9f11d9c67fbd
author Prateeksha Singh <pratu16x7@gmail.com> Thu Aug 30 16:15:27 2018 +0530
committer Prateeksha Singh <pratu16x7@gmail.com> Thu Aug 30 16:15:27 2018 +0530
tree 1bbc1206324cd1144a3c0207959f133283bb5a15
parent ff52e93e694b4dfa3c5aa3d9aa2dda4c6729051a
parent e3f855498fb845eeafba54223b8db9d1ee2471a8

Merge with upstream

erpnext/patches.txt

diff --git a/erpnext/patches.txt b/erpnext/patches.txt
index 6738598..8e02e42 100644
--- a/erpnext/patches.txt
+++ b/erpnext/patches.txt
@@ -559,4 +559,6 @@
 erpnext.patches.v10_0.update_address_template_for_india
 execute:frappe.delete_doc("Page", "hub")
 erpnext.patches.v11_0.reset_publish_in_hub_for_all_items
-erpnext.patches.v11_0.update_hub_url
\ No newline at end of file
+erpnext.patches.v11_0.update_hub_url
+erpnext.patches.v10_0.set_discount_amount
+erpnext.patches.v10_0.recalculate_gross_margin_for_project