projects
/
fa-stable.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Items: fixed item tax type selector to exclude inactive item tax types.
[fa-stable.git]
/
admin
/
void_transaction.php
diff --git
a/admin/void_transaction.php
b/admin/void_transaction.php
index 6e84a17ca48ee5625c4a68f452d8729817f46dca..3016e88d9bf2643dfffe35eaa487ac10109be939 100644
(file)
--- a/
admin/void_transaction.php
+++ b/
admin/void_transaction.php
@@
-21,9
+21,9
@@
include_once($path_to_root . "/admin/db/transactions_db.inc");
include_once($path_to_root . "/admin/db/voiding_db.inc");
$js = "";
include_once($path_to_root . "/admin/db/voiding_db.inc");
$js = "";
-if (
$use_date_picker
)
+if (
user_use_date_picker()
)
$js .= get_js_date_picker();
$js .= get_js_date_picker();
-if ($use_popup_windows)
+if ($
SysPrefs->
use_popup_windows)
$js .= get_js_open_window(800, 500);
page(_($help_context = "Void a Transaction"), false, false, "", $js);
$js .= get_js_open_window(800, 500);
page(_($help_context = "Void a Transaction"), false, false, "", $js);
@@
-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($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
@@
-99,7
+104,6
@@
function exist_transaction($type, $type_no)
return false;
case ST_COSTUPDATE : // it's a stock cost update
return false;
return false;
case ST_COSTUPDATE : // it's a stock cost update
return false;
- break;
}
return true;
}
return true;
@@
-116,6
+120,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
+146,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();
@@
-167,7
+172,7
@@
function voiding_controls()
end_table(1);
$trans_ref = false;
end_table(1);
$trans_ref = false;
- $sql = get_sql_for_view_transactions(
$_POST['filterType'], $_POST['FromTransNo'], $_POST['ToTransNo']
, $trans_ref);
+ $sql = get_sql_for_view_transactions(
get_post('filterType'), get_post('FromTransNo'), get_post('ToTransNo')
, $trans_ref);
if ($sql == "")
return;
if ($sql == "")
return;
@@
-235,7
+240,7
@@
function check_valid_entries()
{
display_error(_("The selected transaction was closed for edition and cannot be voided."));
set_focus('trans_no');
{
display_error(_("The selected transaction was closed for edition and cannot be voided."));
set_focus('trans_no');
- return;
+ return
false
;
}
if (!is_date($_POST['date_']))
{
}
if (!is_date($_POST['date_']))
{
@@
-245,7
+250,7
@@
function check_valid_entries()
}
if (!is_date_in_fiscalyear($_POST['date_']))
{
}
if (!is_date_in_fiscalyear($_POST['date_']))
{
- display_error(_("The entered date is
not in fiscal year
."));
+ display_error(_("The entered date is
out of fiscal year or is closed for further data entry
."));
set_focus('date_');
return false;
}
set_focus('date_');
return false;
}
@@
-277,10
+282,10
@@
function handle_void_transaction()
return;
}
return;
}
- $
ret
= void_transaction($_POST['filterType'], $_POST['trans_no'],
+ $
msg
= void_transaction($_POST['filterType'], $_POST['trans_no'],
$_POST['date_'], $_POST['memo_']);
$_POST['date_'], $_POST['memo_']);
- if (
$ret
)
+ if (
!$msg
)
{
display_notification_centered(_("Selected transaction has been voided."));
unset($_POST['trans_no']);
{
display_notification_centered(_("Selected transaction has been voided."));
unset($_POST['trans_no']);
@@
-288,7
+293,7
@@
function handle_void_transaction()
unset($_POST['date_']);
}
else {
unset($_POST['date_']);
}
else {
- display_error(
_("The entered transaction does not exist or cannot be voided.")
);
+ display_error(
$msg
);
set_focus('trans_no');
}
set_focus('trans_no');
}
@@
-329,4
+334,3
@@
voiding_controls();
end_page();
end_page();
-?>
\ No newline at end of file