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

diff --git a/sales/customer_credit_invoice.php b/sales/customer_credit_invoice.php
index 59e454ef..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();
 }
 
@@ -78,7 +78,7 @@ if (isset($_GET['AddedID'])) {
 
 	display_footer_exit();
 } else
-	check_edit_conflicts();
+	check_edit_conflicts(get_post('cart_id'));
 
 
 //-----------------------------------------------------------------------------
@@ -92,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;
 	}