X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=sales%2Fcredit_note_entry.php;h=f32e2268d8bfc8e39b1ffec802d8ef48fab97838;hb=7561718ee5113232ce917f63085d272884b0929c;hp=5fa56cc3e5b1af02e32b2d2e89c8c242bde3e158;hpb=0c1ab57c09d87eed2bd248892dbfe3f256767a82;p=fa-stable.git

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