X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=reporting%2Frep201.php;h=1c1ee43839ef40cc80b831805a6d3a0222a61af6;hb=a335d3c8e13110304642344e4a6396bccd42801d;hp=45ce3ef988440856c762033aa6ed96cc31b3ce77;hpb=c69bd73ab0f04393cad2f14bd233948cabbc2dc3;p=fa-stable.git diff --git a/reporting/rep201.php b/reporting/rep201.php index 45ce3ef9..1c1ee438 100644 --- a/reporting/rep201.php +++ b/reporting/rep201.php @@ -9,7 +9,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the License here . ***********************************************************************/ -$page_security = 2; +$page_security = 'SA_SUPPLIERANALYTIC'; // ---------------------------------------------------------------- // $ Revision: 2.0 $ // Creator: Joe Hunt @@ -31,12 +31,12 @@ function get_open_balance($supplier_id, $to, $convert) { $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 + + $sql = "SELECT SUM(IF(".TB_PREF."supp_trans.type = ".ST_SUPPINVOICE.", (".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 + + SUM(IF(".TB_PREF."supp_trans.type <> ".ST_SUPPINVOICE.", (".TB_PREF."supp_trans.ov_amount + ".TB_PREF."supp_trans.ov_gst + ".TB_PREF."supp_trans.ov_discount)"; if ($convert) $sql .= "* rate"; @@ -66,7 +66,7 @@ function getTransactions($supplier_id, $from, $to) $sql = "SELECT ".TB_PREF."supp_trans.*, (".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) + ((".TB_PREF."supp_trans.type = ".ST_SUPPINVOICE.") AND ".TB_PREF."supp_trans.due_date < '$to') AS OverDue FROM ".TB_PREF."supp_trans WHERE ".TB_PREF."supp_trans.tran_date >= '$from' AND ".TB_PREF."supp_trans.tran_date <= '$to' @@ -82,26 +82,27 @@ function getTransactions($supplier_id, $from, $to) function print_supplier_balances() { - global $path_to_root; - - $from = $_POST['PARAM_0']; - $to = $_POST['PARAM_1']; - $fromsupp = $_POST['PARAM_2']; - $currency = $_POST['PARAM_3']; - $comments = $_POST['PARAM_4']; - $destination = $_POST['PARAM_5']; + 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']; + $destination = $_POST['PARAM_6']; 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()) + if ($fromsupp == ALL_NUMERIC) $supp = _('All'); else $supp = get_supplier_name($fromsupp); - $dec = user_price_dec(); + $dec = user_price_dec(); - if ($currency == reserved_words::get_all()) + if ($currency == ALL_TEXT) { $convert = true; $currency = _('Balances in Home currency'); @@ -109,6 +110,9 @@ function print_supplier_balances() else $convert = false; + if ($no_zeros) $nozeros = _('Yes'); + else $nozeros = _('No'); + $cols = array(0, 100, 130, 190, 250, 320, 385, 450, 515); $headers = array(_('Trans Type'), _('#'), _('Date'), _('Due Date'), _('Charges'), @@ -117,63 +121,66 @@ function print_supplier_balances() $aligns = array('left', 'left', 'left', 'left', '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' => '')); + 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 Balances'), "SupplierBalances", user_pagesize()); $rep->Font(); $rep->Info($params, $cols, $headers, $aligns); - $rep->Header(); + $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 != reserved_words::get_all_numeric()) - $sql .= "WHERE supplier_id=$fromsupp "; - $sql .= "ORDER BY supp_name"; + $sql = "SELECT supplier_id, supp_name AS name, curr_code FROM ".TB_PREF."suppliers"; + if ($fromsupp != ALL_NUMERIC) + $sql .= " WHERE supplier_id=".db_escape($fromsupp); + $sql .= " ORDER BY supp_name"; $result = db_query($sql, "The customers could not be retrieved"); while ($myrow=db_fetch($result)) { if (!$convert && $currency != $myrow['curr_code']) continue; - $rep->fontSize += 2; - $rep->TextCol(0, 2, $myrow['name']); - if ($convert) - $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'], $from, $to); - if (db_num_rows($res)==0) - continue; + if ($no_zeros && db_num_rows($res) == 0) continue; + + $rep->fontSize += 2; + $rep->TextCol(0, 2, $myrow['name']); + if ($convert) $rep->TextCol(2, 3, $myrow['curr_code']); + $rep->fontSize -= 2; + $rep->TextCol(3, 4, _("Open Balance")); + $rep->AmountCol(4, 5, $init[0], $dec); + $rep->AmountCol(5, 6, $init[1], $dec); + $rep->AmountCol(6, 7, $init[2], $dec); + $rep->AmountCol(7, 8, $init[3], $dec); + $rep->NewLine(1, 2); + if (db_num_rows($res)==0) continue; + $rep->Line($rep->row + 4); while ($trans=db_fetch($res)) { + if ($no_zeros && $trans['TotalAmount'] == 0 && $trans['Allocated'] == 0) continue; $rep->NewLine(1, 2); - $rep->TextCol(0, 1, systypes::name($trans['type'])); + $rep->TextCol(0, 1, $systypes_array[$trans['type']]); $rep->TextCol(1, 2, $trans['reference']); $rep->DateCol(2, 3, $trans['tran_date'], true); - if ($trans['type'] == 20) + if ($trans['type'] == ST_SUPPINVOICE) $rep->DateCol(3, 4, $trans['due_date'], true); $item[0] = $item[1] = 0.0; if ($convert) @@ -198,7 +205,7 @@ function print_supplier_balances() else $item[3] = ($trans['TotalAmount'] + $trans['Allocated']) * $rate; */ - if ($trans['type'] == 20) + if ($trans['type'] == ST_SUPPINVOICE || $trans['type'] == ST_BANKDEPOSIT) $item[3] = $item[0] + $item[1] - $item[2]; else $item[3] = $item[0] - $item[1] + $item[2]; @@ -230,4 +237,4 @@ function print_supplier_balances() $rep->End(); } -?> \ No newline at end of file +?>