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

minor test fixes

Browse Source
This commit is contained in:
Nabin Hait 2018-05-29 10:58:48 +05:30
parent bd2989a541
commit 153536bf70
3 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
erpnext/healthcare/doctype/patient_appointment/patient_appointment.py
View File

@ -207,6 +207,7 @@ def invoice_appointment(appointment_doc):
sales_invoice.appointment = appointment_doc.name sales_invoice.appointment = appointment_doc.name
sales_invoice.due_date = getdate() sales_invoice.due_date = getdate()
sales_invoice.is_pos = '0' sales_invoice.is_pos = '0'
sales_invoice.company = appointment_doc.company
sales_invoice.debit_to = get_receivable_account(appointment_doc.company) sales_invoice.debit_to = get_receivable_account(appointment_doc.company)
fee_validity = get_fee_validity(appointment_doc.physician, appointment_doc.patient, appointment_doc.appointment_date) fee_validity = get_fee_validity(appointment_doc.physician, appointment_doc.patient, appointment_doc.appointment_date)

2
erpnext/projects/doctype/timesheet/test_timesheet.py
View File

@ -159,6 +159,7 @@ def make_timesheet(employee, simulate=False, billable = 0, activity_type="_Test
update_activity_type(activity_type) update_activity_type(activity_type)
timesheet = frappe.new_doc("Timesheet") timesheet = frappe.new_doc("Timesheet")
timesheet.employee = employee timesheet.employee = employee
timesheet.company = company or '_Test Company'
timesheet_detail = timesheet.append('time_logs', {}) timesheet_detail = timesheet.append('time_logs', {})
timesheet_detail.billable = billable timesheet_detail.billable = billable
timesheet_detail.activity_type = activity_type timesheet_detail.activity_type = activity_type
@ -167,7 +168,6 @@ def make_timesheet(employee, simulate=False, billable = 0, activity_type="_Test
timesheet_detail.to_time = timesheet_detail.from_time + datetime.timedelta(hours= timesheet_detail.hours) timesheet_detail.to_time = timesheet_detail.from_time + datetime.timedelta(hours= timesheet_detail.hours)
timesheet_detail.project = project timesheet_detail.project = project
timesheet_detail.task = task timesheet_detail.task = task
timesheet_detail.company = company or '_Test Company'
for data in timesheet.get('time_logs'): for data in timesheet.get('time_logs'):
if simulate: if simulate:

4
erpnext/selling/doctype/sales_order/sales_order.py
View File

@ -589,10 +589,6 @@ def make_sales_invoice(source_name, target_doc=None, ignore_permissions=False):
"Sales Team": { "Sales Team": {
"doctype": "Sales Team", "doctype": "Sales Team",
"add_if_empty": True "add_if_empty": True
},
"Payment Schedule": {
"doctype": "Payment Schedule",
"add_if_empty": True
} }
}, target_doc, postprocess, ignore_permissions=ignore_permissions) }, target_doc, postprocess, ignore_permissions=ignore_permissions)