X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=menus%2Fuser%2F00-erp.yaml;h=f223a1d40429a36ca4df53450c162474e4d7e5bc;hb=a2179ea178c2e8cdcef9fd0cab517048778383de;hp=d1f54c21ff40e64c7c6255d17bd68648f6c9feeb;hpb=9c19433144efc5b50d90a969aa9ac6ea65b2dbbf;p=kivitendo-erp.git

diff --git a/menus/user/00-erp.yaml b/menus/user/00-erp.yaml
index d1f54c21f..f223a1d40 100644
--- a/menus/user/00-erp.yaml
+++ b/menus/user/00-erp.yaml
@@ -11,7 +11,9 @@
 #          ( ) & | are supported.  if binary operator is missing the last
 #          operator in same scope is repeated, or "|" if none used in scope
 #          yet. client config entries can be used as rights by prefixing them
-#          with "client/". If missing, access will be granted.
+#          with "client/".
+#          ! is supported to negate the subsequent expression.
+#          If missing, access will be granted.
 #
 #          Example:
 #            client/feature_default_enabled | ( feature & system )
@@ -74,7 +76,7 @@
   name: Add Assortment
   icon: assortment_add
   order: 550
-  access: part_service_assembly_edit
+  access: part_service_assembly_edit & client/feature_experimental_assortment
   params:
     action: Part/add_assortment
 - parent: master_data
@@ -306,7 +308,6 @@
   name: Invoices, Credit Notes & AR Transactions
   icon: invoices_report
   order: 500
-  access: invoice_edit
   module: ar.pl
   params:
     action: search
@@ -367,6 +368,27 @@
   params:
     action: Letter/list
     is_sales: 1
+- id: webshop
+  name: Webshop
+  order: 250
+- parent: webshop
+  id: webshop_import
+  name: Webshop Import
+  access: shop_order
+  params:
+    action: ShopOrder/list
+    filter.transferred:eq_ignore_empty: 0
+    filter.obsolete: 0
+    db: shop_orders
+    sort_by: shop_ordernumber
+- parent: webshop
+  id: webshop_articles
+  name: Webshop articles
+  access: shop_part_edit
+  params:
+    action: ShopPart/list_articles
+    db: shop_parts
+    sort_by: part.onhand
 - id: ap
   name: AP
   icon: ap
@@ -455,11 +477,9 @@
   id: ap_reports_vendor_invoices_ap_transactions
   name: Vendor Invoices & AP Transactions
   order: 400
-  access: vendor_invoice_edit
   module: ap.pl
   params:
     action: search
-    nextsub: ap_transactions
 - parent: ap_reports
   id: ap_reports_delivery_plan
   name: Delivery Plan
@@ -523,6 +543,13 @@
   params:
     action: transfer_warehouse_selection
     trans_type: removal
+- parent: warehouse
+  id: warehouse_stocktaking
+  name: Stocktaking
+  order: 450
+  access: warehouse_management
+  params:
+    action: Inventory/stocktaking
 - parent: warehouse
   id: warehouse_reports
   name: Reports
@@ -551,6 +578,13 @@
   access: warehouse_contents | warehouse_management
   params:
     action: Inventory/stock_usage
+- parent: warehouse_reports
+  id: warehouse_stocktaking_journal
+  name: Stocktaking Journal
+  order: 400
+  access: warehouse_contents | warehouse_management
+  params:
+    action: Inventory/stocktaking_journal
 - id: general_ledger
   name: General Ledger
   icon: gl
@@ -600,13 +634,21 @@
   params:
     action: GoBD/filter
 - parent: general_ledger
-  id: general_ledger_cbob_transactions
-  name: CB/OB Transactions
+  id: year_end_closing
+  name: Year-end closing
   icon: cbob
   order: 470
   access: general_ledger
   params:
-    action: YearEndTransactions/filter
+    action: YearEndTransactions/form
+- parent: general_ledger
+  id: zugferd_import
+  name: ZugFeRD Import
+  icon: cbob
+  order: 485
+  access: ap_transactions
+  params:
+    action: ZUGFeRD/upload_zugferd
 - parent: general_ledger
   id: general_ledger_reports
   name: Reports
@@ -686,10 +728,21 @@
     action: bank_transfer_add
     vc: vendor
 - parent: cash
-  id: cash_bank_import
+  id: cash_bank_import_menu
   name: Bank Import
   order: 500
   access: bank_transaction
+- parent: cash_bank_import_menu
+  id: cash_bank_import_csv
+  name: Custom CSV format
+  order: 100
+  params:
+    action: CsvImport/new
+    profile.type: bank_transactions
+- parent: cash_bank_import_menu
+  id: cash_bank_import_mt940
+  name: SWIFT MT940 format
+  order: 200
   params:
     action: BankImport/upload_mt940
 - parent: cash
@@ -706,7 +759,6 @@
   access: bank_transaction
   params:
     action: Reconciliation/search
-    next_sub: Reconciliation/reconciliation
 - parent: cash
   id: cash_reconciliation
   name: Reconciliation
@@ -1041,6 +1093,12 @@
   module: am.pl
   params:
     action: list_account
+- parent: system_chart_of_accounts
+  id: system_chart_of_accounts_report_configuration_overview
+  name: Report configuration overview
+  order: 300
+  params:
+    action: Chart/show_report_configuration_overview
 - parent: system
   id: system_buchungsgruppen
   name: Booking groups
@@ -1080,7 +1138,8 @@
   icon: partsclassific
   order: 1100
   params:
-    action: PartClassification/list
+    action: SimpleSystemSetting/list
+    type: part_classification
 - parent: system
   id: system_pricegroups
   name: Pricegroups
@@ -1099,33 +1158,58 @@
   id: system_price_factors
   name: Price Factors
   order: 1200
-  module: am.pl
   params:
-    action: list_price_factors
+    action: SimpleSystemSetting/list
+    type: price_factor
+- parent: system
+  id: system_greetings
+  name: Greetings
+  order: 1250
+  params:
+    action: SimpleSystemSetting/list
+    type: greeting
 - parent: system
   id: system_departments
   name: Departments
   order: 1300
   params:
-    action: Department/list
+    action: SimpleSystemSetting/list
+    type: department
 - parent: system
   id: system_types_of_business
   name: Types of Business
   order: 1400
   params:
-    action: Business/list
+    action: SimpleSystemSetting/list
+    type: business
+- parent: system
+  id: system_contact_titles
+  name: Contact Titles
+  order: 1420
+  params:
+    action: SimpleSystemSetting/list
+    type: contact_title
+- parent: system
+  id: system_contact_departments
+  name: Contact Departments
+  order: 1430
+  params:
+    action: SimpleSystemSetting/list
+    type: contact_department
 - parent: system
   id: system_project_types
   name: Project Types
   order: 1600
   params:
-    action: ProjectType/list
+    action: SimpleSystemSetting/list
+    type: project_type
 - parent: system
   id: system_project_status
   name: Project Status
   order: 1700
   params:
-    action: ProjectStatus/list
+    action: SimpleSystemSetting/list
+    type: project_status
 - parent: system
   id: system_requirement_specs
   name: Requirement specs
@@ -1135,55 +1219,54 @@
   name: Pre-defined Texts
   order: 100
   params:
-    action: RequirementSpecPredefinedText/list
+    action: SimpleSystemSetting/list
+    type: requirement_spec_predefined_text
 - parent: system_requirement_specs
   id: system_requirement_specs_requirement_spec_types
   name: Requirement Spec Types
   order: 200
   params:
-    action: RequirementSpecType/list
+    action: SimpleSystemSetting/list
+    type: requirement_spec_type
 - parent: system_requirement_specs
   id: system_requirement_specs_requirement_spec_statuses
   name: Requirement Spec Statuses
   order: 300
   params:
-    action: RequirementSpecStatus/list
+    action: SimpleSystemSetting/list
+    type: requirement_spec_status
 - parent: system_requirement_specs
   id: system_requirement_specs_complexities
   name: Complexities
   order: 400
   params:
-    action: RequirementSpecComplexity/list
+    action: SimpleSystemSetting/list
+    type: requirement_spec_complexity
 - parent: system_requirement_specs
   id: system_requirement_specs_risks
   name: Risks
   order: 500
   params:
-    action: RequirementSpecRisk/list
+    action: SimpleSystemSetting/list
+    type: requirement_spec_risk
 - parent: system_requirement_specs
   id: system_requirement_specs_acceptance_statuses
   name: Acceptance Statuses
   order: 600
   params:
-    action: RequirementSpecAcceptanceStatus/list
+    action: SimpleSystemSetting/list
+    type: requirement_spec_acceptance_status
 - parent: system
   id: system_languages_and_translations
   name: Languages and translations
   order: 1900
 - parent: system_languages_and_translations
   id: system_languages_and_translations_add_language
-  name: Add Language
+  name: Languages
   order: 100
-  module: am.pl
-  params:
-    action: add_language
-- parent: system_languages_and_translations
-  id: system_languages_and_translations_list_languages
-  name: List Languages
-  order: 200
-  module: am.pl
   params:
-    action: list_language
+    action: SimpleSystemSetting/list
+    type: language
 - parent: system_languages_and_translations
   id: system_languages_and_translations_greetings
   name: Greetings
@@ -1198,6 +1281,20 @@
   module: generictranslations.pl
   params:
     action: edit_sepa_strings
+- parent: system_languages_and_translations
+  id: system_languages_and_translations_zugferd_notes
+  name: ZUGFeRD notes for each invoice
+  order: 450
+  module: generictranslations.pl
+  params:
+    action: edit_zugferd_notes
+- parent: system_languages_and_translations
+  id: system_languages_and_translations_email_strings
+  name: Preset email strings
+  order: 500
+  module: generictranslations.pl
+  params:
+    action: edit_email_strings
 - parent: system
   id: system_payment_terms
   name: Payment Terms
@@ -1223,6 +1320,13 @@
   module: am.pl
   params:
     action: list_warehouses
+- parent: system
+  id: system_shops
+  name: Web shops
+  order: 2350
+  access: edit_shop_config
+  params:
+    action: Shop/list
 - parent: system
   id: system_import_csv
   name: Import CSV
@@ -1276,6 +1380,13 @@
   params:
     action: CsvImport/new
     profile.type: orders
+- parent: system_import_csv
+  id: system_import_csv_delivery_orders
+  name: Delivery Orders
+  order: 720
+  params:
+    action: CsvImport/new
+    profile.type: delivery_orders
 - parent: system_import_csv
   id: system_import_csv_ar_transactions
   name: AR Transactions
@@ -1283,13 +1394,6 @@
   params:
     action: CsvImport/new
     profile.type: ar_transactions
-- parent: system_import_csv
-  id: cash_bank_import_csv
-  name: Bank transactions
-  order: 900
-  params:
-    action: CsvImport/new
-    profile.type: bank_transactions
 - parent: system
   id: system_templates
   name: Templates
@@ -1313,14 +1417,6 @@
     action: display_template_form
     format: tex
     type: templates
-- parent: system_templates
-  id: system_templates_stylesheet
-  name: Stylesheet
-  order: 300
-  module: amtemplates.pl
-  params:
-    action: display_template_form
-    type: stylesheet
 - parent: system
   id: system_general_ledger_corrections
   name: General Ledger Corrections