diff --git a/views/twig/admin/documents/deliverynote/deliverynote.html.twig b/views/twig/admin/documents/deliverynote/deliverynote.html.twig
new file mode 100644
index 0000000..7b42376
--- /dev/null
+++ b/views/twig/admin/documents/deliverynote/deliverynote.html.twig
@@ -0,0 +1,46 @@
+{% set pagePadding = ","|explode("45,15,30,25") %} {# top, right, bottom, left #}
+{% set showLogo = showLogo|default(true) %}
+
+{% capture append = "pdfBlock_style" %}
+ {% block pdfStyles %}
+ {% include "@d3PdfDocuments/assets/d3pdfstyles.css" %}
+ {% endblock %}
+{% endcapture %}
+
+{% capture append = "pdfBlock_header" %}
+ {% block pdfHeader %}
+ {% include "@d3PdfDocuments/documents/inc/page/d3pdfheader.html.twig" with {showLogo: showLogo} %}
+ {% endblock %}
+{% endcapture %}
+
+{% capture append = "pdfBlock_content" %}
+ {% include "@d3PdfDocuments/documents/inc/elements/d3pdffoldmarks.html.twig" with {pagePadding: pagePadding} %}
+
+ {% block pdfAddressArea %}
+ {% include "@d3PdfDocuments/documents/inc/elements/d3pdfaddressarea.html.twig" with {addressfile: "@d3PdfDocuments/documents/deliverynote/d3delnote_pdf_recipient.tpl"} %}
+ {% endblock %}
+
+ {% block pdfInformations %}
+ {% include "@d3PdfDocuments/documents/inc/elements/d3pdfinformations.html.twig" with {documentinformationfile: "@d3PdfDocuments/documents/deliverynote/d3delnote_pdf_informations.tpl"} %}
+ {% endblock %}
+
+ {% block pdfSalutation %}
+ {% include "@d3PdfDocuments/documents/deliverynote/d3delnote_pdf_salutation.html.twig" %}
+ {% endblock %}
+
+ {% block pdfArticleList %}
+ {% include "@d3PdfDocuments/documents/inc/elements/d3pdfarticlelist.html.twig" with {showPrices: false} %}
+ {% endblock %}
+
+ {% block pdfConclusion %}
+ {% include "@d3PdfDocuments/documents/deliverynote/d3delnote_pdf_conclusion.html.twig" %}
+ {% endblock %}
+{% endcapture %}
+
+{% capture append = "pdfBlock_footer" %}
+ {% block pdfFooter %}
+ {% include "@d3PdfDocuments/documents/inc/page/d3pdffooter.html.twig" with {pagePadding: pagePadding} %}
+ {% endblock %}
+{% endcapture %}
+
+{% include "@d3PdfDocuments/documents/inc/page/d3pdfbase.html.twig" with {pagePadding: pagePadding} %}
\ No newline at end of file
diff --git a/views/twig/admin/documents/deliverynote/deliverynoteNoLogo.html.twig b/views/twig/admin/documents/deliverynote/deliverynoteNoLogo.html.twig
new file mode 100644
index 0000000..ac6a308
--- /dev/null
+++ b/views/twig/admin/documents/deliverynote/deliverynoteNoLogo.html.twig
@@ -0,0 +1 @@
+{% include "@d3PdfDocuments/documents/deliverynote/d3deliverynote_pdf.html.twig" with {showLogo: false} %}
\ No newline at end of file
diff --git a/views/twig/admin/documents/deliverynote/inc/conclusion.html.twig b/views/twig/admin/documents/deliverynote/inc/conclusion.html.twig
new file mode 100644
index 0000000..5a65252
--- /dev/null
+++ b/views/twig/admin/documents/deliverynote/inc/conclusion.html.twig
@@ -0,0 +1,6 @@
+{% block conclusion %}
+
+ {% block conclusion_thankyou %}
+ {% endblock %}
+
+{% endblock %}
\ No newline at end of file
diff --git a/views/twig/admin/documents/deliverynote/inc/conclusion.tpl b/views/twig/admin/documents/deliverynote/inc/conclusion.tpl
new file mode 100644
index 0000000..45544e6
--- /dev/null
+++ b/views/twig/admin/documents/deliverynote/inc/conclusion.tpl
@@ -0,0 +1,6 @@
+[{block name="conclusion"}]
+
+ [{block name="conclusion_thankyou"}]
+ [{/block}]
+
+[{/block}]
\ No newline at end of file
diff --git a/views/twig/admin/documents/deliverynote/inc/informations.html.twig b/views/twig/admin/documents/deliverynote/inc/informations.html.twig
new file mode 100644
index 0000000..a583bc5
--- /dev/null
+++ b/views/twig/admin/documents/deliverynote/inc/informations.html.twig
@@ -0,0 +1,10 @@
+{% block informations %}
+
+{% endblock %}
\ No newline at end of file
diff --git a/views/twig/admin/documents/deliverynote/inc/informations.tpl b/views/twig/admin/documents/deliverynote/inc/informations.tpl
new file mode 100644
index 0000000..2ce19fb
--- /dev/null
+++ b/views/twig/admin/documents/deliverynote/inc/informations.tpl
@@ -0,0 +1,10 @@
+[{block name="informations"}]
+
+[{/block}]
\ No newline at end of file
diff --git a/views/twig/admin/documents/deliverynote/inc/recipientAddress.html.twig b/views/twig/admin/documents/deliverynote/inc/recipientAddress.html.twig
new file mode 100644
index 0000000..2b8cad3
--- /dev/null
+++ b/views/twig/admin/documents/deliverynote/inc/recipientAddress.html.twig
@@ -0,0 +1,25 @@
+{% block recipientaddress %}
+ {% if order.getFieldData('oxdellname') %}
+ {% if order.getFieldData('oxdelcompany') %}
+ {{ order.getFieldData('oxdelcompany') }}
+ {% endif %}
+ {{ order.getFieldData('oxdelfname') }} {{ order.getFieldData('oxdellname') }}
+ {% if order.getFieldData('oxdeladdinfo') %}
+ {{ order.getFieldData('oxdeladdinfo') }}
+ {% endif %}
+ {{ order.getFieldData('oxdelstreet') }} {{ order.getFieldData('oxdelstreetnr') }}
+ {{ order.getFieldData('oxdelzip') }} {{ order.getFieldData('oxdelcity') }}
+ {{ order.getFieldData('oxdelcountry') }}
+ {% else %}
+ {% if order.getFieldData('oxbillcompany') %}
+ {{ order.getFieldData('oxbillcompany') }}
+ {% endif %}
+ {{ order.getFieldData('oxbillfname') }} {{ order.getFieldData('oxbilllname') }}
+ {% if order.getFieldData('oxbilladdinfo') %}
+ {{ order.getFieldData('oxbilladdinfo') }}
+ {% endif %}
+ {{ order.getFieldData('oxbillstreet') }} {{ order.getFieldData('oxbillstreetnr') }}
+ {{ order.getFieldData('oxbillzip') }} {{ order.getFieldData('oxbillcity') }}
+ {{ order.getFieldData('oxbillcountry') }}
+ {% endif %}
+{% endblock %}
\ No newline at end of file
diff --git a/views/twig/admin/documents/deliverynote/inc/recipientAddress.tpl b/views/twig/admin/documents/deliverynote/inc/recipientAddress.tpl
new file mode 100644
index 0000000..e872462
--- /dev/null
+++ b/views/twig/admin/documents/deliverynote/inc/recipientAddress.tpl
@@ -0,0 +1,25 @@
+[{block name="recipientaddress"}]
+ [{if $order->getFieldData('oxdellname')}]
+ [{if $order->getFieldData('oxdelcompany')}]
+ [{$order->getFieldData('oxdelcompany')}]
+ [{/if}]
+ [{$order->getFieldData('oxdelfname')}] [{$order->getFieldData('oxdellname')}]
+ [{if $order->getFieldData('oxdeladdinfo')}]
+ [{$order->getFieldData('oxdeladdinfo')}]
+ [{/if}]
+ [{$order->getFieldData('oxdelstreet')}] [{$order->getFieldData('oxdelstreetnr')}]
+ [{$order->getFieldData('oxdelzip')}] [{$order->getFieldData('oxdelcity')}]
+ [{$order->getFieldData('oxdelcountry')}]
+ [{else}]
+ [{if $order->getFieldData('oxbillcompany')}]
+ [{$order->getFieldData('oxbillcompany')}]
+ [{/if}]
+ [{$order->getFieldData('oxbillfname')}] [{$order->getFieldData('oxbilllname')}]
+ [{if $order->getFieldData('oxbilladdinfo')}]
+ [{$order->getFieldData('oxbilladdinfo')}]
+ [{/if}]
+ [{$order->getFieldData('oxbillstreet')}] [{$order->getFieldData('oxbillstreetnr')}]
+ [{$order->getFieldData('oxbillzip')}] [{$order->getFieldData('oxbillcity')}]
+ [{$order->getFieldData('oxbillcountry')}]
+ [{/if}]
+[{/block}]
\ No newline at end of file
diff --git a/views/twig/admin/documents/deliverynote/inc/salutation.html.twig b/views/twig/admin/documents/deliverynote/inc/salutation.html.twig
new file mode 100644
index 0000000..14d4a22
--- /dev/null
+++ b/views/twig/admin/documents/deliverynote/inc/salutation.html.twig
@@ -0,0 +1,12 @@
+{% block salutation %}
+
+
{{ translate({ ident: "D3_PDFDOCUMENTS_DELIVERYNOTE" }) }}
+
{{ translate({ ident: "D3_PDFDOCUMENTS_ORDERNR", suffix: "COLON" }) }} {{ order.getFieldData('oxordernr') }}
+
+ {% set dateFormat = 'D3_PDFDOCUMENTS_DATE_FORMAT'|translate %}
+ {% set sArgs = order.getFieldData('oxorderdate')|date_format(dateFormat)|cat("//")|cat(shop.getFieldData('oxname')) %}
+ {% set aArgs = "//"|explode(sArgs) %}
+
+
{{ translate({ ident: "D3_PDFDOCUMENTS_ORDER_FROM_AT", args: aArgs }) }}
+
+{% endblock %}
\ No newline at end of file
diff --git a/views/twig/admin/documents/deliverynote/inc/salutation.tpl b/views/twig/admin/documents/deliverynote/inc/salutation.tpl
new file mode 100644
index 0000000..3a81ac1
--- /dev/null
+++ b/views/twig/admin/documents/deliverynote/inc/salutation.tpl
@@ -0,0 +1,12 @@
+[{block name="salutation"}]
+
+
[{oxmultilang ident="D3_PDFDOCUMENTS_DELIVERYNOTE"}]
+
[{oxmultilang ident="D3_PDFDOCUMENTS_ORDERNR" suffix="COLON"}] [{$order->getFieldData('oxordernr')}]
+
+ [{assign var="dateFormat" value='D3_PDFDOCUMENTS_DATE_FORMAT'|oxmultilangassign}]
+ [{assign var="sArgs" value=$order->getFieldData('oxorderdate')|date_format:$dateFormat|cat:"//"|cat:$shop->getFieldData('oxname')}]
+ [{assign var="aArgs" value="//"|explode:$sArgs}]
+
+
[{oxmultilang ident="D3_PDFDOCUMENTS_ORDER_FROM_AT" args=$aArgs}]
+
+[{/block}]
\ No newline at end of file
diff --git a/views/twig/admin/documents/inc/elements/addressarea.html.twig b/views/twig/admin/documents/inc/elements/addressarea.html.twig
new file mode 100644
index 0000000..e408f79
--- /dev/null
+++ b/views/twig/admin/documents/inc/elements/addressarea.html.twig
@@ -0,0 +1,13 @@
+{% set backaddressfile = backaddressfile|default("@d3PdfDocuments/documents/inc/page/d3pdfreturnaddress.tpl") %}
+{% set addressfile = addressfile|default("@d3PdfDocuments/documents/inc/elements/d3pdfrecipientaddress.tpl") %}
+
+
+
+
+ {% include $backaddressfile %}
+
+
+
+ {% include $addressfile %}
+
+
\ No newline at end of file
diff --git a/views/twig/admin/documents/inc/elements/articlecostssummary.html.twig b/views/twig/admin/documents/inc/elements/articlecostssummary.html.twig
new file mode 100644
index 0000000..cec824d
--- /dev/null
+++ b/views/twig/admin/documents/inc/elements/articlecostssummary.html.twig
@@ -0,0 +1,254 @@
+{% capture name = "sumnetto" %}
+ {% block sumnetto %}
+
+ |
+
+ {{ translate({ ident: "D3_PDFDOCUMENTS_SUMNETTO", suffix: "COLON" }) }}
+ |
+
+ {{ order.getFormattedTotalNetSum() }} {{ currency.name }}
+ |
+
+ {% endblock %}
+{% endcapture %}
+
+{% capture name = "discount" %}
+ {% block discount %}
+
+ |
+
+ {{ translate({ ident: "D3_PDFDOCUMENTS_DISCOUNT", suffix: "COLON" }) }}
+ |
+
+ {{ order.getFormattedDiscount() }} {{ currency.name }}
+ |
+
+ {% endblock %}
+{% endcapture %}
+
+{% capture name = "producttax" %}
+ {% block producttax %}
+ {% for VatKey, oVat in order.getProductVats(false) %}
+
+ |
+
+ {{ translate({ ident: "D3_PDFDOCUMENTS_TAX", args: VatKey, suffix: "COLON" }) }}
+ |
+
+ {{ lang.formatCurrency($oVat, currency) }} {{ currency.name }}
+ |
+
+ {% endfor %}
+ {% endblock %}
+{% endcapture %}
+
+{% capture name = "sumbrutto" %}
+ {% block sumbrutto %}
+
+ |
+
+ {{ translate({ ident: "D3_PDFDOCUMENTS_SUMBRUTTO", suffix: "COLON" }) }}
+ |
+
+ {{ order.getFormattedTotalBrutSum() }} {{ currency.name }}
+ |
+
+ {% endblock %}
+{% endcapture %}
+
+{% if order.getFieldData('oxdiscount') %}
+ {% if order.isNettoMode() %}
+ {{ smarty.capture.sumnetto }}
+ {{ smarty.capture.discount }}
+ {{ smarty.capture.producttax }}
+ {{ smarty.capture.sumbrutto }}
+ {% else %}
+ {{ smarty.capture.sumbrutto }}
+ {{ smarty.capture.discount }}
+ {{ smarty.capture.sumnetto }}
+ {{ smarty.capture.producttax }}
+ {% endif %}
+{% else %}
+ {{ smarty.capture.sumnetto }}
+ {{ smarty.capture.producttax }}
+ {{ smarty.capture.sumbrutto }}
+{% endif %}
+
+{% if order.getFieldData('oxvoucherdiscount') %}
+ {% block voucherdiscount %}
+
+ |
+
+ {{ translate({ ident: "D3_PDFDOCUMENTS_VOUCHERDISCOUNT", suffix: "COLON" }) }}
+ |
+
+ -{{ order.getFormattedTotalVouchers() }} {{ currency.name }}
+ |
+
+ {% endblock %}
+{% endif %}
+
+{% block delivery %}
+ {% if config.getConfigParam('blShowVATForDelivery') %}
+ {% set deliveryPrice = order.getOrderDeliveryPrice() %}
+
+ |
+
+ {{ translate({ ident: "D3_PDFDOCUMENTS_DELIVERY_NET", suffix: "COLON" }) }}
+ |
+
+ {{ lang.formatCurrency(deliveryPrice.getNettoPrice(), currency) }} {{ currency.name }}
+ |
+
+
+ |
+
+ {% if config.getConfigParam('sAdditionalServVATCalcMethod') != 'proportional' %}
+ {{ translate({ ident: "D3_PDFDOCUMENTS_TAX", args: order.getFieldData('oxdelvat'), suffix: "COLON" }) }}
+ {% else %}
+ {{ translate({ ident: "D3_PDFDOCUMENTS_PROPORTIONAL_TAX", suffix: "COLON" }) }}
+ {% endif %}
+ |
+
+ {{ lang.formatCurrency(deliveryPrice.getVATValue(), currency) }} {{ currency.name }}
+ |
+
+ {% else %}
+
+ |
+
+ {{ translate({ ident: "D3_PDFDOCUMENTS_DELIVERY", suffix: "COLON" }) }}
+ |
+
+ {{ lang.formatCurrency(order.getFieldData('oxdelcost'), currency) }} {{ currency.name }}
+ |
+
+ {% endif %}
+{% endblock %}
+
+{% block payment %}
+ {% if config.getConfigParam('blShowVATForPayCharge') %}
+ {% set paymentPrice = order.getOrderPaymentPrice() %}
+
+ |
+
+ {{ translate({ ident: "D3_PDFDOCUMENTS_PAYMENT_NET", suffix: "COLON" }) }}
+ |
+
+ {{ lang.formatCurrency(paymentPrice.getNettoPrice(), currency) }} {{ currency.name }}
+ |
+
+
+ |
+
+ {% if config.getConfigParam('sAdditionalServVATCalcMethod') != 'proportional' %}
+ {{ translate({ ident: "D3_PDFDOCUMENTS_TAX", args: order.getFieldData('oxpayvat'), suffix: "COLON" }) }}
+ {% else %}
+ {{ translate({ ident: "D3_PDFDOCUMENTS_PROPORTIONAL_TAX", suffix: "COLON" }) }}
+ {% endif %}
+ |
+
+ {{ lang.formatCurrency(paymentPrice.getVATValue(), currency) }} {{ currency.name }}
+ |
+
+ {% else %}
+
+ |
+
+ {{ translate({ ident: "D3_PDFDOCUMENTS_PAYMENT", suffix: "COLON" }) }}
+ |
+
+ {{ lang.formatCurrency(order.getFieldData('oxpaycost'), currency) }} {{ currency.name }}
+ |
+
+ {% endif %}
+{% endblock %}
+
+{% block wrapping %}
+ {% if order.getFieldData('oxwrapcost') %}
+ {% if config.getConfigParam('blShowVATForWrapping') %}
+ {% set wrappingPrice = order.getOrderWrappingPrice() %}
+
+ |
+
+ {{ translate({ ident: "D3_PDFDOCUMENTS_WRAPPING_NET", suffix: "COLON" }) }}
+ |
+
+ {{ lang.formatCurrency(wrappingPrice.getNettoPrice(), currency) }} {{ currency.name }}
+ |
+
+
+ |
+
+ {{ translate({ ident: "D3_PDFDOCUMENTS_UNDEFINED_TAX", suffix: "COLON" }) }}
+ |
+
+ {{ lang.formatCurrency(wrappingPrice.getVATValue(), currency) }} {{ currency.name }}
+ |
+
+ {% else %}
+
+ |
+
+ {{ translate({ ident: "D3_PDFDOCUMENTS_WRAPPING", suffix: "COLON" }) }}
+ |
+
+ {{ lang.formatCurrency(order.getFieldData('oxwrapcost'), currency) }} {{ currency.name }}
+ |
+
+ {% endif %}
+ {% endif %}
+{% endblock %}
+
+{% block giftcard %}
+ {% if order.getFieldData('oxgiftcardcost') %}
+ {% if config.getConfigParam('blShowVATForWrapping') %}
+ {% set giftCardPrice = order.getOrderGiftCardPrice() %}
+
+ |
+
+ {{ translate({ ident: "D3_PDFDOCUMENTS_GIFTCARD_NET", suffix: "COLON" }) }}
+ |
+
+ {{ lang.formatCurrency(giftCardPrice.getNettoPrice(), currency) }} {{ currency.name }}
+ |
+
+
+ |
+
+ {{ translate({ ident: "D3_PDFDOCUMENTS_UNDEFINED_TAX", suffix: "COLON" }) }}
+ |
+
+ {{ lang.formatCurrency(giftCardPrice.getVATValue(), currency) }} {{ currency.name }}
+ |
+
+ {% else %}
+
+ |
+
+ {{ translate({ ident: "D3_PDFDOCUMENTS_GIFTCARD", suffix: "COLON" }) }}
+ |
+
+ {{ lang.formatCurrency(order.getFieldData('oxgiftcardcost'), currency) }} {{ currency.name }}
+ |
+
+ {% endif %}
+ {% endif %}
+{% endblock %}
+
+{% block totalsum %}
+
+ |
+ |
+ |
+
+
+ |
+
+ {{ translate({ ident: "D3_PDFDOCUMENTS_TOTALSUMBRUT", suffix: "COLON" }) }}
+ |
+
+ {{ order.getFormattedTotalOrderSum() }} {{ currency.name }}
+ |
+
+{% endblock %}
\ No newline at end of file
diff --git a/views/twig/admin/documents/inc/elements/articlelist.html.twig b/views/twig/admin/documents/inc/elements/articlelist.html.twig
new file mode 100644
index 0000000..8f64f5b
--- /dev/null
+++ b/views/twig/admin/documents/inc/elements/articlelist.html.twig
@@ -0,0 +1,62 @@
+{% set currency = order.getOrderCurrency() %}
+{% set showPrices = showPrices|default(true) %}
+
+{% block articlelist %}
+
+
+
+ {{ translate({ ident: "D3_PDFDOCUMENTS_AMOUNT" }) }}
+ |
+
+ {{ translate({ ident: "D3_PDFDOCUMENTS_DESCRIPTION" }) }}
+ |
+ {% if showPrices %}
+
+ {{ translate({ ident: "D3_PDFDOCUMENTS_USTPERCENTAGE" }) }}
+ |
+
+ {{ translate({ ident: "D3_PDFDOCUMENTS_UNITPRICE" }) }}
+ |
+
+ {{ translate({ ident: "D3_PDFDOCUMENTS_TOTALPRICE" }) }}
+ |
+ {% endif %}
+
+ {% for orderArticle in order.getOrderArticles(true) %}
+
+
+ {{ orderArticle.getFieldData('oxamount') }}
+ |
+
+ {{ orderArticle.getFieldData('oxtitle') }} {{ orderArticle.getFieldData('oxselvariant') }}
+
+
+ {{ translate({ ident: "D3_PDFDOCUMENTS_ARTNR" }) }} {{ orderArticle.getFieldData('oxartnum') }}
+
+ |
+ {% if showPrices %}
+
+ {{ orderArticle.getFieldData('oxvat') }}
+ |
+
+ {{ orderArticle.getBrutPriceFormated() }} {{ currency.name }}
+ |
+
+ {{ orderArticle.getTotalBrutPriceFormated() }} {{ currency.name }}
+ |
+ {% endif %}
+
+ {% endfor %}
+
+{% endblock %}
+{% if showPrices %}
+ {% block articleCosts %}
+
+
+ {% block d3_article_costs_summary %}
+ {% include "@d3PdfDocuments/documents/inc/elements/d3pdfarticlecostsummary.html.twig" %}
+ {% endblock %}
+
+
+ {% endblock %}
+{% endif %}
\ No newline at end of file
diff --git a/views/twig/admin/documents/inc/elements/deliveryaddress.html.twig b/views/twig/admin/documents/inc/elements/deliveryaddress.html.twig
new file mode 100644
index 0000000..4a348d5
--- /dev/null
+++ b/views/twig/admin/documents/inc/elements/deliveryaddress.html.twig
@@ -0,0 +1,19 @@
+{% block deliveryaddress %}
+ {% if order.getFieldData('oxdelstreet') %}
+
+
+ {{ translate({ ident: "D3_PDFDOCUMENTS_DELIVERYADDRESS", suffix: "COLON" }) }}
+
+ {% if order.getFieldData('oxdelcompany') %}
+
{{ order.getFieldData('oxdelcompany') }}
+ {% endif %}
+
{{ order.getFieldData('oxdelfname') }} {{ order.getFieldData('oxdellname') }}
+ {% if order.getFieldData('oxdeladdinfo') %}
+
{{ order.getFieldData('oxdeladdinfo') }}
+ {% endif %}
+
{{ order.getFieldData('oxdelstreet') }} {{ order.getFieldData('oxdelstreetnr') }}
+
{{ order.getFieldData('oxdelzip') }} {{ order.getFieldData('oxdelcity') }}
+
{{ order.getFieldData('oxdelcountry') }}
+
+ {% endif %}
+{% endblock %}
\ No newline at end of file
diff --git a/views/twig/admin/documents/inc/elements/foldmarks.html.twig b/views/twig/admin/documents/inc/elements/foldmarks.html.twig
new file mode 100644
index 0000000..703c1b0
--- /dev/null
+++ b/views/twig/admin/documents/inc/elements/foldmarks.html.twig
@@ -0,0 +1,32 @@
+{% set defaultPagePadding = ","|explode("45,15,25,25") %} {# top, right, bottom, left #}
+{% set pagePadding = pagePadding|default(defaultPagePadding) %}
+
+
+
+{# fold marks #}
+
+
+
+{# punch mark #}
+
\ No newline at end of file
diff --git a/views/twig/admin/documents/inc/elements/informations.html.twig b/views/twig/admin/documents/inc/elements/informations.html.twig
new file mode 100644
index 0000000..233198f
--- /dev/null
+++ b/views/twig/admin/documents/inc/elements/informations.html.twig
@@ -0,0 +1,39 @@
+
\ No newline at end of file
diff --git a/views/twig/admin/documents/inc/elements/recipientAddress.html.twig b/views/twig/admin/documents/inc/elements/recipientAddress.html.twig
new file mode 100644
index 0000000..e75b6d8
--- /dev/null
+++ b/views/twig/admin/documents/inc/elements/recipientAddress.html.twig
@@ -0,0 +1,12 @@
+{% block recipientaddress %}
+ {% if order.getFieldData('oxbillcompany') %}
+ {{ order.getFieldData('oxbillcompany') }}
+ {% endif %}
+ {{ order.getFieldData('oxbillfname') }} {{ order.getFieldData('oxbilllname') }}
+ {% if order.getFieldData('oxbilladdinfo') %}
+ {{ order.getFieldData('oxbilladdinfo') }}
+ {% endif %}
+ {{ order.getFieldData('oxbillstreet') }} {{ order.getFieldData('oxbillstreetnr') }}
+ {{ order.getFieldData('oxbillzip') }} {{ order.getFieldData('oxbillcity') }}
+ {{ order.getFieldData('oxbillcountry') }}
+{% endblock %}
\ No newline at end of file
diff --git a/views/twig/admin/documents/inc/helper/rulers.html.twig b/views/twig/admin/documents/inc/helper/rulers.html.twig
new file mode 100644
index 0000000..09caa54
--- /dev/null
+++ b/views/twig/admin/documents/inc/helper/rulers.html.twig
@@ -0,0 +1,41 @@
+{% set defaultPagePadding = ","|explode("45,15,25,25") %} {# top, right, bottom, left #}
+{% set pagePadding = pagePadding|default(defaultPagePadding) %}
+
+{# rulers #}
+{# include file="@d3PdfDocuments/documents/inc/helper/d3pdfrulers.tpl" pagePadding=$pagePadding #}
+
+
+
+{# horizontal #}
+{% for rulerItemsHorizontal in 10..600 %}
+
+ {{ loop.index0 }}
+
+{% endfor %}
+
+{# vertical #}
+{% for rulerItemsVertical in 0..600 %}
+
+ {{ loop.index0 }}
+
+{% endfor %}
+
+
diff --git a/views/twig/admin/documents/inc/page/base.html.twig b/views/twig/admin/documents/inc/page/base.html.twig
new file mode 100644
index 0000000..de2b076
--- /dev/null
+++ b/views/twig/admin/documents/inc/page/base.html.twig
@@ -0,0 +1,29 @@
+{% set pageset = pageset|default("new") %}
+{% set orientation = orientation|default("P") %}
+{% set format = format|default("A4") %}
+{% set defaultPagePadding = ","|explode("45,15,25,25") %} {# top, right, bottom, left #}
+{% set pagePadding = pagePadding|default(defaultPagePadding) %}
+
+
+
+
+
+ {% for _block in pdfBlock_header %}
+ {{ _block }}
+ {% endfor %}
+
+
+
+ {% for _block in pdfBlock_footer %}
+ {{ _block }}
+ {% endfor %}
+
+
+ {% for _block in pdfBlock_content %}
+ {{ _block }}
+ {% endfor %}
+
\ No newline at end of file
diff --git a/views/twig/admin/documents/inc/page/footer.html.twig b/views/twig/admin/documents/inc/page/footer.html.twig
new file mode 100644
index 0000000..7c9d018
--- /dev/null
+++ b/views/twig/admin/documents/inc/page/footer.html.twig
@@ -0,0 +1,38 @@
+{% set defaultPagePadding = ","|explode("45,15,25,25") %} {# top, right, bottom, left #}
+{% set pagePadding = pagePadding|default(defaultPagePadding) %}
+
+{% block pdfFooter %}
+
+
+{% endblock %}
\ No newline at end of file
diff --git a/views/twig/admin/documents/inc/page/header.html.twig b/views/twig/admin/documents/inc/page/header.html.twig
new file mode 100644
index 0000000..3a6ae75
--- /dev/null
+++ b/views/twig/admin/documents/inc/page/header.html.twig
@@ -0,0 +1,13 @@
+{% set showLogo = showLogo|default(true) %}
+
+{% block pdfHeader %}
+
+{% endblock %}
\ No newline at end of file
diff --git a/views/twig/admin/documents/inc/page/returnaddress.html.twig b/views/twig/admin/documents/inc/page/returnaddress.html.twig
new file mode 100644
index 0000000..11b9534
--- /dev/null
+++ b/views/twig/admin/documents/inc/page/returnaddress.html.twig
@@ -0,0 +1 @@
+{{ shop.getFielddata('oxname') }} - {{ shop.getFielddata('oxstreet') }} - {{ shop.getFielddata('oxzip') }} {{ shop.getFielddata('oxcity') }} - {{ shop.getFieldData('oxcountry') }}
\ No newline at end of file
diff --git a/views/twig/admin/documents/invoice/inc/conclusion.html.twig b/views/twig/admin/documents/invoice/inc/conclusion.html.twig
new file mode 100644
index 0000000..0662e67
--- /dev/null
+++ b/views/twig/admin/documents/invoice/inc/conclusion.html.twig
@@ -0,0 +1,19 @@
+{% block conclusion %}
+
+ {% block conclusion_paymethod %}
+
+ {{ translate({ ident: "D3_PDFDOCUMENTS_USED_PAYMENTMETHOD", suffix: "COLON" }) }}
+ {{ payment.getFieldData('oxdesc') }}
+
+ {% include "@d3PdfDocuments/documents/invoice/d3invoice_pdf_payinfo.html.twig" %}
+
+ {% endblock %}
+
+ {% block conclusion_thankyou %}
+
+ {{ translate({ ident: "D3_PDFDOCUMENTS_THANKYOU_1" }) }}
+ {{ translate({ ident: "D3_PDFDOCUMENTS_THANKYOU_2", args: shop.getFieldData('oxname') }) }}
+
+ {% endblock %}
+
+{% endblock %}
diff --git a/views/twig/admin/documents/invoice/inc/informations.html.twig b/views/twig/admin/documents/invoice/inc/informations.html.twig
new file mode 100644
index 0000000..9352471
--- /dev/null
+++ b/views/twig/admin/documents/invoice/inc/informations.html.twig
@@ -0,0 +1,19 @@
+{% block informations %}
+
+{% endblock %}
\ No newline at end of file
diff --git a/views/twig/admin/documents/invoice/inc/payinfo.html.twig b/views/twig/admin/documents/invoice/inc/payinfo.html.twig
new file mode 100644
index 0000000..386a5b8
--- /dev/null
+++ b/views/twig/admin/documents/invoice/inc/payinfo.html.twig
@@ -0,0 +1,16 @@
+{% block payinfo %}
+ {% if payment.getId() == 'oxidinvoice' %}
+ {% block payinfo_billable_till %}
+ {% set dateFormat = 'D3_PDFDOCUMENTS_DATE_FORMAT'|translate %}
+ {{ translate({ ident: "D3_PDFDOCUMENTS_PAYABLEUNTIL" }) }}
+ {{ document.getPayableUntilDate()|date_format("dateFormat") }}
+ {% endblock %}
+ {% elseif payment.getId() == 'oxidpayadvance' or payment.getId() == 'oxidcreditcard' %}
+ {% block payinfo_payed %}
+ {{ translate({ ident: "D3_PDFDOCUMENTS_RECEIVED_PAYMENT" }) }}
+ {% endblock %}
+ {% else %}
+ {% block payinfo_other %}
+ {% endblock %}
+ {% endif %}
+{% endblock %}
diff --git a/views/twig/admin/documents/invoice/inc/salutation.html.twig b/views/twig/admin/documents/invoice/inc/salutation.html.twig
new file mode 100644
index 0000000..b201bb8
--- /dev/null
+++ b/views/twig/admin/documents/invoice/inc/salutation.html.twig
@@ -0,0 +1,12 @@
+{% block salutation %}
+
+
{{ translate({ ident: "D3_PDFDOCUMENTS_INVOICE" }) }}
+
{{ translate({ ident: "D3_PDFDOCUMENTS_ORDERNR", suffix: "COLON" }) }} {{ order.getFieldData('oxordernr') }}
+
+ {% set dateFormat = 'D3_PDFDOCUMENTS_DATE_FORMAT'|translate %}
+ {% set sArgs = order.getFieldData('oxorderdate')|date_format(dateFormat)|cat("//")|cat(shop.getFieldData('oxname')) %}
+ {% set aArgs = "//"|explode(sArgs) %}
+
+
{{ translate({ ident: "D3_PDFDOCUMENTS_ORDER_FROM_AT", args: aArgs }) }}
+
+{% endblock %}
\ No newline at end of file
diff --git a/views/twig/admin/documents/invoice/invoice.html.twig b/views/twig/admin/documents/invoice/invoice.html.twig
new file mode 100644
index 0000000..fe1fe8b
--- /dev/null
+++ b/views/twig/admin/documents/invoice/invoice.html.twig
@@ -0,0 +1,51 @@
+{% set pagePadding = ","|explode("45,15,30,25") %} {# top, right, bottom, left #}
+{% set showLogo = showLogo|default(true) %}
+
+{% capture append = "pdfBlock_style" %}
+ {% block pdfStyles %}
+ {% include "@d3PdfDocuments/assets/d3pdfstyles.css" %}
+ {% endblock %}
+{% endcapture %}
+
+{% capture append = "pdfBlock_header" %}
+ {% block pdfHeader %}
+ {% include "@d3PdfDocuments/documents/inc/page/d3pdfheader.html.twig" with {showLogo: showLogo} %}
+ {% endblock %}
+{% endcapture %}
+
+{% capture append = "pdfBlock_content" %}
+ {# include file="@d3PdfDocuments/documents/inc/helper/d3pdfrulers.tpl" pagePadding=$pagePadding #}
+ {% include "@d3PdfDocuments/documents/inc/elements/d3pdffoldmarks.html.twig" with {pagePadding: pagePadding} %}
+
+ {% block pdfAddressArea %}
+ {% include "@d3PdfDocuments/documents/inc/elements/d3pdfaddressarea.html.twig" %}
+ {% endblock %}
+
+ {% block pdfInformations %}
+ {% include "@d3PdfDocuments/documents/inc/elements/d3pdfinformations.html.twig" with {documentinformationfile: "@d3PdfDocuments/documents/invoice/d3invoice_pdf_informations.tpl"} %}
+ {% endblock %}
+
+ {% block pdfDeliveryAddress %}
+ {% include "@d3PdfDocuments/documents/inc/elements/d3pdfdeladdress.html.twig" %}
+ {% endblock %}
+
+ {% block pdfSalutation %}
+ {% include "@d3PdfDocuments/documents/invoice/d3invoice_pdf_salutation.html.twig" %}
+ {% endblock %}
+
+ {% block pdfArticleList %}
+ {% include "@d3PdfDocuments/documents/inc/elements/d3pdfarticlelist.html.twig" %}
+ {% endblock %}
+
+ {% block pdfConclusion %}
+ {% include "@d3PdfDocuments/documents/invoice/d3invoice_pdf_conclusion.html.twig" %}
+ {% endblock %}
+{% endcapture %}
+
+{% capture append = "pdfBlock_footer" %}
+ {% block pdfFooter %}
+ {% include "@d3PdfDocuments/documents/inc/page/d3pdffooter.html.twig" with {pagePadding: pagePadding} %}
+ {% endblock %}
+{% endcapture %}
+
+{% include "@d3PdfDocuments/documents/inc/page/d3pdfbase.html.twig" with {pagePadding: pagePadding} %}
diff --git a/views/twig/admin/documents/invoice/invoiceNoLogo.html.twig b/views/twig/admin/documents/invoice/invoiceNoLogo.html.twig
new file mode 100644
index 0000000..a19b7f8
--- /dev/null
+++ b/views/twig/admin/documents/invoice/invoiceNoLogo.html.twig
@@ -0,0 +1 @@
+{% include "@d3PdfDocuments/documents/invoice/d3invoice_pdf.html.twig" with {showLogo: false} %}
\ No newline at end of file
diff --git a/views/twig/admin/orderoverview_pdfform.html.twig b/views/twig/admin/orderoverview_pdfform.html.twig
new file mode 100644
index 0000000..e4df40c
--- /dev/null
+++ b/views/twig/admin/orderoverview_pdfform.html.twig
@@ -0,0 +1,46 @@
+{% if edit and oView.d3CanExport() %}
+
+
+{% endif %}
diff --git a/views/twig/extensions/themes/admin_twig/order_overview.html.twig b/views/twig/extensions/themes/admin_twig/order_overview.html.twig
new file mode 100644
index 0000000..a052221
--- /dev/null
+++ b/views/twig/extensions/themes/admin_twig/order_overview.html.twig
@@ -0,0 +1,7 @@
+{% extends "order_overview.html.twig" %}
+
+{% block admin_order_overview_export %}
+ {{ parent() }}
+
+ {% include "@d3PdfDocuments/admin/orderoverview_pdfform.html.twig" %}
+{% endblock %}
\ No newline at end of file