X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=manufacturing%2Fincludes%2Fmanufacturing_ui.inc;h=67db356454ab158ee59d532bd69b8ae115431c58;hb=f821f29324e963437132a3f6fa7c57fcef5c5f0e;hp=e5eaf8ccf3fdf439fce442b932507adc1fb51704;hpb=2383d33373d6ddec06906658a0ed6398077c1147;p=fa-stable.git

diff --git a/manufacturing/includes/manufacturing_ui.inc b/manufacturing/includes/manufacturing_ui.inc
index e5eaf8cc..67db3564 100644
--- a/manufacturing/includes/manufacturing_ui.inc
+++ b/manufacturing/includes/manufacturing_ui.inc
@@ -15,8 +15,6 @@ include_once($path_to_root . "/includes/ui.inc");
 
 function display_bom($item_check)
 {
-	global $table_style;
-
     $result = get_bom($item_check);
 
     if (db_num_rows($result) == 0)
@@ -26,7 +24,7 @@ function display_bom($item_check)
     else
     {
 
-        start_table($table_style);
+        start_table(TABLESTYLE);
         $th = array(_("Component"), _("Description"), _("Work Centre"),
         	_("From Location"), _("Quantity"), _("Unit Cost"), _("Total Cost"));
 
@@ -70,7 +68,7 @@ function display_bom($item_check)
 
 function display_wo_requirements($woid, $quantity, $show_qoh=false, $date=null)
 {
-	global $table_style;
+	global $SysPrefs;
 
     $result = get_wo_requirements($woid);
 
@@ -81,7 +79,7 @@ function display_wo_requirements($woid, $quantity, $show_qoh=false, $date=null)
     else
     {
 
-        start_table("$table_style width=80%");
+        start_table(TABLESTYLE, "width='80%'");
         $th = array(_("Component"), _("From Location"), _("Work Centre"),
         	_("Unit Quantity"), _("Total Quantity"), _("Units Issued"), _("On Hand"));
 
@@ -106,7 +104,7 @@ function display_wo_requirements($woid, $quantity, $show_qoh=false, $date=null)
 				$qoh = get_qoh_on_date($myrow["stock_id"], $myrow["loc_code"], $date);
 
 			if ($show_qoh && ($myrow["units_req"] * $quantity > $qoh) &&
-				!sys_prefs::allow_negative_stock())
+				!$SysPrefs->allow_negative_stock())
 			{
 				// oops, we don't have enough of one of the component items
 				start_row("class='stockmankobg'");
@@ -145,7 +143,7 @@ function display_wo_requirements($woid, $quantity, $show_qoh=false, $date=null)
 
 function display_wo_productions($woid)
 {
-	global $path_to_root, $table_style;
+	global $path_to_root;
 
     $result = get_work_order_productions($woid);
 
@@ -155,7 +153,7 @@ function display_wo_productions($woid)
     }
     else
     {
-        start_table($table_style);
+        start_table(TABLESTYLE);
         $th = array(_("#"), _("Reference"), _("Date"), _("Quantity"));
 
         table_header($th);
@@ -188,7 +186,7 @@ function display_wo_productions($woid)
 
 function display_wo_issues($woid)
 {
-	global $path_to_root, $table_style;
+	global $path_to_root;
 
     $result = get_work_order_issues($woid);
 
@@ -198,7 +196,7 @@ function display_wo_issues($woid)
     }
     else
     {
-        start_table($table_style);
+        start_table(TABLESTYLE);
         $th = array(_("#"), _("Reference"), _("Date"));
 
         table_header($th);
@@ -224,9 +222,8 @@ function display_wo_issues($woid)
 
 function display_wo_payments($woid)
 {
-	global $path_to_root, $table_style, $wo_cost_types;
+	global $path_to_root, $wo_cost_types;
 
-    //$result = get_bank_trans(null, null, payment_person_types::WorkOrder(), $woid);
     $result = get_gl_wo_cost_trans($woid);
 
     if (db_num_rows($result) == 0)
@@ -235,7 +232,7 @@ function display_wo_payments($woid)
     }
     else
     {
-        start_table($table_style);
+        start_table(TABLESTYLE);
         $th = array(_("#"), _("Type"), _("Date"), _("Amount"));
 
         table_header($th);
@@ -247,8 +244,8 @@ function display_wo_payments($woid)
 
 			alt_table_row_color($k);
 
-        	label_cell(get_gl_view_str(systypes::work_order(), $myrow["type_no"], $myrow["type_no"]));
-        	label_cell($wo_cost_types[$myrow['person_id']]);
+        	label_cell(get_gl_view_str( $myrow["type"], $myrow["type_no"], $myrow["type_no"]));
+        	label_cell($wo_cost_types[$myrow['cost_type']]);
         	$date = sql2date($myrow["tran_date"]);
         	label_cell($date);
 			amount_cell(-($myrow['amount']));
@@ -263,7 +260,7 @@ function display_wo_payments($woid)
 
 function display_wo_details($woid, $suppress_view_link=false)
 {
-	global $table_style;
+	global $wo_types_array;
 
 	$myrow = get_work_order($woid);
 
@@ -273,7 +270,7 @@ function display_wo_details($woid, $suppress_view_link=false)
     	exit;
     }
 
-   	start_table("$table_style width=80%");
+   	start_table(TABLESTYLE, "width='80%'");
 
 	if ($myrow["released"] == true)
 		$th = array(_("#"), _("Reference"), _("Type"), _("Manufactured Item"),
@@ -288,9 +285,9 @@ function display_wo_details($woid, $suppress_view_link=false)
 	if ($suppress_view_link)
 		label_cell($myrow["id"]);
 	else
-		label_cell(get_trans_view_str(systypes::work_order(), $myrow["id"]));
+		label_cell(get_trans_view_str(ST_WORKORDER, $myrow["id"]));
 	label_cell($myrow["wo_ref"]);
-	label_cell(wo_types::name($myrow["type"]));
+	label_cell($wo_types_array[$myrow["type"]]);
 	view_stock_status_cell($myrow["stock_id"], $myrow["StockItemName"]);
 	label_cell($myrow["location_name"]);
 	label_cell(sql2date($myrow["date_"]));
@@ -305,7 +302,7 @@ function display_wo_details($woid, $suppress_view_link=false)
 	}
 	end_row();
 
-	comments_display_row(systypes::work_order(), $woid);
+	comments_display_row(ST_WORKORDER, $woid);
 
 	end_table();
 
@@ -319,7 +316,7 @@ function display_wo_details($woid, $suppress_view_link=false)
 
 function display_wo_details_quick($woid, $suppress_view_link=false)
 {
-	global $table_style;
+	global $wo_types_array;
 
 	$myrow = get_work_order($woid);
 
@@ -329,7 +326,7 @@ function display_wo_details_quick($woid, $suppress_view_link=false)
     	exit;
     }
 
-   	start_table("$table_style width=80%");
+   	start_table(TABLESTYLE, "width='80%'");
 
 	$th = array(_("#"), _("Reference"), _("Type"), _("Manufactured Item"),
 		_("Into Location"), _("Date"), _("Quantity"));
@@ -339,9 +336,9 @@ function display_wo_details_quick($woid, $suppress_view_link=false)
 	if ($suppress_view_link)
 		label_cell($myrow["id"]);
 	else
-		label_cell(get_trans_view_str(systypes::work_order(), $myrow["id"]));
+		label_cell(get_trans_view_str(ST_WORKORDER, $myrow["id"]));
 	label_cell($myrow["wo_ref"]);
-	label_cell(wo_types::name($myrow["type"]));
+	label_cell($wo_types_array[$myrow["type"]]);
 	view_stock_status_cell($myrow["stock_id"], $myrow["StockItemName"]);
 	label_cell($myrow["location_name"]);
 	label_cell(sql2date($myrow["date_"]));
@@ -350,7 +347,7 @@ function display_wo_details_quick($woid, $suppress_view_link=false)
 
 	end_row();
 
-	comments_display_row(systypes::work_order(), $woid);
+	comments_display_row(ST_WORKORDER, $woid);
 
 	end_table();
 
@@ -360,4 +357,3 @@ function display_wo_details_quick($woid, $suppress_view_link=false)
     }
 }
 
-?>
\ No newline at end of file