X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=manufacturing%2Fwork_order_costs.php;h=e7e0fb07700dbe18a9f45fc70448590f7c0a2204;hb=fff65dd000727b3403f641cb265c7b327b4fe22d;hp=4e7f05379b275601ee566f21911018e46e2dccc9;hpb=ebc600101ceab69c06eac4b1bd4d1782af45de05;p=fa-stable.git

diff --git a/manufacturing/work_order_costs.php b/manufacturing/work_order_costs.php
index 4e7f0537..e7e0fb07 100644
--- a/manufacturing/work_order_costs.php
+++ b/manufacturing/work_order_costs.php
@@ -49,6 +49,7 @@ if (isset($_GET['AddedID']))
 	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"));
+ 	br();
 
 	end_page();
 	exit;
@@ -75,7 +76,7 @@ function can_process()
 		display_error(_("The amount entered is not a valid number or less then zero."));
 		set_focus('costs');
 		return false;
-	}
+	}	
 
 	if (!is_date($_POST['date_']))
 	{
@@ -103,9 +104,10 @@ function can_process()
 
 if (isset($_POST['process']) && can_process() == true)
 {
+	$date = $_POST['date_'];
 	begin_transaction();
 	add_gl_trans_std_cost(ST_WORKORDER, $_POST['selected_id'], $_POST['date_'], $_POST['cr_acc'],
-		0, 0, $wo_cost_types[$_POST['PaymentType']], -input_num('costs'), PT_WORKORDER, $_POST['PaymentType']);
+		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)
 	{
@@ -115,8 +117,16 @@ if (isset($_POST['process']) && can_process() == true)
 	}
 
 	add_gl_trans_std_cost(ST_WORKORDER, $_POST['selected_id'], $_POST['date_'], $_POST['db_acc'],
-		$_POST['dim1'], $_POST['dim2'], $wo_cost_types[$_POST['PaymentType']], input_num('costs'), PT_WORKORDER, 
+		$_POST['dim1'], $_POST['dim2'], $date.": ".$wo_cost_types[$_POST['PaymentType']], input_num('costs'), PT_WORKORDER, 
 			$_POST['PaymentType']);
+			
+	//Chaitanya : Apply the costs to manfuctured stock item as adjustement
+	$wo = get_work_order($_POST['selected_id']);
+	if ($_POST['PaymentType'] == 0)
+		add_labour_cost($wo['stock_id'], 0, $_POST['date_'], input_num('costs'), true);
+	else
+		add_overhead_cost($wo['stock_id'], 0, $_POST['date_'], input_num('costs'), true);
+			
 	commit_transaction();	
 
 	meta_forward($_SERVER['PHP_SELF'], "AddedID=".$_POST['selected_id']);
@@ -133,7 +143,7 @@ start_form();
 hidden('selected_id', $_POST['selected_id']);
 //hidden('WOReqQuantity', $_POST['WOReqQuantity']);
 
-start_table($table_style2);
+start_table(TABLESTYLE2);
 
 br();
 
@@ -143,9 +153,7 @@ date_row(_("Date:"), 'date_');
 
 $item_accounts = get_stock_gl_code($wo_details['stock_id']);
 $_POST['db_acc'] = $item_accounts['assembly_account'];
-$sql = "SELECT DISTINCT account_code FROM ".TB_PREF."bank_accounts";
-$rs = db_query($sql,"could not get bank accounts");
-$r = db_fetch_row($rs);
+$r = get_default_bank_account(get_company_pref('curr_default'));
 $_POST['cr_acc'] = $r[0];
 
 amount_row(_("Additional Costs:"), 'costs');