Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #20097 from deepeshgarg007/travis_fix_develop

Browse Source 
fix: Travis
This commit is contained in:
Deepesh Garg 2019-12-26 21:51:01 +05:30 committed by GitHub
commit 5c6f7369bc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
erpnext/hr/doctype/leave_application/test_leave_application.py
View File

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

5
erpnext/patches/v12_0/set_against_blanket_order_in_sales_and_purchase_order.py
View File

@ -1,7 +1,10 @@
import frappe import frappe
def execute(): 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']: for doctype in ['Sales Order Item', 'Purchase Order Item']:
frappe.reload_doctype(doctype)
frappe.db.sql(""" frappe.db.sql("""
UPDATE `tab{0}` UPDATE `tab{0}`
SET against_blanket_order = 1 SET against_blanket_order = 1

8
erpnext/selling/doctype/sales_order_item/sales_order_item.json
View File

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