Changed the Quantity routines to use the Item Units decimals if any. A lot of files.

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

diff --git a/inventory/inquiry/stock_movements.php b/inventory/inquiry/stock_movements.php
index 35e0f20575c0782d76dcd5685586da62fc970e2e..944cb437b3c95ae1b501f8bfa20de6002a553080 100644 (file)
--- a/inventory/inquiry/stock_movements.php
+++ b/inventory/inquiry/stock_movements.php
@@ -34,7 +34,7 @@ stock_items_list_cells(_("Item:"), 'stock_id', $_POST['stock_id']);
 
 locations_list_cells(_("From Location:"), 'StockLocation', null);
 
-date_cells(_("From:"), 'AfterDate', null, -30);
+date_cells(_("From:"), 'AfterDate', '', null, -30);
 date_cells(_("To:"), 'BeforeDate');
 
 submit_cells('ShowMoves',_("Show Movements"));
@@ -76,8 +76,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 +99,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"];
@@ -153,7 +155,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,13 +167,16 @@ 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);