diff --git a/snippets/sale.sale_order_tree.carrier_id.xml b/snippets/sale.sale_order_tree.carrier_id.xml
new file mode 100644
index 00000000..f609ea1d
--- /dev/null
+++ b/snippets/sale.sale_order_tree.carrier_id.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0"?>
+<data inherit_id="sale.sale_order_tree" priority="50">
+    <xpath expr="//field[@name='validity_date']" position="after">
+        <field name="carrier_id" optional="hide"/>
+    </xpath>
+</data>
diff --git a/snippets/sale.view_order_form.move_note.xml b/snippets/sale.view_order_form.move_note.xml
new file mode 100644
index 00000000..165ff9c1
--- /dev/null
+++ b/snippets/sale.view_order_form.move_note.xml
@@ -0,0 +1,13 @@
+<data inherit_id="sale.view_order_form" priority="50">
+
+    <xpath expr="//field[@name='picking_note']" position="replace"/>
+    <xpath expr="//field[@name='picking_customer_note']" position="replace"/>
+
+    <xpath expr="//group[@name='note_group']" position="after">
+        <group name="sale_shipping" position="inside">
+            <field name="picking_note" string="Notiz Rüstschein" placeholder="Notiz ..." readonly="state not in ('draft','sent')"/>
+            <field name="picking_customer_note" string="Notiz Lieferschein" placeholder="Notiz ..." readonly="state not in ('draft','sent')"/>
+        </group>
+    </xpath>
+
+</data>
\ No newline at end of file
diff --git a/snippets/sale.view_order_form.move_picking_notes.xml b/snippets/sale.view_order_form.move_picking_notes.xml
new file mode 100644
index 00000000..b8bc44fa
--- /dev/null
+++ b/snippets/sale.view_order_form.move_picking_notes.xml
@@ -0,0 +1,13 @@
+<data inherit_id="sale.view_order_form" priority="50">
+
+    <xpath expr="//field[@name='picking_note']" position="replace"/>
+    <xpath expr="//field[@name='picking_customer_note']" position="replace"/>
+
+    <xpath expr="//group[@name='note_group']" position="before">
+        <group name="sale_shipping" position="inside">
+            <field name="picking_note" string="Notiz Rüstschein" readonly="state not in ('draft','sent')"/>
+            <field name="picking_customer_note" string="Notiz Lieferschein" readonly="state not in ('draft','sent')"/>
+        </group>
+    </xpath>
+
+</data>
\ No newline at end of file
diff --git a/snippets/stock.report_delivery_document.replace_table.xml b/snippets/stock.report_delivery_document.replace_table.xml
index 4145f630..bb550deb 100644
--- a/snippets/stock.report_delivery_document.replace_table.xml
+++ b/snippets/stock.report_delivery_document.replace_table.xml
@@ -1,44 +1,50 @@
-<?xml version="1.0"?>
 <data inherit_id="stock.report_delivery_document" priority="50">
-    <xpath expr="//table[@name='stock_move_table']" position="replace">
-        <table style="width:100%; font-family: arial; font-size: 9pt; margin-top: 20px; " t-if="o.state!='done'" name="stock_move_table">
-            <thead>
-                <tr style="color:black; border-bottom: 1px solid rgb(220,220,220);">
-                    <th style="padding-left: 9px; padding-bottom: 10px; width:10%;">Art. Nr.</th>
-                    <th name="th_sm_product" style="width:35%;">
-                        <strong>Bezeichnung</strong>
-                    </th>
-                    <th style="width:25%;">Typenbezeichnung</th>
-                    <th name="th_sm_quantity" style="width:20%; text-align:right; padding-right:20px;">
-                        <strong>Menge</strong>
-                    </th>
-                    <th style="width:15%; text-align: right; padding-right: 10px">Lieferdatum</th>
-                </tr>
-            </thead>
-            <tbody>
-                <t t-set="lines" t-value="o.move_lines.filtered(lambda x: x.product_uom_qty)"/>
-                <tr t-foreach="lines" t-as="move" style="border-bottom: 1px solid rgb(220,220,220);">
-                    <td style="padding-left: 10px; padding-top:5px; vertical-align:top;">
-                        <span t-field="move.product_id.default_code"/>
-                    </td>
-                    <td style="padding-top:5px; padding-right: 10px; vertical-align:top;">
-                        <span t-field="move.product_id.name"/>
-                        <p t-if="move.description_picking != move.product_id.name">
-                            <span t-field="move.description_picking"/>
-                        </p>
-                    </td>
-                    <td style="padding-top:5px; vertical-align:top;">
-                        <span t-field="move.product_id.type_description"/>
-                    </td>
-                    <td style="width:18%; text-align:right; padding-right:20px; padding-top:5px; vertical-align:top;">
-                        <span t-field="move.product_uom_qty"/>
-                        <span t-field="move.product_uom"/>
-                    </td>
-                    <td style="text-align: right; padding-right: 10px; padding-top:5px; vertical-align:top;">
-                        <span t-field="move.date" t-options="{&quot;widget&quot;: &quot;date&quot;}"/>
-                    </td>
-                </tr>
-            </tbody>
-        </table>
+
+    <xpath expr="//div[@class='page']/div[2]" position="replace">
+
+        <div class="row">
+            <div class="col-4">
+                <strong>Verkaufsauftrag: </strong>
+                <span t-field="o.sale_id.name"/>
+            </div>
+            <div class="col-3">
+                <strong>Bestelldatum: </strong>
+                <span t-field="o.sale_id.date_order" t-options="{&quot;widget&quot;: &quot;date&quot;}"/>
+            </div>
+            <div class="col-5" style="margin-left: 60px">
+                <strong>Kontakt Verkauf: </strong>
+                <span t-field="o.sale_id.user_id"/>
+            </div>
+        </div>
+        <div class="row">
+            <div class="col-4">
+                <strong>Kunden-Nr.: </strong>
+                <span t-field="o.partner_id.ref"/>
+            </div>
+            <div class="col-3">
+                <strong>Lieferdatum: </strong>
+                <span t-esc="o.scheduled_date" t-options="{&quot;widget&quot;: &quot;date&quot;}"/>
+            </div>
+            <div class="col-5" style="margin-left: 60px">
+                <strong>Tel. Direkt: </strong>
+                <span t-field="o.sale_id.user_id.phone"/>
+            </div>
+        </div>
+        <div class="row" style="margin-bottom: 40px">
+            <div class="col-4">
+            </div>
+            <div class="col-3">
+                <div t-if="o.picking_type_id.code == 'outgoing' and o.carrier_id">
+                    <strong>Spediteur: </strong>
+                    <span t-field="o.carrier_id"/>
+                </div>
+            </div>
+            <div class="col-5" style="margin-left: 60px">
+                <strong>E-Mail: </strong>
+                <span t-field="o.sale_id.user_id.email"/>
+            </div>
+        </div>
+
     </xpath>
-</data>
+
+</data>
\ No newline at end of file
diff --git a/snippets/stock.report_picking.move_state.xml b/snippets/stock.report_picking.move_state.xml
new file mode 100644
index 00000000..b01e6374
--- /dev/null
+++ b/snippets/stock.report_picking.move_state.xml
@@ -0,0 +1,5 @@
+<data inherit_id="stock.report_picking" priority="50">
+    <xpath expr="//div[@name='div_sched_date']" position="after">
+        <xpath expr="//div[@name='div_state']" position="move"/>
+    </xpath>
+</data>
\ No newline at end of file