projects / fa-stable.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Merged changes form stable branch up to 2.3.13
[fa-stable.git] / reporting / reports_main.php
diff --git a/reporting/reports_main.php b/reporting/reports_main.php
index 650f0dba39e091ffee83b247ab1189e8da524da6..45dc419a701f9a37fa698a7afa1e17925c9628fb 100644 (file)
--- a/reporting/reports_main.php
+++ b/reporting/reports_main.php
@@ -1,12 +1,12 @@
 <?php
 /**********************************************************************
     Copyright (C) FrontAccounting, LLC.
 <?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 
+       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
        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.  
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
     See the License here <http://www.gnu.org/licenses/gpl-3.0.html>.
 ***********************************************************************/
 $path_to_root="..";
     See the License here <http://www.gnu.org/licenses/gpl-3.0.html>.
 ***********************************************************************/
 $path_to_root="..";
@@ -20,29 +20,35 @@ include_once($path_to_root . "/reporting/includes/reports_classes.inc");
 $js = "";
 if ($use_date_picker)
        $js .= get_js_date_picker();
 $js = "";
 if ($use_date_picker)
        $js .= get_js_date_picker();
+
+add_js_file('reports.js');
+
 page(_($help_context = "Reports and Analysis"), false, false, "", $js);
 
 $reports = new BoxReports;
 
 $dim = get_company_pref('use_dimension');
 
 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'),
+$reports->addReportClass(_('Customer'), RC_CUSTOMER);
+$reports->addReport(RC_CUSTOMER, 101, _('Customer &Balances'),
        array(  _('Start Date') => 'DATEBEGIN',
                        _('End Date') => 'DATEENDM',
                        _('Customer') => 'CUSTOMERS_NO_FILTER',
                        _('Currency Filter') => 'CURRENCY',
        array(  _('Start Date') => 'DATEBEGIN',
                        _('End Date') => 'DATEENDM',
                        _('Customer') => 'CUSTOMERS_NO_FILTER',
                        _('Currency Filter') => 'CURRENCY',
+                       _('Suppress Zeros') => 'YES_NO',
                        _('Comments') => 'TEXTBOX',
                        _('Destination') => 'DESTINATION'));
                        _('Comments') => 'TEXTBOX',
                        _('Destination') => 'DESTINATION'));
-$reports->addReport(_('Customer'),102,_('&Aged Customer Analysis'),
+$reports->addReport(RC_CUSTOMER, 102, _('&Aged Customer Analysis'),
        array(  _('End Date') => 'DATE',
                        _('Customer') => 'CUSTOMERS_NO_FILTER',
                        _('Currency Filter') => 'CURRENCY',
        array(  _('End Date') => 'DATE',
                        _('Customer') => 'CUSTOMERS_NO_FILTER',
                        _('Currency Filter') => 'CURRENCY',
+                       _('Show Also Allocated') => 'YES_NO',
                        _('Summary Only') => 'YES_NO',
                        _('Summary Only') => 'YES_NO',
+                       _('Suppress Zeros') => 'YES_NO',
                        _('Graphics') => 'GRAPHIC',
                        _('Comments') => 'TEXTBOX',
                        _('Destination') => 'DESTINATION'));
                        _('Graphics') => 'GRAPHIC',
                        _('Comments') => 'TEXTBOX',
                        _('Destination') => 'DESTINATION'));
-$reports->addReport(_('Customer'),103,_('Customer &Detail Listing'),
+$reports->addReport(RC_CUSTOMER, 103, _('Customer &Detail Listing'),
        array(  _('Activity Since') => 'DATEBEGIN',
                        _('Sales Areas') => 'AREAS',
                        _('Sales Folk') => 'SALESMEN',
        array(  _('Activity Since') => 'DATEBEGIN',
                        _('Sales Areas') => 'AREAS',
                        _('Sales Folk') => 'SALESMEN',
@@ -50,7 +56,13 @@ $reports->addReport(_('Customer'),103,_('Customer &Detail Listing'),
                        _('Activity Less Than') => 'TEXT',
                        _('Comments') => 'TEXTBOX',
                        _('Destination') => 'DESTINATION'));
                        _('Activity Less Than') => 'TEXT',
                        _('Comments') => 'TEXTBOX',
                        _('Destination') => 'DESTINATION'));
-$reports->addReport(_('Customer'),104,_('&Price Listing'),
+$reports->addReport(RC_CUSTOMER, 114, _('Sales &Summary Report'),
+       array(  _('Start Date') => 'DATEBEGINTAX',
+                       _('End Date') => 'DATEENDTAX',
+                       _('Tax Id Only') => 'YES_NO',
+                       _('Comments') => 'TEXTBOX',
+                       _('Destination') => 'DESTINATION'));
+$reports->addReport(RC_CUSTOMER, 104, _('&Price Listing'),
        array(  _('Currency Filter') => 'CURRENCY',
                        _('Inventory Category') => 'CATEGORIES',
                        _('Sales Types') => 'SALESTYPES',
        array(  _('Currency Filter') => 'CURRENCY',
                        _('Inventory Category') => 'CATEGORIES',
                        _('Sales Types') => 'SALESTYPES',
@@ -58,7 +70,7 @@ $reports->addReport(_('Customer'),104,_('&Price Listing'),
                        _('Show GP %') => 'YES_NO',
                        _('Comments') => 'TEXTBOX',
                        _('Destination') => 'DESTINATION'));
                        _('Show GP %') => 'YES_NO',
                        _('Comments') => 'TEXTBOX',
                        _('Destination') => 'DESTINATION'));
-$reports->addReport(_('Customer'),105,_('&Order Status Listing'),
+$reports->addReport(RC_CUSTOMER, 105, _('&Order Status Listing'),
        array(  _('Start Date') => 'DATEBEGINM',
                        _('End Date') => 'DATEENDM',
                        _('Inventory Category') => 'CATEGORIES',
        array(  _('Start Date') => 'DATEBEGINM',
                        _('End Date') => 'DATEENDM',
                        _('Inventory Category') => 'CATEGORIES',
@@ -66,98 +78,124 @@ $reports->addReport(_('Customer'),105,_('&Order Status Listing'),
                        _('Back Orders Only') => 'YES_NO',
                        _('Comments') => 'TEXTBOX',
                        _('Destination') => 'DESTINATION'));
                        _('Back Orders Only') => 'YES_NO',
                        _('Comments') => 'TEXTBOX',
                        _('Destination') => 'DESTINATION'));
-$reports->addReport(_('Customer'),106,_('&Salesman Listing'),
+$reports->addReport(RC_CUSTOMER, 106, _('&Salesman Listing'),
        array(  _('Start Date') => 'DATEBEGINM',
                        _('End Date') => 'DATEENDM',
                        _('Summary Only') => 'YES_NO',
                        _('Comments') => 'TEXTBOX',
                        _('Destination') => 'DESTINATION'));
        array(  _('Start Date') => 'DATEBEGINM',
                        _('End Date') => 'DATEENDM',
                        _('Summary Only') => 'YES_NO',
                        _('Comments') => 'TEXTBOX',
                        _('Destination') => 'DESTINATION'));
-$reports->addReport(_('Customer'),107,_('Print &Invoices/Credit Notes'),
+$reports->addReport(RC_CUSTOMER, 107, _('Print &Invoices'),
        array(  _('From') => 'INVOICE',
                        _('To') => 'INVOICE',
                        _('Currency Filter') => 'CURRENCY',
                        _('email Customers') => 'YES_NO',
                        _('Payment Link') => 'PAYMENT_LINK',
                        _('Comments') => 'TEXTBOX'));
        array(  _('From') => 'INVOICE',
                        _('To') => 'INVOICE',
                        _('Currency Filter') => 'CURRENCY',
                        _('email Customers') => 'YES_NO',
                        _('Payment Link') => 'PAYMENT_LINK',
                        _('Comments') => 'TEXTBOX'));
-$reports->addReport(_('Customer'),110,_('Print &Deliveries'),
+$reports->addReport(RC_CUSTOMER, 113, _('Print &Credit Notes'),
+       array(  _('From') => 'CREDIT',
+                       _('To') => 'CREDIT',
+                       _('Currency Filter') => 'CURRENCY',
+                       _('email Customers') => 'YES_NO',
+                       _('Payment Link') => 'PAYMENT_LINK',
+                       _('Comments') => 'TEXTBOX'));
+$reports->addReport(RC_CUSTOMER, 110, _('Print &Deliveries'),
        array(  _('From') => 'DELIVERY',
                        _('To') => 'DELIVERY',
                        _('email Customers') => 'YES_NO',
                        _('Print as Packing Slip') => 'YES_NO',
                        _('Comments') => 'TEXTBOX'));
        array(  _('From') => 'DELIVERY',
                        _('To') => 'DELIVERY',
                        _('email Customers') => 'YES_NO',
                        _('Print as Packing Slip') => 'YES_NO',
                        _('Comments') => 'TEXTBOX'));
-$reports->addReport(_('Customer'),108,_('Print &Statements'),
+$reports->addReport(RC_CUSTOMER, 108, _('Print &Statements'),
        array(  _('Customer') => 'CUSTOMERS_NO_FILTER',
                        _('Currency Filter') => 'CURRENCY',
        array(  _('Customer') => 'CUSTOMERS_NO_FILTER',
                        _('Currency Filter') => 'CURRENCY',
+                       _('Show Also Allocated') => 'YES_NO',
                        _('Email Customers') => 'YES_NO',
                        _('Comments') => 'TEXTBOX'));
                        _('Email Customers') => 'YES_NO',
                        _('Comments') => 'TEXTBOX'));
-$reports->addReport(_('Customer'),109,_('&Print Sales Orders'),
+$reports->addReport(RC_CUSTOMER, 109, _('&Print Sales Orders'),
        array(  _('From') => 'ORDERS',
                        _('To') => 'ORDERS',
                        _('Currency Filter') => 'CURRENCY',
                        _('Email Customers') => 'YES_NO',
                        _('Print as Quote') => 'YES_NO',
                        _('Comments') => 'TEXTBOX'));
        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'),
+$reports->addReport(RC_CUSTOMER, 111, _('&Print Sales Quotations'),
        array(  _('From') => 'QUOTATIONS',
                        _('To') => 'QUOTATIONS',
                        _('Currency Filter') => 'CURRENCY',
                        _('Email Customers') => 'YES_NO',
                        _('Comments') => 'TEXTBOX'));
        array(  _('From') => 'QUOTATIONS',
                        _('To') => 'QUOTATIONS',
                        _('Currency Filter') => 'CURRENCY',
                        _('Email Customers') => 'YES_NO',
                        _('Comments') => 'TEXTBOX'));
+$reports->addReport(RC_CUSTOMER, 112, _('Print Receipts'),
+       array(  _('From') => 'RECEIPT',
+                       _('To') => 'RECEIPT',
+                       _('Currency Filter') => 'CURRENCY',
+                       _('Comments') => 'TEXTBOX'));
 
 
-$reports->addReportClass(_('Supplier'));
-$reports->addReport(_('Supplier'),201,_('Supplier &Balances'),
+$reports->addReportClass(_('Supplier'), RC_SUPPLIER);
+$reports->addReport(RC_SUPPLIER, 201, _('Supplier &Balances'),
        array(  _('Start Date') => 'DATEBEGIN',
                        _('End Date') => 'DATEENDM',
                        _('Supplier') => 'SUPPLIERS_NO_FILTER',
                        _('Currency Filter') => 'CURRENCY',
        array(  _('Start Date') => 'DATEBEGIN',
                        _('End Date') => 'DATEENDM',
                        _('Supplier') => 'SUPPLIERS_NO_FILTER',
                        _('Currency Filter') => 'CURRENCY',
+                       _('Suppress Zeros') => 'YES_NO',
                        _('Comments') => 'TEXTBOX',
                        _('Destination') => 'DESTINATION'));
                        _('Comments') => 'TEXTBOX',
                        _('Destination') => 'DESTINATION'));
-$reports->addReport(_('Supplier'),202,_('&Aged Supplier Analyses'),
+$reports->addReport(RC_SUPPLIER, 202, _('&Aged Supplier Analyses'),
        array(  _('End Date') => 'DATE',
                        _('Supplier') => 'SUPPLIERS_NO_FILTER',
                        _('Currency Filter') => 'CURRENCY',
        array(  _('End Date') => 'DATE',
                        _('Supplier') => 'SUPPLIERS_NO_FILTER',
                        _('Currency Filter') => 'CURRENCY',
+                       _('Show Also Allocated') => 'YES_NO',
                        _('Summary Only') => 'YES_NO',
                        _('Summary Only') => 'YES_NO',
+                       _('Suppress Zeros') => 'YES_NO',
                        _('Graphics') => 'GRAPHIC',
                        _('Comments') => 'TEXTBOX',
                        _('Destination') => 'DESTINATION'));
                        _('Graphics') => 'GRAPHIC',
                        _('Comments') => 'TEXTBOX',
                        _('Destination') => 'DESTINATION'));
-$reports->addReport(_('Supplier'),203,_('&Payment Report'),
+$reports->addReport(RC_SUPPLIER, 203, _('&Payment Report'),
        array(  _('End Date') => 'DATE',
                        _('Supplier') => 'SUPPLIERS_NO_FILTER',
                        _('Currency Filter') => 'CURRENCY',
        array(  _('End Date') => 'DATE',
                        _('Supplier') => 'SUPPLIERS_NO_FILTER',
                        _('Currency Filter') => 'CURRENCY',
+                       _('Suppress Zeros') => 'YES_NO',
                        _('Comments') => 'TEXTBOX',
                        _('Destination') => 'DESTINATION'));
                        _('Comments') => 'TEXTBOX',
                        _('Destination') => 'DESTINATION'));
-$reports->addReport(_('Supplier'),204,_('Outstanding &GRNs Report'),
+$reports->addReport(RC_SUPPLIER, 204, _('Outstanding &GRNs Report'),
        array(  _('Supplier') => 'SUPPLIERS_NO_FILTER',
                        _('Comments') => 'TEXTBOX',
                        _('Destination') => 'DESTINATION'));
        array(  _('Supplier') => 'SUPPLIERS_NO_FILTER',
                        _('Comments') => 'TEXTBOX',
                        _('Destination') => 'DESTINATION'));
-$reports->addReport(_('Supplier'),209,_('Print Purchase &Orders'),
+$reports->addReport(RC_SUPPLIER, 209, _('Print Purchase &Orders'),
        array(  _('From') => 'PO',
                        _('To') => 'PO',
                        _('Currency Filter') => 'CURRENCY',
                        _('Email Customers') => 'YES_NO',
                        _('Comments') => 'TEXTBOX'));
        array(  _('From') => 'PO',
                        _('To') => 'PO',
                        _('Currency Filter') => 'CURRENCY',
                        _('Email Customers') => 'YES_NO',
                        _('Comments') => 'TEXTBOX'));
+$reports->addReport(RC_SUPPLIER, 210, _('Print Remi&ttances'),
+       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(  _('Inventory Category') => 'CATEGORIES',
+$reports->addReportClass(_('Inventory'), RC_INVENTORY);
+
+$reports->addReport(RC_INVENTORY,  301, _('Inventory &Valuation Report'),
+       array(  _('End Date') => 'DATE',
+                       _('Inventory Category') => 'CATEGORIES',
                        _('Location') => 'LOCATIONS',
                        _('Summary Only') => 'YES_NO',
                        _('Comments') => 'TEXTBOX',
                        _('Destination') => 'DESTINATION'));
                        _('Location') => 'LOCATIONS',
                        _('Summary Only') => 'YES_NO',
                        _('Comments') => 'TEXTBOX',
                        _('Destination') => 'DESTINATION'));
-$reports->addReport(_('Inventory'),302,_('Inventory &Planning Report'),
+$reports->addReport(RC_INVENTORY,  302, _('Inventory &Planning Report'),
        array(  _('Inventory Category') => 'CATEGORIES',
                        _('Location') => 'LOCATIONS',
                        _('Comments') => 'TEXTBOX',
                        _('Destination') => 'DESTINATION'));
        array(  _('Inventory Category') => 'CATEGORIES',
                        _('Location') => 'LOCATIONS',
                        _('Comments') => 'TEXTBOX',
                        _('Destination') => 'DESTINATION'));
-$reports->addReport(_('Inventory'),303,_('Stock &Check Sheets'),
+$reports->addReport(RC_INVENTORY, 303, _('Stock &Check Sheets'),
        array(  _('Inventory Category') => 'CATEGORIES',
                        _('Location') => 'LOCATIONS',
                        _('Show Pictures') => 'YES_NO',
                        _('Inventory Column') => 'YES_NO',
                        _('Show Shortage') => 'YES_NO',
        array(  _('Inventory Category') => 'CATEGORIES',
                        _('Location') => 'LOCATIONS',
                        _('Show Pictures') => 'YES_NO',
                        _('Inventory Column') => 'YES_NO',
                        _('Show Shortage') => 'YES_NO',
+                       _('Suppress Zeros') => 'YES_NO',
                        _('Comments') => 'TEXTBOX',
                        _('Destination') => 'DESTINATION'));
                        _('Comments') => 'TEXTBOX',
                        _('Destination') => 'DESTINATION'));
-$reports->addReport(_('Inventory'),304,_('Inventory &Sales Report'),
+$reports->addReport(RC_INVENTORY, 304, _('Inventory &Sales Report'),
        array(  _('Start Date') => 'DATEBEGINM',
                        _('End Date') => 'DATEENDM',
                        _('Inventory Category') => 'CATEGORIES',
        array(  _('Start Date') => 'DATEBEGINM',
                        _('End Date') => 'DATEENDM',
                        _('Inventory Category') => 'CATEGORIES',
@@ -165,61 +203,62 @@ $reports->addReport(_('Inventory'),304,_('Inventory &Sales Report'),
                        _('Customer') => 'CUSTOMERS_NO_FILTER',
                        _('Comments') => 'TEXTBOX',
                        _('Destination') => 'DESTINATION'));
                        _('Customer') => 'CUSTOMERS_NO_FILTER',
                        _('Comments') => 'TEXTBOX',
                        _('Destination') => 'DESTINATION'));
-$reports->addReport(_('Inventory'),305,_('&GRN Valuation Report'),
+$reports->addReport(RC_INVENTORY, 305, _('&GRN Valuation Report'),
        array(  _('Start Date') => 'DATEBEGINM',
                        _('End Date') => 'DATEENDM',
                        _('Comments') => 'TEXTBOX',
                        _('Destination') => 'DESTINATION'));
 
        array(  _('Start Date') => 'DATEBEGINM',
                        _('End Date') => 'DATEENDM',
                        _('Comments') => 'TEXTBOX',
                        _('Destination') => 'DESTINATION'));
 
-$reports->addReportClass(_('Manufacturing'));
-$reports->addReport(_('Manufacturing'),401,_('&Bill of Material Listing'),
+$reports->addReportClass(_('Manufacturing'), RC_MANUFACTURE);
+$reports->addReport(RC_MANUFACTURE, 401, _('&Bill of Material Listing'),
        array(  _('From product') => 'ITEMS',
                        _('To product') => 'ITEMS',
                        _('Comments') => 'TEXTBOX',
                        _('Destination') => 'DESTINATION'));
        array(  _('From product') => 'ITEMS',
                        _('To product') => 'ITEMS',
                        _('Comments') => 'TEXTBOX',
                        _('Destination') => 'DESTINATION'));
-$reports->addReport(_('Manufacturing'),409,_('Print &Work Orders'),
+$reports->addReport(RC_MANUFACTURE, 409, _('Print &Work Orders'),
        array(  _('From') => 'WORKORDER',
                        _('To') => 'WORKORDER',
                        _('Email Locations') => 'YES_NO',
                        _('Comments') => 'TEXTBOX'));
        array(  _('From') => 'WORKORDER',
                        _('To') => 'WORKORDER',
                        _('Email Locations') => 'YES_NO',
                        _('Comments') => 'TEXTBOX'));
-$reports->addReportClass(_('Dimensions'));
+$reports->addReportClass(_('Dimensions'), RC_DIMENSIONS);
 if ($dim > 0)
 {
 if ($dim > 0)
 {
-       $reports->addReport(_('Dimensions'),501,_('Dimension &Summary'),
+       $reports->addReport(RC_DIMENSIONS, 501, _('Dimension &Summary'),
        array(  _('From Dimension') => 'DIMENSION',
                        _('To Dimension') => 'DIMENSION',
                        _('Show Balance') => 'YES_NO',
                        _('Comments') => 'TEXTBOX',
                        _('Destination') => 'DESTINATION'));
        array(  _('From Dimension') => 'DIMENSION',
                        _('To Dimension') => 'DIMENSION',
                        _('Show Balance') => 'YES_NO',
                        _('Comments') => 'TEXTBOX',
                        _('Destination') => 'DESTINATION'));
-       //$reports->addReport(_('Dimensions'),502,_('Dimension Details'),
+       //$reports->addReport(_('Dimensions'),502, _('Dimension Details'),
        //array(        _('Dimension'),'DIMENSIONS'),
        //              _('Comments'),'TEXTBOX')));
 }
        //array(        _('Dimension'),'DIMENSIONS'),
        //              _('Comments'),'TEXTBOX')));
 }
-$reports->addReportClass(_('Banking'));
-       $reports->addReport(_('Banking'),601,_('Bank &Statement'),
+$reports->addReportClass(_('Banking'), RC_BANKING);
+       $reports->addReport(RC_BANKING,  601, _('Bank &Statement'),
        array(  _('Bank Accounts') => 'BANK_ACCOUNTS',
                        _('Start Date') => 'DATEBEGINM',
                        _('End Date') => 'DATEENDM',
        array(  _('Bank Accounts') => 'BANK_ACCOUNTS',
                        _('Start Date') => 'DATEBEGINM',
                        _('End Date') => 'DATEENDM',
+                       _('Zero values') => 'YES_NO',
                        _('Comments') => 'TEXTBOX',
                        _('Destination') => 'DESTINATION'));
 
                        _('Comments') => 'TEXTBOX',
                        _('Destination') => 'DESTINATION'));
 
-$reports->addReportClass(_('General Ledger'));
-$reports->addReport(_('General Ledger'),701,_('Chart of &Accounts'),
+$reports->addReportClass(_('General Ledger'), RC_GL);
+$reports->addReport(RC_GL, 701, _('Chart of &Accounts'),
        array(  _('Show Balances') => 'YES_NO',
                        _('Comments') => 'TEXTBOX',
                        _('Destination') => 'DESTINATION'));
        array(  _('Show Balances') => 'YES_NO',
                        _('Comments') => 'TEXTBOX',
                        _('Destination') => 'DESTINATION'));
-$reports->addReport(_('General Ledger'),702,_('List of &Journal Entries'),
+$reports->addReport(RC_GL, 702, _('List of &Journal Entries'),
        array(  _('Start Date') => 'DATEBEGINM',
                        _('End Date') => 'DATEENDM',
                        _('Type') => 'SYS_TYPES',
                        _('Comments') => 'TEXTBOX',
                        _('Destination') => 'DESTINATION'));
        array(  _('Start Date') => 'DATEBEGINM',
                        _('End Date') => 'DATEENDM',
                        _('Type') => 'SYS_TYPES',
                        _('Comments') => 'TEXTBOX',
                        _('Destination') => 'DESTINATION'));
-//$reports->addReport(_('General Ledger'),703,_('GL Account Group Summary'),
+//$reports->addReport(RC_GL, 703, _('GL Account Group Summary'),
 //     array(  _('Comments'),'TEXTBOX')));
 
 if ($dim == 2)
 {
 //     array(  _('Comments'),'TEXTBOX')));
 
 if ($dim == 2)
 {
-       $reports->addReport(_('General Ledger'),704,_('GL Account &Transactions'),
+       $reports->addReport(RC_GL, 704, _('GL Account &Transactions'),
        array(  _('Start Date') => 'DATEBEGINM',
                        _('End Date') => 'DATEENDM',
                        _('From Account') => 'GL_ACCOUNTS',
        array(  _('Start Date') => 'DATEBEGINM',
                        _('End Date') => 'DATEENDM',
                        _('From Account') => 'GL_ACCOUNTS',
@@ -228,30 +267,35 @@ if ($dim == 2)
                        _('Dimension')." 2" =>  'DIMENSIONS2',
                        _('Comments') => 'TEXTBOX',
                        _('Destination') => 'DESTINATION'));
                        _('Dimension')." 2" =>  'DIMENSIONS2',
                        _('Comments') => 'TEXTBOX',
                        _('Destination') => 'DESTINATION'));
-       $reports->addReport(_('General Ledger'),705,_('Annual &Expense Breakdown'),
+       $reports->addReport(RC_GL, 705, _('Annual &Expense Breakdown'),
        array(  _('Year') => 'TRANS_YEARS',
                        _('Dimension')." 1" =>  'DIMENSIONS1',
                        _('Dimension')." 2" =>  'DIMENSIONS2',
        array(  _('Year') => 'TRANS_YEARS',
                        _('Dimension')." 1" =>  'DIMENSIONS1',
                        _('Dimension')." 2" =>  'DIMENSIONS2',
+                       _('Account Tags') =>  'ACCOUNTTAGS',
                        _('Comments') => 'TEXTBOX',
                        _('Destination') => 'DESTINATION'));
                        _('Comments') => 'TEXTBOX',
                        _('Destination') => 'DESTINATION'));
-       $reports->addReport(_('General Ledger'),706,_('&Balance Sheet'),
+       $reports->addReport(RC_GL, 706, _('&Balance Sheet'),
        array(  _('Start Date') => 'DATEBEGIN',
                        _('End Date') => 'DATEENDM',
                        _('Dimension')." 1" => 'DIMENSIONS1',
                        _('Dimension')." 2" => 'DIMENSIONS2',
        array(  _('Start Date') => 'DATEBEGIN',
                        _('End Date') => 'DATEENDM',
                        _('Dimension')." 1" => 'DIMENSIONS1',
                        _('Dimension')." 2" => 'DIMENSIONS2',
+                       _('Account Tags') =>  'ACCOUNTTAGS',
+                       _('Decimal values') => 'YES_NO',
                        _('Graphics') => 'GRAPHIC',
                        _('Comments') => 'TEXTBOX',
                        _('Destination') => 'DESTINATION'));
                        _('Graphics') => 'GRAPHIC',
                        _('Comments') => 'TEXTBOX',
                        _('Destination') => 'DESTINATION'));
-       $reports->addReport(_('General Ledger'),707,_('&Profit and Loss Statement'),
+       $reports->addReport(RC_GL, 707, _('&Profit and Loss Statement'),
        array(  _('Start Date') => 'DATEBEGINM',
                        _('End Date') => 'DATEENDM',
                        _('Compare to') => 'COMPARE',
                        _('Dimension')." 1" =>  'DIMENSIONS1',
                        _('Dimension')." 2" =>  'DIMENSIONS2',
        array(  _('Start Date') => 'DATEBEGINM',
                        _('End Date') => 'DATEENDM',
                        _('Compare to') => 'COMPARE',
                        _('Dimension')." 1" =>  'DIMENSIONS1',
                        _('Dimension')." 2" =>  'DIMENSIONS2',
+                       _('Account Tags') =>  'ACCOUNTTAGS',
+                       _('Decimal values') => 'YES_NO',
                        _('Graphics') => 'GRAPHIC',
                        _('Comments') => 'TEXTBOX',
                        _('Destination') => 'DESTINATION'));
                        _('Graphics') => 'GRAPHIC',
                        _('Comments') => 'TEXTBOX',
                        _('Destination') => 'DESTINATION'));
-       $reports->addReport(_('General Ledger'),708,_('Trial &Balance'),
+       $reports->addReport(RC_GL, 708, _('Trial &Balance'),
        array(  _('Start Date') => 'DATEBEGINM',
                        _('End Date') => 'DATEENDM',
                        _('Zero values') => 'YES_NO',
        array(  _('Start Date') => 'DATEBEGINM',
                        _('End Date') => 'DATEENDM',
                        _('Zero values') => 'YES_NO',
@@ -263,7 +307,7 @@ if ($dim == 2)
 }
 else if ($dim == 1)
 {
 }
 else if ($dim == 1)
 {
-       $reports->addReport(_('General Ledger'),704,_('GL Account &Transactions'),
+       $reports->addReport(RC_GL, 704, _('GL Account &Transactions'),
        array(  _('Start Date') => 'DATEBEGINM',
                        _('End Date') => 'DATEENDM',
                        _('From Account') => 'GL_ACCOUNTS',
        array(  _('Start Date') => 'DATEBEGINM',
                        _('End Date') => 'DATEENDM',
                        _('From Account') => 'GL_ACCOUNTS',
@@ -271,27 +315,32 @@ else if ($dim == 1)
                        _('Dimension') =>  'DIMENSIONS1',
                        _('Comments') => 'TEXTBOX',
                        _('Destination') => 'DESTINATION'));
                        _('Dimension') =>  'DIMENSIONS1',
                        _('Comments') => 'TEXTBOX',
                        _('Destination') => 'DESTINATION'));
-       $reports->addReport(_('General Ledger'),705,_('Annual &Expense Breakdown'),
+       $reports->addReport(RC_GL, 705, _('Annual &Expense Breakdown'),
        array(  _('Year') => 'TRANS_YEARS',
                        _('Dimension') =>  'DIMENSIONS1',
        array(  _('Year') => 'TRANS_YEARS',
                        _('Dimension') =>  'DIMENSIONS1',
+                       _('Account Tags') =>  'ACCOUNTTAGS',
                        _('Comments') => 'TEXTBOX',
                        _('Destination') => 'DESTINATION'));
                        _('Comments') => 'TEXTBOX',
                        _('Destination') => 'DESTINATION'));
-       $reports->addReport(_('General Ledger'),706,_('&Balance Sheet'),
+       $reports->addReport(RC_GL, 706, _('&Balance Sheet'),
        array(  _('Start Date') => 'DATEBEGIN',
                        _('End Date') => 'DATEENDM',
                        _('Dimension') => 'DIMENSIONS1',
        array(  _('Start Date') => 'DATEBEGIN',
                        _('End Date') => 'DATEENDM',
                        _('Dimension') => 'DIMENSIONS1',
+                       _('Account Tags') =>  'ACCOUNTTAGS',
+                       _('Decimal values') => 'YES_NO',
                        _('Graphics') => 'GRAPHIC',
                        _('Comments') => 'TEXTBOX',
                        _('Destination') => 'DESTINATION'));
                        _('Graphics') => 'GRAPHIC',
                        _('Comments') => 'TEXTBOX',
                        _('Destination') => 'DESTINATION'));
-       $reports->addReport(_('General Ledger'),707,_('&Profit and Loss Statement'),
+       $reports->addReport(RC_GL, 707, _('&Profit and Loss Statement'),
        array(  _('Start Date') => 'DATEBEGINM',
                        _('End Date') => 'DATEENDM',
                        _('Compare to') => 'COMPARE',
                        _('Dimension') => 'DIMENSIONS1',
        array(  _('Start Date') => 'DATEBEGINM',
                        _('End Date') => 'DATEENDM',
                        _('Compare to') => 'COMPARE',
                        _('Dimension') => 'DIMENSIONS1',
+                       _('Account Tags') =>  'ACCOUNTTAGS',
+                       _('Decimal values') => 'YES_NO',
                        _('Graphics') => 'GRAPHIC',
                        _('Comments') => 'TEXTBOX',
                        _('Destination') => 'DESTINATION'));
                        _('Graphics') => 'GRAPHIC',
                        _('Comments') => 'TEXTBOX',
                        _('Destination') => 'DESTINATION'));
-       $reports->addReport(_('General Ledger'),708,_('Trial &Balance'),
+       $reports->addReport(RC_GL, 708, _('Trial &Balance'),
        array(  _('Start Date') => 'DATEBEGINM',
                        _('End Date') => 'DATEENDM',
                        _('Zero values') => 'YES_NO',
        array(  _('Start Date') => 'DATEBEGINM',
                        _('End Date') => 'DATEENDM',
                        _('Zero values') => 'YES_NO',
@@ -302,31 +351,36 @@ else if ($dim == 1)
 }
 else
 {
 }
 else
 {
-       $reports->addReport(_('General Ledger'),704,_('GL Account &Transactions'),
+       $reports->addReport(RC_GL, 704, _('GL Account &Transactions'),
        array(  _('Start Date') => 'DATEBEGINM',
                        _('End Date') => 'DATEENDM',
                        _('From Account') => 'GL_ACCOUNTS',
                        _('To Account') => 'GL_ACCOUNTS',
                        _('Comments') => 'TEXTBOX',
                        _('Destination') => 'DESTINATION'));
        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'),
+       $reports->addReport(RC_GL, 705, _('Annual &Expense Breakdown'),
        array(  _('Year') => 'TRANS_YEARS',
        array(  _('Year') => 'TRANS_YEARS',
+                       _('Account Tags') =>  'ACCOUNTTAGS',
                        _('Comments') => 'TEXTBOX',
                        _('Destination') => 'DESTINATION'));
                        _('Comments') => 'TEXTBOX',
                        _('Destination') => 'DESTINATION'));
-       $reports->addReport(_('General Ledger'),706,_('&Balance Sheet'),
+       $reports->addReport(RC_GL, 706, _('&Balance Sheet'),
        array(  _('Start Date') => 'DATEBEGIN',
                        _('End Date') => 'DATEENDM',
        array(  _('Start Date') => 'DATEBEGIN',
                        _('End Date') => 'DATEENDM',
+                       _('Account Tags') =>  'ACCOUNTTAGS',
+                       _('Decimal values') => 'YES_NO',
                        _('Graphics') => 'GRAPHIC',
                        _('Comments') => 'TEXTBOX',
                        _('Destination') => 'DESTINATION'));
                        _('Graphics') => 'GRAPHIC',
                        _('Comments') => 'TEXTBOX',
                        _('Destination') => 'DESTINATION'));
-       $reports->addReport(_('General Ledger'),707,_('&Profit and Loss Statement'),
+       $reports->addReport(RC_GL, 707, _('&Profit and Loss Statement'),
        array(  _('Start Date') => 'DATEBEGINM',
                        _('End Date') => 'DATEENDM',
                        _('Compare to') => 'COMPARE',
        array(  _('Start Date') => 'DATEBEGINM',
                        _('End Date') => 'DATEENDM',
                        _('Compare to') => 'COMPARE',
+                       _('Account Tags') =>  'ACCOUNTTAGS',
+                       _('Decimal values') => 'YES_NO',
                        _('Graphics') => 'GRAPHIC',
                        _('Comments') => 'TEXTBOX',
                        _('Destination') => 'DESTINATION'));
                        _('Graphics') => 'GRAPHIC',
                        _('Comments') => 'TEXTBOX',
                        _('Destination') => 'DESTINATION'));
-       $reports->addReport(_('General Ledger'),708,_('Trial &Balance'),
+       $reports->addReport(RC_GL, 708, _('Trial &Balance'),
        array(  _('Start Date') => 'DATEBEGINM',
                        _('End Date') => 'DATEENDM',
                        _('Zero values') => 'YES_NO',
        array(  _('Start Date') => 'DATEBEGINM',
                        _('End Date') => 'DATEENDM',
                        _('Zero values') => 'YES_NO',
@@ -334,12 +388,13 @@ else
                        _('Comments') => 'TEXTBOX',
                        _('Destination') => 'DESTINATION'));
 }
                        _('Comments') => 'TEXTBOX',
                        _('Destination') => 'DESTINATION'));
 }
-$reports->addReport(_('General Ledger'),709,_('Ta&x Report'),
+$reports->addReport(RC_GL, 709, _('Ta&x Report'),
        array(  _('Start Date') => 'DATEBEGINTAX',
                        _('End Date') => 'DATEENDTAX',
                        _('Summary Only') => 'YES_NO',
        array(  _('Start Date') => 'DATEBEGINTAX',
                        _('End Date') => 'DATEENDTAX',
                        _('Summary Only') => 'YES_NO',
-                       _('Comments') => 'TEXTBOX'));
-$reports->addReport(_('General Ledger'),710,_('Audit Trail'),
+                       _('Comments') => 'TEXTBOX',
+                       _('Destination') => 'DESTINATION'));
+$reports->addReport(RC_GL, 710, _('Audit Trail'),
        array(  _('Start Date') => 'DATEBEGINM',
                        _('End Date') => 'DATEENDM',
                        _('Type') => 'SYS_TYPES_ALL',
        array(  _('Start Date') => 'DATEBEGINM',
                        _('End Date') => 'DATEENDM',
                        _('Type') => 'SYS_TYPES_ALL',
@@ -349,14 +404,7 @@ $reports->addReport(_('General Ledger'),710,_('Audit Trail'),
 
 add_custom_reports($reports);
 
 
 add_custom_reports($reports);
 
-echo "<script language='javascript'>
-               function onWindowLoad() {
-                       showClass(" . $_GET['Class'] . ")
-               }
-       Behaviour.addLoadEvent(onWindowLoad);
-       </script>
-";
 echo $reports->getDisplay();
 
 end_page();
 echo $reports->getDisplay();
 
 end_page();
-?>
\ No newline at end of file
+?>
FrontAccounting stable branch