Menüs in Untermenü "menus" verschoben

diff --git a/SL/Layout/Admin.pm b/SL/Layout/Admin.pm
index a379df3..8b75c89 100644 (file)
--- a/SL/Layout/Admin.pm
+++ b/SL/Layout/Admin.pm
@@ -11,7 +11,7 @@ use Rose::Object::MakeMethods::Generic (
 
 
 sub init_menu {
-  Menu->new('admin-menu.ini');
+  Menu->new('menus/admin.ini');
 }
 
 sub start_content {

diff --git a/SL/Layout/Base.pm b/SL/Layout/Base.pm
index 467f56e..2312ecf 100644 (file)
--- a/SL/Layout/Base.pm
+++ b/SL/Layout/Base.pm
@@ -29,7 +29,7 @@ sub new {
 }
 
 sub init_menu {
-  Menu->new('crm/update/menu.ini', 'menu.ini');
+  Menu->new('crm/update/menu.ini', 'menus/erp.ini');
 }
 
 sub init_auto_reload_resources_param {
@@ -327,4 +327,3 @@ None yet, if you don't count the horrible stylesheet/javascript interface.
 Sven Schöling E<lt>s.schoeling@linet-services.deE<gt>
 
 =cut
-

diff --git a/admin-menu.ini b/admin-menu.ini
deleted file mode 100644 (file)
index 3da5752..0000000
--- a/admin-menu.ini
+++ /dev/null
@@ -1,59 +0,0 @@
-[Users, Clients and User Groups]
-
-[Users, Clients and User Groups--List Users, Clients and User Groups]
-module=controller.pl
-action=Admin/show
-
-[Users, Clients and User Groups--Add User]
-module=controller.pl
-action=Admin/new_user
-
-[Users, Clients and User Groups--Add Client]
-module=controller.pl
-action=Admin/new_client
-
-[Users, Clients and User Groups--Add User Group]
-module=controller.pl
-action=Admin/new_group
-
-[Database Management]
-
-[Database Management--Create Dataset]
-module=controller.pl
-action=Admin/create_dataset_login
-
-[Database Management--Delete Dataset]
-module=controller.pl
-action=Admin/delete_dataset_login
-
-[Printer Management]
-
-[Printer Management--List Printers]
-module=controller.pl
-action=Admin/list_printers
-
-[Printer Management--Add Printer]
-module=controller.pl
-action=Admin/new_printer
-
-[System]
-
-[System--Lock and unlock installation]
-module=controller.pl
-action=Admin/show_lock
-
-[System--Documentation (in German)]
-href=doc/kivitendo-Dokumentation.pdf
-target=_blank
-
-[System--kivitendo website (external)]
-href=http://www.kivitendo.de/
-target=_blank
-
-[System--To user login]
-module=controller.pl
-action=LoginScreen/user_login
-
-[System--Logout]
-module=controller.pl
-action=Admin/logout

diff --git a/menu.ini b/menu.ini
deleted file mode 100644 (file)
index b0bff61..0000000
--- a/menu.ini
+++ /dev/null
@@ -1,723 +0,0 @@
-[Master Data]
-
-[Master Data--Add Customer]
-ACCESS=customer_vendor_edit
-module=controller.pl
-action=CustomerVendor/add
-db=customer
-
-[Master Data--Add Vendor]
-ACCESS=customer_vendor_edit
-module=controller.pl
-action=CustomerVendor/add
-db=vendor
-
-[Master Data--Add Part]
-ACCESS=part_service_assembly_edit
-module=ic.pl
-action=add
-item=part
-
-[Master Data--Add Service]
-ACCESS=part_service_assembly_edit
-module=ic.pl
-action=add
-item=service
-
-[Master Data--Add Assembly]
-ACCESS=part_service_assembly_edit
-module=ic.pl
-action=add
-item=assembly
-
-[Master Data--Add Project]
-ACCESS=project_edit
-module=controller.pl
-action=Project/new
-
-[Master Data--Update Prices]
-ACCESS=part_service_assembly_edit
-module=ic.pl
-action=search_update_prices
-
-
-[Master Data--Reports]
-module=menu.pl
-action=acc_menu
-submenu=1
-
-[Master Data--Reports--Customers]
-ACCESS=customer_vendor_edit
-module=controller.pl
-action=CustomerVendor/search
-db=customer
-
-[Master Data--Reports--Vendors]
-ACCESS=customer_vendor_edit
-module=controller.pl
-action=CustomerVendor/search
-db=vendor
-
-[Master Data--Reports--Contacts]
-ACCESS=customer_vendor_edit
-module=controller.pl
-action=CustomerVendor/search_contact
-db=customer
-
-[Master Data--Reports--Parts]
-ACCESS=part_service_assembly_details
-module=ic.pl
-action=search
-searchitems=part
-
-[Master Data--Reports--Services]
-ACCESS=part_service_assembly_details
-module=ic.pl
-action=search
-searchitems=service
-
-[Master Data--Reports--Assemblies]
-ACCESS=part_service_assembly_details
-module=ic.pl
-action=search
-searchitems=assembly
-
-[Master Data--Reports--Projects]
-ACCESS=project_edit
-module=controller.pl
-action=Project/search
-
-[AR]
-
-[AR--Add Quotation]
-ACCESS=sales_quotation_edit
-module=oe.pl
-action=add
-type=sales_quotation
-
-[AR--Add Sales Order]
-ACCESS=sales_order_edit
-module=oe.pl
-action=add
-type=sales_order
-
-[AR--Add Delivery Order]
-ACCESS=sales_delivery_order_edit
-module=do.pl
-action=add
-type=sales_delivery_order
-
-[AR--Add Sales Invoice]
-ACCESS=invoice_edit
-module=is.pl
-action=add
-type=invoice
-
-[AR--Add Credit Note]
-ACCESS=invoice_edit
-module=is.pl
-action=add
-type=credit_note
-
-[AR--Add Dunning]
-ACCESS=dunning_edit
-module=dn.pl
-action=add
-
-[AR--Reports]
-module=menu.pl
-action=acc_menu
-submenu=1
-
-[AR--Reports--Quotations]
-ACCESS=sales_quotation_edit
-module=oe.pl
-action=search
-type=sales_quotation
-
-[AR--Reports--Sales Orders]
-ACCESS=sales_order_edit
-module=oe.pl
-action=search
-type=sales_order
-
-[AR--Reports--Delivery Orders]
-ACCESS=sales_delivery_order_edit
-module=do.pl
-action=search
-type=sales_delivery_order
-
-[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]
-ACCESS=request_quotation_edit
-module=oe.pl
-action=add
-type=request_quotation
-
-[AP--Add Purchase Order]
-ACCESS=purchase_order_edit
-module=oe.pl
-action=add
-type=purchase_order
-
-[AP--Add Delivery Note]
-ACCESS=purchase_delivery_order_edit
-module=do.pl
-action=add
-type=purchase_delivery_order
-
-[AP--Add Vendor Invoice]
-ACCESS=vendor_invoice_edit
-module=ir.pl
-action=add
-type=invoice
-
-
-[AP--Reports]
-module=menu.pl
-action=acc_menu
-submenu=1
-
-[AP--Reports--RFQs]
-ACCESS=request_quotation_edit
-module=oe.pl
-action=search
-type=request_quotation
-
-[AP--Reports--Purchase Orders]
-ACCESS=purchase_order_edit
-module=oe.pl
-action=search
-type=purchase_order
-
-[AP--Reports--Delivery Orders]
-ACCESS=purchase_delivery_order_edit
-module=do.pl
-action=search
-type=purchase_delivery_order
-
-[AP--Reports--Vendor Invoices & AP Transactions]
-ACCESS=vendor_invoice_edit
-module=ap.pl
-action=search
-nextsub=ap_transactions
-
-
-[Warehouse]
-
-[Warehouse--Stock]
-ACCESS=warehouse_management
-module=controller.pl
-action=Inventory/stock_in
-
-[Warehouse--Produce Assembly]
-ACCESS=warehouse_management
-module=wh.pl
-action=transfer_warehouse_selection
-trans_type=assembly
-
-[Warehouse--Transfer]
-ACCESS=warehouse_management
-module=wh.pl
-action=transfer_warehouse_selection
-trans_type=transfer
-
-[Warehouse--Removal]
-ACCESS=warehouse_management
-module=wh.pl
-action=transfer_warehouse_selection
-trans_type=removal
-
-[Warehouse--Reports]
-module=menu.pl
-action=acc_menu
-submenu=1
-
-[Warehouse--Reports--Warehouse content]
-ACCESS=warehouse_contents | warehouse_management
-module=wh.pl
-action=report
-
-[Warehouse--Reports--WHJournal]
-ACCESS=warehouse_management
-module=wh.pl
-action=journal
-
-
-[General Ledger]
-
-[General Ledger--Add Transaction]
-ACCESS=general_ledger
-module=gl.pl
-action=add
-
-[General Ledger--Add AR Transaction]
-ACCESS=general_ledger
-module=ar.pl
-action=add
-
-[General Ledger--Add AP Transaction]
-ACCESS=general_ledger
-module=ap.pl
-action=add
-
-[General Ledger--DATEV - Export Assistent]
-ACCESS=datev_export
-module=datev.pl
-action=export
-
-
-
-
-[General Ledger--Reports]
-module=menu.pl
-action=acc_menu
-submenu=1
-
-
-[General Ledger--Reports--AR Aging]
-ACCESS=general_ledger
-module=rp.pl
-action=report
-report=ar_aging
-
-
-[General Ledger--Reports--AP Aging]
-ACCESS=general_ledger
-module=rp.pl
-action=report
-report=ap_aging
-
-[General Ledger--Reports--Journal]
-ACCESS=general_ledger
-module=gl.pl
-action=search
-
-
-[Cash]
-ACCESS=cash
-
-[Cash--Receipt]
-module=cp.pl
-action=payment
-type=receipt
-vc=customer
-
-[Cash--Payment]
-module=cp.pl
-action=payment
-type=check
-vc=vendor
-
-[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
-submenu=1
-
-[Cash--Reports--Receipts]
-module=rp.pl
-action=report
-report=receipts
-
-[Cash--Reports--Payments]
-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]
-
-[Reports--Chart of Accounts]
-ACCESS=report
-module=ca.pl
-action=chart_of_accounts
-
-[Reports--Trial Balance]
-ACCESS=report
-module=rp.pl
-action=report
-report=trial_balance
-
-[Reports--Income Statement]
-ACCESS=report
-module=rp.pl
-action=report
-report=income_statement
-
-[Reports--BWA]
-ACCESS=report
-module=rp.pl
-action=report
-report=bwa
-
-[Reports--Balance Sheet]
-ACCESS=report
-module=rp.pl
-action=report
-report=balance_sheet
-
-[Reports--UStVa]
-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
-module=bp.pl
-action=search
-vc=customer
-type=invoice
-
-[Batch Printing--Sales Orders]
-ACCESS=sales_order_edit
-module=bp.pl
-action=search
-vc=customer
-type=sales_order
-
-[Batch Printing--Quotations]
-ACCESS=sales_quotation_edit
-module=bp.pl
-action=search
-vc=customer
-type=sales_quotation
-
-[Batch Printing--Packing Lists]
-ACCESS=invoice_edit | sales_order_edit
-module=bp.pl
-action=search
-vc=customer
-type=packing_list
-
-[Batch Printing--Purchase Orders]
-ACCESS=purchase_order_edit
-module=bp.pl
-action=search
-vc=vendor
-type=purchase_order
-
-[Batch Printing--RFQs]
-ACCESS=request_quotation_edit
-module=bp.pl
-action=search
-vc=vendor
-type=request_quotation
-
-[Batch Printing--Checks]
-ACCESS=cash
-module=bp.pl
-action=search
-vc=vendor
-type=check
-
-[Batch Printing--Receipts]
-ACCESS=cash
-module=bp.pl
-action=search
-vc=customer
-type=receipt
-
-
-[Productivity]
-ACCESS=productivity
-
-[Productivity--Show TODO list]
-module=todo.pl
-action=show_todo_list
-
-[Productivity--Add Follow-Up]
-module=fu.pl
-action=add
-
-[Productivity--Edit Access Rights]
-module=fu.pl
-action=edit_access_rights
-
-[Productivity--Reports]
-module=menu.pl
-action=acc_menu
-submenu=1
-
-[Productivity--Reports--Follow-Ups]
-module=fu.pl
-action=search
-
-
-[System]
-ACCESS=config
-
-[System--Client Configuration]
-ACCESS=admin
-module=controller.pl
-action=ClientConfig/edit
-
-[System--UStVa Einstellungen]
-module=ustva.pl
-action=config_step1
-
-[System--Edit Dunning]
-module=dn.pl
-action=edit_config
-
-[System--Chart of Accounts]
-module=menu.pl
-action=acc_menu
-submenu=1
-
-[System--Chart of Accounts--Add Account]
-module=am.pl
-action=add_account
-
-[System--Chart of Accounts--List Accounts]
-module=am.pl
-action=list_account
-
-[System--Buchungsgruppen]
-module=am.pl
-action=list_buchungsgruppe
-
-[System--Taxes]
-module=am.pl
-action=list_tax
-
-[System--Bank accounts]
-module=bankaccounts.pl
-action=bank_account_list
-
-[System--Groups]
-module=pe.pl
-action=search
-type=partsgroup
-
-[System--Pricegroups]
-module=pe.pl
-action=search
-type=pricegroup
-
-[System--Edit units]
-module=am.pl
-action=edit_units
-
-[System--Price Factors]
-module=am.pl
-action=list_price_factors
-
-[System--Departments]
-module=controller.pl
-action=Department/list
-
-[System--Types of Business]
-module=controller.pl
-action=Business/list
-
-[System--Leads]
-module=am.pl
-action=list_lead
-
-[System--Languages and translations]
-module=menu.pl
-action=acc_menu
-submenu=1
-
-[System--Languages and translations--Add Language]
-module=am.pl
-action=add_language
-
-[System--Languages and translations--List Languages]
-module=am.pl
-action=list_language
-
-[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--Payment Terms]
-module=controller.pl
-action=PaymentTerm/list
-
-[System--Manage Custom Variables]
-module=controller.pl
-action=CustomVariableConfig/list
-
-[System--Warehouses]
-module=am.pl
-action=list_warehouses
-
-
-[System--Import CSV]
-module=menu.pl
-action=acc_menu
-submenu=1
-
-[System--Import CSV--Customers and vendors]
-module=controller.pl
-action=CsvImport/new
-profile.type=customers_vendors
-
-[System--Import CSV--Contacts]
-module=controller.pl
-action=CsvImport/new
-profile.type=contacts
-
-[System--Import CSV--Shipto]
-module=controller.pl
-action=CsvImport/new
-profile.type=addresses
-
-[System--Import CSV--Parts]
-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
-submenu=1
-
-[System--Templates--HTML Templates]
-module=amtemplates.pl
-action=display_template_form
-type=templates
-format=html
-
-[System--Templates--LaTeX Templates]
-module=amtemplates.pl
-action=display_template_form
-type=templates
-format=tex
-
-[System--Templates--Stylesheet]
-module=amtemplates.pl
-action=display_template_form
-type=stylesheet
-
-[System--General Ledger Corrections]
-module=acctranscorrections.pl
-action=analyze_filter
-
-[System--Background jobs and task server]
-ACCESS=admin
-module=menu.pl
-action=acc_menu
-submenu=1
-
-[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
-action=audit_control
-
-[System--History Search Engine]
-module=am.pl
-action=show_history_search
-
-[System--Employees]
-ACCESS=admin
-module=controller.pl
-action=Employee/list
-
-[Program]
-
-[Program--User Preferences]
-module=am.pl
-action=config
-
-[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=controller.pl
-action=LoginScreen/logout

diff --git a/menus/admin.ini b/menus/admin.ini
new file mode 100644 (file)
index 0000000..3da5752
--- /dev/null
+++ b/menus/admin.ini
@@ -0,0 +1,59 @@
+[Users, Clients and User Groups]
+
+[Users, Clients and User Groups--List Users, Clients and User Groups]
+module=controller.pl
+action=Admin/show
+
+[Users, Clients and User Groups--Add User]
+module=controller.pl
+action=Admin/new_user
+
+[Users, Clients and User Groups--Add Client]
+module=controller.pl
+action=Admin/new_client
+
+[Users, Clients and User Groups--Add User Group]
+module=controller.pl
+action=Admin/new_group
+
+[Database Management]
+
+[Database Management--Create Dataset]
+module=controller.pl
+action=Admin/create_dataset_login
+
+[Database Management--Delete Dataset]
+module=controller.pl
+action=Admin/delete_dataset_login
+
+[Printer Management]
+
+[Printer Management--List Printers]
+module=controller.pl
+action=Admin/list_printers
+
+[Printer Management--Add Printer]
+module=controller.pl
+action=Admin/new_printer
+
+[System]
+
+[System--Lock and unlock installation]
+module=controller.pl
+action=Admin/show_lock
+
+[System--Documentation (in German)]
+href=doc/kivitendo-Dokumentation.pdf
+target=_blank
+
+[System--kivitendo website (external)]
+href=http://www.kivitendo.de/
+target=_blank
+
+[System--To user login]
+module=controller.pl
+action=LoginScreen/user_login
+
+[System--Logout]
+module=controller.pl
+action=Admin/logout

diff --git a/menus/erp.ini b/menus/erp.ini
new file mode 100644 (file)
index 0000000..b0bff61
--- /dev/null
+++ b/menus/erp.ini
@@ -0,0 +1,723 @@
+[Master Data]
+
+[Master Data--Add Customer]
+ACCESS=customer_vendor_edit
+module=controller.pl
+action=CustomerVendor/add
+db=customer
+
+[Master Data--Add Vendor]
+ACCESS=customer_vendor_edit
+module=controller.pl
+action=CustomerVendor/add
+db=vendor
+
+[Master Data--Add Part]
+ACCESS=part_service_assembly_edit
+module=ic.pl
+action=add
+item=part
+
+[Master Data--Add Service]
+ACCESS=part_service_assembly_edit
+module=ic.pl
+action=add
+item=service
+
+[Master Data--Add Assembly]
+ACCESS=part_service_assembly_edit
+module=ic.pl
+action=add
+item=assembly
+
+[Master Data--Add Project]
+ACCESS=project_edit
+module=controller.pl
+action=Project/new
+
+[Master Data--Update Prices]
+ACCESS=part_service_assembly_edit
+module=ic.pl
+action=search_update_prices
+
+
+[Master Data--Reports]
+module=menu.pl
+action=acc_menu
+submenu=1
+
+[Master Data--Reports--Customers]
+ACCESS=customer_vendor_edit
+module=controller.pl
+action=CustomerVendor/search
+db=customer
+
+[Master Data--Reports--Vendors]
+ACCESS=customer_vendor_edit
+module=controller.pl
+action=CustomerVendor/search
+db=vendor
+
+[Master Data--Reports--Contacts]
+ACCESS=customer_vendor_edit
+module=controller.pl
+action=CustomerVendor/search_contact
+db=customer
+
+[Master Data--Reports--Parts]
+ACCESS=part_service_assembly_details
+module=ic.pl
+action=search
+searchitems=part
+
+[Master Data--Reports--Services]
+ACCESS=part_service_assembly_details
+module=ic.pl
+action=search
+searchitems=service
+
+[Master Data--Reports--Assemblies]
+ACCESS=part_service_assembly_details
+module=ic.pl
+action=search
+searchitems=assembly
+
+[Master Data--Reports--Projects]
+ACCESS=project_edit
+module=controller.pl
+action=Project/search
+
+[AR]
+
+[AR--Add Quotation]
+ACCESS=sales_quotation_edit
+module=oe.pl
+action=add
+type=sales_quotation
+
+[AR--Add Sales Order]
+ACCESS=sales_order_edit
+module=oe.pl
+action=add
+type=sales_order
+
+[AR--Add Delivery Order]
+ACCESS=sales_delivery_order_edit
+module=do.pl
+action=add
+type=sales_delivery_order
+
+[AR--Add Sales Invoice]
+ACCESS=invoice_edit
+module=is.pl
+action=add
+type=invoice
+
+[AR--Add Credit Note]
+ACCESS=invoice_edit
+module=is.pl
+action=add
+type=credit_note
+
+[AR--Add Dunning]
+ACCESS=dunning_edit
+module=dn.pl
+action=add
+
+[AR--Reports]
+module=menu.pl
+action=acc_menu
+submenu=1
+
+[AR--Reports--Quotations]
+ACCESS=sales_quotation_edit
+module=oe.pl
+action=search
+type=sales_quotation
+
+[AR--Reports--Sales Orders]
+ACCESS=sales_order_edit
+module=oe.pl
+action=search
+type=sales_order
+
+[AR--Reports--Delivery Orders]
+ACCESS=sales_delivery_order_edit
+module=do.pl
+action=search
+type=sales_delivery_order
+
+[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]
+ACCESS=request_quotation_edit
+module=oe.pl
+action=add
+type=request_quotation
+
+[AP--Add Purchase Order]
+ACCESS=purchase_order_edit
+module=oe.pl
+action=add
+type=purchase_order
+
+[AP--Add Delivery Note]
+ACCESS=purchase_delivery_order_edit
+module=do.pl
+action=add
+type=purchase_delivery_order
+
+[AP--Add Vendor Invoice]
+ACCESS=vendor_invoice_edit
+module=ir.pl
+action=add
+type=invoice
+
+
+[AP--Reports]
+module=menu.pl
+action=acc_menu
+submenu=1
+
+[AP--Reports--RFQs]
+ACCESS=request_quotation_edit
+module=oe.pl
+action=search
+type=request_quotation
+
+[AP--Reports--Purchase Orders]
+ACCESS=purchase_order_edit
+module=oe.pl
+action=search
+type=purchase_order
+
+[AP--Reports--Delivery Orders]
+ACCESS=purchase_delivery_order_edit
+module=do.pl
+action=search
+type=purchase_delivery_order
+
+[AP--Reports--Vendor Invoices & AP Transactions]
+ACCESS=vendor_invoice_edit
+module=ap.pl
+action=search
+nextsub=ap_transactions
+
+
+[Warehouse]
+
+[Warehouse--Stock]
+ACCESS=warehouse_management
+module=controller.pl
+action=Inventory/stock_in
+
+[Warehouse--Produce Assembly]
+ACCESS=warehouse_management
+module=wh.pl
+action=transfer_warehouse_selection
+trans_type=assembly
+
+[Warehouse--Transfer]
+ACCESS=warehouse_management
+module=wh.pl
+action=transfer_warehouse_selection
+trans_type=transfer
+
+[Warehouse--Removal]
+ACCESS=warehouse_management
+module=wh.pl
+action=transfer_warehouse_selection
+trans_type=removal
+
+[Warehouse--Reports]
+module=menu.pl
+action=acc_menu
+submenu=1
+
+[Warehouse--Reports--Warehouse content]
+ACCESS=warehouse_contents | warehouse_management
+module=wh.pl
+action=report
+
+[Warehouse--Reports--WHJournal]
+ACCESS=warehouse_management
+module=wh.pl
+action=journal
+
+
+[General Ledger]
+
+[General Ledger--Add Transaction]
+ACCESS=general_ledger
+module=gl.pl
+action=add
+
+[General Ledger--Add AR Transaction]
+ACCESS=general_ledger
+module=ar.pl
+action=add
+
+[General Ledger--Add AP Transaction]
+ACCESS=general_ledger
+module=ap.pl
+action=add
+
+[General Ledger--DATEV - Export Assistent]
+ACCESS=datev_export
+module=datev.pl
+action=export
+
+
+
+
+[General Ledger--Reports]
+module=menu.pl
+action=acc_menu
+submenu=1
+
+
+[General Ledger--Reports--AR Aging]
+ACCESS=general_ledger
+module=rp.pl
+action=report
+report=ar_aging
+
+
+[General Ledger--Reports--AP Aging]
+ACCESS=general_ledger
+module=rp.pl
+action=report
+report=ap_aging
+
+[General Ledger--Reports--Journal]
+ACCESS=general_ledger
+module=gl.pl
+action=search
+
+
+[Cash]
+ACCESS=cash
+
+[Cash--Receipt]
+module=cp.pl
+action=payment
+type=receipt
+vc=customer
+
+[Cash--Payment]
+module=cp.pl
+action=payment
+type=check
+vc=vendor
+
+[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
+submenu=1
+
+[Cash--Reports--Receipts]
+module=rp.pl
+action=report
+report=receipts
+
+[Cash--Reports--Payments]
+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]
+
+[Reports--Chart of Accounts]
+ACCESS=report
+module=ca.pl
+action=chart_of_accounts
+
+[Reports--Trial Balance]
+ACCESS=report
+module=rp.pl
+action=report
+report=trial_balance
+
+[Reports--Income Statement]
+ACCESS=report
+module=rp.pl
+action=report
+report=income_statement
+
+[Reports--BWA]
+ACCESS=report
+module=rp.pl
+action=report
+report=bwa
+
+[Reports--Balance Sheet]
+ACCESS=report
+module=rp.pl
+action=report
+report=balance_sheet
+
+[Reports--UStVa]
+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
+module=bp.pl
+action=search
+vc=customer
+type=invoice
+
+[Batch Printing--Sales Orders]
+ACCESS=sales_order_edit
+module=bp.pl
+action=search
+vc=customer
+type=sales_order
+
+[Batch Printing--Quotations]
+ACCESS=sales_quotation_edit
+module=bp.pl
+action=search
+vc=customer
+type=sales_quotation
+
+[Batch Printing--Packing Lists]
+ACCESS=invoice_edit | sales_order_edit
+module=bp.pl
+action=search
+vc=customer
+type=packing_list
+
+[Batch Printing--Purchase Orders]
+ACCESS=purchase_order_edit
+module=bp.pl
+action=search
+vc=vendor
+type=purchase_order
+
+[Batch Printing--RFQs]
+ACCESS=request_quotation_edit
+module=bp.pl
+action=search
+vc=vendor
+type=request_quotation
+
+[Batch Printing--Checks]
+ACCESS=cash
+module=bp.pl
+action=search
+vc=vendor
+type=check
+
+[Batch Printing--Receipts]
+ACCESS=cash
+module=bp.pl
+action=search
+vc=customer
+type=receipt
+
+
+[Productivity]
+ACCESS=productivity
+
+[Productivity--Show TODO list]
+module=todo.pl
+action=show_todo_list
+
+[Productivity--Add Follow-Up]
+module=fu.pl
+action=add
+
+[Productivity--Edit Access Rights]
+module=fu.pl
+action=edit_access_rights
+
+[Productivity--Reports]
+module=menu.pl
+action=acc_menu
+submenu=1
+
+[Productivity--Reports--Follow-Ups]
+module=fu.pl
+action=search
+
+
+[System]
+ACCESS=config
+
+[System--Client Configuration]
+ACCESS=admin
+module=controller.pl
+action=ClientConfig/edit
+
+[System--UStVa Einstellungen]
+module=ustva.pl
+action=config_step1
+
+[System--Edit Dunning]
+module=dn.pl
+action=edit_config
+
+[System--Chart of Accounts]
+module=menu.pl
+action=acc_menu
+submenu=1
+
+[System--Chart of Accounts--Add Account]
+module=am.pl
+action=add_account
+
+[System--Chart of Accounts--List Accounts]
+module=am.pl
+action=list_account
+
+[System--Buchungsgruppen]
+module=am.pl
+action=list_buchungsgruppe
+
+[System--Taxes]
+module=am.pl
+action=list_tax
+
+[System--Bank accounts]
+module=bankaccounts.pl
+action=bank_account_list
+
+[System--Groups]
+module=pe.pl
+action=search
+type=partsgroup
+
+[System--Pricegroups]
+module=pe.pl
+action=search
+type=pricegroup
+
+[System--Edit units]
+module=am.pl
+action=edit_units
+
+[System--Price Factors]
+module=am.pl
+action=list_price_factors
+
+[System--Departments]
+module=controller.pl
+action=Department/list
+
+[System--Types of Business]
+module=controller.pl
+action=Business/list
+
+[System--Leads]
+module=am.pl
+action=list_lead
+
+[System--Languages and translations]
+module=menu.pl
+action=acc_menu
+submenu=1
+
+[System--Languages and translations--Add Language]
+module=am.pl
+action=add_language
+
+[System--Languages and translations--List Languages]
+module=am.pl
+action=list_language
+
+[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--Payment Terms]
+module=controller.pl
+action=PaymentTerm/list
+
+[System--Manage Custom Variables]
+module=controller.pl
+action=CustomVariableConfig/list
+
+[System--Warehouses]
+module=am.pl
+action=list_warehouses
+
+
+[System--Import CSV]
+module=menu.pl
+action=acc_menu
+submenu=1
+
+[System--Import CSV--Customers and vendors]
+module=controller.pl
+action=CsvImport/new
+profile.type=customers_vendors
+
+[System--Import CSV--Contacts]
+module=controller.pl
+action=CsvImport/new
+profile.type=contacts
+
+[System--Import CSV--Shipto]
+module=controller.pl
+action=CsvImport/new
+profile.type=addresses
+
+[System--Import CSV--Parts]
+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
+submenu=1
+
+[System--Templates--HTML Templates]
+module=amtemplates.pl
+action=display_template_form
+type=templates
+format=html
+
+[System--Templates--LaTeX Templates]
+module=amtemplates.pl
+action=display_template_form
+type=templates
+format=tex
+
+[System--Templates--Stylesheet]
+module=amtemplates.pl
+action=display_template_form
+type=stylesheet
+
+[System--General Ledger Corrections]
+module=acctranscorrections.pl
+action=analyze_filter
+
+[System--Background jobs and task server]
+ACCESS=admin
+module=menu.pl
+action=acc_menu
+submenu=1
+
+[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
+action=audit_control
+
+[System--History Search Engine]
+module=am.pl
+action=show_history_search
+
+[System--Employees]
+ACCESS=admin
+module=controller.pl
+action=Employee/list
+
+[Program]
+
+[Program--User Preferences]
+module=am.pl
+action=config
+
+[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=controller.pl
+action=LoginScreen/logout

diff --git a/scripts/locales.pl b/scripts/locales.pl
index e63b1b7..ed08548 100755 (executable)
--- a/scripts/locales.pl
+++ b/scripts/locales.pl
@@ -34,7 +34,7 @@ my $basedir      = "../..";
 my $locales_dir  = ".";
 my $bindir       = "$basedir/bin/mozilla";
 my @progdirs     = ( "$basedir/SL" );
-my @menufiles    = ("${basedir}/menu.ini", "${basedir}/admin-menu.ini");
+my @menufiles    = <${basedir}/menus/*.ini>;
 my @javascript_dirs = ($basedir .'/js', $basedir .'/templates/webpages');
 my $javascript_output_dir = $basedir .'/js';
 my $submitsearch = qr/type\s*=\s*[\"\']?submit/i;