Merge branch 'b-3.6.1' into mebil

diff --combined SL/DB/Helper/Mappings.pm
index 5fc6855,4f78ac4..bc477fc
--- 1/SL/DB/Helper/Mappings.pm
--- 2/SL/DB/Helper/Mappings.pm
+++ b/SL/DB/Helper/Mappings.pm
@@@ -84,6 -84,7 +84,7 @@@ my @kivitendo_blacklist = (@kivitendo_b
  my %kivitendo_package_names = (
    # TABLE                           # MODEL (given in C style)
    acc_trans                      => 'acc_transaction',
+   additional_billing_addresses   => 'additional_billing_address',
    'auth.clients'                 => 'auth_client',
    'auth.clients_users'           => 'auth_client_user',
    'auth.clients_groups'          => 'auth_client_group',
@@@ -98,6 -99,7 +99,7 @@@
    'auth.user_group'              => 'auth_user_group',
    ar                             => 'invoice',
    ap                             => 'purchase_invoice',
+   ap_gl                          => 'ap_gl',
    assembly                       => 'assembly',
    assortment_items               => 'assortment_item',
    background_jobs                => 'background_job',
@@@ -142,6 -144,7 +144,7 @@@
    employee_project_invoices      => 'EmployeeProjectInvoices',
    exchangerate                   => 'exchangerate',
    files                          => 'file',
+   file_full_texts                => 'file_full_text',
    finanzamt                      => 'finanzamt',
    follow_up_access               => 'follow_up_access',
    follow_up_links                => 'follow_up_link',
@@@ -156,7 -159,6 +159,7 @@@
    letter                         => 'letter',
    letter_draft                   => 'letter_draft',
    makemodel                      => 'make_model',
 +  mebil_mapping                  => 'mebil_mapping',
    notes                          => 'note',
    orderitems                     => 'order_item',
    oe                             => 'order',

diff --combined VERSION
index ee5ae26,9575d51..95a00e4
--- 1/VERSION
--- 2/VERSION
+++ b/VERSION
@@@ -1,1 -1,1 +1,1 @@@
- 3.5.8m1
 -3.6.1
++3.6.1m1

diff --combined menus/user/00-erp.yaml
index a22a5a6,10d356b..2a8777d
--- 1/menus/user/00-erp.yaml
--- 2/menus/user/00-erp.yaml
+++ b/menus/user/00-erp.yaml
@@@ -275,7 -275,7 +275,7 @@@
    name: Quotations
    icon: report_quotations
    order: 200
-   access: sales_quotation_edit
+   access: sales_quotation_edit | sales_quotation_view
    module: oe.pl
    params:
      action: search
@@@ -285,7 -285,7 +285,7 @@@
    name: Sales Orders
    icon: report_sales_orders
    order: 300
-   access: sales_order_edit
+   access: sales_order_edit | sales_order_view
    module: oe.pl
    params:
      action: search
@@@ -295,7 -295,7 +295,7 @@@
    name: Delivery Orders
    icon: delivery_order_report
    order: 400
-   access: sales_delivery_order_edit
+   access: sales_delivery_order_edit | sales_delivery_order_view
    module: do.pl
    params:
      action: search
@@@ -446,7 -446,7 +446,7 @@@
    name: RFQs
    icon: rfq_report
    order: 100
-   access: request_quotation_edit
+   access: request_quotation_edit | request_quotation_view
    module: oe.pl
    params:
      action: search
@@@ -456,7 -456,7 +456,7 @@@
    name: Purchase Orders
    icon: purchase_order_report
    order: 200
-   access: purchase_order_edit
+   access: purchase_order_edit | purchase_order_view
    module: oe.pl
    params:
      action: search
@@@ -465,11 -465,20 +465,20 @@@
    id: ap_reports_delivery_orders
    name: Delivery Orders
    order: 300
-   access: purchase_delivery_order_edit
+   access: purchase_delivery_order_edit | purchase_delivery_order_view
    module: do.pl
    params:
      action: search
      type: purchase_delivery_order
+ - parent: ap_reports
+   id: ap_reports_supplier_delivery_orders
+   name: Supplier Delivery Orders
+   order: 350
+   access: purchase_delivery_order_edit | purchase_delivery_order_view
+   module: do.pl
+   params:
+     action: search
+     type: supplier_delivery_order
  - parent: ap_reports
    id: ap_reports_vendor_invoices_ap_transactions
    name: Vendor Invoices & AP Transactions
@@@ -916,24 -925,6 +925,24 @@@
    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
@@@ -1372,6 -1363,13 +1381,13 @@@
    params:
      action: CsvImport/new
      profile.type: contacts
+ - parent: system_import_csv
+   id: system_import_csv_additional_billing_address
+   name: Additional Billing Addresses
+   order: 250
+   params:
+     action: CsvImport/new
+     profile.type: billing_addresses
  - parent: system_import_csv
    id: system_import_csv_shipto
    name: Shipto