schuetz3/schuetz3-erpnext
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

test: fix property name

Browse Source 
(cherry picked from commit c10a22529c)

# Conflicts:
#	erpnext/healthcare/doctype/patient_appointment/patient_appointment.py
This commit is contained in:
Deepesh Garg
2021-08-22 18:05:24 +05:30
committed by Mergify
parent 8f969fbd66
commit e28f6b7d31
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -262,8 +262,12 @@ def create_sales_invoice(appointment_doc):
======= =======
sales_invoice.customer = frappe.get_value('Patient', appointment_doc.patient, 'customer') sales_invoice.customer = frappe.get_value('Patient', appointment_doc.patient, 'customer')
sales_invoice.currency = frappe.get_value('Customer', sales_invoice.customer, 'default_currency') \ sales_invoice.currency = frappe.get_value('Customer', sales_invoice.customer, 'default_currency') \
<<<<<<< HEAD
or get_company_currency(appointment_doc.currency) or get_company_currency(appointment_doc.currency)
>>>>>>> 60915e874d (test: Update test cases for currency change validation) >>>>>>> 60915e874d (test: Update test cases for currency change validation)
=======
or get_company_currency(appointment_doc.company)
>>>>>>> c10a22529c (test: fix property name)
sales_invoice.appointment = appointment_doc.name sales_invoice.appointment = appointment_doc.name
sales_invoice.due_date = getdate() sales_invoice.due_date = getdate()
sales_invoice.company = appointment_doc.company sales_invoice.company = appointment_doc.company