Merge pull request #20097 from deepeshgarg007/travis_fix_develop

fix: Travis

erpnext/hr/doctype/leave_application/test_leave_application.py

@@ -235,8 +235,8 @@ class TestLeaveApplication(unittest.TestCase):
 			frappe.get_doc(dict(
 				doctype = 'Holiday List',
 				holiday_list_name = holiday_list,
-				from_date = date(date.today().year, 1, 1),
-				to_date = date(date.today().year, 12, 31),
+				from_date = add_months(today, -6),
+				to_date = add_months(today, 6),
 				holidays = [
 					dict(holiday_date = today, description = 'Test')
 				]
@@ -597,8 +597,8 @@ def get_leave_period():
 		return frappe.get_doc(dict(
 				name = 'Test Leave Period',
 				doctype = 'Leave Period',
-				from_date = "{0}-12-01".format(now_datetime().year - 1),
-				to_date = "{0}-12-31".format(now_datetime().year),
+				from_date = add_months(nowdate(), -6),
+				to_date = add_months(nowdate(), 6),
 				company = "_Test Company",
 				is_active = 1
 			)).insert()

erpnext/patches/v12_0/set_against_blanket_order_in_sales_and_purchase_order.py

@@ -1,7 +1,10 @@
 import frappe
 def execute():
+
+	frappe.reload_doc('selling', 'doctype', frappe.scrub('Sales Order Item'))
+	frappe.reload_doc('buying', 'doctype', frappe.scrub('Purchase Order Item'))
+
 	for doctype in ['Sales Order Item', 'Purchase Order Item']:
-		frappe.reload_doctype(doctype)
 		frappe.db.sql("""
 			UPDATE `tab{0}`
 			SET against_blanket_order = 1

erpnext/selling/doctype/sales_order_item/sales_order_item.json

@@ -757,11 +757,17 @@
    "fieldname": "additional_notes",
    "fieldtype": "Text",
    "label": "Additional Notes"
+  },
+  {
+   "default": "0",
+   "fieldname": "against_blanket_order",
+   "fieldtype": "Check",
+   "label": "Against Blanket Order"
   }
  ],
  "idx": 1,
  "istable": 1,
- "modified": "2019-12-11 18:06:26.238169",
+ "modified": "2019-12-12 18:06:26.238169",
  "modified_by": "Administrator",
  "module": "Selling",
  "name": "Sales Order Item",