Merging latest changes from stable branch up to 2.3.24

[fa-stable.git] / reporting / reports_main.php

diff --git a/reporting/reports_main.php b/reporting/reports_main.php
index 897eac56509539abe607d41c8fcf40ed17969c9e..2435cc698923fd85d659aac8381b74593435ff70 100644 (file)
--- a/reporting/reports_main.php
+++ b/reporting/reports_main.php
@@ -18,7 +18,7 @@ include_once($path_to_root . "/includes/data_checks.inc");
 include_once($path_to_root . "/includes/ui.inc");
 include_once($path_to_root . "/reporting/includes/reports_classes.inc");
 $js = "";
-if ($use_date_picker)
+if (user_use_date_picker())
        $js .= get_js_date_picker();
 
 add_js_file('reports.js');
@@ -99,7 +99,9 @@ $reports->addReport(RC_CUSTOMER, 107, _('Print &Invoices'),
                        _('email Customers') => 'YES_NO',
                        _('Payment Link') => 'PAYMENT_LINK',
                        _('Comments') => 'TEXTBOX',
-                       _('Orientation') => 'ORIENTATION'));
+                       _('Customer') => 'CUSTOMERS_NO_FILTER',
+                       _('Orientation') => 'ORIENTATION'
+));
 $reports->addReport(RC_CUSTOMER, 113, _('Print &Credit Notes'),
        array(  _('From') => 'CREDIT',
                        _('To') => 'CREDIT',
@@ -190,20 +192,20 @@ $reports->addReport(RC_SUPPLIER, 209, _('Print Purchase &Orders'),
        array(  _('From') => 'PO',
                        _('To') => 'PO',
                        _('Currency Filter') => 'CURRENCY',
-                       _('Email Customers') => 'YES_NO',
+                       _('Email Suppliers') => 'YES_NO',
                        _('Comments') => 'TEXTBOX',
                        _('Orientation') => 'ORIENTATION'));
-$reports->addReport(RC_SUPPLIER, 210, _('Print Remittances'),
+$reports->addReport(RC_SUPPLIER, 210, _('Print Remi&ttances'),
        array(  _('From') => 'REMITTANCE',
                        _('To') => 'REMITTANCE',
                        _('Currency Filter') => 'CURRENCY',
-                       _('Email Customers') => 'YES_NO',
+                       _('Email Suppliers') => 'YES_NO',
                        _('Comments') => 'TEXTBOX',
                        _('Orientation') => 'ORIENTATION'));
 
 $reports->addReportClass(_('Inventory'), RC_INVENTORY);
 $reports->addReport(RC_INVENTORY,  301, _('Inventory &Valuation Report'),
-       array(  _('End Date') => 'DATE',        
+       array(  _('End Date') => 'DATE',
                        _('Inventory Category') => 'CATEGORIES',
                        _('Location') => 'LOCATIONS',
                        _('Summary Only') => 'YES_NO',
@@ -223,6 +225,7 @@ $reports->addReport(RC_INVENTORY, 303, _('Stock &Check Sheets'),
                        _('Inventory Column') => 'YES_NO',
                        _('Show Shortage') => 'YES_NO',
                        _('Suppress Zeros') => 'YES_NO',
+                       _('Item Like') => 'TEXT',
                        _('Comments') => 'TEXTBOX',
                        _('Orientation') => 'ORIENTATION',
                        _('Destination') => 'DESTINATION'));
@@ -232,6 +235,7 @@ $reports->addReport(RC_INVENTORY, 304, _('Inventory &Sales Report'),
                        _('Inventory Category') => 'CATEGORIES',
                        _('Location') => 'LOCATIONS',
                        _('Customer') => 'CUSTOMERS_NO_FILTER',
+                       _('Show Service Items') => 'YES_NO',
                        _('Comments') => 'TEXTBOX',
                        _('Orientation') => 'ORIENTATION',
                        _('Destination') => 'DESTINATION'));
@@ -267,7 +271,7 @@ $reports->addReport(RC_INVENTORY, 308, _('C&osted Inventory Movement Report'),
                        _('Comments') => 'TEXTBOX',
                        _('Orientation') => 'ORIENTATION',
                        _('Destination') => 'DESTINATION'));                            
-$reports->addReport(RC_INVENTORY, 309,_('&Sales Summary Report, Detailed'),
+$reports->addReport(RC_INVENTORY, 309,_('Item &Sales Summary Report'),
        array(  _('Start Date') => 'DATEBEGINM',
                        _('End Date') => 'DATEENDM',
                        _('Inventory Category') => 'CATEGORIES',
@@ -282,6 +286,13 @@ $reports->addReport(RC_MANUFACTURE, 401, _('&Bill of Material Listing'),
                        _('Comments') => 'TEXTBOX',
                        _('Orientation') => 'ORIENTATION',
                        _('Destination') => 'DESTINATION'));
+$reports->addReport(RC_MANUFACTURE, 402, _('Work Order &Listing'),
+       array(  _('Items') => 'ITEMS_ALL',
+                       _('Location') => 'LOCATIONS',
+                       _('Outstanding Only') => 'YES_NO',
+                       _('Comments') => 'TEXTBOX',
+                       _('Orientation') => 'ORIENTATION',
+                       _('Destination') => 'DESTINATION'));
 $reports->addReport(RC_MANUFACTURE, 409, _('Print &Work Orders'),
        array(  _('From') => 'WORKORDER',
                        _('To') => 'WORKORDER',
@@ -311,6 +322,12 @@ $reports->addReportClass(_('Banking'), RC_BANKING);
                        _('Comments') => 'TEXTBOX',
                        _('Orientation') => 'ORIENTATION',
                        _('Destination') => 'DESTINATION'));
+       $reports->addReport(RC_BANKING,  602, _('Bank Statement w/ &Reconcile'),
+       array(  _('Bank Accounts') => 'BANK_ACCOUNTS',
+                       _('Start Date') => 'DATEBEGINM',
+                       _('End Date') => 'DATEENDM',
+                       _('Comments') => 'TEXTBOX',
+                       _('Destination') => 'DESTINATION'));
 
 $reports->addReportClass(_('General Ledger'), RC_GL);
 $reports->addReport(RC_GL, 701, _('Chart of &Accounts'),
@@ -496,4 +513,3 @@ add_custom_reports($reports);
 echo $reports->getDisplay();
 
 end_page();
-?>