Healthcare - Invoice - Redesign

erpnext/accounts/doctype/sales_invoice/sales_invoice.js

@@ -859,6 +859,7 @@ var select_loyalty_program = function(frm, loyalty_programs) {
 	dialog.show();
 }
 
+// Healthcare
 var get_healthcare_services_to_invoice = function(frm) {
 	var me = this;
 	let selected_patient = '';
@@ -962,7 +963,8 @@ var make_list_row= function(result={}) {
 			data-dn= "${result.reference_name}" data-dt= "${result.reference_type}" data-item= "${result.service}"
 			data-rate = ${result.rate}
 			data-income-account = "${result.income_account}"
-			data-qty = ${result.qty}>
+			data-qty = ${result.qty}
+			data-description = "${result.description}">
 			</div>`).append($row);
 	return $row;
 };
@@ -970,32 +972,21 @@ var make_list_row= function(result={}) {
 var set_primary_action= function(frm, dialog, $results) {
 	var me = this;
 	dialog.set_primary_action(__('Add'), function() {
-		// TODO: Get checked items
 		let checked_values = get_checked_values($results);
 		if(checked_values.length > 0){
 			frm.set_value("patient", dialog.fields_dict.patient.input.value);
 			frm.set_value("items", []);
-			for(let i=0; i<checked_values.length; i++){
+			frappe.call({
-				var si_item = frappe.model.add_child(frm.doc, 'Sales Invoice Item', 'items');
+				doc: frm.doc,
-				if(checked_values[i]['item'] == "Consulting Charges"){
+				method: "set_healthcare_services",
-					frappe.model.set_value(si_item.doctype, si_item.name, 'item_name', checked_values[i]['item']);
+				args:{
-					frappe.model.set_value(si_item.doctype, si_item.name, 'description', checked_values[i]['item']);
+					checked_values: checked_values
-					frappe.model.set_value(si_item.doctype, si_item.name, 'rate', checked_values[i]['rate']);
+				},
-					frappe.model.set_value(si_item.doctype, si_item.name, 'income_account', checked_values[i]['income_account']);
+				callback: function() {
-					frappe.model.set_value(si_item.doctype, si_item.name, 'uom', 'Nos');
+					frm.trigger("validate");
-					frappe.model.set_value(si_item.doctype, si_item.name, 'conversion_factor', 1);
+					frm.refresh_fields();
 				}
-				else{
+			});
-					frappe.model.set_value(si_item.doctype, si_item.name, 'item_code', checked_values[i]['item']);
-				}
-				frappe.model.set_value(si_item.doctype, si_item.name, 'reference_dt', checked_values[i]['dt']);
-				frappe.model.set_value(si_item.doctype, si_item.name, 'reference_dn', checked_values[i]['dn']);
-				frappe.model.set_value(si_item.doctype, si_item.name, 'qty', 1);
-				if(checked_values[i]['qty'] > 1){
-					frappe.model.set_value(si_item.doctype, si_item.name, 'qty', parseFloat(checked_values[i]['qty']));
-				}
-			}
-			frm.refresh_fields();
 			dialog.hide();
 		}
 		else{
@@ -1011,15 +1002,30 @@ var get_checked_values= function($results) {
 			checked_values['dn'] = $(this).attr('data-dn');
 			checked_values['dt'] = $(this).attr('data-dt');
 			checked_values['item'] = $(this).attr('data-item');
-			if($(this).attr('data-rate')){
+			if($(this).attr('data-rate') != 'undefined'){
 				checked_values['rate'] = $(this).attr('data-rate');
 			}
-			if($(this).attr('data-income-account')){
+			else{
+				checked_values['rate'] = false;
+			}
+			if($(this).attr('data-income-account') != 'undefined'){
 				checked_values['income_account'] = $(this).attr('data-income-account');
 			}
-			if($(this).attr('data-qty')){
+			else{
+				checked_values['income_account'] = false;
+			}
+			if($(this).attr('data-qty') != 'undefined'){
 				checked_values['qty'] = $(this).attr('data-qty');
 			}
+			else{
+				checked_values['qty'] = false;
+			}
+			if($(this).attr('data-description') != 'undefined'){
+				checked_values['description'] = $(this).attr('data-description');
+			}
+			else{
+				checked_values['description'] = false;
+			}
 			return checked_values;
 		}
 	}).get();

erpnext/accounts/doctype/sales_invoice/sales_invoice.py

@@ -1191,6 +1191,43 @@ class SalesInvoice(SellingController):
 			from erpnext.accounts.general_ledger import make_gl_entries
 			make_gl_entries(gl_entries, cancel=(self.docstatus == 2), merge_entries=True)
 
+	# Healthcare
+	def set_healthcare_services(self, checked_values):
+		self.set("items", [])
+		from erpnext.stock.get_item_details import get_item_details
+		for checked_item in checked_values:
+			item_line = self.append("items", {})
+			price_list, price_list_currency = frappe.db.get_values("Price List", {"selling": 1}, ['name', 'currency'])[0]
+			args = {
+				'doctype': "Sales Invoice",
+				'item_code': checked_item['item'],
+				'company': self.company,
+				'customer': frappe.db.get_value("Patient", self.patient, "customer"),
+				'selling_price_list': price_list,
+				'price_list_currency': price_list_currency,
+				'plc_conversion_rate': 1.0,
+				'conversion_rate': 1.0
+			}
+			item_details = get_item_details(args)
+			item_line.item_code = checked_item['item']
+			item_line.qty = 1
+			if checked_item['qty']:
+				item_line.qty = checked_item['qty']
+			if checked_item['rate']:
+				item_line.rate = checked_item['rate']
+			else:
+				item_line.rate = item_details.price_list_rate
+			item_line.amount = float(item_line.rate) * float(item_line.qty)
+			if checked_item['income_account']:
+				item_line.income_account = checked_item['income_account']
+			if checked_item['dt']:
+				item_line.reference_dt = checked_item['dt']
+			if checked_item['dn']:
+				item_line.reference_dn = checked_item['dn']
+			if checked_item['description']:
+				item_line.description = checked_item['description']
+
+		self.set_missing_values(for_validate = True)
 
 def booked_deferred_revenue(start_date=None, end_date=None):
 	# check for the sales invoice for which GL entries has to be done

erpnext/healthcare/utils.py

@@ -57,11 +57,12 @@ def get_healthcare_services_to_invoice(patient):
 						if not skip_invoice:
 							practitioner_charge = 0
 							income_account = None
+							service_item = None
 							if patient_appointment_obj.practitioner:
-								practitioner_charge = get_practitioner_charge(patient_appointment_obj.practitioner)
+								service_item, practitioner_charge = service_item_and_practitioner_charge(patient_appointment_obj)
 								income_account = get_income_account(patient_appointment_obj.practitioner, patient_appointment_obj.company)
 							item_to_invoice.append({'reference_type': 'Patient Appointment', 'reference_name': patient_appointment_obj.name,
-							'service': 'Consulting Charges', 'rate': practitioner_charge,
+							'service': service_item, 'rate': practitioner_charge,
 							'income_account': income_account})
 
 			encounters = frappe.get_list("Patient Encounter", {'patient': patient.name, 'invoiced': False, 'docstatus': 1})
@@ -71,11 +72,13 @@ def get_healthcare_services_to_invoice(patient):
 					if not encounter_obj.appointment:
 						practitioner_charge = 0
 						income_account = None
+						service_item = None
 						if encounter_obj.practitioner:
-							practitioner_charge = get_practitioner_charge(encounter_obj.practitioner)
+							service_item, practitioner_charge = service_item_and_practitioner_charge(encounter_obj)
 							income_account = get_income_account(encounter_obj.practitioner, encounter_obj.company)
+
 						item_to_invoice.append({'reference_type': 'Patient Encounter', 'reference_name': encounter_obj.name,
-						'service': 'Consulting Charges', 'rate': practitioner_charge,
+						'service': service_item, 'rate': practitioner_charge,
 						'income_account': income_account})
 
 			lab_tests = frappe.get_list("Lab Test", {'patient': patient.name, 'invoiced': False})
@@ -83,7 +86,8 @@ def get_healthcare_services_to_invoice(patient):
 				for lab_test in lab_tests:
 					lab_test_obj = frappe.get_doc("Lab Test", lab_test['name'])
 					if frappe.db.get_value("Lab Test Template", lab_test_obj.template, "is_billable") == 1:
-						item_to_invoice.append({'reference_type': 'Lab Test', 'reference_name': lab_test_obj.name, 'service': lab_test_obj.template})
+						item_to_invoice.append({'reference_type': 'Lab Test', 'reference_name': lab_test_obj.name,
+						'service': frappe.db.get_value("Lab Test Template", lab_test_obj.template, "item")})
 
 			lab_rxs = frappe.db.sql("""select lp.name from `tabPatient Encounter` et,
 			`tabLab Prescription` lp where et.patient=%s and lp.parent=et.name and lp.test_created=0 and lp.invoiced=0""", (patient.name))
@@ -91,7 +95,8 @@ def get_healthcare_services_to_invoice(patient):
 				for lab_rx in lab_rxs:
 					rx_obj = frappe.get_doc("Lab Prescription", lab_rx[0])
 					if rx_obj.test_code and (frappe.db.get_value("Lab Test Template", rx_obj.test_code, "is_billable") == 1):
-						item_to_invoice.append({'reference_type': 'Lab Prescription', 'reference_name': rx_obj.name, 'service': rx_obj.test_code})
+						item_to_invoice.append({'reference_type': 'Lab Prescription', 'reference_name': rx_obj.name,
+						'service': frappe.db.get_value("Lab Test Template", rx_obj.test_code, "item")})
 
 			procedures = frappe.get_list("Clinical Procedure", {'patient': patient.name, 'invoiced': False})
 			if procedures:
@@ -99,7 +104,8 @@ def get_healthcare_services_to_invoice(patient):
 					procedure_obj = frappe.get_doc("Clinical Procedure", procedure['name'])
 					if not procedure_obj.appointment:
 						if procedure_obj.procedure_template and (frappe.db.get_value("Clinical Procedure Template", procedure_obj.procedure_template, "is_billable") == 1):
-							item_to_invoice.append({'reference_type': 'Clinical Procedure', 'reference_name': procedure_obj.name, 'service': procedure_obj.procedure_template})
+							item_to_invoice.append({'reference_type': 'Clinical Procedure', 'reference_name': procedure_obj.name,
+							'service': frappe.db.get_value("Clinical Procedure Template", procedure_obj.procedure_template, "item")})
 
 			procedure_rxs = frappe.db.sql("""select pp.name from `tabPatient Encounter` et,
 			`tabProcedure Prescription` pp where et.patient=%s and pp.parent=et.name and
@@ -108,16 +114,22 @@ def get_healthcare_services_to_invoice(patient):
 				for procedure_rx in procedure_rxs:
 					rx_obj = frappe.get_doc("Procedure Prescription", procedure_rx[0])
 					if frappe.db.get_value("Clinical Procedure Template", rx_obj.procedure, "is_billable") == 1:
-						item_to_invoice.append({'reference_type': 'Procedure Prescription', 'reference_name': rx_obj.name, 'service': rx_obj.procedure})
+						item_to_invoice.append({'reference_type': 'Procedure Prescription', 'reference_name': rx_obj.name,
+						'service': frappe.db.get_value("Clinical Procedure Template", rx_obj.procedure, "item")})
 
-			procedure_consumables = frappe.db.sql("""select pc.name from `tabClinical Procedure` cp,
+			procedures = frappe.get_list("Clinical Procedure",
-			`tabClinical Procedure Item` pc where cp.patient=%s and pc.parent=cp.name and
+			{'patient': patient.name, 'invoice_separately_as_consumables': True, 'consumption_invoiced': False,
-			pc.invoice_separately_as_consumables=1 and pc.invoiced=0""", (patient.name))
+			'consume_stock': True, 'status': 'Completed'})
-			if procedure_consumables:
+			if procedures:
-				for procedure_consumable in procedure_consumables:
+				service_item = get_healthcare_service_item('clinical_procedure_consumable_item')
-					procedure_consumable_obj = frappe.get_doc("Clinical Procedure Item", procedure_consumable[0])
+				if not service_item:
-					item_to_invoice.append({'reference_type': 'Clinical Procedure Item', 'reference_name': procedure_consumable_obj.name,
+					msg = _(("Please Configure {0} in ").format("Clinical Procedure Consumable Item") \
-					'service': procedure_consumable_obj.item_code, 'qty': procedure_consumable_obj.qty})
+						+ """<b><a href="#Form/Healthcare Settings">Healthcare Settings</a></b>""")
+					frappe.throw(msg)
+				for procedure in procedures:
+					procedure_obj = frappe.get_doc("Clinical Procedure", procedure['name'])
+					item_to_invoice.append({'reference_type': 'Clinical Procedure', 'reference_name': procedure_obj.name,
+					'service': service_item, 'rate': procedure_obj.consumable_total_amount, 'description': procedure_obj.consumption_details})
 
 			inpatient_services = frappe.db.sql("""select io.name, io.parent from `tabInpatient Record` ip,
 			`tabInpatient Occupancy` io where ip.patient=%s and io.parent=ip.name and
@@ -137,10 +149,56 @@ def get_healthcare_services_to_invoice(patient):
 		else:
 			frappe.throw(_("The Patient {0} do not have customer refrence to invoice").format(patient.name))
 
-def get_practitioner_charge(practitioner):
+def service_item_and_practitioner_charge(doc):
-	practitioner_charge = frappe.db.get_value("Healthcare Practitioner", practitioner, "op_consulting_charge")
+	is_ip = doc_is_ip(doc)
+	if is_ip:
+		service_item = get_healthcare_service_item("inpatient_visit_charge_item")
+	else:
+		service_item = get_healthcare_service_item("op_consulting_charge_item")
+	if not service_item:
+		throw_config_service_item(is_ip)
+
+	practitioner_charge = get_practitioner_charge(doc.practitioner, is_ip)
+	if not practitioner_charge:
+		throw_config_practitioner_charge(is_ip, doc.practitioner)
+
+	return service_item, practitioner_charge
+
+def throw_config_service_item(is_ip):
+	service_item_lable = "Out Patient Consulting Charge Item"
+	if is_ip:
+		service_item_lable = "Inpatient Visit Charge Item"
+
+	msg = _(("Please Configure {0} in ").format(service_item_lable) \
+		+ """<b><a href="#Form/Healthcare Settings">Healthcare Settings</a></b>""")
+	frappe.throw(msg)
+
+def throw_config_practitioner_charge(is_ip, practitioner):
+	charge_name = "OP Consulting Charge"
+	if is_ip:
+		charge_name = "Inpatient Visit Charge"
+
+	msg = _(("Please Configure {0} for Healthcare Practitioner").format(charge_name) \
+		+ """ <b><a href="#Form/Healthcare Practitioner/{0}">{0}</a></b>""".format(practitioner))
+	frappe.throw(msg)
+
+def get_healthcare_service_item(service_item_field):
+	return frappe.db.get_value("Healthcare Settings", None, service_item_field)
+
+def doc_is_ip(doc):
+	is_ip = False
+	if doc.inpatient_record:
+		is_ip = True
+	return is_ip
+
+def get_practitioner_charge(practitioner, is_ip):
+	if is_ip:
+		practitioner_charge = frappe.db.get_value("Healthcare Practitioner", practitioner, "inpatient_visit_charge")
+	else:
+		practitioner_charge = frappe.db.get_value("Healthcare Practitioner", practitioner, "op_consulting_charge")
 	if practitioner_charge:
 		return practitioner_charge
+	return False
 
 def manage_invoice_submit_cancel(doc, method):
 	if doc.items:
@@ -155,7 +213,14 @@ def set_invoiced(item, method, ref_invoice=None):
 		validate_invoiced_on_submit(item)
 		invoiced = True
 
-	frappe.db.set_value(item.reference_dt, item.reference_dn, "invoiced", invoiced)
+	if item.reference_dt == 'Clinical Procedure':
+		if get_healthcare_service_item('clinical_procedure_consumable_item') == item.item_code:
+			frappe.db.set_value(item.reference_dt, item.reference_dn, "consumption_invoiced", invoiced)
+		else:
+			frappe.db.set_value(item.reference_dt, item.reference_dn, "invoiced", invoiced)
+	else:
+		frappe.db.set_value(item.reference_dt, item.reference_dn, "invoiced", invoiced)
+
 	if item.reference_dt == 'Patient Appointment':
 		if frappe.db.get_value('Patient Appointment', item.reference_dn, 'procedure_template'):
 			dt_from_appointment = "Clinical Procedure"
@@ -171,7 +236,10 @@ def set_invoiced(item, method, ref_invoice=None):
 		manage_prescriptions(invoiced, item.reference_dt, item.reference_dn, "Clinical Procedure", "procedure_created")
 
 def validate_invoiced_on_submit(item):
-	is_invoiced = frappe.db.get_value(item.reference_dt, item.reference_dn, "invoiced")
+	if item.reference_dt == 'Clinical Procedure' and get_healthcare_service_item('clinical_procedure_consumable_item') == item.item_code:
+			is_invoiced = frappe.db.get_value(item.reference_dt, item.reference_dn, "consumption_invoiced")
+	else:
+		is_invoiced = frappe.db.get_value(item.reference_dt, item.reference_dn, "invoiced")
 	if is_invoiced == 1:
 		frappe.throw(_("The item referenced by {0} - {1} is already invoiced"\
 		).format(item.reference_dt, item.reference_dn))