X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=reporting%2Freports_main.php;h=b5dcc128a1e4f2911485e55b86fedfe52d1d3de2;hb=0ad69edb5561aac03a5af49286c37b3350307719;hp=97b97da1c8e0a1c0294dbbe166817e87a4a1d8a6;hpb=97c745bdeb0f2e6fac9ee1d8515170e1525d2cfa;p=fa-stable.git

diff --git a/reporting/reports_main.php b/reporting/reports_main.php
index 97b97da1..b5dcc128 100644
--- a/reporting/reports_main.php
+++ b/reporting/reports_main.php
@@ -11,7 +11,7 @@ include_once($path_to_root . "/reporting/includes/reports_classes.inc");
 $js = "";
 if ($use_date_picker)
 	$js .= get_js_date_picker();
-page(_("Reports and Analysis"), false, false, "", $js);
+page(_("Reports and Analysis"), false, false, "", $js, true);
 
 $reports = new BoxReports;
 
@@ -35,7 +35,8 @@ $reports->addReport(_('Customer'),103,_('Customer Detail Listing'),
 			new ReportParam(_('Sales Areas'),'AREAS'),
 			new ReportParam(_('Sales Folk'),'SALESMEN'), new ReportParam(_('Activity Greater Than'),'TEXT'), new ReportParam(_('Activity Less Than'),'TEXT'), new ReportParam(_('Comments'),'TEXTBOX')));
 $reports->addReport(_('Customer'),104,_('Price Listing'),
-	array(	new ReportParam(_('Inventory Category'),'CATEGORIES'),
+	array(	new ReportParam(_('Currency Filter'),'CURRENCY'),
+			new ReportParam(_('Inventory Category'),'CATEGORIES'),
 			new ReportParam(_('Sales Types'),'SALESTYPES'),
 			new ReportParam(_('Show Pictures'),'YES_NO'),
 			new ReportParam(_('Show GP %'),'YES_NO'),
@@ -124,6 +125,13 @@ $reports->addReport(_('Inventory'),303,_('Stock Check Sheets'),
 			new ReportParam(_('Location'),'LOCATIONS'),
 			new ReportParam(_('Show Pictures'),'YES_NO'),
 			new ReportParam(_('Comments'),'TEXTBOX')));
+$reports->addReport(_('Inventory'),304,_('Inventory Sales Report'),
+	array(	new ReportParam(_('Start Date'),'DATEBEGINM'),
+			new ReportParam(_('End Date'),'DATEENDM'),
+			new ReportParam(_('Inventory Category'),'CATEGORIES'),
+			new ReportParam(_('Location'),'LOCATIONS'),
+			new ReportParam(_('Detailed Report'),'YES_NO'),
+			new ReportParam(_('Comments'),'TEXTBOX')));
 
 $reports->addReportClass(_('Manufactoring'));
 $reports->addReport(_('Manufactoring'),401,_('Bill of Material Listing'),
@@ -138,9 +146,9 @@ if ($dim > 0)
 			new ReportParam(_('To Dimension'),'DIMENSION'),
 			new ReportParam(_('Show Balance'),'YES_NO'),
 			new ReportParam(_('Comments'),'TEXTBOX')));
-	$reports->addReport(_('Dimensions'),502,_('Dimension Details'),
-	array(	new ReportParam(_('Dimension'),'DIMENSIONS'),
-			new ReportParam(_('Comments'),'TEXTBOX')));
+	//$reports->addReport(_('Dimensions'),502,_('Dimension Details'),
+	//array(	new ReportParam(_('Dimension'),'DIMENSIONS'),
+	//		new ReportParam(_('Comments'),'TEXTBOX')));
 }
 $reports->addReportClass(_('Banking'));
 //$reports->addReport(_('Banking'),601,_('Bank Account Transactions'),
@@ -281,7 +289,7 @@ echo "
 		function onWindowLoad() {
 			showClass(" . $_GET['Class'] . ")
 		}
-		window.onload=onWindowLoad;
+	Behaviour.addLoadEvent(onWindowLoad);
 	</script>
 ";
 echo $reports->getDisplay();