X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=sales%2Fcredit_note_entry.php;h=70148e81a6574fc99ae54fa30ac53d3158e8abe5;hb=1d59d6273b76ba9132cffbe4de5cc672890c6cdd;hp=513fb25eb0f1fbe7b3354d22e6bf73fdd527602a;hpb=46c5f7a65a7659a44ae8254c63152074363d3987;p=fa-stable.git

diff --git a/sales/credit_note_entry.php b/sales/credit_note_entry.php
index 513fb25e..70148e81 100644
--- a/sales/credit_note_entry.php
+++ b/sales/credit_note_entry.php
@@ -74,6 +74,8 @@ if (isset($_GET['AddedID'])) {
 
 	hyperlink_params($_SERVER['PHP_SELF'], _("Enter Another &Credit Note"), "NewCredit=yes");
 
+	hyperlink_params("$path_to_root/admin/attachments.php", _("Add an Attachment"), "filterType=$trans_type&trans_no=$credit_no");
+
 	display_footer_exit();
 } else
 	check_edit_conflicts();
@@ -94,7 +96,7 @@ function copy_to_cn()
 	$cart->Comments = $_POST['CreditText'];
 	$cart->document_date = $_POST['OrderDate'];
 	$cart->freight_cost = input_num('ChargeFreightCost');
-	$cart->Location = $_POST["Location"];
+	$cart->Location = (isset($_POST["Location"]) ? $_POST["Location"] : "");
 	$cart->sales_type = $_POST['sales_type_id'];
 	if ($cart->trans_no == 0)
 		$cart->reference = $_POST['ref'];
@@ -126,7 +128,7 @@ function copy_from_cn()
 function handle_new_credit($trans_no)
 {
 	processing_start();
-	$_SESSION['Items'] = new Cart(11,$trans_no);
+	$_SESSION['Items'] = new Cart(ST_CUSTCREDIT,$trans_no);
 	copy_from_cn();
 }
 
@@ -142,14 +144,10 @@ function can_process()
 		return false;
 	if($_SESSION['Items']->trans_no == 0) {
 	    if (!$Refs->is_valid($_POST['ref'])) {
-		display_error( _("You must enter a reference."));
-		set_focus('ref');
-		$input_error = 1;
-	    } elseif (!is_new_reference($_POST['ref'], ST_CUSTCREDIT))	{
-		display_error( _("The entered reference is already in use."));
-		set_focus('ref');
-		$input_error = 1;
-	    }
+			display_error( _("You must enter a reference."));
+			set_focus('ref');
+			$input_error = 1;
+		}
 	}
 	if (!is_date($_POST['OrderDate'])) {
 		display_error(_("The entered date for the credit note is invalid."));
@@ -172,17 +170,23 @@ if (isset($_POST['ProcessCredit']) && can_process()) {
 		display_note(_("For credit notes created to write off the stock, a general ledger account is required to be selected."), 1, 0);
 		display_note(_("Please select an account to write the cost of the stock off to, then click on Process again."), 1, 0);
 		exit;
-		
 	}
 	if (!isset($_POST['WriteOffGLCode'])) {
 		$_POST['WriteOffGLCode'] = 0;
 	}
 	copy_to_cn();
 	$credit_no = $_SESSION['Items']->write($_POST['WriteOffGLCode']);
-	new_doc_date($_SESSION['Items']->document_date);
-	processing_end();
-	meta_forward($_SERVER['PHP_SELF'], "AddedID=$credit_no");
-
+	if ($credit_no == -1)
+	{
+		display_error(_("The entered reference is already in use."));
+		set_focus('ref');
+	}
+	else
+	{
+		new_doc_date($_SESSION['Items']->document_date);
+		processing_end();
+		meta_forward($_SERVER['PHP_SELF'], "AddedID=$credit_no");
+	}
 } /*end of process credit note */
 
   //-----------------------------------------------------------------------------
@@ -255,7 +259,7 @@ if (isset($_POST['CancelItemChanges']))
 //-----------------------------------------------------------------------------
 
 if (!processing_active()) {
-	handle_new_credit();
+	handle_new_credit(0);
 }
 
 //-----------------------------------------------------------------------------