From: Peter Schulgin Date: Thu, 24 Nov 2016 13:26:14 +0000 (+0100) Subject: Revert "Alle neuen Features in das basis User-Menu" X-Git-Tag: release-3.5.4~1856 X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=697b5abe782e69e01ed62be2d12a8ae0159dc5ed;p=kivitendo-erp.git Revert "Alle neuen Features in das basis User-Menu" This reverts commit 1b803cbdc5f0945a1a942af25e85693a4d15346c. --- diff --git a/doc/UPGRADE b/doc/UPGRADE index 0f79ccbe6..b92165ded 100644 --- a/doc/UPGRADE +++ b/doc/UPGRADE @@ -28,9 +28,6 @@ Upgrade auf v3.4.x Unstable neue Spalte part_type vom ENUM-Typ, der auf die Werte 'part', 'service', 'assembly' und 'assortment' beschränkt ist. -* Die Tabelle hat eine neue Spalte classification_id die zu der neuen - Artikel-Klassifizierung Tabelle "parts_classifications" weist. - * In der Tabelle parts wurde die Spalten inventory_accno_id, expense_accno_id und income_accno_id entfernt. Deren Funktionalität wurde schon lange durch Buchungsgruppen ersetzt und für die Erkennung des Artikeltyps gibt es nun die diff --git a/menus/user/00-erp.yaml b/menus/user/00-erp.yaml index b48ac3e77..8d8741fca 100644 --- a/menus/user/00-erp.yaml +++ b/menus/user/00-erp.yaml @@ -142,15 +142,35 @@ action: CustomerVendor/search_contact db: customer - parent: master_data_reports - id: master_data_reports_articles - name: Articles + id: master_data_reports_parts + name: Parts 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_edit + access: part_service_assembly_details module: ic.pl params: action: search - searchitems: article + 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 @@ -554,14 +574,6 @@ 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 @@ -610,14 +622,6 @@ 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 @@ -1097,13 +1101,6 @@ module: am.pl params: action: edit_units -- parent: system - id: system_parts_classification - name: Parts Classification - icon: partsclassific - order: 1150 - params: - action: PartsClassification/list - parent: system id: system_price_factors name: Price Factors diff --git a/menus/user/11-yearend-transactions.yaml b/menus/user/11-yearend-transactions.yaml new file mode 100644 index 000000000..6906cdc89 --- /dev/null +++ b/menus/user/11-yearend-transactions.yaml @@ -0,0 +1,16 @@ +# 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 new file mode 100644 index 000000000..06b3c4c70 --- /dev/null +++ b/menus/user/12-warehouse-usage.yaml @@ -0,0 +1,15 @@ +# +# 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 diff --git a/menus/user/13-parts-classification.yaml b/menus/user/13-parts-classification.yaml new file mode 100644 index 000000000..5cffd750d --- /dev/null +++ b/menus/user/13-parts-classification.yaml @@ -0,0 +1,14 @@ +# +# opendynamic features +# +--- +# +# parts classification +# +- parent: system + id: system_parts_classification + name: Parts Classification + icon: partsclassific + order: 1100 + params: + action: PartsClassification/list diff --git a/menus/user/14-one-part-edit-page.yaml b/menus/user/14-one-part-edit-page.yaml new file mode 100644 index 000000000..730e76cee --- /dev/null +++ b/menus/user/14-one-part-edit-page.yaml @@ -0,0 +1,29 @@ +# +# opendynamic features +# +--- +# +# one edit page for parts,assemblies and services +# +# +# first disable obsolete menu entries +# +- id: master_data_reports_parts + access: noaccess +- id: master_data_reports_services + access: noaccess +- id: master_data_reports_assemblies + access: noaccess +# +# new menu +# +- parent: master_data_reports + id: master_data_reports_articles + name: Articles + icon: part_report + order: 500 + access: part_service_assembly_edit + module: ic.pl + params: + action: search + searchitems: article