diff --git a/Layout/default/WarehouseShippingNote/PDF_HEADER.html b/Layout/default/WarehouseShippingNote/PDF_HEADER.html index 6e8c2d764..f1ba3ce5e 100644 --- a/Layout/default/WarehouseShippingNote/PDF_HEADER.html +++ b/Layout/default/WarehouseShippingNote/PDF_HEADER.html @@ -59,12 +59,21 @@ +
+
Lieferadresse
{{ addressLine_1 }}
{{ addressLine_2 }}
{{ addressLine_3 }}
{{ addressLine_4 }}
{{ addressLine_5 }}
+
Rechnungsadresse
+
{{ billingAddressLine_1 }}
+
{{ billingAddressLine_2 }}
+
{{ billingAddressLine_3 }}
+
{{ billingAddressLine_4 }}
+
{{ billingAddressLine_5 }}
+
diff --git a/application/WarehouseShippingNote/WarehouseShippingNoteController.php b/application/WarehouseShippingNote/WarehouseShippingNoteController.php index e54b258f1..fda2e9335 100644 --- a/application/WarehouseShippingNote/WarehouseShippingNoteController.php +++ b/application/WarehouseShippingNote/WarehouseShippingNoteController.php @@ -342,6 +342,11 @@ class WarehouseShippingNoteController extends TTCrud { $headerHtml = str_replace("{{ addressLine_3 }}", $shippingNote->deliveryAddressPLZ . " " . $shippingNote->deliveryAddressCity, $headerHtml); $headerHtml = str_replace("{{ addressLine_4 }}", "", $headerHtml); $headerHtml = str_replace("{{ addressLine_5 }}", "", $headerHtml); + $headerHtml = str_replace("{{ billingAddressLine_1 }}", $address->getCompanyOrName(), $headerHtml); + $headerHtml = str_replace("{{ billingAddressLine_2 }}", $address->street, $headerHtml); + $headerHtml = str_replace("{{ billingAddressLine_3 }}", $address->zip . " " . $address->city, $headerHtml); + $headerHtml = str_replace("{{ billingAddressLine_4 }}", "", $headerHtml); + $headerHtml = str_replace("{{ billingAddressLine_5 }}", "", $headerHtml); $headerHtml = str_replace("{{ customerNumber }}", $address->customer_number, $headerHtml); $headerHtml = str_replace("{{ shippingNoteNumber }}", $shippingNoteNumber, $headerHtml); $headerHtml = str_replace("{{ shippingNoteDate }}", date("d.m.Y", $shippingNote->create), $headerHtml);