Merged last changes from stable.

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

diff --git a/sales/customer_delivery.php b/sales/customer_delivery.php
index fba45c7baf06f739fcb79eabd039c3b9dad611c0..4363493bfb678e8edb40477be50b3735ae9be8f5 100644 (file)
--- a/sales/customer_delivery.php
+++ b/sales/customer_delivery.php
@@ -337,7 +337,7 @@ if (isset($_POST['process_delivery']) && check_data() && check_qoh()) {
        }
 }
 
-if (isset($_POST['Update']) || isset($_POST['_Location_update'])) {
+if (isset($_POST['Update']) || isset($_POST['_Location_update']) || isset($_POST['qty'])) {
        $Ajax->activate('Items');
 }
 //------------------------------------------------------------------------------
@@ -454,24 +454,30 @@ 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 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.
 
-       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)
@@ -484,6 +490,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) . "%";
@@ -535,9 +545,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();