X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=menu.ini;h=4277162822ac63763ce3f2c0227ee25c3ed53737;hb=515d5a58413076f0ed5d61f5001ff41db455e84f;hp=b0738420c54fd9d1b6370302f801e9f25cfaa0d7;hpb=0884406403ce36af3484924086527ba689807329;p=kivitendo-erp.git

diff --git a/menu.ini b/menu.ini
index b0738420c..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,17 +82,6 @@ ACCESS=project_edit
 module=projects.pl
 action=search
 
-[Master Data--Reports--Projecttransactions]
-ACCESS=report
-module=rp.pl
-action=report
-report=projects
-
-[Master Data--Reports--Licenses]
-ACCESS=license_edit
-module=licenses.pl
-action=search
-
 [AR]
 
 [AR--Add Quotation]
@@ -165,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]
@@ -184,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
@@ -236,6 +227,12 @@ module=wh.pl
 action=transfer_warehouse_selection
 trans_type=stock
 
+[Warehouse--Produce Assembly]
+ACCESS=warehouse_management
+module=wh.pl
+action=transfer_warehouse_selection
+trans_type=assembly
+
 [Warehouse--Transfer]
 ACCESS=warehouse_management
 module=wh.pl
@@ -255,7 +252,7 @@ target=acc_menu
 submenu=1
 
 [Warehouse--Reports--Warehouse content]
-ACCESS=warehouse_content | warehouse_management
+ACCESS=warehouse_contents | warehouse_management
 module=wh.pl
 action=report
 
@@ -316,7 +313,6 @@ module=gl.pl
 action=search
 
 
-
 [Cash]
 ACCESS=cash
 
@@ -332,13 +328,21 @@ 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
 action=acc_menu
@@ -355,6 +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]
 
@@ -392,7 +405,15 @@ ACCESS=advance_turnover_tax_return
 module=ustva.pl
 action=report
 
+[Reports--Projecttransactions]
+ACCESS=report
+module=rp.pl
+action=report
+report=projects
+
+
 [Batch Printing]
+ACCESS=batch_printing
 
 [Batch Printing--Sales Invoices]
 ACCESS=invoice_edit
@@ -525,10 +546,24 @@ action=acc_menu
 target=acc_menu
 submenu=1
 
-[System--Taxes--List Tax]
+[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
@@ -561,21 +596,9 @@ module=pe.pl
 action=search
 type=pricegroup
 
-[System--Units]
-module=menu.pl
-action=acc_menu
-target=acc_menu
-submenu=1
-
-[System--Units--Dimension units]
-module=am.pl
-action=edit_units
-unit_type=dimension
-
-[System--Units--Service units]
+[System--Edit units]
 module=am.pl
 action=edit_units
-unit_type=service
 
 [System--Price Factors]
 module=menu.pl
@@ -598,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
@@ -612,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
@@ -647,19 +670,14 @@ action=add_language
 module=am.pl
 action=list_language
 
-[System--Printer]
-module=menu.pl
-action=acc_menu
-target=acc_menu
-submenu=1
+[System--Languages--Greetings]
+module=generictranslations.pl
+action=edit_greetings
 
-[System--Printer--Add Printer]
-module=am.pl
-action=add_printer
+[System--Languages--SEPA strings]
+module=generictranslations.pl
+action=edit_sepa_strings
 
-[System--Printer--List Printer]
-module=am.pl
-action=list_printer
 
 [System--Payment Terms]
 module=menu.pl
@@ -668,34 +686,26 @@ 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
-
-[System--Custom Variables]
-module=menu.pl
-action=acc_menu
-target=acc_menu
-submenu=1
+module=controller.pl
+action=PaymentTerm/list
 
-[System--Custom Variables--Customers and Vendors]
+[System--Manage Custom Variables]
 module=menu.pl
 action=acc_menu
 target=acc_menu
 submenu=1
 
-[System--Custom Variables--Customers and Vendors--Add Custom Variable]
+[System--Manage Custom Variables--Add]
 module=amcvar.pl
 action=add_cvar_config
-cvar_module=CT
 
-[System--Custom Variables--Customers and Vendors--List Custom Variables]
+[System--Manage Custom Variables--List]
 module=amcvar.pl
 action=list_cvar_configs
-cvar_module=CT
 
 [System--Warehouses]
 module=menu.pl
@@ -712,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]
@@ -775,6 +772,16 @@ 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]
+module=acctranscorrections.pl
+action=analyze_filter
+
 [System--Audit Control]
 module=am.pl
 action=audit_control
@@ -783,49 +790,23 @@ action=audit_control
 module=am.pl
 action=show_history_search
 
-[System--Administration area]
-module=admin.pl
-action=login
-
 
-[Programm]
+[Program]
 
-[Programm--Preferences]
+[Program--Preferences]
 module=am.pl
 action=config
 
-[Programm--Logout]
-module=login.pl
-action=logout
-target=_top
+[Program--Administration area]
+module=admin.pl
+action=login
 
-[Programm--Version]
+[Program--Version]
 module=login.pl
 action=company_logo
 no_todo_list=1
 
-
-#################################
-# 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=login.pl
+action=logout
+target=_top