X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=reporting%2Frep601.php;h=1614e1166404be545dca9454cce5191626128783;hb=5a3cbfe6d2df1c8c32edcab8bf93e8a8432a15fc;hp=ba630465ab1062e2c6a64d11444217674e6759f0;hpb=5b8f4c4b4aa8cf996bc071f116bfce1273200fa2;p=fa-stable.git diff --git a/reporting/rep601.php b/reporting/rep601.php index ba630465..1614e116 100644 --- a/reporting/rep601.php +++ b/reporting/rep601.php @@ -43,11 +43,11 @@ function get_bank_transactions($from, $to, $account) { $from = date2sql($from); $to = date2sql($to); - $sql = "SELECT ".TB_PREF."bank_trans.* FROM ".TB_PREF."bank_trans - WHERE ".TB_PREF."bank_trans.bank_act = '$account' + $sql = "SELECT * FROM ".TB_PREF."bank_trans + WHERE bank_act = '$account' AND trans_date >= '$from' AND trans_date <= '$to' - ORDER BY trans_date,".TB_PREF."bank_trans.id"; + ORDER BY trans_date, id"; return db_query($sql,"The transactions for '$account' could not be retrieved"); } @@ -72,7 +72,7 @@ function print_bank_transactions() $rep = new FrontReport(_('Bank Statement'), "BankStatement", user_pagesize(), 9, $orientation); $dec = user_price_dec(); - $cols = array(0, 90, 110, 170, 225, 350, 400, 460, 520); + $cols = array(0, 90, 120, 170, 225, 350, 400, 460, 520); $aligns = array('left', 'left', 'left', 'left', 'left', 'right', 'right', 'right');