X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=menu.ini;h=73ac2d072432fdaaa6ed1da7da08cf06a7c6e274;hb=95a60147c8b2bf2fab66e6e1785708aeebfaccbc;hp=da54506645635ca6c9eea90e92683e650d515870;hpb=5104dee447f25733832ed4e4a58c4847b2c2ea66;p=kivitendo-erp.git

diff --git a/menu.ini b/menu.ini
index da5450664..73ac2d072 100644
--- a/menu.ini
+++ b/menu.ini
@@ -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,7 +44,6 @@ action=search_update_prices
 [Master Data--Reports]
 module=menu.pl
 action=acc_menu
-target=acc_menu
 submenu=1
 
 [Master Data--Reports--Customers]
@@ -63,7 +62,6 @@ db=vendor
 ACCESS=customer_vendor_edit
 module=ct.pl
 action=search_contact
-db=customer
 
 [Master Data--Reports--Parts]
 ACCESS=part_service_assembly_edit
@@ -85,8 +83,8 @@ searchitems=assembly
 
 [Master Data--Reports--Projects]
 ACCESS=project_edit
-module=projects.pl
-action=search
+module=controller.pl
+action=Project/search
 
 [AR]
 
@@ -128,7 +126,6 @@ action=add
 [AR--Reports]
 module=menu.pl
 action=acc_menu
-target=acc_menu
 submenu=1
 
 [AR--Reports--Quotations]
@@ -149,7 +146,7 @@ module=do.pl
 action=search
 type=sales_delivery_order
 
-[AR--Reports--Invoices]
+[AR--Reports--Invoices, Credit Notes & AR Transactions]
 ACCESS=invoice_edit
 module=ar.pl
 action=search
@@ -166,6 +163,10 @@ ACCESS=dunning_edit
 module=dn.pl
 action=search
 
+[AR--Reports--Delivery Plan]
+ACCESS=sales_order_edit
+module=controller.pl
+action=DeliveryPlan/list
 
 [AP]
 
@@ -197,7 +198,6 @@ type=invoice
 [AP--Reports]
 module=menu.pl
 action=acc_menu
-target=acc_menu
 submenu=1
 
 [AP--Reports--RFQs]
@@ -218,7 +218,7 @@ module=do.pl
 action=search
 type=purchase_delivery_order
 
-[AP--Reports--Vendor Invoices]
+[AP--Reports--Vendor Invoices & AP Transactions]
 ACCESS=vendor_invoice_edit
 module=ap.pl
 action=search
@@ -254,7 +254,6 @@ trans_type=removal
 [Warehouse--Reports]
 module=menu.pl
 action=acc_menu
-target=acc_menu
 submenu=1
 
 [Warehouse--Reports--Warehouse content]
@@ -296,7 +295,6 @@ action=export
 [General Ledger--Reports]
 module=menu.pl
 action=acc_menu
-target=acc_menu
 submenu=1
 
 
@@ -352,7 +350,6 @@ vc=vendor
 [Cash--Reports]
 module=menu.pl
 action=acc_menu
-target=acc_menu
 submenu=1
 
 [Cash--Reports--Receipts]
@@ -479,6 +476,7 @@ type=receipt
 
 
 [Productivity]
+ACCESS=productivity
 
 [Productivity--Show TODO list]
 module=todo.pl
@@ -495,7 +493,6 @@ action=edit_access_rights
 [Productivity--Reports]
 module=menu.pl
 action=acc_menu
-target=acc_menu
 submenu=1
 
 [Productivity--Reports--Follow-Ups]
@@ -506,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
@@ -521,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]
@@ -533,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
@@ -607,123 +556,52 @@ 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]
+[System--Languages and translations]
 module=menu.pl
 action=acc_menu
-target=acc_menu
 submenu=1
 
-[System--Languages--Add Language]
+[System--Languages and translations--Add Language]
 module=am.pl
 action=add_language
 
-[System--Languages--List Languages]
+[System--Languages and translations--List Languages]
 module=am.pl
 action=list_language
 
-[System--Languages--Greetings]
+[System--Languages and translations--Greetings]
 module=generictranslations.pl
 action=edit_greetings
 
-[System--Languages--SEPA strings]
+[System--Languages and translations--SEPA strings]
 module=generictranslations.pl
 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
 
@@ -731,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]
@@ -754,12 +631,15 @@ module=controller.pl
 action=CsvImport/new
 profile.type=parts
 
+[System--Import CSV--Projects]
+module=controller.pl
+action=CsvImport/new
+profile.type=projects
 
 [System--Templates]
 ACCESS=admin
 module=menu.pl
 action=acc_menu
-target=acc_menu
 submenu=1
 
 [System--Templates--HTML Templates]
@@ -779,15 +659,27 @@ module=amtemplates.pl
 action=display_template_form
 type=stylesheet
 
-[System--Corrections]
+[System--General Ledger Corrections]
+module=acctranscorrections.pl
+action=analyze_filter
+
+[System--Background jobs and task server]
+ACCESS=admin
 module=menu.pl
 action=acc_menu
-target=acc_menu
 submenu=1
 
-[System--Corrections--General Ledger Corrections]
-module=acctranscorrections.pl
-action=analyze_filter
+[System--Background jobs and task server--List current background jobs]
+module=controller.pl
+action=BackgroundJob/list
+
+[System--Background jobs and task server--Background job history]
+module=controller.pl
+action=BackgroundJobHistory/list
+
+[System--Background jobs and task server--Task server control]
+module=controller.pl
+action=TaskServer/show
 
 [System--Audit Control]
 module=am.pl
@@ -802,23 +694,30 @@ ACCESS=admin
 module=controller.pl
 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=_blank
+
+[Program--kivitendo website (external)]
+href=http://www.kivitendo.de/
+target=_blank
+
 [Program--Logout]
-module=login.pl
-action=logout
-target=_top
+module=controller.pl
+action=LoginScreen/logout