From ee5f9c7b8099db1d3742ba890bf0c02a68f61afd Mon Sep 17 00:00:00 2001 From: Jamsheer Date: Mon, 30 Jul 2018 12:42:06 +0530 Subject: [PATCH] Healthcare Invoice - Practitioner Specific Service Item --- erpnext/healthcare/utils.py | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/erpnext/healthcare/utils.py b/erpnext/healthcare/utils.py index b9667214d97..3580003646a 100644 --- a/erpnext/healthcare/utils.py +++ b/erpnext/healthcare/utils.py @@ -152,9 +152,13 @@ def get_healthcare_services_to_invoice(patient): def service_item_and_practitioner_charge(doc): is_ip = doc_is_ip(doc) if is_ip: - service_item = get_healthcare_service_item("inpatient_visit_charge_item") + service_item = get_practitioner_service_item(doc.practitioner, "inpatient_visit_charge_item") + if not service_item: + service_item = get_healthcare_service_item("inpatient_visit_charge_item") else: - service_item = get_healthcare_service_item("op_consulting_charge_item") + service_item = get_practitioner_service_item(doc.practitioner, "op_consulting_charge_item") + if not service_item: + service_item = get_healthcare_service_item("op_consulting_charge_item") if not service_item: throw_config_service_item(is_ip) @@ -182,6 +186,9 @@ def throw_config_practitioner_charge(is_ip, practitioner): + """ {0}""".format(practitioner)) frappe.throw(msg) +def get_practitioner_service_item(practitioner, service_item_field): + return frappe.db.get_value("Healthcare Practitioner", practitioner, service_item_field) + def get_healthcare_service_item(service_item_field): return frappe.db.get_value("Healthcare Settings", None, service_item_field)