X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=manufacturing%2Fincludes%2Fmanufacturing_ui.inc;h=2d55477ba767fb01651173eb6e5ea9ac930b1359;hb=acec14f639533b3e6b9b33c395ae5aeff29684f3;hp=426356d9c61a4efa053edd055dba260cb2717772;hpb=80dd97a37f674cc3691fa04af4c29607067566b2;p=fa-stable.git

diff --git a/manufacturing/includes/manufacturing_ui.inc b/manufacturing/includes/manufacturing_ui.inc
index 426356d9..2d55477b 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, $SysPrefs;
+	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"));
 
@@ -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);
@@ -170,7 +168,7 @@ function display_wo_productions($woid)
 
 			$total_qty += $myrow['quantity'];
 
-        	label_cell(get_trans_view_str(29, $myrow["id"]));
+        	label_cell(get_trans_view_str(ST_MANURECEIVE, $myrow["id"]));
 			label_cell($myrow['reference']);
 			label_cell(sql2date($myrow["date_"]));
 			qty_cell($myrow['quantity'], false, get_qty_dec($myrow['reference']));
@@ -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);
@@ -210,7 +208,7 @@ function display_wo_issues($woid)
 
 			alt_table_row_color($k);
 
-        	label_cell(get_trans_view_str(28, $myrow["issue_no"]));
+        	label_cell(get_trans_view_str(ST_MANUISSUE, $myrow["issue_no"]));
 			label_cell($myrow['reference']);
 			label_cell(sql2date($myrow["issue_date"]));
 			end_row();
@@ -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, PT_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(ST_WORKORDER, $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, $wo_types_array;
+	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"),
@@ -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, $wo_types_array;
+	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"));
@@ -360,4 +357,3 @@ function display_wo_details_quick($woid, $suppress_view_link=false)
     }
 }
 
-?>
\ No newline at end of file