X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=manufacturing%2Fincludes%2Fmanufacturing_ui.inc;h=812590edd1a9f6a51884f7e5c1921e7cbd5a3867;hb=8b04fc62bdaa30caf1f4fb373c6eb9fe2ed96f3d;hp=6726fb34c958c2813aae1e82acc77374edf4a582;hpb=d567a10b7925c8bb97c734e213d6651a979af29d;p=fa-stable.git

diff --git a/manufacturing/includes/manufacturing_ui.inc b/manufacturing/includes/manufacturing_ui.inc
index 6726fb34..812590ed 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,9 +24,9 @@ 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"));
+        	_("From Location"), _("Quantity"), _("Unit Cost"), _("Cost"));
 
         table_header($th);
 
@@ -47,19 +45,36 @@ function display_bom($item_check)
 			label_cell($myrow["WorkCentreDescription"]);
 			label_cell($myrow["location_name"]);
 			qty_cell($myrow["quantity"], false, get_qty_dec($myrow["component"]));
-			amount_cell($myrow["standard_cost"]);
+			amount_cell($myrow["ProductCost"]);
 			amount_cell($myrow["ComponentCost"]);
 			end_row();
         	$total_cost += $myrow["ComponentCost"];
 
         	$j++;
-        	If ($j == 12)
+        	if ($j == 12)
         	{
         		$j = 1;
         		table_header($th);
-        	}//end of page full new headings if
-		}//end of while
+        	}
+		}
 
+		$item = get_item($item_check);
+		if ($item['labour_cost'] != 0)
+		{
+			$total_cost += $item['labour_cost'];
+			alt_table_row_color($k);
+	        label_cells(_("Standard Labour Cost"), number_format2($item['labour_cost'],user_price_dec()),
+    	    	"colspan=6 align=left", "class=odd_row nowrap align=right");
+    	    end_row();
+		}
+		if ($item['overhead_cost'] != 0)
+		{
+			$total_cost += $item['overhead_cost'];
+			alt_table_row_color($k);
+	        label_cells(_("Standard Overhead Cost"), number_format2($item['overhead_cost'],user_price_dec()),
+    	    	"colspan=6 align=left", "nowrap align=right");
+    	    end_row();
+		}
         label_row("<b>" . _("Total Cost") . "</b>", "<b>" . number_format2($total_cost,user_price_dec()) ."</b>",
         	"colspan=6 align=right", "nowrap align=right");
 		end_table();
@@ -70,7 +85,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 +96,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 +121,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 +160,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 +170,7 @@ function display_wo_productions($woid)
     }
     else
     {
-        start_table($table_style);
+        start_table(TABLESTYLE);
         $th = array(_("#"), _("Reference"), _("Date"), _("Quantity"));
 
         table_header($th);
@@ -170,7 +185,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 +203,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 +213,7 @@ function display_wo_issues($woid)
     }
     else
     {
-        start_table($table_style);
+        start_table(TABLESTYLE);
         $th = array(_("#"), _("Reference"), _("Date"));
 
         table_header($th);
@@ -210,7 +225,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,33 +239,31 @@ function display_wo_issues($woid)
 
 function display_wo_payments($woid)
 {
-	global $path_to_root, $table_style;
+	global $path_to_root, $wo_cost_types;
 
-    $result = get_bank_trans(null, null, payment_person_types::WorkOrder(), $woid);
+    $result = get_wo_costing($woid);
 
     if (db_num_rows($result) == 0)
     {
-    	display_note(_("There are no Payments for this Order."), 0, 1);
+    	display_note(_("There are no additional costs for this Order."), 0, 1);
     }
     else
     {
-        start_table($table_style);
-        $th = array(_("#"), _("Reference"), _("Date"), _("Amount"));
+        start_table(TABLESTYLE);
+        $th = array(_("#"), _("Type"), _("Date"), _("Amount"));
 
         table_header($th);
 
-        $k = 0; //row colour counter
-
+        $k = 0;
         while ($myrow = db_fetch($result))
         {
-
 			alt_table_row_color($k);
 
-        	label_cell(get_trans_view_str(1, $myrow["trans_no"]));
-			label_cell($myrow['ref']);
-			label_cell(sql2date($myrow["trans_date"]));
-			amount_cell(-($myrow['amount']));
-			label_cell($myrow['bank_curr_code']);
+        	label_cell(get_gl_view_str( $myrow["trans_type"], $myrow["trans_no"], $myrow["trans_no"]));
+        	label_cell($wo_cost_types[$myrow['cost_type']]);
+        	$date = sql2date($myrow["tran_date"]);
+        	label_cell($date);
+			amount_cell($myrow['amount']);
 			end_row();
 		}
 
@@ -262,7 +275,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);
 
@@ -272,7 +285,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"),
@@ -287,9 +300,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_"]));
@@ -304,7 +317,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();
 
@@ -318,7 +331,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);
 
@@ -328,7 +341,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"));
@@ -338,9 +351,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_"]));
@@ -349,7 +362,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();
 
@@ -359,4 +372,3 @@ function display_wo_details_quick($woid, $suppress_view_link=false)
     }
 }
 
-?>
\ No newline at end of file