X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=sales%2Fcustomer_credit_invoice.php;h=ff6e45797e0c14534051686c21f71a594f42dfa1;hb=f36a75347f4940099744e978acb5f043785a4fea;hp=48f3f0d597ef6fd122f3a4a5e0e55451867f89f3;hpb=46c5f7a65a7659a44ae8254c63152074363d3987;p=fa-stable.git

diff --git a/sales/customer_credit_invoice.php b/sales/customer_credit_invoice.php
index 48f3f0d5..ff6e4579 100644
--- a/sales/customer_credit_invoice.php
+++ b/sales/customer_credit_invoice.php
@@ -124,25 +124,12 @@ function can_process()
 
 if (isset($_GET['InvoiceNumber']) && $_GET['InvoiceNumber'] > 0) {
 
-    $ci = new Cart(ST_SALESINVOICE, $_GET['InvoiceNumber'], true);
-
-    $ci->trans_type = ST_CUSTCREDIT;
-    $ci->src_docs = $ci->trans_no;
-    $ci->src_date = $ci->document_date;
-    $ci->trans_no = 0;
-    $ci->document_date = new_doc_date();
-    $ci->reference = $Refs->get_next(ST_CUSTCREDIT);
-
-    for ($line_no=0; $line_no<count($ci->line_items); $line_no++) {
-	$ci->line_items[$line_no]->qty_dispatched = '0';
-    }
-
-    $_SESSION['Items'] = $ci;
+    $_SESSION['Items'] = new Cart(ST_SALESINVOICE, $_GET['InvoiceNumber'], true);
 	copy_from_cart();
 
 } elseif ( isset($_GET['ModifyCredit']) && $_GET['ModifyCredit']>0) {
 
-	$_SESSION['Items'] = new Cart(ST_CUSTCREDIT,$_GET['ModifyCredit']);
+	$_SESSION['Items'] = new Cart(ST_CUSTCREDIT, $_GET['ModifyCredit']);
 	copy_from_cart();
 
 } elseif (!processing_active()) {
@@ -164,10 +151,10 @@ function check_quantities()
 				$_SESSION['Items']->line_items[$line_no]->qty_dispatched =
 				  input_num('Line'.$line_no);
 			}
+			else {
+				$ok = 0;
+			}
 	  	}
-		else {
-			$ok = 0;
-		}
 
 		if (isset($_POST['Line'.$line_no.'Desc'])) {
 			$line_desc = $_POST['Line'.$line_no.'Desc'];
@@ -186,7 +173,7 @@ function copy_to_cart()
 	$cart->ship_via = $_POST['ShipperID'];
 	$cart->freight_cost = input_num('ChargeFreightCost');
 	$cart->document_date =  $_POST['CreditDate'];
-	$cart->Location = $_POST['Location'];
+	$cart->Location = (isset($_POST['Location']) ? $_POST['Location'] : "");
 	$cart->Comments = $_POST['CreditText'];
 	if ($_SESSION['Items']->trans_no == 0)
 		$cart->reference = $_POST['ref'];
@@ -217,11 +204,13 @@ if (isset($_POST['ProcessCredit']) && can_process()) {
 	if ($new_credit) new_doc_date($_SESSION['Items']->document_date);
     $credit_no = $_SESSION['Items']->write($_POST['WriteOffGLCode']);
 
-	processing_end();
-	if ($new_credit) {
-	   	meta_forward($_SERVER['PHP_SELF'], "AddedID=$credit_no");
-	} else {
-	   	meta_forward($_SERVER['PHP_SELF'], "UpdatedID=$credit_no");
+	if($credit_no) {
+		processing_end();
+		if ($new_credit) {
+		   	meta_forward($_SERVER['PHP_SELF'], "AddedID=$credit_no");
+		} else {
+		   	meta_forward($_SERVER['PHP_SELF'], "UpdatedID=$credit_no");
+		}
 	}
 }