X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=reporting%2Frep201.php;h=de1d47e461d8526abef07b569791fcc83d352797;hb=34f8e554ed5ac52648b5a542f02b39b6c6e3fc46;hp=e0a882d0f48de28154a74225f94fe9b633599c62;hpb=45b9663b6305cb70c2f3f1782406232d3ed0d755;p=fa-stable.git diff --git a/reporting/rep201.php b/reporting/rep201.php index e0a882d0..de1d47e4 100644 --- a/reporting/rep201.php +++ b/reporting/rep201.php @@ -1,13 +1,13 @@ . + See the License here . ***********************************************************************/ $page_security = 2; // ---------------------------------------------------------------- @@ -25,20 +25,52 @@ include_once($path_to_root . "/gl/includes/gl_db.inc"); //---------------------------------------------------------------------------------------------------- -// trial_inquiry_controls(); print_supplier_balances(); -function getTransactions($supplier_id, $date) +function get_open_balance($supplier_id, $to, $convert) { - $date = date2sql($date); + $to = date2sql($to); + + $sql = "SELECT SUM(IF(".TB_PREF."supp_trans.type = 20, (".TB_PREF."supp_trans.ov_amount + ".TB_PREF."supp_trans.ov_gst + + ".TB_PREF."supp_trans.ov_discount)"; + if ($convert) + $sql .= " * rate"; + $sql .= ", 0)) AS charges, + SUM(IF(".TB_PREF."supp_trans.type <> 20, (".TB_PREF."supp_trans.ov_amount + ".TB_PREF."supp_trans.ov_gst + + ".TB_PREF."supp_trans.ov_discount)"; + if ($convert) + $sql .= "* rate"; + $sql .= ", 0)) AS credits, + SUM(".TB_PREF."supp_trans.alloc"; + if ($convert) + $sql .= " * rate"; + $sql .= ") AS Allocated, + SUM((".TB_PREF."supp_trans.ov_amount + ".TB_PREF."supp_trans.ov_gst + + ".TB_PREF."supp_trans.ov_discount - ".TB_PREF."supp_trans.alloc)"; + if ($convert) + $sql .= " * rate"; + $sql .= ") AS OutStanding + FROM ".TB_PREF."supp_trans + WHERE ".TB_PREF."supp_trans.tran_date < '$to' + AND ".TB_PREF."supp_trans.supplier_id = '$supplier_id' 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); $sql = "SELECT ".TB_PREF."supp_trans.*, ".TB_PREF."sys_types.type_name, (".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) - AND ".TB_PREF."supp_trans.due_date < '$date') AS OverDue + AND ".TB_PREF."supp_trans.due_date < '$to') AS OverDue FROM ".TB_PREF."supp_trans, ".TB_PREF."sys_types - WHERE ".TB_PREF."supp_trans.tran_date <= '$date' AND ".TB_PREF."supp_trans.supplier_id = '$supplier_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.type = ".TB_PREF."sys_types.type_id ORDER BY ".TB_PREF."supp_trans.tran_date"; @@ -53,17 +85,21 @@ function print_supplier_balances() { global $path_to_root; - include_once($path_to_root . "/reporting/includes/pdf_report.inc"); - - $to = $_POST['PARAM_0']; - $fromsupp = $_POST['PARAM_1']; - $currency = $_POST['PARAM_2']; - $comments = $_POST['PARAM_3']; + $from = $_POST['PARAM_0']; + $to = $_POST['PARAM_1']; + $fromsupp = $_POST['PARAM_2']; + $currency = $_POST['PARAM_3']; + $comments = $_POST['PARAM_4']; + $destination = $_POST['PARAM_5']; + if ($destination) + include_once($path_to_root . "/reporting/includes/excel_report.inc"); + else + include_once($path_to_root . "/reporting/includes/pdf_report.inc"); if ($fromsupp == reserved_words::get_all_numeric()) - $from = _('All'); + $supp = _('All'); else - $from = get_supplier_name($fromsupp); + $supp = get_supplier_name($fromsupp); $dec = user_price_dec(); if ($currency == reserved_words::get_all()) @@ -82,11 +118,11 @@ function print_supplier_balances() $aligns = array('left', 'left', 'left', 'left', 'right', 'right', 'right', 'right'); $params = array( 0 => $comments, - 1 => array('text' => _('End Date'), 'from' => $to, 'to' => ''), - 2 => array('text' => _('Supplier'), 'from' => $from, 'to' => ''), + 1 => array('text' => _('Period'), 'from' => $from, 'to' => $to), + 2 => array('text' => _('Supplier'), 'from' => $supp, 'to' => ''), 3 => array( 'text' => _('Currency'),'from' => $currency, 'to' => '')); - $rep = new FrontReport(_('Supplier Balances'), "SupplierBalances.pdf", user_pagesize()); + $rep = new FrontReport(_('Supplier Balances'), "SupplierBalances", user_pagesize()); $rep->Font(); $rep->Info($params, $cols, $headers, $aligns); @@ -106,48 +142,68 @@ function print_supplier_balances() if (!$convert && $currency != $myrow['curr_code']) continue; $rep->fontSize += 2; - $rep->TextCol(0, 3, $myrow['name']); + $rep->TextCol(0, 2, $myrow['name']); if ($convert) - $rep->TextCol(3, 4, $myrow['curr_code']); + $rep->TextCol(2, 3, $myrow['curr_code']); $rep->fontSize -= 2; + $bal = get_open_balance($myrow['supplier_id'], $from, $convert); + $init[0] = $init[1] = 0.0; + $rep->TextCol(3, 4, _("Open Balance")); + $init[0] = round2(abs($bal['charges']), $dec); + $rep->AmountCol(4, 5, $init[0], $dec); + $init[1] = round2(Abs($bal['credits']), $dec); + $rep->AmountCol(5, 6, $init[1], $dec); + $init[2] = round2($bal['Allocated'], $dec); + $rep->AmountCol(6, 7, $init[2], $dec); + $init[3] = round2($bal['OutStanding'], $dec);; + $rep->AmountCol(7, 8, $init[3], $dec); + $total = array(0,0,0,0); + for ($i = 0; $i < 4; $i++) + { + $total[$i] += $init[$i]; + $grandtotal[$i] += $init[$i]; + } $rep->NewLine(1, 2); - $res = getTransactions($myrow['supplier_id'], $to); + $res = getTransactions($myrow['supplier_id'], $from, $to); if (db_num_rows($res)==0) continue; $rep->Line($rep->row + 4); - $total[0] = $total[1] = $total[2] = $total[3] = 0.0; while ($trans=db_fetch($res)) { $rep->NewLine(1, 2); $rep->TextCol(0, 1, $trans['type_name']); $rep->TextCol(1, 2, $trans['reference']); - $date = sql2date($trans['tran_date']); - $rep->TextCol(2, 3, $date); + $rep->DateCol(2, 3, $trans['tran_date'], true); if ($trans['type'] == 20) - $rep->TextCol(3, 4, sql2date($trans['due_date'])); + $rep->DateCol(3, 4, $trans['due_date'], true); $item[0] = $item[1] = 0.0; if ($convert) - //$rate = get_exchange_rate_from_home_currency($myrow['curr_code'], $date); $rate = $trans['rate']; else $rate = 1.0; if ($trans['TotalAmount'] > 0.0) { - $item[0] = Abs($trans['TotalAmount']) * $rate; - $rep->TextCol(4, 5, number_format2($item[0], $dec)); + $item[0] = round2(abs($trans['TotalAmount']) * $rate, $dec); + $rep->AmountCol(4, 5, $item[0], $dec); } else { - $item[1] = Abs($trans['TotalAmount']) * $rate; - $rep->TextCol(5, 6, number_format2($item[1], $dec)); + $item[1] = round2(abs($trans['TotalAmount']) * $rate, $dec); + $rep->AmountCol(5, 6, $item[1], $dec); } - $item[2] = $trans['Allocated'] * $rate; - $rep->TextCol(6, 7, number_format2($item[2], $dec)); + $item[2] = round2($trans['Allocated'] * $rate, $dec); + $rep->AmountCol(6, 7, $item[2], $dec); + /* if ($trans['type'] == 20) $item[3] = ($trans['TotalAmount'] - $trans['Allocated']) * $rate; else $item[3] = ($trans['TotalAmount'] + $trans['Allocated']) * $rate; - $rep->TextCol(7, 8, number_format2($item[3], $dec)); + */ + if ($trans['type'] == 20) + $item[3] = $item[0] + $item[1] - $item[2]; + else + $item[3] = $item[0] - $item[1] + $item[2]; + $rep->AmountCol(7, 8, $item[3], $dec); for ($i = 0; $i < 4; $i++) { $total[$i] += $item[$i]; @@ -159,7 +215,7 @@ function print_supplier_balances() $rep->TextCol(0, 3, _('Total')); for ($i = 0; $i < 4; $i++) { - $rep->TextCol($i + 4, $i + 5, number_format2($total[$i], $dec)); + $rep->AmountCol($i + 4, $i + 5, $total[$i], $dec); $total[$i] = 0.0; } $rep->Line($rep->row - 4); @@ -169,8 +225,9 @@ function print_supplier_balances() $rep->TextCol(0, 3, _('Grand Total')); $rep->fontSize -= 2; for ($i = 0; $i < 4; $i++) - $rep->TextCol($i + 4, $i + 5,number_format2($grandtotal[$i], $dec)); + $rep->AmountCol($i + 4, $i + 5,$grandtotal[$i], $dec); $rep->Line($rep->row - 4); + $rep->NewLine(); $rep->End(); }