X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=purchasing%2Finquiry%2Fsupplier_inquiry.php;h=ea5c8384cfb8624a7e5fe1d58ad3d93538a0f203;hb=5f06887dedd4d14701864fb72994d7e20352086d;hp=3ad2fd261e0e17662d47b04d7c858bca472a31fa;hpb=431531eebf3ba494002cfbf7ea36f9e82d4975c0;p=fa-stable.git diff --git a/purchasing/inquiry/supplier_inquiry.php b/purchasing/inquiry/supplier_inquiry.php index 3ad2fd26..ea5c8384 100644 --- a/purchasing/inquiry/supplier_inquiry.php +++ b/purchasing/inquiry/supplier_inquiry.php @@ -1,17 +1,28 @@ . +***********************************************************************/ +$page_security = 'SA_SUPPTRANSVIEW'; +$path_to_root = "../.."; +include($path_to_root . "/includes/db_pager.inc"); include($path_to_root . "/includes/session.inc"); include($path_to_root . "/purchasing/includes/purchasing_ui.inc"); +include($path_to_root . "/reporting/includes/reporting.inc"); $js = ""; if ($use_popup_windows) $js .= get_js_open_window(900, 500); if ($use_date_picker) $js .= get_js_date_picker(); -page(_("Supplier Inquiry"), false, false, "", $js); +page(_($help_context = "Supplier Inquiry"), false, false, "", $js); if (isset($_GET['supplier_id'])){ $_POST['supplier_id'] = $_GET['supplier_id']; @@ -25,7 +36,7 @@ if (isset($_GET['ToDate'])){ //------------------------------------------------------------------------------------------------ -start_form(false, true); +start_form(); if (!isset($_POST['supplier_id'])) $_POST['supplier_id'] = get_global_supplier(); @@ -35,18 +46,15 @@ start_row(); supplier_list_cells(_("Select a supplier:"), 'supplier_id', null, true); -date_cells(_("From:"), 'TransAfterDate', null, -30); +date_cells(_("From:"), 'TransAfterDate', '', null, -30); date_cells(_("To:"), 'TransToDate'); -supp_allocations_list_cells("filterType", null); +supp_allocations_list_cell("filterType", null); -submit_cells('Refresh Inquiry', _("Search")); +submit_cells('RefreshInquiry', _("Search"),'',_('Refresh Inquiry'), 'default'); end_row(); end_table(); - -end_form(); - set_global_supplier($_POST['supplier_id']); //------------------------------------------------------------------------------------------------ @@ -78,149 +86,113 @@ function display_supplier_summary($supplier_record) end_row(); end_table(1); } - //------------------------------------------------------------------------------------------------ -function get_transactions() +div_start('totals_tbl'); +if (($_POST['supplier_id'] != "") && ($_POST['supplier_id'] != ALL_TEXT)) { - global $db; - - $date_after = date2sql($_POST['TransAfterDate']); - $date_to = date2sql($_POST['TransToDate']); - - // Sherifoz 22.06.03 Also get the description - $sql = "SELECT ".TB_PREF."supp_trans.type, ".TB_PREF."supp_trans.trans_no, - ".TB_PREF."supp_trans.tran_date, ".TB_PREF."supp_trans.reference, ".TB_PREF."supp_trans.supp_reference, - (".TB_PREF."supp_trans.ov_amount + ".TB_PREF."supp_trans.ov_gst + ".TB_PREF."supp_trans.ov_discount) AS TotalAmount, ".TB_PREF."supp_trans.alloc AS Allocated, - ((".TB_PREF."supp_trans.type = 20 OR ".TB_PREF."supp_trans.type = 21) AND ".TB_PREF."supp_trans.due_date < '" . date2sql(Today()) . "') AS OverDue, - (ABS(".TB_PREF."supp_trans.ov_amount + ".TB_PREF."supp_trans.ov_gst + ".TB_PREF."supp_trans.ov_discount - ".TB_PREF."supp_trans.alloc) <= 0.005) AS Settled, - ".TB_PREF."suppliers.curr_code, ".TB_PREF."suppliers.supp_name, ".TB_PREF."supp_trans.due_date - FROM ".TB_PREF."supp_trans, ".TB_PREF."suppliers - WHERE ".TB_PREF."suppliers.supplier_id = ".TB_PREF."supp_trans.supplier_id - AND ".TB_PREF."supp_trans.tran_date >= '$date_after' - AND ".TB_PREF."supp_trans.tran_date <= '$date_to'"; - if ($_POST['supplier_id'] != reserved_words::get_all()) - $sql .= " AND ".TB_PREF."supp_trans.supplier_id = '" . $_POST['supplier_id'] . "'"; - if (isset($_POST['filterType']) && $_POST['filterType'] != reserved_words::get_all()) - { - if (($_POST['filterType'] == '1')) - { - $sql .= " AND (".TB_PREF."supp_trans.type = 20 OR ".TB_PREF."supp_trans.type = 2)"; - } - elseif (($_POST['filterType'] == '2')) - { - $sql .= " AND ".TB_PREF."supp_trans.type = 20 "; - } - elseif ($_POST['filterType'] == '3') - { - $sql .= " AND (".TB_PREF."supp_trans.type = 22 OR ".TB_PREF."supp_trans.type = 1) "; - } - elseif (($_POST['filterType'] == '4') || ($_POST['filterType'] == '5')) - { - $sql .= " AND ".TB_PREF."supp_trans.type = 21 "; - } - - if (($_POST['filterType'] == '2') || ($_POST['filterType'] == '5')) - { - $today = date2sql(Today()); - $sql .= " AND ".TB_PREF."supp_trans.due_date < '$today' "; - } - } - - $sql .= " ORDER BY ".TB_PREF."supp_trans.tran_date"; - - return db_query($sql,"No supplier transactions were returned"); + $supplier_record = get_supplier_details($_POST['supplier_id']); + display_supplier_summary($supplier_record); } +div_end(); -//------------------------------------------------------------------------------------------------ - -if (($_POST['supplier_id'] != "") && ($_POST['supplier_id'] != reserved_words::get_all())) +if(get_post('RefreshInquiry')) { - $supplier_record = get_supplier_details($_POST['supplier_id']); - display_supplier_summary($supplier_record); + $Ajax->activate('totals_tbl'); } //------------------------------------------------------------------------------------------------ +function systype_name($dummy, $type) +{ + global $systypes_array; + return $systypes_array[$type]; +} -$result = get_transactions(); - -if (db_num_rows($result) == 0) +function trans_view($trans) { - display_note(_("There are no transactions to display for the given dates."), 1, 1); - end_page(); - exit; + return get_trans_view_str($trans["type"], $trans["trans_no"]); } -//------------------------------------------------------------------------------------------------ +function due_date($row) +{ + return ($row["type"]== ST_SUPPINVOICE) || ($row["type"]== ST_SUPPCREDIT) ? $row["due_date"] : ''; +} -/*show a table of the transactions returned by the sql */ +function gl_view($row) +{ + return get_gl_view_str($row["type"], $row["trans_no"]); +} -start_table("$table_style width=80%"); -if ($_POST['supplier_id'] == reserved_words::get_all()) - $th = array(_("Type"), _("#"), _("Reference"), _("Supplier"), - _("Supplier's Reference"), _("Date"), _("Due Date"), _("Currency"), - _("Debit"), _("Credit"), ""); -else - $th = array(_("Type"), _("#"), _("Reference"), - _("Supplier's Reference"), _("Date"), _("Due Date"), - _("Debit"), _("Credit"), ""); -table_header($th); - -$j = 1; -$k = 0; //row colour counter -$over_due = false; -while ($myrow = db_fetch($result)) +function credit_link($row) { + return $row['type'] == ST_SUPPINVOICE && $row["TotalAmount"] - $row["Allocated"] > 0 ? + pager_link(_("Credit This"), + "/purchasing/supplier_credit.php?New=1&invoice_no=". + $row['trans_no'], ICON_CREDIT) + : ''; +} - if ($myrow['OverDue'] == 1) - { - start_row("class='overduebg'"); - $over_due = true; - } - else - { - alt_table_row_color($k); - } +function fmt_debit($row) +{ + $value = $row["TotalAmount"]; + return $value>=0 ? price_format($value) : ''; - $date = sql2date($myrow["tran_date"]); +} - $duedate = ((($myrow["type"]== 20) || ($myrow["type"]== 21))?sql2date($myrow["due_date"]):""); +function fmt_credit($row) +{ + $value = -$row["TotalAmount"]; + return $value>0 ? price_format($value) : ''; +} +function prt_link($row) +{ + if ($row['type'] == ST_SUPPAYMENT || $row['type'] == ST_BANKPAYMENT || $row['type'] == ST_SUPPCREDIT) + return print_document_link($row['trans_no']."-".$row['type'], _("Print Remittance"), true, ST_SUPPAYMENT, ICON_PRINT); +} - label_cell(systypes::name($myrow["type"])); - label_cell(get_trans_view_str($myrow["type"],$myrow["trans_no"])); - label_cell(get_trans_view_str($myrow["type"],$myrow["trans_no"], $myrow["reference"])); - if ($_POST['supplier_id'] == reserved_words::get_all()) - label_cell($myrow["supp_name"]); - label_cell($myrow["supp_reference"]); - label_cell($date); - label_cell($duedate); - if ($_POST['supplier_id'] == reserved_words::get_all()) - label_cell($myrow["curr_code"]); - if ($myrow["TotalAmount"] >= 0) - label_cell(""); - amount_cell(abs($myrow["TotalAmount"])); - if ($myrow["TotalAmount"] < 0) - label_cell(""); +function check_overdue($row) +{ + return $row['OverDue'] == 1 + && (abs($row["TotalAmount"]) - $row["Allocated"] != 0); +} +//------------------------------------------------------------------------------------------------ - label_cell(get_gl_view_str($myrow["type"], $myrow["trans_no"])); +$sql = get_sql_for_supplier_inquiry(); + +$cols = array( + _("Type") => array('fun'=>'systype_name', 'ord'=>''), + _("#") => array('fun'=>'trans_view', 'ord'=>''), + _("Reference"), + _("Supplier"), + _("Supplier's Reference"), + _("Date") => array('name'=>'tran_date', 'type'=>'date', 'ord'=>'desc'), + _("Due Date") => array('type'=>'date', 'fun'=>'due_date'), + _("Currency") => array('align'=>'center'), + _("Debit") => array('align'=>'right', 'fun'=>'fmt_debit'), + _("Credit") => array('align'=>'right', 'insert'=>true,'fun'=>'fmt_credit'), + array('insert'=>true, 'fun'=>'gl_view'), + array('insert'=>true, 'fun'=>'credit_link'), + array('insert'=>true, 'fun'=>'prt_link') + ); + +if ($_POST['supplier_id'] != ALL_TEXT) +{ + $cols[_("Supplier")] = 'skip'; + $cols[_("Currency")] = 'skip'; +} +//------------------------------------------------------------------------------------------------ - end_row(); - $j++; - If ($j == 12) - { - $j=1; - table_header($th); - } -//end of page full new headings if -} -//end of while loop +/*show a table of the transactions returned by the sql */ +$table =& new_db_pager('trans_tbl', $sql, $cols); +$table->set_marker('check_overdue', _("Marked items are overdue.")); -end_table(1); -if ($over_due) - display_note(_("Marked items are overdue."), 0, 1, "class='overduefg'"); +$table->width = "85%"; +display_db_pager($table); +end_form(); end_page(); + ?>