X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=manufacturing%2Fincludes%2Fdb%2Fwork_orders_db.inc;h=830b33b90ff217765fe8893301979beb4c18aadb;hb=467fca01c62dd47bcd97ec957a49b0209732c9d0;hp=1271f611428277a046f8b70d5c52e1a231d9ec32;hpb=279d7962a249da9cbc3074360e3a68a23a31145e;p=fa-stable.git

diff --git a/manufacturing/includes/db/work_orders_db.inc b/manufacturing/includes/db/work_orders_db.inc
index 1271f611..830b33b9 100644
--- a/manufacturing/includes/db/work_orders_db.inc
+++ b/manufacturing/includes/db/work_orders_db.inc
@@ -20,19 +20,20 @@ function add_material_cost($stock_id, $qty, $date_)
 		$standard_cost = get_standard_cost($bom_item['component']);
 		$m_cost += ($bom_item['quantity'] * $standard_cost);
 	}
-	$dec = user_price_dec();
-	price_decimal_format($m_cost, $dec);
+	//$dec = user_price_dec();
+	//price_decimal_format($m_cost, $dec);
 	$sql = "SELECT material_cost FROM ".TB_PREF."stock_master WHERE stock_id = "
 		.db_escape($stock_id);
 	$result = db_query($sql);
 	$myrow = db_fetch($result);
 	$material_cost =  $myrow['material_cost'];
-	$qoh = get_qoh_on_date($stock_id, null, $date_);
+	//$qoh = get_qoh_on_date($stock_id, null, $date_);
+	$qoh = get_qoh_on_date($stock_id);
 	if ($qoh < 0)
 		$qoh = 0;
 	if ($qoh + $qty != 0)	
 		$material_cost = ($qoh * $material_cost + $qty * $m_cost) /	($qoh + $qty);
-	$material_cost = round2($material_cost, $dec);	
+	//$material_cost = round2($material_cost, $dec);	
 	$sql = "UPDATE ".TB_PREF."stock_master SET material_cost=$material_cost
 		WHERE stock_id=".db_escape($stock_id);
 	db_query($sql,"The cost details for the inventory item could not be updated");
@@ -40,8 +41,8 @@ function add_material_cost($stock_id, $qty, $date_)
 
 function add_overhead_cost($stock_id, $qty, $date_, $costs)
 {
-	$dec = user_price_dec();
-	price_decimal_format($costs, $dec); 
+	//$dec = user_price_dec();
+	//price_decimal_format($costs, $dec); 
 	if ($qty != 0)
 		$costs /= $qty;
 	$sql = "SELECT overhead_cost FROM ".TB_PREF."stock_master WHERE stock_id = "
@@ -49,12 +50,13 @@ function add_overhead_cost($stock_id, $qty, $date_, $costs)
 	$result = db_query($sql);
 	$myrow = db_fetch($result);
 	$overhead_cost =  $myrow['overhead_cost'];
-	$qoh = get_qoh_on_date($stock_id, null, $date_);
+	//$qoh = get_qoh_on_date($stock_id, null, $date_);
+	$qoh = get_qoh_on_date($stock_id);
 	if ($qoh < 0)
 		$qoh = 0;
 	if ($qoh + $qty != 0)	
 		$overhead_cost = ($qoh * $overhead_cost + $qty * $costs) /	($qoh + $qty);
-	$overhead_cost = round2($overhead_cost, $dec);	
+	//$overhead_cost = round2($overhead_cost, $dec);	
 	$sql = "UPDATE ".TB_PREF."stock_master SET overhead_cost=".db_escape($overhead_cost)."
 		WHERE stock_id=".db_escape($stock_id);
 	db_query($sql,"The cost details for the inventory item could not be updated");
@@ -62,8 +64,8 @@ function add_overhead_cost($stock_id, $qty, $date_, $costs)
 
 function add_labour_cost($stock_id, $qty, $date_, $costs)
 {
-	$dec = user_price_dec();
-	price_decimal_format($costs, $dec); 
+	//$dec = user_price_dec();
+	//price_decimal_format($costs, $dec); 
 	if ($qty != 0)
 		$costs /= $qty;
 	$sql = "SELECT labour_cost FROM ".TB_PREF."stock_master WHERE stock_id = "
@@ -71,12 +73,13 @@ function add_labour_cost($stock_id, $qty, $date_, $costs)
 	$result = db_query($sql);
 	$myrow = db_fetch($result);
 	$labour_cost =  $myrow['labour_cost'];
-	$qoh = get_qoh_on_date($stock_id, null, $date_);
+	//$qoh = get_qoh_on_date($stock_id, null, $date_);
+	$qoh = get_qoh_on_date($stock_id);
 	if ($qoh < 0)
 		$qoh = 0;
 	if ($qoh + $qty != 0)	
 		$labour_cost = ($qoh * $labour_cost + $qty * $costs) /	($qoh + $qty);
-	$labour_cost = round2($labour_cost, $dec);	
+	//$labour_cost = round2($labour_cost, $dec);	
 	$sql = "UPDATE ".TB_PREF."stock_master SET labour_cost=".db_escape($labour_cost)."
 		WHERE stock_id=".db_escape($stock_id);
 	db_query($sql,"The cost details for the inventory item could not be updated");
@@ -91,14 +94,15 @@ function add_issue_cost($stock_id, $qty, $date_, $costs)
 	$result = db_query($sql);
 	$myrow = db_fetch($result);
 	$material_cost =  $myrow['material_cost'];
-	$dec = user_price_dec();
-	price_decimal_format($material_cost, $dec); 
-	$qoh = get_qoh_on_date($stock_id, null, $date_);
+	//$dec = user_price_dec();
+	//price_decimal_format($material_cost, $dec); 
+	//$qoh = get_qoh_on_date($stock_id, null, $date_);
+	$qoh = get_qoh_on_date($stock_id);
 	if ($qoh < 0)
 		$qoh = 0;
 	if ($qoh + $qty != 0)	
 		$material_cost = ($qty * $costs) /	($qoh + $qty);
-	$material_cost = round2($material_cost, $dec);	
+	//$material_cost = round2($material_cost, $dec);	
 	$sql = "UPDATE ".TB_PREF."stock_master SET material_cost=material_cost+"
 		.db_escape($material_cost)
 		." WHERE stock_id=".db_escape($stock_id);
@@ -189,13 +193,13 @@ function delete_work_order($woid)
 
 function get_work_order($woid, $allow_null=false)
 {
-    $sql = "SELECT ".TB_PREF."workorders.*, ".TB_PREF."stock_master.description As StockItemName,
-		".TB_PREF."locations.location_name, ".TB_PREF."locations.delivery_address 
-		FROM ".TB_PREF."workorders, ".TB_PREF."stock_master, ".TB_PREF."locations
-		WHERE ".TB_PREF."stock_master.stock_id=".TB_PREF."workorders.stock_id
-		AND	".TB_PREF."locations.loc_code=".TB_PREF."workorders.loc_code
-		AND ".TB_PREF."workorders.id=".db_escape($woid)."
-		GROUP BY ".TB_PREF."workorders.id";
+    $sql = "SELECT wo.*,st.description As StockItemName,l.location_name,
+    		l.delivery_address,l.email, l.contact
+		FROM ".TB_PREF."workorders wo, ".TB_PREF."stock_master st, ".TB_PREF."locations l
+		WHERE st.stock_id=wo.stock_id
+		AND	l.loc_code=wo.loc_code
+		AND wo.id=".db_escape($woid)."
+		GROUP BY wo.id";
 
 	$result = db_query($sql, "The work order issues could not be retrieved");