Bug 5360: Spelling mistake in ../sales/allocations/customer_allocate.php. Fixed.

[fa-stable.git] / sales / allocations / customer_allocate.php

diff --git a/sales/allocations/customer_allocate.php b/sales/allocations/customer_allocate.php
index f269ca4b1a5f674bc70eb916825df83c21f9edb5..7c88dc9553af855b3fb42be8bfc6696756551b69 100644 (file)
--- 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);
@@ -56,7 +61,7 @@ function edit_allocations_for_transaction($type, $trans_no)
 
        if (floatcmp($cart->bank_amount, $cart->amount))
        {
-           $total = _("Amount ot be settled:") . " <b>" . price_format($cart->amount).' '.$cart->person_curr."</b>";
+           $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);
@@ -126,4 +131,3 @@ if (isset($_SESSION['alloc']))
 
 end_page();
 
-?>
\ No newline at end of file