projects
/
fa-stable.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merged stable branch up to 2.3.10
[fa-stable.git]
/
admin
/
void_transaction.php
diff --git
a/admin/void_transaction.php
b/admin/void_transaction.php
index 6e84a17ca48ee5625c4a68f452d8729817f46dca..474217a0c32a942cccea23ed0225b8d865884327 100644
(file)
--- a/
admin/void_transaction.php
+++ b/
admin/void_transaction.php
@@
-70,8
+70,13
@@
function exist_transaction($type, $type_no)
break;
case ST_PURCHORDER : // it's a PO
break;
case ST_PURCHORDER : // it's a PO
- case ST_SUPPRECEIVE : // it's a GRN
return false;
return false;
+
+ case ST_SUPPRECEIVE : // it's a GRN
+ if (exists_grn_on_invoices($type_no))
+ return false;
+ 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
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
@@
-116,6
+121,8
@@
function select_link($row)
{
if (!isset($row['type']))
$row['type'] = $_POST['filterType'];
{
if (!isset($row['type']))
$row['type'] = $_POST['filterType'];
+ if (!is_date_in_fiscalyear($row['trans_date'], true))
+ return _("N/A");
return button('Edit'.$row["trans_no"], _("Select"), _("Select"), ICON_EDIT);
}
return button('Edit'.$row["trans_no"], _("Select"), _("Select"), ICON_EDIT);
}
@@
-140,8
+147,7
@@
function voiding_controls()
{
global $selected_id;
{
global $selected_id;
- $not_implemented = array(ST_PURCHORDER, ST_SUPPRECEIVE, ST_SALESORDER,
- ST_SALESQUOTE, ST_COSTUPDATE);
+ $not_implemented = array(ST_PURCHORDER, ST_SALESORDER, ST_SALESQUOTE, ST_COSTUPDATE);
start_form();
start_form();