X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;ds=inline;f=purchasing%2Fallocations%2Fsupplier_allocate.php;h=d26ed61bf796ce02c4e51dbf09c0f11c22ea8bd1;hb=477c1f221df891f39e9363f7b34e6ff1eb4ad4c7;hp=a12494067783efe391fafe93f3ba8ec5fdfbf02f;hpb=87e4961d8cb13efab395b6a5548164d6a748bf3d;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:"). " " . 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 "
";
@@ -127,4 +128,3 @@ if (isset($_SESSION['alloc']))
end_page();
-?>
\ No newline at end of file