X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=purchasing%2Fsupplier_invoice.php;h=0ac3052d97c3867e6cb436804900e78421cf800d;hb=a001646bef2b971535791d4e67b8565684d6de24;hp=94b65f4df545aa99ee0cfb4beaf77fc68054b299;hpb=5b8f4c4b4aa8cf996bc071f116bfce1273200fa2;p=fa-stable.git

diff --git a/purchasing/supplier_invoice.php b/purchasing/supplier_invoice.php
index 94b65f4d..0ac3052d 100644
--- a/purchasing/supplier_invoice.php
+++ b/purchasing/supplier_invoice.php
@@ -21,16 +21,12 @@ include_once($path_to_root . "/includes/data_checks.inc");
 
 include_once($path_to_root . "/purchasing/includes/purchasing_ui.inc");
 $js = "";
-if ($use_popup_windows)
+if ($SysPrefs->use_popup_windows)
 	$js .= get_js_open_window(900, 500);
 if (user_use_date_picker())
 	$js .= get_js_date_picker();
 //----------------------------------------------------------------------------------------
 
-check_db_has_suppliers(_("There are no suppliers defined in the system."));
-
-//--------------------------------------------------------------------------------------------------
-
 if (isset($_GET['New']))
 {
 	if (isset( $_SESSION['supp_trans']))
@@ -54,6 +50,8 @@ page($_SESSION['page_title'], false, false, "", $js);
 if (isset($_GET['ModifyInvoice']))
 	check_is_editable(ST_SUPPINVOICE, $_GET['ModifyInvoice']);
 
+check_db_has_suppliers(_("There are no suppliers defined in the system."));
+
 //---------------------------------------------------------------------------------------------------------------
 
 if (isset($_GET['AddedID'])) 
@@ -69,7 +67,7 @@ if (isset($_GET['AddedID']))
 	display_note(get_gl_view_str($trans_type, $invoice_no, _("View the GL Journal Entries for this Invoice")), 1);
 
 	hyperlink_params("$path_to_root/purchasing/supplier_payment.php", _("Entry supplier &payment for this invoice"),
-		"PInvoice=".$invoice_no);
+		"PInvoice=".$invoice_no."&trans_type=".$trans_type);
 
 	hyperlink_params($_SERVER['PHP_SELF'], _("Enter Another Invoice"), "New=1");
 
@@ -178,27 +176,12 @@ function check_data()
 		return false;
 	}
 
-	if (!$Refs->is_valid($_SESSION['supp_trans']->reference)) 
+	if (!check_reference($_SESSION['supp_trans']->reference, ST_SUPPINVOICE, $_SESSION['supp_trans']->trans_no))
 	{
-		display_error(_("You must enter an invoice reference."));
 		set_focus('reference');
 		return false;
 	}
 
-	if (!is_new_reference($_SESSION['supp_trans']->reference, ST_SUPPINVOICE, $_SESSION['supp_trans']->trans_no))
-	{
-		display_error(_("The entered reference is already in use."));
-		set_focus('reference');
-		return false;
-	}
-
-	if (!$Refs->is_valid($_SESSION['supp_trans']->supp_reference)) 
-	{
-		display_error(_("You must enter a supplier's invoice reference."));
-		set_focus('supp_reference');
-		return false;
-	}
-
 	if (!is_date( $_SESSION['supp_trans']->tran_date))
 	{
 		display_error(_("The invoice as entered cannot be processed because the invoice date is in an incorrect format."));
@@ -218,9 +201,17 @@ function check_data()
 		return false;
 	}
 
+	if (trim(get_post('supp_reference')) == false)
+	{
+		display_error(_("You must enter a supplier's invoice reference."));
+		set_focus('supp_reference');
+		return false;
+	}
+
 	if (is_reference_already_there($_SESSION['supp_trans']->supplier_id, $_POST['supp_reference'], $_SESSION['supp_trans']->trans_no))
 	{ 	/*Transaction reference already entered */
 		display_error(_("This invoice number has already been entered. It cannot be entered again.") . " (" . $_POST['supp_reference'] . ")");
+		set_focus('supp_reference');
 		return false;
 	}
 
@@ -238,10 +229,6 @@ function handle_commit_invoice()
 	$inv = $_SESSION['supp_trans'];
 	$invoice_no = add_supp_invoice($inv);
 
-	// presume supplier data need correction
-	if ($inv->stored_algorithm != $inv->tax_algorithm)
-		update_supp_tax_algorithm($inv->supplier_id, $inv->tax_algorithm);
-
     $_SESSION['supp_trans']->clear_items();
     unset($_SESSION['supp_trans']);
 
@@ -257,8 +244,15 @@ if (isset($_POST['PostInvoice']))
 
 function check_item_data($n)
 {
-	global $check_price_charged_vs_order_price,
-		$check_qty_charged_vs_del_qty, $SysPrefs;
+	global $SysPrefs;
+
+	$item = get_grn_item($n);
+
+	if (!$item)
+	{
+		display_error( _("Invalid GRN item selected."));
+		return false;
+	}
 
 	if (!check_num('this_quantity_inv'.$n, 0) || input_num('this_quantity_inv'.$n)==0)
 	{
@@ -275,12 +269,10 @@ function check_item_data($n)
 	}
 
 	$margin = $SysPrefs->over_charge_allowance();
-	if ($check_price_charged_vs_order_price == True)
+	if ($SysPrefs->check_price_charged_vs_order_price == True)
 	{
-		if ($_POST['order_price'.$n]!=input_num('ChgPrice'.$n)) {
-		     if ($_POST['order_price'.$n]==0 ||
-				input_num('ChgPrice'.$n)/$_POST['order_price'.$n] >
-			    (1 + ($margin/ 100)))
+		if ($item['unit_price'] != input_num('ChgPrice'.$n)) {
+		     if ($item['unit_price'] == 0 || input_num('ChgPrice'.$n)/$item['unit_price'] > (1 + ($margin/ 100)))
 		    {
 			display_error(_("The price being invoiced is more than the purchase order price by more than the allowed over-charge percentage. The system is set up to prohibit this. See the system administrator to modify the set up parameters if necessary.") .
 			_("The over-charge percentage allowance is :") . $margin . "%");
@@ -290,9 +282,9 @@ function check_item_data($n)
 		}
 	}
 
-	if ($check_qty_charged_vs_del_qty == true && ($_POST['qty_recd'.$n] != $_POST['prev_quantity_inv'.$n]))
+	if ($SysPrefs->check_qty_charged_vs_del_qty == true && ($item['qty_recd'] != $item['quantity_inv']))
 	{
-		if (input_num('this_quantity_inv'.$n) / ($_POST['qty_recd'.$n] - $_POST['prev_quantity_inv'.$n]) >
+		if (input_num('this_quantity_inv'.$n) / ($item['qty_recd'] - $item['quantity_inv']) >
 			(1+ ($margin / 100)))
 		{
 			display_error( _("The quantity being invoiced is more than the outstanding quantity by more than the allowed over-charge percentage. The system is set up to prohibit this. See the system administrator to modify the set up parameters if necessary.")
@@ -302,27 +294,23 @@ function check_item_data($n)
 		}
 	}
 
-	return true;
+	$item['quantity'] = input_num('this_quantity_inv'.$n);
+	$item['chg_price'] = input_num('ChgPrice'.$n);
+
+	return $item;
 }
 
 function commit_item_data($n)
 {
-	if (check_item_data($n))
+	$item  = check_item_data($n);
+	if ($item)
 	{
-    	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['std_cost_unit'.$n], "");
+		$_SESSION['supp_trans']->add_grn_to_trans($n,
+    		$item['po_detail_item'], $item['item_code'],
+    		$item['description'], $item['qty_recd'],
+    		$item['quantity_inv'], $item['quantity'],
+    		$item['unit_price'], $item['chg_price'], $item['std_cost_unit']);
+
 		reset_tax_input();
 	}
 }
@@ -339,9 +327,9 @@ if (isset($_POST['InvGRNAll']))
 {
    	foreach($_POST as $postkey=>$postval )
     {
-		if (strpos($postkey, "qty_recd") === 0)
+		if (strpos($postkey, "this_quantity_inv") === 0)
 		{
-			$id = substr($postkey, strlen("qty_recd"));
+			$id = substr($postkey, strlen("this_quantity_inv"));
 			$id = (int)$id;
 			commit_item_data($id);
 		}
@@ -366,16 +354,18 @@ if ($id4 != -1)
 	$Ajax->activate('gl_items');
 }
 
-$id2 = -1;
-if ($_SESSION["wa_current_user"]->can_access('SA_GRNDELETE'))
+$id5 = find_submit('Edit');
+if ($id5 != -1)
 {
-	$id2 = find_submit('void_item_id');
-	if ($id2 != -1) 
-	{
-		remove_not_invoice_item($id2);
-		display_notification(sprintf(_('All yet non-invoiced items on delivery line # %d has been removed.'), $id2));
-
-	}
+    $_POST['gl_code'] = $_SESSION['supp_trans']->gl_codes[$id5]->gl_code;
+    $_POST['dimension_id'] = $_SESSION['supp_trans']->gl_codes[$id5]->gl_dim;
+    $_POST['dimension2_id'] = $_SESSION['supp_trans']->gl_codes[$id5]->gl_dim2;
+    $_POST['amount'] = $_SESSION['supp_trans']->gl_codes[$id5]->amount;
+    $_POST['memo_'] = $_SESSION['supp_trans']->gl_codes[$id5]->memo_;
+
+       $_SESSION['supp_trans']->remove_gl_codes_from_trans($id5);
+       reset_tax_input();
+       $Ajax->activate('gl_items');
 }
 
 if (isset($_POST['go']))
@@ -405,7 +395,7 @@ else {
 
 //-----------------------------------------------------------------------------------------
 
-if ($id != -1 || $id2 != -1)
+if ($id != -1)
 {
 	$Ajax->activate('grn_items');
 	$Ajax->activate('inv_tot');