X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=sales%2Fcustomer_credit_invoice.php;h=2bb122dd9a438820c77d12a7d6fc61fb1cc30714;hb=3b06c6c4718610a408cae2e9b76c3134ca30b84c;hp=a88cdabed2aab5159d5070c458a9aa392b9bd28e;hpb=e0e9bd8bd00ee6d601be62991d5e59fe03d07f80;p=fa-stable.git

diff --git a/sales/customer_credit_invoice.php b/sales/customer_credit_invoice.php
index a88cdabe..2bb122dd 100644
--- a/sales/customer_credit_invoice.php
+++ b/sales/customer_credit_invoice.php
@@ -30,7 +30,7 @@ if ($use_popup_windows) {
 	$js .= get_js_open_window(900, 500);
 }
 
-if ($use_date_picker) {
+if (user_use_date_picker()) {
 	$js .= get_js_date_picker();
 }
 
@@ -59,6 +59,8 @@ if (isset($_GET['AddedID'])) {
 
  	display_note(get_gl_view_str($trans_type, $credit_no, _("View the GL &Journal Entries for this Credit Note")),1);
 
+	hyperlink_params("$path_to_root/admin/attachments.php", _("Add an Attachment"), "filterType=$trans_type&trans_no=$credit_no");
+
 	display_footer_exit();
 
 } elseif (isset($_GET['UpdatedID'])) {
@@ -76,7 +78,7 @@ if (isset($_GET['AddedID'])) {
 
 	display_footer_exit();
 } else
-	check_edit_conflicts();
+	check_edit_conflicts(get_post('cart_id'));
 
 
 //-----------------------------------------------------------------------------
@@ -90,7 +92,7 @@ function can_process()
 		set_focus('CreditDate');
 		return false;
 	} elseif (!is_date_in_fiscalyear($_POST['CreditDate']))	{
-		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('CreditDate');
 		return false;
 	}
@@ -102,11 +104,6 @@ function can_process()
 			return false;
 		}
 
-		if (!is_new_reference($_POST['ref'], ST_CUSTCREDIT)) {
-			display_error(_("The entered reference is already in use."));;
-			set_focus('ref');
-			return false;
-		}
     }
 	if (!check_num('ChargeFreightCost', 0)) {
 		display_error(_("The entered shipping cost is invalid or less than zero."));;
@@ -173,7 +170,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'];
@@ -194,21 +191,26 @@ function copy_from_cart()
 //-----------------------------------------------------------------------------
 
 if (isset($_POST['ProcessCredit']) && can_process()) {
+	$new_credit = ($_SESSION['Items']->trans_no == 0);
 
-    $new_credit = ($_SESSION['Items']->trans_no == 0);
-
-    if (!isset($_POST['WriteOffGLCode']))
+	if (!isset($_POST['WriteOffGLCode']))
 		$_POST['WriteOffGLCode'] = 0;
 
 	copy_to_cart();
-	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 ($new_credit) 
+		new_doc_date($_SESSION['Items']->document_date);
+	$credit_no = $_SESSION['Items']->write($_POST['WriteOffGLCode']);
+	if ($credit_no == -1)
+	{
+		display_error(_("The entered reference is already in use."));
+		set_focus('ref');
+	} elseif($credit_no) {
+		processing_end();
+		if ($new_credit) {
+			meta_forward($_SERVER['PHP_SELF'], "AddedID=$credit_no");
+		} else {
+			meta_forward($_SERVER['PHP_SELF'], "UpdatedID=$credit_no");
+		}
 	}
 }