X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=sales%2Fcustomer_delivery.php;h=1e29859ea49905f170704b7f19967f9c62c0a4e7;hb=c34e563fae8003a637a485b4eaf634678b90c60f;hp=f54bbd1cc9c19db1cd49931139ec0e5b85fd3612;hpb=5b8f4c4b4aa8cf996bc071f116bfce1273200fa2;p=fa-stable.git diff --git a/sales/customer_delivery.php b/sales/customer_delivery.php index f54bbd1c..1e29859e 100644 --- a/sales/customer_delivery.php +++ b/sales/customer_delivery.php @@ -19,14 +19,13 @@ $path_to_root = ".."; include_once($path_to_root . "/sales/includes/cart_class.inc"); include_once($path_to_root . "/includes/session.inc"); include_once($path_to_root . "/includes/data_checks.inc"); -include_once($path_to_root . "/includes/manufacturing.inc"); include_once($path_to_root . "/sales/includes/sales_db.inc"); include_once($path_to_root . "/sales/includes/sales_ui.inc"); include_once($path_to_root . "/reporting/includes/reporting.inc"); include_once($path_to_root . "/taxes/tax_calc.inc"); $js = ""; -if ($use_popup_windows) { +if ($SysPrefs->use_popup_windows) { $js .= get_js_open_window(900, 500); } if (user_use_date_picker()) { @@ -174,7 +173,7 @@ function check_data() } if ($_SESSION['Items']->trans_no==0) { - if (!$Refs->is_valid($_POST['ref'])) { + if (!$Refs->is_valid($_POST['ref'], ST_CUSTDELIVERY)) { display_error(_("You must enter a reference.")); set_focus('ref'); return false; @@ -203,7 +202,7 @@ function check_data() if (!$SysPrefs->allow_negative_stock() && ($low_stock = $_SESSION['Items']->check_qoh())) { - display_error(_("This document cannot be processed because there is insufficient quantity for: ").implode(',', $low_stock)); + display_error(_("This document cannot be processed because there is insufficient quantity for items marked.")); return false; } @@ -249,13 +248,13 @@ function check_quantities() // Update cart delivery quantities/descriptions foreach ($_SESSION['Items']->line_items as $line=>$itm) { if (isset($_POST['Line'.$line])) { - if($_SESSION['Items']->trans_no) { - $min = $itm->qty_done; - $max = $itm->quantity; - } else { - $min = 0; - $max = $itm->quantity - $itm->qty_done; - } + if($_SESSION['Items']->trans_no) { + $min = $itm->qty_done; + $max = $itm->quantity; + } else { + $min = 0; + $max = $itm->quantity - $itm->qty_done; + } if (check_num('Line'.$line, $min, $max)) { $_SESSION['Items']->line_items[$line]->qty_dispatched = @@ -274,47 +273,12 @@ function check_quantities() } } } -// ... -// else -// $_SESSION['Items']->freight_cost = input_num('ChargeFreightCost'); return $ok; } -//------------------------------------------------------------------------------ - -if (isset($_POST['process_delivery']) && check_data()) -{ - global $SysPrefs; - $dn = &$_SESSION['Items']; - $newdelivery = ($dn->trans_no==0); - if (!$SysPrefs->allow_negative_stock()) { - foreach ($_SESSION['Items']->line_items as $itm) { - - if ($itm->qty_dispatched && has_stock_holding($itm->mb_flag)) { - $qoh_by_date = get_qoh_on_date($itm->stock_id, $_POST['Location'], $_POST['DispatchDate']); - $qoh_abs = get_qoh_on_date($itm->stock_id, $_POST['Location'], null); - //If editing current delivery delivered qty should be added - 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 = ($qoh_by_date < $qoh_abs ? $qoh_by_date : $qoh_abs); - if ($itm->qty_dispatched > $qoh) { - display_error(_("The delivery cannot be processed because there is an insufficient quantity for item:") . - " " . $itm->stock_id . " - " . $itm->item_description); - return false; - } - } - } - } - return true; -} //------------------------------------------------------------------------------ -if (isset($_POST['process_delivery']) && check_data() && check_qoh()) { +if (isset($_POST['process_delivery']) && check_data()) { $dn = &$_SESSION['Items']; if ($_POST['bo_policy']) { @@ -354,10 +318,10 @@ if (isset($_POST['Update']) || isset($_POST['_Location_update']) || isset($_POST start_form(); hidden('cart_id'); -start_table(TABLESTYLE2, "width=80%", 5); +start_table(TABLESTYLE2, "width='80%'", 5); echo "