X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=manufacturing%2Fwork_order_costs.php;h=2228a8cbc5b272ce3bf5abb4cce722234806ce8b;hb=ed8422cc500fa848a1e3a85bc0979ff76a802ca9;hp=a4ebdf2e6f5c0a97670cc4f5935527e68ca2570a;hpb=233ff5f66ad848a134d243cd11a215d8a2d725f8;p=fa-stable.git

diff --git a/manufacturing/work_order_costs.php b/manufacturing/work_order_costs.php
index a4ebdf2e..2228a8cb 100644
--- a/manufacturing/work_order_costs.php
+++ b/manufacturing/work_order_costs.php
@@ -9,8 +9,8 @@
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  
     See the License here <http://www.gnu.org/licenses/gpl-3.0.html>.
 ***********************************************************************/
-$page_security = 10;
-$path_to_root="..";
+$page_security = 'SA_WORKORDERCOST';
+$path_to_root = "..";
 include_once($path_to_root . "/includes/session.inc");
 
 include_once($path_to_root . "/includes/date_functions.inc");
@@ -26,7 +26,7 @@ if ($use_popup_windows)
 	$js .= get_js_open_window(900, 500);
 if ($use_date_picker)
 	$js .= get_js_date_picker();
-page(_("Work Order Additional Costs"), false, false, "", $js);
+page(_($help_context = "Work Order Additional Costs"), false, false, "", $js);
 
 if (isset($_GET['trans_no']) && $_GET['trans_no'] != "")
 {
@@ -38,7 +38,7 @@ if (isset($_GET['trans_no']) && $_GET['trans_no'] != "")
 if (isset($_GET['AddedID']))
 {
 	$id = $_GET['AddedID'];
-	$stype = systypes::work_order();
+	$stype = ST_WORKORDER;
 
 	display_notification(_("The additional cost has been entered."));
 
@@ -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_']))
 	{
@@ -89,7 +90,7 @@ function can_process()
 		set_focus('date_');
 		return false;
 	}
-	if (date_diff(sql2date($wo_details["released_date"]), $_POST['date_'], "d") > 0)
+	if (date_diff2(sql2date($wo_details["released_date"]), $_POST['date_'], "d") > 0)
 	{
 		display_error(_("The additional cost date cannot be before the release date of the work order."));
 		set_focus('date_');
@@ -103,21 +104,30 @@ function can_process()
 
 if (isset($_POST['process']) && can_process() == true)
 {
-	add_gl_trans_std_cost(systypes::work_order(), $_POST['selected_id'], $_POST['date_'], $_POST['cr_acc'],
-		0, 0, $wo_cost_types[$_POST['PaymentType']], -input_num('costs'), payment_person_types::WorkOrder(), $_POST['PaymentType']);
+	$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(systypes::work_order(), $_POST['selected_id'], $is_bank_to, "",
-			$_POST['date_'], -input_num('costs'), payment_person_types::WorkOrder(), $_POST['PaymentType'], get_company_currency(),
+		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");
 	}
 
-	add_gl_trans_std_cost(systypes::work_order(), $_POST['selected_id'], $_POST['date_'], $_POST['db_acc'],
-		$_POST['dim1'], $_POST['dim2'], $wo_cost_types[$_POST['PaymentType']], input_num('costs'), payment_person_types::WorkOrder(), 
+	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']);
-	
-
+			
+	//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'], $wo['units_reqd'], $_POST['date_'], input_num('costs'), true);
+	else
+		add_overhead_cost($wo['stock_id'], $wo['units_reqd'], $_POST['date_'], input_num('costs'), true);
+			
+	commit_transaction();	
 	meta_forward($_SERVER['PHP_SELF'], "AddedID=".$_POST['selected_id']);
 }
 
@@ -132,7 +142,7 @@ start_form();
 hidden('selected_id', $_POST['selected_id']);
 //hidden('WOReqQuantity', $_POST['WOReqQuantity']);
 
-start_table($table_style2);
+start_table(TABLESTYLE2);
 
 br();
 
@@ -142,9 +152,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');