Cleanups in price/cost/reorder levels pages.

[fa-stable.git] / sales / customer_delivery.php

diff --git a/sales/customer_delivery.php b/sales/customer_delivery.php
index 5abc5942d4fa61699dca5194d3764681dbabbf5d..41e3726b48a1a3f86b327f12fb31467ca426aa2d 100644 (file)
--- a/sales/customer_delivery.php
+++ b/sales/customer_delivery.php
@@ -94,16 +94,16 @@ if (isset($_GET['OrderNumber']) && $_GET['OrderNumber'] > 0) {
                check_deferred_income_act(_("You have to set Deferred Income Account in GL Setup to entry prepayment invoices."));
 
        if ($ord->count_items() == 0) {
-               echo "<br><center><b>" . _("This order has no items. There is nothing to delivery.") .
-                       "</center></b>";
                hyperlink_params($path_to_root . "/sales/inquiry/sales_orders_view.php",
                        _("Select a different sales order to delivery"), "OutstandingOnly=1");
+               echo "<br><center><b>" . _("This order has no items. There is nothing to delivery.") .
+                       "</center></b>";
                display_footer_exit();
-       } else if (!$ord->prep_amount) {
-               echo "<br><center><b>"._("This prepayment order is not yet ready for delivery due to insufficient amount received.")
-                       ."</center></b>";
+       } 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 "<br><center><b>"._("This prepayment order is not yet ready for delivery due to insufficient amount received.")
+                       ."</center></b>";
                display_footer_exit();
        }
        // Adjust Shipping Charge based upon previous deliveries TAM
@@ -459,23 +459,25 @@ 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;
-       }
+       $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.
 
-       if ($show_qoh) {
                $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;
+               }
 
-       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)