X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=reporting%2Frep101.php;h=d8ad7d6482609716822809baf196877370b5aefd;hb=8273b6b981c008c7968a7f7c8eaea640d453c3f2;hp=3fd3e979030e69771a01e5a1d900f94ee201135f;hpb=f474e197d8af7acfea554f560a5c45f7d0bef1f7;p=fa-stable.git diff --git a/reporting/rep101.php b/reporting/rep101.php index 3fd3e979..d8ad7d64 100644 --- a/reporting/rep101.php +++ b/reporting/rep101.php @@ -1,5 +1,14 @@ . +***********************************************************************/ $page_security = 2; // ---------------------------------------------------------------- @@ -8,12 +17,12 @@ $page_security = 2; // date_: 2005-05-19 // Title: Customer Balances // ---------------------------------------------------------------- -$path_to_root="../"; +$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 . "/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"); //---------------------------------------------------------------------------------------------------- @@ -30,7 +39,7 @@ function get_transactions($debtorno, $date) ((".TB_PREF."debtor_trans.type = 10) AND ".TB_PREF."debtor_trans.due_date < '$date') AS OverDue FROM ".TB_PREF."debtor_trans, ".TB_PREF."sys_types - WHERE ".TB_PREF."debtor_trans.tran_date <= '$date' + WHERE ".TB_PREF."debtor_trans.tran_date <= '$date' AND ".TB_PREF."debtor_trans.debtor_no = '$debtorno' AND ".TB_PREF."debtor_trans.type != 13 AND ".TB_PREF."debtor_trans.type = ".TB_PREF."sys_types.type_id @@ -45,12 +54,15 @@ function print_customer_balances() { global $path_to_root; - include_once($path_to_root . "reporting/includes/pdf_report.inc"); - $to = $_POST['PARAM_0']; $fromcust = $_POST['PARAM_1']; $currency = $_POST['PARAM_2']; $comments = $_POST['PARAM_3']; + $destination = $_POST['PARAM_4']; + if ($destination) + include_once($path_to_root . "/reporting/includes/excel_report.inc"); + else + include_once($path_to_root . "/reporting/includes/pdf_report.inc"); if ($fromcust == reserved_words::get_all_numeric()) $from = _('All'); @@ -78,13 +90,12 @@ function print_customer_balances() 2 => array('text' => _('Customer'), 'from' => $from, 'to' => ''), 3 => array('text' => _('Currency'), 'from' => $currency, 'to' => '')); - $rep = new FrontReport(_('Customer Balances'), "CustomerBalances.pdf", user_pagesize()); + $rep = new FrontReport(_('Customer Balances'), "CustomerBalances", user_pagesize()); $rep->Font(); $rep->Info($params, $cols, $headers, $aligns); $rep->Header(); - $total = array(0,0,0,0); $grandtotal = array(0,0,0,0); $sql = "SELECT debtor_no, name, curr_code FROM ".TB_PREF."debtors_master "; @@ -107,37 +118,45 @@ function print_customer_balances() if (db_num_rows($res)==0) continue; $rep->Line($rep->row + 4); + $total = array(0,0,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'] == 10) - $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['type'] == 11 || $trans['type'] == 12 || $trans['type'] == 2) + $trans['TotalAmount'] *= -1; 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'] == 10) $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'] == 10) + $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]; @@ -148,7 +167,7 @@ function print_customer_balances() $rep->NewLine(2); $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); $rep->Line($rep->row - 4); $rep->NewLine(2); } @@ -156,8 +175,9 @@ function print_customer_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(); }