Old ineffective sql_trail superseded by new improved db_trail logging only calls...

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

diff --git a/sales/allocations/customer_allocate.php b/sales/allocations/customer_allocate.php
index cf0005fe04e7d9e5c0f5ea122c4a94bfa06bc8c9..68a1ff43102285dcda74ec46604f8f2f2e220d90 100644 (file)
--- a/sales/allocations/customer_allocate.php
+++ b/sales/allocations/customer_allocate.php
@@ -17,10 +17,9 @@ include_once($path_to_root . "/includes/session.inc");
 include_once($path_to_root . "/includes/data_checks.inc");
 include_once($path_to_root . "/sales/includes/sales_ui.inc");
 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 +45,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 +58,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>";
@@ -89,7 +94,7 @@ if (isset($_POST['Process']))
 {
        if (check_allocations())
        {
-               $_SESSION['alloc']->write();
+               write_cust_allocation($_SESSION['alloc']);
                clear_allocations();
                $_POST['Cancel'] = 1;
        }
@@ -125,4 +130,3 @@ if (isset($_SESSION['alloc']))
 
 end_page();
 
-?>
\ No newline at end of file