fix: ensure that on-hold invoices are not preselected for payment (#358) (#360)

(cherry picked from commit 0e8c4f7)

Co-authored-by: Tyler Matteson <support@agritheory.dev>

Author: github-actions[bot]

check_run/check_run/doctype/check_run/check_run.py

@@ -233,7 +233,6 @@ def _process_check_run(self, save: bool = False) -> None:
 		self.submit()
 		self.create_and_attach_positive_pay()
 		frappe.db.sql("RELEASE SAVEPOINT process_check_run")
-		frappe.publish_realtime("reload", "{}", doctype=self.doctype, docname=self.name)
 
 	def build_nacha_file(self, settings: CheckRunSettings) -> str:
 		electronic_mop = frappe.get_all(
@@ -779,7 +778,7 @@ def get_entries(doc: CheckRun | str) -> dict:
 			]
 
 		if settings and settings.pre_check_overdue_items:
-			if transaction.due_date < doc.posting_date:  # type: ignore
+			if transaction.due_date < doc.posting_date and transaction["on_hold"] == 0:  # type: ignore
 				transaction.pay = 1
 		if transaction.doctype == "Journal Entry":
 			if transaction.party_type == "Supplier":

check_run/public/js/check_run/CheckRun.vue

@@ -6,22 +6,15 @@
 				<tr>
 					<th style="text-align: left" class="col col-sm-2" id="check-run-party-filter">
 						<div class="d-flex align-items-center justify-between gap-2">
-							<span class="party-onclick party-display">
-								Party
-							</span>
-							<span class="filter-icon" style="cursor: pointer;" @click="show_party_filter = !show_party_filter">
+							<span class="party-onclick party-display"> Party </span>
+							<span class="filter-icon" style="cursor: pointer" @click="show_party_filter = !show_party_filter">
 								<svg class="icon icon-sm">
 									<use class="" href="#icon-filter"></use>
 								</svg>
 							</span>
 						</div>
 						<div class="mt-2">
-							<input
-								v-if="show_party_filter"
-								type="text"
-								class="form-control"
-								v-model="filters.party"
-							/>
+							<input v-if="show_party_filter" type="text" class="form-control" v-model="filters.party" />
 						</div>
 					</th>
 					<th class="col col-sm-2">Document</th>
@@ -32,21 +25,21 @@
 					</th>
 					<th class="col col-sm-2" style="white-space: nowrap; width: 12.49%">
 						<div class="d-flex align-items-center justify-between gap-2">
-							<span @click="update_sort('mode_of_payment')" class="flex-grow-1 check-run-sort-indicator" id="check-run-mop-sort">
+							<span
+								@click="update_sort('mode_of_payment')"
+								class="flex-grow-1 check-run-sort-indicator"
+								id="check-run-mop-sort">
 								Mode of Payment &#11021;
 							</span>
-							<span class="filter-icon" style="cursor: pointer;" @click="show_mop_filter = !show_mop_filter">
+							<span class="filter-icon" style="cursor: pointer" @click="show_mop_filter = !show_mop_filter">
 								<svg class="icon icon-sm">
 									<use href="#icon-filter"></use>
 								</svg>
 							</span>
 						</div>
 
 						<div v-if="show_mop_filter" class="mt-2">
-							<select
-								class="form-control form-select form-select-sm"
-								v-model="filters.mode_of_payment_filter"
-							>
+							<select class="form-control form-select form-select-sm" v-model="filters.mode_of_payment_filter">
 								<option value="All">All</option>
 								<option v-for="mop in modes_of_payment" :key="mop" :value="mop">
 									{{ mop === '' ? 'Not Set' : mop }}
@@ -70,18 +63,15 @@
 						style="text-align: left">
 						<div class="d-flex align-items-center justify-between gap-2">
 							<span>Pay</span>
-							<span class="filter-icon" style="cursor: pointer;" @click="show_paid_filter = !show_paid_filter">
+							<span class="filter-icon" style="cursor: pointer" @click="show_paid_filter = !show_paid_filter">
 								<svg class="icon icon-sm">
 									<use href="#icon-filter"></use>
 								</svg>
 							</span>
 						</div>
 
 						<div v-if="show_paid_filter" class="mt-2">
-							<select
-								class="form-control form-select form-select-sm"
-								v-model="filters.paid_filter"
-							>
+							<select class="form-control form-select form-select-sm" v-model="filters.paid_filter">
 								<option value="All">All</option>
 								<option value="Paid">Paid</option>
 								<option value="Unpaid">Unpaid</option>
@@ -189,35 +179,35 @@ let location = ref(window.location)
 let paymentSelects = ref({})
 
 let orderedTransactions = computed(() => {
-    let arr = Object.values(transactions);
-
-    arr = arr.filter(item => {
-        if (!partyIsInFilter(item.party)) return false;
-
-        if (filters.mode_of_payment_filter === '') {
-            if (item.mode_of_payment) return false;
-        } else if (
-            filters.mode_of_payment_filter &&
-            filters.mode_of_payment_filter !== 'All' &&
-            item.mode_of_payment !== filters.mode_of_payment_filter
-        ) {
-            return false;
-        }
-
-        if (filters.paid_filter && filters.paid_filter !== 'All') {
-            if (filters.paid_filter === 'Paid' && !item.pay) return false;
-            if (filters.paid_filter === 'Unpaid' && item.pay) return false;
-        }
-
-		return true;
-    });
-
-    return arr.sort((a, b) => {
-        if (a[filters.key] > b[filters.key]) return filters[filters.key];
-        if (a[filters.key] < b[filters.key]) return -filters[filters.key];
-        return 0;
-    });
-});
+	let arr = Object.values(transactions)
+
+	arr = arr.filter(item => {
+		if (!partyIsInFilter(item.party)) return false
+
+		if (filters.mode_of_payment_filter === '') {
+			if (item.mode_of_payment) return false
+		} else if (
+			filters.mode_of_payment_filter &&
+			filters.mode_of_payment_filter !== 'All' &&
+			item.mode_of_payment !== filters.mode_of_payment_filter
+		) {
+			return false
+		}
+
+		if (filters.paid_filter && filters.paid_filter !== 'All') {
+			if (filters.paid_filter === 'Paid' && !item.pay) return false
+			if (filters.paid_filter === 'Unpaid' && item.pay) return false
+		}
+
+		return true
+	})
+
+	return arr.sort((a, b) => {
+		if (a[filters.key] > b[filters.key]) return filters[filters.key]
+		if (a[filters.key] < b[filters.key]) return -filters[filters.key]
+		return 0
+	})
+})
 
 let modes_of_payment = computed(() => {
 	return unref(window.check_run.modes_of_payment)

check_run/tests/test_check_run.py

@@ -68,26 +68,40 @@ def test_process_check_run_on_hold_invoice_error(cr):
 	with pytest.raises(
 		frappe.exceptions.ValidationError, match=f"Purchase Invoice ACC-PINV-{year}-00020 is on hold"
 	):
-		# cr.flags.in_test = True
 		cr.process_check_run()
 
 
 @pytest.mark.order(12)
 def test_process_check_run_on_hold_invoice_auto_release(cr):
 	# Test Settings auto-release of on-hold invoices
-	cr.transactions = frappe.utils.safe_json_loads(cr.transactions)
+	crs = get_check_run_settings(cr)
+	crs.pre_check_overdue_items = True
+	crs.save()
+	cr.end_date = datetime.date(year, 12, 30)
+	cr.transactions = get_entries(cr).get("transactions")
 	for row in cr.transactions:
-		if row.get("party") == "Liu & Loewen Accountants LLP":
+		if row.get("party") == "Liu & Loewen Accountants LLP" and row.get("on_hold") == True:
+			assert not row.get("pay")  # test that on-hold invoices are not selected for payment
 			row["pay"] = True
 			row["mode_of_payment"] = "Credit Card"
-	cr.transactions = frappe.as_json(cr.transactions)
-	cr.flags.in_test = True
-	cr.save()
+		else:
+			assert row["pay"]
 
 	crs = get_check_run_settings(cr)
+	crs.pre_check_overdue_items = False
 	crs.automatically_release_on_hold_invoices = True
 	crs.save()
 
+	cr.end_date = datetime.date(year, 12, 31)
+	cr.transactions = get_entries(cr).get("transactions")
+	for row in cr.transactions:
+		if row.get("party") == "Liu & Loewen Accountants LLP" and row.get("on_hold") == True:
+			row["pay"] = True
+			row["mode_of_payment"] = "Credit Card"
+	cr.transactions = frappe.as_json(cr.transactions)
+	cr.flags.in_test = True
+	cr.save()
+
 	try:
 		cr.process_check_run()
 	except frappe.exceptions.ValidationError: