Minor layout bug at Credit Shipping Costs in customer_credit_invoice.php

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

diff --git a/inventory/inquiry/stock_movements.php b/inventory/inquiry/stock_movements.php
index 942a1a8e68b5c4a9e33b50052398e9b067b72257..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"));
@@ -70,14 +70,16 @@ $before_qty = db_query($sql, "The starting quantity on hand could not be calcula
 $before_qty_row = db_fetch_row($before_qty);
 $after_qty = $before_qty = $before_qty_row[0];
 
-if (!isset($before_qty_row[0])) 
+if (!isset($before_qty_row[0]))
 {
        $after_qty = $before_qty = 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;
@@ -86,7 +88,7 @@ $k = 0; //row colour counter
 $total_in = 0;
 $total_out = 0;
 
-while ($myrow = db_fetch($result)) 
+while ($myrow = db_fetch($result))
 {
 
        alt_table_row_color($k);
@@ -95,14 +97,14 @@ while ($myrow = db_fetch($result))
 
        $type_name = systypes::name($myrow["type"]);
 
-       if ($myrow["qty"] > 0) 
+       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 
+       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"];
@@ -118,15 +120,15 @@ while ($myrow = db_fetch($result))
        $person = $myrow["person_id"];
        $gl_posting = "";
 
-       if (($myrow["type"] == 10) || ($myrow["type"] == 11)) 
+       if (($myrow["type"] == 13) || ($myrow["type"] == 11))
        {
                $cust_row = get_customer_details_from_trans($myrow["type"], $myrow["trans_no"]);
 
                if (strlen($cust_row['name']) > 0)
                        $person = $cust_row['name'] . " (" . $cust_row['br_name'] . ")";
 
-       } 
-       elseif ($myrow["type"] == 25) 
+       }
+       elseif ($myrow["type"] == 25)
        {
                // get the supplier name
                $sql = "SELECT supp_name FROM ".TB_PREF."suppliers WHERE supplier_id = '" . $myrow["person_id"] . "'";
@@ -136,15 +138,15 @@ while ($myrow = db_fetch($result))
 
                if (strlen($supp_row['supp_name']) > 0)
                        $person = $supp_row['supp_name'];
-       } 
-       elseif ($myrow["type"] == systypes::location_transfer() || $myrow["type"] == systypes::inventory_adjustment()) 
+       }
+       elseif ($myrow["type"] == systypes::location_transfer() || $myrow["type"] == systypes::inventory_adjustment())
        {
                // get the adjustment type
                $movement_type = get_movement_type($myrow["person_id"]);
                $person = $movement_type["name"];
-       } 
-       elseif ($myrow["type"]==systypes::work_order() || $myrow["type"] == 28  || 
-               $myrow["type"] == 29) 
+       }
+       elseif ($myrow["type"]==systypes::work_order() || $myrow["type"] == 28  ||
+               $myrow["type"] == 29)
        {
                $person = "";
        }
@@ -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);