Thread: [Frontaccounting-cvs_updates] /hgroot/frontaccounting/frontaccounting: Cleanup in get_sql_for_...
Brought to you by:
frontaccounting,
itronics
From: FrontAccounting <fro...@us...> - 2013-01-29 14:30:48
|
details: http://frontaccounting.hg.sourceforge.net:8000/hgroot/frontaccounting/frontaccounting/hgroot/frontaccounting/frontaccounting/rev/71a48752dc9d changeset: 3172:71a48752dc9d user: Janusz Dobrowolski <ja...@fr...> date: Sun Jan 27 17:55:08 2013 +0100 description: Cleanup in get_sql_for_supplier_inquiry(). diffstat: purchasing/includes/db/supp_trans_db.inc | 28 ++++++++++++++-------------- purchasing/inquiry/supplier_inquiry.php | 2 +- 2 files changed, 15 insertions(+), 15 deletions(-) diffs (79 lines): diff -r 887bb10e4e9d -r 71a48752dc9d purchasing/includes/db/supp_trans_db.inc --- a/purchasing/includes/db/supp_trans_db.inc Tue Jan 29 11:48:17 2013 +0100 +++ b/purchasing/includes/db/supp_trans_db.inc Sun Jan 27 17:55:08 2013 +0100 @@ -163,10 +163,10 @@ //---------------------------------------------------------------------------------------- -function get_sql_for_supplier_inquiry() +function get_sql_for_supplier_inquiry($filter, $after_date, $to_date, $supplier_id=ALL_TEXT) { - $date_after = date2sql($_POST['TransAfterDate']); - $date_to = date2sql($_POST['TransToDate']); + $date_after = date2sql($after_date); + $date_to = date2sql($to_date); $sql = "SELECT trans.type, trans.trans_no, @@ -203,38 +203,38 @@ AND trans.delivery_date >= '$date_after' AND trans.delivery_date <= '$date_to'"; - if ($_POST['supplier_id'] != ALL_TEXT) { - $sql .= " AND trans.supplier_id = ".db_escape($_POST['supplier_id']); - $sql2 .= " AND trans.supplier_id = ".db_escape($_POST['supplier_id']); + if ($supplier_id != ALL_TEXT) { + $sql .= " AND trans.supplier_id = ".db_escape($supplier_id); + $sql2 .= " AND trans.supplier_id = ".db_escape($supplier_id); } - if (($_POST['filterType'] == '6')) + if (($filter == '6')) { $sql = $sql2; } - elseif (!isset($_POST['filterType']) || $_POST['filterType'] == ALL_TEXT || $_POST['filterType'] == '6') { + elseif (!isset($filter) || $filter == ALL_TEXT || $filter == '6') { $sql = "SELECT * FROM (($sql) UNION ($sql2)) as tr"; } - if (isset($_POST['filterType']) && $_POST['filterType'] != ALL_TEXT) + if (isset($filter) && $filter != ALL_TEXT) { - if (($_POST['filterType'] == '1')) + if (($filter == '1')) { $sql .= " AND (trans.type = ".ST_SUPPINVOICE." OR trans.type = ".ST_BANKDEPOSIT.")"; } - elseif (($_POST['filterType'] == '2')) + elseif (($filter == '2')) { $sql .= " AND trans.type = ".ST_SUPPINVOICE." "; } - elseif ($_POST['filterType'] == '3') + elseif ($filter == '3') { $sql .= " AND (trans.type = ".ST_SUPPAYMENT." OR trans.type = ".ST_BANKPAYMENT.") "; } - elseif (($_POST['filterType'] == '4') || ($_POST['filterType'] == '5')) + elseif (($filter == '4') || ($filter == '5')) { $sql .= " AND trans.type = ".ST_SUPPCREDIT." "; } - if (($_POST['filterType'] == '2') || ($_POST['filterType'] == '5')) + if (($filter == '2') || ($filter == '5')) { $today = date2sql(Today()); $sql .= " AND trans.due_date < '$today' "; diff -r 887bb10e4e9d -r 71a48752dc9d purchasing/inquiry/supplier_inquiry.php --- a/purchasing/inquiry/supplier_inquiry.php Tue Jan 29 11:48:17 2013 +0100 +++ b/purchasing/inquiry/supplier_inquiry.php Sun Jan 27 17:55:08 2013 +0100 @@ -162,7 +162,7 @@ } //------------------------------------------------------------------------------------------------ -$sql = get_sql_for_supplier_inquiry(); +$sql = get_sql_for_supplier_inquiry($_POST['filterType'], $_POST['TransAfterDate'], $_POST['TransToDate'], $_POST['supplier_id']); $cols = array( _("Type") => array('fun'=>'systype_name', 'ord'=>''), |