X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=sales%2Fcredit_note_entry.php;h=2a3077b4c5787b5e6c9680d26e92b50fae916284;hb=48589f9ce6c51bb25e2fa8ed83c57d9dfa485e44;hp=70148e81a6574fc99ae54fa30ac53d3158e8abe5;hpb=acbb281bf6915bfccd6798b12eae1fd7d60f63c6;p=fa-stable.git

diff --git a/sales/credit_note_entry.php b/sales/credit_note_entry.php
index 70148e81..2a3077b4 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,14 +78,14 @@ if (isset($_GET['AddedID'])) {
 
 	display_footer_exit();
 } else
-	check_edit_conflicts();
+	check_edit_conflicts(get_post('cart_id'));
 
 //--------------------------------------------------------------------------------
 
 function line_start_focus() {
-  global $Ajax;
-  $Ajax->activate('items_table');
-  set_focus('_stock_id_edit');
+  	global $Ajax;
+  	$Ajax->activate('items_table');
+  	set_focus('_stock_id_edit');
 }
 
 //-----------------------------------------------------------------------------
@@ -143,7 +143,7 @@ function can_process()
 	if ($_SESSION['Items']->count_items() == 0 && (!check_num('ChargeFreightCost',0)))
 		return false;
 	if($_SESSION['Items']->trans_no == 0) {
-	    if (!$Refs->is_valid($_POST['ref'])) {
+	    if (!$Refs->is_valid($_POST['ref'], ST_CUSTCREDIT)) {
 			display_error( _("You must enter a reference."));
 			set_focus('ref');
 			$input_error = 1;
@@ -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;
 	}
@@ -270,7 +270,7 @@ hidden('cart_id');
 $customer_error = display_credit_header($_SESSION['Items']);
 
 if ($customer_error == "") {
-	start_table(TABLESTYLE, "width=80%", 10);
+	start_table(TABLESTYLE, "width='80%'", 10);
 	echo "<tr><td>";
 	display_credit_items(_("Credit Note Items"), $_SESSION['Items']);
 	credit_options_controls($_SESSION['Items']);
@@ -288,4 +288,3 @@ echo "</tr></table></center>";
 end_form();
 end_page();
 
-?>