From: Janusz Dobrowolski Date: Sat, 29 Aug 2015 09:42:42 +0000 (+0200) Subject: Void a Transaction: fixed GRN voiding. X-Git-Tag: v2.4.2~19^2~149 X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=commitdiff_plain;h=582e4a2443d9ed6ca67f47c05b7d92772b53b805;p=fa-stable.git Void a Transaction: fixed GRN voiding. --- diff --git a/admin/db/voiding_db.inc b/admin/db/voiding_db.inc index 70878ad4..8323c0d1 100644 --- a/admin/db/voiding_db.inc +++ b/admin/db/voiding_db.inc @@ -77,6 +77,10 @@ function void_transaction($type, $type_no, $date_, $memo_) case ST_SUPPRECEIVE : // it's a GRN if (exists_grn_on_invoices($type_no)) return _('This GRN cannot be voided because it was already invoiced.'); + if (!post_void_supp_trans($type, $type_no)) + return _('Error encountered when voiding transaction.'); + break; + case ST_SUPPINVOICE : // it's a suppler invoice case ST_SUPPCREDIT : // it's a supplier credit note case ST_SUPPAYMENT : // it's a supplier payment diff --git a/admin/void_transaction.php b/admin/void_transaction.php index af44b391..41ff2f77 100644 --- a/admin/void_transaction.php +++ b/admin/void_transaction.php @@ -73,7 +73,7 @@ function exist_transaction($type, $type_no) return false; case ST_SUPPRECEIVE : // it's a GRN - if (exists_grn_on_invoices($type_no)) + if (exists_grn($type_no)) return false; break;