Improved layout.

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

diff --git a/reporting/rep702.php b/reporting/rep702.php
index 263672f215d0ec4d8a78c56418d72d0fe77f27e8..2600df6ba3f02fced02f9598cc88050603b15b1d 100644 (file)
--- a/reporting/rep702.php
+++ b/reporting/rep702.php
@@ -26,7 +26,6 @@ include_once($path_to_root . "/includes/ui/ui_view.inc");
 
 //----------------------------------------------------------------------------------------------------
 
-// trial_inquiry_controls();
 print_list_of_journal_entries();
 
 //----------------------------------------------------------------------------------------------------
@@ -40,16 +39,10 @@ function print_list_of_journal_entries()
     $systype = $_POST['PARAM_2'];
     $comments = $_POST['PARAM_3'];
        $destination = $_POST['PARAM_4'];
-       if (isset($destination) && $destination)
-       {
+       if ($destination)
                include_once($path_to_root . "/reporting/includes/excel_report.inc");
-               $filename = "JournalEntries.xml";
-       }       
        else
-       {
                include_once($path_to_root . "/reporting/includes/pdf_report.inc");
-               $filename = "JournalEntries.pdf";
-       }
 
     $dec = user_price_dec();
 
@@ -65,7 +58,7 @@ function print_list_of_journal_entries()
                        2 => array('text' => _('Type'), 'from' => systypes::name($systype),
                             'to' => ''));
 
-    $rep = new FrontReport(_('List of Journal Entries'), $filename, user_pagesize());
+    $rep = new FrontReport(_('List of Journal Entries'), "JournalEntries", user_pagesize());
 
     $rep->Font();
     $rep->Info($params, $cols, $headers, $aligns);
@@ -76,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)
             {
@@ -87,6 +80,7 @@ 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->DateCol(2, 3, $myrow['tran_date'], true);