X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=menu.ini;h=451034b9caae74e38b47af85e75eef5cc119fb3f;hb=4b97efc19319f25bcd5a1df9e397f21399d3439b;hp=8d1383bb911dba6474f3f268937b769e2c031e7d;hpb=3e79eff483fbe94a4a24bbc05806046e0ad2d342;p=kivitendo-erp.git

diff --git a/menu.ini b/menu.ini
index 8d1383bb9..451034b9c 100644
--- a/menu.ini
+++ b/menu.ini
@@ -40,11 +40,6 @@ ACCESS=part_service_assembly_edit
 module=ic.pl
 action=search_update_prices
 
-[Master Data--Add License]
-ACCESS=license_edit
-module=licenses.pl
-action=add
-
 
 [Master Data--Reports]
 module=menu.pl
@@ -64,6 +59,12 @@ module=ct.pl
 action=search
 db=vendor
 
+[Master Data--Reports--Contacts]
+ACCESS=customer_vendor_edit
+module=ct.pl
+action=search_contact
+db=customer
+
 [Master Data--Reports--Parts]
 ACCESS=part_service_assembly_edit
 module=ic.pl
@@ -87,11 +88,6 @@ ACCESS=project_edit
 module=projects.pl
 action=search
 
-[Master Data--Reports--Licenses]
-ACCESS=license_edit
-module=licenses.pl
-action=search
-
 [AR]
 
 [AR--Add Quotation]
@@ -153,17 +149,28 @@ 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
 nextsub=ar_transactions
 
+[AR--Reports--Sales Report]
+ACCESS=invoice_edit
+module=vk.pl
+action=search_invoice
+nextsub=invoice_transactions
+
 [AR--Reports--Dunnings]
 ACCESS=dunning_edit
 module=dn.pl
 action=search
 
+[AR--Reports--Delivery Plan]
+ACCESS=sales_order_edit
+module=controller.pl
+action=DeliveryPlan/list
+
 [AP]
 
 [AP--Add RFQ]
@@ -178,7 +185,7 @@ module=oe.pl
 action=add
 type=purchase_order
 
-[AP--Add Delivery Order]
+[AP--Add Delivery Note]
 ACCESS=purchase_delivery_order_edit
 module=do.pl
 action=add
@@ -215,7 +222,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
@@ -331,16 +338,20 @@ action=payment
 type=check
 vc=vendor
 
-# Wird selten eingesetzt und ist Fehlerbehaftet !!!
-# Stimmt nicht! Udo Spallek
 [Cash--Reconciliation]
 ACCESS=cash
 module=rc.pl
 action=reconciliation
 
+[Cash--Bank collection via SEPA]
+module=sepa.pl
+action=bank_transfer_add
+vc=customer
+
 [Cash--Bank transfer via SEPA]
 module=sepa.pl
 action=bank_transfer_add
+vc=vendor
 
 [Cash--Reports]
 module=menu.pl
@@ -358,9 +369,15 @@ module=rp.pl
 action=report
 report=payments
 
+[Cash--Reports--Bank collections via SEPA]
+module=sepa.pl
+action=bank_transfer_search
+vc=customer
+
 [Cash--Reports--Bank transfers via SEPA]
 module=sepa.pl
 action=bank_transfer_search
+vc=vendor
 
 [Reports]
 
@@ -406,6 +423,7 @@ report=projects
 
 
 [Batch Printing]
+ACCESS=batch_printing
 
 [Batch Printing--Sales Invoices]
 ACCESS=invoice_edit
@@ -519,71 +537,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--List Tax]
 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
@@ -593,178 +563,90 @@ 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
+module=controller.pl
+action=Department/list
 
-[System--Departments--Add Department]
-module=am.pl
-action=add_department
+[System--Types of Business]
+module=controller.pl
+action=Business/list
 
-[System--Departments--List Departments]
-module=am.pl
-action=list_department
-
-[System--Type of Business]
-module=menu.pl
-action=acc_menu
-target=acc_menu
-submenu=1
-
-[System--Type of Business--Add Business]
-module=am.pl
-action=add_business
-
-[System--Type of Business--List Businesses]
-module=am.pl
-action=list_business
-
-[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 and translations--SEPA strings]
+module=generictranslations.pl
+action=edit_sepa_strings
 
-[System--Printer]
-module=menu.pl
-action=acc_menu
-target=acc_menu
-submenu=1
-
-[System--Printer--Add Printer]
-module=am.pl
-action=add_printer
-
-[System--Printer--List Printer]
-module=am.pl
-action=list_printer
 
 [System--Payment Terms]
-module=menu.pl
-action=acc_menu
-target=acc_menu
-submenu=1
-
-[System--Payment Terms--Add Payment Terms]
-module=am.pl
-action=add_payment
-
-[System--Payment Terms--List Payment Terms]
-module=am.pl
-action=list_payment
-
-[System--Custom Variables]
-module=menu.pl
-action=acc_menu
-target=acc_menu
-submenu=1
+module=controller.pl
+action=PaymentTerm/list
 
-[System--Custom Variables--Add]
-module=amcvar.pl
-action=add_cvar_config
-
-[System--Custom Variables--List]
+[System--Manage Custom Variables]
 module=amcvar.pl
 action=list_cvar_configs
 
 [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
 
 
-#[System--Import Datanorm]
-#module=menu.pl
-#action=acc_menu
-#target=acc_menu
-#submenu=1
-
-#[System--Import Datanorm--Warengruppensatz]
-#module=datanorm.pl
-#action=import
-#type=Warengruppensatz
-
-#[System--Import Datanorm--Artikelsatz]
-#module=datanorm.pl
-#action=import
-#type=Artikelsatz
-
-#[System--Import Datanorm--Datapreis]
-#module=datanorm.pl
-#action=import
-#type=Datapreis
-
 [System--Import CSV]
 module=menu.pl
 action=acc_menu
 target=acc_menu
 submenu=1
 
-[System--Import CSV--Customer]
-module=lxo-import/addressB.php
+[System--Import CSV--Customers and vendors]
+module=controller.pl
+action=CsvImport/new
+profile.type=customers_vendors
 
 [System--Import CSV--Contacts]
-module=lxo-import/contactB.php
+module=controller.pl
+action=CsvImport/new
+profile.type=contacts
 
 [System--Import CSV--Shipto]
-module=lxo-import/shiptoB.php
+module=controller.pl
+action=CsvImport/new
+profile.type=addresses
 
 [System--Import CSV--Parts]
-module=lxo-import/partsB.php
+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
@@ -787,15 +669,28 @@ 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
@@ -805,10 +700,15 @@ action=audit_control
 module=am.pl
 action=show_history_search
 
-[System--Administration area]
-module=admin.pl
-action=login
+[System--Client Configuration]
+ACCESS=admin
+module=controller.pl
+action=ClientConfig/edit
 
+[System--Employees]
+ACCESS=admin
+module=controller.pl
+action=Employee/list
 
 [Program]
 
@@ -816,38 +716,23 @@ action=login
 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--Logout]
-module=login.pl
-action=logout
+[Program--Documentation (in German)]
+href=doc/kivitendo-Dokumentation.pdf
 target=_top
 
+[Program--kivitendo website (external)]
+href=http://www.kivitendo.de/
+target=_top
 
-#################################
-# WEISS NOCH NICHT WAS DAMIT IST #
-#################################
-
-
-#[AR--Reports--Tax collected]
-#module=rp.pl
-#action=report
-#report=tax_collected
-
-#[AR--Reports--Non-taxable]
-#module=rp.pl
-#action=report
-#report=nontaxable_sales
-
-#[AP--Reports--Tax paid]
-#module=rp.pl
-#action=report
-#report=tax_paid
-
-#[AP--Reports--Non-taxable]
-#module=rp.pl
-#action=report
-#report=nontaxable_purchases
+[Program--Logout]
+module=controller.pl
+action=LoginScreen/logout