X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=reporting%2Freports_main.php;h=5bc356a1ccee7f8c38dbea29d33c068c99ddf5d0;hb=7286bbfc939360b0fcb573ae075b2b8e899d96c8;hp=494a09f84353e41cd126235a4ba3815de56d72de;hpb=52a4b60cf90cb1157ddbceb6fbf02687a1ff6d70;p=fa-stable.git

diff --git a/reporting/reports_main.php b/reporting/reports_main.php
index 494a09f8..5bc356a1 100644
--- a/reporting/reports_main.php
+++ b/reporting/reports_main.php
@@ -1,7 +1,16 @@
 <?php
-
+/**********************************************************************
+    Copyright (C) FrontAccounting, LLC.
+	Released under the terms of the GNU General Public License, GPL, 
+	as published by the Free Software Foundation, either version 3 
+	of the License, or (at your option) any later version.
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  
+    See the License here <http://www.gnu.org/licenses/gpl-3.0.html>.
+***********************************************************************/
 $path_to_root="..";
-$page_security = 5;
+$page_security = 'SA_OPEN';
 include_once($path_to_root . "/includes/session.inc");
 
 include_once($path_to_root . "/includes/date_functions.inc");
@@ -11,280 +20,359 @@ include_once($path_to_root . "/reporting/includes/reports_classes.inc");
 $js = "";
 if ($use_date_picker)
 	$js .= get_js_date_picker();
-page(_("Reports and Analysis"), false, false, "", $js, true);
+page(_($help_context = "Reports and Analysis"), false, false, "", $js);
 
 $reports = new BoxReports;
 
 $dim = get_company_pref('use_dimension');
 
 $reports->addReportClass(_('Customer'));
-$reports->addReport(_('Customer'),101,_('Customer Balances'),
-	array(	new ReportParam(_('End Date'),'DATE'),
-			new ReportParam(_('Customer'),'CUSTOMERS_NO_FILTER'),
-			new ReportParam(_('Currency Filter'),'CURRENCY'),
-			new ReportParam(_('Comments'),'TEXTBOX')));
-$reports->addReport(_('Customer'),102,_('Aged Customer Analysis'),
-	array(	new ReportParam(_('End Date'),'DATE'),
-			new ReportParam(_('Customer'),'CUSTOMERS_NO_FILTER'),
-			new ReportParam(_('Currency Filter'),'CURRENCY'),
-			new ReportParam(_('Summary Only'),'YES_NO'),
-			new ReportParam(_('Graphics'),'GRAPHIC'),
-			new ReportParam(_('Comments'),'TEXTBOX')));
-$reports->addReport(_('Customer'),103,_('Customer Detail Listing'),
-	array(	new ReportParam(_('Activity Since'),'DATEBEGIN'),
-			new ReportParam(_('Sales Areas'),'AREAS'),
-			new ReportParam(_('Sales Folk'),'SALESMEN'), new ReportParam(_('Activity Greater Than'),'TEXT'), new ReportParam(_('Activity Less Than'),'TEXT'), new ReportParam(_('Comments'),'TEXTBOX')));
-$reports->addReport(_('Customer'),104,_('Price Listing'),
-	array(	new ReportParam(_('Inventory Category'),'CATEGORIES'),
-			new ReportParam(_('Sales Types'),'SALESTYPES'),
-			new ReportParam(_('Show Pictures'),'YES_NO'),
-			new ReportParam(_('Show GP %'),'YES_NO'),
-			new ReportParam(_('Comments'),'TEXTBOX')));
-$reports->addReport(_('Customer'),105,_('Order Status Listing'),
-	array(	new ReportParam(_('Start Date'),'DATEBEGINM'),
-			new ReportParam(_('End Date'),'DATEENDM'),
-			new ReportParam(_('Inventory Category'),'CATEGORIES'),
-			new ReportParam(_('Stock Location'),'LOCATIONS'),
-			new ReportParam(_('Back Orders Only'),'YES_NO'),
-			new ReportParam(_('Comments'),'TEXTBOX')));
-$reports->addReport(_('Customer'),106,_('Salesman Listing'),
-	array(	new ReportParam(_('Start Date'),'DATEBEGINM'),
-			new ReportParam(_('End Date'),'DATEENDM'),
-			new ReportParam(_('Summary Only'),'YES_NO'),
-			new ReportParam(_('Comments'),'TEXTBOX')));
-$reports->addReport(_('Customer'),107,_('Print Invoices/Credit Notes'),
-	array(	new ReportParam(_('From'),'INVOICE'),
-			new ReportParam(_('To'),'INVOICE'),
-			new ReportParam(_('Currency Filter'),'CURRENCY'),
-			new ReportParam(_('Bank Account'),'BANK_ACCOUNTS'),
-			new ReportParam(_('email Customers'),'YES_NO'),
-			new ReportParam(_('Payment Link'),'PAYMENT_LINK'),
-			new ReportParam(_('Comments'),'TEXTBOX')));
-$reports->addReport(_('Customer'),110,_('Print Deliveries'),
-	array(	new ReportParam(_('From'),'DELIVERY'),
-			new ReportParam(_('To'),'DELIVERY'),
-			new ReportParam(_('email Customers'),'YES_NO'),
-			new ReportParam(_('Comments'),'TEXTBOX')));
-$reports->addReport(_('Customer'),108,_('Print Statements'),
-	array(	new ReportParam(_('Customer'),'CUSTOMERS_NO_FILTER'),
-			new ReportParam(_('Currency Filter'),'CURRENCY'),
-			new ReportParam(_('Bank Account'),'BANK_ACCOUNTS'),
-			new ReportParam(_('Email Customers'),'YES_NO'),
-			new ReportParam(_('Comments'),'TEXTBOX')));
-$reports->addReport(_('Customer'),109,_('Print Sales Orders'),
-	array(	new ReportParam(_('From'),'ORDERS'),
-			new ReportParam(_('To'),'ORDERS'),
-			new ReportParam(_('Currency Filter'),'CURRENCY'),
-			new ReportParam(_('Bank Account'),'BANK_ACCOUNTS'),
-			new ReportParam(_('Email Customers'),'YES_NO'),
-			new ReportParam(_('Print as Quote'),'YES_NO'),
-			new ReportParam(_('Comments'),'TEXTBOX')));
+$reports->addReport(_('Customer'),101,_('Customer &Balances'),
+	array(	_('Start Date') => 'DATEBEGIN',
+			_('End Date') => 'DATEENDM',
+			_('Customer') => 'CUSTOMERS_NO_FILTER',
+			_('Currency Filter') => 'CURRENCY',
+			_('Comments') => 'TEXTBOX',
+			_('Destination') => 'DESTINATION'));
+$reports->addReport(_('Customer'),102,_('&Aged Customer Analysis'),
+	array(	_('End Date') => 'DATE',
+			_('Customer') => 'CUSTOMERS_NO_FILTER',
+			_('Currency Filter') => 'CURRENCY',
+			_('Summary Only') => 'YES_NO',
+			_('Graphics') => 'GRAPHIC',
+			_('Comments') => 'TEXTBOX',
+			_('Destination') => 'DESTINATION'));
+$reports->addReport(_('Customer'),103,_('Customer &Detail Listing'),
+	array(	_('Activity Since') => 'DATEBEGIN',
+			_('Sales Areas') => 'AREAS',
+			_('Sales Folk') => 'SALESMEN',
+			_('Activity Greater Than') => 'TEXT',
+			_('Activity Less Than') => 'TEXT',
+			_('Comments') => 'TEXTBOX',
+			_('Destination') => 'DESTINATION'));
+$reports->addReport(_('Customer'),104,_('&Price Listing'),
+	array(	_('Currency Filter') => 'CURRENCY',
+			_('Inventory Category') => 'CATEGORIES',
+			_('Sales Types') => 'SALESTYPES',
+			_('Show Pictures') => 'YES_NO',
+			_('Show GP %') => 'YES_NO',
+			_('Comments') => 'TEXTBOX',
+			_('Destination') => 'DESTINATION'));
+$reports->addReport(_('Customer'),105,_('&Order Status Listing'),
+	array(	_('Start Date') => 'DATEBEGINM',
+			_('End Date') => 'DATEENDM',
+			_('Inventory Category') => 'CATEGORIES',
+			_('Stock Location') => 'LOCATIONS',
+			_('Back Orders Only') => 'YES_NO',
+			_('Comments') => 'TEXTBOX',
+			_('Destination') => 'DESTINATION'));
+$reports->addReport(_('Customer'),106,_('&Salesman Listing'),
+	array(	_('Start Date') => 'DATEBEGINM',
+			_('End Date') => 'DATEENDM',
+			_('Summary Only') => 'YES_NO',
+			_('Comments') => 'TEXTBOX',
+			_('Destination') => 'DESTINATION'));
+$reports->addReport(_('Customer'),107,_('Print &Invoices/Credit Notes'),
+	array(	_('From') => 'INVOICE',
+			_('To') => 'INVOICE',
+			_('Currency Filter') => 'CURRENCY',
+			_('email Customers') => 'YES_NO',
+			_('Payment Link') => 'PAYMENT_LINK',
+			_('Comments') => 'TEXTBOX'));
+$reports->addReport(_('Customer'),110,_('Print &Deliveries'),
+	array(	_('From') => 'DELIVERY',
+			_('To') => 'DELIVERY',
+			_('email Customers') => 'YES_NO',
+			_('Print as Packing Slip') => 'YES_NO',
+			_('Comments') => 'TEXTBOX'));
+$reports->addReport(_('Customer'),108,_('Print &Statements'),
+	array(	_('Customer') => 'CUSTOMERS_NO_FILTER',
+			_('Currency Filter') => 'CURRENCY',
+			_('Email Customers') => 'YES_NO',
+			_('Comments') => 'TEXTBOX'));
+$reports->addReport(_('Customer'),109,_('&Print Sales Orders'),
+	array(	_('From') => 'ORDERS',
+			_('To') => 'ORDERS',
+			_('Currency Filter') => 'CURRENCY',
+			_('Email Customers') => 'YES_NO',
+			_('Print as Quote') => 'YES_NO',
+			_('Comments') => 'TEXTBOX'));
+$reports->addReport(_('Customer'),111,_('&Print Sales Quotations'),
+	array(	_('From') => 'QUOTATIONS',
+			_('To') => 'QUOTATIONS',
+			_('Currency Filter') => 'CURRENCY',
+			_('Email Customers') => 'YES_NO',
+			_('Comments') => 'TEXTBOX'));
+$reports->addReport(_('Customer'),111,_('&Print Sales Quotations'),
+	array(	_('From') => 'QUOTATIONS',
+			_('To') => 'QUOTATIONS',
+			_('Currency Filter') => 'CURRENCY',
+			_('Email Customers') => 'YES_NO',
+			_('Comments') => 'TEXTBOX'));
+$reports->addReport(_('Customer'),112,_('Print Receipts'),
+	array(	_('From') => 'RECEIPT',
+			_('To') => 'RECEIPT',
+			_('Currency Filter') => 'CURRENCY',
+			_('Comments') => 'TEXTBOX'));
 
 $reports->addReportClass(_('Supplier'));
-$reports->addReport(_('Supplier'),201,_('Supplier Balances'),
-	array(	new ReportParam(_('End Date'),'DATE'),
-			new ReportParam(_('Supplier'),'SUPPLIERS_NO_FILTER'),
-			new ReportParam(_('Currency Filter'),'CURRENCY'),
-			new ReportParam(_('Comments'),'TEXTBOX')));
-$reports->addReport(_('Supplier'),202,_('Aged Supplier Analyses'),
-	array(	new ReportParam(_('End Date'),'DATE'),
-			new ReportParam(_('Supplier'),'SUPPLIERS_NO_FILTER'),
-			new ReportParam(_('Currency Filter'),'CURRENCY'),
-			new ReportParam(_('Summary Only'),'YES_NO'),
-			new ReportParam(_('Graphics'),'GRAPHIC'),
-			new ReportParam(_('Comments'),'TEXTBOX')));
-$reports->addReport(_('Supplier'),203,_('Payment Report'),
-	array(	new ReportParam(_('End Date'),'DATE'),
-			new ReportParam(_('Supplier'),'SUPPLIERS_NO_FILTER'),
-			new ReportParam(_('Currency Filter'),'CURRENCY'),
-			new ReportParam(_('Comments'),'TEXTBOX')));
-$reports->addReport(_('Supplier'),204,_('Outstanding GRNs Report'),
-	array(	new ReportParam(_('Supplier'),'SUPPLIERS_NO_FILTER'),
-			new ReportParam(_('Comments'),'TEXTBOX')));
-$reports->addReport(_('Supplier'),209,_('Print Purchase Orders'),
-	array(	new ReportParam(_('From'),'PO'),
-			new ReportParam(_('To'),'PO'),
-			new ReportParam(_('Currency Filter'),'CURRENCY'),
-			new ReportParam(_('Bank Account'),'BANK_ACCOUNTS'),
-			new ReportParam(_('Email Customers'),'YES_NO'),
-			new ReportParam(_('Comments'),'TEXTBOX')));
+$reports->addReport(_('Supplier'),201,_('Supplier &Balances'),
+	array(	_('Start Date') => 'DATEBEGIN',
+			_('End Date') => 'DATEENDM',
+			_('Supplier') => 'SUPPLIERS_NO_FILTER',
+			_('Currency Filter') => 'CURRENCY',
+			_('Comments') => 'TEXTBOX',
+			_('Destination') => 'DESTINATION'));
+$reports->addReport(_('Supplier'),202,_('&Aged Supplier Analyses'),
+	array(	_('End Date') => 'DATE',
+			_('Supplier') => 'SUPPLIERS_NO_FILTER',
+			_('Currency Filter') => 'CURRENCY',
+			_('Summary Only') => 'YES_NO',
+			_('Graphics') => 'GRAPHIC',
+			_('Comments') => 'TEXTBOX',
+			_('Destination') => 'DESTINATION'));
+$reports->addReport(_('Supplier'),203,_('&Payment Report'),
+	array(	_('End Date') => 'DATE',
+			_('Supplier') => 'SUPPLIERS_NO_FILTER',
+			_('Currency Filter') => 'CURRENCY',
+			_('Comments') => 'TEXTBOX',
+			_('Destination') => 'DESTINATION'));
+$reports->addReport(_('Supplier'),204,_('Outstanding &GRNs Report'),
+	array(	_('Supplier') => 'SUPPLIERS_NO_FILTER',
+			_('Comments') => 'TEXTBOX',
+			_('Destination') => 'DESTINATION'));
+$reports->addReport(_('Supplier'),209,_('Print Purchase &Orders'),
+	array(	_('From') => 'PO',
+			_('To') => 'PO',
+			_('Currency Filter') => 'CURRENCY',
+			_('Email Customers') => 'YES_NO',
+			_('Comments') => 'TEXTBOX'));
+$reports->addReport(_('Supplier'),210,_('Print Remittances'),
+	array(	_('From') => 'REMITTANCE',
+			_('To') => 'REMITTANCE',
+			_('Currency Filter') => 'CURRENCY',
+			_('Email Customers') => 'YES_NO',
+			_('Comments') => 'TEXTBOX'));
 
 $reports->addReportClass(_('Inventory'));
-$reports->addReport(_('Inventory'),301,_('Inventory Valuation Report'),
-	array(	new ReportParam(_('Inventory Category'),'CATEGORIES'),
-			new ReportParam(_('Location'),'LOCATIONS'),
-			new ReportParam(_('Detailed Report'),'YES_NO'),
-			new ReportParam(_('Comments'),'TEXTBOX')));
-$reports->addReport(_('Inventory'),302,_('Inventory Planning Report'),
-	array(	new ReportParam(_('Inventory Category'),'CATEGORIES'),
-			new ReportParam(_('Location'),'LOCATIONS'),
-			new ReportParam(_('Comments'),'TEXTBOX')));
-$reports->addReport(_('Inventory'),303,_('Stock Check Sheets'),
-	array(	new ReportParam(_('Inventory Category'),'CATEGORIES'),
-			new ReportParam(_('Location'),'LOCATIONS'),
-			new ReportParam(_('Show Pictures'),'YES_NO'),
-			new ReportParam(_('Comments'),'TEXTBOX')));
-$reports->addReport(_('Inventory'),304,_('Inventory Sales Report'),
-	array(	new ReportParam(_('Start Date'),'DATEBEGINM'),
-			new ReportParam(_('End Date'),'DATEENDM'),
-			new ReportParam(_('Inventory Category'),'CATEGORIES'),
-			new ReportParam(_('Location'),'LOCATIONS'),
-			new ReportParam(_('Detailed Report'),'YES_NO'),
-			new ReportParam(_('Comments'),'TEXTBOX')));
+$reports->addReport(_('Inventory'),301,_('Inventory &Valuation Report'),
+	array(	_('Inventory Category') => 'CATEGORIES',
+			_('Location') => 'LOCATIONS',
+			_('Summary Only') => 'YES_NO',
+			_('Comments') => 'TEXTBOX',
+			_('Destination') => 'DESTINATION'));
+$reports->addReport(_('Inventory'),302,_('Inventory &Planning Report'),
+	array(	_('Inventory Category') => 'CATEGORIES',
+			_('Location') => 'LOCATIONS',
+			_('Comments') => 'TEXTBOX',
+			_('Destination') => 'DESTINATION'));
+$reports->addReport(_('Inventory'),303,_('Stock &Check Sheets'),
+	array(	_('Inventory Category') => 'CATEGORIES',
+			_('Location') => 'LOCATIONS',
+			_('Show Pictures') => 'YES_NO',
+			_('Inventory Column') => 'YES_NO',
+			_('Show Shortage') => 'YES_NO',
+			_('Comments') => 'TEXTBOX',
+			_('Destination') => 'DESTINATION'));
+$reports->addReport(_('Inventory'),304,_('Inventory &Sales Report'),
+	array(	_('Start Date') => 'DATEBEGINM',
+			_('End Date') => 'DATEENDM',
+			_('Inventory Category') => 'CATEGORIES',
+			_('Location') => 'LOCATIONS',
+			_('Customer') => 'CUSTOMERS_NO_FILTER',
+			_('Comments') => 'TEXTBOX',
+			_('Destination') => 'DESTINATION'));
+$reports->addReport(_('Inventory'),305,_('&GRN Valuation Report'),
+	array(	_('Start Date') => 'DATEBEGINM',
+			_('End Date') => 'DATEENDM',
+			_('Comments') => 'TEXTBOX',
+			_('Destination') => 'DESTINATION'));
 
-$reports->addReportClass(_('Manufactoring'));
-$reports->addReport(_('Manufactoring'),401,_('Bill of Material Listing'),
-	array(	new ReportParam(_('From component'),'ITEMS'),
-			new ReportParam(_('To component'),'ITEMS'),
-			new ReportParam(_('Comments'),'TEXTBOX')));
-	$reports->addReportClass(_('Dimensions'));
+$reports->addReportClass(_('Manufacturing'));
+$reports->addReport(_('Manufacturing'),401,_('&Bill of Material Listing'),
+	array(	_('From product') => 'ITEMS',
+			_('To product') => 'ITEMS',
+			_('Comments') => 'TEXTBOX',
+			_('Destination') => 'DESTINATION'));
+$reports->addReport(_('Manufacturing'),409,_('Print &Work Orders'),
+	array(	_('From') => 'WORKORDER',
+			_('To') => 'WORKORDER',
+			_('Email Locations') => 'YES_NO',
+			_('Comments') => 'TEXTBOX'));
+$reports->addReportClass(_('Dimensions'));
 if ($dim > 0)
 {
-	$reports->addReport(_('Dimensions'),501,_('Dimension Summary'),
-	array(	new ReportParam(_('From Dimension'),'DIMENSION'),
-			new ReportParam(_('To Dimension'),'DIMENSION'),
-			new ReportParam(_('Show Balance'),'YES_NO'),
-			new ReportParam(_('Comments'),'TEXTBOX')));
+	$reports->addReport(_('Dimensions'),501,_('Dimension &Summary'),
+	array(	_('From Dimension') => 'DIMENSION',
+			_('To Dimension') => 'DIMENSION',
+			_('Show Balance') => 'YES_NO',
+			_('Comments') => 'TEXTBOX',
+			_('Destination') => 'DESTINATION'));
 	//$reports->addReport(_('Dimensions'),502,_('Dimension Details'),
-	//array(	new ReportParam(_('Dimension'),'DIMENSIONS'),
-	//		new ReportParam(_('Comments'),'TEXTBOX')));
+	//array(	_('Dimension'),'DIMENSIONS'),
+	//		_('Comments'),'TEXTBOX')));
 }
 $reports->addReportClass(_('Banking'));
-//$reports->addReport(_('Banking'),601,_('Bank Account Transactions'),
-//	array(	new ReportParam(_('Bank Accounts'),'BANK_ACCOUNTS'),
-//			new ReportParam(_('Start Date'),'DATE'),
-//			new ReportParam(_('End Date'),'DATE'),
-//			new ReportParam(_('Comments'),'TEXTBOX')));
+	$reports->addReport(_('Banking'),601,_('Bank &Statement'),
+	array(	_('Bank Accounts') => 'BANK_ACCOUNTS',
+			_('Start Date') => 'DATEBEGINM',
+			_('End Date') => 'DATEENDM',
+			_('Comments') => 'TEXTBOX',
+			_('Destination') => 'DESTINATION'));
 
 $reports->addReportClass(_('General Ledger'));
-$reports->addReport(_('General Ledger'),701,_('Chart of Accounts'),
-	array(	new ReportParam(_('Show Balances'),'YES_NO'),
-			new ReportParam(_('Comments'),'TEXTBOX')));
-$reports->addReport(_('General Ledger'),702,_('List of Journal Entries'),
-	array(	new ReportParam(_('Start Date'),'DATEBEGINM'),
-			new ReportParam(_('End Date'),'DATEENDM'),
-			new ReportParam(_('Type'),'SYS_TYPES'),
-			new ReportParam(_('Comments'),'TEXTBOX')));
+$reports->addReport(_('General Ledger'),701,_('Chart of &Accounts'),
+	array(	_('Show Balances') => 'YES_NO',
+			_('Comments') => 'TEXTBOX',
+			_('Destination') => 'DESTINATION'));
+$reports->addReport(_('General Ledger'),702,_('List of &Journal Entries'),
+	array(	_('Start Date') => 'DATEBEGINM',
+			_('End Date') => 'DATEENDM',
+			_('Type') => 'SYS_TYPES',
+			_('Comments') => 'TEXTBOX',
+			_('Destination') => 'DESTINATION'));
 //$reports->addReport(_('General Ledger'),703,_('GL Account Group Summary'),
-//	array(	new ReportParam(_('Comments'),'TEXTBOX')));
+//	array(	_('Comments'),'TEXTBOX')));
+
 if ($dim == 2)
 {
-	$reports->addReport(_('General Ledger'),704,_('GL Account Transactions'),
-	array(	new ReportParam(_('Start Date'),'DATEBEGINM'),
-			new ReportParam(_('End Date'),'DATEENDM'),
-			new ReportParam(_('From Account'),'GL_ACCOUNTS'),
-			new ReportParam(_('To Account'),'GL_ACCOUNTS'),
-			new ReportParam(_('Dimension')." 1", 'DIMENSIONS1'),
-			new ReportParam(_('Dimension')." 2", 'DIMENSIONS2'),
-			new ReportParam(_('Comments'),'TEXTBOX')));
-	$reports->addReport(_('General Ledger'),705,_('Annual Expense Breakdown'),
-	array(	new ReportParam(_('Year'),'TRANS_YEARS'),
-			new ReportParam(_('Dimension')." 1", 'DIMENSIONS1'),
-			new ReportParam(_('Dimension')." 2", 'DIMENSIONS2'),
-			new ReportParam(_('Comments'),'TEXTBOX')));
-	$reports->addReport(_('General Ledger'),706,_('Balance Sheet'),
-	array(	new ReportParam(_('Start Date'),'DATEBEGIN'),
-			new ReportParam(_('End Date'),'DATEENDM'),
-			new ReportParam(_('Dimension')." 1", 'DIMENSIONS1'),
-			new ReportParam(_('Dimension')." 2", 'DIMENSIONS2'),
-			new ReportParam(_('Graphics'),'GRAPHIC'),
-			new ReportParam(_('Comments'),'TEXTBOX')));
-	$reports->addReport(_('General Ledger'),707,_('Profit and Loss Statement'),
-	array(	new ReportParam(_('Start Date'),'DATEBEGINM'),
-			new ReportParam(_('End Date'),'DATEENDM'),
-			new ReportParam(_('Compare to'),'COMPARE'),
-			new ReportParam(_('Dimension')." 1", 'DIMENSIONS1'),
-			new ReportParam(_('Dimension')." 2", 'DIMENSIONS2'),
-			new ReportParam(_('Graphics'),'GRAPHIC'),
-			new ReportParam(_('Comments'),'TEXTBOX')));
-	$reports->addReport(_('General Ledger'),708,_('Trial Balance'),
-	array(	new ReportParam(_('Start Date'),'DATEBEGINM'),
-			new ReportParam(_('End Date'),'DATEENDM'),
-			new ReportParam(_('Zero values'),'YES_NO'),
-			new ReportParam(_('Dimension')." 1", 'DIMENSIONS1'),
-			new ReportParam(_('Dimension')." 2", 'DIMENSIONS2'),
-			new ReportParam(_('Comments'),'TEXTBOX')));
+	$reports->addReport(_('General Ledger'),704,_('GL Account &Transactions'),
+	array(	_('Start Date') => 'DATEBEGINM',
+			_('End Date') => 'DATEENDM',
+			_('From Account') => 'GL_ACCOUNTS',
+			_('To Account') => 'GL_ACCOUNTS',
+			_('Dimension')." 1" =>  'DIMENSIONS1',
+			_('Dimension')." 2" =>  'DIMENSIONS2',
+			_('Comments') => 'TEXTBOX',
+			_('Destination') => 'DESTINATION'));
+	$reports->addReport(_('General Ledger'),705,_('Annual &Expense Breakdown'),
+	array(	_('Year') => 'TRANS_YEARS',
+			_('Dimension')." 1" =>  'DIMENSIONS1',
+			_('Dimension')." 2" =>  'DIMENSIONS2',
+			_('Comments') => 'TEXTBOX',
+			_('Destination') => 'DESTINATION'));
+	$reports->addReport(_('General Ledger'),706,_('&Balance Sheet'),
+	array(	_('Start Date') => 'DATEBEGIN',
+			_('End Date') => 'DATEENDM',
+			_('Dimension')." 1" => 'DIMENSIONS1',
+			_('Dimension')." 2" => 'DIMENSIONS2',
+			_('Decimal values') => 'YES_NO',
+			_('Graphics') => 'GRAPHIC',
+			_('Comments') => 'TEXTBOX',
+			_('Destination') => 'DESTINATION'));
+	$reports->addReport(_('General Ledger'),707,_('&Profit and Loss Statement'),
+	array(	_('Start Date') => 'DATEBEGINM',
+			_('End Date') => 'DATEENDM',
+			_('Compare to') => 'COMPARE',
+			_('Dimension')." 1" =>  'DIMENSIONS1',
+			_('Dimension')." 2" =>  'DIMENSIONS2',
+			_('Decimal values') => 'YES_NO',
+			_('Graphics') => 'GRAPHIC',
+			_('Comments') => 'TEXTBOX',
+			_('Destination') => 'DESTINATION'));
+	$reports->addReport(_('General Ledger'),708,_('Trial &Balance'),
+	array(	_('Start Date') => 'DATEBEGINM',
+			_('End Date') => 'DATEENDM',
+			_('Zero values') => 'YES_NO',
+			_('Only balances') => 'YES_NO',
+			_('Dimension')." 1" =>  'DIMENSIONS1',
+			_('Dimension')." 2" =>  'DIMENSIONS2',
+			_('Comments') => 'TEXTBOX',
+			_('Destination') => 'DESTINATION'));
 }
 else if ($dim == 1)
 {
-	$reports->addReport(_('General Ledger'),704,_('GL Account Transactions'),
-	array(	new ReportParam(_('Start Date'),'DATEBEGINM'),
-			new ReportParam(_('End Date'),'DATEENDM'),
-			new ReportParam(_('From Account'),'GL_ACCOUNTS'),
-			new ReportParam(_('To Account'),'GL_ACCOUNTS'),
-			new ReportParam(_('Dimension'), 'DIMENSIONS1'),
-			new ReportParam(_('Comments'),'TEXTBOX')));
-	$reports->addReport(_('General Ledger'),705,_('Annual Expense Breakdown'),
-	array(	new ReportParam(_('Year'),'TRANS_YEARS'),
-			new ReportParam(_('Dimension'), 'DIMENSIONS1'),
-			new ReportParam(_('Comments'),'TEXTBOX')));
-	$reports->addReport(_('General Ledger'),706,_('Balance Sheet'),
-	array(	new ReportParam(_('Start Date'),'DATEBEGIN'),
-			new ReportParam(_('End Date'),'DATEENDM'),
-			new ReportParam(_('Dimension'), 'DIMENSIONS1'),
-			new ReportParam(_('Graphics'),'GRAPHIC'),
-			new ReportParam(_('Comments'),'TEXTBOX')));
-	$reports->addReport(_('General Ledger'),707,_('Profit and Loss Statement'),
-	array(	new ReportParam(_('Start Date'),'DATEBEGINM'),
-			new ReportParam(_('End Date'),'DATEENDM'),
-			new ReportParam(_('Compare to'),'COMPARE'),
-			new ReportParam(_('Dimension'), 'DIMENSIONS1'),
-			new ReportParam(_('Graphics'),'GRAPHIC'),
-			new ReportParam(_('Comments'),'TEXTBOX')));
-	$reports->addReport(_('General Ledger'),708,_('Trial Balance'),
-	array(	new ReportParam(_('Start Date'),'DATEBEGINM'),
-			new ReportParam(_('End Date'),'DATEENDM'),
-			new ReportParam(_('Zero values'),'YES_NO'),
-			new ReportParam(_('Dimension'), 'DIMENSIONS1'),
-			new ReportParam(_('Comments'),'TEXTBOX')));
+	$reports->addReport(_('General Ledger'),704,_('GL Account &Transactions'),
+	array(	_('Start Date') => 'DATEBEGINM',
+			_('End Date') => 'DATEENDM',
+			_('From Account') => 'GL_ACCOUNTS',
+			_('To Account') => 'GL_ACCOUNTS',
+			_('Dimension') =>  'DIMENSIONS1',
+			_('Comments') => 'TEXTBOX',
+			_('Destination') => 'DESTINATION'));
+	$reports->addReport(_('General Ledger'),705,_('Annual &Expense Breakdown'),
+	array(	_('Year') => 'TRANS_YEARS',
+			_('Dimension') =>  'DIMENSIONS1',
+			_('Comments') => 'TEXTBOX',
+			_('Destination') => 'DESTINATION'));
+	$reports->addReport(_('General Ledger'),706,_('&Balance Sheet'),
+	array(	_('Start Date') => 'DATEBEGIN',
+			_('End Date') => 'DATEENDM',
+			_('Dimension') => 'DIMENSIONS1',
+			_('Decimal values') => 'YES_NO',
+			_('Graphics') => 'GRAPHIC',
+			_('Comments') => 'TEXTBOX',
+			_('Destination') => 'DESTINATION'));
+	$reports->addReport(_('General Ledger'),707,_('&Profit and Loss Statement'),
+	array(	_('Start Date') => 'DATEBEGINM',
+			_('End Date') => 'DATEENDM',
+			_('Compare to') => 'COMPARE',
+			_('Dimension') => 'DIMENSIONS1',
+			_('Decimal values') => 'YES_NO',
+			_('Graphics') => 'GRAPHIC',
+			_('Comments') => 'TEXTBOX',
+			_('Destination') => 'DESTINATION'));
+	$reports->addReport(_('General Ledger'),708,_('Trial &Balance'),
+	array(	_('Start Date') => 'DATEBEGINM',
+			_('End Date') => 'DATEENDM',
+			_('Zero values') => 'YES_NO',
+			_('Only balances') => 'YES_NO',
+			_('Dimension') => 'DIMENSIONS1',
+			_('Comments') => 'TEXTBOX',
+			_('Destination') => 'DESTINATION'));
 }
 else
 {
-	$reports->addReport(_('General Ledger'),704,_('GL Account Transactions'),
-	array(	new ReportParam(_('Start Date'),'DATEBEGINM'),
-			new ReportParam(_('End Date'),'DATEENDM'),
-			new ReportParam(_('From Account'),'GL_ACCOUNTS'),
-			new ReportParam(_('To Account'),'GL_ACCOUNTS'),
-			new ReportParam(_('Comments'),'TEXTBOX')));
-	$reports->addReport(_('General Ledger'),705,_('Annual Expense Breakdown'),
-	array(	new ReportParam(_('Year'),'TRANS_YEARS'),
-			new ReportParam(_('Comments'),'TEXTBOX')));
-	$reports->addReport(_('General Ledger'),706,_('Balance Sheet'),
-	array(	new ReportParam(_('Start Date'),'DATEBEGIN'),
-			new ReportParam(_('End Date'),'DATEENDM'),
-			new ReportParam(_('Graphics'),'GRAPHIC'),
-			new ReportParam(_('Comments'),'TEXTBOX')));
-	$reports->addReport(_('General Ledger'),707,_('Profit and Loss Statement'),
-	array(	new ReportParam(_('Start Date'),'DATEBEGINM'),
-			new ReportParam(_('End Date'),'DATEENDM'),
-			new ReportParam(_('Compare to'),'COMPARE'),
-			new ReportParam(_('Graphics'),'GRAPHIC'),
-			new ReportParam(_('Comments'),'TEXTBOX')));
-	$reports->addReport(_('General Ledger'),708,_('Trial Balance'),
-	array(	new ReportParam(_('Start Date'),'DATEBEGINM'),
-			new ReportParam(_('End Date'),'DATEENDM'),
-			new ReportParam(_('Zero values'),'YES_NO'),
-			new ReportParam(_('Comments'),'TEXTBOX')));
+	$reports->addReport(_('General Ledger'),704,_('GL Account &Transactions'),
+	array(	_('Start Date') => 'DATEBEGINM',
+			_('End Date') => 'DATEENDM',
+			_('From Account') => 'GL_ACCOUNTS',
+			_('To Account') => 'GL_ACCOUNTS',
+			_('Comments') => 'TEXTBOX',
+			_('Destination') => 'DESTINATION'));
+	$reports->addReport(_('General Ledger'),705,_('Annual &Expense Breakdown'),
+	array(	_('Year') => 'TRANS_YEARS',
+			_('Comments') => 'TEXTBOX',
+			_('Destination') => 'DESTINATION'));
+	$reports->addReport(_('General Ledger'),706,_('&Balance Sheet'),
+	array(	_('Start Date') => 'DATEBEGIN',
+			_('End Date') => 'DATEENDM',
+			_('Decimal values') => 'YES_NO',
+			_('Graphics') => 'GRAPHIC',
+			_('Comments') => 'TEXTBOX',
+			_('Destination') => 'DESTINATION'));
+	$reports->addReport(_('General Ledger'),707,_('&Profit and Loss Statement'),
+	array(	_('Start Date') => 'DATEBEGINM',
+			_('End Date') => 'DATEENDM',
+			_('Compare to') => 'COMPARE',
+			_('Decimal values') => 'YES_NO',
+			_('Graphics') => 'GRAPHIC',
+			_('Comments') => 'TEXTBOX',
+			_('Destination') => 'DESTINATION'));
+	$reports->addReport(_('General Ledger'),708,_('Trial &Balance'),
+	array(	_('Start Date') => 'DATEBEGINM',
+			_('End Date') => 'DATEENDM',
+			_('Zero values') => 'YES_NO',
+			_('Only balances') => 'YES_NO',
+			_('Comments') => 'TEXTBOX',
+			_('Destination') => 'DESTINATION'));
 }
-$reports->addReport(_('General Ledger'),709,_('Tax Report'),
-	array(	new ReportParam(_('Start Date'),'DATEBEGINTAX'),
-			new ReportParam(_('End Date'),'DATEENDTAX'),
-			new ReportParam(_('Summary Only'),'YES_NO'),
-			new ReportParam(_('Comments'),'TEXTBOX')));
+$reports->addReport(_('General Ledger'),709,_('Ta&x Report'),
+	array(	_('Start Date') => 'DATEBEGINTAX',
+			_('End Date') => 'DATEENDTAX',
+			_('Summary Only') => 'YES_NO',
+			_('Comments') => 'TEXTBOX'));
+$reports->addReport(_('General Ledger'),710,_('Audit Trail'),
+	array(	_('Start Date') => 'DATEBEGINM',
+			_('End Date') => 'DATEENDM',
+			_('Type') => 'SYS_TYPES_ALL',
+			_('User') => 'USERS',
+			_('Comments') => 'TEXTBOX',
+			_('Destination') => 'DESTINATION'));
 
-echo "
-<form method=post>
-	<input type='hidden' name='REP_ID' value=''>
-	<input type='hidden' name='PARAM_COUNT' value=''>
-	<input type='hidden' name='PARAM_0' value=''>
-	<input type='hidden' name='PARAM_1' value=''>
-	<input type='hidden' name='PARAM_2' value=''>
-	<input type='hidden' name='PARAM_3' value=''>
-	<input type='hidden' name='PARAM_4' value=''>
-	<input type='hidden' name='PARAM_5' value=''>
-	<input type='hidden' name='PARAM_6' value=''>
+add_custom_reports($reports);
 
-	<script language='javascript'>
+echo "<script language='javascript'>
 		function onWindowLoad() {
 			showClass(" . $_GET['Class'] . ")
 		}
@@ -292,7 +380,6 @@ echo "
 	</script>
 ";
 echo $reports->getDisplay();
-echo "</form>";
 
 end_page();
 ?>
\ No newline at end of file