X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=sales%2Fallocations%2Fcustomer_allocate.php;h=7c88dc9553af855b3fb42be8bfc6696756551b69;hb=d58fa50bb3c97cabf0646db613018690a12dbb46;hp=cf0005fe04e7d9e5c0f5ea122c4a94bfa06bc8c9;hpb=87e4961d8cb13efab395b6a5548164d6a748bf3d;p=fa-stable.git

diff --git a/sales/allocations/customer_allocate.php b/sales/allocations/customer_allocate.php
index cf0005fe..7c88dc95 100644
--- a/sales/allocations/customer_allocate.php
+++ b/sales/allocations/customer_allocate.php
@@ -20,7 +20,7 @@ include_once($path_to_root . "/sales/includes/sales_db.inc");
 //include_once($path_to_root . "/sales/includes/ui/cust_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');
@@ -46,7 +46,12 @@ function edit_allocations_for_transaction($type, $trans_no)
 	global $systypes_array;
 
 	$cart = $_SESSION['alloc'];
-
+	
+	if ($cart->type == ST_JOURNAL && $cart->bank_amount < 0)
+	{
+		$cart->bank_amount = -$cart->bank_amount;
+		$cart->amount = -$cart->amount;
+	}	
     display_heading(sprintf(_("Allocation of %s # %d"), $systypes_array[$cart->type], $cart->trans_no));
 
     display_heading($cart->person_name);
@@ -54,11 +59,12 @@ function edit_allocations_for_transaction($type, $trans_no)
     display_heading2(_("Date:") . " <b>" . $cart->date_ . "</b>");
    	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 to 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>";
@@ -125,4 +131,3 @@ if (isset($_SESSION['alloc']))
 
 end_page();
 
-?>
\ No newline at end of file