X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=reporting%2Freports_main.php;h=edb270b2964f91c064e921d90f5cc22ba70317e6;hb=b431133cbb731f56273a7c817e9ce1c166d64a57;hp=718484a03b34e911c451d346e065485d78e80bb3;hpb=46c5f7a65a7659a44ae8254c63152074363d3987;p=fa-stable.git

diff --git a/reporting/reports_main.php b/reporting/reports_main.php
index 718484a0..edb270b2 100644
--- a/reporting/reports_main.php
+++ b/reporting/reports_main.php
@@ -37,15 +37,18 @@ $reports->addReport(RC_CUSTOMER, 101, _('Customer &Balances'),
 			_('Currency Filter') => 'CURRENCY',
 			_('Suppress Zeros') => 'YES_NO',
 			_('Comments') => 'TEXTBOX',
+			_('Orientation') => 'ORIENTATION',
 			_('Destination') => 'DESTINATION'));
 $reports->addReport(RC_CUSTOMER, 102, _('&Aged Customer Analysis'),
 	array(	_('End Date') => 'DATE',
 			_('Customer') => 'CUSTOMERS_NO_FILTER',
 			_('Currency Filter') => 'CURRENCY',
+			_('Show Also Allocated') => 'YES_NO',
 			_('Summary Only') => 'YES_NO',
 			_('Suppress Zeros') => 'YES_NO',
 			_('Graphics') => 'GRAPHIC',
 			_('Comments') => 'TEXTBOX',
+			_('Orientation') => 'ORIENTATION',
 			_('Destination') => 'DESTINATION'));
 $reports->addReport(RC_CUSTOMER, 103, _('Customer &Detail Listing'),
 	array(	_('Activity Since') => 'DATEBEGIN',
@@ -54,6 +57,14 @@ $reports->addReport(RC_CUSTOMER, 103, _('Customer &Detail Listing'),
 			_('Activity Greater Than') => 'TEXT',
 			_('Activity Less Than') => 'TEXT',
 			_('Comments') => 'TEXTBOX',
+			_('Orientation') => 'ORIENTATION',
+			_('Destination') => 'DESTINATION'));
+$reports->addReport(RC_CUSTOMER, 114, _('Sales &Summary Report'),
+	array(	_('Start Date') => 'DATEBEGINTAX',
+			_('End Date') => 'DATEENDTAX',
+			_('Tax Id Only') => 'YES_NO',
+			_('Comments') => 'TEXTBOX',
+			_('Orientation') => 'ORIENTATION',
 			_('Destination') => 'DESTINATION'));
 $reports->addReport(RC_CUSTOMER, 104, _('&Price Listing'),
 	array(	_('Currency Filter') => 'CURRENCY',
@@ -62,6 +73,7 @@ $reports->addReport(RC_CUSTOMER, 104, _('&Price Listing'),
 			_('Show Pictures') => 'YES_NO',
 			_('Show GP %') => 'YES_NO',
 			_('Comments') => 'TEXTBOX',
+			_('Orientation') => 'ORIENTATION',
 			_('Destination') => 'DESTINATION'));
 $reports->addReport(RC_CUSTOMER, 105, _('&Order Status Listing'),
 	array(	_('Start Date') => 'DATEBEGINM',
@@ -70,56 +82,66 @@ $reports->addReport(RC_CUSTOMER, 105, _('&Order Status Listing'),
 			_('Stock Location') => 'LOCATIONS',
 			_('Back Orders Only') => 'YES_NO',
 			_('Comments') => 'TEXTBOX',
+			_('Orientation') => 'ORIENTATION',
 			_('Destination') => 'DESTINATION'));
 $reports->addReport(RC_CUSTOMER, 106, _('&Salesman Listing'),
 	array(	_('Start Date') => 'DATEBEGINM',
 			_('End Date') => 'DATEENDM',
 			_('Summary Only') => 'YES_NO',
 			_('Comments') => 'TEXTBOX',
+			_('Orientation') => 'ORIENTATION',
 			_('Destination') => 'DESTINATION'));
-$reports->addReport(RC_CUSTOMER, 107, _('Print &Invoices/Credit Notes'),
+$reports->addReport(RC_CUSTOMER, 107, _('Print &Invoices'),
 	array(	_('From') => 'INVOICE',
 			_('To') => 'INVOICE',
 			_('Currency Filter') => 'CURRENCY',
 			_('email Customers') => 'YES_NO',
 			_('Payment Link') => 'PAYMENT_LINK',
-			_('Comments') => 'TEXTBOX'));
+			_('Comments') => 'TEXTBOX',
+			_('Orientation') => 'ORIENTATION'));
+$reports->addReport(RC_CUSTOMER, 113, _('Print &Credit Notes'),
+	array(	_('From') => 'CREDIT',
+			_('To') => 'CREDIT',
+			_('Currency Filter') => 'CURRENCY',
+			_('email Customers') => 'YES_NO',
+			_('Payment Link') => 'PAYMENT_LINK',
+			_('Comments') => 'TEXTBOX',
+			_('Orientation') => 'ORIENTATION'));
 $reports->addReport(RC_CUSTOMER, 110, _('Print &Deliveries'),
 	array(	_('From') => 'DELIVERY',
 			_('To') => 'DELIVERY',
 			_('email Customers') => 'YES_NO',
 			_('Print as Packing Slip') => 'YES_NO',
-			_('Comments') => 'TEXTBOX'));
+			_('Comments') => 'TEXTBOX',
+			_('Orientation') => 'ORIENTATION'));
 $reports->addReport(RC_CUSTOMER, 108, _('Print &Statements'),
 	array(	_('Customer') => 'CUSTOMERS_NO_FILTER',
 			_('Currency Filter') => 'CURRENCY',
-			_('Show Outstanding Only') => 'YES_NO',
+			_('Show Also Allocated') => 'YES_NO',
 			_('Email Customers') => 'YES_NO',
-			_('Comments') => 'TEXTBOX'));
+			_('Comments') => 'TEXTBOX',
+			_('Orientation') => 'ORIENTATION'));
 $reports->addReport(RC_CUSTOMER, 109, _('&Print Sales Orders'),
 	array(	_('From') => 'ORDERS',
 			_('To') => 'ORDERS',
 			_('Currency Filter') => 'CURRENCY',
 			_('Email Customers') => 'YES_NO',
 			_('Print as Quote') => 'YES_NO',
-			_('Comments') => 'TEXTBOX'));
-$reports->addReport(RC_CUSTOMER, 111, _('&Print Sales Quotations'),
-	array(	_('From') => 'QUOTATIONS',
-			_('To') => 'QUOTATIONS',
-			_('Currency Filter') => 'CURRENCY',
-			_('Email Customers') => 'YES_NO',
-			_('Comments') => 'TEXTBOX'));
+			_('Comments') => 'TEXTBOX',
+			_('Orientation') => 'ORIENTATION'));
 $reports->addReport(RC_CUSTOMER, 111, _('&Print Sales Quotations'),
 	array(	_('From') => 'QUOTATIONS',
 			_('To') => 'QUOTATIONS',
 			_('Currency Filter') => 'CURRENCY',
 			_('Email Customers') => 'YES_NO',
-			_('Comments') => 'TEXTBOX'));
+			_('Comments') => 'TEXTBOX',
+			_('Orientation') => 'ORIENTATION'));
 $reports->addReport(RC_CUSTOMER, 112, _('Print Receipts'),
 	array(	_('From') => 'RECEIPT',
 			_('To') => 'RECEIPT',
 			_('Currency Filter') => 'CURRENCY',
-			_('Comments') => 'TEXTBOX'));
+			_('Comments') => 'TEXTBOX',
+			_('Orientation') => 'ORIENTATION'));
 
 $reports->addReportClass(_('Supplier'), RC_SUPPLIER);
 $reports->addReport(RC_SUPPLIER, 201, _('Supplier &Balances'),
@@ -129,15 +151,18 @@ $reports->addReport(RC_SUPPLIER, 201, _('Supplier &Balances'),
 			_('Currency Filter') => 'CURRENCY',
 			_('Suppress Zeros') => 'YES_NO',
 			_('Comments') => 'TEXTBOX',
+			_('Orientation') => 'ORIENTATION',
 			_('Destination') => 'DESTINATION'));
 $reports->addReport(RC_SUPPLIER, 202, _('&Aged Supplier Analyses'),
 	array(	_('End Date') => 'DATE',
 			_('Supplier') => 'SUPPLIERS_NO_FILTER',
 			_('Currency Filter') => 'CURRENCY',
+			_('Show Also Allocated') => 'YES_NO',
 			_('Summary Only') => 'YES_NO',
 			_('Suppress Zeros') => 'YES_NO',
 			_('Graphics') => 'GRAPHIC',
 			_('Comments') => 'TEXTBOX',
+			_('Orientation') => 'ORIENTATION',
 			_('Destination') => 'DESTINATION'));
 $reports->addReport(RC_SUPPLIER, 203, _('&Payment Report'),
 	array(	_('End Date') => 'DATE',
@@ -145,36 +170,50 @@ $reports->addReport(RC_SUPPLIER, 203, _('&Payment Report'),
 			_('Currency Filter') => 'CURRENCY',
 			_('Suppress Zeros') => 'YES_NO',
 			_('Comments') => 'TEXTBOX',
+			_('Orientation') => 'ORIENTATION',
 			_('Destination') => 'DESTINATION'));
 $reports->addReport(RC_SUPPLIER, 204, _('Outstanding &GRNs Report'),
 	array(	_('Supplier') => 'SUPPLIERS_NO_FILTER',
 			_('Comments') => 'TEXTBOX',
+			_('Orientation') => 'ORIENTATION',
+			_('Destination') => 'DESTINATION'));
+$reports->addReport(RC_SUPPLIER, 205, _('Supplier &Detail Listing'),
+	array(	_('Activity Since') => 'DATEBEGIN',
+			_('Activity Greater Than') => 'TEXT',
+			_('Activity Less Than') => 'TEXT',
+			_('Comments') => 'TEXTBOX',
+			_('Orientation') => 'ORIENTATION',
 			_('Destination') => 'DESTINATION'));
 $reports->addReport(RC_SUPPLIER, 209, _('Print Purchase &Orders'),
 	array(	_('From') => 'PO',
 			_('To') => 'PO',
 			_('Currency Filter') => 'CURRENCY',
 			_('Email Customers') => 'YES_NO',
-			_('Comments') => 'TEXTBOX'));
+			_('Comments') => 'TEXTBOX',
+			_('Orientation') => 'ORIENTATION'));
 $reports->addReport(RC_SUPPLIER, 210, _('Print Remittances'),
 	array(	_('From') => 'REMITTANCE',
 			_('To') => 'REMITTANCE',
 			_('Currency Filter') => 'CURRENCY',
 			_('Email Customers') => 'YES_NO',
-			_('Comments') => 'TEXTBOX'));
+			_('Comments') => 'TEXTBOX',
+			_('Orientation') => 'ORIENTATION'));
 
 $reports->addReportClass(_('Inventory'), RC_INVENTORY);
 
 $reports->addReport(RC_INVENTORY,  301, _('Inventory &Valuation Report'),
-	array(	_('Inventory Category') => 'CATEGORIES',
+	array(	_('End Date') => 'DATE',	
+			_('Inventory Category') => 'CATEGORIES',
 			_('Location') => 'LOCATIONS',
 			_('Summary Only') => 'YES_NO',
 			_('Comments') => 'TEXTBOX',
+			_('Orientation') => 'ORIENTATION',
 			_('Destination') => 'DESTINATION'));
 $reports->addReport(RC_INVENTORY,  302, _('Inventory &Planning Report'),
 	array(	_('Inventory Category') => 'CATEGORIES',
 			_('Location') => 'LOCATIONS',
 			_('Comments') => 'TEXTBOX',
+			_('Orientation') => 'ORIENTATION',
 			_('Destination') => 'DESTINATION'));
 $reports->addReport(RC_INVENTORY, 303, _('Stock &Check Sheets'),
 	array(	_('Inventory Category') => 'CATEGORIES',
@@ -184,7 +223,16 @@ $reports->addReport(RC_INVENTORY, 303, _('Stock &Check Sheets'),
 			_('Show Shortage') => 'YES_NO',
 			_('Suppress Zeros') => 'YES_NO',
 			_('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',
@@ -192,11 +240,23 @@ $reports->addReport(RC_INVENTORY, 304, _('Inventory &Sales Report'),
 			_('Location') => 'LOCATIONS',
 			_('Customer') => 'CUSTOMERS_NO_FILTER',
 			_('Comments') => 'TEXTBOX',
+			_('Orientation') => 'ORIENTATION',
 			_('Destination') => 'DESTINATION'));
 $reports->addReport(RC_INVENTORY, 305, _('&GRN Valuation Report'),
 	array(	_('Start Date') => 'DATEBEGINM',
 			_('End Date') => 'DATEENDM',
 			_('Comments') => 'TEXTBOX',
+			_('Orientation') => 'ORIENTATION',
+			_('Destination') => 'DESTINATION'));
+$reports->addReport(RC_INVENTORY, 306, _('Inventory P&urchasing Report'),
+	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->addReportClass(_('Manufacturing'), RC_MANUFACTURE);
@@ -204,12 +264,14 @@ $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, 409, _('Print &Work Orders'),
 	array(	_('From') => 'WORKORDER',
 			_('To') => 'WORKORDER',
 			_('Email Locations') => 'YES_NO',
-			_('Comments') => 'TEXTBOX'));
+			_('Comments') => 'TEXTBOX',
+			_('Orientation') => 'ORIENTATION'));
 $reports->addReportClass(_('Dimensions'), RC_DIMENSIONS);
 if ($dim > 0)
 {
@@ -218,6 +280,7 @@ if ($dim > 0)
 			_('To Dimension') => 'DIMENSION',
 			_('Show Balance') => 'YES_NO',
 			_('Comments') => 'TEXTBOX',
+			_('Orientation') => 'ORIENTATION',
 			_('Destination') => 'DESTINATION'));
 	//$reports->addReport(_('Dimensions'),502, _('Dimension Details'),
 	//array(	_('Dimension'),'DIMENSIONS'),
@@ -228,19 +291,23 @@ $reports->addReportClass(_('Banking'), RC_BANKING);
 	array(	_('Bank Accounts') => 'BANK_ACCOUNTS',
 			_('Start Date') => 'DATEBEGINM',
 			_('End Date') => 'DATEENDM',
+			_('Zero values') => 'YES_NO',
 			_('Comments') => 'TEXTBOX',
+			_('Orientation') => 'ORIENTATION',
 			_('Destination') => 'DESTINATION'));
 
 $reports->addReportClass(_('General Ledger'), RC_GL);
 $reports->addReport(RC_GL, 701, _('Chart of &Accounts'),
 	array(	_('Show Balances') => 'YES_NO',
 			_('Comments') => 'TEXTBOX',
+			_('Orientation') => 'ORIENTATION',
 			_('Destination') => 'DESTINATION'));
 $reports->addReport(RC_GL, 702, _('List of &Journal Entries'),
 	array(	_('Start Date') => 'DATEBEGINM',
 			_('End Date') => 'DATEENDM',
 			_('Type') => 'SYS_TYPES',
 			_('Comments') => 'TEXTBOX',
+			_('Orientation') => 'ORIENTATION',
 			_('Destination') => 'DESTINATION'));
 //$reports->addReport(RC_GL, 703, _('GL Account Group Summary'),
 //	array(	_('Comments'),'TEXTBOX')));
@@ -255,6 +322,7 @@ if ($dim == 2)
 			_('Dimension')." 1" =>  'DIMENSIONS1',
 			_('Dimension')." 2" =>  'DIMENSIONS2',
 			_('Comments') => 'TEXTBOX',
+			_('Orientation') => 'ORIENTATION',
 			_('Destination') => 'DESTINATION'));
 	$reports->addReport(RC_GL, 705, _('Annual &Expense Breakdown'),
 	array(	_('Year') => 'TRANS_YEARS',
@@ -262,6 +330,7 @@ if ($dim == 2)
 			_('Dimension')." 2" =>  'DIMENSIONS2',
 			_('Account Tags') =>  'ACCOUNTTAGS',
 			_('Comments') => 'TEXTBOX',
+			_('Orientation') => 'ORIENTATION',
 			_('Destination') => 'DESTINATION'));
 	$reports->addReport(RC_GL, 706, _('&Balance Sheet'),
 	array(	_('Start Date') => 'DATEBEGIN',
@@ -272,6 +341,7 @@ if ($dim == 2)
 			_('Decimal values') => 'YES_NO',
 			_('Graphics') => 'GRAPHIC',
 			_('Comments') => 'TEXTBOX',
+			_('Orientation') => 'ORIENTATION',
 			_('Destination') => 'DESTINATION'));
 	$reports->addReport(RC_GL, 707, _('&Profit and Loss Statement'),
 	array(	_('Start Date') => 'DATEBEGINM',
@@ -283,6 +353,7 @@ if ($dim == 2)
 			_('Decimal values') => 'YES_NO',
 			_('Graphics') => 'GRAPHIC',
 			_('Comments') => 'TEXTBOX',
+			_('Orientation') => 'ORIENTATION',
 			_('Destination') => 'DESTINATION'));
 	$reports->addReport(RC_GL, 708, _('Trial &Balance'),
 	array(	_('Start Date') => 'DATEBEGINM',
@@ -292,6 +363,7 @@ if ($dim == 2)
 			_('Dimension')." 1" =>  'DIMENSIONS1',
 			_('Dimension')." 2" =>  'DIMENSIONS2',
 			_('Comments') => 'TEXTBOX',
+			_('Orientation') => 'ORIENTATION',
 			_('Destination') => 'DESTINATION'));
 }
 else if ($dim == 1)
@@ -303,12 +375,14 @@ else if ($dim == 1)
 			_('To Account') => 'GL_ACCOUNTS',
 			_('Dimension') =>  'DIMENSIONS1',
 			_('Comments') => 'TEXTBOX',
+			_('Orientation') => 'ORIENTATION',
 			_('Destination') => 'DESTINATION'));
 	$reports->addReport(RC_GL, 705, _('Annual &Expense Breakdown'),
 	array(	_('Year') => 'TRANS_YEARS',
 			_('Dimension') =>  'DIMENSIONS1',
 			_('Account Tags') =>  'ACCOUNTTAGS',
 			_('Comments') => 'TEXTBOX',
+			_('Orientation') => 'ORIENTATION',
 			_('Destination') => 'DESTINATION'));
 	$reports->addReport(RC_GL, 706, _('&Balance Sheet'),
 	array(	_('Start Date') => 'DATEBEGIN',
@@ -318,6 +392,7 @@ else if ($dim == 1)
 			_('Decimal values') => 'YES_NO',
 			_('Graphics') => 'GRAPHIC',
 			_('Comments') => 'TEXTBOX',
+			_('Orientation') => 'ORIENTATION',
 			_('Destination') => 'DESTINATION'));
 	$reports->addReport(RC_GL, 707, _('&Profit and Loss Statement'),
 	array(	_('Start Date') => 'DATEBEGINM',
@@ -328,6 +403,7 @@ else if ($dim == 1)
 			_('Decimal values') => 'YES_NO',
 			_('Graphics') => 'GRAPHIC',
 			_('Comments') => 'TEXTBOX',
+			_('Orientation') => 'ORIENTATION',
 			_('Destination') => 'DESTINATION'));
 	$reports->addReport(RC_GL, 708, _('Trial &Balance'),
 	array(	_('Start Date') => 'DATEBEGINM',
@@ -336,6 +412,7 @@ else if ($dim == 1)
 			_('Only balances') => 'YES_NO',
 			_('Dimension') => 'DIMENSIONS1',
 			_('Comments') => 'TEXTBOX',
+			_('Orientation') => 'ORIENTATION',
 			_('Destination') => 'DESTINATION'));
 }
 else
@@ -346,11 +423,13 @@ else
 			_('From Account') => 'GL_ACCOUNTS',
 			_('To Account') => 'GL_ACCOUNTS',
 			_('Comments') => 'TEXTBOX',
+			_('Orientation') => 'ORIENTATION',
 			_('Destination') => 'DESTINATION'));
 	$reports->addReport(RC_GL, 705, _('Annual &Expense Breakdown'),
 	array(	_('Year') => 'TRANS_YEARS',
 			_('Account Tags') =>  'ACCOUNTTAGS',
 			_('Comments') => 'TEXTBOX',
+			_('Orientation') => 'ORIENTATION',
 			_('Destination') => 'DESTINATION'));
 	$reports->addReport(RC_GL, 706, _('&Balance Sheet'),
 	array(	_('Start Date') => 'DATEBEGIN',
@@ -359,6 +438,7 @@ else
 			_('Decimal values') => 'YES_NO',
 			_('Graphics') => 'GRAPHIC',
 			_('Comments') => 'TEXTBOX',
+			_('Orientation') => 'ORIENTATION',
 			_('Destination') => 'DESTINATION'));
 	$reports->addReport(RC_GL, 707, _('&Profit and Loss Statement'),
 	array(	_('Start Date') => 'DATEBEGINM',
@@ -368,6 +448,7 @@ else
 			_('Decimal values') => 'YES_NO',
 			_('Graphics') => 'GRAPHIC',
 			_('Comments') => 'TEXTBOX',
+			_('Orientation') => 'ORIENTATION',
 			_('Destination') => 'DESTINATION'));
 	$reports->addReport(RC_GL, 708, _('Trial &Balance'),
 	array(	_('Start Date') => 'DATEBEGINM',
@@ -375,6 +456,7 @@ else
 			_('Zero values') => 'YES_NO',
 			_('Only balances') => 'YES_NO',
 			_('Comments') => 'TEXTBOX',
+			_('Orientation') => 'ORIENTATION',
 			_('Destination') => 'DESTINATION'));
 }
 $reports->addReport(RC_GL, 709, _('Ta&x Report'),
@@ -382,6 +464,7 @@ $reports->addReport(RC_GL, 709, _('Ta&x Report'),
 			_('End Date') => 'DATEENDTAX',
 			_('Summary Only') => 'YES_NO',
 			_('Comments') => 'TEXTBOX',
+			_('Orientation') => 'ORIENTATION',
 			_('Destination') => 'DESTINATION'));
 $reports->addReport(RC_GL, 710, _('Audit Trail'),
 	array(	_('Start Date') => 'DATEBEGINM',
@@ -389,6 +472,7 @@ $reports->addReport(RC_GL, 710, _('Audit Trail'),
 			_('Type') => 'SYS_TYPES_ALL',
 			_('User') => 'USERS',
 			_('Comments') => 'TEXTBOX',
+			_('Orientation') => 'ORIENTATION',
 			_('Destination') => 'DESTINATION'));
 
 add_custom_reports($reports);