X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;ds=sidebyside;f=reporting%2Freports_main.php;h=6f9555489ab66b14552c782da38cfc45419dcd5b;hb=5b8f4c4b4aa8cf996bc071f116bfce1273200fa2;hp=edb270b2964f91c064e921d90f5cc22ba70317e6;hpb=7bcdbd3d9ee403fd3555fd8e9a4de6a654883b5c;p=fa-stable.git

diff --git a/reporting/reports_main.php b/reporting/reports_main.php
index edb270b2..6f955548 100644
--- 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');
@@ -34,6 +34,7 @@ $reports->addReport(RC_CUSTOMER, 101, _('Customer &Balances'),
 	array(	_('Start Date') => 'DATEBEGIN',
 			_('End Date') => 'DATEENDM',
 			_('Customer') => 'CUSTOMERS_NO_FILTER',
+			_('Show Balance') => 'YES_NO',
 			_('Currency Filter') => 'CURRENCY',
 			_('Suppress Zeros') => 'YES_NO',
 			_('Comments') => 'TEXTBOX',
@@ -98,7 +99,9 @@ $reports->addReport(RC_CUSTOMER, 107, _('Print &Invoices'),
 			_('email Customers') => 'YES_NO',
 			_('Payment Link') => 'PAYMENT_LINK',
 			_('Comments') => 'TEXTBOX',
-			_('Orientation') => 'ORIENTATION'));
+			_('Customer') => 'CUSTOMERS_NO_FILTER',
+			_('Orientation') => 'ORIENTATION'
+));
 $reports->addReport(RC_CUSTOMER, 113, _('Print &Credit Notes'),
 	array(	_('From') => 'CREDIT',
 			_('To') => 'CREDIT',
@@ -148,6 +151,7 @@ $reports->addReport(RC_SUPPLIER, 201, _('Supplier &Balances'),
 	array(	_('Start Date') => 'DATEBEGIN',
 			_('End Date') => 'DATEENDM',
 			_('Supplier') => 'SUPPLIERS_NO_FILTER',
+			_('Show Balance') => 'YES_NO',
 			_('Currency Filter') => 'CURRENCY',
 			_('Suppress Zeros') => 'YES_NO',
 			_('Comments') => 'TEXTBOX',
@@ -188,21 +192,20 @@ $reports->addReport(RC_SUPPLIER, 209, _('Print Purchase &Orders'),
 	array(	_('From') => 'PO',
 			_('To') => 'PO',
 			_('Currency Filter') => 'CURRENCY',
-			_('Email Customers') => 'YES_NO',
+			_('Email Suppliers') => 'YES_NO',
 			_('Comments') => 'TEXTBOX',
 			_('Orientation') => 'ORIENTATION'));
-$reports->addReport(RC_SUPPLIER, 210, _('Print Remittances'),
+$reports->addReport(RC_SUPPLIER, 210, _('Print Remi&ttances'),
 	array(	_('From') => 'REMITTANCE',
 			_('To') => 'REMITTANCE',
 			_('Currency Filter') => 'CURRENCY',
-			_('Email Customers') => 'YES_NO',
+			_('Email Suppliers') => 'YES_NO',
 			_('Comments') => 'TEXTBOX',
 			_('Orientation') => 'ORIENTATION'));
 
 $reports->addReportClass(_('Inventory'), RC_INVENTORY);
-
 $reports->addReport(RC_INVENTORY,  301, _('Inventory &Valuation Report'),
-	array(	_('End Date') => 'DATE',	
+	array(	_('End Date') => 'DATE',
 			_('Inventory Category') => 'CATEGORIES',
 			_('Location') => 'LOCATIONS',
 			_('Summary Only') => 'YES_NO',
@@ -222,17 +225,10 @@ $reports->addReport(RC_INVENTORY, 303, _('Stock &Check Sheets'),
 			_('Inventory Column') => 'YES_NO',
 			_('Show Shortage') => 'YES_NO',
 			_('Suppress Zeros') => 'YES_NO',
+			_('Item Like') => 'TEXT',
 			_('Comments') => 'TEXTBOX',
 			_('Orientation') => 'ORIENTATION',
 			_('Destination') => 'DESTINATION'));
-$reports->addReport(RC_INVENTORY, 307, _('Inventory &Movement Report'),
-	array(	_('Start Date') => 'DATEBEGINM',
-			_('End Date') => 'DATEENDM',
-			_('Inventory Category') => 'CATEGORIES',
-			_('Location') => 'LOCATIONS',
-			_('Comments') => 'TEXTBOX',
-			_('Orientation') => 'ORIENTATION',
-			_('Destination') => 'DESTINATION'));				
 $reports->addReport(RC_INVENTORY, 304, _('Inventory &Sales Report'),
 	array(	_('Start Date') => 'DATEBEGINM',
 			_('End Date') => 'DATEENDM',
@@ -258,6 +254,29 @@ $reports->addReport(RC_INVENTORY, 306, _('Inventory P&urchasing Report'),
 			_('Comments') => 'TEXTBOX',
 			_('Orientation') => 'ORIENTATION',
 			_('Destination') => 'DESTINATION'));
+$reports->addReport(RC_INVENTORY, 307, _('Inventory &Movement Report'),
+	array(	_('Start Date') => 'DATEBEGINM',
+			_('End Date') => 'DATEENDM',
+			_('Inventory Category') => 'CATEGORIES',
+			_('Location') => 'LOCATIONS',
+			_('Comments') => 'TEXTBOX',
+			_('Orientation') => 'ORIENTATION',
+			_('Destination') => 'DESTINATION'));				
+$reports->addReport(RC_INVENTORY, 308, _('C&osted Inventory Movement Report'),
+	array(	_('Start Date') => 'DATEBEGINM',
+			_('End Date') => 'DATEENDM',
+			_('Inventory Category') => 'CATEGORIES',
+			_('Location') => 'LOCATIONS',
+			_('Comments') => 'TEXTBOX',
+			_('Orientation') => 'ORIENTATION',
+			_('Destination') => 'DESTINATION'));				
+$reports->addReport(RC_INVENTORY, 309,_('Item &Sales Summary Report'),
+	array(	_('Start Date') => 'DATEBEGINM',
+			_('End Date') => 'DATEENDM',
+			_('Inventory Category') => 'CATEGORIES',
+			_('Comments') => 'TEXTBOX',
+			_('Orientation') => 'ORIENTATION',
+			_('Destination') => 'DESTINATION'));				
 
 $reports->addReportClass(_('Manufacturing'), RC_MANUFACTURE);
 $reports->addReport(RC_MANUFACTURE, 401, _('&Bill of Material Listing'),
@@ -266,6 +285,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',
@@ -295,6 +321,12 @@ $reports->addReportClass(_('Banking'), RC_BANKING);
 			_('Comments') => 'TEXTBOX',
 			_('Orientation') => 'ORIENTATION',
 			_('Destination') => 'DESTINATION'));
+	$reports->addReport(RC_BANKING,  602, _('Bank Statement w/ &Reconcile'),
+	array(	_('Bank Accounts') => 'BANK_ACCOUNTS',
+			_('Start Date') => 'DATEBEGINM',
+			_('End Date') => 'DATEENDM',
+			_('Comments') => 'TEXTBOX',
+			_('Destination') => 'DESTINATION'));
 
 $reports->addReportClass(_('General Ledger'), RC_GL);
 $reports->addReport(RC_GL, 701, _('Chart of &Accounts'),
@@ -480,4 +512,3 @@ add_custom_reports($reports);
 echo $reports->getDisplay();
 
 end_page();
-?>