[0005214] Stock Check Sheet: changed option name to less confusing for shortages...

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

diff --git a/reporting/rep702.php b/reporting/rep702.php
index 5a05470bb4dfa82954ee0e1b5cdf81a0cd6ce36e..f1723157cd09d4c19567d8ec6000e30d75be982f 100644 (file)
--- a/reporting/rep702.php
+++ b/reporting/rep702.php
@@ -38,12 +38,14 @@ function print_list_of_journal_entries()
     $to = $_POST['PARAM_1'];
     $systype = $_POST['PARAM_2'];
     $comments = $_POST['PARAM_3'];
-       $destination = $_POST['PARAM_4'];
+       $orientation = $_POST['PARAM_4'];
+       $destination = $_POST['PARAM_5'];
        if ($destination)
                include_once($path_to_root . "/reporting/includes/excel_report.inc");
        else
                include_once($path_to_root . "/reporting/includes/pdf_report.inc");
 
+       $orientation = ($orientation ? 'L' : 'P');
     $dec = user_price_dec();
 
     $cols = array(0, 100, 240, 300, 400, 460, 520, 580);
@@ -59,7 +61,9 @@ function print_list_of_journal_entries()
                                                $systype == -1 ? _('All') : $systypes_array[$systype],
                             'to' => ''));
 
-    $rep = new FrontReport(_('List of Journal Entries'), "JournalEntries", user_pagesize());
+    $rep = new FrontReport(_('List of Journal Entries'), "JournalEntries", user_pagesize(), 9, $orientation);
+    if ($orientation == 'L')
+       recalculate_cols($cols);
 
     $rep->Font();
     $rep->Info($params, $cols, $headers, $aligns);
@@ -71,13 +75,22 @@ function print_list_of_journal_entries()
     $trans = get_gl_transactions($from, $to, -1, null, 0, 0, $systype);
 
     $typeno = $type = 0;
+    $debit = $credit = 0.0;
+    $totdeb = $totcre = 0.0;
     while ($myrow=db_fetch($trans))
     {
         if ($type != $myrow['type'] || $typeno != $myrow['type_no'])
         {
             if ($typeno != 0)
             {
-                $rep->Line($rep->row  + 4);
+                $rep->Line($rep->row += 6);
+                $rep->NewLine();
+               $rep->AmountCol(4, 5, $debit, $dec);
+               $rep->AmountCol(5, 6, abs($credit), $dec);
+               $totdeb += $debit;
+               $totcre += $credit;
+               $debit = $credit = 0.0;
+                               $rep->Line($rep->row -= 4);
                 $rep->NewLine();
             }
             $typeno = $myrow['type_no'];
@@ -86,34 +99,45 @@ 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 =  payment_person_name($myrow["person_type_id"],$myrow["person_id"]);
             $memo = get_comments_string($myrow['type'], $myrow['type_no']);
-            if ($memo != '')
-            {
-               if ($coms == "")
-                       $coms = $memo;
-               else
-                       $coms .= " / ".$memo;
-            }          
-            $rep->TextCol(3, 6, $coms);
-            $rep->NewLine(2);
+                       $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 != "")
                $dim_str .= "/".$dim_str2;
         $rep->TextCol(2, 3, $dim_str);
         $rep->TextCol(3, 4, $myrow['memo_']);
-        if ($myrow['amount'] > 0.0)
+        if ($myrow['amount'] > 0.0) {
+               $debit += $myrow['amount'];
             $rep->AmountCol(4, 5, abs($myrow['amount']), $dec);
-        else
+        }    
+        else {
+               $credit += $myrow['amount'];
             $rep->AmountCol(5, 6, abs($myrow['amount']), $dec);
+        }    
         $rep->NewLine(1, 2);
     }
-    $rep->Line($rep->row  + 4);
+       if ($typeno != 0)
+       {
+               $rep->Line($rep->row += 6);
+               $rep->NewLine();
+               $rep->AmountCol(4, 5, $debit, $dec);
+               $rep->AmountCol(5, 6, abs($credit), $dec);
+               $totdeb += $debit;
+               $totcre += $credit;
+               $rep->Line($rep->row -= 4);
+               $rep->NewLine();
+        $rep->TextCol(0, 4, _("Total"));
+               $rep->AmountCol(4, 5, $totdeb, $dec);
+               $rep->AmountCol(5, 6, abs($totcre), $dec);
+               $rep->Line($rep->row -= 4);
+       }
     $rep->End();
 }
 
-?>
\ No newline at end of file