X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=menus%2Fuser%2F00-erp.yaml;h=3707233770dce997153e1bc4f0f70f2c954ffc12;hb=11d25b53fa311e7d86d499b0350e7aa9a1262859;hp=9c4f9778989dffda2da14d69c85aff7046b856cc;hpb=9c785acd332352877abd90cd0c79a2fa1ef214a1;p=kivitendo-erp.git

diff --git a/menus/user/00-erp.yaml b/menus/user/00-erp.yaml
index 9c4f97789..370723377 100644
--- a/menus/user/00-erp.yaml
+++ b/menus/user/00-erp.yaml
@@ -74,7 +74,7 @@
   name: Add Assortment
   icon: assortment_add
   order: 550
-  access: part_service_assembly_edit
+  access: part_service_assembly_edit & client/feature_experimental
   params:
     action: Part/add_assortment
 - parent: master_data
@@ -99,9 +99,8 @@
   icon: prices_update
   order: 800
   access: part_service_assembly_edit
-  module: ic.pl
   params:
-    action: search_update_prices
+    action: PartsPriceUpdate/search_update_prices
 - parent: master_data
   id: master_data_price_rules
   name: Price Rules
@@ -142,45 +141,15 @@
     action: CustomerVendor/search_contact
     db: customer
 - parent: master_data_reports
-  id: master_data_reports_parts
-  name: Parts
+  id: master_data_reports_articles
+  name: Articles
   icon: part_report
-  order: 400
-  access: part_service_assembly_details
-  module: ic.pl
-  params:
-    action: search
-    searchitems: part
-- parent: master_data_reports
-  id: master_data_reports_services
-  name: Services
-  icon: service_report
   order: 500
   access: part_service_assembly_details
   module: ic.pl
   params:
     action: search
-    searchitems: service
-- parent: master_data_reports
-  id: master_data_reports_assemblies
-  name: Assemblies
-  icon: assembly_report
-  order: 600
-  access: part_service_assembly_details
-  module: ic.pl
-  params:
-    action: search
-    searchitems: assembly
-- parent: master_data_reports
-  id: master_data_reports_assortments
-  name: Assortments
-  icon: assortment_report
-  order: 650
-  access: part_service_assortment_details
-  module: ic.pl
-  params:
-    action: search
-    searchitems: assortment
+    searchitems: article
 - parent: master_data_reports
   id: master_data_reports_projects
   name: Projects
@@ -398,6 +367,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
@@ -490,7 +480,6 @@
   module: ap.pl
   params:
     action: search
-    nextsub: ap_transactions
 - parent: ap_reports
   id: ap_reports_delivery_plan
   name: Delivery Plan
@@ -574,6 +563,14 @@
   module: wh.pl
   params:
     action: journal
+- parent: warehouse_reports
+  id: warehouse_reports_whusage
+  name: WHUsage
+  icon: warehouse_usage
+  order: 300
+  access: warehouse_contents | warehouse_management
+  params:
+    action: Inventory/stock_usage
 - id: general_ledger
   name: General Ledger
   icon: gl
@@ -622,6 +619,14 @@
   access: general_ledger
   params:
     action: GoBD/filter
+- parent: general_ledger
+  id: general_ledger_cbob_transactions
+  name: CB/OB Transactions
+  icon: cbob
+  order: 470
+  access: general_ledger
+  params:
+    action: YearEndTransactions/filter
 - parent: general_ledger
   id: general_ledger_reports
   name: Reports
@@ -701,10 +706,20 @@
     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
+  name: SWIFT MT940 format
+  order: 200
   params:
     action: BankImport/upload_mt940
 - parent: cash
@@ -721,7 +736,6 @@
   access: bank_transaction
   params:
     action: Reconciliation/search
-    next_sub: Reconciliation/reconciliation
 - parent: cash
   id: cash_reconciliation
   name: Reconciliation
@@ -1008,6 +1022,7 @@
   name: Email journal
   order: 200
   module: controller.pl
+  icon: mail_journal
   params:
     action: EmailJournal/list
 - id: system
@@ -1079,23 +1094,34 @@
   name: Bank accounts
   order: 800
   params:
-    action: BankAccount/list
+    action: SimpleSystemSetting/list
+    type: bank_account
 - parent: system
   id: system_partsgroups
   name: Partsgroups
   order: 900
   params:
-    action: PartsGroup/list
+    action: SimpleSystemSetting/list
+    type: parts_group
+- parent: system
+  id: system_part_classification
+  name: Parts Classification
+  icon: partsclassific
+  order: 1100
+  params:
+    action: SimpleSystemSetting/list
+    type: part_classification
 - parent: system
   id: system_pricegroups
   name: Pricegroups
-  order: 1000
+  order: 1120
   params:
-    action: Pricegroup/list
+    action: SimpleSystemSetting/list
+    type: pricegroup
 - parent: system
   id: system_edit_units
   name: Edit units
-  order: 1100
+  order: 1140
   module: am.pl
   params:
     action: edit_units
@@ -1103,40 +1129,37 @@
   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_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
-- parent: system
-  id: system_leads
-  name: Leads
-  order: 1500
-  module: am.pl
-  params:
-    action: list_lead
+    action: SimpleSystemSetting/list
+    type: business
 - 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
@@ -1146,55 +1169,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
@@ -1209,6 +1231,13 @@
   module: generictranslations.pl
   params:
     action: edit_sepa_strings
+- 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
@@ -1234,6 +1263,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
@@ -1294,13 +1330,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
@@ -1324,14 +1353,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