X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=reporting%2Frep702.php;h=05c2ec5e86ebc305b50b5b6d1e265053c1f40e74;hb=a31195793c023906ab5da62f06ab84aefed445c3;hp=c71daca67148071d24663c495f5ae6a153620df8;hpb=ead9e4537a95ddc691750715bb8c38ee310e7b9b;p=fa-stable.git

diff --git a/reporting/rep702.php b/reporting/rep702.php
index c71daca6..05c2ec5e 100644
--- 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);
@@ -72,6 +76,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 +87,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 +99,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 != '')
             {
@@ -101,8 +108,8 @@ function print_list_of_journal_entries()
             	else
             		$coms .= " / ".$memo;
             }		
-            $rep->TextCol(3, 6, $coms);
-            $rep->NewLine(2);
+            $rep->TextColLines(3, 6, $coms);
+            $rep->NewLine();
         }
         $rep->TextCol(0, 1, $myrow['account']);
         $rep->TextCol(1, 2, $myrow['account_name']);
@@ -122,8 +129,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();
 }
 
-?>
\ No newline at end of file