X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=sales%2Fcustomer_invoice.php;h=7f46f16968f61aea38bf28f7c13bd701422fcae5;hb=7561718ee5113232ce917f63085d272884b0929c;hp=66f676e6cd00c36f0ea6fd2b4ce7b3dc31a5f519;hpb=0c1ab57c09d87eed2bd248892dbfe3f256767a82;p=fa-stable.git

diff --git a/sales/customer_invoice.php b/sales/customer_invoice.php
index 66f676e6..7f46f169 100644
--- a/sales/customer_invoice.php
+++ b/sales/customer_invoice.php
@@ -27,7 +27,7 @@ include_once($path_to_root . "/taxes/tax_calc.inc");
 include_once($path_to_root . "/admin/db/shipping_db.inc");
 
 $js = "";
-if ($use_popup_windows) {
+if ($SysPrefs->use_popup_windows) {
 	$js .= get_js_open_window(900, 500);
 }
 if (user_use_date_picker()) {
@@ -48,7 +48,7 @@ page($_SESSION['page_title'], false, false, "", $js);
 
 //-----------------------------------------------------------------------------
 
-check_edit_conflicts();
+check_edit_conflicts(get_post('cart_id'));
 
 if (isset($_GET['AddedID'])) {
 
@@ -66,12 +66,7 @@ if (isset($_GET['AddedID'])) {
 
 	hyperlink_params("$path_to_root/sales/inquiry/sales_deliveries_view.php", _("Select Another &Delivery For Invoicing"), "OutstandingOnly=1");
 
-	$sql = "SELECT trans_type_from, trans_no_from FROM ".TB_PREF."cust_allocations
-			WHERE trans_type_to=".ST_SALESINVOICE." AND trans_no_to=".db_escape($invoice_no);
-	$result = db_query($sql, "could not retrieve customer allocation");
-	$row = db_fetch($result);
-
-	if ($row === false)
+	if (!db_num_rows(get_allocatable_from_cust_transactions(null, $invoice_no, $trans_type)))
 		hyperlink_params("$path_to_root/sales/customer_payments.php", _("Entry &customer payment for this invoice"),
 		"SInvoice=".$invoice_no);
 
@@ -699,4 +694,3 @@ end_form();
 
 end_page();
 
-?>