From: Martin Helmling martin.helmling@octosoft.eu <martin.helmling@octosoft.eu>
Date: Thu, 22 Dec 2016 07:22:33 +0000 (+0100)
Subject: Alle neuen Features im Master-Branch in das Basis User-Menu
X-Git-Tag: release-3.5.4~1793
X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=9dd27bda270b521cb717501eeb033517267b5dec;p=kivitendo-erp.git

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 9c4f97789..b8205b70c 100644
--- a/menus/user/00-erp.yaml
+++ b/menus/user/00-erp.yaml
@@ -574,6 +574,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 +630,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
diff --git a/menus/user/11-yearend-transactions.yaml b/menus/user/11-yearend-transactions.yaml
deleted file mode 100644
index 6906cdc89..000000000
--- 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
index 06b3c4c70..000000000
--- 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