X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=purchasing%2Finquiry%2Fsupplier_inquiry.php;h=dff07c662cbf465f6b7485ecc355d5fbca486f2c;hb=ddadb47f2620ce6902ad4694ce6512568862ba05;hp=74d4ea91eb96a65c0a16fa41899199138d122d37;hpb=f12dbe7523bb1abc6cd69b009ef8f0be838f5348;p=fa-stable.git diff --git a/purchasing/inquiry/supplier_inquiry.php b/purchasing/inquiry/supplier_inquiry.php index 74d4ea91..dff07c66 100644 --- a/purchasing/inquiry/supplier_inquiry.php +++ b/purchasing/inquiry/supplier_inquiry.php @@ -1,7 +1,17 @@ . +***********************************************************************/ +$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"); @@ -25,7 +35,7 @@ if (isset($_GET['ToDate'])){ //------------------------------------------------------------------------------------------------ -start_form(false, true); +start_form(); if (!isset($_POST['supplier_id'])) $_POST['supplier_id'] = get_global_supplier(); @@ -40,13 +50,11 @@ date_cells(_("To:"), 'TransToDate'); supp_allocations_list_cell("filterType", null); -submit_cells('Refresh Inquiry', _("Search"),'',_('Refresh Inquiry'), true); +submit_cells('RefreshInquiry', _("Search"),'',_('Refresh Inquiry'), 'default'); end_row(); end_table(); - end_form(); - set_global_supplier($_POST['supplier_id']); //------------------------------------------------------------------------------------------------ @@ -78,156 +86,163 @@ function display_supplier_summary($supplier_record) end_row(); end_table(1); } +//------------------------------------------------------------------------------------------------ + +div_start('totals_tbl'); +if (($_POST['supplier_id'] != "") && ($_POST['supplier_id'] != ALL_TEXT)) +{ + $supplier_record = get_supplier_details($_POST['supplier_id']); + display_supplier_summary($supplier_record); +} +div_end(); + +if(get_post('RefreshInquiry')) +{ + $Ajax->activate('totals_tbl'); +} //------------------------------------------------------------------------------------------------ +function systype_name($dummy, $type) +{ + global $systypes_array; + return $systypes_array[$type]; +} + +function trans_view($trans) +{ + 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"] : ''; +} + +function gl_view($row) +{ + return get_gl_view_str($row["type"], $row["trans_no"]); +} + +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) + : ''; +} + +function fmt_debit($row) +{ + $value = $row["TotalAmount"]; + return $value>=0 ? price_format($value) : ''; + +} + +function fmt_credit($row) +{ + $value = -$row["TotalAmount"]; + return $value>0 ? price_format($value) : ''; +} -function get_transactions() +function prt_link($row) { - global $db; + return print_document_link($row['trans_no'], _("Print"), true, $row['type']); +} + +function check_overdue($row) +{ + return $row['OverDue'] == 1 + && (abs($row["TotalAmount"]) - $row["Allocated"] != 0); +} +//------------------------------------------------------------------------------------------------ $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()) + $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 = ".ST_SUPPINVOICE." OR trans.type = ".ST_SUPPCREDIT.") AND trans.due_date < '" . date2sql(Today()) . "') AS OverDue, + (ABS(trans.ov_amount + trans.ov_gst + trans.ov_discount - trans.alloc) <= 0.005) AS Settled + 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' + AND trans.ov_amount != 0"; // exclude voided transactions + if ($_POST['supplier_id'] != ALL_TEXT) + $sql .= " AND trans.supplier_id = '" . $_POST['supplier_id'] . "'"; + if (isset($_POST['filterType']) && $_POST['filterType'] != ALL_TEXT) { if (($_POST['filterType'] == '1')) { - $sql .= " AND (".TB_PREF."supp_trans.type = 20 OR ".TB_PREF."supp_trans.type = 2)"; + $sql .= " AND (trans.type = ".ST_SUPPINVOICE." OR trans.type = ".ST_BANKDEPOSIT.")"; } elseif (($_POST['filterType'] == '2')) { - $sql .= " AND ".TB_PREF."supp_trans.type = 20 "; + $sql .= " AND trans.type = ".ST_SUPPINVOICE." "; } elseif ($_POST['filterType'] == '3') { - $sql .= " AND (".TB_PREF."supp_trans.type = 22 OR ".TB_PREF."supp_trans.type = 1) "; + $sql .= " AND (trans.type = ".ST_SUPPAYMENT." OR trans.type = ".ST_BANKPAYMENT.") "; } elseif (($_POST['filterType'] == '4') || ($_POST['filterType'] == '5')) { - $sql .= " AND ".TB_PREF."supp_trans.type = 21 "; + $sql .= " AND trans.type = ".ST_SUPPCREDIT." "; } if (($_POST['filterType'] == '2') || ($_POST['filterType'] == '5')) { $today = date2sql(Today()); - $sql .= " AND ".TB_PREF."supp_trans.due_date < '$today' "; + $sql .= " AND trans.due_date < '$today' "; } } - $sql .= " ORDER BY ".TB_PREF."supp_trans.tran_date"; - - return db_query($sql,"No supplier transactions were returned"); -} - -//------------------------------------------------------------------------------------------------ - -div_start('totals_tbl'); -if (($_POST['supplier_id'] != "") && ($_POST['supplier_id'] != reserved_words::get_all())) +$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') + ); + +if ($_POST['supplier_id'] != ALL_TEXT) { - $supplier_record = get_supplier_details($_POST['supplier_id']); - display_supplier_summary($supplier_record); + $cols[_("Supplier")] = 'skip'; + $cols[_("Currency")] = 'skip'; } -div_end(); - //------------------------------------------------------------------------------------------------ -$result = get_transactions(); - -if(get_post('Refresh Inquiry')) -{ - $Ajax->activate('trans_tbl'); - $Ajax->activate('totals_tbl'); -} - -//------------------------------------------------------------------------------------------------ /*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.")); -div_start('trans_tbl'); -if (db_num_rows($result) == 0) -{ - display_note(_("There are no transactions to display for the given dates."), 1, 1); -} else -{ - 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)) - { - - if ($myrow['OverDue'] == 1 && $myrow['Settled'] == 0) - { - start_row("class='overduebg'"); - $over_due = true; - } - else - { - alt_table_row_color($k); - } - - $date = sql2date($myrow["tran_date"]); - - $duedate = ((($myrow["type"]== 20) || ($myrow["type"]== 21))?sql2date($myrow["due_date"]):""); - - - 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(""); - - label_cell(get_gl_view_str($myrow["type"], $myrow["trans_no"])); - - end_row(); - - $j++; - If ($j == 12) - { - $j=1; - table_header($th); - } - //end of page full new headings if - } - //end of while loop - - end_table(1); - if ($over_due) - display_note(_("Marked items are overdue."), 0, 1, "class='overduefg'"); +if (get_post('RefreshInquiry')) { + $table->set_sql($sql); + $table->set_columns($cols); } -div_end(); +$table->width = "85%"; +start_form(); + +display_db_pager($table); + +end_form(); end_page(); + ?>