Rerun. Changed som defines to better harmonize.

diff --git a/applications/customers.php b/applications/customers.php
index ff161af8f41c6ff06730c6d4086250f9f9319d37..eab888c05127d202064fba4f5df50c2b7ae3f472 100644 (file)
--- a/applications/customers.php
+++ b/applications/customers.php
@@ -26,29 +26,29 @@ class customers_app extends application
                        "sales/sales_order_entry.php?NewInvoice=0", 'SA_SALESINVOICE', MENU_TRANSACTION);
                $this->add_lapp_function(0, "","");
                $this->add_lapp_function(0, _("&Delivery Against Sales Orders"),
-                       "sales/inquiry/sales_orders_view.php?OutstandingOnly=1", 'SA_SALESDELIVERY', MENU_INQUIRY);
+                       "sales/inquiry/sales_orders_view.php?OutstandingOnly=1", 'SA_SALESDELIVERY', MENU_TRANSACTION);
                $this->add_lapp_function(0, _("&Invoice Against Sales Delivery"),
-                       "sales/inquiry/sales_deliveries_view.php?OutstandingOnly=1", 'SA_SALESINVOICE', MENU_INQUIRY);
+                       "sales/inquiry/sales_deliveries_view.php?OutstandingOnly=1", 'SA_SALESINVOICE', MENU_TRANSACTION);
 
                $this->add_rapp_function(0, _("&Template Delivery"),
-                       "sales/inquiry/sales_orders_view.php?DeliveryTemplates=Yes", 'SA_SALESDELIVERY', MENU_INQUIRY);
+                       "sales/inquiry/sales_orders_view.php?DeliveryTemplates=Yes", 'SA_SALESDELIVERY', MENU_TRANSACTION);
                $this->add_rapp_function(0, _("&Template Invoice"),
-                       "sales/inquiry/sales_orders_view.php?InvoiceTemplates=Yes", 'SA_SALESINVOICE', MENU_INQUIRY);
+                       "sales/inquiry/sales_orders_view.php?InvoiceTemplates=Yes", 'SA_SALESINVOICE', MENU_TRANSACTION);
                $this->add_rapp_function(0, _("&Create and Print Recurrent Invoices"),
-                       "sales/create_recurrent_invoices.php?", 'SA_SALESINVOICE', MENU_INQUIRY);
+                       "sales/create_recurrent_invoices.php?", 'SA_SALESINVOICE', MENU_TRANSACTION);
                $this->add_rapp_function(0, "","");
                $this->add_rapp_function(0, _("Customer &Payments"),
-                       "sales/customer_payments.php?", 'SA_SALESPAYMNT', MENU_ENTRY);
+                       "sales/customer_payments.php?", 'SA_SALESPAYMNT', MENU_TRANSACTION);
                $this->add_rapp_function(0, _("Customer &Credit Notes"),
-                       "sales/credit_note_entry.php?NewCredit=Yes", 'SA_SALESCREDIT', MENU_ENTRY);
+                       "sales/credit_note_entry.php?NewCredit=Yes", 'SA_SALESCREDIT', MENU_TRANSACTION);
                $this->add_rapp_function(0, _("&Allocate Customer Payments or Credit Notes"),
-                       "sales/allocations/customer_allocation_main.php?", 'SA_SALESALLOC', MENU_INQUIRY);
+                       "sales/allocations/customer_allocation_main.php?", 'SA_SALESALLOC', MENU_TRANSACTION);
 
                $this->add_module(_("Inquiries and Reports"));
                $this->add_lapp_function(1, _("Sales Quotation I&nquiry"),
                        "sales/inquiry/sales_orders_view.php?type=32", 'SA_SALESTRANSVIEW', MENU_INQUIRY);
                $this->add_lapp_function(1, _("Sales Order &Inquiry"),
-                       "sales/inquiry/sales_orders_view.php?type=30", 'SA_SALESTRANSVIEW', 'MENU_INQUIRY');
+                       "sales/inquiry/sales_orders_view.php?type=30", 'SA_SALESTRANSVIEW', MENU_INQUIRY);
                $this->add_lapp_function(1, _("Customer Transaction &Inquiry"),
                        "sales/inquiry/customer_inquiry.php?", 'SA_SALESTRANSVIEW', MENU_INQUIRY);
                $this->add_lapp_function(1, "","");
@@ -66,11 +66,11 @@ class customers_app extends application
                $this->add_lapp_function(2, _("Sales &Groups"),
                        "sales/manage/sales_groups.php?", 'SA_SALESGROUP', MENU_MAINTENANCE);
                $this->add_lapp_function(2, _("Recurrent &Invoices"),
-                       "sales/manage/recurrent_invoices.php?", 'SA_SRECURRENT', MENU_INQUIRY);
+                       "sales/manage/recurrent_invoices.php?", 'SA_SRECURRENT', MENU_MAINTENANCE);
                $this->add_rapp_function(2, _("Sales T&ypes"),
                        "sales/manage/sales_types.php?", 'SA_SALESTYPES', MENU_MAINTENANCE);
                $this->add_rapp_function(2, _("Sales &Persons"),
-                       "sales/manage/sales_people.php?", 'SA_SALESMAN', MENU_INQUIRY);
+                       "sales/manage/sales_people.php?", 'SA_SALESMAN', MENU_MAINTENANCE);
                $this->add_rapp_function(2, _("Sales &Areas"),
                        "sales/manage/sales_areas.php?", 'SA_SALESAREA', MENU_MAINTENANCE);
                $this->add_rapp_function(2, _("Credit &Status Setup"),

diff --git a/applications/dimensions.php b/applications/dimensions.php
index 88f05e314603b65b9d172915472439a04aef37a5..3df00fd7a850634935ae00a3284ef8ed03c31ccf 100644 (file)
--- a/applications/dimensions.php
+++ b/applications/dimensions.php
@@ -22,7 +22,7 @@ class dimensions_app extends application
                        $this->add_lapp_function(0, _("Dimension &Entry"),
                                "dimensions/dimension_entry.php?", 'SA_DIMENSION', MENU_ENTRY);
                        $this->add_lapp_function(0, _("&Outstanding Dimensions"),
-                               "dimensions/inquiry/search_dimensions.php?outstanding_only=1", 'SA_DIMTRANSVIEW', MENU_INQUIRY);
+                               "dimensions/inquiry/search_dimensions.php?outstanding_only=1", 'SA_DIMTRANSVIEW', MENU_TRANSACTIONS);
 
                        $this->add_module(_("Inquiries and Reports"));
                        $this->add_lapp_function(1, _("Dimension &Inquiry"),

diff --git a/applications/generalledger.php b/applications/generalledger.php
index 670f27aace65cd2b590d78f6ef7c06241b805ab7..c4c0522b4f3cd4296991c96a45c8a14837e70e89 100644 (file)
--- a/applications/generalledger.php
+++ b/applications/generalledger.php
@@ -17,19 +17,19 @@ class general_ledger_app extends application
 
                $this->add_module(_("Transactions"));
                $this->add_lapp_function(0, _("&Payments"),
-                       "gl/gl_bank.php?NewPayment=Yes", 'SA_PAYMENT', MENU_ENTRY);
+                       "gl/gl_bank.php?NewPayment=Yes", 'SA_PAYMENT', MENU_TRANSACTION);
                $this->add_lapp_function(0, _("&Deposits"),
-                       "gl/gl_bank.php?NewDeposit=Yes", 'SA_DEPOSIT', MENU_ENTRY);
+                       "gl/gl_bank.php?NewDeposit=Yes", 'SA_DEPOSIT', MENU_TRANSACTION);
                $this->add_lapp_function(0, _("Bank Account &Transfers"),
-                       "gl/bank_transfer.php?", 'SA_BANKTRANSFER', MENU_ENTRY);
+                       "gl/bank_transfer.php?", 'SA_BANKTRANSFER', MENU_TRANSACTION);
                $this->add_rapp_function(0, _("&Journal Entry"),
-                       "gl/gl_journal.php?NewJournal=Yes", 'SA_JOURNALENTRY', MENU_ENTRY);
+                       "gl/gl_journal.php?NewJournal=Yes", 'SA_JOURNALENTRY', MENU_TRANSACTION);
                $this->add_rapp_function(0, _("&Budget Entry"),
-                       "gl/gl_budget.php?", 'SA_BUDGETENTRY', MENU_ENTRY);
+                       "gl/gl_budget.php?", 'SA_BUDGETENTRY', MENU_TRANSACTION);
                $this->add_rapp_function(0, _("&Reconcile Bank Account"),
-                       "gl/bank_account_reconcile.php?", 'SA_RECONCILE', MENU_INQUIRY);
+                       "gl/bank_account_reconcile.php?", 'SA_RECONCILE', MENU_TRANSACTION);
                $this->add_rapp_function(0, _("Revenue / &Costs Accruals"),
-                       "gl/accruals.php?", 'SA_ACCRUALS', MENU_INQUIRY);
+                       "gl/accruals.php?", 'SA_ACCRUALS', MENU_TRANSACTION);
 
                $this->add_module(_("Inquiries and Reports"));
                $this->add_lapp_function(1, _("&Journal Inquiry"),
@@ -54,7 +54,7 @@ class general_ledger_app extends application
 
                $this->add_module(_("Maintenance"));
                $this->add_lapp_function(2, _("Bank &Accounts"),
-                       "gl/manage/bank_accounts.php?", 'SA_BANKACCOUNT', MENU_ENTRY);
+                       "gl/manage/bank_accounts.php?", 'SA_BANKACCOUNT', MENU_MAINTENANCE);
                $this->add_lapp_function(2, _("&Quick Entries"),
                        "gl/manage/gl_quick_entries.php?", 'SA_QUICKENTRY', MENU_MAINTENANCE);
                $this->add_lapp_function(2, _("Account &Tags"),

diff --git a/applications/manufacturing.php b/applications/manufacturing.php
index b876a5ecd56c06731cf27c606767bf0ecfbede17..aef0bf31135b4f74bd123fd0eef914c759b98c1a 100644 (file)
--- a/applications/manufacturing.php
+++ b/applications/manufacturing.php
@@ -17,9 +17,9 @@ class manufacturing_app extends application
 
                $this->add_module(_("Transactions"));
                $this->add_lapp_function(0, _("Work &Order Entry"),
-                       "manufacturing/work_order_entry.php?", 'SA_WORKORDERENTRY', MENU_ENTRY);
+                       "manufacturing/work_order_entry.php?", 'SA_WORKORDERENTRY', MENU_TRANSACTION);
                $this->add_lapp_function(0, _("&Outstanding Work Orders"),
-                       "manufacturing/search_work_orders.php?outstanding_only=1", 'SA_MANUFTRANSVIEW', MENU_INQUIRY);
+                       "manufacturing/search_work_orders.php?outstanding_only=1", 'SA_MANUFTRANSVIEW', MENU_TRANSACTION);
 
                $this->add_module(_("Inquiries and Reports"));
                $this->add_lapp_function(1, _("Costed Bill Of Material Inquiry"),
@@ -33,7 +33,7 @@ class manufacturing_app extends application
 
                $this->add_module(_("Maintenance"));
                $this->add_lapp_function(2, _("&Bills Of Material"),
-                       "manufacturing/manage/bom_edit.php?", 'SA_BOM', MENU_INQUIRY);
+                       "manufacturing/manage/bom_edit.php?", 'SA_BOM', MENU_ENTRY);
                $this->add_lapp_function(2, _("&Work Centres"),
                        "manufacturing/manage/work_centres.php?", 'SA_WORKCENTRES', MENU_MAINTENANCE);
 

diff --git a/applications/setup.php b/applications/setup.php
index 6e48fc710dbee56ae9eea07391bc8199766d2488..7ee9fb792bd74d4141b591d925a4e48e1d27ec88 100644 (file)
--- a/applications/setup.php
+++ b/applications/setup.php
@@ -33,7 +33,7 @@ class setup_app extends application
                $this->add_rapp_function(0, _("Item Ta&x Types"),
                        "taxes/item_tax_types.php?", 'SA_ITEMTAXTYPE', MENU_MAINTENANCE);
                $this->add_rapp_function(0, _("System and &General GL Setup"),
-                       "admin/gl_setup.php?", 'SA_GLSETUP', MENU_MAINTENANCE);
+                       "admin/gl_setup.php?", 'SA_GLSETUP', MENU_SETTINGS);
                $this->add_rapp_function(0, _("&Fiscal Years"),
                        "admin/fiscalyears.php?", 'SA_FISCALYEARS', MENU_MAINTENANCE);
                $this->add_rapp_function(0, _("&Print Profiles"),