X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;ds=inline;f=sales%2Fallocations%2Fcustomer_allocate.php;h=ab3a30013ab7cf11ea2c7d3dd960379d14e52321;hb=7705a766b36239b2622c1b269292ec6e12f2ca09;hp=cf0005fe04e7d9e5c0f5ea122c4a94bfa06bc8c9;hpb=1571869d54be48452fdbe08f25130972ff0a7b5a;p=fa-stable.git
diff --git a/sales/allocations/customer_allocate.php b/sales/allocations/customer_allocate.php
index cf0005fe..ab3a3001 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');
@@ -54,11 +54,12 @@ function edit_allocations_for_transaction($type, $trans_no)
display_heading2(_("Date:") . " " . $cart->date_ . "");
display_heading2(_("Total:"). " " . price_format($cart->bank_amount).' '.$cart->currency."");
- if ($cart->currency != $cart->person_curr)
+ if (floatcmp($cart->bank_amount, $cart->amount))
{
- $total = _("Total in clearing currency:") . " " . price_format($cart->amount).""
- . 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:") . " " . price_format($cart->amount).' '.$cart->person_curr."";
+ 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 "
";
@@ -125,4 +126,3 @@ if (isset($_SESSION['alloc']))
end_page();
-?>
\ No newline at end of file