Customer Payment, Supplier Payment: early discount support.

[fa-stable.git] / purchasing / allocations / supplier_allocate.php

diff --git a/purchasing/allocations/supplier_allocate.php b/purchasing/allocations/supplier_allocate.php
index 2ebbb227858f6cf65ab0e95c9bbd62d3bcc30cd8..14632d7d013855c945438c72df72bd2d67f1d07f 100644 (file)
--- 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');
@@ -55,15 +55,13 @@ 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 (floatcmp($cart->bank_amount, $cart->amount))
-       {
-           $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);
-       }
+               display_heading2(_("Total:"). " <b>" . price_format(-$cart->bank_amount).' '.$cart->currency."</b>");
+
+       $total = _("Amount ot be settled:") . " <b>" . '<span id="total">'.price_format(-$cart->amount).'</span> '.$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>";
 
        div_start('alloc_tbl');
@@ -92,7 +90,7 @@ if (isset($_POST['Process']))
 {
        if (check_allocations())
        {
-               $_SESSION['alloc']->write();
+               write_supp_allocation($_SESSION['alloc']);
                clear_allocations();
                $_POST['Cancel'] = 1;
        }
@@ -128,4 +126,3 @@ if (isset($_SESSION['alloc']))
 
 end_page();
 
-?>
\ No newline at end of file