X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=reporting%2Freports_main.php;h=84bfb44fe210ad394abd55860ea0f2da51b1c163;hb=da7df35c61205d0b1af47d286be591b8a3194b0c;hp=9a1c5d14dd91afb3d96f95e6f8c3ec276f8ebbf5;hpb=0b63d898491b6577a5a5bf90e771dca0dcbbcf1f;p=fa-stable.git

diff --git a/reporting/reports_main.php b/reporting/reports_main.php
index 9a1c5d14..84bfb44f 100644
--- a/reporting/reports_main.php
+++ b/reporting/reports_main.php
@@ -18,7 +18,9 @@ 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 ($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();
 
 add_js_file('reports.js');
@@ -235,6 +237,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'));
@@ -277,20 +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',
+$reports->addReport(RC_INVENTORY, 310, _('Inventory Purchasing - &Transaction Based'),
+	array(	_('Start Date') => 'DATEBEGINM',
+			_('End Date') => 'DATEENDM',
+			_('Inventory Category') => 'CATEGORIES',
+			_('Location') => 'LOCATIONS',
+			_('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)
 {
@@ -301,9 +336,6 @@ if ($dim > 0)
 			_('Comments') => 'TEXTBOX',
 			_('Orientation') => 'ORIENTATION',
 			_('Destination') => 'DESTINATION'));
-	//$reports->addReport(_('Dimensions'),502, _('Dimension Details'),
-	//array(	_('Dimension'),'DIMENSIONS'),
-	//		_('Comments'),'TEXTBOX')));
 }
 $reports->addReportClass(_('Banking'), RC_BANKING);
 	$reports->addReport(RC_BANKING,  601, _('Bank &Statement'),
@@ -334,8 +366,6 @@ $reports->addReport(RC_GL, 702, _('List of &Journal Entries'),
 			_('Comments') => 'TEXTBOX',
 			_('Orientation') => 'ORIENTATION',
 			_('Destination') => 'DESTINATION'));
-//$reports->addReport(RC_GL, 703, _('GL Account Group Summary'),
-//	array(	_('Comments'),'TEXTBOX')));
 
 if ($dim == 2)
 {
@@ -391,7 +421,7 @@ if ($dim == 2)
 			_('Orientation') => 'ORIENTATION',
 			_('Destination') => 'DESTINATION'));
 }
-else if ($dim == 1)
+elseif ($dim == 1)
 {
 	$reports->addReport(RC_GL, 704, _('GL Account &Transactions'),
 	array(	_('Start Date') => 'DATEBEGINM',
@@ -505,4 +535,3 @@ add_custom_reports($reports);
 echo $reports->getDisplay();
 
 end_page();
-?>