diff --git a/Application/views/tpl/deliverynote.tpl b/Application/views/tpl/deliverynote.tpl
index de3029f..33074b0 100644
--- a/Application/views/tpl/deliverynote.tpl
+++ b/Application/views/tpl/deliverynote.tpl
@@ -1,6 +1,7 @@
 [{assign var=currency value=$order->getOrderCurrency()}]
+[{assign var=deliveryPrice value=$order->getOrderDeliveryPrice()}]
 
-<page backtop="30mm" backbottom="30mm" backleft="10mm" backright="10mm">
+<page backtop="30mm" backbottom="30mm" backleft="10mm" backright="10mm" pageset="new">
 	<style>
 		.aligning{
 				text-align: right;
@@ -20,8 +21,8 @@
 		<div  style="position: absolute; top: 30px; right: 44px;">
 			<img src="[{$oViewConf->getImageUrl('d3pdf_logo.png')}]">
 		</div>
-    </page_header>
-    <page_footer>
+	</page_header>
+	<page_footer>
         <table style="width: 688px; font-size: 9px; margin: 0 30px 0 30px; border-top: solid 1px #000;" cellspacing="0">
 			<tr>
 				<td style="width: 33.33%;"></td>
@@ -39,12 +40,12 @@
 				<td style="width: 33.33%">[{$shop->oxshops__oxbankname->value}]</td>
 			</tr>
 			<tr>
-				<td style="width: 33.33%">[{$shop->oxshops__oxzip->value}][{$shop->oxshops__oxcity->value}]</td>
+				<td style="width: 33.33%">[{$shop->oxshops__oxzip->value}] [{$shop->oxshops__oxcity->value}]</td>
 				<td style="width: 33.33%">[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_HRBNR"}][{$shop->oxshops__oxhrbnr->value}]</td>
 				<td style="width: 33.33%">[{oxmultilang ident="ORDER_OVERVIEW_PDF_ACCOUNTNR"}][{$shop->oxshops__oxibannumber->value}]</td>
 			</tr>
 			<tr>
-				<td style="width: 33.33%">[{$shop->oxshops__oxcountry->value}]</td>
+				<td style="width: 33.33%"></td>
 				<td style="width: 33.33%">[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_USTID"}][{$shop->oxshops__oxvatnumber->value}]</td>
 				<td style="width: 33.33%">[{oxmultilang ident="ORDER_OVERVIEW_PDF_BANKCODE"}][{$shop->oxshops__oxbiccode->value}]</td>
 			</tr>
@@ -57,148 +58,106 @@
 				<td style="width: 100%">[{$shop->oxshops__oxinfoemail->value}]</td>
 			</tr>
 		</table>
-    </page_footer>
+	</page_footer>
 	
 	<table style="width: 100%; font-size: 12px; margin-top: 50px;" cellspacing="0">
 		<tr>
-			<td style="width: 70%"></td>
-			<td style="width: 30%;" class="aligning"><strong>[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_GET_IN_CONTACT"}]</strong></td>
+			<td style="width: 50%;"></td>
+			<td style="width: 50%;" class="aligning"><strong>[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_GET_IN_CONTACT"}]</strong></td>
 		</tr>
 		<tr>
-			<td style="width: 70%; font-size: 8px">[{$shop->oxshops__oxname->value}] - [{$shop->oxshops__oxstreet->value}] - [{$shop->oxshops__oxzip->value}] [{$shop->oxshops__oxcity->value}]</td>
-			<td style="width: 30%;" class="aligning sizing">[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_TELEFON"}][{$shop->oxshops__oxtelefon->value}]</td>
+			<td style="width: 50%; font-size: 8px;">[{$shop->oxshops__oxname->value}] - [{$shop->oxshops__oxstreet->value}] - [{$shop->oxshops__oxzip->value}] [{$shop->oxshops__oxcity->value}]</td>
+			<td style="width: 50%;" class="aligning sizing">[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_TELEFON"}][{$shop->oxshops__oxtelefon->value}]</td>
 		</tr>
 		<tr>
-			<td style="width: 70%"></td>
-			<td style="width: 30%" class="aligning sizing">[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_FAX"}][{$shop->oxshops__oxtelefax->value}]</td>
-		</tr>
-		<tr>
-			<td style="width: 70%">[{$order->oxorder__oxbillcompany->value}]</td>
-			<td style="width: 30%" class="aligning sizing">[{$shop->oxshops__oxinfoemail->value}]</td>
-		</tr>
-		<tr>
-			<td style="width: 70%">[{$order->oxorder__oxbillfname->value}] [{$order->oxorder__oxbilllname->value}]</td>
-			<td style="width: 30%"></td>
-		</tr>
-		<tr>
-			<td style="width: 70%">[{$order->oxorder__oxbillstreet->value}] [{$order->oxorder__oxbillstreetnr->value}]</td>
-			<td style="width: 30%" class="aligning"><strong>[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_BANKVERBINDUNG"}]</strong></td>
-		</tr>
-		<tr>
-			<td style="width: 70%"><strong>[{$order->oxorder__oxbillzip}] [{$order->oxorder__oxbillcity->value}]</strong></td>
-			<td style="width: 30%" class="aligning sizing">[{$shop->oxshops__oxbankname->value}]</td>
+			<td style="width: 50%; "></td>
+			<td style="width: 50%; " class="aligning sizing">[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_FAX"}][{$shop->oxshops__oxtelefax->value}]</td>
 		</tr>
 	</table>
 	<table style="width: 100%; font-size: 12px;" cellspacing="0">
 		<tr>
-			<td style="width: 10%">[{$shop->oxshops__oxcountry->value}]</td>
-			<td style="width: 90%" class="aligning sizing">[{oxmultilang ident="ORDER_OVERVIEW_PDF_ACCOUNTNR"}][{$shop->oxshops__oxibannumber->value}]</td>
+			<td style="width: 50%;">
+				<div>[{$order->oxorder__oxbillcompany->value}]</div>
+				<div>[{$order->oxorder__oxbillfname->value}] [{$order->oxorder__oxbilllname->value}]</div>
+				<div>[{$order->oxorder__oxbillstreet->value}] [{$order->oxorder__oxbillstreetnr->value}]</div>
+				<div><strong>[{$order->oxorder__oxbillzip->value}] [{$order->oxorder__oxbillcity->value}]</strong></div>
+				<div style="padding-bottom: 10px">[{$shop->oxshops__oxcountry->value}]</div>
+
+[{* +++++Lieferadressen dynamisch++++++ *}]
+			[{if $order->oxorder__oxdelstreet->value}]
+				<div style="font-size: 10px; padding-bottom: 10px">[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_DELIVERYADDRESS"}]</div>
+			[{if $order->oxorder__oxdelcompany->value}]<div>[{$order->oxorder__oxdelcompany->value}]</div>[{/if}]
+				<div>[{$order->oxorder__oxdelfname->value}] [{$order->oxorder__oxdellname->value}]</div>
+				<div>[{$order->oxorder__oxdelstreet->value}] [{$order->oxorder__oxdelstreetnr->value}]</div>
+				<div><strong>[{$order->oxorder__oxdelzip->value}] [{$order->oxorder__oxdelcity->value}]</strong></div>
+				<div>[{$shop->oxshops__oxcountry->value}]</div>
+				<div>[{$shop->oxshops__oxdeladdinfo->value}]</div>
+			[{/if}]
+			</td>
+			<td style="width: 50%;">
+				<div style="padding-top: 10px" class="aligning"><strong>[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_BANKVERBINDUNG"}]</strong></div>
+				<div class="aligning">[{$shop->oxshops__oxbankname->value}]</div>
+				<div class="aligning">[{oxmultilang ident="ORDER_OVERVIEW_PDF_ACCOUNTNR"}][{$shop->oxshops__oxibannumber->value}]</div>
+				<div style="padding-bottom: 10px" class="aligning">[{oxmultilang ident="ORDER_OVERVIEW_PDF_BANKCODE_HEADER"}][{$shop->oxshops__oxbiccode->value}]</div>
+			</td>
 		</tr>
 	</table>
 	<table style="width: 100%; font-size: 12px;" cellspacing="0">
 		<tr>
-			<td style="width: 70%"></td>
-			<td style="width: 30%" class="aligning sizing">[{oxmultilang ident="ORDER_OVERVIEW_PDF_BANKCODE_HEADER"}][{$shop->oxshops__oxbiccode->value}]</td>
-		</tr>
-		<tr>
-			<td style="width: 70%">&nbsp;</td>
-			<td style="width: 30%"></td>
-		</tr>
-		<tr>
-			<td style="width: 70%"></td>
-			<td style="width: 30%" class="aligning">[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_ORDERBILLNR"}][{$order->oxorder__oxbillnr->value}]</td>
-		</tr>
-		<tr>
-			<td style="width: 70%; font-size: 15px;"><strong>[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_ORDERNR"}][{$order->oxorder__oxordernr->value}]</strong></td>
-			<td style="width: 30%" class="aligning">[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_ORDERBILL_CUSTOMERNR"}] [{$user->oxuser__oxcustnr->value}]</td>
-		</tr>
-		<tr>
-			<td style="width: 70%; font-size: 14px">[{if $order->oxorder__d3pdftextkostenstelle_kunden->value}][{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_INVOICENOTE"}][{$order->oxorder__d3pdftextkostenstelle_kunden->value}][{/if}]</td>
-			<td style="width: 30%" class="aligning">[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_DATE"}][{$order->oxorder__oxbilldate->value|date_format:"%d. %m. %Y"}]</td>
-		</tr>
-		<tr>
-			<td style="width: 70%; font-size: 14px; padding-top: 20px"></td>
-			<td style="width: 30%" class="aligning"></td>
-		</tr>
-		<tr>
-			<td style="width: 70%">[{oxmultilang ident="ORDER_OVERVIEW_PDF_ORDERSINCERELY"}][{$order->oxorder__oxorderdate->value|date_format:"%d. %m. %Y"}][{oxmultilang ident="ORDER_OVERVIEW_PDF_ORDERSAT"}]</td>
-			<td style="width: 30%" class="aligning">[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_USTIDNR"}][{$shop->oxshops__oxvatnumber->value}]</td>
+			<td style="width: 50%;">
+				<div style="font-size: 15px; padding-top: 10px"><strong>[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_ORDERNR"}][{$order->oxorder__oxordernr->value}]</strong></div>
+				<div style="padding-top:10px">[{if $order->oxorder__d3pdftextkostenstelle_kunden->value}][{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_INVOICENOTE"}][{$order->oxorder__d3pdftextkostenstelle_kunden->value}][{/if}]</div>
+				<div style="padding-bottom: 10px">[{if $order->oxorder__oxremark->value }][{$order->oxorder__oxremark->value}][{/if}]</div>
+				<div>[{oxmultilang ident="ORDER_OVERVIEW_PDF_ORDERSINCERELY"}][{$order->oxorder__oxorderdate->value|date_format:"%d.%m.%Y"}][{oxmultilang ident="ORDER_OVERVIEW_PDF_ORDERSAT"}]</div>
+			</td>
+			<td style="width: 50%;">
+				<div style="padding-top: 10px" class="aligning">[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_ORDERBILLNR"}][{$order->oxorder__oxbillnr->value}]</div>
+				<div class="aligning">[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_ORDERBILL_CUSTOMERNR"}] [{$user->oxuser__oxcustnr->value}]</div>
+				<div style="padding-bottom: 10px" class="aligning">[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_DATE"}][{$order->oxorder__oxbilldate->value|date_format:"%d.%m.%Y"}]</div>
+				<div class="aligning">[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_USTIDNR"}][{$shop->oxshops__oxvatnumber->value}]</div>
+			</td>
 		</tr>
 	</table>
-	
-	
-	
-	<table style="width: 100%; border-bottom: solid 1px #000; margin-top: 10px;" cellspacing="0">
+
+	<table style="width: 100%; margin-top: 10px;" cellspacing="0">
 		<tr>
-			<td style="width: 8%" class="sizing">[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_AMOUNT"}]</td>
-			<td style="width: 20%" class="sizing">[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_ARTNR"}]</td>
-			<td style="width: 40%" class="sizing">[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_DESCRIPTION"}]</td>
-			<td style="width: 5%" class="sizing aligning">[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_USTPERCENTAGE"}]</td>
-			<td style="width: 12%; text-align: right" class="sizing">[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_UNITPRICE"}]</td>
-			<td style="width: 15%" class="aligning sizing">[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_TOTALPRICE"}]</td>
+			<td style="width: 10%; padding-bottom: 5px; font-size: 11px;" class="sizing vertical-a">[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_AMOUNT"}]</td>
+			<td style="width: 15%; padding-bottom: 5px; font-size: 11px;" class="sizing">[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_ARTNR"}]</td>
+			<td style="width: 40%; padding-bottom: 5px; font-size: 11px;" class="sizing">[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_DESCRIPTION"}]</td>
+			<td style="width: 10%; padding-bottom: 5px; font-size: 11px;" class="sizing aligning">[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_USTPERCENTAGE"}]</td>
+			<td style="width: 12%; text-align: right; padding-bottom: 5px; font-size: 11px;" class="sizing">[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_UNITPRICE"}]</td>
+			<td style="width: 13%; padding-bottom: 5px; font-size: 11px;" class="aligning sizing">[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_TOTALPRICE"}]</td>
 		</tr>
 		<tr>
-			<td style="width: 8%; border-top: solid 1px #000;"></td>
-			<td style="width: 20%; border-top: solid 1px #000;"></td>
-			<td style="width: 40%; border-top: solid 1px #000;"></td>
-			<td style="width: 5%; border-top: solid 1px #000;"></td>
-			<td style="width: 12%; border-top: solid 1px #000;"></td>
-			<td style="width: 15%; border-top: solid 1px #000;"></td>
+			<td style="width: 10%; border-top: solid 0.15mm #000; padding-bottom: 5px"></td>
+			<td style="width: 15%; border-top: solid 0.15mm #000; padding-bottom: 5px"></td>
+			<td style="width: 40%; border-top: solid 0.15mm #000; padding-bottom: 5px"></td>
+			<td style="width: 10%; border-top: solid 0.15mm #000; padding-bottom: 5px"></td>
+			<td style="width: 12%; border-top: solid 0.15mm #000; padding-bottom: 5px"></td>
+			<td style="width: 13%; border-top: solid 0.15mm #000; padding-bottom: 5px"></td>
 		</tr>
-		
 [{foreach from=$order->getOrderArticles(true) item=oOrderArticle}]
 		<tr>
-			<td style="width: 8%" class='vertical-a sizing'>[{$oOrderArticle->oxorderarticles__oxamount->value }]</td>
-			<td style="width: 20%" class='vertical-a sizing'>[{$oOrderArticle->oxorderarticles__oxartnum->value }]</td>
-			<td style="width: 40%" class='vertical-a sizing'>[{$oOrderArticle->oxorderarticles__oxtitle->getRawValue() }] [{ $oOrderArticle->oxorderarticles__oxselvariant->getRawValue() }]</td>
-			<td style="width: 5%" class='vertical-a sizing aligning'>[{$oOrderArticle->oxorderarticles__oxvat->value }]</td>
-			<td style="width: 12%; text-align: right" class='vertical-a sizing'>[{$oOrderArticle->getBrutPriceFormated()}] [{$currency->name}]</td>
-			<td style="width: 15%" class="aligning vertical-a sizing">[{$oOrderArticle->getTotalBrutPriceFormated()}] [{$currency->name}]</td>
+			<td style="width: 10%; padding-bottom:  5px; " class='vertical-a sizing'>[{$oOrderArticle->oxorderarticles__oxamount->value }]</td>
+			<td style="width: 15%; padding-bottom:  5px; " class='vertical-a sizing'>[{$oOrderArticle->oxorderarticles__oxartnum->value }]</td>
+			<td style="width: 40%; padding-bottom:  5px; " class='vertical-a sizing'>[{$oOrderArticle->oxorderarticles__oxtitle->getRawValue() }] [{ $oOrderArticle->oxorderarticles__oxselvariant->getRawValue() }]</td>
+			<td style="width: 10%; padding-bottom:  5px; " class='vertical-a sizing aligning'>[{$oOrderArticle->oxorderarticles__oxvat->value }]</td>
+			<td style="width: 12%; padding-bottom: 5px; text-align: right" class='vertical-a sizing'>[{$oOrderArticle->getBrutPriceFormated()}] [{$currency->name}]</td>
+			<td style="width: 13%; padding-bottom:  5px; " class="aligning vertical-a sizing">[{$oOrderArticle->getTotalBrutPriceFormated()}] [{$currency->name}]</td>
 		</tr>
 [{/foreach}]
+	</table>
+	<nobreak>
+	<table style="width: 100%;" cellspacing="0">
 		<tr>
-			<td style="width: 8%; border-top: solid 1px #000;"></td>
-			<td style="width: 20%; border-top: solid 1px #000;"></td>
-			<td style="width: 40%; border-top: solid 1px #000;"></td>
-			<td style="width: 5%; border-top: solid 1px #000;"></td>
-			<td style="width: 12%; border-top: solid 1px #000;"></td>
-			<td style="width: 15%; border-top: solid 1px #000;"></td>
-		</tr>			
-		<tr>
-			<td style="width: 8%"></td>
-			<td style="width: 20%"></td>
-			<td style="width: 40%" class="sizing">[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_ORDERBILL_SUMBRUTTO"}]</td>
-			<td style="width: 5%"></td>
-			<td style="width: 12%"></td>
-			<td style="width: 15%" class="aligning sizing">[{$order->getFormattedTotalBrutSum()}] [{$currency->name}]</td>
+			<td style="width: 8%; border-top: solid 0.15mm #000;"></td>
+			<td style="width: 20%; border-top: solid 0.15mm #000;"></td>
+			<td style="width: 40%; border-top: solid 0.15mm #000;"></td>
+			<td style="width: 5%; border-top: solid 0.15mm #000;"></td>
+			<td style="width: 12%; border-top: solid 0.15mm #000;"></td>
+			<td style="width: 15%; border-top: solid 0.15mm #000;"></td>
 		</tr>
-		<tr>
-			<td style="width: 8%;"></td>
-			<td style="width: 20%;"></td>
-			<td style="width: 40%; border-top: solid 1px #000;"></td>
-			<td style="width: 5%; border-top: solid 1px #000;"></td>
-			<td style="width: 12%; border-top: solid 1px #000;"></td>
-			<td style="width: 15%; border-top: solid 1px #000;"></td>
-		</tr>
-	[{if $order->getFormattedDiscount() != 0}]
-		<tr>
-			<td style="width: 8%"></td>
-			<td style="width: 20%"></td>
-			<td style="width: 40%" class="sizing">[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_ORDERBILL_DISCOUNT"}]</td>
-			<td style="width: 5%"></td>
-			<td style="width: 12%"></td>
-			<td style="width: 15%" class="aligning sizing">[{$order->getFormattedDiscount()}] [{$currency->name}]</td>
-		</tr>
-		<tr>
-			<td style="width: 8%;"></td>
-			<td style="width: 20%;"></td>
-			<td style="width: 40%; border-top: solid 1px #000;"></td>
-			<td style="width: 5%; border-top: solid 1px #000;"></td>
-			<td style="width: 12%; border-top: solid 1px #000;"></td>
-			<td style="width: 15%; border-top: solid 1px #000;"></td>
-		</tr>
-	[{/if}]
-		<tr style="border-bottom: solid 2px #000">
+		<tr style="border-bottom: solid 2px #000;">
 			<td style="width: 8%"></td>
 			<td style="width: 20%"></td>
 			<td style="width: 40%" class="sizing">[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_ORDERBILL_SUMNETTO"}]</td>
@@ -206,65 +165,109 @@
 			<td style="width: 12%"></td>
 			<td style="width: 15%" class="aligning sizing">[{$order->getFormattedTotalNetSum()}] [{$currency->name}]</td>
 		</tr>
-	[{foreach from=$order->getVats() key=VatKey item=oVat}]
+		[{if $order->getFormattedDiscount() != 0}]
+		<tr>
+			<td style="width: 8%;"></td>
+			<td style="width: 20%;"></td>
+			<td style="width: 40%; border-bottom: solid 0.15mm #000;"></td>
+			<td style="width: 5%; border-bottom: solid 0.15mm #000;"></td>
+			<td style="width: 12%; border-bottom: solid 0.15mm #000;"></td>
+			<td style="width: 15%; border-bottom: solid 0.15mm #000;"></td>
+		</tr>
 		<tr>
 			<td style="width: 8%"></td>
-			<td style="width: 20%">&nbsp;</td>
-			<td style="width: 40%" class="sizing">[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_ORDERBILL_TAX"}] [{$VatKey}] [{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_ORDERBILL_PERCENTAGE"}] [{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_ORDERBILL_TAXPERCVALUE"}]</td>
-			<td style="width: 5%%"></td>
+			<td style="width: 20%"></td>
+			<td style="width: 40%" class="sizing">[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_ORDERBILL_DISCOUNT"}]</td>
+			<td style="width: 5%"></td>
 			<td style="width: 12%"></td>
-			<td style="width: 15%" class="aligning sizing">[{$lang->formatCurrency($oVat, $currency)}] [{$currency->name}]</td>
+			<td style="width: 15%" class="aligning sizing">-[{$order->getFormattedDiscount()}] [{$currency->name}]</td>
+		</tr>
+		<tr>
+			<td style="width: 8%;"></td>
+			<td style="width: 20%;"></td>
+			<td style="width: 40%; border-top: solid 0.15mm #000;"></td>
+			<td style="width: 5%; border-top: solid 0.15mm #000;"></td>
+			<td style="width: 12%; border-top: solid 0.15mm #000;"></td>
+			<td style="width: 15%; border-top: solid 0.15mm #000;"></td>
+		</tr>
+		[{/if}]
+	[{foreach from=$order->getVats() key=VatKey item=oVat}]
+		<tr>
+			<td style="width: 8%;"></td>
+			<td style="width: 20%;">&nbsp;</td>
+			<td style="width: 40%;" class="sizing">[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_ORDERBILL_TAX"}] [{$VatKey}] [{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_ORDERBILL_PERCENTAGE"}] [{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_ORDERBILL_TAXPERCVALUE"}]</td>
+			<td style="width: 5%;"></td>
+			<td style="width: 12%;"></td>
+			<td style="width: 15%;" class="aligning sizing">[{$lang->formatCurrency($oVat, $currency)}] [{$currency->name}]</td>
 		</tr>
 	[{/foreach}]
+		<tr>
+			<td style="width: 8%; padding-bottom: 5px;"></td>
+			<td style="width: 20%; padding-bottom: 5px;"></td>
+			<td style="width: 40%; padding-bottom: 5px;" class="sizing">[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_ORDERBILL_SUMBRUTTO"}]</td>
+			<td style="width: 5%; padding-bottom: 5px;"></td>
+			<td style="width: 12%; padding-bottom: 5px;"></td>
+			<td style="width: 15%; padding-bottom: 5px;" class="aligning sizing">[{$order->getFormattedTotalBrutSum()}] [{$currency->name}]</td>
+		</tr>
 		<tr>
 			<td style="width: 8%;"></td>
 			<td style="width: 20%;"></td>
-			<td style="width: 40%; border-top: solid 1px #000;"></td>
-			<td style="width: 5%; border-top: solid 1px #000;"></td>
-			<td style="width: 12%; border-top: solid 1px #000;"></td>
-			<td style="width: 15%; border-top: solid 1px #000;"></td>
+			<td style="width: 40%; border-top: solid 0.15mm #000;"></td>
+			<td style="width: 5%; border-top: solid 0.15mm #000;"></td>
+			<td style="width: 12%; border-top: solid 0.15mm #000;"></td>
+			<td style="width: 15%; border-top: solid 0.15mm #000;"></td>
 		</tr>
 		<tr style="border-bottom: 2px solid #000">
-			<td style="width: 8%"></td>
-			<td style="width: 20%"></td>
-			<td style="width: 40%" class="sizing">[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_ORDERBILL_DELIVERY"}]</td>
-			<td style="width: 5%"></td>
-			<td style="width: 12%"></td>
-			<td style="width: 15%" class="aligning sizing">[{$order->getFormattedeliveryCost()}] [{$currency->name}]</td>
+			<td style="width: 8%; padding-top: 5px;"></td>
+			<td style="width: 20%; padding-top: 5px;"></td>
+			<td style="width: 40%; padding-top: 5px;" class="sizing">[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_ORDERBILL_DELIVERY"}]</td>
+			<td style="width: 5%; padding-top: 5px;"></td>
+			<td style="width: 12%; padding-top: 5px;"></td>
+			<td style="width: 15%; padding-top: 5px;" class="aligning sizing">[{$lang->formatCurrency($deliveryPrice->getNettoPrice(), $currency)}] [{$currency->name}]</td>
 		</tr>
 		<tr>
-			<td style="width: 8%"></td>
-			<td style="width: 20%">&nbsp;</td>
-			<td style="width: 40%" class="sizing">[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_ORDERBILL_TAX"}]</td>
-			<td style="width: 5%"></td>
-			<td style="width: 12%"></td>
-			<td style="width: 15%" class="aligning sizing">[{$lang->formatCurrency($oVat, $currency)}] [{$currency->name}]</td>
+			<td style="width: 8%; padding-bottom: 5px;"></td>
+			<td style="width: 20%; padding-bottom: 5px;">&nbsp;</td>
+			<td style="width: 40%; padding-bottom: 5px;" class="sizing">[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_ORDERBILL_TAX"}]</td>
+			<td style="width: 5%; padding-bottom: 5px;"></td>
+			<td style="width: 12%; padding-bottom: 5px;"></td>
+			<td style="width: 15%; padding-bottom: 5px;" class="aligning sizing">[{$lang->formatCurrency($deliveryPrice->getVATValue(), $currency)}] [{$currency->name}]</td>
 		</tr>
 		<tr>
-			<td style="width: 8%; border-top: solid 1px #000;"></td>
-			<td style="width: 20%; border-top: solid 1px #000;"></td>
-			<td style="width: 40%; border-top: solid 1px #000;"></td>
-			<td style="width: 5%; border-top: solid 1px #000;"></td>
-			<td style="width: 12%; border-top: solid 1px #000;"></td>
-			<td style="width: 15%; border-top: solid 1px #000;"></td>
+			<td style="width: 8%; border-top: solid 0.1mm #000;"></td>
+			<td style="width: 20%; border-top: solid 0.1mm #000;"></td>
+			<td style="width: 40%; border-top: solid 0.1mm #000;"></td>
+			<td style="width: 5%; border-top: solid 0.1mm #000;"></td>
+			<td style="width: 12%; border-top: solid 0.1mm #000;"></td>
+			<td style="width: 15%; border-top: solid 0.1mm #000;"></td>
 		</tr>
 		<tr>
-			<td style="width: 8%;"></td>
-			<td style="width: 20%;"></td>
-			<td style="width: 40%;" class="sizing"><strong>[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_ORDERBILL_TOTALSUMBRUT"}]</strong></td>
-			<td style="width: 5%;"></td>
-			<td style="width: 12%;"></td>
-			<td style="width: 15%;" class="aligning sizing">[{$order->getFormattedTotalOrderSum()}] [{$currency->name}]<strong></strong></td>
-		</tr>		
+			<td style="width: 8%; padding-bottom: 5px"></td>
+			<td style="width: 20%; padding-bottom: 5px"></td>
+			<td style="width: 40%; padding-bottom: 5px" class="sizing"><strong>[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_ORDERBILL_TOTALSUMBRUT"}]</strong></td>
+			<td style="width: 5%; padding-bottom: 5px"></td>
+			<td style="width: 12%; padding-bottom: 5px"></td>
+			<td style="width: 15%; padding-bottom: 5px" class="aligning sizing"><strong>[{$order->getFormattedTotalOrderSum()}] [{$currency->name}]</strong></td>
+		</tr>
+		<tr>
+			<td style="width: 8%; border-top: solid 0.1mm #000;"></td>
+			<td style="width: 20%; border-top: solid 0.1mm #000;"></td>
+			<td style="width: 40%; border-top: solid 0.1mm #000;"></td>
+			<td style="width: 5%; border-top: solid 0.1mm #000;"></td>
+			<td style="width: 12%; border-top: solid 0.1mm #000;"></td>
+			<td style="width: 15%; border-top: solid 0.1mm #000;"></td>
+		</tr>
 	</table>
 	<table style="width: 100%" cellspacing="0">
 		<tr><td style="width: 100%">&nbsp;</td></tr>
 		<tr><td style="width: 100%" class="sizing">[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_USED_PAYMENTMETHOD"}][{$payment->oxpayments__oxdesc->value}]</td></tr>
+		[{if $order->oxorder__d3pdftextbestellbestaetigung}]<tr><td style="width: 100%" class="sizing">[{$order->oxorder__d3pdftextbestellbestaetigung->value}]</td></tr>[{/if}]
 		<tr><td style="width: 100%" class="sizing">[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_USED_GREETINGSORDER"}]</td></tr>
 		<tr><td style="width: 100%">&nbsp;</td></tr>
 		<tr><td style="width: 100%" class="sizing">[{oxmultilang ident="ORDER_OVERVIEW_PDF_GREETINGS_AUFTRAG_1"}]</td></tr>
 		<tr><td style="width: 100%" class="sizing">[{oxmultilang ident="ORDER_OVERVIEW_PDF_GREETINGS_AUFTRAG_2"}]</td></tr>
 	</table>
+	</nobreak>
 </page>
 
 [{*