X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=purchasing%2Finquiry%2Fsupplier_allocation_inquiry.php;h=ee78a35271f1c4017e39aecd8df1730940c7aa94;hb=e000d0b3fb245b02de604356b1f60c65b5f4962f;hp=3e233b1477bcbbb5dc9e12b512c5d88eb7af95f2;hpb=61027f425da0c66e2802076d6b48472462f3cf3b;p=fa-stable.git diff --git a/purchasing/inquiry/supplier_allocation_inquiry.php b/purchasing/inquiry/supplier_allocation_inquiry.php index 3e233b14..ee78a352 100644 --- a/purchasing/inquiry/supplier_allocation_inquiry.php +++ b/purchasing/inquiry/supplier_allocation_inquiry.php @@ -2,6 +2,7 @@ $page_security=2; $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"); @@ -37,62 +38,120 @@ start_row(); supplier_list_cells(_("Select a supplier: "), 'supplier_id', $_POST['supplier_id'], true); -date_cells(_("From:"), 'TransAfterDate', null, -30); -date_cells(_("To:"), 'TransToDate', null, 1); +date_cells(_("From:"), 'TransAfterDate', '', null, -30); +date_cells(_("To:"), 'TransToDate', '', null, 1); -supp_allocations_list_cells("filterType", null); +supp_allocations_list_cell("filterType", null); check_cells(_("show settled:"), 'showSettled', null); -submit_cells('Refresh Inquiry', _("Search")); +submit_cells('RefreshInquiry', _("Search"),'',_('Refresh Inquiry'), true); set_global_supplier($_POST['supplier_id']); end_row(); end_table(); end_form(); +//------------------------------------------------------------------------------------------------ +function check_overdue($row) +{ + return ($row['TotalAmount']>$row['Allocated']) && + $row['OverDue'] == 1; +} +function systype_name($dummy, $type) +{ + return systypes::name($type); +} -//------------------------------------------------------------------------------------------------ +function view_link($trans) +{ + return get_trans_view_str($trans["type"], $trans["trans_no"]); +} -function get_transactions() +function due_date($row) { - global $db; + return (($row["type"] == 20) || ($row["type"]== 21)) + ? $row["due_date"] : ""; +} - $date_after = date2sql($_POST['TransAfterDate']); - $date_to = date2sql($_POST['TransToDate']); +function fmt_balance($row) +{ + $value = ($row["type"] == 1 || $row["type"] == 21 || $row["type"] == 22) + ? -$row["TotalAmount"] - $row["Allocated"] + : $row["TotalAmount"] - $row["Allocated"]; + return $value; +} + +function alloc_link($row) +{ + $link = + pager_link(_("Allocations"), + "/purchasing/allocations/supplier_allocate.php?trans_no=" . + $row["trans_no"]. "&trans_type=" . $row["type"] ); + + return (($row["type"] == 1 || $row["type"] == 21 || $row["type"] == 22) + && (-$row["TotalAmount"] - $row["Allocated"]) > 0) + ? $link : ''; +} + +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) : ''; +} +//------------------------------------------------------------------------------------------------ + + $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, - ".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'"; + $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 ".TB_PREF."supp_trans.supplier_id = '" . $_POST['supplier_id'] . "'"; + $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 ".TB_PREF."supp_trans.type = 20 "; + $sql .= " AND trans.type = 20 "; } elseif ($_POST['filterType'] == '3') { - $sql .= " AND ".TB_PREF."supp_trans.type = 22 "; + $sql .= " AND trans.type = 22 "; } elseif (($_POST['filterType'] == '4') || ($_POST['filterType'] == '5')) { - $sql .= " AND ".TB_PREF."supp_trans.type = 21 "; + $sql .= " AND trans.type = 21 "; } 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' "; } } @@ -101,105 +160,39 @@ function get_transactions() $sql .= " AND (round(abs(ov_amount + ov_gst + ov_discount) - alloc,6) != 0) "; } - $sql .= " ORDER BY ".TB_PREF."supp_trans.tran_date"; - - return db_query($sql,"No supplier transactions were returned"); -} - -//------------------------------------------------------------------------------------------------ - -$result = get_transactions(); - -if (db_num_rows($result) == 0) -{ - display_note(_("There are no transactions to display for the given dates."), 1, 1); - end_page(); - exit; +$cols = array( + _("Type") => array('fun'=>'systype_name'), + _("Number") => array('fun'=>'view_link', 'ord'=>''), + _("Reference"), + _("Supplier") => array('ord'=>''), + _("Supp Reference"), + _("Date") => array('type'=>'date', 'ord'=>'asc'), + _("Due Date") => array('fun'=>'due_date'), + _("Currency") => array('align'=>'center'), + _("Debit") => array('align'=>'right', 'fun'=>'fmt_debit'), + _("Credit") => array('align'=>'right', 'insert'=>true, 'fun'=>'fmt_credit'), + _("Allocated") => 'amount', + _("Balance") => array('type'=>'amount', 'insert'=>true, 'fun'=>'fmt_balance'), + array('insert'=>true, 'fun'=>'alloc_link') + ); + +if ($_POST['supplier_id'] != reserved_words::get_all()) { + $cols[_("Supplier")] = 'skip'; + $cols[_("Currency")] = 'skip'; } - //------------------------------------------------------------------------------------------------ -/*show a table of the transactions returned by the sql */ - -start_table("$table_style width=90%"); -if ($_POST['supplier_id'] == reserved_words::get_all()) - $th = array(_("Type"), _("Number"), _("Reference"), _("Supplier"), - _("Supp Reference"), _("Date"), _("Due Date"), _("Currency"), - _("Debit"), _("Credit"), _("Allocated"), _("Balance"), ""); -else - $th = array(_("Type"), _("Number"), _("Reference"), _("Supp Reference"), _("Date"), _("Due Date"), - _("Debit"), _("Credit"), _("Allocated"), _("Balance"), ""); -table_header($th); - -$j = 1; -$k = 0; //row colour counter -$over_due = false; -while ($myrow = db_fetch($result)) -{ +$table =& new_db_pager('doc_tbl', $sql, $cols); +$table->set_marker('check_overdue', _("Marked items are overdue.")); - if ($myrow['OverDue'] == 1) - { - 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($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(""); - amount_cell($myrow["Allocated"]); - if ($myrow["type"] == 1 || $myrow["type"] == 21 || $myrow["type"] == 22) - $balance = -$myrow["TotalAmount"] - $myrow["Allocated"]; - else - $balance = $myrow["TotalAmount"] - $myrow["Allocated"]; - amount_cell($balance); - - //if (($myrow["type"] == 1 || $myrow["type"] == 21 || $myrow["type"] == 22) && - // $myrow["Void"] == 0) - if (($myrow["type"] == 1 || $myrow["type"] == 21 || $myrow["type"] == 22) && - $balance > 0) - { - label_cell("" . _("Allocations") . ""); - } - else - label_cell(""); - - end_row(); - - $j++; - If ($j == 12) - { - $j = 1; - table_header($th); - } -//end of page full new headings if +if (get_post('RefreshInquiry')) { + $table->set_sql($sql); + $table->set_columns($cols); } -//end of while loop +start_form(); -end_table(1); -if ($over_due) - display_note(_("Marked items are overdue."), 0, 1, "class='overduefg'"); +display_db_pager($table); +end_form(); end_page(); ?>