X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=reporting%2Frep501.php;h=25b39fd6f354bd896f1e4078eea6f3aafbb4bb06;hb=3a07ab5b09141aa056c2c628f4f9fec79f45e85b;hp=5c2b2422d588241b28758decb34355f871e0e7ff;hpb=a5242af68e65661edb7175412444dce536a7f311;p=fa-stable.git

diff --git a/reporting/rep501.php b/reporting/rep501.php
index 5c2b2422..25b39fd6 100644
--- a/reporting/rep501.php
+++ b/reporting/rep501.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_DIMENSIONREP';
 // ----------------------------------------------------------------
 // $ Revision:	2.0 $
 // Creator:	Joe Hunt
@@ -25,7 +25,6 @@ include_once($path_to_root . "/gl/includes/gl_db.inc");
 
 //----------------------------------------------------------------------------------------------------
 
-// trial_inquiry_controls();
 print_dimension_summary();
 
 function getTransactions($from, $to)
@@ -33,8 +32,8 @@ function getTransactions($from, $to)
 	$sql = "SELECT *
 		FROM
 			".TB_PREF."dimensions
-		WHERE reference >= '$from'
-		AND reference <= '$to'
+		WHERE id >= ".db_escape($from)."
+		AND id <= ".db_escape($to)."
 		ORDER BY
 			reference";
 
@@ -71,14 +70,18 @@ function print_dimension_summary()
 {
     global $path_to_root;
 
-    include_once($path_to_root . "/reporting/includes/pdf_report.inc");
-
     $fromdim = $_POST['PARAM_0'];
     $todim = $_POST['PARAM_1'];
     $showbal = $_POST['PARAM_2'];
     $comments = $_POST['PARAM_3'];
-    
+	$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');
 	$cols = array(0, 50, 210, 250, 320, 395, 465,	515);
 
 	$headers = array(_('Reference'), _('Name'), _('Type'), _('Date'), _('Due Date'), _('Closed'), _('YTD'));
@@ -86,13 +89,15 @@ function print_dimension_summary()
 	$aligns = array('left',	'left', 'left',	'left', 'left', 'left', 'right');
 
     $params =   array( 	0 => $comments,
-    				    1 => array('text' => _('Dimension'), 'from' => $fromdim, 'to' => $todim));
+    				    1 => array('text' => _('Dimension'), 'from' => get_dimension_string($fromdim), 'to' => get_dimension_string($todim)));
 
-    $rep = new FrontReport(_('Dimension Summary'), "DimensionSummary.pdf", user_pagesize());
+    $rep = new FrontReport(_('Dimension Summary'), "DimensionSummary", user_pagesize(), 9, $orientation);
+    if ($orientation == 'L')
+    	recalculate_cols($cols);
 
     $rep->Font();
     $rep->Info($params, $cols, $headers, $aligns);
-    $rep->Header();
+    $rep->NewPage();
 
 	$res = getTransactions($fromdim, $todim);
 	while ($trans=db_fetch($res))
@@ -100,8 +105,8 @@ function print_dimension_summary()
 		$rep->TextCol(0, 1, $trans['reference']);
 		$rep->TextCol(1, 2, $trans['name']);
 		$rep->TextCol(2, 3, $trans['type_']);
-		$rep->TextCol(3, 4, $trans['date_']);
-		$rep->TextCol(4, 5, $trans['due_date']);
+		$rep->DateCol(3, 4, $trans['date_'], true);
+		$rep->DateCol(4, 5, $trans['due_date'], true);
 		if ($trans['closed'])
 			$str = _('Yes');
 		else
@@ -110,7 +115,7 @@ function print_dimension_summary()
 		if ($showbal)
 		{
 			$balance = getYTD($trans['id']);
-			$rep->TextCol(6, 7, number_format2($balance, 0));
+			$rep->AmountCol(6, 7, $balance, 0);
 		}	
 		$rep->NewLine(1, 2);
 	}
@@ -118,4 +123,3 @@ function print_dimension_summary()
     $rep->End();
 }
 
-?>
\ No newline at end of file