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

fix(test): test cases fixed

Browse Source
This commit is contained in:
Nabin Hait 2018-09-11 17:11:39 +05:30
parent 2236f0aef0
commit 84ddbc0ac9
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
erpnext/patches/v7_0/convert_timelogbatch_to_timesheet.py
View File

@ -6,7 +6,6 @@ def execute():
return return
from erpnext.manufacturing.doctype.work_order.work_order import add_timesheet_detail from erpnext.manufacturing.doctype.work_order.work_order import add_timesheet_detail
from erpnext.patches.v7_0.convert_timelog_to_timesheet import get_timelog_data
for tlb in frappe.get_all('Time Log Batch', fields=["*"], for tlb in frappe.get_all('Time Log Batch', fields=["*"],
filters = [["docstatus", "<", "2"]]): filters = [["docstatus", "<", "2"]]):
@ -25,6 +24,8 @@ def execute():
time_sheet.save(ignore_permissions=True) time_sheet.save(ignore_permissions=True)
def get_timesheet_data(data): def get_timesheet_data(data):
from erpnext.patches.v7_0.convert_timelog_to_timesheet import get_timelog_data
time_log = frappe.get_all('Time Log', fields=["*"], filters = {'name': data.time_log}) time_log = frappe.get_all('Time Log', fields=["*"], filters = {'name': data.time_log})
if time_log: if time_log:
return get_timelog_data(time_log[0]) return get_timelog_data(time_log[0])

2
erpnext/stock/doctype/purchase_receipt/test_purchase_receipt.py
View File

@ -383,7 +383,7 @@ class TestPurchaseReceipt(unittest.TestCase):
'location_name': 'Test Location' 'location_name': 'Test Location'
}).insert() }).insert()
set_perpetual_inventory(1, pr.company) set_perpetual_inventory(1, "_Test Company")
pr = make_purchase_receipt() pr = make_purchase_receipt()
stock_in_hand_account = get_inventory_account(pr.company, pr.get("items")[0].warehouse) stock_in_hand_account = get_inventory_account(pr.company, pr.get("items")[0].warehouse)