diff --git a/snippets/mint_system.account.report_invoice_document.add_footer_text.xml b/snippets/mint_system.account.report_invoice_document.add_footer_text.xml
index 46f45415..75cd8adf 100644
--- a/snippets/mint_system.account.report_invoice_document.add_footer_text.xml
+++ b/snippets/mint_system.account.report_invoice_document.add_footer_text.xml
@@ -1,7 +1,7 @@
-<data priority="50">
+<data inherit_id="account.report_invoice_document" priority="50">
     <xpath expr="//div[@id='payment_term']" position="after">
         <t t-if="o.partner_shipping_id.country_id.id == 57">
        Verlagerung der Steuerschuld auf den Leistungs- und Rechnungsempfänger (Empfängerortprinzip gem. Art. 8 MWST).
         </t>
     </xpath>
-</data>
\ No newline at end of file
+</data>
diff --git a/snippets/mint_system.account.report_invoice_document.add_general_information.xml b/snippets/mint_system.account.report_invoice_document.add_general_information.xml
index 503ae683..05a69601 100644
--- a/snippets/mint_system.account.report_invoice_document.add_general_information.xml
+++ b/snippets/mint_system.account.report_invoice_document.add_general_information.xml
@@ -4,7 +4,7 @@
 
         <table style="margin-left: 0px; margin-top: 30px; border: transparent">
             <tr style="height: 100px;">
-                <td style="width: 335px; line-height: 1.3; padding-bottom: 0px">               
+                <td style="width: 335px; line-height: 1.3; padding-bottom: 0px">
                     <t t-if="o.company_id.id == 2">
                         The General Terms and Conditions of
                         <t t-out="o.company_id.name"/> apply.
@@ -13,7 +13,7 @@
                             <span t-out="o.company_id.website.replace('http://', '').replace('https://', '')"/>.
                         </t>
                     </t>
-                    <t t-if="o.company_id.id == 1">
+                    <t t-if="o.company_id.id == 1 and o.move_type == 'out_invoice' ">
                     <div style="font-weight: bold; padding-bottom: 5px">
                         <span>Payment Instructions - Use SEPA payment if possible!</span>
                     </div>
@@ -35,7 +35,7 @@
                             <span>)</span>
                             <span>IBAN:</span>
                             <span t-field="o.company_id.partner_id.bank_ids.filtered(lambda bank: bank.currency_id == o.currency_id)[0].acc_number"/>
-                            
+
                         </t>
                     </div>
                     <div>
@@ -53,10 +53,12 @@
                 </td>
                 <td style="width: 40px"/>
                 <td style="width: 300px; vertical-align: top">
+                    <t t-if="o.move_type == 'out_invoice' ">
                     <div style="font-weight: bold; padding-bottom: 15px">
                         <span>Payable until: </span>
                         <span t-field="o.invoice_payment_term_id"/>
                     </div>
+                    </t>
                 <t t-if="o.company_id.id == 2">
                     <div>
                         <t>
diff --git a/snippets/mint_system.account.report_invoice_document.add_header_text.xml b/snippets/mint_system.account.report_invoice_document.add_header_text.xml
index 3d5ed667..9ddf7c03 100644
--- a/snippets/mint_system.account.report_invoice_document.add_header_text.xml
+++ b/snippets/mint_system.account.report_invoice_document.add_header_text.xml
@@ -1,7 +1,7 @@
 <data priority="50">
     <xpath expr="//table[@name='invoice_line_table']" position="before">
     <t t-if="', '.join([str(x) for x in o.invoice_line_ids.sale_line_ids.order_id.mapped('x_blanket_order') if x])">
-            
+
         <span t-esc="', '.join([str(x) for x in o.invoice_line_ids.sale_line_ids.order_id.mapped('x_blanket_order') if x])"/>
 
         </t>
diff --git a/snippets/mint_system.l10n_din5008.external_layout_din5008.replace_information_block.xml b/snippets/mint_system.l10n_din5008.external_layout_din5008.replace_information_block.xml
index 9f788e47..c28a6ac7 100644
--- a/snippets/mint_system.l10n_din5008.external_layout_din5008.replace_information_block.xml
+++ b/snippets/mint_system.l10n_din5008.external_layout_din5008.replace_information_block.xml
@@ -1,23 +1,50 @@
 <data priority="50">
-    <xpath expr="//td[@t-if='din5008_document_information']" position="replace">
+
+    <xpath expr="//div[@class='information_block']/.." position="replace">
         <style>
+            div.information_block tr {
+                heigt: 30px;
+            }
             .din_page.invoice_note tr .address, .din_page.invoice_note tr .shipping_address {
-                width: 76mm;
+                width: 85mm;
             }
             div.information_block {
                 line-height: 1.5;
             }
+
+            .din_page.invoice_note tr .information_block {
+                margin-left: 10mm;
+            }
+
         </style>
 
-        <td style="vertical-align: top; padding-top: 30px">
+        <td style="vertical-align: top;">
             <div class="information_block">
                 <t t-if="'l10n_din5008_template_data' in company" t-set="template_data" t-value="company.l10n_din5008_template_data"/>
                 <t t-if="o and 'l10n_din5008_template_data' in o" t-set="template_data" t-value="o.l10n_din5008_template_data"/>
                 <table>
-                
-                    <!-- Rechnung -->
-                    <t t-if="o.type_name == 'Ausgangsrechnung'">
 
+                    <t t-if="o._name not in ['sale.order', 'stock.picking']">
+
+                        <tr>
+                            <td colspan="2" style="font-size: 14px; font-weight: bold; padding-bottom: 7px; white-space: nowrap;">
+                                <span t-if="not o and not docs">
+                                    <t t-out="company.l10n_din5008_document_title"/>
+                                </span>
+                                <span t-else="">
+                                    <t t-set="o" t-value="docs[0]" t-if="not o"/>
+                                    <span t-if="'l10n_din5008_document_title' in o">
+                                        <t t-out="o.l10n_din5008_document_title"/>
+                                    </span>
+                                    <span t-elif="'name' in o" t-field="o.name"/>
+                                </span>
+                            </td>
+                        </tr>
+
+                    </t>
+
+                    <!-- Ausgangsrechnung -->
+                    <t t-if="o._name == 'account.move'">
                         <tr>
                             <td>
                                 <span>Invoice No.</span>
@@ -44,43 +71,156 @@
                         </tr>
                         <tr>
                             <td>
-                                <span>Source</span>
+                                <span>Our Order</span>
                             </td>
                             <td>
                                 <span t-field="o.invoice_origin"/>
                             </td>
                         </tr>
+                        <t t-if="o.ref">
                         <tr>
                             <td>
-                                <span>Reference</span>
+                                <span>Your Order</span>
                             </td>
                             <td>
                                 <span t-field="o.ref"/>
                             </td>
                         </tr>
-                        <tr>
-                            <td>
-                                <span>Delivery Date</span>
-                            </td>
-                            <td>
-                                <span t-field="o.delivery_date"/>
-                            </td>
-                        </tr>
-                        <tr>
-                            <td>
-                                <span>Incoterms</span>
-                            </td>
-                            <td>
-                                <span t-field="o.invoice_incoterm_id.code"/>
-                            </td>
-                        </tr>
+                        </t>
+                        <t t-if="o.delivery_date">
+                            <tr>
+                                <td>
+                                    <span>Delivery Date</span>
+                                </td>
+                                <td>
+                                    <span t-field="o.delivery_date"/>
+                                </td>
+                            </tr>
+                        </t>
+                        <t t-if="o.invoice_incoterm_id.code">
+                            <tr>
+                                <td>
+                                    <span>Incoterm</span>
+                                </td>
+                                <td>
+                                    <span t-field="o.invoice_incoterm_id.code"/>
+                                </td>
+                            </tr>
+                        </t>
                     </t>
 
-                    <!-- Verkaufsauftrag -->
-                    <t t-if="o.type_name == 'Verkaufsauftrag' or o.type_name == 'Bon de commande'">
+                    <!-- Angebot/Verkaufsauftrag  -->
+                    <t t-if="o._name == 'sale.order'">
+
+                        <t t-if="is_pro_forma">
+                            <tr>
+                                <td colspan="2" style="font-size: 14px; font-weight: bold; padding-bottom: 7px; white-space: nowrap;">
+                                    <span>Proforma-Invoice</span>
+                                </td>
+                            </tr>
+                        </t>
+                        <t t-if="o.state == 'draft' and not is_pro_forma">
+                            <tr>
+                                <td colspan="2" style="font-size: 14px; font-weight: bold; padding-bottom: 7px; white-space: nowrap;">
+                                    <span>Offer</span>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td>
+                                    <span>Offer No.</span>
+                                </td>
+                                <td>
+                                    <span t-field="o.name"/>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td>
+                                    <span>Offer Date</span>
+                                </td>
+                                <td>
+                                    <span t-field="o.date_order" t-options="{'widget': 'date'}"/>
+                                </td>
+                            </tr>
+                        </t>
+                        <t t-if="o.state in ('sent', 'sale', 'cancel') and not is_pro_forma">
+                            <tr>
+                                <td colspan="2" style="font-size: 14px; font-weight: bold; padding-bottom: 7px; white-space: nowrap;">
+                                    <span>Order Confirmation</span>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td>
+                                    <span>Order No.</span>
+                                </td>
+                                <td>
+                                    <span t-field="o.name"/>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td>
+                                    <span>Order Date</span>
+                                </td>
+                                <td>
+                                    <span t-field="o.date_order" t-options="{'widget': 'date'}"/>
+                                </td>
+                            </tr>
+                        </t>
+                        <t t-if="is_pro_forma">
+                            <tr>
+                                <td>
+                                    <span>Order No.</span>
+                                </td>
+                                <td>
+                                    <span t-field="o.name"/>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td>
+                                    <span>Order Date</span>
+                                </td>
+                                <td>
+                                    <span t-field="o.date_order" t-options="{'widget': 'date'}"/>
+                                </td>
+                            </tr>
+                        </t>
+
+                        <t t-if="o.client_order_ref">
+                            <tr>
+                                <td>
+                                    <span>Your reference</span>
+                                </td>
+                                <td>
+                                    <span t-field="o.client_order_ref"/>
+                                </td>
+                            </tr>
+                        </t>
+                        <t t-if="o.commitment_date">
+                            <tr>
+                                <td>
+                                    <span>Delivery Date</span>
+                                </td>
+                                <td>
+                                    <span t-field="o.commitment_date" t-options="{'widget': 'date'}"/>
+                                </td>
+                            </tr>
+                        </t>
+                        <t t-if="o.incoterm">
+                            <tr>
+                                <td>
+                                    <span>Incoterm</span>
+                                </td>
+                                <td>
+                                    <span t-field="o.incoterm.code"/>
+                                </td>
+                            </tr>
+                        </t>
+                    </t>
+
+                    <!-- Bestellung  -->
+                    <t t-if="o._name == 'purchase.order'">
                         <tr>
                             <td>
-                                <span>Order No.</span>
+                                <span>Purchase No.</span>
                             </td>
                             <td>
                                 <span t-field="o.name"/>
@@ -88,30 +228,168 @@
                         </tr>
                         <tr>
                             <td>
-                                <span>Order Date</span>
+                                <span>Date</span>
                             </td>
                             <td>
                                 <span t-field="o.date_order" t-options="{'widget': 'date'}"/>
                             </td>
                         </tr>
-                        <tr>
-                            <td>
-                                <span>Your reference</span>
-                            </td>
-                            <td>
+                        <t t-if="o.partner_ref">
+                            <tr>
+                                <td>
+                                    <span>Your reference</span>
+                                </td>
+                                <td>
+                                    <span t-field="o.partner_ref"/>
+                                </td>
+                            </tr>
+                        </t>
+                        <t t-if="o.incoterm_id">
+                            <tr>
+                                <td>
+                                    <span>Incoterm</span>
+                                </td>
+                                <td>
+                                    <span t-field="o.incoterm_id.code"/>
+                                </td>
+                            </tr>
+                        </t>
+                    </t>
 
-                                <span t-field="o.client_order_ref"/>
+                    <!-- Lieferschein  -->
+                    <t t-if="o._name == 'stock.picking'">
+
+                        <t t-if="valued">
+                            <tr>
+                                <td colspan="2" style="font-size: 14px; font-weight: bold; padding-bottom: 7px; white-space: nowrap;">
+                                    <span>Pro-forma-invoice</span>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td>
+                                    <span>Invoice No.</span>
+                                </td>
+                                <td>
+                                    <span t-field="o.name"/>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td>
+                                    <span>Delivery Date</span>
+                                </td>
+                                <td>
+                                    <span t-field="o.date_done" t-options="{'widget': 'date'}"/>
+                                </td>
+                            </tr>
+                            <tr>
+                                <t t-if="o.origin">
+                                    <td>
+                                        <span>Source</span>
+                                    </td>
+                                    <td>
+                                        <span t-field="o.origin"/>
+                                    </td>
+                                </t>
+                            </tr>
+                            <tr>
+                                <t t-if="o.sudo().sale_id.client_order_ref">
+                                    <td>
+                                        <span>Reference</span>
+                                    </td>
+                                    <td>
+                                        <span t-field="o.sudo().sale_id.client_order_ref"/>
+                                    </td>
+                                </t>
+                            </tr>
+                            <t t-if="o.sudo().sale_id.incoterm">
+                                <tr>
+                                    <td>
+                                        <span>Incoterm</span>
+                                    </td>
+                                    <td>
+                                        <span t-field="o.sudo().sale_id.incoterm.code"/>
+                                    </td>
+                                </tr>
+                            </t>
+                            <t t-elif="o.x_incoterm">
+                                <tr>
+                                    <td>
+                                        <span>Incoterm</span>
+                                    </td>
+                                    <td>
+                                        <span t-field="o.x_incoterm.code"/>
+                                    </td>
+                                </tr>
+                            </t>
+                        </t>
+
+                        <t t-if="not valued">
+
+                            <tr>
+                                <td colspan="2" style="font-size: 14px; font-weight: bold; padding-bottom: 7px; white-space: nowrap;">
+                                    <span>Delivery Note</span>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td>
+                                    <span>No.</span>
+                                </td>
+                                <td>
+                                    <span t-field="o.name"/>
+                                </td>
+                            </tr>
+                            <t t-if="o.origin">
+                                <tr>
+                                    <td>
+                                        <span>Our Order</span>
+                                    </td>
+                                    <td>
+                                        <span t-field="o.origin"/>
+                                    </td>
+                                </tr>
+                            </t>
+                            <t t-if="o.date_done">
+                                <tr>
+                                    <td>
+                                        <span>Delivery Date</span>
+                                    </td>
+                                    <td>
+                                        <span t-field="o.date_done" t-options="{'widget': 'date'}"/>
+                                    </td>
+                                </tr>
+                            </t>
+                            <t t-if="o.sudo().sale_id.client_order_ref">
+                                <tr>
+                                    <td>
+                                        <span>Your Order</span>
+                                    </td>
+                                    <td>
+                                        <span t-field="o.sudo().sale_id.client_order_ref"/>
+                                    </td>
+                                </tr>
+                            </t>
+                            <t t-if="o.sudo().sale_id.incoterm">
+                                <tr>
+                                    <td>
+                                        <span>Incoterm</span>
+                                    </td>
+                                    <td>
+                                        <span t-field="o.sudo().sale_id.incoterm.code"/>
+                                    </td>
+                                </tr>
+                            </t>
+                            <t t-elif="o.x_incoterm">
+                                <tr>
+                                    <td>
+                                        <span>Incoterm</span>
+                                    </td>
+                                    <td>
+                                        <span t-field="o.x_incoterm.code"/>
+                                    </td>
+                                </tr>
+                            </t>
+                        </t>
 
-                            </td>
-                        </tr>
-                        <tr>
-                            <td>
-                                <span>Incoterms</span>
-                            </td>
-                            <td>
-                                <span t-field="o.incoterm.code"/>
-                            </td>
-                        </tr>
                     </t>
 
                 </table>
@@ -119,4 +397,4 @@
         </td>
 
     </xpath>
-</data>
\ No newline at end of file
+</data>