X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=sales%2Fcustomer_delivery.php;h=1e29859ea49905f170704b7f19967f9c62c0a4e7;hb=da7df35c61205d0b1af47d286be591b8a3194b0c;hp=41e3726b48a1a3f86b327f12fb31467ca426aa2d;hpb=0b63d898491b6577a5a5bf90e771dca0dcbbcf1f;p=fa-stable.git diff --git a/sales/customer_delivery.php b/sales/customer_delivery.php index 41e3726b..1e29859e 100644 --- a/sales/customer_delivery.php +++ b/sales/customer_delivery.php @@ -19,17 +19,16 @@ $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 ($use_date_picker) { +if (user_use_date_picker()) { $js .= get_js_date_picker(); } @@ -138,7 +137,7 @@ if (isset($_GET['OrderNumber']) && $_GET['OrderNumber'] > 0) { exit; } else { - check_edit_conflicts(); + check_edit_conflicts(get_post('cart_id')); if (!check_quantities()) { display_error(_("Selected quantity cannot be less than quantity invoiced nor more than quantity not dispatched on sales order.")); @@ -153,7 +152,7 @@ if (isset($_GET['OrderNumber']) && $_GET['OrderNumber'] > 0) { function check_data() { - global $Refs; + global $Refs, $SysPrefs; if (!isset($_POST['DispatchDate']) || !is_date($_POST['DispatchDate'])) { display_error(_("The entered date of delivery is invalid.")); @@ -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; @@ -199,6 +198,14 @@ function check_data() return false; } + copy_to_cart(); + + if (!$SysPrefs->allow_negative_stock() && ($low_stock = $_SESSION['Items']->check_qoh())) + { + display_error(_("This document cannot be processed because there is insufficient quantity for items marked.")); + return false; + } + return true; } //------------------------------------------------------------------------------ @@ -241,14 +248,14 @@ 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 = input_num('Line'.$line); @@ -266,47 +273,12 @@ function check_quantities() } } } -// ... -// else -// $_SESSION['Items']->freight_cost = input_num('ChargeFreightCost'); return $ok; } -//------------------------------------------------------------------------------ - -function check_qoh() -{ - 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']) { @@ -316,9 +288,11 @@ if (isset($_POST['process_delivery']) && check_data() && check_qoh()) { } $newdelivery = ($dn->trans_no == 0); - copy_to_cart(); - if ($newdelivery) new_doc_date($dn->document_date); + if ($newdelivery) + new_doc_date($dn->document_date); + $delivery_no = $dn->write($bo_policy); + if ($delivery_no == -1) { display_error(_("The entered reference is already in use.")); @@ -337,17 +311,17 @@ if (isset($_POST['process_delivery']) && check_data() && check_qoh()) { } } -if (isset($_POST['Update']) || isset($_POST['_Location_update']) || isset($_POST['qty'])) { +if (isset($_POST['Update']) || isset($_POST['_Location_update']) || isset($_POST['qty']) || isset($_POST['process_delivery'])) { $Ajax->activate('Items'); } //------------------------------------------------------------------------------ start_form(); hidden('cart_id'); -start_table(TABLESTYLE2, "width=80%", 5); +start_table(TABLESTYLE2, "width='80%'", 5); echo ""; // outer table -start_table(TABLESTYLE, "width=100%"); +start_table(TABLESTYLE, "width='100%'"); start_row(); label_cells(_("Customer"), $_SESSION['Items']->customer_name, "class='tableheader2'"); label_cells(_("Branch"), get_branch_name($_SESSION['Items']->Branch), "class='tableheader2'"); @@ -355,11 +329,11 @@ label_cells(_("Currency"), $_SESSION['Items']->customer_currency, "class='tableh end_row(); start_row(); -//if (!isset($_POST['ref'])) -// $_POST['ref'] = $Refs->get_next(ST_CUSTDELIVERY); - if ($_SESSION['Items']->trans_no==0) { - ref_cells(_("Reference"), 'ref', '', null, "class='tableheader2'"); + ref_cells(_("Reference"), 'ref', '', null, "class='tableheader2'", false, ST_CUSTDELIVERY, + array('customer' => $_SESSION['Items']->customer_id, + 'branch' => $_SESSION['Items']->Branch, + 'date' => get_post('DispatchDate'))); } else { label_cells(_("Reference"), $_SESSION['Items']->reference, "class='tableheader2'"); } @@ -396,13 +370,13 @@ end_table(); echo "";// outer table -start_table(TABLESTYLE, "width=90%"); +start_table(TABLESTYLE, "width='90%'"); if (!isset($_POST['due_date']) || !is_date($_POST['due_date'])) { $_POST['due_date'] = get_invoice_duedate($_SESSION['Items']->payment, $_POST['DispatchDate']); } customer_credit_row($_SESSION['Items']->customer_id, $_SESSION['Items']->credit, "class='tableheader2'"); -// 2010-09-03 Joe Hunt + $dim = get_company_pref('use_dimension'); if ($dim > 0) { start_row(); @@ -439,7 +413,7 @@ if ($row['dissallow_invoices'] == 1) } display_heading(_("Delivery Items")); div_start('Items'); -start_table(TABLESTYLE, "width=80%"); +start_table(TABLESTYLE, "width='80%'"); $new = $_SESSION['Items']->trans_no==0; $th = array(_("Item Code"), _("Item Description"), @@ -465,16 +439,22 @@ foreach ($_SESSION['Items']->line_items as $line=>$ln_itm) { // quantity input box. This allows for example a hook to modify the default quantity to what's dispatchable // (if there is not enough in hand), check at other location or other order people etc ... // This hook also returns a 'reason' (css classes) which can be used to theme the row. + // + // FIXME: hook_get_dispatchable definition does not allow qoh checks on transaction level + // (but anyway dispatch is checked again later before transaction is saved) + + $qty = $ln_itm->qty_dispatched; + if ($check = check_negative_stock($ln_itm->stock_id, $ln_itm->qty_done-$ln_itm->qty_dispatched, $_POST['Location'], $_POST['DispatchDate'])) + $qty = $check['qty']; + + $q_class = hook_get_dispatchable_quantity($ln_itm, $_POST['Location'], $_POST['DispatchDate'], $qty); - $qoh = get_qoh_on_date($ln_itm->stock_id, $_POST['Location'], $_POST['DispatchDate']); - $q_class = hook_get_dispatchable_quantity($ln_itm, $_POST['Location'], $_POST['DispatchDate'], $qoh); // Skip line if needed if($q_class === 'skip') continue; if(is_array($q_class)) { list($ln_itm->qty_dispatched, $row_classes) = $q_class; $has_marked = true; } - } alt_table_row_color($k, $row_classes); @@ -534,7 +514,7 @@ label_row(_("Amount Total"), $display_total, "colspan=$colspan align=right","ali end_table(1); if ($has_marked) { - display_note(_("Marked items have insufficient quantities in stock as on day of delivery."), 0, 1, "class='red'"); + display_note(_("Marked items have insufficient quantities in stock as on day of delivery."), 0, 1, "class='stockmankofg'"); } start_table(TABLESTYLE2); @@ -560,4 +540,3 @@ end_form(); end_page(); -?>