X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=reporting%2Frep702.php;h=f1723157cd09d4c19567d8ec6000e30d75be982f;hb=75564761d1429129282bd04ab00575c5e80fe4c2;hp=6d6f324533c512cabf1c77971924c6b6e0a001e2;hpb=0489317205141deaecefe3a7243d11a3e38a51d0;p=fa-stable.git diff --git a/reporting/rep702.php b/reporting/rep702.php index 6d6f3245..f1723157 100644 --- a/reporting/rep702.php +++ b/reporting/rep702.php @@ -63,7 +63,7 @@ function print_list_of_journal_entries() $rep = new FrontReport(_('List of Journal Entries'), "JournalEntries", user_pagesize(), 9, $orientation); if ($orientation == 'L') - $rep->recalculate_cols($cols); + recalculate_cols($cols); $rep->Font(); $rep->Info($params, $cols, $headers, $aligns); @@ -99,20 +99,14 @@ function print_list_of_journal_entries() $rep->TextCol(0, 1, $TransName . " # " . $myrow['type_no']); $rep->TextCol(1, 2, get_reference($myrow['type'], $myrow['type_no'])); $rep->DateCol(2, 3, $myrow['tran_date'], true); - $coms = get_subaccount_name($myrow["account"], $myrow["person_id"]); $memo = get_comments_string($myrow['type'], $myrow['type_no']); - if ($memo != '') - { - if ($coms == "") - $coms = $memo; - else - $coms .= " / ".$memo; - } - $rep->TextColLines(3, 6, $coms); + $rep->TextCol(3, 6, $memo); $rep->NewLine(); } $rep->TextCol(0, 1, $myrow['account']); $rep->TextCol(1, 2, $myrow['account_name']); + $coms = get_subaccount_name($myrow["account"], $myrow["person_id"]); + $rep->TextCol(3, 6, $coms); $dim_str = get_dimension_string($myrow['dimension_id']); $dim_str2 = get_dimension_string($myrow['dimension2_id']); if ($dim_str2 != "") @@ -147,4 +141,3 @@ function print_list_of_journal_entries() $rep->End(); } -?> \ No newline at end of file