projects
/
fa-stable.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fixes in sales reports to use debtor_trans.tax_included field instead of trans_tax_de...
[fa-stable.git]
/
sales
/
customer_delivery.php
diff --git
a/sales/customer_delivery.php
b/sales/customer_delivery.php
index 30e359193d6e25253d0ac1ed60d4084b235cb30b..df8bad06d9ebd4016d13e8f24174a1cf90420c50 100644
(file)
--- a/
sales/customer_delivery.php
+++ b/
sales/customer_delivery.php
@@
-103,7
+103,8
@@
if (isset($_GET['OrderNumber']) && $_GET['OrderNumber'] > 0) {
} elseif (isset($_GET['ModifyDelivery']) && $_GET['ModifyDelivery'] > 0) {
} elseif (isset($_GET['ModifyDelivery']) && $_GET['ModifyDelivery'] > 0) {
- $_SESSION['Items'] = new Cart(ST_CUSTDELIVERY, $_GET['ModifyDelivery']);
+ check_is_closed(ST_CUSTDELIVERY, $_GET['ModifyDelivery']);
+ $_SESSION['Items'] = new Cart(ST_CUSTDELIVERY,$_GET['ModifyDelivery']);
if ($_SESSION['Items']->count_items() == 0) {
hyperlink_params($path_to_root . "/sales/inquiry/sales_orders_view.php",
if ($_SESSION['Items']->count_items() == 0) {
hyperlink_params($path_to_root . "/sales/inquiry/sales_orders_view.php",
@@
-150,7
+151,7
@@
function check_data()
}
if (!is_date_in_fiscalyear($_POST['DispatchDate'])) {
}
if (!is_date_in_fiscalyear($_POST['DispatchDate'])) {
- display_error(_("The entered date
of delivery is not in fiscal year
."));
+ display_error(_("The entered date
is out of fiscal year or is closed for further data entry
."));
set_focus('DispatchDate');
return false;
}
set_focus('DispatchDate');
return false;
}
@@
-282,7
+283,7
@@
function check_qoh()
if (!$newdelivery)
{
$delivered = get_already_delivered($itm->stock_id, $_POST['Location'], key($dn->trans_no));
if (!$newdelivery)
{
$delivered = get_already_delivered($itm->stock_id, $_POST['Location'], key($dn->trans_no));
-
+
$qoh_abs = $qoh_abs - $delivered;
$qoh_by_date = $qoh_by_date - $delivered;
}
$qoh_abs = $qoh_abs - $delivered;
$qoh_by_date = $qoh_by_date - $delivered;
}