Merged changes from main trunk up to version_2_1_4

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

diff --git a/reporting/reports_main.php b/reporting/reports_main.php
index d2ac0bc2e6504071cb492ab8513261365bbe94b0..15f47d543a41073e4c679b1b5927ed718e6c1fb7 100644 (file)
--- a/reporting/reports_main.php
+++ b/reporting/reports_main.php
@@ -151,6 +151,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'),
@@ -158,7 +159,12 @@ $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')));
 
@@ -168,7 +174,12 @@ $reports->addReport(_('Manufactoring'),401,_('&Bill of Material Listing'),
                        new ReportParam(_('To component'),'ITEMS'),
                        new ReportParam(_('Comments'),'TEXTBOX'),
                        new ReportParam(_('Destination'),'DESTINATION')));
-       $reports->addReportClass(_('Dimensions'));
+$reports->addReport(_('Manufactoring'),409,_('Print &Work Orders'),
+       array(  new ReportParam(_('From'),'WORKORDER'),
+                       new ReportParam(_('To'),'WORKORDER'),
+                       new ReportParam(_('email Customers'),'YES_NO'),
+                       new ReportParam(_('Comments'),'TEXTBOX')));
+$reports->addReportClass(_('Dimensions'));
 if ($dim > 0)
 {
        $reports->addReport(_('Dimensions'),501,_('Dimension &Summary'),
@@ -325,6 +336,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() {