From 393fc0d3cfcbf7de823cc580a1088ce3c8b18a3a Mon Sep 17 00:00:00 2001 From: Joe Hunt Date: Fri, 21 Dec 2018 17:01:03 +0100 Subject: [PATCH] Added 2 new reports, Customer Trial Balance and Supplier Trial Balance. @boxygen. --- reporting/rep115.php | 303 +++++++++++++++++++++++++++++++++++++ reporting/rep201.php | 6 +- reporting/rep206.php | 241 +++++++++++++++++++++++++++++ reporting/reports_main.php | 20 +++ 4 files changed, 567 insertions(+), 3 deletions(-) create mode 100644 reporting/rep115.php create mode 100644 reporting/rep206.php diff --git a/reporting/rep115.php b/reporting/rep115.php new file mode 100644 index 00000000..5757fc85 --- /dev/null +++ b/reporting/rep115.php @@ -0,0 +1,303 @@ +. +***********************************************************************/ +$page_security = 'SA_CUSTPAYMREP'; + +// ---------------------------------------------------------------- +// $ Revision: 2.0 $ +// Creator: @boxygen +// date_: 2018-12-20 +// Title: Customer Trial Balances +// ---------------------------------------------------------------- +$path_to_root=".."; + +include_once($path_to_root . "/includes/session.inc"); +include_once($path_to_root . "/includes/date_functions.inc"); +include_once($path_to_root . "/includes/data_checks.inc"); +include_once($path_to_root . "/gl/includes/gl_db.inc"); +include_once($path_to_root . "/sales/includes/db/customers_db.inc"); + +//---------------------------------------------------------------------------------------------------- + +print_customer_balances(); + +function get_open_balance($debtorno, $to) +{ + if ($to) + $to = date2sql($to); + + $sql = "SELECT SUM(IF(t.type = ".ST_SALESINVOICE." OR (t.type IN (".ST_JOURNAL." , ".ST_BANKPAYMENT.") AND t.ov_amount>0), + -abs(t.ov_amount + t.ov_gst + t.ov_freight + t.ov_freight_tax + t.ov_discount), 0)) AS charges,"; + $sql .= "SUM(IF(t.type != ".ST_SALESINVOICE." AND NOT(t.type IN (".ST_JOURNAL." , ".ST_BANKPAYMENT.") AND t.ov_amount>0), + abs(t.ov_amount + t.ov_gst + t.ov_freight + t.ov_freight_tax + t.ov_discount) * -1, 0)) AS credits,"; + $sql .= "SUM(IF(t.type != ".ST_SALESINVOICE." AND NOT(t.type IN (".ST_JOURNAL." , ".ST_BANKPAYMENT.")), + t.alloc * -1, t.alloc)) AS Allocated,"; + $sql .= "SUM(IF(t.type = ".ST_SALESINVOICE.", 1, -1) * + (abs(t.ov_amount + t.ov_gst + t.ov_freight + t.ov_freight_tax + t.ov_discount) - abs(t.alloc))) AS OutStanding + FROM ".TB_PREF."debtor_trans t + WHERE t.debtor_no = ".db_escape($debtorno) + ." AND t.type <> ".ST_CUSTDELIVERY; + if ($to) + $sql .= " AND t.tran_date < '$to'"; + $sql .= " GROUP BY debtor_no"; + + $result = db_query($sql,"No transactions were returned"); + return db_fetch($result); +} + +function get_transactions($debtorno, $from, $to, $only_rec) +{ + $from = date2sql($from); + $to = date2sql($to); + + $allocated_from = + "(SELECT trans_type_from as trans_type, trans_no_from as trans_no, date_alloc, sum(amt) amount + FROM ".TB_PREF."cust_allocations alloc + WHERE person_id=".db_escape($debtorno)." + AND date_alloc <= '$to' + GROUP BY trans_type_from, trans_no_from) alloc_from"; + $allocated_to = + "(SELECT trans_type_to as trans_type, trans_no_to as trans_no, date_alloc, sum(amt) amount + FROM ".TB_PREF."cust_allocations alloc + WHERE person_id=".db_escape($debtorno)." + AND date_alloc <= '$to' + GROUP BY trans_type_to, trans_no_to) alloc_to"; + + $sql = "SELECT trans.*, comments.memo_, + (trans.ov_amount + trans.ov_gst + trans.ov_freight + trans.ov_freight_tax + trans.ov_discount) AS TotalAmount, + IFNULL(alloc_from.amount, alloc_to.amount) AS Allocated, + ((trans.type = ".ST_SALESINVOICE.") AND trans.due_date < '$to') AS OverDue + FROM ".TB_PREF."debtor_trans trans + LEFT JOIN ".TB_PREF."voided voided ON trans.type=voided.type AND trans.trans_no=voided.id + LEFT JOIN ".TB_PREF."comments comments ON trans.type=comments.type AND trans.trans_no=comments.id + LEFT JOIN $allocated_from ON alloc_from.trans_type = trans.type AND alloc_from.trans_no = trans.trans_no + LEFT JOIN $allocated_to ON alloc_to.trans_type = trans.type AND alloc_to.trans_no = trans.trans_no + WHERE trans.tran_date >= '$from' + AND trans.tran_date <= '$to' + AND trans.debtor_no = ".db_escape($debtorno); + $sql .= " AND trans.type <> ".ST_CUSTDELIVERY; + $sql .= " AND ISNULL(voided.id) + ORDER BY trans.tran_date "; + + return db_query($sql,"No transactions were returned"); +} + +function get_customer_reference ($order_number) +{ + + $sql = "SELECT customer_ref FROM ".TB_PREF."sales_orders WHERE order_no ='$order_number' AND trans_type=".ST_SALESORDER.""; + + $result = db_query($sql,"No Transcation were returned"); + + $val = db_fetch($result); + + return $val['customer_ref']; +} +//---------------------------------------------------------------------------------------------------- + +function print_customer_balances() +{ + global $path_to_root, $systypes_array; + + $from = $_POST['PARAM_0']; + $to = $_POST['PARAM_1']; + $fromcust = $_POST['PARAM_2']; + $area = $_POST['PARAM_3']; //added by Faisal to filter by area + $folk = $_POST['PARAM_4']; // added by Faisal to filter by sales person + $currency = $_POST['PARAM_5']; + $no_zeros = $_POST['PARAM_6']; + $hide_trans = 1; + $comments = $_POST['PARAM_7']; + $orientation = $_POST['PARAM_8']; + $destination = $_POST['PARAM_9']; + if ($destination) + include_once($path_to_root . "/reporting/includes/excel_report.inc"); + else + include_once($path_to_root . "/reporting/includes/pdf_report.inc"); + + $orientation = ($orientation ? 'L' : 'P'); + if ($fromcust == ALL_TEXT) + $cust = _('All'); + else + $cust = get_customer_name($fromcust); + $dec = user_price_dec(); + + if ($area == ALL_NUMERIC) + $area = 0; + + if ($area == 0) + $sarea = _('All Areas'); + else + $sarea = get_area_name($area); + + if ($folk == ALL_NUMERIC) + $folk = 0; + if ($folk == 0) + $salesfolk = _('All Sales Man'); + else + $salesfolk = get_salesman_name($folk); + + if ($currency == ALL_TEXT) + { + $convert = true; + $currency = _('Balances in Home Currency'); + } + else + $convert = false; + + if ($no_zeros) $nozeros = _('Yes'); + else $nozeros = _('No'); + + $cols = array(0, 70, 140, 180, 230, 270, 350, 445, 495, 555); + + $headers = array(_('Name'), '', '', _('Opening Bal'), '', _('Debits'), _('Credits'), '', _('Balance')); + + $aligns = array('left', 'left', 'left', 'right', 'left', 'right', 'right', 'right', 'right'); + + $params = array( 0 => $comments, + 1 => array('text' => _('Period'), 'from' => $from, 'to' => $to), + 2 => array('text' => _('Customer'), 'from' => $cust, 'to' => ''), + 3 => array('text' => _('Currency'), 'from' => $currency, 'to' => ''), + 4 => array('text' => _('Suppress Zeros'), 'from' => $nozeros, 'to' => '')); + + $rep = new FrontReport(_('Customer Trial Balance'), "CustomerTB", user_pagesize(), 9, $orientation); + if ($orientation == 'L') + recalculate_cols($cols); + $rep->Font(); + $rep->Info($params, $cols, $headers, $aligns); + $rep->NewPage(); + + $grandtotal = array(0,0,0,0); + + $sql = "SELECT ".TB_PREF."debtors_master.debtor_no, name, curr_code FROM ".TB_PREF."debtors_master + INNER JOIN ".TB_PREF."cust_branch + ON ".TB_PREF."debtors_master.debtor_no=".TB_PREF."cust_branch.debtor_no + INNER JOIN ".TB_PREF."areas + ON ".TB_PREF."cust_branch.area = ".TB_PREF."areas.area_code + INNER JOIN ".TB_PREF."salesman + ON ".TB_PREF."cust_branch.salesman=".TB_PREF."salesman.salesman_code"; + if ($fromcust != ALL_TEXT ) + { + // if ($area != 0 || $folk != 0) continue; + $sql .= " WHERE ".TB_PREF."debtors_master.debtor_no=".db_escape($fromcust); + } + elseif ($area != 0) + { + if ($folk != 0) + $sql .= " WHERE ".TB_PREF."salesman.salesman_code=".db_escape($folk)." + AND ".TB_PREF."areas.area_code=".db_escape($area); + else + $sql .= " WHERE ".TB_PREF."areas.area_code=".db_escape($area); + } + elseif ($folk != 0 ) + { + $sql .= " WHERE ".TB_PREF."salesman.salesman_code=".db_escape($folk); + } + + $sql .= " GROUP BY ".TB_PREF."debtors_master.debtor_no ORDER BY name"; + + $result = db_query($sql, "The customers could not be retrieved"); + + $tot_cur_cr = $tot_cur_db = 0; + while ($myrow = db_fetch($result)) + { + if (!$convert && $currency != $myrow['curr_code']) continue; + + $accumulate = 0; + $rate = $convert ? get_exchange_rate_from_home_currency($myrow['curr_code'], Today()) : 1; + $bal = get_open_balance($myrow['debtor_no'], $from, $convert); + $init[0] = $init[1] = 0.0; + $init[0] = round2(abs($bal['charges'] * $rate), $dec); + $init[1] = round2(Abs($bal['credits'] * $rate), $dec); + $init[2] = round2($bal['Allocated'] * $rate, $dec); + $init[3] = $init[0] - $init[1]; + $accumulate += $init[3]; + + $res = get_transactions($myrow['debtor_no'], $from, $to, false); + + $total = array(0,0,0,0); + for ($i = 0; $i < 4; $i++) + { + $total[$i] += $init[$i]; + $grandtotal[$i] += $init[$i]; + } + + if ($no_zeros && $init[3] == 0) continue; + + if (db_num_rows($res) == 0) + { + $rep->TextCol(0, 2, $myrow['name']); + $rep->AmountCol(3, 4, $init[3], $dec); + $rep->AmountCol(8, 9, $init[3], $dec); + //$rep->Line($rep->row - 2); + $rep->NewLine(1); + continue; + } + $curr_cr = $curr_db = 0; + while ($trans = db_fetch($res)) //Detail starts here + { + $item[0] = $item[1] = 0.0; + //modified below by faisal + if ($trans['type'] == ST_CUSTCREDIT || $trans['type'] == ST_CUSTPAYMENT || $trans['type'] == ST_BANKDEPOSIT) + $trans['TotalAmount'] *= -1; + if ($trans['TotalAmount'] > 0.0) + { + $item[0] = round2(abs($trans['TotalAmount']) * $rate, $dec); + $accumulate += $item[0]; + $curr_db += $item[0]; + $tot_cur_db += $item[0]; + $item[2] = round2($trans['Allocated'] * $rate, $dec); + } + else + { + $item[1] = round2(Abs($trans['TotalAmount']) * $rate, $dec); + $accumulate -= $item[1]; + $curr_cr += $item[1]; + $tot_cur_cr +=$item[1]; + $item[2] = round2($trans['Allocated'] * $rate, $dec) * -1; + } + + if ($trans['type'] == ST_JOURNAL || $trans['type'] == ST_SALESINVOICE || $trans['type'] == ST_BANKPAYMENT) + $item[3] = $item[0] - $item[2]; + else + $item[3] = -$item[1] - $item[2]; + + for ($i = 0; $i < 4; $i++) + { + $total[$i] += $item[$i]; + $grandtotal[$i] += $item[$i]; + } + $total[3] = $total[0] - $total[1]; + } + + $rep->TextCol(0, 2, $myrow['name']); + $rep->AmountCol(3, 4, $total[3] + $curr_cr - $curr_db, $dec); + $rep->AmountCol(5, 6, $curr_db, $dec); + $rep->AmountCol(6, 7, $curr_cr, $dec); + $rep->AmountCol(8, 9, $total[3], $dec); + //$rep->Line($rep->row - 2); + $rep->NewLine(1); + } + $rep->Line($rep->row + 4); + $rep->NewLine(); + $rep->fontSize += 2; + $rep->TextCol(0, 3, _('Grand Total')); + $rep->fontSize -= 2; + $grandtotal[3] = $grandtotal[0] - $grandtotal[1]; + + $rep->AmountCol(3, 4, $grandtotal[3] - $tot_cur_db + $tot_cur_cr, $dec); + $rep->AmountCol(5, 6, $tot_cur_db, $dec); + $rep->AmountCol(6, 7, $tot_cur_cr, $dec); + $rep->AmountCol(8, 9, $grandtotal[3], $dec); + $rep->Line($rep->row - 6, 1); + $rep->NewLine(); + $rep->End(); +} \ No newline at end of file diff --git a/reporting/rep201.php b/reporting/rep201.php index 2d5eba8d..d5c5608b 100644 --- a/reporting/rep201.php +++ b/reporting/rep201.php @@ -1,6 +1,6 @@ . +***********************************************************************/ +$page_security = 'SA_SUPPLIERANALYTIC'; + +// ---------------------------------------------------------------- +// $ Revision: 2.0 $ +// Creator: @boxygen, Joe Hunt +// date_: 2018-12-20 +// Title: Supplier Trial Balances +// ---------------------------------------------------------------- +$path_to_root=".."; + +include_once($path_to_root . "/includes/session.inc"); +include_once($path_to_root . "/includes/date_functions.inc"); +include_once($path_to_root . "/includes/data_checks.inc"); +include_once($path_to_root . "/gl/includes/gl_db.inc"); + +//---------------------------------------------------------------------------------------------------- + +print_supplier_balances(); + +function get_open_balance($supplier_id, $to) +{ + if($to) + $to = date2sql($to); + + $sql = "SELECT SUM(IF(t.type = ".ST_SUPPINVOICE." OR (t.type IN (".ST_JOURNAL." , ".ST_BANKDEPOSIT.") AND t.ov_amount>0), + -abs(t.ov_amount + t.ov_gst + t.ov_discount), 0)) AS charges,"; + + $sql .= "SUM(IF(t.type != ".ST_SUPPINVOICE." AND NOT(t.type IN (".ST_JOURNAL." , ".ST_BANKDEPOSIT.") AND t.ov_amount>0), + abs(t.ov_amount + t.ov_gst + t.ov_discount) * -1, 0)) AS credits,"; + + $sql .= "SUM(IF(t.type != ".ST_SUPPINVOICE." AND NOT(t.type IN (".ST_JOURNAL." , ".ST_BANKDEPOSIT.")), + t.alloc * -1, t.alloc)) AS Allocated,"; + + $sql .= "SUM(IF(t.type = ".ST_SUPPINVOICE.", 1, -1) * + (abs(t.ov_amount + t.ov_gst + t.ov_discount) - abs(t.alloc))) AS OutStanding + FROM ".TB_PREF."supp_trans t + WHERE t.supplier_id = ".db_escape($supplier_id); + if ($to) + $sql .= " AND t.tran_date < '$to'"; + $sql .= " GROUP BY supplier_id"; + + $result = db_query($sql,"No transactions were returned"); + return db_fetch($result); +} + +function getTransactions($supplier_id, $from, $to) +{ + $from = date2sql($from); + $to = date2sql($to); + //memo added by faisal + $sql = "SELECT ".TB_PREF."supp_trans.*, comments.memo_, + (".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 = ".ST_SUPPINVOICE.") + AND ".TB_PREF."supp_trans.due_date < '$to') AS OverDue + FROM ".TB_PREF."supp_trans + LEFT JOIN ".TB_PREF."comments comments ON ".TB_PREF."supp_trans.type=comments.type AND ".TB_PREF."supp_trans.trans_no=comments.id + WHERE ".TB_PREF."supp_trans.tran_date >= '$from' AND ".TB_PREF."supp_trans.tran_date <= '$to' + AND ".TB_PREF."supp_trans.supplier_id = '$supplier_id' AND ".TB_PREF."supp_trans.ov_amount!=0 + ORDER BY ".TB_PREF."supp_trans.tran_date"; + + return db_query($sql,"No transactions were returned"); +} + +//---------------------------------------------------------------------------------------------------- + +function print_supplier_balances() +{ + global $path_to_root, $systypes_array; + + $from = $_POST['PARAM_0']; + $to = $_POST['PARAM_1']; + $fromsupp = $_POST['PARAM_2']; + $currency = $_POST['PARAM_3']; + $no_zeros = $_POST['PARAM_4']; + $comments = $_POST['PARAM_5']; + $orientation = $_POST['PARAM_6']; + $destination = $_POST['PARAM_7']; + if ($destination) + include_once($path_to_root . "/reporting/includes/excel_report.inc"); + else + include_once($path_to_root . "/reporting/includes/pdf_report.inc"); + + $orientation = ($orientation ? 'L' : 'P'); + if ($fromsupp == ALL_TEXT) + $supp = _('All'); + else + $supp = get_supplier_name($fromsupp); + $dec = user_price_dec(); + + if ($currency == ALL_TEXT) + { + $convert = true; + $currency = _('Balances in Home currency'); + } + else + $convert = false; + + if ($no_zeros) $nozeros = _('Yes'); + else $nozeros = _('No'); + + $cols = array(0, 100, 130, 190, 250, 320, 385, 450, 515); + + $headers = array(_('Name'), '', '', _('Open Balance'), _('Debit'), + _('Credit'), '', _('Balance')); + + $aligns = array('left', 'left', 'left', 'right', 'right', 'right', 'right', 'right'); + + $params = array( 0 => $comments, + 1 => array('text' => _('Period'), 'from' => $from, 'to' => $to), + 2 => array('text' => _('Supplier'), 'from' => $supp, 'to' => ''), + 3 => array( 'text' => _('Currency'),'from' => $currency, 'to' => ''), + 4 => array('text' => _('Suppress Zeros'), 'from' => $nozeros, 'to' => '')); + + $rep = new FrontReport(_('Supplier Trial Balance'), "SupplierTB", user_pagesize(), 9, $orientation); + if ($orientation == 'L') + recalculate_cols($cols); + + $rep->Font(); + $rep->Info($params, $cols, $headers, $aligns); + $rep->NewPage(); + + $total = array(); + $grandtotal = array(0,0,0,0); + + $sql = "SELECT supplier_id, supp_name AS name, curr_code FROM ".TB_PREF."suppliers"; + if ($fromsupp != ALL_TEXT) + $sql .= " WHERE supplier_id=".db_escape($fromsupp); + $sql .= " ORDER BY supp_name"; + $result = db_query($sql, "The customers could not be retrieved"); + + $tot_cur_cr = $tot_cur_db = 0; + while ($myrow=db_fetch($result)) + { + if (!$convert && $currency != $myrow['curr_code']) + continue; + $accumulate = 0; + $rate = $convert ? get_exchange_rate_from_home_currency($myrow['curr_code'], Today()) : 1; + $bal = get_open_balance($myrow['supplier_id'], $from); + $init[0] = $init[1] = 0.0; + $init[0] = round2(abs($bal['charges']*$rate), $dec); + $init[1] = round2(Abs($bal['credits']*$rate), $dec); + $init[2] = round2($bal['Allocated']*$rate, $dec); + + $init[3] = $init[1] - $init[0]; + $accumulate += $init[3]; + + $res = getTransactions($myrow['supplier_id'], $from, $to); + + $total = array(0,0,0,0); + for ($i = 0; $i < 4; $i++) + { + $total[$i] += $init[$i]; + $grandtotal[$i] += $init[$i]; + } + + if ($no_zeros && $init[3] == 0) continue; + + if (db_num_rows($res) == 0) + { + $rep->TextCol(0, 2, $myrow['name']); + $rep->AmountCol(3, 4, $init[3], $dec); + $rep->AmountCol(7, 8, $init[3], $dec); + //$rep->Line($rep->row - 2); + $rep->NewLine(); + + continue; + } + $curr_db = $curr_cr = 0; + while ($trans=db_fetch($res)) + { + if ($no_zeros && floatcmp(abs($trans['TotalAmount']), $trans['Allocated']) == 0) continue; + $item[0] = $item[1] = 0.0; + if ($trans['TotalAmount'] > 0.0) + { + $item[0] = round2(abs($trans['TotalAmount']) * $rate, $dec); + $curr_cr += $item[0]; + $tot_cur_cr += $item[0]; + + $accumulate -= $item[0]; + } + else + { + $item[1] = round2(abs($trans['TotalAmount']) * $rate, $dec); + $curr_db += $item[1]; + $tot_cur_db += $item[1]; + $accumulate += $item[1]; + } + $item[2] = round2($trans['Allocated'] * $rate, $dec); + if ($trans['TotalAmount'] > 0.0) + $item[3] = $item[2] - $item[0]; + else + $item[3] = ($item[2] - $item[1]) * -1; + + for ($i = 0; $i < 4; $i++) + { + $total[$i] += $item[$i]; + $grandtotal[$i] += $item[$i]; + } + $total[3] = $total[1] - $total[0]; + } + $rep->TextCol(0, 2, $myrow['name']); + $rep->AmountCol(3, 4, $total[3] + $curr_cr - $curr_db, $dec); + $rep->AmountCol(5, 6, $curr_cr, $dec); + $rep->AmountCol(4, 5, $curr_db, $dec); + $rep->AmountCol(7, 8, $total[3], $dec); + for ($i = 2; $i < 4; $i++) + { + $total[$i] = 0.0; + } + //$rep->Line($rep->row - 2); + $rep->NewLine(); + } + $rep->Line($rep->row + 4); // added line by Joe + $rep->NewLine(); + $rep->fontSize += 2; + $rep->TextCol(0, 3, _('Grand Total')); + $rep->fontSize -= 2; + + $grandtotal[3] = $grandtotal[1] - $grandtotal[0]; + + $rep->AmountCol(3, 4,$grandtotal[3] - $tot_cur_db + $tot_cur_cr, $dec); + + $rep->AmountCol(4, 5,$tot_cur_db, $dec); + $rep->AmountCol(5, 6,$tot_cur_cr, $dec); + + $rep->AmountCol(7, 8,$grandtotal[3], $dec); + $rep->Line($rep->row - 6, 1); + $rep->End(); +} diff --git a/reporting/reports_main.php b/reporting/reports_main.php index 84bfb44f..85c2612f 100644 --- a/reporting/reports_main.php +++ b/reporting/reports_main.php @@ -53,6 +53,17 @@ $reports->addReport(RC_CUSTOMER, 102, _('&Aged Customer Analysis'), _('Comments') => 'TEXTBOX', _('Orientation') => 'ORIENTATION', _('Destination') => 'DESTINATION')); +$reports->addReport(RC_CUSTOMER, 115, _('Customer Trial Balance'), + array( _('Start Date') => 'DATEBEGIN', + _('End Date') => 'DATEENDM', + _('Customer') => 'CUSTOMERS_NO_FILTER', + _('Sales Areas') => 'AREAS', + _('Sales Folk') => 'SALESMEN', + _('Currency Filter') => 'CURRENCY', + _('Suppress Zeros') => 'YES_NO', + _('Comments') => 'TEXTBOX', + _('Orientation') => 'ORIENTATION', + _('Destination') => 'DESTINATION')); $reports->addReport(RC_CUSTOMER, 103, _('Customer &Detail Listing'), array( _('Activity Since') => 'DATEBEGIN', _('Sales Areas') => 'AREAS', @@ -170,6 +181,15 @@ $reports->addReport(RC_SUPPLIER, 202, _('&Aged Supplier Analyses'), _('Comments') => 'TEXTBOX', _('Orientation') => 'ORIENTATION', _('Destination') => 'DESTINATION')); +$reports->addReport(RC_SUPPLIER, 206, _('Supplier &Trial Balances'), + array( _('Start Date') => 'DATEBEGIN', + _('End Date') => 'DATEENDM', + _('Supplier') => 'SUPPLIERS_NO_FILTER', + _('Currency Filter') => 'CURRENCY', + _('Suppress Zeros') => 'YES_NO', + _('Comments') => 'TEXTBOX', + _('Orientation') => 'ORIENTATION', + _('Destination') => 'DESTINATION')); $reports->addReport(RC_SUPPLIER, 203, _('&Payment Report'), array( _('End Date') => 'DATE', _('Supplier') => 'SUPPLIERS_NO_FILTER', -- 2.30.2