X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=sales%2Fcustomer_delivery.php;h=605df69188fd200ccc48b3635975c51a4477d648;hb=3b06c6c4718610a408cae2e9b76c3134ca30b84c;hp=90905a2cbbc32267a69e5771a2cf138ce4cd08d1;hpb=a52ac85e7b37a748bd6b4210e8f669fbb615ddcc;p=fa-stable.git diff --git a/sales/customer_delivery.php b/sales/customer_delivery.php index 90905a2c..605df691 100644 --- a/sales/customer_delivery.php +++ b/sales/customer_delivery.php @@ -29,7 +29,7 @@ $js = ""; if ($use_popup_windows) { $js .= get_js_open_window(900, 500); } -if ($use_date_picker) { +if (user_use_date_picker()) { $js .= get_js_date_picker(); } @@ -58,7 +58,8 @@ if (isset($_GET['AddedID'])) { display_note(get_gl_view_str(13, $dispatch_no, _("View the GL Journal Entries for this Dispatch")),1); - hyperlink_params("$path_to_root/sales/customer_invoice.php", _("Invoice This Delivery"), "DeliveryNumber=$dispatch_no"); + if (!isset($_GET['prepaid'])) + hyperlink_params("$path_to_root/sales/customer_invoice.php", _("Invoice This Delivery"), "DeliveryNumber=$dispatch_no"); hyperlink_params("$path_to_root/sales/inquiry/sales_orders_view.php", _("Select Another Order For Dispatch"), "OutstandingOnly=1"); @@ -77,7 +78,8 @@ if (isset($_GET['AddedID'])) { display_note(print_document_link($delivery_no, _("P&rint as Packing Slip"), true, ST_CUSTDELIVERY, false, "printlink", "", 0, 1)); display_note(print_document_link($delivery_no, _("E&mail as Packing Slip"), true, ST_CUSTDELIVERY, false, "printlink", "", 1, 1), 1); - hyperlink_params($path_to_root . "/sales/customer_invoice.php", _("Confirm Delivery and Invoice"), "DeliveryNumber=$delivery_no"); + if (!isset($_GET['prepaid'])) + hyperlink_params($path_to_root . "/sales/customer_invoice.php", _("Confirm Delivery and Invoice"), "DeliveryNumber=$delivery_no"); hyperlink_params($path_to_root . "/sales/inquiry/sales_deliveries_view.php", _("Select A Different Delivery"), "OutstandingOnly=1"); @@ -88,13 +90,22 @@ if (isset($_GET['AddedID'])) { if (isset($_GET['OrderNumber']) && $_GET['OrderNumber'] > 0) { $ord = new Cart(ST_SALESORDER, $_GET['OrderNumber'], true); + if ($ord->is_prepaid()) + check_deferred_income_act(_("You have to set Deferred Income Account in GL Setup to entry prepayment invoices.")); if ($ord->count_items() == 0) { hyperlink_params($path_to_root . "/sales/inquiry/sales_orders_view.php", _("Select a different sales order to delivery"), "OutstandingOnly=1"); - die ("
" . _("This order has no items. There is nothing to delivery.") . ""); + echo "
" . _("This order has no items. There is nothing to delivery.") . + "
"; + display_footer_exit(); + } else if (!$ord->is_released()) { + hyperlink_params($path_to_root . "/sales/inquiry/sales_orders_view.php",_("Select a different sales order to delivery"), + "OutstandingOnly=1"); + echo "
"._("This prepayment order is not yet ready for delivery due to insufficient amount received.") + ."
"; + display_footer_exit(); } - // Adjust Shipping Charge based upon previous deliveries TAM adjust_shipping_charge($ord, $_GET['OrderNumber']); @@ -103,9 +114,10 @@ if (isset($_GET['OrderNumber']) && $_GET['OrderNumber'] > 0) { } elseif (isset($_GET['ModifyDelivery']) && $_GET['ModifyDelivery'] > 0) { - $_SESSION['Items'] = new Cart(ST_CUSTDELIVERY, $_GET['ModifyDelivery']); + check_is_editable(ST_CUSTDELIVERY, $_GET['ModifyDelivery']); + $_SESSION['Items'] = new Cart(ST_CUSTDELIVERY,$_GET['ModifyDelivery']); - if ($_SESSION['Items']->count_items() == 0) { + if (!$_SESSION['Items']->prepaid && $_SESSION['Items']->count_items() == 0) { hyperlink_params($path_to_root . "/sales/inquiry/sales_orders_view.php", _("Select a different delivery"), "OutstandingOnly=1"); echo "
" . _("This delivery has all items invoiced. There is nothing to modify.") . @@ -126,7 +138,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.")); @@ -141,7 +153,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.")); @@ -150,7 +162,7 @@ function check_data() } 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; } @@ -187,6 +199,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; } //------------------------------------------------------------------------------ @@ -236,7 +256,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); @@ -261,7 +281,7 @@ function check_quantities() } //------------------------------------------------------------------------------ -function check_qoh() +if (isset($_POST['process_delivery']) && check_data()) { global $SysPrefs; $dn = &$_SESSION['Items']; @@ -276,7 +296,7 @@ function check_qoh() 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; } @@ -304,9 +324,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.")); @@ -314,16 +336,18 @@ if (isset($_POST['process_delivery']) && check_data() && check_qoh()) { } else { + $is_prepaid = $dn->is_prepaid() ? "&prepaid=Yes" : ''; + processing_end(); if ($newdelivery) { - meta_forward($_SERVER['PHP_SELF'], "AddedID=$delivery_no"); + meta_forward($_SERVER['PHP_SELF'], "AddedID=$delivery_no$is_prepaid"); } else { - meta_forward($_SERVER['PHP_SELF'], "UpdatedID=$delivery_no"); + meta_forward($_SERVER['PHP_SELF'], "UpdatedID=$delivery_no$is_prepaid"); } - } + } } -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'); } //------------------------------------------------------------------------------ @@ -445,23 +469,31 @@ foreach ($_SESSION['Items']->line_items as $line=>$ln_itm) { $ln_itm->qty_dispatched = $ln_itm->quantity-$ln_itm->qty_done; } // 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 ($show_qoh) { - $qoh = get_qoh_on_date($ln_itm->stock_id, $_POST['Location'], $_POST['DispatchDate']); + $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) @@ -518,7 +550,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);