Fixed focus setting on multi-form pages.

[fa-stable.git] / inventory / inquiry / stock_movements.php

diff --git a/inventory/inquiry/stock_movements.php b/inventory/inquiry/stock_movements.php
index 3f4332c578434e9d32a14d66bf2d71f9d2ee75e5..0f4b21daaf8c2a8220596379bd7dac48ebbe5117 100644 (file)
--- a/inventory/inquiry/stock_movements.php
+++ b/inventory/inquiry/stock_movements.php
@@ -17,6 +17,12 @@ if ($use_date_picker)
        $js .= get_js_date_picker();
 
 page(_("Inventory Item Movement"), false, false, "", $js);
+//------------------------------------------------------------------------------------------------
+
+if(get_post('ShowMoves')) 
+{
+       $Ajax->activate('doc_tbl');
+}
 
 if (isset($_GET['stock_id']))
 {
@@ -37,7 +43,7 @@ locations_list_cells(_("From Location:"), 'StockLocation', null);
 date_cells(_("From:"), 'AfterDate', '', null, -30);
 date_cells(_("To:"), 'BeforeDate');
 
-submit_cells('ShowMoves',_("Show Movements"));
+submit_cells('ShowMoves',_("Show Movements"),'',_('Refresh Inquiry'), true);
 end_table();
 end_form();
 
@@ -56,6 +62,7 @@ $result = db_query($sql, "could not query stock moves");
 
 check_db_error("The stock movements for the selected criteria could not be retrieved",$sql);
 
+div_start('doc_tbl');
 start_table("$table_style width=70%");
 $th = array(_("Type"), _("#"), _("Reference"), _("Date"), _("Detail"),
        _("Quantity In"), _("Quantity Out"), _("Quantity On Hand"));
@@ -76,8 +83,10 @@ if (!isset($before_qty_row[0]))
 }
 
 start_row("class='inquirybg'");
-label_cell("<b>"._("Quantity on hand before") . " " . $_POST['AfterDate']."</b>", "align=center colspan=7");
-qty_cell($before_qty);
+label_cell("<b>"._("Quantity on hand before") . " " . $_POST['AfterDate']."</b>", "align=center colspan=5");
+label_cell("&nbsp;", "colspan=2");
+$dec = get_qty_dec($_POST['stock_id']);
+qty_cell($before_qty, false, $dec);
 end_row();
 
 $j = 1;
@@ -97,12 +106,12 @@ while ($myrow = db_fetch($result))
 
        if ($myrow["qty"] > 0)
        {
-               $quantity_formatted = number_format2($myrow["qty"],user_qty_dec());
+               $quantity_formatted = number_format2($myrow["qty"], $dec);
                $total_in += $myrow["qty"];
        }
        else
        {
-               $quantity_formatted = number_format2(-$myrow["qty"],user_qty_dec());
+               $quantity_formatted = number_format2(-$myrow["qty"], $dec);
                $total_out += -$myrow["qty"];
        }
        $after_qty += $myrow["qty"];
@@ -112,7 +121,6 @@ while ($myrow = db_fetch($result))
        label_cell(get_trans_view_str($myrow["type"], $myrow["trans_no"]));
 
        label_cell(get_trans_view_str($myrow["type"], $myrow["trans_no"], $myrow["reference"]));
-
        label_cell($trandate);
 
        $person = $myrow["person_id"];
@@ -153,7 +161,7 @@ while ($myrow = db_fetch($result))
 
        label_cell((($myrow["qty"] >= 0) ? $quantity_formatted : ""), "nowrap align=right");
        label_cell((($myrow["qty"] < 0) ? $quantity_formatted : ""), "nowrap align=right");
-       label_cell(number_format2($after_qty,user_qty_dec()), "nowrap align=right");
+       qty_cell($after_qty, false, $dec);
        end_row();
        $j++;
        If ($j == 12)
@@ -165,16 +173,19 @@ while ($myrow = db_fetch($result))
 }
 //end of while loop
 
-if ($total_in != 0 || $total_out != 0)
-{
+// 2008-06-14. Always write this.
+//if ($total_in != 0 || $total_out != 0)
+//{
        start_row("class='inquirybg'");
-    label_cell("<b>"._("Quantity on hand after") . " " . $_POST['BeforeDate']."</b>", "align=center colspan=7");
-    qty_cell($after_qty);
+    label_cell("<b>"._("Quantity on hand after") . " " . $_POST['BeforeDate']."</b>", "align=center colspan=5");
+    qty_cell($total_in, false, $dec);
+    qty_cell($total_out, false, $dec);
+    qty_cell($after_qty, false, $dec);
     end_row();
-}
+//}
 
 end_table(1);
-
+div_end();
 end_page();
 
 ?>