X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=purchasing%2Fsupplier_invoice.php;h=5c5c91ac6bcadaf406e405c5e604847a0b69720b;hb=cb757b5cc05a792c90bded4db3df0543799b8746;hp=3dde32cddf02662221a154f8ebcf7f2e3766b47e;hpb=8440d01cf34fab02ef02e91e16ac983970e0c28e;p=fa-stable.git

diff --git a/purchasing/supplier_invoice.php b/purchasing/supplier_invoice.php
index 3dde32cd..5c5c91ac 100644
--- a/purchasing/supplier_invoice.php
+++ b/purchasing/supplier_invoice.php
@@ -65,10 +65,7 @@ if (isset($_GET['New']))
 		unset ($_SESSION['supp_trans']);
 	}
 
-	//session_register("SuppInv");
-	//session_register("supp_trans");
-	$_SESSION['supp_trans'] = new supp_trans;
-	$_SESSION['supp_trans']->is_invoice = true;
+	$_SESSION['supp_trans'] = new supp_trans(ST_SUPPINVOICE);
 }
 
 //--------------------------------------------------------------------------------------------------
@@ -99,8 +96,7 @@ if (isset($_POST['AddGLCodeToTrans'])){
 	$Ajax->activate('gl_items');
 	$input_error = false;
 
-	$sql = "SELECT account_code, account_name FROM ".TB_PREF."chart_master WHERE account_code=".db_escape($_POST['gl_code']);
-	$result = db_query($sql,"get account information");
+	$result = get_gl_account_info($_POST['gl_code']);
 	if (db_num_rows($result) == 0)
 	{
 		display_error(_("The account code entered is not a valid code, this line cannot be added to the transaction."));
@@ -186,17 +182,9 @@ function check_data()
 		return false;
 	}
 
-	$sql = "SELECT Count(*) FROM ".TB_PREF."supp_trans WHERE supplier_id="
-		.db_escape($_SESSION['supp_trans']->supplier_id) . " AND supp_reference=" 
-		.db_escape( $_POST['supp_reference']) 
-		. " AND ov_amount!=0"; // ignore voided invoice references
-
-	$result=db_query($sql,"The sql to check for the previous entry of the same invoice failed");
-
-	$myrow = db_fetch_row($result);
-	if ($myrow[0] == 1)
+	if (is_reference_already_there($_SESSION['supp_trans']->supplier_id, $_POST['supp_reference']))
 	{ 	/*Transaction reference already entered */
-		display_error(_("This invoice number has already been entered. It cannot be entered again." . " (" . $_POST['supp_reference'] . ")"));
+		display_error(_("This invoice number has already been entered. It cannot be entered again.") . " (" . $_POST['supp_reference'] . ")");
 		return false;
 	}
 
@@ -280,20 +268,12 @@ function commit_item_data($n)
 {
 	if (check_item_data($n))
 	{
-    	if (input_num('this_quantity_inv'.$n) >= ($_POST['qty_recd'.$n] - $_POST['prev_quantity_inv'.$n]))
-    	{
-    		$complete = true;
-    	}
-    	else
-    	{
-    		$complete = false;
-    	}
-
 		$_SESSION['supp_trans']->add_grn_to_trans($n, $_POST['po_detail_item'.$n],
 			$_POST['item_code'.$n], $_POST['item_description'.$n], $_POST['qty_recd'.$n],
 			$_POST['prev_quantity_inv'.$n], input_num('this_quantity_inv'.$n),
-			$_POST['order_price'.$n], input_num('ChgPrice'.$n), $complete,
+			$_POST['order_price'.$n], input_num('ChgPrice'.$n),
 			$_POST['std_cost_unit'.$n], "");
+		unset($_POST['mantax']);
 	}
 }
 
@@ -323,6 +303,7 @@ $id3 = find_submit('Delete');
 if ($id3 != -1)
 {
 	$_SESSION['supp_trans']->remove_grn_from_trans($id3);
+	unset($_POST['mantax']);
 	$Ajax->activate('grn_items');
 	$Ajax->activate('inv_tot');
 }
@@ -342,27 +323,7 @@ if ($_SESSION["wa_current_user"]->can_access('SA_GRNDELETE'))
 	$id2 = find_submit('void_item_id');
 	if ($id2 != -1) 
 	{
-		begin_transaction();
-		
-		$myrow = get_grn_item_detail($id2);
-
-		$grn = get_grn_batch($myrow['grn_batch_id']);
-
-	    $sql = "UPDATE ".TB_PREF."purch_order_details
-			SET quantity_received = qty_invoiced, quantity_ordered = qty_invoiced WHERE po_detail_item = ".$myrow["po_detail_item"];
-	    db_query($sql, "The quantity invoiced of the purchase order line could not be updated");
-
-	    $sql = "UPDATE ".TB_PREF."grn_items
-	    	SET qty_recd = quantity_inv WHERE id = ".$myrow["id"];
-		db_query($sql, "The quantity invoiced off the items received record could not be updated");
-	
-		update_average_material_cost($grn["supplier_id"], $myrow["item_code"],
-			$myrow["unit_price"], -$myrow["QtyOstdg"], Today());
-
-	   	add_stock_move(ST_SUPPRECEIVE, $myrow["item_code"], $myrow['grn_batch_id'], $grn['loc_code'], sql2date($grn["delivery_date"]), "",
-	   		-$myrow["QtyOstdg"], $myrow['std_cost_unit'], $grn["supplier_id"], 1, $myrow['unit_price']);
-	   		
-	   	commit_transaction();
+		remove_not_invoice_item($id2);
 		display_notification(sprintf(_('All yet non-invoiced items on delivery line # %d has been removed.'), $id2));
 
 	}