diff --git a/propms/property_management_solution/doctype/lease/lease.js b/propms/property_management_solution/doctype/lease/lease.js
index 3fc78dd6..1004fe27 100755
--- a/propms/property_management_solution/doctype/lease/lease.js
+++ b/propms/property_management_solution/doctype/lease/lease.js
@@ -29,10 +29,6 @@ frappe.ui.form.on('Lease', {
 	refresh: function(frm) {
 		frm.trigger("custom_set_intro");
 
-		var has_generated_invoices = (frm.doc.lease_invoice_schedule || []).some(function(row) {
-			return row.invoice_number || row.sales_order_number;
-		});
-		frm.set_df_property("days_to_invoice_in_advance", "read_only", has_generated_invoices ? 1 : 0);
 
 		cur_frm.add_custom_button(__("Make Invoice Schedule"), function() {
 			make_lease_invoice_schedule(cur_frm);
@@ -204,6 +200,10 @@ var make_lease_invoice_schedule = function(frm){
 		args: {leasedoc: doc.name},
 		callback: function(){
 			cur_frm.reload_doc();
+			frappe.show_alert({
+				message: __("Completed making of invoice schedule."),
+				indicator: "green"
+			}, 5);
 		}
 	});
 };
diff --git a/propms/property_management_solution/doctype/lease/lease.py b/propms/property_management_solution/doctype/lease/lease.py
index a22dd082..c7e5ba20 100755
--- a/propms/property_management_solution/doctype/lease/lease.py
+++ b/propms/property_management_solution/doctype/lease/lease.py
@@ -290,7 +290,7 @@ def make_lease_invoice_schedule(leasedoc):
 				"invoice_number",
 				"date_to_invoice",
 			],
-			filters={"parent": lease.name, "date_to_invoice": (">", lease.end_date)},
+			filters={"parent": lease.name, "schedule_start_date": (">", lease.end_date)},
 			parent_doctype="Lease",
 		)
 		for lease_invoice_schedule in lease_invoice_schedule_list:
@@ -362,7 +362,7 @@ def make_lease_invoice_schedule(leasedoc):
 						"date_to_invoice",
 					],
 					filters={"parent": lease.name, "lease_item": item.lease_item},
-					order_by="date_to_invoice",
+					order_by="schedule_start_date asc, creation asc",
 				)
 				# frappe.msgprint(str(lease_invoice_schedule_list))
 				# Get the latest item frequency incase lease was changed.
@@ -452,11 +452,8 @@ def make_lease_invoice_schedule(leasedoc):
 						idx += 1
 						invoice_date = add_days(invoice_period_end, 1)
 					# frappe.msgprint(str(lease_invoice_schedule))
-					# If the record already exists and invoice is generated
-					if (
-						lease_invoice_schedule.invoice_number is not None
-						and lease_invoice_schedule.invoice_number != ""
-					):
+					# If the record already exists
+					if True:
 						# frappe.msgprint("Lease Invoice Schedule retained: " + lease_invoice_schedule.name
 						# 	+ " for invoice number: " + str(lease_invoice_schedule.invoice_number)
 						# 	+ " dated " + str(lease_invoice_schedule.date_to_invoice)
@@ -479,10 +476,7 @@ def make_lease_invoice_schedule(leasedoc):
 							idx,
 						)
 						idx += 1
-					# If the invoice is not created
-					else:
-						# frappe.msgprint("Deleting schedule :" + lease_invoice_schedule.name + " dated: " + str(lease_invoice_schedule.date_to_invoice) + " for " + str(lease_invoice_schedule.lease_item))
-						frappe.delete_doc("Lease Invoice Schedule", lease_invoice_schedule.name)
+
 				# frappe.msgprint("first invoice_date: " + str(invoice_date), "Lease Invoice Schedule")
 				while end_date >= invoice_date:
 					invoice_period_end = add_days(add_months(invoice_date, frequency_factor), -1)
@@ -511,8 +505,6 @@ def make_lease_invoice_schedule(leasedoc):
 					idx += 1
 					invoice_date = add_days(invoice_period_end, 1)
 
-		frappe.msgprint("Completed making of invoice schedule.")
-
 	except Exception as e:
 		frappe.msgprint("Exception error! Check app error log.")
 		app_error_log(frappe.session.user, str(e))