From 9f581a71ee116d3ca89905a1b040cb25573510bd Mon Sep 17 00:00:00 2001 From: MaxBUhe Date: Fri, 24 Apr 2020 11:31:14 +0200 Subject: [PATCH] #9641 articleTable: vertical-align:top; rearragement: articleTable_sumNetto; reword oxmultilang ident --- Application/views/tpl/deliverynote.tpl | 109 +++++++++++-------------- 1 file changed, 48 insertions(+), 61 deletions(-) diff --git a/Application/views/tpl/deliverynote.tpl b/Application/views/tpl/deliverynote.tpl index 292a28a..995f7a5 100644 --- a/Application/views/tpl/deliverynote.tpl +++ b/Application/views/tpl/deliverynote.tpl @@ -20,43 +20,32 @@
- +
- +
- - - - - - - - - - - - - - - - - - - - - - - - -
[{$shop->oxshops__oxname->value}][{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_MANAGINGDIRECTOR"}][{$shop->oxshops__oxfname->value}] [{$shop->oxshops__oxlname->value}][{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_BANKVERBINDUNG"}]
[{$shop->oxshops__oxstreet->value}][{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_COURT"}] [{$shop->oxshops__oxcourt->value}][{$shop->oxshops__oxbankname->value}]
[{$shop->oxshops__oxzip->value}] [{$shop->oxshops__oxcity->value}][{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_HRBNR"}][{$shop->oxshops__oxhrbnr->value}][{oxmultilang ident="ORDER_OVERVIEW_PDF_ACCOUNTNR"}][{$shop->oxshops__oxibannumber->value}]
[{$shop->oxshops__oxcountry->value}][{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_USTID"}][{$shop->oxshops__oxvatnumber->value}][{oxmultilang ident="ORDER_OVERVIEW_PDF_BANKCODE"}][{$shop->oxshops__oxbiccode->value}]
- - - - - - + + +
[{$shop->oxshops__oxurl->value}]
[{$shop->oxshops__oxinfoemail->value}] +
[{$shop->oxshops__oxname->value}]
+
[{$shop->oxshops__oxstreet->value}]
+
[{$shop->oxshops__oxzip->value}] [{$shop->oxshops__oxcity->value}]
+
[{$shop->oxshops__oxcountry->value}]
+
[{$shop->oxshops__oxurl->value}]
+
[{$shop->oxshops__oxinfoemail->value}]
+ 		+
[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_MANAGINGDIRECTOR"}][{$shop->oxshops__oxfname->value}] [{$shop->oxshops__oxlname->value}]
+
[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_COURT"}] [{$shop->oxshops__oxcourt->value}]
+
[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_HRBNR"}][{$shop->oxshops__oxhrbnr->value}]
+
[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_USTID"}][{$shop->oxshops__oxvatnumber->value}]
+ 		+
[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_BANKVERBINDUNG"}]
+
[{$shop->oxshops__oxbankname->value}]
+
[{oxmultilang ident="ORDER_OVERVIEW_PDF_ACCOUNTNR"}][{$shop->oxshops__oxibannumber->value}]
+
[{oxmultilang ident="ORDER_OVERVIEW_PDF_BANKCODE"}][{$shop->oxshops__oxbiccode->value}]
+
@@ -115,31 +104,29 @@ - - + + - + - - + + [{foreach from=$order->getOrderArticles(true) item=oOrderArticle}] - - + - - - + + + + [{/foreach}]
[{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_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_TOTALPRICE"}]
[{$oOrderArticle->oxorderarticles__oxamount->value }]
 -
+
[{$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}]
[{$oOrderArticle->oxorderarticles__oxvat->value }]
[{$oOrderArticle->getBrutPriceFormated()}] [{$currency->name}]
[{$oOrderArticle->getTotalBrutPriceFormated()}] [{$currency->name}]
@@ -155,12 +142,12 @@ - - - [{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_ORDERBILL_SUMNETTO"}] - - - [{$order->getFormattedTotalNetSum()}] [{$currency->name}] + + + [{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_ORDERBILL_SUMBRUTTO"}] + + + [{$order->getFormattedTotalBrutSum()}] [{$currency->name}] [{if $order->getFormattedDiscount() != 0}] @@ -188,6 +175,14 @@ [{/if}] + + + + [{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_ORDERBILL_SUMNETTO"}] + + + [{$order->getFormattedTotalNetSum()}] [{$currency->name}] + [{foreach from=$order->getVats() key=VatKey item=oVat}] @@ -198,14 +193,6 @@ [{$lang->formatCurrency($oVat, $currency)}] [{$currency->name}] [{/foreach}] - - - - [{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_ORDERBILL_SUMBRUTTO"}] - - - [{$order->getFormattedTotalBrutSum()}] [{$currency->name}] - @@ -225,7 +212,7 @@   - [{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_ORDERBILL_TAX"}] + [{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"}] [{$lang->formatCurrency($deliveryPrice->getVATValue(), $currency)}] [{$currency->name}]