X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=sales%2Fcustomer_credit_invoice.php;h=d87653e0847e2193de13bfa8bb278717dc534585;hb=13aa48ccc9265df336a1805d2e4709365f19c956;hp=8d5a104a459e80029a88d176b21ea26f38814645;hpb=c16b7a0f7aa17722568a0695e2fd03a362998372;p=fa-stable.git

diff --git a/sales/customer_credit_invoice.php b/sales/customer_credit_invoice.php
index 8d5a104a..d87653e0 100644
--- a/sales/customer_credit_invoice.php
+++ b/sales/customer_credit_invoice.php
@@ -39,7 +39,6 @@ page($_SESSION['page_title'], false, false, "", $js);
 if (isset($_GET['AddedID'])) {
 	$credit_no = $_GET['AddedID'];
 	$trans_type = 11;
-	print_hidden_script(11);
 
 	display_notification_centered(_("Credit Note has been processed"));
 
@@ -54,7 +53,6 @@ if (isset($_GET['AddedID'])) {
 } elseif (isset($_GET['UpdatedID'])) {
 	$credit_no = $_GET['UpdatedID'];
 	$trans_type = 11;
-	print_hidden_script(11);
 
 	display_notification_centered(_("Credit Note has been updated"));
 
@@ -99,7 +97,10 @@ function can_process()
 		set_focus('ChargeFreightCost');
 		return false;
 	}
-
+	if (!check_quantities()) {
+		display_error(_("Selected quantity cannot be less than zero nor more than quantity not credited yet."));
+		return false;
+	}
 	return true;
 }
 
@@ -109,15 +110,6 @@ if (isset($_GET['InvoiceNumber']) && $_GET['InvoiceNumber'] > 0) {
 
     $ci = new Cart(10, $_GET['InvoiceNumber'], true);
 
-    if ($ci==null) {
-		display_error(_("This invoice can not be credited using the automatic facility."));
-		display_error("Please report that a duplicate debtor_trans header record was found for invoice " . key($ci->src_docs));
-		echo "<br><br>";
-		processing_end();
-		exit;
-    }
-    //valid invoice record returned from the entered invoice number
-
     $ci->trans_type = 11;
     $ci->src_docs = $ci->trans_no;
     $ci->src_date = $ci->document_date;
@@ -140,14 +132,23 @@ if (isset($_GET['InvoiceNumber']) && $_GET['InvoiceNumber'] > 0) {
 } elseif (!processing_active()) {
 	/* This page can only be called with an invoice number for crediting*/
 	die (_("This page can only be opened if an invoice has been selected for crediting."));
-} else {
+} elseif (!check_quantities()) {
+	display_error(_("Selected quantity cannot be less than zero nor more than quantity not credited yet."));
+}
+
+function check_quantities()
+{
+	$ok =1;
 	foreach ($_SESSION['Items']->line_items as $line_no=>$itm) {
 		if (isset($_POST['Line'.$line_no])) {
-			if (check_num('Line'.$line_no, ($itm->quantity - $itm->qty_done))) {
+			if (check_num('Line'.$line_no, 0, $itm->quantity)) {
 				$_SESSION['Items']->line_items[$line_no]->qty_dispatched =
 				  input_num('Line'.$line_no);
 			}
 	  	}
+		else {
+			$ok = 0;
+		}
 
 		if (isset($_POST['Line'.$line_no.'Desc'])) {
 			$line_desc = $_POST['Line'.$line_no.'Desc'];
@@ -156,6 +157,7 @@ if (isset($_GET['InvoiceNumber']) && $_GET['InvoiceNumber'] > 0) {
 			}
 	  	}
 	}
+	return $ok;
 }
 //-----------------------------------------------------------------------------
 
@@ -354,7 +356,7 @@ if (isset($_POST['_CreditType_update']))
 }
 
 //-----------------------------------------------------------------------------
-if (get_post('Update')) 
+if (get_post('Update'))
 {
 	$Ajax->activate('credit_items');
 }