X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=reporting%2Frep702.php;h=f1723157cd09d4c19567d8ec6000e30d75be982f;hb=630e99edecc3eabe708a9e7bda94eaa60bf16db7;hp=263672f215d0ec4d8a78c56418d72d0fe77f27e8;hpb=f50187b9c3095886d7fd847f635cd8763109a75e;p=fa-stable.git

diff --git a/reporting/rep702.php b/reporting/rep702.php
index 263672f2..f1723157 100644
--- 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
@@ -26,93 +26,118 @@ include_once($path_to_root . "/includes/ui/ui_view.inc");
 
 //----------------------------------------------------------------------------------------------------
 
-// trial_inquiry_controls();
 print_list_of_journal_entries();
 
 //----------------------------------------------------------------------------------------------------
 
 function print_list_of_journal_entries()
 {
-    global $path_to_root;
+    global $path_to_root, $systypes_array;
 
     $from = $_POST['PARAM_0'];
     $to = $_POST['PARAM_1'];
     $systype = $_POST['PARAM_2'];
     $comments = $_POST['PARAM_3'];
-	$destination = $_POST['PARAM_4'];
-	if (isset($destination) && $destination)
-	{
+	$orientation = $_POST['PARAM_4'];
+	$destination = $_POST['PARAM_5'];
+	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";
-	}
 
+	$orientation = ($orientation ? 'L' : 'P');
     $dec = user_price_dec();
 
     $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');
 
     $params =   array( 	0 => $comments,
     				    1 => array('text' => _('Period'), 'from' => $from,'to' => $to),
-                    	2 => array('text' => _('Type'), 'from' => systypes::name($systype),
+                    	2 => array('text' => _('Type'), 'from' => 
+						$systype == -1 ? _('All') : $systypes_array[$systype],
                             'to' => ''));
 
-    $rep = new FrontReport(_('List of Journal Entries'), $filename, 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);
-    $rep->Header();
+    $rep->NewPage();
 
     if ($systype == -1)
         $systype = null;
 
     $trans = get_gl_transactions($from, $to, -1, null, 0, 0, $systype);
 
-    $typeno = 0;
+    $typeno = $type = 0;
+    $debit = $credit = 0.0;
+    $totdeb = $totcre = 0.0;
     while ($myrow=db_fetch($trans))
     {
-        if ($typeno != $myrow['type_no'])
+        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'];
-            $TransName = systypes::name($myrow['type']);
-            $rep->TextCol(0, 2, $TransName . " # " . $myrow['type_no']);
+            $type = $myrow['type'];
+            $TransName = $systypes_array[$myrow['type']];
+            $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;
-            $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