From e28f6b7d312e9a06346700a9f9627a21c06d64d9 Mon Sep 17 00:00:00 2001 From: Deepesh Garg Date: Sun, 22 Aug 2021 18:05:24 +0530 Subject: [PATCH] test: fix property name (cherry picked from commit c10a22529c8b612ca31d2221700e45184426753d) # Conflicts: # erpnext/healthcare/doctype/patient_appointment/patient_appointment.py --- .../doctype/patient_appointment/patient_appointment.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py b/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py index 131767797db..713e5b3501e 100755 --- a/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +++ b/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py @@ -262,8 +262,12 @@ def create_sales_invoice(appointment_doc): ======= sales_invoice.customer = frappe.get_value('Patient', appointment_doc.patient, 'customer') sales_invoice.currency = frappe.get_value('Customer', sales_invoice.customer, 'default_currency') \ +<<<<<<< HEAD or get_company_currency(appointment_doc.currency) >>>>>>> 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.due_date = getdate() sales_invoice.company = appointment_doc.company