X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=sales%2Fcustomer_credit_invoice.php;h=e87113ffa5c6aa850c1094ca6e0fa0d5f40c6fe0;hb=5b8f4c4b4aa8cf996bc071f116bfce1273200fa2;hp=d9a6542499cf858f240fc9e8c320df34a4ce62a8;hpb=90b3d069d96b99671af51726e2953352738abb75;p=fa-stable.git

diff --git a/sales/customer_credit_invoice.php b/sales/customer_credit_invoice.php
index d9a65424..e87113ff 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();
 }
 
@@ -78,7 +78,7 @@ if (isset($_GET['AddedID'])) {
 
 	display_footer_exit();
 } else
-	check_edit_conflicts();
+	check_edit_conflicts(get_post('cart_id'));
 
 
 //-----------------------------------------------------------------------------
@@ -104,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."));;
@@ -196,22 +191,25 @@ 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']);
-
-	if($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");
+			meta_forward($_SERVER['PHP_SELF'], "AddedID=$credit_no");
 		} else {
-		   	meta_forward($_SERVER['PHP_SELF'], "UpdatedID=$credit_no");
+			meta_forward($_SERVER['PHP_SELF'], "UpdatedID=$credit_no");
 		}
 	}
 }
@@ -389,4 +387,3 @@ end_form();
 
 end_page();
 
-?>