Bug 4817: g/l account inquiry can timeout due to slow sql. @Braath Waate.

[fa-stable.git] / applications / suppliers.php

diff --git a/applications/suppliers.php b/applications/suppliers.php
index 304c653c731a79c0c8169c7751eb7eb51d41e586..5c649e484320a52462e9891fee916b76ff782b5f 100644 (file)
--- a/applications/suppliers.php
+++ b/applications/suppliers.php
@@ -11,53 +11,47 @@
 ***********************************************************************/
 class suppliers_app extends application 
 {
-       function suppliers_app() 
+       function __construct() 
        {
-               global $installed_extensions;
-               $this->application("AP", _($this->help_context = "&Purchases"));
+               parent::__construct("AP", _($this->help_context = "&Purchases"));
 
                $this->add_module(_("Transactions"));
                $this->add_lapp_function(0, _("Purchase &Order Entry"),
-                       "purchasing/po_entry_items.php?NewOrder=Yes", 'SA_PURCHASEORDER');
+                       "purchasing/po_entry_items.php?NewOrder=Yes", 'SA_PURCHASEORDER', MENU_TRANSACTION);
                $this->add_lapp_function(0, _("&Outstanding Purchase Orders Maintenance"),
-                       "purchasing/inquiry/po_search.php?", 'SA_SUPPTRANSVIEW');
+                       "purchasing/inquiry/po_search.php?", 'SA_GRN', MENU_TRANSACTION);
+               $this->add_lapp_function(0, _("Direct &GRN"),
+                       "purchasing/po_entry_items.php?NewGRN=Yes", 'SA_GRN', MENU_TRANSACTION);
+               $this->add_lapp_function(0, _("Direct Supplier &Invoice"),
+                       "purchasing/po_entry_items.php?NewInvoice=Yes", 'SA_SUPPLIERINVOICE', MENU_TRANSACTION);
+
                $this->add_rapp_function(0, _("&Payments to Suppliers"),
-                       "purchasing/supplier_payment.php?", 'SA_SUPPLIERPAYMNT');
+                       "purchasing/supplier_payment.php?", 'SA_SUPPLIERPAYMNT', MENU_TRANSACTION);
                $this->add_rapp_function(0, "","");
                $this->add_rapp_function(0, _("Supplier &Invoices"),
-                       "purchasing/supplier_invoice.php?New=1", 'SA_SUPPLIERINVOICE');
+                       "purchasing/supplier_invoice.php?New=1", 'SA_SUPPLIERINVOICE', MENU_TRANSACTION);
                $this->add_rapp_function(0, _("Supplier &Credit Notes"),
-                       "purchasing/supplier_credit.php?New=1", 'SA_SUPPLIERCREDIT');
+                       "purchasing/supplier_credit.php?New=1", 'SA_SUPPLIERCREDIT', MENU_TRANSACTION);
                $this->add_rapp_function(0, _("&Allocate Supplier Payments or Credit Notes"),
-                       "purchasing/allocations/supplier_allocation_main.php?", 'SA_SUPPLIERALLOC');
+                       "purchasing/allocations/supplier_allocation_main.php?", 'SA_SUPPLIERALLOC', MENU_TRANSACTION);
 
                $this->add_module(_("Inquiries and Reports"));
                $this->add_lapp_function(1, _("Purchase Orders &Inquiry"),
-                       "purchasing/inquiry/po_search_completed.php?", 'SA_SUPPTRANSVIEW');
+                       "purchasing/inquiry/po_search_completed.php?", 'SA_SUPPTRANSVIEW', MENU_INQUIRY);
                $this->add_lapp_function(1, _("Supplier Transaction &Inquiry"),
-                       "purchasing/inquiry/supplier_inquiry.php?", 'SA_SUPPTRANSVIEW');
-               $this->add_lapp_function(1, "","");
+                       "purchasing/inquiry/supplier_inquiry.php?", 'SA_SUPPTRANSVIEW', MENU_INQUIRY);
                $this->add_lapp_function(1, _("Supplier Allocation &Inquiry"),
-                       "purchasing/inquiry/supplier_allocation_inquiry.php?", 'SA_SUPPLIERALLOC');
+                       "purchasing/inquiry/supplier_allocation_inquiry.php?", 'SA_SUPPLIERALLOC', MENU_INQUIRY);
 
                $this->add_rapp_function(1, _("Supplier and Purchasing &Reports"),
-                       "reporting/reports_main.php?Class=1", 'SA_SUPPTRANSVIEW');
+                       "reporting/reports_main.php?Class=1", 'SA_SUPPTRANSVIEW', MENU_REPORT);
 
                $this->add_module(_("Maintenance"));
                $this->add_lapp_function(2, _("&Suppliers"),
-                       "purchasing/manage/suppliers.php?", 'SA_SUPPLIER');
-               if (count($installed_extensions) > 0)
-               {
-                       foreach ($installed_extensions as $mod)
-                       {
-                               if (@$mod['active'] && $mod['type'] == 'plugin' && $mod["tab"] == "AP")
-                                       $this->add_rapp_function(2, $mod["title"], 
-                                               "modules/".$mod["path"]."/".$mod["filename"]."?",
-                                               isset($mod["access"]) ? $mod["access"] : 'SA_OPEN' );
-                       }
-               }
+                       "purchasing/manage/suppliers.php?", 'SA_SUPPLIER', MENU_ENTRY);
+
+               $this->add_extensions();
        }
 }
 
 
-?>
\ No newline at end of file