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 9a1c5d14dd91afb3d96f95e6f8c3ec276f8ebbf5..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');
@@ -235,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'));
@@ -285,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',
@@ -505,4 +513,3 @@ add_custom_reports($reports);
 echo $reports->getDisplay();
 
 end_page();
-?>