From 63c508aa778b478b0cde9a7c092baadd6fc5aa5f Mon Sep 17 00:00:00 2001 From: Michael Wagner Date: Tue, 8 Feb 2022 23:06:24 +0100 Subject: [PATCH] epic-ts --- VERSION | 2 +- menus/.dummy | 0 menus/admin/00-admin.yaml | 92 -- menus/mobile/00-erp.yaml | 24 - menus/user/00-erp.yaml | 1579 ------------------------- menus/user/10-custom-data-export.yaml | 14 - menus/user/10-order-controller.yaml | 50 - menus/user/10-time-recording.yaml | 22 - sql/Pg-upgrade2/mebil_v1.sql | 102 ++ sql/Pg-upgrade2/release_3_5_8.sql | 2 +- templates/webpages/mebil/.dummy | 0 11 files changed, 104 insertions(+), 1783 deletions(-) create mode 100644 menus/.dummy delete mode 100644 menus/admin/00-admin.yaml delete mode 100644 menus/mobile/00-erp.yaml delete mode 100644 menus/user/00-erp.yaml delete mode 100644 menus/user/10-custom-data-export.yaml delete mode 100644 menus/user/10-order-controller.yaml delete mode 100644 menus/user/10-time-recording.yaml create mode 100644 sql/Pg-upgrade2/mebil_v1.sql create mode 100644 templates/webpages/mebil/.dummy diff --git a/VERSION b/VERSION index fa8da2074..ee5ae260d 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -3.5.8 +3.5.8m1 diff --git a/menus/.dummy b/menus/.dummy new file mode 100644 index 000000000..e69de29bb diff --git a/menus/admin/00-admin.yaml b/menus/admin/00-admin.yaml deleted file mode 100644 index 86850271c..000000000 --- a/menus/admin/00-admin.yaml +++ /dev/null @@ -1,92 +0,0 @@ ---- -- id: users_clients_and_user_groups - name: Users, Clients and User Groups - order: 100 -- parent: users_clients_and_user_groups - id: users_clients_and_user_groups_list_users_clients_and_user_groups - name: List Users, Clients and User Groups - order: 100 - params: - action: Admin/show -- parent: users_clients_and_user_groups - id: users_clients_and_user_groups_add_user - name: Add User - order: 200 - params: - action: Admin/new_user -- parent: users_clients_and_user_groups - id: users_clients_and_user_groups_add_client - name: Add Client - order: 300 - params: - action: Admin/new_client -- parent: users_clients_and_user_groups - id: users_clients_and_user_groups_add_user_group - name: Add User Group - order: 400 - params: - action: Admin/new_group -- id: database_management - name: Database Management - order: 200 -- parent: database_management - id: database_management_create_dataset - name: Create Dataset - order: 100 - params: - action: Admin/create_dataset_login -- parent: database_management - id: database_management_delete_dataset - name: Delete Dataset - order: 200 - params: - action: Admin/delete_dataset_login -- id: printer_management - name: Printer Management - order: 300 -- parent: printer_management - id: printer_management_list_printers - name: List Printers - order: 100 - params: - action: Admin/list_printers -- parent: printer_management - id: printer_management_add_printer - name: Add Printer - order: 200 - params: - action: Admin/new_printer -- id: system - name: System - icon: system - order: 400 -- parent: system - id: system_lock_and_unlock_installation - name: Lock and unlock installation - order: 100 - params: - action: Admin/show_lock -- parent: system - id: system_documentation_in_german_ - name: Documentation (in German) - order: 200 - href: doc/kivitendo-Dokumentation.pdf - target: _blank -- parent: system - id: system_kivitendo_website_external_ - name: kivitendo website (external) - order: 300 - href: http://www.kivitendo.de/ - target: _blank -- parent: system - id: system_to_user_login - name: To user login - order: 400 - params: - action: LoginScreen/user_login -- parent: system - id: system_logout - name: Logout - order: 500 - params: - action: Admin/logout diff --git a/menus/mobile/00-erp.yaml b/menus/mobile/00-erp.yaml deleted file mode 100644 index 448a5549b..000000000 --- a/menus/mobile/00-erp.yaml +++ /dev/null @@ -1,24 +0,0 @@ -# This is the main menu config file for mobile user space menu entries. -# -# Th structure is the same as in user/, but currently infinite nesting is not supported. -# ---- -- id: image_upload - name: Image Upload - order: 100 - access: sales_delivery_order_edit - params: - action: ImageUpload/upload_image - object_type: sales_delivery_order -- id: component_test - name: Component Test - order: 200 - access: developer - params: - action: MaterializeTest/components -- id: modal_test - name: Modal Test - order: 300 - access: developer - params: - action: MaterializeTest/modal diff --git a/menus/user/00-erp.yaml b/menus/user/00-erp.yaml deleted file mode 100644 index a22a5a655..000000000 --- a/menus/user/00-erp.yaml +++ /dev/null @@ -1,1579 +0,0 @@ -# This is the main menu config file for user space menu entries. -# -# Each menu entry can have the following properties: -# -# parent: the id of a higher node in the tree, top-level node if missing -# id: a unique identifier used by parent links and for overloading -# name: translatable text for display -# icon: stripped name of an icon for this menu entry -# order: numeric value. lower will be displayed first -# access: boolean expression of the rights needed to display and access this entry -# ( ) & | 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/". -# ! is supported to negate the subsequent expression. -# If missing, access will be granted. -# -# Example: -# client/feature_default_enabled | ( feature & system ) -# -# href: fully qualified external link -# module: defaults to "controller.pl". Should not be present if the link is for -# Controller::Base dispatching to enable routing. Otherwise this -# script will be used. -# target: target window for link. ex: "_blank" -# params: additional url parameter ---- -- id: master_data - name: Master Data - icon: master_data - order: 100 -- parent: master_data - id: master_data_add_customer - name: Add Customer - icon: customer_add - order: 100 - access: customer_vendor_edit|customer_vendor_all_edit - params: - action: CustomerVendor/add - db: customer -- parent: master_data - id: master_data_add_vendor - name: Add Vendor - icon: vendor_add - order: 200 - access: customer_vendor_edit|customer_vendor_all_edit - params: - action: CustomerVendor/add - db: vendor -- parent: master_data - id: master_data_add_part - name: Add Part - icon: part_add - order: 300 - access: part_service_assembly_edit - params: - action: Part/add_part -- parent: master_data - id: master_data_add_service - name: Add Service - icon: service_add - order: 400 - access: part_service_assembly_edit - params: - action: Part/add_service -- parent: master_data - id: master_data_add_assembly - name: Add Assembly - icon: assembly_add - order: 500 - access: part_service_assembly_edit - params: - action: Part/add_assembly -- parent: master_data - id: master_data_add_assortment - name: Add Assortment - icon: assortment_add - order: 550 - access: part_service_assembly_edit & client/feature_experimental_assortment - params: - action: Part/add_assortment -- parent: master_data - id: master_data_add_project - name: Add Project - icon: project_add - order: 600 - access: project_edit - params: - action: Project/new -- parent: master_data - id: master_data_add_requirement_spec_template - name: Add Requirement Spec Template - order: 700 - access: requirement_spec_edit - params: - action: RequirementSpec/new - is_template: 1 -- parent: master_data - id: master_data_update_prices - name: Update Prices - icon: prices_update - order: 800 - access: part_service_assembly_edit - params: - action: PartsPriceUpdate/search_update_prices -- parent: master_data - id: master_data_price_rules - name: Price Rules - order: 900 - access: part_service_assembly_edit - params: - action: PriceRule/list - filter.obsolete: 0 -- parent: master_data - id: master_data_reports - name: Reports - icon: master_data_report - order: 1000 -- parent: master_data_reports - id: master_data_reports_customers - name: Customers - icon: customer_report - order: 100 - params: - action: CustomerVendor/search - db: customer -- parent: master_data_reports - id: master_data_reports_vendors - name: Vendors - icon: vendor_report - order: 200 - params: - action: CustomerVendor/search - db: vendor -- parent: master_data_reports - id: master_data_reports_contacts - name: Contacts - order: 300 - params: - action: CustomerVendor/search_contact - db: customer -- parent: master_data_reports - id: master_data_reports_articles - name: Articles - icon: part_report - order: 500 - access: part_service_assembly_details - module: ic.pl - params: - action: search - searchitems: article -- parent: master_data_reports - id: master_data_reports_projects - name: Projects - icon: project_report - order: 700 - access: project_edit - params: - action: Project/list - filter.active: active - filter.valid: valid -- parent: master_data_reports - id: master_data_reports_requirement_spec_templates - name: Requirement Spec Templates - order: 800 - access: requirement_spec_edit - params: - action: RequirementSpec/list - is_template: 1 -- id: ar - name: AR - icon: ar - order: 200 -- parent: ar - id: ar_add_requirement_spec - name: Add Requirement Spec - order: 100 - access: requirement_spec_edit - params: - action: RequirementSpec/new -- parent: ar - id: ar_add_quotation - name: Add Quotation - icon: quotation_add - order: 200 - access: sales_quotation_edit - module: oe.pl - params: - action: add - type: sales_quotation -- parent: ar - id: ar_add_sales_order - name: Add Sales Order - icon: sales_order_add - order: 300 - access: sales_order_edit - module: oe.pl - params: - action: add - type: sales_order -- parent: ar - id: ar_add_delivery_order - name: Add Delivery Order - icon: delivery_order_add - order: 400 - access: sales_delivery_order_edit - module: do.pl - params: - action: add - type: sales_delivery_order -- parent: ar - id: ar_add_sales_invoice - name: Add Sales Invoice - icon: sales_invoice_add - order: 500 - access: invoice_edit - module: is.pl - params: - action: add - type: invoice -- parent: ar - id: ar_add_credit_note - name: Add Credit Note - icon: credit_note_add - order: 600 - access: invoice_edit - module: is.pl - params: - action: add - type: credit_note -- parent: ar - id: ar_add_dunning - name: Add Dunning - icon: dunning_add - order: 700 - access: dunning_edit - module: dn.pl - params: - action: add -- parent: ar - id: ar_add_letter - name: Add Letter - order: 800 - access: sales_letter_edit - params: - action: Letter/add - is_sales: 1 -- parent: ar - id: ar_invoices - name: Invoices - icon: sales_invoice_add - order: 850 -- parent: ar_invoices - id: ar_invoices_mass_add_sales_invoice - name: Mass Create Print Sales Invoice from Delivery Order - order: 100 - access: invoice_edit - params: - noshow: 1 - action: MassInvoiceCreatePrint/list_sales_delivery_orders -- parent: ar - id: ar_reports - name: Reports - icon: ar_report - order: 900 -- parent: ar_reports - id: ar_reports_requirement_specs - name: Requirement Specs - order: 100 - access: requirement_spec_edit - params: - action: RequirementSpec/list -- parent: ar_reports - id: ar_reports_quotations - name: Quotations - icon: report_quotations - order: 200 - access: sales_quotation_edit - module: oe.pl - params: - action: search - type: sales_quotation -- parent: ar_reports - id: ar_reports_sales_orders - name: Sales Orders - icon: report_sales_orders - order: 300 - access: sales_order_edit - module: oe.pl - params: - action: search - type: sales_order -- parent: ar_reports - id: ar_reports_delivery_orders - name: Delivery Orders - icon: delivery_order_report - order: 400 - access: sales_delivery_order_edit - module: do.pl - params: - action: search - type: sales_delivery_order -- parent: ar_reports - id: ar_reports_invoices_credit_notes_ar_transactions - name: Invoices, Credit Notes & AR Transactions - icon: invoices_report - order: 500 - module: ar.pl - params: - action: search - nextsub: ar_transactions -- parent: ar_reports - id: ar_reports_sales_report - name: Sales Report - order: 600 - access: invoice_edit - module: vk.pl - params: - action: search_invoice - nextsub: invoice_transactions -- parent: ar_reports - id: ar_reports_dunnings - name: Dunnings - icon: dunnings_report - order: 700 - access: dunning_edit - module: dn.pl - params: - action: search -- parent: ar_reports - id: ar_order_item_search - name: Order item search - order: 750 - access: sales_order_edit - params: - action: OrderItem/search -- parent: ar_reports - id: ar_reports_delivery_plan - name: Delivery Plan - order: 800 - access: delivery_plan - params: - action: DeliveryPlan/list - vc: customer -- parent: ar_reports - id: ar_reports_delivery_value_report - name: Delivery Value Report - order: 900 - access: delivery_value_report - params: - action: DeliveryValueReport/list - vc: customer -- parent: ar_reports - id: ar_reports_financial_controlling - name: Financial Controlling - order: 1000 - access: sales_order_edit - params: - action: FinancialControllingReport/list -- parent: ar_reports - id: ar_reports_letters - name: Letters - order: 1100 - access: sales_letter_report - 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 - order: 300 -- parent: ap - id: ap_add_rfq - name: Add RFQ - icon: rfq_add - order: 100 - access: request_quotation_edit - module: oe.pl - params: - action: add - type: request_quotation -- parent: ap - id: ap_add_purchase_order - name: Add Purchase Order - icon: purchase_order_add - order: 200 - access: purchase_order_edit - module: oe.pl - params: - action: add - type: purchase_order -- parent: ap - id: ap_add_delivery_note - name: Add Delivery Note - order: 300 - access: client/allow_new_purchase_delivery_order & purchase_delivery_order_edit - module: do.pl - params: - action: add - type: purchase_delivery_order -- parent: ap - id: ap_add_vendor_invoice - name: Add Vendor Invoice - order: 400 - access: client/allow_new_purchase_invoice & vendor_invoice_edit - module: ir.pl - params: - action: add - type: invoice -- parent: ap - id: ap_add_letter - name: Add Letter - order: 450 - access: purchase_letter_edit - params: - action: Letter/add - is_sales: 0 -- parent: ap - id: ap_reports - name: Reports - icon: ap_report - order: 500 -- parent: ap_reports - id: ap_reports_rfqs - name: RFQs - icon: rfq_report - order: 100 - access: request_quotation_edit - module: oe.pl - params: - action: search - type: request_quotation -- parent: ap_reports - id: ap_reports_purchase_orders - name: Purchase Orders - icon: purchase_order_report - order: 200 - access: purchase_order_edit - module: oe.pl - params: - action: search - type: purchase_order -- parent: ap_reports - id: ap_reports_delivery_orders - name: Delivery Orders - order: 300 - access: purchase_delivery_order_edit - module: do.pl - params: - action: search - type: purchase_delivery_order -- parent: ap_reports - id: ap_reports_vendor_invoices_ap_transactions - name: Vendor Invoices & AP Transactions - order: 400 - module: ap.pl - params: - action: search -- parent: ap_reports - id: ap_reports_delivery_plan - name: Delivery Plan - order: 500 - access: delivery_plan - params: - action: DeliveryPlan/list - vc: vendor -- parent: ap_reports - id: ap_reports_delivery_value_report - name: Delivery Value Report - order: 600 - access: delivery_value_report - params: - action: DeliveryValueReport/list - vc: vendor -- parent: ap_reports - id: ap_reports_letters - name: Letters - order: 1100 - access: purchase_letter_report - params: - action: Letter/list - is_sales: 0 -- id: warehouse - name: Warehouse - icon: warehouse - order: 400 -- parent: warehouse - id: warehouse_stock - name: Stock - order: 100 - access: warehouse_management - params: - action: Inventory/stock_in -- parent: warehouse - id: warehouse_produce_assembly - name: Produce Assembly - icon: assembly_produce - order: 200 - access: warehouse_management - module: wh.pl - params: - action: transfer_warehouse_selection - trans_type: assembly -- parent: warehouse - id: warehouse_transfer - name: Transfer - order: 300 - access: warehouse_management - module: wh.pl - params: - action: transfer_warehouse_selection - trans_type: transfer -- parent: warehouse - id: warehouse_removal - name: Removal - order: 400 - access: warehouse_management - module: wh.pl - 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 - order: 500 -- parent: warehouse_reports - id: warehouse_reports_warehouse_content - name: Warehouse content - order: 100 - access: warehouse_contents | warehouse_management - module: wh.pl - params: - action: report -- parent: warehouse_reports - id: warehouse_reports_whjournal - name: WHJournal - order: 200 - access: warehouse_management - 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 -- 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 - order: 500 -- parent: general_ledger - id: general_ledger_add_transaction - name: Add Transaction - icon: transaction_add - order: 100 - access: gl_transactions - module: gl.pl - params: - action: add -- parent: general_ledger - id: general_ledger_add_ar_transaction - name: Add AR Transaction - icon: ar_transaction_add - order: 200 - access: ar_transactions - module: ar.pl - params: - action: add -- parent: general_ledger - id: general_ledger_add_ap_transaction - name: Add AP Transaction - icon: ap_transaction_add - order: 300 - access: ap_transactions - module: ap.pl - params: - action: add -- parent: general_ledger - id: general_ledger_datev_export_assistent - name: DATEV - Export Assistent - icon: datev - order: 400 - access: datev_export & client/feature_datev - module: datev.pl - params: - action: export -- parent: general_ledger - id: general_ledger_gobd_export - name: GoBD Export - icon: gobd - order: 450 - access: general_ledger - params: - action: GoBD/filter -- parent: general_ledger - id: year_end_closing - name: Year-end closing - icon: cbob - order: 470 - access: general_ledger - params: - action: YearEndTransactions/form -- parent: general_ledger - id: zugferd_import - name: Factur-X/ZUGFeRD import - icon: cbob - order: 485 - access: ap_transactions - params: - action: ZUGFeRD/upload_zugferd -- parent: general_ledger - id: pay_posting_import - name: DATEV - Pay Postings Import - icon: datev - order: 495 - access: datev_export & client/feature_datev - params: - action: PayPostingImport/upload_pay_postings -- parent: general_ledger - id: general_ledger_reports - name: Reports - icon: gl_report - order: 500 -- parent: general_ledger_reports - id: general_ledger_reports_ar_aging - name: AR Aging - icon: ar_aging - order: 100 - access: general_ledger - module: rp.pl - params: - action: report - report: ar_aging -- parent: general_ledger_reports - id: general_ledger_reports_ap_aging - name: AP Aging - icon: ap_aging - order: 200 - access: general_ledger - module: rp.pl - params: - action: report - report: ap_aging -- parent: general_ledger_reports - id: general_ledger_reports_journal - name: Journal - icon: journal - order: 300 - access: general_ledger | gl_transactions - module: gl.pl - params: - action: search -- id: cash - name: Cash - icon: cash - order: 600 -- parent: cash - id: cash_receipt - name: Receipt - icon: receipt - order: 100 - access: cash - module: cp.pl - params: - action: payment - vc: customer - type: receipt -- parent: cash - id: cash_payment - name: Payment - icon: payment - order: 200 - access: cash - module: cp.pl - params: - action: payment - vc: vendor - type: check -- parent: cash - id: cash_bank_collection_via_sepa - name: Bank collection via SEPA - order: 300 - access: cash - module: sepa.pl - params: - action: bank_transfer_add - vc: customer -- parent: cash - id: cash_bank_transfer_via_sepa - name: Bank transfer via SEPA - order: 400 - access: cash - module: sepa.pl - params: - action: bank_transfer_add - vc: vendor -- parent: cash - 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 - id: cash_bank_transactions_mt940 - name: Bank transactions MT940 - order: 600 - access: bank_transaction - params: - action: BankTransaction/search -- parent: cash - id: cash_reconciliation_with_bank - name: Reconciliation with bank - order: 700 - access: bank_transaction - params: - action: Reconciliation/search -- parent: cash - id: cash_reconciliation - name: Reconciliation - icon: reconcilliation - order: 800 - access: cash - module: rc.pl - params: - action: reconciliation -- parent: cash - id: cash_reports - name: Reports - icon: cash_report - order: 900 -- parent: cash_reports - id: cash_reports_receipts - name: Receipts - icon: receipt_report - order: 100 - access: cash - module: rp.pl - params: - action: report - report: receipts -- parent: cash_reports - id: cash_reports_payments - name: Payments - icon: payment_report - order: 200 - access: cash - module: rp.pl - params: - action: report - report: payments -- parent: cash_reports - id: cash_reports_bank_collections_via_sepa - name: Bank collections via SEPA - order: 300 - access: cash - module: sepa.pl - params: - action: bank_transfer_search - vc: customer -- parent: cash_reports - id: cash_reports_bank_transfers_via_sepa - name: Bank transfers via SEPA - order: 400 - access: cash - module: sepa.pl - params: - action: bank_transfer_search - vc: vendor -- parent: cash_reports - id: cash_reports_bank_transactions - name: Bank transactions - order: 500 - access: bank_transaction - params: - action: BankTransaction/list_all -- id: reports - name: Reports - icon: report - order: 700 -- parent: reports - id: reports_chart_of_accounts - name: Chart of Accounts - icon: chart_of_accounts - order: 100 - access: report - module: ca.pl - params: - action: chart_of_accounts -- parent: reports - id: reports_trial_balance - name: Trial Balance - order: 200 - access: report - module: rp.pl - params: - action: report - report: trial_balance -- parent: reports - id: reports_erfolgsrechnung - name: Erfolgsrechnung - icon: income_statement - order: 300 - access: report & client/feature_erfolgsrechnung - module: rp.pl - params: - action: report - report: erfolgsrechnung -- parent: reports - id: reports_income_statement - name: Income Statement - icon: income_statement - order: 300 - access: report & client/feature_eurechnung - module: rp.pl - params: - action: report - report: income_statement -- parent: reports - id: reports_bwa - name: BWA - order: 400 - access: report & client/feature_eurechnung - module: rp.pl - params: - action: report - report: bwa -- parent: reports - id: reports_balance_sheet - name: Balance Sheet - icon: balance_sheet - order: 500 - access: report & client/feature_balance - module: rp.pl - params: - action: report - report: balance_sheet -- parent: reports - id: reports_ustva - name: UStVa - icon: ustva - order: 600 - access: advance_turnover_tax_return & client/feature_ustva - module: ustva.pl - params: - action: report -- parent: reports - id: reports_projecttransactions - name: Projecttransactions - order: 700 - access: report - module: rp.pl - params: - action: report - report: projects -- parent: reports - id: reports_financial_overview - name: Financial Overview - order: 800 - access: report - params: - action: FinancialOverview/list -- parent: reports - id: reports_liquidity_projection - name: Liquidity projection - order: 900 - access: report - params: - action: LiquidityProjection/show -- id: mebil - name: Mebil - icon: wtg - order: 750 -- parent: mebil - id: mebil_showmap - name: Map anzeigen - order: 100 - access: report - params: - action: Mebil/showmap -- parent: mebil - id: mebil_calcmap - name: Map berechnen - order: 200 - access: report - params: - action: Mebil/calcmap -- id: batch_printing - name: Batch Printing - icon: printing - order: 800 - access: batch_printing -- parent: batch_printing - id: batch_printing_sales_invoices - name: Sales Invoices - icon: sales_invoice_printing - order: 100 - access: invoice_edit - module: bp.pl - params: - action: search - vc: customer - type: invoice -- parent: batch_printing - id: batch_printing_sales_orders - name: Sales Orders - icon: sales_order_printing - order: 200 - access: sales_order_edit - module: bp.pl - params: - action: search - type: sales_order - vc: customer -- parent: batch_printing - id: batch_printing_quotations - name: Quotations - icon: quotation_printing - order: 300 - access: sales_quotation_edit - module: bp.pl - params: - action: search - vc: customer - type: sales_quotation -- parent: batch_printing - id: batch_printing_packing_lists - name: Packing Lists - icon: package_lists - order: 400 - access: invoice_edit | sales_order_edit - module: bp.pl - params: - action: search - type: packing_list - vc: customer -- parent: batch_printing - id: batch_printing_purchase_orders - name: Purchase Orders - icon: purchase_order_printing - order: 500 - access: purchase_order_edit - module: bp.pl - params: - action: search - type: purchase_order - vc: vendor -- parent: batch_printing - id: batch_printing_rfqs - name: RFQs - icon: rfq_printing - order: 600 - access: request_quotation_edit - module: bp.pl - params: - action: search - vc: vendor - type: request_quotation -- parent: batch_printing - id: batch_printing_checks - name: Checks - order: 700 - access: cash - module: bp.pl - params: - action: search - type: check - vc: vendor -- parent: batch_printing - id: batch_printing_receipts - name: Receipts - icon: receipt_printing - order: 800 - access: cash - module: bp.pl - params: - action: search - vc: customer - type: receipt -- id: productivity - name: Productivity - icon: productivity - order: 900 -- parent: productivity - id: productivity_show_todo_list - name: Show TODO list - order: 100 - access: productivity - module: todo.pl - params: - action: show_todo_list -- parent: productivity - id: productivity_add_follow_up - name: Add Follow-Up - order: 200 - access: productivity - module: fu.pl - params: - action: add -- parent: productivity - id: productivity_edit_access_rights - name: Edit Access Rights - order: 300 - access: productivity - module: fu.pl - params: - action: edit_access_rights -- parent: productivity - id: productivity_reports - name: Reports - order: 400 -- parent: productivity_reports - id: productivity_reports_follow_ups - name: Follow-Ups - order: 100 - access: productivity - module: fu.pl - params: - action: search -- parent: productivity_reports - id: productivity_reports_email_journal - name: Email journal - order: 200 - access: email_journal - module: controller.pl - icon: mail_journal - params: - action: EmailJournal/list -- id: system - name: System - icon: system - order: 1000 - access: config -- parent: system - id: system_client_configuration - name: Client Configuration - order: 100 - access: admin - params: - action: ClientConfig/edit -- parent: system - id: system_ustva_einstellungen - name: UStVa Einstellungen - order: 200 - access: client/feature_ustva - module: ustva.pl - params: - action: config_step1 -- parent: system - id: system_edit_dunning - name: Edit Dunning - order: 300 - module: dn.pl - params: - action: edit_config -- parent: system - id: system_chart_of_accounts - name: Chart of Accounts - order: 400 -- parent: system_chart_of_accounts - id: system_chart_of_accounts_add_account - name: Add Account - order: 100 - module: am.pl - params: - action: add_account -- parent: system_chart_of_accounts - id: system_chart_of_accounts_list_accounts - name: List Accounts - order: 200 - 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 - order: 500 - params: - action: Buchungsgruppen/list -- parent: system - id: system_taxzones - name: Taxzones - order: 600 - params: - action: Taxzones/list -- parent: system - id: system_taxes - name: Taxes - order: 700 - module: am.pl - params: - action: list_tax -- parent: system - id: system_bank_accounts - name: Bank accounts - order: 800 - params: - action: SimpleSystemSetting/list - type: bank_account -- parent: system - id: system_partsgroups - name: Partsgroups - order: 900 - params: - 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: 1120 - params: - action: SimpleSystemSetting/list - type: pricegroup -- parent: system - id: system_edit_units - name: Edit units - order: 1140 - module: am.pl - params: - action: edit_units -- parent: system - id: system_price_factors - name: Price Factors - order: 1200 - params: - 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: SimpleSystemSetting/list - type: department -- parent: system - id: system_types_of_business - name: Types of Business - order: 1400 - params: - 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: SimpleSystemSetting/list - type: project_type -- parent: system - id: system_project_status - name: Project Status - order: 1700 - params: - action: SimpleSystemSetting/list - type: project_status -- parent: system - id: system_requirement_specs - name: Requirement specs - order: 1800 -- parent: system_requirement_specs - id: system_requirement_specs_pre_defined_texts - name: Pre-defined Texts - order: 100 - params: - 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: 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: SimpleSystemSetting/list - type: requirement_spec_status -- parent: system_requirement_specs - id: system_requirement_specs_complexities - name: Complexities - order: 400 - params: - action: SimpleSystemSetting/list - type: requirement_spec_complexity -- parent: system_requirement_specs - id: system_requirement_specs_risks - name: Risks - order: 500 - params: - action: SimpleSystemSetting/list - type: requirement_spec_risk -- parent: system_requirement_specs - id: system_requirement_specs_acceptance_statuses - name: Acceptance Statuses - order: 600 - params: - 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: Languages - order: 100 - params: - action: SimpleSystemSetting/list - type: language -- parent: system_languages_and_translations - id: system_languages_and_translations_greetings - name: Greetings - order: 300 - module: generictranslations.pl - params: - action: edit_greetings -- parent: system_languages_and_translations - id: system_languages_and_translations_sepa_strings - name: SEPA strings - order: 400 - module: generictranslations.pl - params: - action: edit_sepa_strings -- parent: system_languages_and_translations - id: system_languages_and_translations_zugferd_notes - name: Factur-X/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 - order: 2000 - params: - action: PaymentTerm/list -- parent: system - id: system_delivery_terms - name: Delivery Terms - order: 2100 - params: - action: DeliveryTerm/list -- parent: system - id: system_manage_custom_variables - name: Manage Custom Variables - order: 2200 - params: - action: CustomVariableConfig/list -- parent: system - id: system_warehouses - name: Warehouses - order: 2300 - 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 - order: 2400 -- parent: system_import_csv - id: system_import_csv_customers_and_vendors - name: Customers and vendors - order: 100 - params: - action: CsvImport/new - profile.type: customers_vendors -- parent: system_import_csv - id: system_import_csv_contacts - name: Contacts - order: 200 - params: - action: CsvImport/new - profile.type: contacts -- parent: system_import_csv - id: system_import_csv_shipto - name: Shipto - order: 300 - params: - action: CsvImport/new - profile.type: addresses -- parent: system_import_csv - id: system_import_csv_parts - name: Parts - order: 400 - params: - action: CsvImport/new - profile.type: parts -- parent: system_import_csv - id: system_import_csv_inventories - name: Inventories - order: 500 - params: - action: CsvImport/new - profile.type: inventories -- parent: system_import_csv - id: system_import_csv_projects - name: Projects - order: 600 - params: - action: CsvImport/new - profile.type: projects -- parent: system_import_csv - id: system_import_csv_orders - name: Orders - order: 700 - 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 - order: 800 - params: - action: CsvImport/new - profile.type: ar_transactions -- parent: system - id: system_templates - name: Templates - order: 2500 - access: admin -- parent: system_templates - id: system_templates_html_templates - name: HTML Templates - order: 100 - module: amtemplates.pl - params: - action: display_template_form - type: templates - format: html -- parent: system_templates - id: system_templates_latex_templates - name: LaTeX Templates - order: 200 - module: amtemplates.pl - params: - action: display_template_form - format: tex - type: templates -- parent: system - id: system_general_ledger_corrections - name: General Ledger Corrections - order: 2600 - module: acctranscorrections.pl - params: - action: analyze_filter -- parent: system - id: system_background_jobs_and_task_server - name: Background jobs and task server - order: 2700 - access: admin -- parent: system_background_jobs_and_task_server - id: system_background_jobs_and_task_server_list_current_background_jobs - name: List current background jobs - order: 100 - params: - action: BackgroundJob/list -- parent: system_background_jobs_and_task_server - id: system_background_jobs_and_task_server_background_job_history - name: Background job history - order: 200 - params: - action: BackgroundJobHistory/list -- parent: system_background_jobs_and_task_server - id: system_background_jobs_and_task_server_task_server_control - name: Task server control - order: 300 - params: - action: TaskServer/show -- parent: system - id: system_audit_control - name: Audit Control - order: 2800 - module: am.pl - params: - action: audit_control -- parent: system - id: system_history_search_engine - name: History Search Engine - order: 2900 - module: am.pl - params: - action: show_history_search -- parent: system - id: system_employees - name: Employees - order: 3000 - access: admin - params: - action: Employee/list -- id: program - name: Program - icon: program - order: 1100 -- parent: program - id: program_user_preferences - name: User Preferences - order: 100 - module: am.pl - params: - action: config -- parent: program - id: program_internal_phone_list - name: Internal Phone List - order: 200 - params: - action: CTI/list_internal_extensions -- parent: program - id: program_version - name: Version - icon: version - order: 300 - module: login.pl - params: - action: company_logo - no_todo_list: 1 -- parent: program - id: program_kivitendo_modul - name: kivitendo modules - order: 350 -- parent: program_kivitendo_modul - id: program_kivitendo_modul_overview - name: Overview kivitendo modules - order: 100 - href: http://www.kivitendo-premium.de/module.shtml - target: _blank -- parent: program_kivitendo_modul - id: program_kivitendo_modul_activate - name: Activate kivitendo module - order: 200 - href: http://www.kivitendo-premium.de/modul-aktivieren.shtml - target: _blank -- parent: program - id: program_administration_area - name: Administration area - order: 400 - access: display_admin_link - params: - action: Admin/login -- parent: program - id: program_documentation_in_german_ - name: Documentation (in German) - order: 500 - href: doc/kivitendo-Dokumentation.pdf - target: _blank -- parent: program - id: program_kivitendo_website_external_ - name: kivitendo website (external) - order: 600 - href: http://www.kivitendo.de/ - target: _blank -- parent: program - id: program_logout - name: Logout - icon: logout - order: 700 - params: - action: LoginScreen/logout - -- id: develop - name: Developer Tools - icon: developer - order: 1200 - access: developer -- parent: develop - id: part_test - name: Part Test - access: developer - icon: part - order: 100 - params: - action: Part/test_page diff --git a/menus/user/10-custom-data-export.yaml b/menus/user/10-custom-data-export.yaml deleted file mode 100644 index bbe7e8b31..000000000 --- a/menus/user/10-custom-data-export.yaml +++ /dev/null @@ -1,14 +0,0 @@ ---- -- parent: reports - id: custom_data_export - name: Custom data export - order: 9000 - params: - action: CustomDataExport/list -- parent: system - id: custom_data_export_designer - name: Custom data export - order: 2250 - access: custom_data_export_designer - params: - action: CustomDataExportDesigner/list diff --git a/menus/user/10-order-controller.yaml b/menus/user/10-order-controller.yaml deleted file mode 100644 index f4ec4d10f..000000000 --- a/menus/user/10-order-controller.yaml +++ /dev/null @@ -1,50 +0,0 @@ -- parent: ar - id: ar_add_quotation - access: sales_quotation_edit & (!client/feature_experimental_order) -- parent: ar - id: ar_add_sales_order - access: sales_order_edit & (!client/feature_experimental_order) -- parent: ap - id: ap_add_rfq - access: request_quotation_edit & (!client/feature_experimental_order) -- parent: ap - id: ap_add_purchase_order - access: purchase_order_edit & (!client/feature_experimental_order) - -- parent: ar - id: ar_add_quotation_experimental - name: Add Quotation - icon: quotation_add - order: 250 - access: sales_quotation_edit & client/feature_experimental_order - params: - action: Order/add - type: sales_quotation -- parent: ar - id: ar_add_sales_order_experimental - name: Add Sales Order - icon: sales_order_add - order: 350 - access: sales_order_edit & client/feature_experimental_order - params: - action: Order/add - type: sales_order - -- parent: ap - id: ap_add_rfq_experimental - name: Add RFQ - icon: rfq_add - order: 150 - access: request_quotation_edit & client/feature_experimental_order - params: - action: Order/add - type: request_quotation -- parent: ap - id: ap_add_purchase_order_experimental - name: Add Purchase Order - icon: purchase_order_add - order: 250 - access: purchase_order_edit & client/feature_experimental_order - params: - action: Order/add - type: purchase_order diff --git a/menus/user/10-time-recording.yaml b/menus/user/10-time-recording.yaml deleted file mode 100644 index eab685f05..000000000 --- a/menus/user/10-time-recording.yaml +++ /dev/null @@ -1,22 +0,0 @@ ---- -- parent: system - id: system_time_recording_articles - name: Time Recording Articles - order: 2370 - params: - action: SimpleSystemSetting/list - type: time_recording_article -- parent: productivity - id: productivity_time_recording - name: Time Recording - order: 350 - access: time_recording - params: - action: TimeRecording/edit -- parent: productivity_reports - id: productivity_reports_time_recording - name: Time Recording - order: 300 - access: time_recording - params: - action: TimeRecording/list diff --git a/sql/Pg-upgrade2/mebil_v1.sql b/sql/Pg-upgrade2/mebil_v1.sql new file mode 100644 index 000000000..751b264c8 --- /dev/null +++ b/sql/Pg-upgrade2/mebil_v1.sql @@ -0,0 +1,102 @@ +-- @tag: mebil_v1 +-- @description: mebil-DB +-- @depends: + +-- Table of mebil extensions +-- for module +-- Lx office +DROP TABLE IF EXISTS mebil_mapping; +CREATE TABLE mebil_mapping ( + id SERIAL PRIMARY KEY, + ordering INTEGER NOT NULL, + typ CHAR NOT NULL, + fromacc VARCHAR(200) NOT NULL, + toacc VARCHAR(200) NOT NULL +); +INSERT INTO mebil_mapping (ordering,typ,fromacc,toacc) +VALUES + (10,'S','0483','bs.ass.fixAss.tan.machinery.gwgsammelposten'), + (10,'S','0484','bs.ass.fixAss.tan.machinery.gwgsammelposten'), + (20,'X','bs.ass.fixAss.tan.machinery.gwgsammelposten','bs.ass.fixAss.tan.machinery'), + (21,'X','bs.ass.fixAss.tan.machinery','bs.ass.fixAss.tan'), + (22,'X','bs.ass.fixAss.tan','bs.ass.fixAss'), + (50,'X','bs.ass.fixAss','bs.ass'), + + (10,'S','1200','bs.ass.currAss.cashEquiv.bank'), + (20,'X','bs.ass.currAss.cashEquiv.bank','bs.ass.currAss.cashEquiv'), + (21,'X','bs.ass.currAss.cashEquiv.bank','bs.ass.currAss'), + + (10,'S','3980','bs.ass.currAss.inventory.finishedAndMerch.merchandise.new'), + (20,'X','bs.ass.currAss.inventory.finishedAndMerch.merchandise.new','bs.ass.currAss.inventory.finishedAndMerch.merchandise'), + (21,'X','bs.ass.currAss.inventory.finishedAndMerch.merchandise','bs.ass.currAss.inventory.finishedAndMerch'), + (22,'X','bs.ass.currAss.inventory.finishedAndMerch','bs.ass.currAss.inventory'), + (23,'X','bs.ass.currAss.inventory','bs.ass.currAss'), + + (10,'S','1400','bs.ass.currAss.receiv.trade'), + (20,'X','bs.ass.currAss.receiv.trade','bs.ass.currAss.receiv'), + + (10,'S','1575','bs.ass.currAss.receiv.other.vat'), + (10,'S','1576','bs.ass.currAss.receiv.other.vat'), + (10,'S','1579','bs.ass.currAss.receiv.other.vat'), + (10,'S','1780','bs.ass.currAss.receiv.other.vat'), + (20,'X','bs.ass.currAss.receiv.other.vat','bs.ass.currAss.receiv.other'), + (21,'X','bs.ass.currAss.receiv.other','bs.ass.currAss.receiv'), + (30,'X','bs.ass.currAss.receiv','bs.ass.currAss'), + + (50,'X','bs.ass.currAss','bs.ass'), + + (10,'H','0800','bs.eqLiab.equity.subscribed.corp'), + (20,'X', 'bs.eqLiab.equity.subscribed.corp','bs.eqLiab.equity.subscribed'), + (40,'X', 'bs.eqLiab.equity.subscribed', 'bs.eqLiab.equity'), + (10,'H','0810','bs.eqLiab.equity.capRes'), + (20,'X', 'bs.eqLiab.equity.capRes', 'bs.eqLiab.equity'), + (50,'X', 'bs.eqLiab.equity', 'bs.eqLiab'), + (10,'H','0970','bs.eqLiab.accruals.other.upTo1year'), + (20,'X', 'bs.eqLiab.accruals.other.upTo1year','bs.eqLiab.accruals.other'), + (21,'X', 'bs.eqLiab.accruals.other','bs.eqLiab.accruals'), + (50,'X', 'bs.eqLiab.accruals','bs.eqLiab'), + (10,'H','1775','bs.eqLiab.liab.other.theroffTax.vat'), + (10,'H','1776','bs.eqLiab.liab.other.theroffTax.vat'), + (20,'X', 'bs.eqLiab.liab.other.theroffTax.vat','bs.eqLiab.liab.other.theroffTax'), + (10,'H','1651','bs.eqLiab.liab.other.theroffTax.operatingTaxes'), + (10,'H','1652','bs.eqLiab.liab.other.theroffTax.operatingTaxes'), + (10,'H','1653','bs.eqLiab.liab.other.theroffTax.operatingTaxes'), + (20,'X', 'bs.eqLiab.liab.other.theroffTax.operatingTaxes','bs.eqLiab.liab.other.theroffTax'), + (21,'X', 'bs.eqLiab.liab.other.theroffTax','bs.eqLiab.liab.other'), + (10,'H','1606','bs.eqLiab.liab.other.profitPartLoans'), + (20,'X', 'bs.eqLiab.liab.other.profitPartLoans','bs.eqLiab.liab.other'), + (22,'X', 'bs.eqLiab.liab.other','bs.eqLiab.liab'), + (50,'X', 'bs.eqLiab.liab','bs.eqLiab'), + + (10,'S','4121','is.netIncome.regular.operatingTC.staff.salaries.managerPartner'), + (20,'X' ,'is.netIncome.regular.operatingTC.staff.salaries.managerPartner','is.netIncome.regular.operatingTC.staff.salaries'), + (21,'X' ,'is.netIncome.regular.operatingTC.staff.salaries','ismi.netIncome.staff'), + (50,'Y' ,'ismi.netIncome.staff','ismi.netIncome'), + (10,'S','3960','is.netIncome.regular.operatingTC.grossTradingProfit.materialServices.material.purchased.generalRateVAT'), + (20,'X', 'is.netIncome.regular.operatingTC.grossTradingProfit.materialServices.material.purchased.generalRateVAT','is.netIncome.regular.operatingTC.grossTradingProfit.materialServices.material.purchased'), + (21,'X', 'is.netIncome.regular.operatingTC.grossTradingProfit.materialServices.material.purchased','is.netIncome.regular.operatingTC.grossTradingProfit.materialServices.material'), + (22,'X', 'is.netIncome.regular.operatingTC.grossTradingProfit.materialServices.material','ismi.netIncome.materialServices'), + (50,'Y', 'ismi.netIncome.materialServices','ismi.netIncome'), + + (50,'X','bs.ass.fixAss.tan.machinery.gwgsammelposten','all'), + (10,'R','ACC=0482:START=2016:VALUES=negative','grossCost.beginning'), + (10,'R','ACC=0484:START=2017:VALUES=negative','grossCost.beginning'), + (50,'X','grossCost.beginning','gross'), + (50,'X','gross.addition','gross'), + (10,'R','ACC=0483:START=YEAR:VALUES=negative','gross.addition'), + (52,'X','grossCost.beginning','accDepr'), + (52,'X','gross.addition','accDepr'), + (52,'Y','all','accDepr'), + (50,'X','grossCost.beginning','accDepr.beginning'), + (50,'Y','all_Prev_period','accDepr.beginning'), + (50,'X','all_Prev_period','accDepr.DeprPeriod'), + (50,'X','gross.addition','accDepr.DeprPeriod'), + (50,'Y','all','accDepr.DeprPeriod'), + (60,'X','accDepr.DeprPeriod','accDepr.DeprPeriod.regular'), + (10,'R','ACC=0482:END=PY:INVERT=true','all_Prev_period'), + (10,'R','ACC=0483:END=PY:INVERT=true','all_Prev_period'), + (10,'R','ACC=0484:END=PY:INVERT=true','all_Prev_period'), + + (0,'C','de-gaap-ci.bsAss','hbst.transfer.bsAss.name') + ; + diff --git a/sql/Pg-upgrade2/release_3_5_8.sql b/sql/Pg-upgrade2/release_3_5_8.sql index 25f7fb0f6..0432c28b7 100644 --- a/sql/Pg-upgrade2/release_3_5_8.sql +++ b/sql/Pg-upgrade2/release_3_5_8.sql @@ -1,3 +1,3 @@ -- @tag: release_3_5_8 -- @description: Leeres Script, das alle Upgradescripte bis zum Release 3.5.8 voraussetzt, um ein fest definiertes Schema zu definieren. --- @depends: release_3_5_7 defaults_produce_assembly_transfer_service change_warehouse_client_config_default drop_shipped_qty_config delete_warehouse_for_assembly delete_cvars_on_trans_deletion_add_shipto +-- @depends: release_3_5_7 defaults_produce_assembly_transfer_service change_warehouse_client_config_default drop_shipped_qty_config delete_warehouse_for_assembly delete_cvars_on_trans_deletion_add_shipto mebil_v1 diff --git a/templates/webpages/mebil/.dummy b/templates/webpages/mebil/.dummy new file mode 100644 index 000000000..e69de29bb -- 2.20.1