X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=reporting%2Freports_main.php;h=8babc61a5c7cc08d0cabb72b500a261141cff994;hb=cceb107ab3e8db0b400aeb7b98d0360e06ba8dae;hp=9eff484c08b228e1f33b0a0c70305600f34964cf;hpb=f50187b9c3095886d7fd847f635cd8763109a75e;p=fa-stable.git

diff --git a/reporting/reports_main.php b/reporting/reports_main.php
index 9eff484c..8babc61a 100644
--- a/reporting/reports_main.php
+++ b/reporting/reports_main.php
@@ -10,7 +10,7 @@
     See the License here <http://www.gnu.org/licenses/gpl-3.0.html>.
 ***********************************************************************/
 $path_to_root="..";
-$page_security = 5;
+$page_security = 'SA_OPEN';
 include_once($path_to_root . "/includes/session.inc");
 
 include_once($path_to_root . "/includes/date_functions.inc");
@@ -20,7 +20,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(_($help_context = "Reports and Analysis"), false, false, "", $js);
 
 $reports = new BoxReports;
 
@@ -28,7 +28,8 @@ $dim = get_company_pref('use_dimension');
 
 $reports->addReportClass(_('Customer'));
 $reports->addReport(_('Customer'),101,_('Customer &Balances'),
-	array(	new ReportParam(_('End Date'),'DATE'),
+	array(	new ReportParam(_('Start Date'),'DATEBEGIN'),
+			new ReportParam(_('End Date'),'DATEENDM'),
 			new ReportParam(_('Customer'),'CUSTOMERS_NO_FILTER'),
 			new ReportParam(_('Currency Filter'),'CURRENCY'),
 			new ReportParam(_('Comments'),'TEXTBOX'),
@@ -75,7 +76,6 @@ $reports->addReport(_('Customer'),107,_('Print &Invoices/Credit Notes'),
 	array(	new ReportParam(_('From'),'INVOICE'),
 			new ReportParam(_('To'),'INVOICE'),
 			new ReportParam(_('Currency Filter'),'CURRENCY'),
-			new ReportParam(_('Bank Account'),'BANK_ACCOUNTS'),
 			new ReportParam(_('email Customers'),'YES_NO'),
 			new ReportParam(_('Payment Link'),'PAYMENT_LINK'),
 			new ReportParam(_('Comments'),'TEXTBOX')));
@@ -83,25 +83,31 @@ $reports->addReport(_('Customer'),110,_('Print &Deliveries'),
 	array(	new ReportParam(_('From'),'DELIVERY'),
 			new ReportParam(_('To'),'DELIVERY'),
 			new ReportParam(_('email Customers'),'YES_NO'),
+			new ReportParam(_('Print as Packing Slip'),'YES_NO'),
 			new ReportParam(_('Comments'),'TEXTBOX')));
 $reports->addReport(_('Customer'),108,_('Print &Statements'),
 	array(	new ReportParam(_('Customer'),'CUSTOMERS_NO_FILTER'),
 			new ReportParam(_('Currency Filter'),'CURRENCY'),
-			new ReportParam(_('Bank Account'),'BANK_ACCOUNTS'),
 			new ReportParam(_('Email Customers'),'YES_NO'),
 			new ReportParam(_('Comments'),'TEXTBOX')));
 $reports->addReport(_('Customer'),109,_('&Print Sales Orders'),
 	array(	new ReportParam(_('From'),'ORDERS'),
 			new ReportParam(_('To'),'ORDERS'),
 			new ReportParam(_('Currency Filter'),'CURRENCY'),
-			new ReportParam(_('Bank Account'),'BANK_ACCOUNTS'),
 			new ReportParam(_('Email Customers'),'YES_NO'),
 			new ReportParam(_('Print as Quote'),'YES_NO'),
 			new ReportParam(_('Comments'),'TEXTBOX')));
+$reports->addReport(_('Customer'),111,_('&Print Sales Quotations'),
+	array(	new ReportParam(_('From'),'QUOTATIONS'),
+			new ReportParam(_('To'),'QUOTATIONS'),
+			new ReportParam(_('Currency Filter'),'CURRENCY'),
+			new ReportParam(_('Email Customers'),'YES_NO'),
+			new ReportParam(_('Comments'),'TEXTBOX')));
 
 $reports->addReportClass(_('Supplier'));
 $reports->addReport(_('Supplier'),201,_('Supplier &Balances'),
-	array(	new ReportParam(_('End Date'),'DATE'),
+	array(	new ReportParam(_('Start Date'),'DATEBEGIN'),
+			new ReportParam(_('End Date'),'DATEENDM'),
 			new ReportParam(_('Supplier'),'SUPPLIERS_NO_FILTER'),
 			new ReportParam(_('Currency Filter'),'CURRENCY'),
 			new ReportParam(_('Comments'),'TEXTBOX'),
@@ -128,7 +134,6 @@ $reports->addReport(_('Supplier'),209,_('Print Purchase &Orders'),
 	array(	new ReportParam(_('From'),'PO'),
 			new ReportParam(_('To'),'PO'),
 			new ReportParam(_('Currency Filter'),'CURRENCY'),
-			new ReportParam(_('Bank Account'),'BANK_ACCOUNTS'),
 			new ReportParam(_('Email Customers'),'YES_NO'),
 			new ReportParam(_('Comments'),'TEXTBOX')));
 
@@ -136,7 +141,7 @@ $reports->addReportClass(_('Inventory'));
 $reports->addReport(_('Inventory'),301,_('Inventory &Valuation Report'),
 	array(	new ReportParam(_('Inventory Category'),'CATEGORIES'),
 			new ReportParam(_('Location'),'LOCATIONS'),
-			new ReportParam(_('Detailed Report'),'YES_NO'),
+			new ReportParam(_('Summary Only'),'YES_NO'),
 			new ReportParam(_('Comments'),'TEXTBOX'),
 			new ReportParam(_('Destination'),'DESTINATION')));
 $reports->addReport(_('Inventory'),302,_('Inventory &Planning Report'),
@@ -149,6 +154,7 @@ $reports->addReport(_('Inventory'),303,_('Stock &Check Sheets'),
 			new ReportParam(_('Location'),'LOCATIONS'),
 			new ReportParam(_('Show Pictures'),'YES_NO'),
 			new ReportParam(_('Inventory Column'),'YES_NO'),
+			new ReportParam(_('Show Shortage'),'YES_NO'),
 			new ReportParam(_('Comments'),'TEXTBOX'),
 			new ReportParam(_('Destination'),'DESTINATION')));
 $reports->addReport(_('Inventory'),304,_('Inventory &Sales Report'),
@@ -156,17 +162,27 @@ $reports->addReport(_('Inventory'),304,_('Inventory &Sales Report'),
 			new ReportParam(_('End Date'),'DATEENDM'),
 			new ReportParam(_('Inventory Category'),'CATEGORIES'),
 			new ReportParam(_('Location'),'LOCATIONS'),
-			new ReportParam(_('Detailed Report'),'YES_NO'),
+			new ReportParam(_('Customer'),'CUSTOMERS_NO_FILTER'),
+			new ReportParam(_('Comments'),'TEXTBOX'),
+			new ReportParam(_('Destination'),'DESTINATION')));
+$reports->addReport(_('Inventory'),305,_('&GRN Valuation Report'),
+	array(	new ReportParam(_('Start Date'),'DATEBEGINM'),
+			new ReportParam(_('End Date'),'DATEENDM'),
 			new ReportParam(_('Comments'),'TEXTBOX'),
 			new ReportParam(_('Destination'),'DESTINATION')));
 
-$reports->addReportClass(_('Manufactoring'));
-$reports->addReport(_('Manufactoring'),401,_('&Bill of Material Listing'),
+$reports->addReportClass(_('Manufacturing'));
+$reports->addReport(_('Manufacturing'),401,_('&Bill of Material Listing'),
 	array(	new ReportParam(_('From component'),'ITEMS'),
 			new ReportParam(_('To component'),'ITEMS'),
 			new ReportParam(_('Comments'),'TEXTBOX'),
 			new ReportParam(_('Destination'),'DESTINATION')));
-	$reports->addReportClass(_('Dimensions'));
+$reports->addReport(_('Manufacturing'),409,_('Print &Work Orders'),
+	array(	new ReportParam(_('From'),'WORKORDER'),
+			new ReportParam(_('To'),'WORKORDER'),
+			new ReportParam(_('Email Locations'),'YES_NO'),
+			new ReportParam(_('Comments'),'TEXTBOX')));
+$reports->addReportClass(_('Dimensions'));
 if ($dim > 0)
 {
 	$reports->addReport(_('Dimensions'),501,_('Dimension &Summary'),
@@ -301,7 +317,6 @@ else
 			new ReportParam(_('End Date'),'DATEENDM'),
 			new ReportParam(_('Graphics'),'GRAPHIC'),
 			new ReportParam(_('Comments'),'TEXTBOX'),
-			new ReportParam(_('Destination'),'DESTINATION'),
 			new ReportParam(_('Destination'),'DESTINATION')));
 	$reports->addReport(_('General Ledger'),707,_('&Profit and Loss Statement'),
 	array(	new ReportParam(_('Start Date'),'DATEBEGINM'),
@@ -323,6 +338,13 @@ $reports->addReport(_('General Ledger'),709,_('Ta&x Report'),
 			new ReportParam(_('End Date'),'DATEENDTAX'),
 			new ReportParam(_('Summary Only'),'YES_NO'),
 			new ReportParam(_('Comments'),'TEXTBOX')));
+$reports->addReport(_('General Ledger'),710,_('Audit Trail'),
+	array(	new ReportParam(_('Start Date'),'DATEBEGINM'),
+			new ReportParam(_('End Date'),'DATEENDM'),
+			new ReportParam(_('Type'),'SYS_TYPES_ALL'),
+			new ReportParam(_('User'),'USERS'),
+			new ReportParam(_('Comments'),'TEXTBOX'),
+			new ReportParam(_('Destination'),'DESTINATION')));
 
 echo "<script language='javascript'>
 		function onWindowLoad() {