Merged changes in main trunk up to 2.0.6 (see CHANGELOG)

[fa-stable.git] / manufacturing / view / wo_production_view.php

diff --git a/manufacturing/view/wo_production_view.php b/manufacturing/view/wo_production_view.php
index 002c9ef7b9985e3aa5aab06d2335b059c3ce098d..1558f67cbcddedad032ee1830058161febda810d 100644 (file)
--- a/manufacturing/view/wo_production_view.php
+++ b/manufacturing/view/wo_production_view.php
@@ -5,7 +5,10 @@ $path_to_root="../..";
 
 include_once($path_to_root . "/includes/session.inc");
 
-page(_("View Work Order Production"), true);
+$js = "";
+if ($use_popup_windows)
+       $js .= get_js_open_window(900, 500);
+page(_("View Work Order Production"), true, false, "", $js);
 
 include_once($path_to_root . "/includes/date_functions.inc");
 include_once($path_to_root . "/includes/manufacturing.inc");
@@ -16,7 +19,7 @@ include_once($path_to_root . "/manufacturing/includes/manufacturing_ui.inc");
 
 //-------------------------------------------------------------------------------------------------
 
-if ($_GET['trans_no'] != "") 
+if ($_GET['trans_no'] != "")
 {
        $wo_production = $_GET['trans_no'];
 }
@@ -29,17 +32,18 @@ function display_wo_production($prod_id)
 
     $myrow = get_work_order_produce($prod_id);
 
+       br(1);
     start_table($table_style);
     $th = array(_("Production #"), _("Reference"), _("For Work Order #"),
        _("Item"), _("Quantity Manufactured"), _("Date"));
-    table_header($th); 
+    table_header($th);
 
        start_row();
        label_cell($myrow["id"]);
        label_cell($myrow["reference"]);
        label_cell(get_trans_view_str(systypes::work_order(),$myrow["workorder_id"]));
        label_cell($myrow["stock_id"] . " - " . $myrow["StockDescription"]);
-       qty_cell($myrow["quantity"]);
+       qty_cell($myrow["quantity"], false, get_qty_dec($myrow["stock_id"]));
        label_cell(sql2date($myrow["date_"]));
        end_row();