From 1946173ac35c4700afe0b161748443f8c6e251e3 Mon Sep 17 00:00:00 2001 From: MaxBUhe Date: Wed, 22 Apr 2020 16:03:34 +0200 Subject: [PATCH] #9641 changed articleTable construction, moved artnr under artDesc --- Application/views/tpl/deliverynote.tpl | 58 ++++++++++++-------------- 1 file changed, 27 insertions(+), 31 deletions(-) diff --git a/Application/views/tpl/deliverynote.tpl b/Application/views/tpl/deliverynote.tpl index f4e505e..a424f53 100644 --- a/Application/views/tpl/deliverynote.tpl +++ b/Application/views/tpl/deliverynote.tpl @@ -84,7 +84,7 @@ [{* +++++++Lieferadressen dynamisch+++++++ *}] [{if $order->oxorder__oxdelstreet->value}] -
[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_DELIVERYADDRESS"}]
+
[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_DELIVERYADDRESS"}]
[{if $order->oxorder__oxdelcompany->value}]
[{$order->oxorder__oxdelcompany->value}]
[{/if}]
[{$order->oxorder__oxdelfname->value}] [{$order->oxorder__oxdellname->value}]
[{$order->oxorder__oxdelstreet->value}] [{$order->oxorder__oxdelstreetnr->value}]
@@ -110,44 +110,40 @@ - [{* - - - -
-
[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_ORDERNR"}][{$order->oxorder__oxordernr->value}]
-
[{if $order->oxorder__d3pdftextkostenstelle_kunden->value}][{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_INVOICENOTE"}][{$order->oxorder__d3pdftextkostenstelle_kunden->value}][{/if}]
-
[{oxmultilang ident="ORDER_OVERVIEW_PDF_ORDERSINCERELY"}][{$order->oxorder__oxorderdate->value|date_format:"%d.%m.%Y"}][{oxmultilang ident="ORDER_OVERVIEW_PDF_ORDERSAT"}]
-
*}] - + [{* +++++Artikeltabelle+++++*}] +
- - - - - - + + + + + - - - - - - + + + + + -[{foreach from=$order->getOrderArticles(true) item=oOrderArticle}] + [{foreach from=$order->getOrderArticles(true) item=oOrderArticle}] - - - - - - + + + + + -[{/foreach}] + [{/foreach}]
[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_AMOUNT"}][{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_ARTNR"}][{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_DESCRIPTION"}][{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_USTPERCENTAGE"}][{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_UNITPRICE"}][{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_TOTALPRICE"}]
[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_AMOUNT"}]
[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_DESCRIPTION"}]
[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_USTPERCENTAGE"}]
[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_UNITPRICE"}]
[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_TOTALPRICE"}]
[{$oOrderArticle->oxorderarticles__oxamount->value }][{$oOrderArticle->oxorderarticles__oxartnum->value }][{$oOrderArticle->oxorderarticles__oxtitle->getRawValue() }] [{ $oOrderArticle->oxorderarticles__oxselvariant->getRawValue() }][{$oOrderArticle->oxorderarticles__oxvat->value }][{$oOrderArticle->getBrutPriceFormated()}] [{$currency->name}][{$oOrderArticle->getTotalBrutPriceFormated()}] [{$currency->name}]
[{$oOrderArticle->oxorderarticles__oxamount->value }]
 +
+ [{$oOrderArticle->oxorderarticles__oxtitle->getRawValue() }] [{ $oOrderArticle->oxorderarticles__oxselvariant->getRawValue() }] +
+ [{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_ARTNR"}] [{$oOrderArticle->oxorderarticles__oxartnum->value }] +
+
[{$oOrderArticle->oxorderarticles__oxvat->value }]
[{$oOrderArticle->getBrutPriceFormated()}] [{$currency->name}]
[{$oOrderArticle->getTotalBrutPriceFormated()}] [{$currency->name}]
+