Added confirmation js dialogs for deleting and restoring backup file.

[fa-stable.git] / reporting / rep702.php

diff --git a/reporting/rep702.php b/reporting/rep702.php
index bbb6ec4b59e444387fe236a45602b9efbc6d3035..478770f28a5f2ef259301136752fc0f5c545e7e2 100644 (file)
--- a/reporting/rep702.php
+++ b/reporting/rep702.php
@@ -9,7 +9,7 @@
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  
     See the License here <http://www.gnu.org/licenses/gpl-3.0.html>.
 ***********************************************************************/
-$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');
@@ -69,10 +69,10 @@ function print_list_of_journal_entries()
 
     $trans = get_gl_transactions($from, $to, -1, null, 0, 0, $systype);
 
-    $typeno = 0;
+    $typeno = $type = 0;
     while ($myrow=db_fetch($trans))
     {
-        if ($typeno != $myrow['type_no'])
+        if ($type != $myrow['type'] || $typeno != $myrow['type_no'])
         {
             if ($typeno != 0)
             {
@@ -80,13 +80,20 @@ function print_list_of_journal_entries()
                 $rep->NewLine();
             }
             $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);
         }