Merge branch 'master' of github.com:webnotes/erpnext
diff --git a/patches/patch.py b/patches/patch.py
index b8f5b03..7de1cb0 100644
--- a/patches/patch.py
+++ b/patches/patch.py
@@ -1,6 +1,6 @@
# REMEMBER to update this
# ========================
-last_patch = 295
+last_patch = 296
#-------------------------------------------
@@ -1176,3 +1176,5 @@
elif patch_no == 295:
sql("update `tabDocField` set options = 'Delivered\nNot Delivered\nPartly Delivered\nClosed\nNot Applicable' where parent = 'Sales Order' and fieldname = 'delivery_status'")
sql("update `tabDocField` set options = 'Billed\nNot Billed\nPartly Billed\nClosed' where parent = 'Sales Order' and fieldname = 'billing_status'")
+ elif patch_no == 296:
+ reload_doc('maintenance', 'doctype', 'support_ticket')