Fixed edition of purchase order (bug #0000001)

[fa-stable.git] / manufacturing / search_work_orders.php

diff --git a/manufacturing/search_work_orders.php b/manufacturing/search_work_orders.php
index 386ff583c13ef1e58167b101d27e8a3cd3ff08b0..666206129add29c08edc6592e604c662a769682f 100644 (file)
--- a/manufacturing/search_work_orders.php
+++ b/manufacturing/search_work_orders.php
@@ -9,12 +9,12 @@ include_once($path_to_root . "/manufacturing/includes/manufacturing_ui.inc");
 $js = "";
 if ($use_popup_windows)
        $js .= get_js_open_window(800, 500);
-if (isset($_GET['outstanding_only'])) 
+if (isset($_GET['outstanding_only']))
 {
        $outstanding_only = 1;
        page(_("Search Outstanding Work Orders"), false, false, "", $js);
-} 
-else 
+}
+else
 {
        $outstanding_only = 0;
        page(_("Search Work Orders"), false, false, "", $js);
@@ -53,27 +53,27 @@ $sql = "SELECT ".TB_PREF."workorders.*, ".TB_PREF."stock_master.description,".TB
        WHERE ".TB_PREF."stock_master.stock_id=".TB_PREF."workorders.stock_id AND
        ".TB_PREF."locations.loc_code=".TB_PREF."workorders.loc_code ";
 
-if (check_value('OpenOnly')) 
+if (check_value('OpenOnly'))
 {
        $sql .= " AND ".TB_PREF."workorders.closed=0 ";
 }
 
-if (isset($_POST['StockLocation']) && $_POST['StockLocation'] != $all_items) 
+if (isset($_POST['StockLocation']) && $_POST['StockLocation'] != $all_items)
 {
        $sql .= "AND ".TB_PREF."workorders.loc_code='" . $_POST['StockLocation'] . "' ";
 }
 
-if (isset($_POST['OrderNumber']) && $_POST['OrderNumber'] != "") 
+if (isset($_POST['OrderNumber']) && $_POST['OrderNumber'] != "")
 {
        $sql .= "AND ".TB_PREF."workorders.wo_ref LIKE '%". $_POST['OrderNumber'] . "%'";
 }
 
-if (isset($_POST['SelectedStockItem']) && $_POST['SelectedStockItem'] != $all_items) 
+if (isset($_POST['SelectedStockItem']) && $_POST['SelectedStockItem'] != $all_items)
 {
        $sql .= "AND ".TB_PREF."workorders.stock_id='". $_POST['SelectedStockItem'] . "'";
 }
 
-if (check_value('OverdueOnly')) 
+if (check_value('OverdueOnly'))
 {
        $Today = date2sql(Today());
 
@@ -92,12 +92,12 @@ table_header($th);
 $j = 1;
 $k = 0;
 
-while ($myrow = db_fetch($result)) 
+while ($myrow = db_fetch($result))
 {
 
 
        // check if it's an overdue work order
-       if (!$myrow["closed"] && date_diff(Today(), sql2date($myrow["required_by"]), "d") > 0) 
+       if (!$myrow["closed"] && date_diff(Today(), sql2date($myrow["required_by"]), "d") > 0)
        {
                start_row("class='overduebg'");
        }
@@ -106,7 +106,7 @@ while ($myrow = db_fetch($result))
 
        $modify_page = $path_to_root . "/manufacturing/work_order_entry.php?" . SID . "trans_no=" . $myrow["id"];
        $release_page = $path_to_root . "/manufacturing/work_order_release.php?" . SID . "trans_no=" . $myrow["id"];
-       if ($myrow["closed"] == 0) 
+       if ($myrow["closed"] == 0)
        {
                $issue = $path_to_root . "/manufacturing/work_order_issue.php?" . SID . "trans_no=" .$myrow["id"];
                $add_finished = $path_to_root . "/manufacturing/work_order_add_finished.php?" . SID . "trans_no=" .$myrow["id"];
@@ -115,29 +115,29 @@ while ($myrow = db_fetch($result))
                $issue_link = $can_issue?("<a href=$issue>" . _("Issue") . "</a></td>
                        <td><a href=$add_finished>" . _("Produce") . "</a></td>
                        <td><a href=$costs>" . _("Costs") . "</a>"): _("Not Released");
-       } 
-       else 
+       }
+       else
        {
                $issue_link = "";
        }
-
+       $dec = get_qty_dec($myrow["stock_id"]);
        label_cell(get_trans_view_str(systypes::work_order(), $myrow["id"]));
        label_cell(get_trans_view_str(systypes::work_order(), $myrow["id"], $myrow["wo_ref"]));
        label_cell(wo_types::name($myrow["type"]));
        label_cell($myrow["location_name"]);
        view_stock_status_cell($myrow["stock_id"], $myrow["description"]);
-       qty_cell($myrow["units_reqd"]);
-       qty_cell($myrow["units_issued"]);
+       qty_cell($myrow["units_reqd"], false, $dec);
+       qty_cell($myrow["units_issued"], false, $dec);
        label_cell(sql2date($myrow["date_"]));
        label_cell(sql2date($myrow["required_by"]));
        label_cell(($myrow["closed"]? _("Yes"):_("No")));
        if ($issue_link != "")
                label_cell($issue_link);
-       if ($myrow["released"] == 0) 
+       if ($myrow["released"] == 0)
        {
                label_cell("<a href=$release_page>" . _("Release") . "</a>");
        }
-       if ($myrow["closed"] == 0) 
+       if ($myrow["closed"] == 0)
        {
                label_cell("<a href=$modify_page>" . _("Edit") . "</a>");
        }