X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=reporting%2Frep702.php;h=478770f28a5f2ef259301136752fc0f5c545e7e2;hb=11e485e4a7c5f12c9424713b7330815a9cc5e4ae;hp=2600df6ba3f02fced02f9598cc88050603b15b1d;hpb=21290a4a16ca78fe736f62cf1cb039c06cb53fca;p=fa-stable.git diff --git a/reporting/rep702.php b/reporting/rep702.php index 2600df6b..478770f2 100644 --- a/reporting/rep702.php +++ b/reporting/rep702.php @@ -9,7 +9,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the License here . ***********************************************************************/ -$page_security = 2; +$page_security = 'SA_GLANALYTIC'; // ---------------------------------------------------------------- // $ Revision: 2.0 $ // Creator: Joe Hunt @@ -48,7 +48,7 @@ function print_list_of_journal_entries() $cols = array(0, 100, 240, 300, 400, 460, 520, 580); - $headers = array(_('Type/Account'), _('Account Name'), _('Date/Dim.'), + $headers = array(_('Type/Account'), _('Reference').'/'._('Account Name'), _('Date/Dim.'), _('Person/Item/Memo'), _('Debit'), _('Credit')); $aligns = array('left', 'left', 'left', 'left', 'right', 'right'); @@ -82,12 +82,18 @@ function print_list_of_journal_entries() $typeno = $myrow['type_no']; $type = $myrow['type']; $TransName = systypes::name($myrow['type']); - $rep->TextCol(0, 2, $TransName . " # " . $myrow['type_no']); + $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 = payment_person_types::person_name($myrow["person_type_id"],$myrow["person_id"]); $memo = get_comments_string($myrow['type'], $myrow['type_no']); if ($memo != '') - $coms .= ($coms!= "")?"/":"" . $memo; + { + if ($coms == "") + $coms = $memo; + else + $coms .= " / ".$memo; + } $rep->TextCol(3, 6, $coms); $rep->NewLine(2); }