Customer Payment, Supplier Payment: early discount support.

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

diff --git a/purchasing/allocations/supplier_allocation_main.php b/purchasing/allocations/supplier_allocation_main.php
index a14565946c0fc42463653043705c6ee1bd6c6d6d..09610785bdfaf264e6ed33bf261e0b19e90609f1 100644 (file)
--- a/purchasing/allocations/supplier_allocation_main.php
+++ b/purchasing/allocations/supplier_allocation_main.php
@@ -21,7 +21,7 @@ include_once($path_to_root . "/includes/banking.inc");
 
 include_once($path_to_root . "/sales/includes/sales_db.inc");
 $js = "";
-if ($use_popup_windows)
+if ($SysPrefs->use_popup_windows)
        $js .= get_js_open_window(900, 500);
 page(_($help_context = "Supplier Allocations"), false, false, "", $js);
 
@@ -34,7 +34,7 @@ start_form();
        $_POST['supplier_id'] = get_global_supplier();
 
     echo "<center>" . _("Select a Supplier: ") . "&nbsp;&nbsp;";
-       supplier_list('supplier_id', $_POST['supplier_id'], true, true);
+       echo supplier_list('supplier_id', $_POST['supplier_id'], true, true);
     echo "<br>";
     check(_("Show Settled Items:"), 'ShowSettled', null, true);
        echo "</center><br><br>";
@@ -69,12 +69,12 @@ function alloc_link($row)
 {
        return pager_link(_("Allocate"),
                "/purchasing/allocations/supplier_allocate.php?trans_no="
-                       .$row["trans_no"] . "&trans_type=" . $row["type"], ICON_MONEY );
+                       .$row["trans_no"] . "&trans_type=" . $row["type"]. "&supplier_id=" . $row["supplier_id"], ICON_ALLOC);
 }
 
 function amount_left($row)
 {
-       return price_format(-$row["Total"]-$row["alloc"]);
+       return price_format($row['type'] == ST_JOURNAL ?  abs($row["Total"])-$row["alloc"] : -$row["Total"]-$row["alloc"]);
 }
 
 function amount_total($row)
@@ -88,11 +88,17 @@ function check_settled($row)
 }
 
 
+$all_settled = !db_num_rows(get_allocatable_to_supp_transactions(get_post('supplier_id')));
+if ($all_settled)
+       display_note('<b>'.
+               ($supplier_id ? _("There is no unsettled transactions for this supplier.")
+                       :_("There is no unsettled transactions.")).'</b><p>');
+
 $sql = get_allocatable_from_supp_sql($supplier_id, $settled);
 
 $cols = array(
        _("Transaction Type") => array('fun'=>'systype_name'),
-       _("#") => array('fun'=>'trans_view'),
+       _("#") => array('fun'=>'trans_view', 'align'=>'right'),
        _("Reference"), 
        _("Date") => array('name'=>'tran_date', 'type'=>'date', 'ord'=>'asc'),
        _("Supplier") => array('ord'=>''),
@@ -116,4 +122,3 @@ display_db_pager($table);
 
 end_form();
 end_page();
-?>
\ No newline at end of file