diff --git a/snippets/account.md b/snippets/account.md
index ef65dbbc..f5559943 100644
--- a/snippets/account.md
+++ b/snippets/account.md
@@ -2132,6 +2132,20 @@ ID: `mint_system.account.report_invoice_document.unit_precision`
 ```
 Source: [snippets/account.report_invoice_document.unit_precision.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/account.report_invoice_document.unit_precision.xml)
 
+### X Hide On Invoice  
+ID: `mint_system.account.report_invoice_document.x_hide_on_invoice`  
+```xml
+<?xml version="1.0"?>
+<data inherit_id="account.report_invoice_document" priority="50">
+
+    <xpath expr="//t[@t-set='lines']" position="after">
+        <t t-set="lines" t-value="lines.filtered(lambda l: not l.product_id.x_hide_on_invoice)" />
+    </xpath>
+
+</data>
+```
+Source: [snippets/account.report_invoice_document.x_hide_on_invoice.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/account.report_invoice_document.x_hide_on_invoice.xml)
+
 ### X Picking List  
 ID: `mint_system.account.report_invoice_document.x_picking_list`  
 ```xml
@@ -4311,6 +4325,20 @@ ID: `mint_system.account.report_invoice_document.unit_precision`
 ```
 Source: [snippets/account.report_invoice_document.unit_precision.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/account.report_invoice_document.unit_precision.xml)
 
+### X Hide On Invoice  
+ID: `mint_system.account.report_invoice_document.x_hide_on_invoice`  
+```xml
+<?xml version="1.0"?>
+<data inherit_id="account.report_invoice_document" priority="50">
+
+    <xpath expr="//t[@t-set='lines']" position="after">
+        <t t-set="lines" t-value="lines.filtered(lambda l: not l.product_id.x_hide_on_invoice)" />
+    </xpath>
+
+</data>
+```
+Source: [snippets/account.report_invoice_document.x_hide_on_invoice.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/account.report_invoice_document.x_hide_on_invoice.xml)
+
 ### X Picking List  
 ID: `mint_system.account.report_invoice_document.x_picking_list`  
 ```xml
diff --git a/snippets/account.report_invoice_document.x_hide_on_invoice.xml b/snippets/account.report_invoice_document.x_hide_on_invoice.xml
new file mode 100644
index 00000000..a1c497ea
--- /dev/null
+++ b/snippets/account.report_invoice_document.x_hide_on_invoice.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+<data inherit_id="account.report_invoice_document" priority="50">
+
+    <xpath expr="//t[@t-set='lines']" position="after">
+        <t t-set="lines" t-value="lines.filtered(lambda l: not l.product_id.x_hide_on_invoice)" />
+    </xpath>
+
+</data>
\ No newline at end of file
diff --git a/snippets/ir_model.md b/snippets/ir_model.md
index e0444f6a..f3fcff68 100644
--- a/snippets/ir_model.md
+++ b/snippets/ir_model.md
@@ -1134,7 +1134,7 @@ ID: `mint_system.ir_model.product_template.x_hide_on_delivery`
     <field name="name">x_hide_on_delivery</field>
     <field name="store" eval="True"/>
     <field name="readonly" eval="False"/>
-    <field name="copied" eval="False"/>
+    <field name="copied" eval="True"/>
     <field name="ttype">boolean</field>
   </record>
 
@@ -1143,6 +1143,29 @@ ID: `mint_system.ir_model.product_template.x_hide_on_delivery`
 ```
 Source: [snippets/ir_model.product_template.x_hide_on_delivery.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/ir_model.product_template.x_hide_on_delivery.xml)
 
+### X Hide On Invoice  
+ID: `mint_system.ir_model.product_template.x_hide_on_invoice`  
+```xml
+<?xml version='1.0' encoding='UTF-8' ?>
+<odoo>
+
+  <record id="x_hide_on_invoice" model="ir.model.fields">
+    <field name="domain">[]</field>
+    <field name="field_description">Auf Rechnung ausblenden</field>
+    <field name="model">product.template</field>
+    <field name="model_id" ref="product.model_product_template"/>
+    <field name="name">x_hide_on_invoice</field>
+    <field name="store" eval="True"/>
+    <field name="readonly" eval="False"/>
+    <field name="copied" eval="True"/>
+    <field name="ttype">boolean</field>
+  </record>
+
+</odoo>
+
+```
+Source: [snippets/ir_model.product_template.x_hide_on_invoice.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/ir_model.product_template.x_hide_on_invoice.xml)
+
 ### X Hide On Sale Order  
 ID: `mint_system.ir_model.product_template.x_hide_on_sale_order`  
 ```xml
diff --git a/snippets/ir_model.product_template.x_hide_on_delivery.xml b/snippets/ir_model.product_template.x_hide_on_delivery.xml
index 479181a3..ef1b77c6 100644
--- a/snippets/ir_model.product_template.x_hide_on_delivery.xml
+++ b/snippets/ir_model.product_template.x_hide_on_delivery.xml
@@ -9,7 +9,7 @@
     <field name="name">x_hide_on_delivery</field>
     <field name="store" eval="True"/>
     <field name="readonly" eval="False"/>
-    <field name="copied" eval="False"/>
+    <field name="copied" eval="True"/>
     <field name="ttype">boolean</field>
   </record>
 
diff --git a/snippets/ir_model.product_template.x_hide_on_invoice.xml b/snippets/ir_model.product_template.x_hide_on_invoice.xml
new file mode 100644
index 00000000..5b8317ca
--- /dev/null
+++ b/snippets/ir_model.product_template.x_hide_on_invoice.xml
@@ -0,0 +1,16 @@
+<?xml version='1.0' encoding='UTF-8' ?>
+<odoo>
+
+  <record id="x_hide_on_invoice" model="ir.model.fields">
+    <field name="domain">[]</field>
+    <field name="field_description">Auf Rechnung ausblenden</field>
+    <field name="model">product.template</field>
+    <field name="model_id" ref="product.model_product_template"/>
+    <field name="name">x_hide_on_invoice</field>
+    <field name="store" eval="True"/>
+    <field name="readonly" eval="False"/>
+    <field name="copied" eval="True"/>
+    <field name="ttype">boolean</field>
+  </record>
+
+</odoo>
diff --git a/snippets/product.md b/snippets/product.md
index e0cac0b3..ae37643a 100644
--- a/snippets/product.md
+++ b/snippets/product.md
@@ -531,6 +531,24 @@ ID: `mint_system.product.product_template_only_form_view.x_hide_on_delivery`
 ```
 Source: [snippets/product.product_template_only_form_view.x_hide_on_delivery.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/product.product_template_only_form_view.x_hide_on_delivery.xml)
 
+### X Hide On Invoice  
+ID: `mint_system.product.product_template_only_form_view.x_hide_on_invoice`  
+```xml
+<?xml version="1.0"?>
+<data inherit_id="product.product_template_only_form_view" priority="50">
+
+    <group name="properties" position="before">
+        <group>
+            <group>
+                <field name="x_hide_on_invoice" widget="boolean_toggle" />
+            </group>
+        </group>
+    </group>
+
+</data>
+```
+Source: [snippets/product.product_template_only_form_view.x_hide_on_invoice.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/product.product_template_only_form_view.x_hide_on_invoice.xml)
+
 ### X Hide On Sale Order  
 ID: `mint_system.product.product_template_only_form_view.x_hide_on_sale_order`  
 ```xml
@@ -538,7 +556,7 @@ ID: `mint_system.product.product_template_only_form_view.x_hide_on_sale_order`
 <data inherit_id="product.product_template_only_form_view" priority="50">
 
     <field name="description_sale" position="after">
-        <field name="x_hide_on_sale_order" />
+        <field name="x_hide_on_sale_order" widget="boolean_toggle" />
     </field>
 
 </data>
diff --git a/snippets/product.product_template_only_form_view.x_hide_on_invoice.xml b/snippets/product.product_template_only_form_view.x_hide_on_invoice.xml
new file mode 100644
index 00000000..c83d4fc9
--- /dev/null
+++ b/snippets/product.product_template_only_form_view.x_hide_on_invoice.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0"?>
+<data inherit_id="product.product_template_only_form_view" priority="50">
+
+    <group name="properties" position="before">
+        <group>
+            <group>
+                <field name="x_hide_on_invoice" widget="boolean_toggle" />
+            </group>
+        </group>
+    </group>
+
+</data>
\ No newline at end of file
diff --git a/snippets/product.product_template_only_form_view.x_hide_on_sale_order.xml b/snippets/product.product_template_only_form_view.x_hide_on_sale_order.xml
index 784c5d18..cc1fa3be 100644
--- a/snippets/product.product_template_only_form_view.x_hide_on_sale_order.xml
+++ b/snippets/product.product_template_only_form_view.x_hide_on_sale_order.xml
@@ -2,7 +2,7 @@
 <data inherit_id="product.product_template_only_form_view" priority="50">
 
     <field name="description_sale" position="after">
-        <field name="x_hide_on_sale_order" />
+        <field name="x_hide_on_sale_order" widget="boolean_toggle" />
     </field>
 
 </data>
\ No newline at end of file
diff --git a/snippets/sale.md b/snippets/sale.md
index 21670b3f..138e5c19 100644
--- a/snippets/sale.md
+++ b/snippets/sale.md
@@ -3272,6 +3272,21 @@ ID: `mint_system.sale.view_order_form.no_create_edit`
 ```
 Source: [snippets/sale.view_order_form.no_create_edit.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/sale.view_order_form.no_create_edit.xml)
 
+### Product Id No Create  
+ID: `mint_system.sale.view_order_form.product_id_no_create`  
+```xml
+<?xml version="1.0"?>
+<data inherit_id="sale.view_order_form" priority="50">
+
+  <xpath expr="//field[@name='order_line']/tree/field[@name='product_id']" position="attributes">
+      <attribute name="options">{'no_open': True, 'no_create': True}</attribute>
+  </xpath>
+
+</data>
+
+```
+Source: [snippets/sale.view_order_form.product_id_no_create.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/sale.view_order_form.product_id_no_create.xml)
+
 ### Project Domain  
 ID: `mint_system.sale.view_order_form.project_domain`  
 ```xml
diff --git a/snippets/sale.view_order_form.product_id_no_create.xml b/snippets/sale.view_order_form.product_id_no_create.xml
new file mode 100644
index 00000000..ea086fc8
--- /dev/null
+++ b/snippets/sale.view_order_form.product_id_no_create.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+<data inherit_id="sale.view_order_form" priority="50">
+
+  <xpath expr="//field[@name='order_line']/tree/field[@name='product_id']" position="attributes">
+      <attribute name="options">{'no_open': True, 'no_create': True}</attribute>
+  </xpath>
+
+</data>
diff --git a/snippets/stock.md b/snippets/stock.md
index f8da4fb7..a181fe24 100644
--- a/snippets/stock.md
+++ b/snippets/stock.md
@@ -1442,25 +1442,47 @@ ID: `mint_system.stock.report_delivery_document.append_signature_text`
 <?xml version="1.0"?>
 <data inherit_id="stock.report_delivery_document" priority="50">
 
+  <xpath expr="//table[@name='stock_move_line_table']" position="after">
+    <style>
+      div#signature {
+      padding-left: 75px;
+      padding-right: 75px;
+      margin-top: 3rem;
+      }
+    </style>
+    <div id="signature">
+      <p>Hiermit bestätigen wir den Erhalt der Ware gemäss Lieferung.</p>
+      <br />
+      <br />
+      <div class="row">
+        <div class="col-6">
+          <p>Ort/Datum: __________________________________</p>
+        </div>
+        <div class="col-6">
+          <p>Unterschrift Kunde: __________________________________</p>
+        </div>
+      </div>
+    </div>
+  </xpath>
+
   <xpath expr="//table[@name='stock_move_line_table']" position="after">
     <div class="row" style="margin-top: 3rem;">
       <div class="col-5">
-       <p>Gebinde geliefert: _____</p>
-       <p>Gebinde zurück: _____</p>
-       <br/>
-       <p>Unterschrift Transport: _______________</p>
+        <p>Gebinde geliefert: _____</p>
+        <p>Gebinde zurück: _____</p>
+        <br />
+        <p>Unterschrift Transport: _______________</p>
       </div>
       <div class="col-2" />
       <div class="col-5">
-       <p>Produkte einwandfrei erhalten.</p>
-       <br/>
-       <p>Unterschrift Kunde: _______________</p>
+        <p>Produkte einwandfrei erhalten.</p>
+        <br />
+        <p>Unterschrift Kunde: _______________</p>
       </div>
     </div>
   </xpath>
 
 </data>
-
 ```
 Source: [snippets/stock.report_delivery_document.append_signature_text.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/stock.report_delivery_document.append_signature_text.xml)
 
@@ -1472,9 +1494,9 @@ ID: `mint_system.stock.report_delivery_document.backorder_signature_section`
 
   <xpath expr="//table[@name='stock_move_line_table']" position="after">
     <p>Retouren:<br/><br/>
-		KEG:             ___________  Anzahl<br/><br/>
-		Harassen:  ___________  Anzahl<br/><br/>
-		Waren erhalten:   Datum:  ______________________  Unterschrift:  _________________________________
+		KEG:             ___________  Anzahl<br/><br/>
+		Harassen:  ___________  Anzahl<br/><br/>
+		Waren erhalten:   Datum:  ______________________  Unterschrift:  _________________________________
     </p>
   </xpath>
 
@@ -1498,26 +1520,6 @@ ID: `mint_system.stock.report_delivery_document.barcode_customer_reference`
 ```
 Source: [snippets/stock.report_delivery_document.barcode_customer_reference.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/stock.report_delivery_document.barcode_customer_reference.xml)
 
-### Description Sale  
-ID: `mint_system.stock.report_delivery_document.description_sale`  
-```xml
-<?xml version="1.0"?>
-<data inherit_id="stock.report_delivery_document" priority="55">
-
-  <xpath expr="//span[@t-field='move.product_id']" position="replace">
-    <t t-if="move.product_id.description_sale">
-      <span t-field="move.product_id.description_sale"/>
-    </t>
-    <t t-else="">
-      <span t-field="move.product_id"/>
-    </t>
-  </xpath>
-
-</data>
-
-```
-Source: [snippets/stock.report_delivery_document.description_sale.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/stock.report_delivery_document.description_sale.xml)
-
 ### Disable Stock Move Line Table  
 ID: `mint_system.stock.report_delivery_document.disable_stock_move_line_table`  
 ```xml
@@ -2088,6 +2090,25 @@ ID: `mint_system.stock.report_delivery_document.remove_informations`
 ```
 Source: [snippets/stock.report_delivery_document.remove_informations.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/stock.report_delivery_document.remove_informations.xml)
 
+### Replace Description Sale  
+ID: `mint_system.stock.report_delivery_document.replace_description_sale`  
+```xml
+<?xml version="1.0"?>
+<data inherit_id="stock.report_delivery_document" priority="55">
+
+    <xpath expr="//span[@t-field='move.product_id']" position="replace">
+        <t t-if="move.product_id.description_sale">
+            <span t-field="move.product_id.description_sale" />
+        </t>
+        <t t-else="">
+            <span t-field="move.product_id" />
+        </t>
+    </xpath>
+
+</data>
+```
+Source: [snippets/stock.report_delivery_document.replace_description_sale.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/stock.report_delivery_document.replace_description_sale.xml)
+
 ### Replace Header  
 ID: `mint_system.stock.report_delivery_document.replace_header`  
 ```xml
@@ -2143,25 +2164,32 @@ ID: `mint_system.stock.report_delivery_document.replace_informations`
             <table class="table table-borderless table-sm">
                 <tr>
                     <td>
-                        <strong>Shipping Date:</strong>
+                        <strong>Versanddatum:</strong>
                         <t t-if="o.state == 'done'">
-                            <p t-field="o.date_done" />
+                            <span t-field="o.date_done" t-options='{"widget": "date"}' />
                         </t>
                         <t t-if="o.state != 'done'">
-                            <p t-field="o.scheduled_date" />
+                            <span t-field="o.scheduled_date" t-options='{"widget": "date"}' />
                         </t>
                     </td>
                     <td>
+                        <strong>Unser Kontakt:</strong>
+                        <span t-field="o.sudo().sale_id.user_id" />
                     </td>
                     <td>
-                        <strong>Customer Reference:</strong>
-                        <p t-field="o.sudo().sale_id.client_order_ref" />
+                        <strong>Ihr Kontakt:</strong>
+                        <span t-field="o.sudo().sale_id.partner_sale_id.name" />
                     </td>
                 </tr>
                 <tr>
                     <td colspan="2">
                         <strong>&#160;Unsere Referenz:</strong>
-                        <p t-field="o.origin" />
+                        <span t-field="o.origin" />
+                    </td>
+                    <td>
+
+                        <strong>Ihre Referenz:</strong>
+                        <span t-field="o.sudo().sale_id.client_order_ref" />
                     </td>
                 </tr>
             </table>
@@ -2437,6 +2465,25 @@ ID: `mint_system.stock.report_delivery_document.replace_product_uom_qty`
 ```
 Source: [snippets/stock.report_delivery_document.replace_product_uom_qty.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/stock.report_delivery_document.replace_product_uom_qty.xml)
 
+### Replace Sale Line Name  
+ID: `mint_system.stock.report_delivery_document.replace_sale_line_name`  
+```xml
+<?xml version="1.0"?>
+<data inherit_id="stock.report_delivery_document" priority="55">
+
+    <xpath expr="//span[@t-field='move.product_id']" position="replace">
+        <t t-if="move.sale_line_id">
+            <span t-field="move.sale_line_id.name" />
+        </t>
+        <t t-else="">
+            <span t-field="move.product_id" />
+        </t>
+    </xpath>
+
+</data>
+```
+Source: [snippets/stock.report_delivery_document.replace_sale_line_name.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/stock.report_delivery_document.replace_sale_line_name.xml)
+
 ### Replace Table  
 ID: `mint_system.stock.report_delivery_document.replace_table`  
 ```xml
@@ -2760,23 +2807,26 @@ ID: `mint_system.stock.report_delivery_document.show_default_code`
 <?xml version="1.0"?>
 <data inherit_id="stock.report_delivery_document" priority="50">
 
-  <xpath expr="//table[@name='stock_move_table']/thead/tr/th[1]" position="before">
+  <xpath expr="//table[@name='stock_move_table']//th[@name='th_sm_product']" position="before">
+    <th name="th_default_code">
+      <strong>Referenz</strong>
+    </th>
+  </xpath>
+
+  <!-- <xpath expr="//table[@name='stock_backorder_table']/thead/tr/th[1]" position="before">
     <th id="default_code">
       <strong >Nr.</strong>
     </th>
-  </xpath>
-  <xpath expr="//table[@name='stock_backorder_table']/thead/tr/th[1]" position="before">
-    <th id="default_code">
-      <strong >Nr.</strong>
-    </th>
-  </xpath>
-  <xpath expr="//table[@name='stock_move_table']/tbody//tr/td[1]" position="before">
-    <td id="default_code">
+  </xpath> -->
+
+  <xpath expr="//table[@name='stock_move_table']//span[@t-field='move.product_id']/.." position="before">
+    <td name="td_default_code">
       <span t-field="move.product_id.default_code"/>
     </td>
   </xpath>
 
 </data>
+
 ```
 Source: [snippets/stock.report_delivery_document.show_default_code.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/stock.report_delivery_document.show_default_code.xml)
 
@@ -2786,16 +2836,18 @@ ID: `mint_system.stock.report_delivery_document.show_lot_ids`
 <?xml version="1.0"?>
 <data inherit_id="stock.report_delivery_document" priority="50">
 
-  <xpath expr="//table[@name='stock_move_table']//th[1]" position="after">
+  <xpath expr="//table[@name='stock_move_table']//th[@name='th_sm_product']" position="after">
     <th name="th_lot_ids">
       <strong>Seriennummer</strong>
     </th>
   </xpath>
 
-  <xpath expr="//table[@name='stock_move_table']//td[1]" position="after">
+  <xpath expr="//table[@name='stock_move_table']//span[@t-field='move.product_id']/.." position="after">
     <td name="td_lots">
-      <ul>
-      <t t-foreach="move.lot_ids" t-as="lot" ><li t-esc="lot.name" /></t>
+      <ul class="list-unstyled">
+        <t t-foreach="move.lot_ids" t-as="lot">
+          <li t-esc="lot.name" />
+        </t>
       </ul>
     </td>
   </xpath>
diff --git a/snippets/stock.report_delivery_document.append_signature_text.xml b/snippets/stock.report_delivery_document.append_signature_text.xml
index d3707b77..63a230b5 100644
--- a/snippets/stock.report_delivery_document.append_signature_text.xml
+++ b/snippets/stock.report_delivery_document.append_signature_text.xml
@@ -2,20 +2,43 @@
 <data inherit_id="stock.report_delivery_document" priority="50">
 
   <xpath expr="//table[@name='stock_move_line_table']" position="after">
-    <div class="row" style="margin-top: 3rem;">
-      <div class="col-5">
-       <p>Gebinde geliefert: _____</p>
-       <p>Gebinde zurück: _____</p>
-       <br/>
-       <p>Unterschrift Transport: _______________</p>
-      </div>
-      <div class="col-2" />
-      <div class="col-5">
-       <p>Produkte einwandfrei erhalten.</p>
-       <br/>
-       <p>Unterschrift Kunde: _______________</p>
+    <style>
+      div#signature {
+      padding-left: 75px;
+      padding-right: 75px;
+      margin-top: 3rem;
+      }
+    </style>
+    <div id="signature">
+      <p>Hiermit bestätigen wir den Erhalt der Ware gemäss Lieferung.</p>
+      <br />
+      <br />
+      <div class="row">
+        <div class="col-6">
+          <p>Ort/Datum: __________________________________</p>
+        </div>
+        <div class="col-6">
+          <p>Unterschrift Kunde: __________________________________</p>
+        </div>
       </div>
     </div>
   </xpath>
 
-</data>
+  <xpath expr="//table[@name='stock_move_line_table']" position="after">
+    <div class="row" style="margin-top: 3rem;">
+      <div class="col-5">
+        <p>Gebinde geliefert: _____</p>
+        <p>Gebinde zurück: _____</p>
+        <br />
+        <p>Unterschrift Transport: _______________</p>
+      </div>
+      <div class="col-2" />
+      <div class="col-5">
+        <p>Produkte einwandfrei erhalten.</p>
+        <br />
+        <p>Unterschrift Kunde: _______________</p>
+      </div>
+    </div>
+  </xpath>
+
+</data>
\ No newline at end of file
diff --git a/snippets/stock.report_delivery_document.backorder_signature_section.xml b/snippets/stock.report_delivery_document.backorder_signature_section.xml
index 275aad52..2ff331b5 100644
--- a/snippets/stock.report_delivery_document.backorder_signature_section.xml
+++ b/snippets/stock.report_delivery_document.backorder_signature_section.xml
@@ -3,9 +3,9 @@
 
   <xpath expr="//table[@name='stock_move_line_table']" position="after">
     <p>Retouren:<br/><br/>
-		KEG:             ___________  Anzahl<br/><br/>
-		Harassen:  ___________  Anzahl<br/><br/>
-		Waren erhalten:   Datum:  ______________________  Unterschrift:  _________________________________
+		KEG:             ___________  Anzahl<br/><br/>
+		Harassen:  ___________  Anzahl<br/><br/>
+		Waren erhalten:   Datum:  ______________________  Unterschrift:  _________________________________
     </p>
   </xpath>
 
diff --git a/snippets/stock.report_delivery_document.description_sale.xml b/snippets/stock.report_delivery_document.description_sale.xml
deleted file mode 100644
index 3b7502a9..00000000
--- a/snippets/stock.report_delivery_document.description_sale.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0"?>
-<data inherit_id="stock.report_delivery_document" priority="55">
-
-  <xpath expr="//span[@t-field='move.product_id']" position="replace">
-    <t t-if="move.product_id.description_sale">
-      <span t-field="move.product_id.description_sale"/>
-    </t>
-    <t t-else="">
-      <span t-field="move.product_id"/>
-    </t>
-  </xpath>
-
-</data>
diff --git a/snippets/stock.report_delivery_document.replace_description_sale.xml b/snippets/stock.report_delivery_document.replace_description_sale.xml
new file mode 100644
index 00000000..b61ca4f6
--- /dev/null
+++ b/snippets/stock.report_delivery_document.replace_description_sale.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0"?>
+<data inherit_id="stock.report_delivery_document" priority="55">
+
+    <xpath expr="//span[@t-field='move.product_id']" position="replace">
+        <t t-if="move.product_id.description_sale">
+            <span t-field="move.product_id.description_sale" />
+        </t>
+        <t t-else="">
+            <span t-field="move.product_id" />
+        </t>
+    </xpath>
+
+</data>
\ No newline at end of file
diff --git a/snippets/stock.report_delivery_document.replace_informations.xml b/snippets/stock.report_delivery_document.replace_informations.xml
index d9b15804..539cef58 100644
--- a/snippets/stock.report_delivery_document.replace_informations.xml
+++ b/snippets/stock.report_delivery_document.replace_informations.xml
@@ -15,25 +15,32 @@
             <table class="table table-borderless table-sm">
                 <tr>
                     <td>
-                        <strong>Shipping Date:</strong>
+                        <strong>Versanddatum:</strong>
                         <t t-if="o.state == 'done'">
-                            <p t-field="o.date_done" />
+                            <span t-field="o.date_done" t-options='{"widget": "date"}' />
                         </t>
                         <t t-if="o.state != 'done'">
-                            <p t-field="o.scheduled_date" />
+                            <span t-field="o.scheduled_date" t-options='{"widget": "date"}' />
                         </t>
                     </td>
                     <td>
+                        <strong>Unser Kontakt:</strong>
+                        <span t-field="o.sudo().sale_id.user_id" />
                     </td>
                     <td>
-                        <strong>Customer Reference:</strong>
-                        <p t-field="o.sudo().sale_id.client_order_ref" />
+                        <strong>Ihr Kontakt:</strong>
+                        <span t-field="o.sudo().sale_id.partner_sale_id.name" />
                     </td>
                 </tr>
                 <tr>
                     <td colspan="2">
                         <strong>&#160;Unsere Referenz:</strong>
-                        <p t-field="o.origin" />
+                        <span t-field="o.origin" />
+                    </td>
+                    <td>
+
+                        <strong>Ihre Referenz:</strong>
+                        <span t-field="o.sudo().sale_id.client_order_ref" />
                     </td>
                 </tr>
             </table>
diff --git a/snippets/stock.report_delivery_document.replace_sale_line_name.xml b/snippets/stock.report_delivery_document.replace_sale_line_name.xml
new file mode 100644
index 00000000..4eb490c6
--- /dev/null
+++ b/snippets/stock.report_delivery_document.replace_sale_line_name.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0"?>
+<data inherit_id="stock.report_delivery_document" priority="55">
+
+    <xpath expr="//span[@t-field='move.product_id']" position="replace">
+        <t t-if="move.sale_line_id">
+            <span t-field="move.sale_line_id.name" />
+        </t>
+        <t t-else="">
+            <span t-field="move.product_id" />
+        </t>
+    </xpath>
+
+</data>
\ No newline at end of file
diff --git a/snippets/stock.report_delivery_document.show_default_code.xml b/snippets/stock.report_delivery_document.show_default_code.xml
index b08d510f..967b7a2f 100644
--- a/snippets/stock.report_delivery_document.show_default_code.xml
+++ b/snippets/stock.report_delivery_document.show_default_code.xml
@@ -1,20 +1,22 @@
 <?xml version="1.0"?>
 <data inherit_id="stock.report_delivery_document" priority="50">
 
-  <xpath expr="//table[@name='stock_move_table']/thead/tr/th[1]" position="before">
+  <xpath expr="//table[@name='stock_move_table']//th[@name='th_sm_product']" position="before">
+    <th name="th_default_code">
+      <strong>Referenz</strong>
+    </th>
+  </xpath>
+
+  <!-- <xpath expr="//table[@name='stock_backorder_table']/thead/tr/th[1]" position="before">
     <th id="default_code">
       <strong >Nr.</strong>
     </th>
-  </xpath>
-  <xpath expr="//table[@name='stock_backorder_table']/thead/tr/th[1]" position="before">
-    <th id="default_code">
-      <strong >Nr.</strong>
-    </th>
-  </xpath>
-  <xpath expr="//table[@name='stock_move_table']/tbody//tr/td[1]" position="before">
-    <td id="default_code">
+  </xpath> -->
+
+  <xpath expr="//table[@name='stock_move_table']//span[@t-field='move.product_id']/.." position="before">
+    <td name="td_default_code">
       <span t-field="move.product_id.default_code"/>
     </td>
   </xpath>
 
-</data>
\ No newline at end of file
+</data>
diff --git a/snippets/stock.report_delivery_document.show_lot_ids.xml b/snippets/stock.report_delivery_document.show_lot_ids.xml
index 9bde9287..d7a96f25 100644
--- a/snippets/stock.report_delivery_document.show_lot_ids.xml
+++ b/snippets/stock.report_delivery_document.show_lot_ids.xml
@@ -1,16 +1,18 @@
 <?xml version="1.0"?>
 <data inherit_id="stock.report_delivery_document" priority="50">
 
-  <xpath expr="//table[@name='stock_move_table']//th[1]" position="after">
+  <xpath expr="//table[@name='stock_move_table']//th[@name='th_sm_product']" position="after">
     <th name="th_lot_ids">
       <strong>Seriennummer</strong>
     </th>
   </xpath>
 
-  <xpath expr="//table[@name='stock_move_table']//td[1]" position="after">
+  <xpath expr="//table[@name='stock_move_table']//span[@t-field='move.product_id']/.." position="after">
     <td name="td_lots">
-      <ul>
-      <t t-foreach="move.lot_ids" t-as="lot" ><li t-esc="lot.name" /></t>
+      <ul class="list-unstyled">
+        <t t-foreach="move.lot_ids" t-as="lot">
+          <li t-esc="lot.name" />
+        </t>
       </ul>
     </td>
   </xpath>