Merged last changes from stable.
[fa-stable.git] / purchasing / inquiry / supplier_allocation_inquiry.php
index 55ab1678c676deb0b6142dd8a9f02664ea41f5e5..fc19aee869944fd81786071865674ae743cd0317 100644 (file)
@@ -9,8 +9,8 @@
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  
     See the License here <http://www.gnu.org/licenses/gpl-3.0.html>.
 ***********************************************************************/
-$page_security=2;
-$path_to_root="../..";
+$page_security = 'SA_SUPPLIERALLOC';
+$path_to_root = "../..";
 include($path_to_root . "/includes/db_pager.inc");
 include($path_to_root . "/includes/session.inc");
 
@@ -20,7 +20,7 @@ if ($use_popup_windows)
        $js .= get_js_open_window(900, 500);
 if ($use_date_picker)
        $js .= get_js_date_picker();
-page(_("Supplier Allocation Inquiry"), false, false, "", $js);
+page(_($help_context = "Supplier Allocation Inquiry"), false, false, "", $js);
 
 if (isset($_GET['supplier_id']))
 {
@@ -37,30 +37,29 @@ if (isset($_GET['ToDate']))
 
 //------------------------------------------------------------------------------------------------
 
-start_form(false, true);
+start_form();
 
 if (!isset($_POST['supplier_id']))
        $_POST['supplier_id'] = get_global_supplier();
 
-start_table("class='tablestyle_noborder'");
+start_table(TABLESTYLE_NOBORDER);
 start_row();
 
 supplier_list_cells(_("Select a supplier: "), 'supplier_id', $_POST['supplier_id'], true);
 
-date_cells(_("From:"), 'TransAfterDate', '', null, -30);
+date_cells(_("From:"), 'TransAfterDate', '', null, -$_SESSION["wa_current_user"]->prefs->transaction_days());
 date_cells(_("To:"), 'TransToDate', '', null, 1);
 
 supp_allocations_list_cell("filterType", null);
 
 check_cells(_("show settled:"), 'showSettled', null);
 
-submit_cells('RefreshInquiry', _("Search"),'',_('Refresh Inquiry'), true);
+submit_cells('RefreshInquiry', _("Search"),'',_('Refresh Inquiry'), 'default');
 
 set_global_supplier($_POST['supplier_id']);
 
 end_row();
 end_table();
-end_form();
 //------------------------------------------------------------------------------------------------
 function check_overdue($row)
 {
@@ -70,7 +69,9 @@ function check_overdue($row)
 
 function systype_name($dummy, $type)
 {
-       return systypes::name($type);
+       global $systypes_array;
+       
+       return $systypes_array[$type];
 }
 
 function view_link($trans)
@@ -80,13 +81,13 @@ function view_link($trans)
 
 function due_date($row)
 {
-       return (($row["type"] == 20) || ($row["type"]== 21))
+       return (($row["type"] == ST_SUPPINVOICE) || ($row["type"]== ST_SUPPCREDIT))
                ? $row["due_date"] : "";
 }
 
 function fmt_balance($row)
 {
-       $value = ($row["type"] == 1 || $row["type"] == 21 || $row["type"] == 22)
+       $value = ($row["type"] == ST_BANKPAYMENT || $row["type"] == ST_SUPPCREDIT || $row["type"] == ST_SUPPAYMENT)
                ? -$row["TotalAmount"] - $row["Allocated"]
                : $row["TotalAmount"] - $row["Allocated"];
        return $value;
@@ -94,14 +95,15 @@ function fmt_balance($row)
 
 function alloc_link($row)
 {
-       $link = 
-       pager_link(_("Allocations"),
-               "/purchasing/allocations/supplier_allocate.php?trans_no=" .
-                       $row["trans_no"]. "&trans_type=" . $row["type"], ICON_MONEY );
-
-       return (($row["type"] == 1 || $row["type"] == 21 || $row["type"] == 22) 
-               && (-$row["TotalAmount"] - $row["Allocated"]) > 0)
-               ? $link : '';
+       if (($row["type"] == ST_BANKPAYMENT || $row["type"] == ST_SUPPCREDIT || $row["type"] == ST_SUPPAYMENT) 
+               && (-$row["TotalAmount"] - $row["Allocated"]) >= 0)
+                       return  pager_link(_("Allocations"), "/purchasing/allocations/supplier_allocate.php?trans_no=" .
+                               $row["trans_no"]. "&trans_type=" . $row["type"]. "&supplier_id=" . $row["supplier_id"], ICON_ALLOC);
+       elseif ($row["type"] == ST_SUPPINVOICE && ($row["TotalAmount"] - $row["Allocated"]) > 0)
+                       return  pager_link(_("Pay"), "/purchasing/supplier_payment.php?supplier_id=".$row["supplier_id"]
+                               ."&PInvoice=".$row["trans_no"], ICON_MONEY );
+       else
+               return '';
 }
 
 function fmt_debit($row)
@@ -118,56 +120,7 @@ function fmt_credit($row)
 }
 //------------------------------------------------------------------------------------------------
 
- $date_after = date2sql($_POST['TransAfterDate']);
- $date_to = date2sql($_POST['TransToDate']);
-
-    // Sherifoz 22.06.03 Also get the description
-    $sql = "SELECT 
-               trans.type, 
-               trans.trans_no,
-               trans.reference, 
-               supplier.supp_name, 
-               trans.supp_reference,
-       trans.tran_date, 
-               trans.due_date,
-               supplier.curr_code, 
-       (trans.ov_amount + trans.ov_gst  + trans.ov_discount) AS TotalAmount, 
-               trans.alloc AS Allocated,
-               ((trans.type = 20 OR trans.type = 21) AND trans.due_date < '" . date2sql(Today()) . "') AS OverDue
-       FROM "
-                       .TB_PREF."supp_trans as trans, "
-                       .TB_PREF."suppliers as supplier
-       WHERE supplier.supplier_id = trans.supplier_id
-       AND trans.tran_date >= '$date_after'
-       AND trans.tran_date <= '$date_to'";
-       if ($_POST['supplier_id'] != reserved_words::get_all())
-               $sql .= " AND trans.supplier_id = '" . $_POST['supplier_id'] . "'";
-       if (isset($_POST['filterType']) && $_POST['filterType'] != reserved_words::get_all())
-       {
-               if (($_POST['filterType'] == '1') || ($_POST['filterType'] == '2'))
-               {
-                       $sql .= " AND trans.type = 20 ";
-               }
-               elseif ($_POST['filterType'] == '3')
-               {
-                       $sql .= " AND trans.type = 22 ";
-               }
-               elseif (($_POST['filterType'] == '4') || ($_POST['filterType'] == '5'))
-               {
-                       $sql .= " AND trans.type = 21 ";
-               }
-
-               if (($_POST['filterType'] == '2') || ($_POST['filterType'] == '5'))
-               {
-                       $today =  date2sql(Today());
-                       $sql .= " AND trans.due_date < '$today' ";
-               }
-       }
-
-       if (!check_value('showSettled'))
-       {
-               $sql .= " AND (round(abs(ov_amount + ov_gst + ov_discount) - alloc,6) != 0) ";
-       }
+$sql = get_sql_for_supplier_allocation_inquiry();
 
 $cols = array(
        _("Type") => array('fun'=>'systype_name'),
@@ -185,7 +138,7 @@ $cols = array(
        array('insert'=>true, 'fun'=>'alloc_link')
        );
 
-if ($_POST['supplier_id'] != reserved_words::get_all()) {
+if ($_POST['supplier_id'] != ALL_TEXT) {
        $cols[_("Supplier")] = 'skip';
        $cols[_("Currency")] = 'skip';
 }
@@ -194,12 +147,7 @@ if ($_POST['supplier_id'] != reserved_words::get_all()) {
 $table =& new_db_pager('doc_tbl', $sql, $cols);
 $table->set_marker('check_overdue', _("Marked items are overdue."));
 
-if (get_post('RefreshInquiry')) {
-       $table->set_sql($sql);
-       $table->set_columns($cols);
-}
 $table->width = "90%";
-start_form();
 
 display_db_pager($table);