Cleanup comments. Small bugfixes. Third run

[fa-stable.git] / inventory / includes / item_adjustments_ui.inc

diff --git a/inventory/includes/item_adjustments_ui.inc b/inventory/includes/item_adjustments_ui.inc
index f7af3dadcae60659f001def954399693757bd789..4aa976cbbb5a269940db334c2f635bf28c59fcba 100644 (file)
--- a/inventory/includes/item_adjustments_ui.inc
+++ b/inventory/includes/item_adjustments_ui.inc
@@ -17,7 +17,7 @@ include_once($path_to_root . "/includes/ui/items_cart.inc");
 function add_to_order(&$order, $new_item, $new_item_qty, $standard_cost)
 {
     if ($order->find_cart_item($new_item))
-         display_error(_("For Part :") . $new_item . " " . "This item is already on this order.  You can change the quantity ordered of the existing line if necessary.");
+         display_error(_("For Part :") . $new_item . " " . "This item is already on this document. You can change the quantity on the existing line if necessary.");
        else
          $order->add_to_cart (count($order->line_items), $new_item, $new_item_qty, $standard_cost);
 }
@@ -28,24 +28,16 @@ function display_order_header(&$order)
 {
        global $Refs;
 
-       start_outer_table(TABLESTYLE2, "width=70%"); // outer table
+       start_outer_table(TABLESTYLE2, "width='70%'"); // outer table
        table_section(1);
 
        locations_list_row(_("Location:"), 'StockLocation', null);
-       ref_row(_("Reference:"), 'ref', '', $Refs->get_next(ST_INVADJUST));
-
-       table_section(2, "33%");
-
     date_row(_("Date:"), 'AdjDate', '', true);
 
-       table_section(3, "33%");
-
-    movement_types_list_row(_("Detail:"), 'type', null);
+       table_section(2, "50%");
 
-    if (!isset($_POST['Increase']))
-       $_POST['Increase'] = 1;
-    yesno_list_row(_("Type:"), 'Increase', $_POST['Increase'],
-       _("Positive Adjustment"), _("Negative Adjustment"));
+       ref_row(_("Reference:"), 'ref', '', $Refs->get_next(ST_INVADJUST, null, array('location'=>get_post('StockLocation'), 'date'=>get_post('AdjDate'))),
+                false, ST_INVADJUST);
 
        end_outer_table(1); // outer table
 }
@@ -58,7 +50,7 @@ function display_adjustment_items($title, &$order)
 
        display_heading($title);
     div_start('items_table');
-       start_table(TABLESTYLE, "width=80%");
+       start_table(TABLESTYLE, "width='80%'");
        $th = array(_("Item Code"), _("Item Description"), _("Quantity"),
                _("Unit"), _("Unit Cost"), _("Total"), "");
        if ( count($order->line_items)) $th[] = '';
@@ -67,6 +59,7 @@ function display_adjustment_items($title, &$order)
        $total = 0;
        $k = 0;  //row colour counter
 
+       $low_stock = $order->check_qoh($_POST['StockLocation'], $_POST['AdjDate']);
        $id = find_submit('Edit');
        foreach ($order->line_items as $line_no=>$stock_item)
        {
@@ -75,7 +68,10 @@ function display_adjustment_items($title, &$order)
 
                if ($id != $line_no)
                {
-               alt_table_row_color($k);
+                       if (in_array($stock_item->stock_id, $low_stock))
+                               start_row("class='stockmankobg'");      // notice low stock status
+                       else 
+                               alt_table_row_color($k);
 
                        view_stock_status_cell($stock_item->stock_id);
                        label_cell($stock_item->item_description);
@@ -102,6 +98,8 @@ function display_adjustment_items($title, &$order)
        label_row(_("Total"), number_format2($total,user_price_dec()), "align=right colspan=5", "align=right", 2);
 
     end_table();
+       if ($low_stock)
+               display_note(_("Marked items have insufficient quantities in stock as on day of adjustment."), 0, 1, "class='stockmankofg'");
        div_end();
 }
 
@@ -148,7 +146,6 @@ function adjustment_edit_item_controls(&$order, $line_no=-1)
        qty_cells(null, 'qty', $_POST['qty'], null, null, $dec);
        label_cell($_POST['units'], '', 'units');
 
-       //amount_cells(null, 'std_cost', $_POST['std_cost']);
        amount_cells(null, 'std_cost', null, null, null, $dec2);
        label_cell(" ");
 
@@ -186,4 +183,3 @@ function adjustment_options_controls()
 
 //---------------------------------------------------------------------------------
 
-?>
\ No newline at end of file