X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=reporting%2Frep101.php;h=3fee1e8f00c59deefcce79ac951c44d8d697c02c;hb=0489317205141deaecefe3a7243d11a3e38a51d0;hp=dc027b5ad54e394e48769d76aab17ac07ffe29ea;hpb=46c5f7a65a7659a44ae8254c63152074363d3987;p=fa-stable.git diff --git a/reporting/rep101.php b/reporting/rep101.php index dc027b5a..3fee1e8f 100644 --- a/reporting/rep101.php +++ b/reporting/rep101.php @@ -102,13 +102,16 @@ function print_customer_balances() $currency = $_POST['PARAM_3']; $no_zeros = $_POST['PARAM_4']; $comments = $_POST['PARAM_5']; - $destination = $_POST['PARAM_6']; + $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"); - if ($fromcust == ALL_NUMERIC) + $orientation = ($orientation ? 'L' : 'P'); + + if ($fromcust == ALL_TEXT) $cust = _('All'); else $cust = get_customer_name($fromcust); @@ -138,7 +141,9 @@ function print_customer_balances() 3 => array('text' => _('Currency'), 'from' => $currency, 'to' => ''), 4 => array('text' => _('Suppress Zeros'), 'from' => $nozeros, 'to' => '')); - $rep = new FrontReport(_('Customer Balances'), "CustomerBalances", user_pagesize()); + $rep = new FrontReport(_('Customer Balances'), "CustomerBalances", user_pagesize(), 9, $orientation); + if ($orientation == 'L') + $rep->recalculate_cols($cols); $rep->Font(); $rep->Info($params, $cols, $headers, $aligns); $rep->NewPage(); @@ -146,7 +151,7 @@ function print_customer_balances() $grandtotal = array(0,0,0,0); $sql = "SELECT debtor_no, name, curr_code FROM ".TB_PREF."debtors_master "; - if ($fromcust != ALL_NUMERIC) + if ($fromcust != ALL_TEXT) $sql .= "WHERE debtor_no=".db_escape($fromcust); $sql .= " ORDER BY name"; $result = db_query($sql, "The customers could not be retrieved"); @@ -189,7 +194,7 @@ function print_customer_balances() $rep->Line($rep->row + 4); while ($trans = db_fetch($res)) { - if ($no_zeros && $trans['TotalAmount'] == 0 && $trans['Allocated'] == 0) continue; + if ($no_zeros && floatcmp($trans['TotalAmount'], $trans['Allocated']) == 0) continue; $rep->NewLine(1, 2); $rep->TextCol(0, 1, $systypes_array[$trans['type']]); $rep->TextCol(1, 2, $trans['reference']);