Allocate Customer Payment or Credit Note, Allocate Supplier Payment or Credit Note...

diff --git a/purchasing/allocations/supplier_allocate.php b/purchasing/allocations/supplier_allocate.php
index a12494067783efe391fafe93f3ba8ec5fdfbf02f..2ebbb227858f6cf65ab0e95c9bbd62d3bcc30cd8 100644 (file)
--- a/purchasing/allocations/supplier_allocate.php
+++ b/purchasing/allocations/supplier_allocate.php
@@ -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>";
 

diff --git a/sales/allocations/customer_allocate.php b/sales/allocations/customer_allocate.php
index cf0005fe04e7d9e5c0f5ea122c4a94bfa06bc8c9..f269ca4b1a5f674bc70eb916825df83c21f9edb5 100644 (file)
--- a/sales/allocations/customer_allocate.php
+++ b/sales/allocations/customer_allocate.php
@@ -54,11 +54,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 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>";