X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=sales%2Fcredit_note_entry.php;h=f32e2268d8bfc8e39b1ffec802d8ef48fab97838;hb=7561718ee5113232ce917f63085d272884b0929c;hp=56e81a1dbfee6cd6928ee8c1e695676ec81f87fa;hpb=cf075cde0c002313459cad1a7ffaab64d244caea;p=fa-stable.git

diff --git a/sales/credit_note_entry.php b/sales/credit_note_entry.php
index 56e81a1d..f32e2268 100644
--- a/sales/credit_note_entry.php
+++ b/sales/credit_note_entry.php
@@ -26,10 +26,10 @@ include_once($path_to_root . "/sales/includes/ui/sales_order_ui.inc");
 include_once($path_to_root . "/reporting/includes/reporting.inc");
 
 $js = "";
-if ($use_popup_windows) {
+if ($SysPrefs->use_popup_windows) {
 	$js .= get_js_open_window(900, 500);
 }
-if ($use_date_picker) {
+if (user_use_date_picker()) {
 	$js .= get_js_date_picker();
 }
 
@@ -74,9 +74,11 @@ 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();
+	check_edit_conflicts(get_post('cart_id'));
 
 //--------------------------------------------------------------------------------
 
@@ -142,21 +144,17 @@ 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."));
 		set_focus('OrderDate');
 		$input_error = 1;
 	} elseif (!is_date_in_fiscalyear($_POST['OrderDate'])) {
-		display_error(_("The entered date is not in fiscal year."));
+		display_error(_("The entered date is out of fiscal year or is closed for further data entry."));
 		set_focus('OrderDate');
 		$input_error = 1;
 	}
@@ -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 */
 
   //-----------------------------------------------------------------------------
@@ -284,4 +288,3 @@ echo "</tr></table></center>";
 end_form();
 end_page();
 
-?>