X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=menu.ini;h=9decadbf7eb0499033b38882437a0def10828dec;hb=54f00ed88d7ed5fcd286ac72b9a9052243153c57;hp=290ae0a91ba4fca89f0ae10278cb686a80b69f07;hpb=12a0e84445ff0e360e38d6ad5f520fa848536efd;p=kivitendo-erp.git

diff --git a/menu.ini b/menu.ini
index 290ae0a91..9decadbf7 100644
--- a/menu.ini
+++ b/menu.ini
@@ -2,14 +2,14 @@
 
 [Master Data--Add Customer]
 ACCESS=customer_vendor_edit
-module=ct.pl
-action=add
+module=controller.pl
+action=CustomerVendor/add
 db=customer
 
 [Master Data--Add Vendor]
 ACCESS=customer_vendor_edit
-module=ct.pl
-action=add
+module=controller.pl
+action=CustomerVendor/add
 db=vendor
 
 [Master Data--Add Part]
@@ -32,8 +32,8 @@ item=assembly
 
 [Master Data--Add Project]
 ACCESS=project_edit
-module=projects.pl
-action=add
+module=controller.pl
+action=Project/new
 
 [Master Data--Update Prices]
 ACCESS=part_service_assembly_edit
@@ -44,25 +44,24 @@ action=search_update_prices
 [Master Data--Reports]
 module=menu.pl
 action=acc_menu
-target=acc_menu
 submenu=1
 
 [Master Data--Reports--Customers]
 ACCESS=customer_vendor_edit
-module=ct.pl
-action=search
+module=controller.pl
+action=CustomerVendor/search
 db=customer
 
 [Master Data--Reports--Vendors]
 ACCESS=customer_vendor_edit
-module=ct.pl
-action=search
+module=controller.pl
+action=CustomerVendor/search
 db=vendor
 
 [Master Data--Reports--Contacts]
 ACCESS=customer_vendor_edit
-module=ct.pl
-action=search_contact
+module=controller.pl
+action=CustomerVendor/search_contact
 db=customer
 
 [Master Data--Reports--Parts]
@@ -85,8 +84,8 @@ searchitems=assembly
 
 [Master Data--Reports--Projects]
 ACCESS=project_edit
-module=projects.pl
-action=search
+module=controller.pl
+action=Project/search
 
 [AR]
 
@@ -128,7 +127,6 @@ action=add
 [AR--Reports]
 module=menu.pl
 action=acc_menu
-target=acc_menu
 submenu=1
 
 [AR--Reports--Quotations]
@@ -201,7 +199,6 @@ type=invoice
 [AP--Reports]
 module=menu.pl
 action=acc_menu
-target=acc_menu
 submenu=1
 
 [AP--Reports--RFQs]
@@ -233,9 +230,8 @@ nextsub=ap_transactions
 
 [Warehouse--Stock]
 ACCESS=warehouse_management
-module=wh.pl
-action=transfer_warehouse_selection
-trans_type=stock
+module=controller.pl
+action=Inventory/stock_in
 
 [Warehouse--Produce Assembly]
 ACCESS=warehouse_management
@@ -258,7 +254,6 @@ trans_type=removal
 [Warehouse--Reports]
 module=menu.pl
 action=acc_menu
-target=acc_menu
 submenu=1
 
 [Warehouse--Reports--Warehouse content]
@@ -300,7 +295,6 @@ action=export
 [General Ledger--Reports]
 module=menu.pl
 action=acc_menu
-target=acc_menu
 submenu=1
 
 
@@ -356,7 +350,6 @@ vc=vendor
 [Cash--Reports]
 module=menu.pl
 action=acc_menu
-target=acc_menu
 submenu=1
 
 [Cash--Reports--Receipts]
@@ -483,6 +476,7 @@ type=receipt
 
 
 [Productivity]
+ACCESS=productivity
 
 [Productivity--Show TODO list]
 module=todo.pl
@@ -499,7 +493,6 @@ action=edit_access_rights
 [Productivity--Reports]
 module=menu.pl
 action=acc_menu
-target=acc_menu
 submenu=1
 
 [Productivity--Reports--Follow-Ups]
@@ -510,9 +503,10 @@ action=search
 [System]
 ACCESS=config
 
-[System--Ranges of numbers and default accounts]
-module=am.pl
-action=edit_defaults
+[System--Client Configuration]
+ACCESS=admin
+module=controller.pl
+action=ClientConfig/edit
 
 [System--UStVa Einstellungen]
 module=ustva.pl
@@ -525,7 +519,6 @@ action=edit_config
 [System--Chart of Accounts]
 module=menu.pl
 action=acc_menu
-target=acc_menu
 submenu=1
 
 [System--Chart of Accounts--Add Account]
@@ -537,71 +530,23 @@ module=am.pl
 action=list_account
 
 [System--Buchungsgruppen]
-module=menu.pl
-action=acc_menu
-target=acc_menu
-submenu=1
-
-[System--Buchungsgruppen--Add Accounting Group]
-module=am.pl
-action=add_buchungsgruppe
-
-[System--Buchungsgruppen--List Accounting Groups]
 module=am.pl
 action=list_buchungsgruppe
 
 [System--Taxes]
-module=menu.pl
-action=acc_menu
-target=acc_menu
-submenu=1
-
-[System--Taxes--Edit]
 module=am.pl
 action=list_tax
 
 [System--Bank accounts]
-module=menu.pl
-action=acc_menu
-target=acc_menu
-submenu=1
-
-[System--Bank accounts--Add bank account]
-module=bankaccounts.pl
-action=bank_account_add
-
-[System--Bank accounts--List bank accounts]
 module=bankaccounts.pl
 action=bank_account_list
 
 [System--Groups]
-module=menu.pl
-action=acc_menu
-target=acc_menu
-submenu=1
-
-[System--Groups--Add Group]
-module=pe.pl
-action=add
-type=partsgroup
-
-[System--Groups--List Groups]
 module=pe.pl
 action=search
 type=partsgroup
 
 [System--Pricegroups]
-module=menu.pl
-action=acc_menu
-target=acc_menu
-submenu=1
-
-[System--Pricegroups--Add Pricegroup]
-module=pe.pl
-action=add
-type=pricegroup
-
-[System--Pricegroups--List Pricegroups]
 module=pe.pl
 action=search
 type=pricegroup
@@ -611,65 +556,24 @@ module=am.pl
 action=edit_units
 
 [System--Price Factors]
-module=menu.pl
-action=acc_menu
-target=acc_menu
-submenu=1
-
-[System--Price Factors--Add Price Factor]
-module=am.pl
-action=add_price_factor
-
-[System--Price Factors--List Price Factors]
 module=am.pl
 action=list_price_factors
 
 [System--Departments]
-module=menu.pl
-action=acc_menu
-target=acc_menu
-submenu=1
-
-[System--Departments--Add Department]
-module=controller.pl
-action=Department/new
-
-[System--Departments--List Departments]
 module=controller.pl
 action=Department/list
 
-[System--Type of Business]
-module=menu.pl
-action=acc_menu
-target=acc_menu
-submenu=1
-
-[System--Type of Business--Add Business]
-module=controller.pl
-action=Business/new
-
-[System--Type of Business--List Businesses]
+[System--Types of Business]
 module=controller.pl
 action=Business/list
 
-[System--Lead]
-module=menu.pl
-action=acc_menu
-target=acc_menu
-submenu=1
-
-[System--Lead--Add Lead]
-module=am.pl
-action=add_lead
-
-[System--Lead--List Lead]
+[System--Leads]
 module=am.pl
 action=list_lead
 
 [System--Languages and translations]
 module=menu.pl
 action=acc_menu
-target=acc_menu
 submenu=1
 
 [System--Languages and translations--Add Language]
@@ -690,44 +594,14 @@ action=edit_sepa_strings
 
 
 [System--Payment Terms]
-module=menu.pl
-action=acc_menu
-target=acc_menu
-submenu=1
-
-[System--Payment Terms--Add Payment Terms]
-module=controller.pl
-action=PaymentTerm/new
-
-[System--Payment Terms--List Payment Terms]
 module=controller.pl
 action=PaymentTerm/list
 
 [System--Manage Custom Variables]
-module=menu.pl
-action=acc_menu
-target=acc_menu
-submenu=1
-
-[System--Manage Custom Variables--Add]
-module=amcvar.pl
-action=add_cvar_config
-
-[System--Manage Custom Variables--List]
-module=amcvar.pl
-action=list_cvar_configs
+module=controller.pl
+action=CustomVariableConfig/list
 
 [System--Warehouses]
-module=menu.pl
-action=acc_menu
-target=acc_menu
-submenu=1
-
-[System--Warehouses--Add Warehouse]
-module=am.pl
-action=add_warehouse
-
-[System--Warehouses--List Warehouses]
 module=am.pl
 action=list_warehouses
 
@@ -735,7 +609,6 @@ action=list_warehouses
 [System--Import CSV]
 module=menu.pl
 action=acc_menu
-target=acc_menu
 submenu=1
 
 [System--Import CSV--Customers and vendors]
@@ -767,7 +640,6 @@ profile.type=projects
 ACCESS=admin
 module=menu.pl
 action=acc_menu
-target=acc_menu
 submenu=1
 
 [System--Templates--HTML Templates]
@@ -787,13 +659,7 @@ module=amtemplates.pl
 action=display_template_form
 type=stylesheet
 
-[System--Corrections]
-module=menu.pl
-action=acc_menu
-target=acc_menu
-submenu=1
-
-[System--Corrections--General Ledger Corrections]
+[System--General Ledger Corrections]
 module=acctranscorrections.pl
 action=analyze_filter
 
@@ -801,7 +667,6 @@ action=analyze_filter
 ACCESS=admin
 module=menu.pl
 action=acc_menu
-target=acc_menu
 submenu=1
 
 [System--Background jobs and task server--List current background jobs]
@@ -824,11 +689,6 @@ action=audit_control
 module=am.pl
 action=show_history_search
 
-[System--Client Configuration]
-ACCESS=admin
-module=controller.pl
-action=ClientConfig/edit
-
 [System--Employees]
 ACCESS=admin
 module=controller.pl
@@ -836,26 +696,27 @@ action=Employee/list
 
 [Program]
 
-[Program--Preferences]
+[Program--User Preferences]
 module=am.pl
 action=config
 
-[Program--Administration area]
-module=admin.pl
-action=login
-
 [Program--Version]
 module=login.pl
 action=company_logo
 no_todo_list=1
 
+[Program--Administration area]
+ACCESS=display_admin_link
+module=controller.pl
+action=Admin/login
+
 [Program--Documentation (in German)]
 href=doc/kivitendo-Dokumentation.pdf
-target=_top
+target=_blank
 
 [Program--kivitendo website (external)]
 href=http://www.kivitendo.de/
-target=_top
+target=_blank
 
 [Program--Logout]
 module=controller.pl