X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=sales%2Fcustomer_delivery.php;h=1c5753411caece180bfd161ab09d04ebb643a9f4;hb=c587e204ffa7c53378bc385c9609ccc3e60ec6cf;hp=c7e051e1bab3c43962a3c1ae33e8df3dc1e0979a;hpb=14aa0635fd12ae41e1ddb1d74dc59e48d3b1dc44;p=fa-stable.git diff --git a/sales/customer_delivery.php b/sales/customer_delivery.php index c7e051e1..1c575341 100644 --- a/sales/customer_delivery.php +++ b/sales/customer_delivery.php @@ -95,6 +95,9 @@ if (isset($_GET['OrderNumber']) && $_GET['OrderNumber'] > 0) { die ("
" . _("This order has no items. There is nothing to delivery.") . ""); } + // Adjust Shipping Charge based upon previous deliveries TAM + adjust_shipping_charge($ord, $_GET['OrderNumber']); + $_SESSION['Items'] = $ord; copy_from_cart(); @@ -103,7 +106,7 @@ if (isset($_GET['OrderNumber']) && $_GET['OrderNumber'] > 0) { $_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", + hyperlink_params($path_to_root . "/sales/inquiry/customer_inquiry.php", _("Select a different delivery"), "OutstandingOnly=1"); echo "
" . _("This delivery has all items invoiced. There is nothing to modify.") . "
"; @@ -138,7 +141,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.")); @@ -164,12 +167,6 @@ function check_data() set_focus('ref'); return false; } - - if ($_SESSION['Items']->trans_no==0 && !is_new_reference($_POST['ref'], ST_CUSTDELIVERY)) { - display_error(_("The entered reference is already in use.")); - set_focus('ref'); - return false; - } } if ($_POST['ChargeFreightCost'] == "") { $_POST['ChargeFreightCost'] = price_format(0); @@ -190,6 +187,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: ").implode(',', $low_stock)); + return false; + } + return true; } //------------------------------------------------------------------------------ @@ -239,7 +244,7 @@ function check_quantities() $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); @@ -264,41 +269,8 @@ function check_quantities() } //------------------------------------------------------------------------------ -function check_qoh() +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()) { - $dn = &$_SESSION['Items']; if ($_POST['bo_policy']) { @@ -308,29 +280,38 @@ 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); - processing_end(); - if ($newdelivery) { - meta_forward($_SERVER['PHP_SELF'], "AddedID=$delivery_no"); - } else { - meta_forward($_SERVER['PHP_SELF'], "UpdatedID=$delivery_no"); + if ($delivery_no == -1) + { + display_error(_("The entered reference is already in use.")); + set_focus('ref'); + } + else + { + processing_end(); + if ($newdelivery) { + meta_forward($_SERVER['PHP_SELF'], "AddedID=$delivery_no"); + } else { + meta_forward($_SERVER['PHP_SELF'], "UpdatedID=$delivery_no"); + } } } -if (isset($_POST['Update']) || isset($_POST['_Location_update'])) { +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'"); @@ -379,7 +360,7 @@ 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']); @@ -422,7 +403,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"), @@ -437,24 +418,36 @@ foreach ($_SESSION['Items']->line_items as $line=>$ln_itm) { if ($ln_itm->quantity==$ln_itm->qty_done) { continue; //this line is fully delivered } - // if it's a non-stock item (eg. service) don't show qoh - $show_qoh = true; - if ($SysPrefs->allow_negative_stock() || !has_stock_holding($ln_itm->mb_flag) || - $ln_itm->qty_dispatched == 0) { - $show_qoh = false; + if(isset($_POST['_Location_update']) || isset($_POST['clear_quantity']) || isset($_POST['reset_quantity'])) { + // reset quantity + $ln_itm->qty_dispatched = $ln_itm->quantity-$ln_itm->qty_done; } - - if ($show_qoh) { - $qoh = get_qoh_on_date($ln_itm->stock_id, $_POST['Location'], $_POST['DispatchDate']); + // if it's a non-stock item (eg. service) don't show qoh + $row_classes = null; + if (has_stock_holding($ln_itm->mb_flag) && $ln_itm->qty_dispatched) { + // It's a stock : call get_dispatchable_quantity hook to get which quantity to preset in the + // 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); + + // 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; + } } - if ($show_qoh && ($ln_itm->qty_dispatched > $qoh)) { - // oops, we don't have enough of one of the component items - start_row("class='stockmankobg'"); - $has_marked = true; - } else { - alt_table_row_color($k); - } + alt_table_row_color($k, $row_classes); view_stock_status_cell($ln_itm->stock_id); if ($ln_itm->descr_editable) @@ -467,6 +460,10 @@ foreach ($_SESSION['Items']->line_items as $line=>$ln_itm) { label_cell($ln_itm->units); qty_cell($ln_itm->qty_done, false, $dec); + if(isset($_POST['clear_quantity'])) { + $ln_itm->qty_dispatched = 0; + } + $_POST['Line'.$line]=$ln_itm->qty_dispatched; /// clear post so value displayed in the fiel is the 'new' quantity small_qty_cells(null, 'Line'.$line, qty_format($ln_itm->qty_dispatched, $ln_itm->stock_id, $dec), null, null, $dec); $display_discount_percent = percent_format($ln_itm->discount_percent*100) . "%"; @@ -507,7 +504,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); @@ -518,9 +515,15 @@ textarea_row(_("Memo"), 'Comments', null, 50, 4); end_table(1); div_end(); submit_center_first('Update', _("Update"), - _('Refresh document page'), true); + _('Refresh document page'), true); +if(isset($_POST['clear_quantity'])) { + submit('reset_quantity', _('Reset quantity'), true, _('Refresh document page')); +} +else { + submit('clear_quantity', _('Clear quantity'), true, _('Refresh document page')); +} submit_center_last('process_delivery', _("Process Dispatch"), - _('Check entered data and save document'), 'default'); + _('Check entered data and save document'), 'default'); end_form();