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

diff --git a/menu.ini b/menu.ini
index 8d1383bb9..427716282 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
@@ -87,11 +82,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]
@@ -159,11 +149,18 @@ 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
 
+
 [AP]
 
 [AP--Add RFQ]
@@ -178,7 +175,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
@@ -331,16 +328,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 +359,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 +413,7 @@ report=projects
 
 
 [Batch Printing]
+ACCESS=batch_printing
 
 [Batch Printing--Sales Invoices]
 ACCESS=invoice_edit
@@ -538,7 +546,7 @@ action=acc_menu
 target=acc_menu
 submenu=1
 
-[System--Taxes--List Tax]
+[System--Taxes--Edit]
 module=am.pl
 action=list_tax
 
@@ -613,12 +621,12 @@ target=acc_menu
 submenu=1
 
 [System--Departments--Add Department]
-module=am.pl
-action=add_department
+module=controller.pl
+action=Department/new
 
 [System--Departments--List Departments]
-module=am.pl
-action=list_department
+module=controller.pl
+action=Department/list
 
 [System--Type of Business]
 module=menu.pl
@@ -627,12 +635,12 @@ target=acc_menu
 submenu=1
 
 [System--Type of Business--Add Business]
-module=am.pl
-action=add_business
+module=controller.pl
+action=Business/new
 
 [System--Type of Business--List Businesses]
-module=am.pl
-action=list_business
+module=controller.pl
+action=Business/list
 
 [System--Lead]
 module=menu.pl
@@ -666,20 +674,10 @@ action=list_language
 module=generictranslations.pl
 action=edit_greetings
 
+[System--Languages--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
@@ -688,24 +686,24 @@ target=acc_menu
 submenu=1
 
 [System--Payment Terms--Add Payment Terms]
-module=am.pl
-action=add_payment
+module=controller.pl
+action=PaymentTerm/new
 
 [System--Payment Terms--List Payment Terms]
-module=am.pl
-action=list_payment
+module=controller.pl
+action=PaymentTerm/list
 
-[System--Custom Variables]
+[System--Manage Custom Variables]
 module=menu.pl
 action=acc_menu
 target=acc_menu
 submenu=1
 
-[System--Custom Variables--Add]
+[System--Manage Custom Variables--Add]
 module=amcvar.pl
 action=add_cvar_config
 
-[System--Custom Variables--List]
+[System--Manage Custom Variables--List]
 module=amcvar.pl
 action=list_cvar_configs
 
@@ -724,44 +722,31 @@ 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--Templates]
@@ -805,10 +790,6 @@ action=audit_control
 module=am.pl
 action=show_history_search
 
-[System--Administration area]
-module=admin.pl
-action=login
-
 
 [Program]
 
@@ -816,6 +797,10 @@ action=login
 module=am.pl
 action=config
 
+[Program--Administration area]
+module=admin.pl
+action=login
+
 [Program--Version]
 module=login.pl
 action=company_logo
@@ -825,29 +810,3 @@ no_todo_list=1
 module=login.pl
 action=logout
 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