X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=manufacturing%2Fwork_order_costs.php;h=4054fcbdc1cf6889cf8251e6e23ec922264a5db2;hb=6e0c436eff1b7664473ea0dd1264b78f096a7808;hp=50e7f7feaf9309922c60f650c768439d95775ca0;hpb=455c2279dfd2b46c4ac36246b5e7d5806b9b2105;p=fa-stable.git

diff --git a/manufacturing/work_order_costs.php b/manufacturing/work_order_costs.php
index 50e7f7fe..4054fcbd 100644
--- a/manufacturing/work_order_costs.php
+++ b/manufacturing/work_order_costs.php
@@ -44,8 +44,6 @@ if (isset($_GET['AddedID']))
 
     display_note(get_trans_view_str($stype, $id, _("View this Work Order")));
 
-   	display_note(get_gl_view_str($stype, $id, _("View the GL Journal Entries for this Work Order")), 1);
-
 	hyperlink_params("work_order_costs.php", _("Enter another additional cost."), "trans_no=$id");
  
  	hyperlink_no_params("search_work_orders.php", _("Select another &Work Order to Process"));
@@ -67,9 +65,8 @@ if (strlen($wo_details[0]) == 0)
 
 //--------------------------------------------------------------------------------------------------
 
-function can_process()
+function can_process($wo_details)
 {
-	global $wo_details;
 
 	if (!check_num('costs', 0))
 	{
@@ -86,7 +83,7 @@ function can_process()
 	}
 	elseif (!is_date_in_fiscalyear($_POST['date_']))
 	{
-		display_error(_("The entered date is not in fiscal year."));
+		display_error(_("The entered date is out of fiscal year or is closed for further data entry."));
 		set_focus('date_');
 		return false;
 	}
@@ -102,24 +99,14 @@ function can_process()
 
 //--------------------------------------------------------------------------------------------------
 
-if (isset($_POST['process']) && can_process() == true)
+if (isset($_POST['process']) && can_process($wo_details) == true)
 {
 	$date = $_POST['date_'];
-	begin_transaction();
-	add_gl_trans_std_cost(ST_WORKORDER, $_POST['selected_id'], $_POST['date_'], $_POST['cr_acc'],
-		0, 0, $date.": ".$wo_cost_types[$_POST['PaymentType']], -input_num('costs'), PT_WORKORDER, $_POST['PaymentType']);
-	$is_bank_to = is_bank_account($_POST['cr_acc']);
-	if ($is_bank_to)
-	{
-		add_bank_trans(ST_WORKORDER, $_POST['selected_id'], $is_bank_to, "",
-			$_POST['date_'], -input_num('costs'), PT_WORKORDER, $_POST['PaymentType'], get_company_currency(),
-			"Cannot insert a destination bank transaction");
-	}
+	$memo = $_POST['memo'];
+	$ref  = $_POST['ref'];
 
-	add_gl_trans_std_cost(ST_WORKORDER, $_POST['selected_id'], $_POST['date_'], $_POST['db_acc'],
-		$_POST['dim1'], $_POST['dim2'], $date.": ".$wo_cost_types[$_POST['PaymentType']], input_num('costs'), PT_WORKORDER, 
-			$_POST['PaymentType']);
-	commit_transaction();	
+	add_wo_costs_journal($_POST['selected_id'], input_num('costs'), $_POST['PaymentType'], 
+		$_POST['cr_acc'], $_POST['db_acc'], $date, $_POST['dim1'], $_POST['dim2'], $memo, $ref);
 
 	meta_forward($_SERVER['PHP_SELF'], "AddedID=".$_POST['selected_id']);
 }
@@ -130,6 +117,9 @@ display_wo_details($_POST['selected_id']);
 
 //-------------------------------------------------------------------------------------
 
+if (!isset($_POST['ref']))
+	$_POST['ref'] = $Refs->get_next(ST_JOURNAL);
+
 start_form();
 
 hidden('selected_id', $_POST['selected_id']);
@@ -139,9 +129,11 @@ start_table(TABLESTYLE2);
 
 br();
 
-yesno_list_row(_("Type:"), 'PaymentType', null,	$wo_cost_types[WO_OVERHEAD], $wo_cost_types[WO_LABOUR]);
 
 date_row(_("Date:"), 'date_');
+ref_row(_("Reference:"), 'ref', '');
+
+yesno_list_row(_("Type:"), 'PaymentType', null,	$wo_cost_types[WO_OVERHEAD], $wo_cost_types[WO_LABOUR]);
 
 $item_accounts = get_stock_gl_code($wo_details['stock_id']);
 $_POST['db_acc'] = $item_accounts['assembly_account'];
@@ -151,7 +143,7 @@ $_POST['cr_acc'] = $r[0];
 amount_row(_("Additional Costs:"), 'costs');
 gl_all_accounts_list_row(_("Debit Account"), 'db_acc', null);
 gl_all_accounts_list_row(_("Credit Account"), 'cr_acc', null);
-
+textarea_row(_("Memo:"), 'memo', null, 40, 5);
 end_table(1);
 hidden('dim1', $item_accounts["dimension_id"]);
 hidden('dim2', $item_accounts["dimension2_id"]);