Merge branch 'version-14' into version-14-hotfix

earthians · Nov 28, 2023 · 969b679 · 969b679
2 parents 8ab8b14 + 92176d5
commit 969b679
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 10 deletions.
diff --git a/healthcare/__init__.py b/healthcare/__init__.py
@@ -1 +1 @@
-__version__ = "14.0.0"
+__version__ = "14.0.2"
diff --git a/healthcare/healthcare/doctype/patient_appointment/patient_appointment.js b/healthcare/healthcare/doctype/patient_appointment/patient_appointment.js
@@ -953,17 +953,12 @@ let make_payment = function (frm, automate_invoicing) {
 			title: "Enter Payment Details",
 			fields: fields,
 			primary_action_label: "Create Invoice",
-			primary_action: async function(values) {
-				if (frm.is_dirty()) {
-					await frm.save();
-				}
+			primary_action(values) {
+				frm.set_value("mode_of_payment", values.mode_of_payment)
+				frm.save();
 				frappe.call({
 					method: "healthcare.healthcare.doctype.patient_appointment.patient_appointment.invoice_appointment",
-					args: {
-						"appointment_name": frm.doc.name,
-						"discount_percentage": values.discount_percentage,
-						"discount_amount": values.discount_amount
-					},
+					args: { "appointment_name": frm.doc.name },
 					callback: async function (data) {
 						if (!data.exc) {
 							await frm.reload_doc();