X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=manufacturing%2Fview%2Fwo_costs_view.php;h=80ed02dbc31b3165fb6b355d77a0ba0df1ebcfbd;hb=630e99edecc3eabe708a9e7bda94eaa60bf16db7;hp=12ed5fe3c1d776d7e3ea232f9066f10279c2ce52;hpb=0b63d898491b6577a5a5bf90e771dca0dcbbcf1f;p=fa-stable.git

diff --git a/manufacturing/view/wo_costs_view.php b/manufacturing/view/wo_costs_view.php
index 12ed5fe3..80ed02db 100644
--- a/manufacturing/view/wo_costs_view.php
+++ b/manufacturing/view/wo_costs_view.php
@@ -15,12 +15,11 @@ $path_to_root = "../..";
 include_once($path_to_root . "/includes/session.inc");
 
 $js = "";
-if ($use_popup_windows)
+if ($SysPrefs->use_popup_windows)
 	$js .= get_js_open_window(900, 500);
 page(_($help_context = "View Work Order Costs"), true, false, "", $js);
 
 include_once($path_to_root . "/includes/date_functions.inc");
-include_once($path_to_root . "/includes/manufacturing.inc");
 include_once($path_to_root . "/includes/data_checks.inc");
 
 include_once($path_to_root . "/manufacturing/includes/manufacturing_db.inc");
@@ -34,33 +33,54 @@ if ($_GET['trans_no'] != "")
 }
 
 //-------------------------------------------------------------------------------------------------
-
+function print_gl_rows($result, $title)
+{
+	global $systypes_array;
+
+    if (db_num_rows($result))
+    {
+		table_section_title($title, 7);
+		while($myrow = db_fetch($result)) {
+			start_row();
+			label_cell(sql2date($myrow["tran_date"]));
+			label_cell(get_trans_view_str($myrow['type'],$myrow["type_no"], $systypes_array[$myrow['type']]. ' '.$myrow['type_no']));
+		    label_cell($myrow['account']);
+			label_cell($myrow['account_name']);
+			display_debit_or_credit_cells($myrow['amount']);
+			label_cell($myrow['memo_']);
+			end_row();
+		}
+	}
+}
 function display_wo_costs($prod_id)
 {
-	global $wo_cost_types;
-
-    $costs = get_gl_wo_cost_trans($prod_id);
-
 	br(1);
     start_table(TABLESTYLE);
-    $th = array(_("Date"), _("Type"), _("Amount"), _("Memo"), '');
-    table_header($th);
-	while($myrow = db_fetch($costs)) {
-		start_row();
-		label_cell(sql2date($myrow["tran_date"]));
-		label_cell($wo_cost_types[$myrow["cost_type"]]);
-		amount_cell(-$myrow['amount']);
-		label_cell($myrow['memo_']);
-		label_cell(get_trans_view_str($myrow['trans_type'],$myrow["trans_no"]));
-		end_row();
-	}
+
+	$th = array(_("Date"), _("Transaction"), _("Account Code"), _("Account Name"),
+		_("Debit"), _("Credit"), _("Memo"));
+
+   	table_header($th);
+
+	$productions = get_gl_wo_productions($prod_id, true);
+	print_gl_rows($productions, _("Finished Product Requirements"));
+
+	$issues = get_gl_wo_issue_trans($prod_id, -1, true);
+	print_gl_rows($issues, _("Additional Material Issues"));
+
+    $costs = get_gl_wo_cost_trans($prod_id, -1, true);
+	print_gl_rows($costs, _("Additional Costs"));
+
+	$wo = get_gl_trans(ST_WORKORDER, $prod_id);
+	print_gl_rows($wo, _("Finished Product Receival"));
 	end_table(1);
 }
 
 //-------------------------------------------------------------------------------------------------
-
 display_heading(sprintf(_("Production Costs for Work Order # %d"), $wo_id));
 
+display_wo_details($wo_id, true);
+
 display_wo_costs($wo_id);
 
 //-------------------------------------------------------------------------------------------------
@@ -69,5 +89,3 @@ br(2);
 
 end_page(true, false, false, ST_WORKORDER, $wo_id);
 
-?>
-