X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=reporting%2Frep108.php;h=5fccb257fcd2db5f871659cac4d43d3e2a4d9a69;hb=927ebef2443b6dda544056e33ec84b71d2bdb6c2;hp=894e7f61e5442fcc4afcbf9047ec3d1e7842adc9;hpb=00d6656483e9b0630e325f0772268223b6762ece;p=fa-stable.git diff --git a/reporting/rep108.php b/reporting/rep108.php index 894e7f61..5fccb257 100644 --- a/reporting/rep108.php +++ b/reporting/rep108.php @@ -44,7 +44,7 @@ function getTransactions($debtorno, $date, $show_also_allocated) AND ABS(".TB_PREF."debtor_trans.ov_amount + ".TB_PREF."debtor_trans.ov_gst + ".TB_PREF."debtor_trans.ov_freight + ".TB_PREF."debtor_trans.ov_freight_tax + ".TB_PREF."debtor_trans.ov_discount) > 1e-6"; if (!$show_also_allocated) - $sql .= " AND ABS (ABS(".TB_PREF."debtor_trans.ov_amount + ".TB_PREF."debtor_trans.ov_gst + ".TB_PREF."debtor_trans.ov_freight + + $sql .= " AND ABS(ABS(".TB_PREF."debtor_trans.ov_amount + ".TB_PREF."debtor_trans.ov_gst + ".TB_PREF."debtor_trans.ov_freight + ".TB_PREF."debtor_trans.ov_freight_tax + ".TB_PREF."debtor_trans.ov_discount) - alloc) > 1e-6"; $sql .= " ORDER BY ".TB_PREF."debtor_trans.tran_date"; @@ -83,9 +83,9 @@ function print_statements() if ($email == 0) $rep = new FrontReport(_('STATEMENT'), "StatementBulk", user_pagesize(), 9, $orientation); - if ($orientation == 'L') + if ($orientation == 'L') recalculate_cols($cols); - + $sql = "SELECT debtor_no, name AS DebtorName, address, tax_id, curr_code, curdate() AS tran_date FROM ".TB_PREF."debtors_master"; if ($customer != ALL_TEXT) $sql .= " WHERE debtor_no = ".db_escape($customer); @@ -113,13 +113,13 @@ function print_statements() } $contacts = get_customer_contacts($myrow['debtor_no'], 'invoice'); - $rep->SetHeaderType('Header2'); $rep->currency = $cur; $rep->Font(); $rep->Info($params, $cols, null, $aligns); //= get_branch_contacts($branch['branch_code'], 'invoice', $branch['debtor_no']); $rep->SetCommonData($myrow, null, null, $baccount, ST_STATEMENT, $contacts); + $rep->SetHeaderType('Header2'); $rep->NewPage(); $rep->NewLine(); $doctype = ST_STATEMENT; @@ -174,4 +174,3 @@ function print_statements() $rep->End(); } -?>