Implemented journal entries with multiply virtual AR/AP subaccounts.

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

diff --git a/reporting/rep702.php b/reporting/rep702.php
index c71daca67148071d24663c495f5ae6a153620df8..9fdde38eb02970756f53731a0cba51adf5db3f04 100644 (file)
--- a/reporting/rep702.php
+++ b/reporting/rep702.php
@@ -72,6 +72,7 @@ function print_list_of_journal_entries()
 
     $typeno = $type = 0;
     $debit = $credit = 0.0;
+    $totdeb = $totcre = 0.0;
     while ($myrow=db_fetch($trans))
     {
         if ($type != $myrow['type'] || $typeno != $myrow['type_no'])
@@ -82,6 +83,8 @@ function print_list_of_journal_entries()
                 $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();
@@ -92,7 +95,7 @@ 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"]);
+            $coms =  get_subaccount_name($myrow["account"], $myrow["person_id"]);
             $memo = get_comments_string($myrow['type'], $myrow['type_no']);
             if ($memo != '')
             {
@@ -122,7 +125,21 @@ function print_list_of_journal_entries()
         }    
         $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();
 }