X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=sales%2Fcredit_note_entry.php;h=8181f7a34c24c3e1154af1642676bb1f622109c1;hb=7e8df3a179c05c51085349e139aac9ce88b9378d;hp=cdd6ebe464ff3c72003ea99948c37b70c41c1747;hpb=fc24ee893402902fc58632dabb5d7c2594e191d0;p=fa-stable.git

diff --git a/sales/credit_note_entry.php b/sales/credit_note_entry.php
index cdd6ebe4..8181f7a3 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();
 }
 
@@ -78,7 +78,7 @@ if (isset($_GET['AddedID'])) {
 
 	display_footer_exit();
 } else
-	check_edit_conflicts();
+	check_edit_conflicts(get_post('cart_id'));
 
 //--------------------------------------------------------------------------------
 
@@ -154,7 +154,7 @@ function can_process()
 		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;
 	}
@@ -288,4 +288,3 @@ echo "</tr></table></center>";
 end_form();
 end_page();
 
-?>