Alle neuen Features im Master-Branch in das Basis User-Menu

diff --git a/menus/user/00-erp.yaml b/menus/user/00-erp.yaml
index 9c4f9778989dffda2da14d69c85aff7046b856cc..b8205b70c9c9249c2a22e1a87e3c930c7cbb6b11 100644 (file)
--- a/menus/user/00-erp.yaml
+++ b/menus/user/00-erp.yaml
@@ -574,6 +574,14 @@
   module: wh.pl
   params:
     action: journal
   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
 - id: general_ledger
   name: General Ledger
   icon: gl


@@ -622,6 +630,14 @@
   access: general_ledger
   params:
     action: GoBD/filter
   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
 - parent: general_ledger
   id: general_ledger_reports
   name: Reports

diff --git a/menus/user/11-yearend-transactions.yaml b/menus/user/11-yearend-transactions.yaml
deleted file mode 100644 (file)
index 6906cdc..0000000
--- a/menus/user/11-yearend-transactions.yaml
+++ /dev/null
@@ -1,16 +0,0 @@
-# This is the main menu config file for user space menu entries.
-#
-# opendynamic features
-#
----
-#
-# SB/EB-Buchungen
-#
-- parent: general_ledger
-  id: general_ledger_cbob_transactions
-  name: CB/OB Transactions
-  icon: cbob
-  order: 470
-  access: general_ledger
-  params:
-    action: YearEndTransactions/filter

diff --git a/menus/user/12-warehouse-usage.yaml b/menus/user/12-warehouse-usage.yaml
deleted file mode 100644 (file)
index 06b3c4c..0000000
--- a/menus/user/12-warehouse-usage.yaml
+++ /dev/null
@@ -1,15 +0,0 @@
-#
-# opendynamic feature
-#
----
-#
-# Warenverbrauchsbericht
-#
-- parent: warehouse_reports
-  id: warehouse_reports_whusage
-  name: WHUsage
-  icon: warehouse_usage
-  order: 300
-  access: warehouse_contents | warehouse_management
-  params:
-    action: Inventory/stock_usage