X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=purchasing%2Fallocations%2Fsupplier_allocate.php;h=d26ed61bf796ce02c4e51dbf09c0f11c22ea8bd1;hb=c1075ebea2322dfe60ff198163b8a9c5646813be;hp=a12494067783efe391fafe93f3ba8ec5fdfbf02f;hpb=fa43a9c974d05b77517a0d8e3e510ef4a088632e;p=fa-stable.git

diff --git a/purchasing/allocations/supplier_allocate.php b/purchasing/allocations/supplier_allocate.php
index a1249406..d26ed61b 100644
--- a/purchasing/allocations/supplier_allocate.php
+++ b/purchasing/allocations/supplier_allocate.php
@@ -21,7 +21,7 @@ include_once($path_to_root . "/sales/includes/sales_db.inc");
 //include_once($path_to_root . "/purchasing/includes/ui/supp_alloc_ui.inc");
 
 $js = "";
-if ($use_popup_windows)
+if ($SysPrefs->use_popup_windows)
 	$js .= get_js_open_window(900, 500);
 
 add_js_file('allocate.js');
@@ -57,11 +57,12 @@ function edit_allocations_for_transaction($type, $trans_no)
 
    	display_heading2(_("Total:"). " <b>" . price_format(-$cart->bank_amount).' '.$cart->currency."</b>");
 
-	if ($cart->currency != $cart->person_curr)
+	if (floatcmp($cart->bank_amount, $cart->amount))
 	{
-	    $total = _("Total in clearing currency:") . " <b>" . price_format(-$cart->amount)."</b>"
-	    	. sprintf(" %s (%s %s/%s)", $cart->person_curr, exrate_format($cart->bank_amount/$cart->amount), $cart->currency, $cart->person_curr);
-    	display_heading2($total);
+	    $total = _("Amount ot be settled:") . " <b>" . price_format(-$cart->amount).' '.$cart->person_curr."</b>";
+		if ($cart->currency != $cart->person_curr)
+    		$total .= sprintf(" (%s %s/%s)",  exrate_format($cart->bank_amount/$cart->amount), $cart->currency, $cart->person_curr);
+	   	display_heading2($total);
 	}
     echo "<br>";
 
@@ -127,4 +128,3 @@ if (isset($_SESSION['alloc']))
 
 end_page();
 
-?>
\ No newline at end of file