X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=purchasing%2Fsupplier_invoice.php;h=c4b91de93164aca359a267a50f7c5bd6f376c1ac;hb=01dd975d5588641f9b56ae26bd112d4d9ba31783;hp=b0434e68d3670ebd64b78dfc4125d84007d1d106;hpb=46c5f7a65a7659a44ae8254c63152074363d3987;p=fa-stable.git

diff --git a/purchasing/supplier_invoice.php b/purchasing/supplier_invoice.php
index b0434e68..c4b91de9 100644
--- a/purchasing/supplier_invoice.php
+++ b/purchasing/supplier_invoice.php
@@ -45,7 +45,8 @@ if (isset($_GET['AddedID']))
 
 	display_note(get_gl_view_str($trans_type, $invoice_no, _("View the GL Journal Entries for this Invoice")), 1);
 
-	hyperlink_no_params("$path_to_root/purchasing/supplier_payment.php", _("Entry supplier &payment for this invoice"));
+	hyperlink_params("$path_to_root/purchasing/supplier_payment.php", _("Entry supplier &payment for this invoice"),
+		"PInvoice=".$invoice_no);
 
 	hyperlink_params($_SERVER['PHP_SELF'], _("Enter Another Invoice"), "New=1");
 
@@ -82,6 +83,15 @@ function clear_fields()
 	$Ajax->activate('gl_items');
 	set_focus('gl_code');
 }
+
+function reset_tax_input()
+{
+	global $Ajax;
+
+	unset($_POST['mantax']);
+	$Ajax->activate('inv_tot');
+}
+
 //------------------------------------------------------------------------------------------------
 //	GL postings are often entered in the same form to two accounts
 //  so fileds are cleared only on user demand.
@@ -126,6 +136,7 @@ if (isset($_POST['AddGLCodeToTrans'])){
 		$_SESSION['supp_trans']->add_gl_codes_to_trans($_POST['gl_code'], $gl_act_name,
 			$_POST['dimension_id'], $_POST['dimension2_id'], 
 			input_num('amount'), $_POST['memo_']);
+		reset_tax_input();
 		set_focus('gl_code');
 	}
 }
@@ -249,7 +260,7 @@ function check_item_data($n)
 		}
 	}
 
-	if ($check_qty_charged_vs_del_qty == True)
+	if ($check_qty_charged_vs_del_qty == true && ($_POST['qty_recd'.$n] != $_POST['prev_quantity_inv'.$n]))
 	{
 		if (input_num('this_quantity_inv'.$n) / ($_POST['qty_recd'.$n] - $_POST['prev_quantity_inv'.$n]) >
 			(1+ ($margin / 100)))
@@ -268,20 +279,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], "");
+		reset_tax_input();
 	}
 }
 
@@ -312,7 +315,7 @@ if ($id3 != -1)
 {
 	$_SESSION['supp_trans']->remove_grn_from_trans($id3);
 	$Ajax->activate('grn_items');
-	$Ajax->activate('inv_tot');
+	reset_tax_input();
 }
 
 $id4 = find_submit('Delete2');
@@ -320,8 +323,8 @@ if ($id4 != -1)
 {
 	$_SESSION['supp_trans']->remove_gl_codes_from_trans($id4);
 	clear_fields();
+	reset_tax_input();
 	$Ajax->activate('gl_items');
-	$Ajax->activate('inv_tot');
 }
 
 $id2 = -1;
@@ -333,7 +336,7 @@ if ($_SESSION["wa_current_user"]->can_access('SA_GRNDELETE'))
 		remove_not_invoice_item($id2);
 		display_notification(sprintf(_('All yet non-invoiced items on delivery line # %d has been removed.'), $id2));
 
-	}   		
+	}
 }
 
 if (isset($_POST['go']))
@@ -341,7 +344,7 @@ if (isset($_POST['go']))
 	$Ajax->activate('gl_items');
 	display_quick_entries($_SESSION['supp_trans'], $_POST['qid'], input_num('totamount'), QE_SUPPINV);
 	$_POST['totamount'] = price_format(0); $Ajax->activate('totamount');
-	$Ajax->activate('inv_tot');
+	reset_tax_input();
 }
 
 start_form();