X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=reporting%2Freports_main.php;h=84bfb44fe210ad394abd55860ea0f2da51b1c163;hb=98bf5bfc72317d45e356e3909a8cd1fdf5181176;hp=b5a89fcea87399278320404f96a142cdcb84cd94;hpb=a9d55e1c13cbd6a6305b9322ec8621a06516f9f3;p=fa-stable.git

diff --git a/reporting/reports_main.php b/reporting/reports_main.php
index b5a89fce..84bfb44f 100644
--- a/reporting/reports_main.php
+++ b/reporting/reports_main.php
@@ -18,6 +18,8 @@ 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 ($SysPrefs->use_popup_windows && $SysPrefs->use_popup_search)
+	$js .= get_js_open_window(900, 500);
 if (user_use_date_picker())
 	$js .= get_js_date_picker();
 
@@ -278,27 +280,52 @@ $reports->addReport(RC_INVENTORY, 309,_('Item &Sales Summary Report'),
 			_('Comments') => 'TEXTBOX',
 			_('Orientation') => 'ORIENTATION',
 			_('Destination') => 'DESTINATION'));				
-
-$reports->addReportClass(_('Manufacturing'), RC_MANUFACTURE);
-$reports->addReport(RC_MANUFACTURE, 401, _('&Bill of Material Listing'),
-	array(	_('From product') => 'ITEMS',
-			_('To product') => 'ITEMS',
-			_('Comments') => 'TEXTBOX',
-			_('Orientation') => 'ORIENTATION',
-			_('Destination') => 'DESTINATION'));
-$reports->addReport(RC_MANUFACTURE, 402, _('Work Order &Listing'),
-	array(	_('Items') => 'ITEMS_ALL',
+$reports->addReport(RC_INVENTORY, 310, _('Inventory Purchasing - &Transaction Based'),
+	array(	_('Start Date') => 'DATEBEGINM',
+			_('End Date') => 'DATEENDM',
+			_('Inventory Category') => 'CATEGORIES',
 			_('Location') => 'LOCATIONS',
-			_('Outstanding Only') => 'YES_NO',
+			_('Supplier') => 'SUPPLIERS_NO_FILTER',
+			_('Items') => 'ITEMS_P',
 			_('Comments') => 'TEXTBOX',
 			_('Orientation') => 'ORIENTATION',
 			_('Destination') => 'DESTINATION'));
-$reports->addReport(RC_MANUFACTURE, 409, _('Print &Work Orders'),
-	array(	_('From') => 'WORKORDER',
-			_('To') => 'WORKORDER',
-			_('Email Locations') => 'YES_NO',
-			_('Comments') => 'TEXTBOX',
-			_('Orientation') => 'ORIENTATION'));
+if (get_company_pref('use_manufacturing'))
+{
+	$reports->addReportClass(_('Manufacturing'), RC_MANUFACTURE);
+	$reports->addReport(RC_MANUFACTURE, 401, _('&Bill of Material Listing'),
+		array(	_('From product') => 'ITEMS',
+				_('To product') => 'ITEMS',
+				_('Comments') => 'TEXTBOX',
+				_('Orientation') => 'ORIENTATION',
+				_('Destination') => 'DESTINATION'));
+	$reports->addReport(RC_MANUFACTURE, 402, _('Work Order &Listing'),
+		array(	_('Items') => 'ITEMS_ALL',
+				_('Location') => 'LOCATIONS',
+				_('Outstanding Only') => 'YES_NO',
+				_('Show GL Rows') => 'YES_NO',
+				_('Comments') => 'TEXTBOX',
+				_('Orientation') => 'ORIENTATION',
+				_('Destination') => 'DESTINATION'));
+	$reports->addReport(RC_MANUFACTURE, 409, _('Print &Work Orders'),
+		array(	_('From') => 'WORKORDER',
+				_('To') => 'WORKORDER',
+				_('Email Locations') => 'YES_NO',
+				_('Comments') => 'TEXTBOX',
+				_('Orientation') => 'ORIENTATION'));
+}
+if (get_company_pref('use_fixed_assets'))
+{
+	$reports->addReportClass(_('Fixed Assets'), RC_FIXEDASSETS);
+	$reports->addReport(RC_FIXEDASSETS, 451, _('&Fixed Assets Valuation'),
+		array(	_('End Date') => 'DATE',
+				_('Fixed Assets Class') => 'FCLASS',
+				_('Fixed Assets Location') => 'FLOCATIONS',
+				_('Summary Only') => 'YES_NO',
+				_('Comments') => 'TEXTBOX',
+				_('Orientation') => 'ORIENTATION',
+				_('Destination') => 'DESTINATION'));
+}				
 $reports->addReportClass(_('Dimensions'), RC_DIMENSIONS);
 if ($dim > 0)
 {