Merged changes up to 2.3.16 into unstable

[fa-stable.git] / reporting / reports_main.php

diff --git a/reporting/reports_main.php b/reporting/reports_main.php
index dd35488aaf27580aaae80e8abe1cf235307e83a4..6efe4c6be836364c51b9788bf2db29d938c62c6e 100644 (file)
--- a/reporting/reports_main.php
+++ b/reporting/reports_main.php
@@ -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',
@@ -177,6 +181,13 @@ $reports->addReport(RC_SUPPLIER, 204, _('Outstanding &GRNs Report'),
                        _('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',
@@ -193,7 +204,6 @@ $reports->addReport(RC_SUPPLIER, 210, _('Print Remi&ttances'),
                        _('Orientation') => 'ORIENTATION'));
 
 $reports->addReportClass(_('Inventory'), RC_INVENTORY);
-
 $reports->addReport(RC_INVENTORY,  301, _('Inventory &Valuation Report'),
        array(  _('End Date') => 'DATE',
                        _('Inventory Category') => 'CATEGORIES',
@@ -215,6 +225,7 @@ $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'));
@@ -243,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'),