From dbe11823b395456ee2df307de61955af2777c735 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Jan=20B=C3=BCren?= <jan@kivitendo.de>
Date: Fri, 11 Jun 2021 15:52:57 +0200
Subject: [PATCH] changelog und en locales

---
 doc/changelog | 4 ++++
 locale/en/all | 6 ++++++
 2 files changed, 10 insertions(+)

diff --git a/doc/changelog b/doc/changelog
index 415e03c28..dbae02adb 100644
--- a/doc/changelog
+++ b/doc/changelog
@@ -36,6 +36,10 @@ Mittelgroße neue Features:
      Mahnung
 
 Kleinere neue Features und Detailverbesserungen:
+  - Der Status geliefert bei Aufträgen kann mit oder ohne Dienstleistungen
+    im Lieferschein berechnet werden. Einstellbar in der Mandantenkonfiguration
+    jeweils unabhängig für Einkauf und Verkauf.
+    Standardeinstellung: Dienstleistungen sind lagerbar.
   - Gefertigte Erzeugnisse können innerhalb des Zurücklagerungszeitraums
     wieder zerlegt werden. Die Aktion befindet sich im Lagerbuchungsbericht
   - E-Mail-Versand: Neben dem Freitext CC-Feld kann jetzt auch ein
diff --git a/locale/en/all b/locale/en/all
index 15ff9e101..32832abab 100644
--- a/locale/en/all
+++ b/locale/en/all
@@ -349,6 +349,7 @@ $self->{texts} = {
   'Assembly (typeabbreviation)' => 'A',
   'Assembly Last Cost'          => '',
   'Assembly Number missing!'    => '',
+  'Assembly creation warehouse dependant' => '',
   'Assembly items'              => '',
   'Asset'                       => '',
   'Assets'                      => '',
@@ -1700,6 +1701,8 @@ $self->{texts} = {
   'If you want to set up the authentication database yourself then log in to the administration panel. kivitendo will then create the database and tables for you.' => '',
   'If your old bins match exactly Bins in the Warehouse CLICK on <b>AUTOMATICALLY MATCH BINS</b>.' => '',
   'Ignore faulty positions'     => '',
+  'Ignore services for the purchase orders state of delivery' => '',
+  'Ignore services for the sales orders state of delivery' => '',
   'Illegal characters have been removed from the following fields: #1' => '',
   'Illegal date'                => '',
   'Image'                       => '',
@@ -2572,6 +2575,7 @@ $self->{texts} = {
   'Problem'                     => '',
   'Produce'                     => '',
   'Produce Assembly'            => '',
+  'Produce assembly only if all parts are in the same warehouse' => '',
   'Production'                  => 'Production',
   'Production (typeabbreviation)' => 'W',
   'Productivity'                => '',
@@ -2617,6 +2621,7 @@ $self->{texts} = {
   'Purchase Invoices'           => '',
   'Purchase Order'              => '',
   'Purchase Orders'             => '',
+  'Purchase Orders Services are deliverable' => '',
   'Purchase Orders deleteable'  => '',
   'Purchase Price Rules'        => '',
   'Purchase Price Rules '       => '',
@@ -2843,6 +2848,7 @@ $self->{texts} = {
   'Sales Order delivery date interval' => '',
   'Sales Orders'                => '',
   'Sales Orders Advance'        => '',
+  'Sales Orders Services are deliverable' => '',
   'Sales Orders deleteable'     => '',
   'Sales Price Rules'           => '',
   'Sales Price Rules '          => '',
-- 
2.20.1