Merge branch 'master' of github.com:kivitendo/kivitendo-erp

diff --git a/sql/Pg-upgrade2/ap_set_payment_term_from_vendor.sql b/sql/Pg-upgrade2/ap_set_payment_term_from_vendor.sql
new file mode 100644 (file)
index 0000000..1567b51
--- /dev/null
+++ b/sql/Pg-upgrade2/ap_set_payment_term_from_vendor.sql
@@ -0,0 +1,7 @@
+-- @tag: ap_set_payment_term_from_vendor
+-- @description: Zahlungsbedingungen in EK-Rechnungen aus Lieferant setzen
+-- @depends: release_3_5_6
+
+UPDATE ap SET payment_id = (SELECT payment_id FROM vendor WHERE vendor.id = ap.vendor_id)
+  WHERE (SELECT payment_id FROM vendor WHERE vendor.id = ap.vendor_id) IS NOT NULL
+    AND ap.payment_id IS NULL;