diff --git a/snippets/l10n_din5008.external_layout_din5008.replace_information_block.xml b/snippets/l10n_din5008.external_layout_din5008.replace_information_block.xml
index 45afbf8c..724808c4 100644
--- a/snippets/l10n_din5008.external_layout_din5008.replace_information_block.xml
+++ b/snippets/l10n_din5008.external_layout_din5008.replace_information_block.xml
@@ -157,42 +157,133 @@
                         </tr>
                     </t>
 
-
-                    <t t-if="o._name == 'stock.picking'">
-
-                        <tr>
-                            <td colspan="2" style="font-size: 14px; font-weight: bold; padding-bottom: 7px; white-space: nowrap;">
-                                <span>Delivery Note</span>
-                            </td>
-                        </tr>
+                    <!-- Bestellung  -->
+                    <t t-if="o._name == 'purchase.order'">
                         <tr>
                             <td>
-                                <span>No.</span>
+                                <span>Purchase No.</span>
                             </td>
                             <td>
                                 <span t-field="o.name"/>
                             </td>
                         </tr>
-                        <t t-if="o.origin">
+                        <tr>
+                            <td>
+                                <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>
+                                <span t-field="o.partner_ref"/>
+                            </td>
+                        </tr>
+                        <tr>
+                            <td>
+                                <span>Incoterms</span>
+                            </td>
+                            <td>
+                                <span t-field="o.incoterm_id.code"/>
+                            </td>
+                        </tr>
+                    </t>
+                    
+                    <!-- Lieferschein  -->
+                    <t t-if="o._name == 'stock.picking'">
+
+                        <t t-if="valued">
                             <tr>
-                                <td>
-                                    <span>Reference</span>
-                                </td>
-                                <td>
-                                    <span t-field="o.origin"/>
+                                <td colspan="2" style="font-size: 14px; font-weight: bold; padding-bottom: 7px; white-space: nowrap;">
+                                    <span>Pro-forma-invoice</span>
                                 </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>
+                                <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>
+                            <td>
+                                <span>Source</span>
+                            </td>
+                            <td>
+                                <span t-field="o.origin"/>
+                            </td>
+                        </tr>
+                        <tr>
+                            <td>
+                                <span>Reference</span>
+                            </td>
+                            <td>
+                                <span t-field="o.sudo().sale_id.client_order_ref"/>
+                            </td>
+                        </tr>
+                        <tr>
+                            <td>
+                                <span>Incoterms</span>
+                            </td>
+                            <td>
+                                <span t-field="o.sudo().sale_id.incoterm.code"/>
+                            </td>
+                        </tr>
+                        
+                        </t>
+
+                        <t t-if="">
+
+                            <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>Reference</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>
 
                 </table>
diff --git a/snippets/stock.report_delivery_document.add_address.xml b/snippets/stock.report_delivery_document.add_address.xml
index e531362a..271760a1 100644
--- a/snippets/stock.report_delivery_document.add_address.xml
+++ b/snippets/stock.report_delivery_document.add_address.xml
@@ -1,4 +1,3 @@
-
 <data inherit_id="stock.report_delivery_document" priority="50">
 
     <xpath expr="//t[@t-set='address']" position="after">
@@ -99,6 +98,26 @@
                     </t>
                 </td>
             </tr>
+            
+            <t t-if="valued">
+                <tr>
+                    <td style="width: 280px; padding-top: 20px; vertical-align: top; padding-left: 5mm;" colspan="2">
+                        <t t-if="o.partner_id.x_remarks">
+                            <div t-field="o.partner_id.x_remarks"/>
+                        </t>
+                    </td>
+
+                    <td style="width: 60px"/>
+
+                    <td style="width: 280px; padding-top: 20px; vertical-align: top; padding-left: 0;" colspan="2">
+                        <t t-if="o.location_id.warehouse_id.partner_id.x_remarks">
+                            <div t-field="o.location_id.warehouse_id.partner_id.x_remarks"/>
+                        </t>
+                    </td>
+                </tr>
+            </t>
+            <t t-if="not valued">
+            </t>
 
             <t t-if="is_pro_forma">
                 <tr>
@@ -124,4 +143,4 @@
     
     <xpath expr="//div[@name='div_origin']/.." position="replace"/>
     
-</data>
+</data>
\ No newline at end of file
diff --git a/snippets/stock.report_delivery_document.get_position2.xml b/snippets/stock.report_delivery_document.get_position2.xml
index defdc910..ac971e3f 100644
--- a/snippets/stock.report_delivery_document.get_position2.xml
+++ b/snippets/stock.report_delivery_document.get_position2.xml
@@ -1,9 +1,5 @@
 <data inherit_id="stock.report_delivery_document" priority="60">
-    <xpath expr="//table[@name='stock_move_table']/thead/tr/th[1]" position="before">
-        <th id="position" class="text-start">
-            <strong>Pos.</strong>
-        </th>
-    </xpath>
+
     <xpath expr="//table[@name='stock_move_line_table']/thead/tr/th[1]" position="before">
         <th id="position" class="text-start">
             <strong>Pos.</strong>
@@ -13,5 +9,6 @@
         <th id="position" class="text-start">
             <strong>Pos.</strong>
         </th>
-    </xpath>   
+    </xpath>
+
 </data>
\ No newline at end of file
diff --git a/snippets/stock.report_delivery_document.header_picking.xml b/snippets/stock.report_delivery_document.header_picking.xml
new file mode 100644
index 00000000..9724af15
--- /dev/null
+++ b/snippets/stock.report_delivery_document.header_picking.xml
@@ -0,0 +1,30 @@
+<data inherit_id="stock.report_delivery_document" priority="60">
+
+    <xpath expr="//table[@name='stock_move_table']/thead/tr/th[6]" position="after">
+        <th id="th_packing" class="text-end">
+            <strong>Packing</strong>
+        </th>
+        <th id="th_ve" class="text-end">
+            <strong>VE</strong>
+        </th>
+
+    </xpath>
+    <xpath expr="//table[@name='stock_move_line_table']/thead/tr/th[6]" position="after">
+        <th id="th_line_packing" class="text-end">
+            <strong>Packing</strong>
+        </th>
+        <th id="th_line_ve" class="text-end">
+            <strong>VE</strong>
+        </th>
+
+    </xpath>
+    <xpath expr="//table[@name='stock_backorder_table']/thead/tr/th[6]" position="after">
+        <th id="th_packing" class="text-end">
+            <strong>Packing</strong>
+        </th>
+        <th id="th_ve" class="text-end">
+            <strong>VE</strong>
+        </th>
+    </xpath>
+
+</data>
\ No newline at end of file
diff --git a/snippets/stock.report_delivery_document.hs_code_and_origin.xml b/snippets/stock.report_delivery_document.hs_code_and_origin.xml
index e71a4662..35acfc53 100644
--- a/snippets/stock.report_delivery_document.hs_code_and_origin.xml
+++ b/snippets/stock.report_delivery_document.hs_code_and_origin.xml
@@ -14,5 +14,6 @@
         <th class="text-start">
             <strong>Origin</strong>
         </th>
-    </xpath>   
+    </xpath>
+   
 </data>
\ No newline at end of file
diff --git a/snippets/stock.report_delivery_document.replace_delivery_address.xml b/snippets/stock.report_delivery_document.replace_delivery_address.xml
index 3f888646..383c026d 100644
--- a/snippets/stock.report_delivery_document.replace_delivery_address.xml
+++ b/snippets/stock.report_delivery_document.replace_delivery_address.xml
@@ -1,11 +1,15 @@
 <data inherit_id="stock.report_delivery_document" priority="50">
 
     <xpath expr="//div[@name='div_outgoing_address']" position="replace">
-        <div name="div_outgoing_address">
-            <div name="address">
-                <div t-field="o.sale_id.partner_id" t-options="{&quot;widget&quot;: &quot;contact&quot;, &quot;fields&quot;: [&quot;address&quot;, &quot;name&quot;], &quot;no_marker&quot;: True}"/>
+        <t t-if="valued">
+        </t>
+        <t t-if="not valued">
+            <div name="div_outgoing_address">
+                <div name="address">
+                    <div t-field="o.sale_id.partner_id" t-options="{&quot;widget&quot;: &quot;contact&quot;, &quot;fields&quot;: [&quot;address&quot;, &quot;name&quot;], &quot;no_marker&quot;: True}"/>
+                </div>
             </div>
-        </div>
+        </t>
     </xpath>
-    
+
 </data>
\ No newline at end of file
diff --git a/snippets/stock.report_delivery_document.summary.xml b/snippets/stock.report_delivery_document.summary.xml
index 2ac2fc43..7a7ecc30 100644
--- a/snippets/stock.report_delivery_document.summary.xml
+++ b/snippets/stock.report_delivery_document.summary.xml
@@ -24,45 +24,48 @@
 				</t>
 			</tr>
 
-			<table style="margin-left: auto; margin-right: 0; border: transparent">
+			<t t-if="not valued">
 
-				<t t-if="count_packages">
-					<tr>
-						<td style="padding-right:5px;">
-							<strong>Number of transport units:</strong>
-						</td>
-						<td style="text-align: right; width: 80px">
-							<strong t-esc="count_packages"/>
-						</td>
-					</tr>
-				</t>
+				<table style="margin-left: auto; margin-right: 0;">
 
-				<t t-if="not has_shipping_weight">
-					<tr>
-						<td style="padding-right:5px;">
-							<strong>Total net weight:</strong>
-						</td>
-						<td style="text-align: right">
-							<strong t-esc="net_weight"/>
-							<strong> kg</strong>
-						</td>
-					</tr>
-
-					<t t-if="total_weight">
+					<t t-if="count_packages">
 						<tr>
-							<td style="padding-right:5px;">
-								<strong>Total gross weight:</strong>
+							<td>
+								<strong>Anzahl Transporteinheiten:</strong>
 							</td>
-							<td style="text-align: right">
-								<t>
-									<strong t-esc="total_weight"/>
-									<strong> kg</strong>
-								</t>
+							<td style="text-align: right; width: 80px">
+								<strong t-esc="count_packages"/>
 							</td>
 						</tr>
 					</t>
-				</t>
-			</table>
+
+					<t t-if="not has_shipping_weight">
+						<tr>
+							<td>
+								<strong>Gesamtgewicht Netto: </strong>
+							</td>
+							<td style="text-align: right">
+								<strong t-esc="net_weight"/>
+								<strong> kg</strong>
+							</td>
+						</tr>
+
+						<t t-if="total_weight">
+							<tr>
+								<td>
+									<strong>Gesamtgewicht Brutto: </strong>
+								</td>
+								<td style="text-align: right">
+									<t>
+										<strong t-esc="total_weight"/>
+										<strong> kg</strong>
+									</t>
+								</td>
+							</tr>
+						</t>
+					</t>
+				</table>
+			</t>
 
 		</div>
 
diff --git a/snippets/stock.report_delivery_document.valued_document.xml b/snippets/stock.report_delivery_document.valued_document.xml
new file mode 100644
index 00000000..ba083516
--- /dev/null
+++ b/snippets/stock.report_delivery_document.valued_document.xml
@@ -0,0 +1,9 @@
+<data inherit_id="stock.stock_report_delivery_has_serial_move_line" priority="50">
+    <xpath expr="//td[@name='td_sml_taxes']" position="replace">
+
+        <td name="td_taxes" t-if="valued" class="text-end">
+            <span t-out="move_line.move_id.tax_id.name"/>
+        </td>
+
+    </xpath>
+</data>
\ No newline at end of file
diff --git a/snippets/stock.stock_report_delivery_has_serial_move_line.add_packing.xml b/snippets/stock.stock_report_delivery_has_serial_move_line.add_packing.xml
index dabfac8f..e7f8cf70 100644
--- a/snippets/stock.stock_report_delivery_has_serial_move_line.add_packing.xml
+++ b/snippets/stock.stock_report_delivery_has_serial_move_line.add_packing.xml
@@ -1,10 +1,12 @@
 <data inherit_id="stock.stock_report_delivery_has_serial_move_line" priority="50">
     <xpath expr="//td[@name='move_line_lot_quantity']" position="before">
-        <td class="text-end">
-            <span t-esc="move_line.move_id.product_packaging_id.name"/>
-        </td>
-        <td class="text-end">
-            <span t-esc="move_line.product_packaging_qty" t-options="{&quot;widget&quot;: &quot;integer&quot;}"/>
-        </td>
+        <t t-if="not valued">
+            <td class="text-end">
+                <span t-esc="move_line.move_id.product_packaging_id.name"/>
+            </td>
+            <td class="text-end">
+                <span t-esc="move_line.product_packaging_qty" t-options="{&quot;widget&quot;: &quot;integer&quot;}"/>
+            </td>
+        </t>
     </xpath>
 </data>
\ No newline at end of file
diff --git a/snippets/stock.stock_report_delivery_has_serial_move_line.hide_lot.xml b/snippets/stock.stock_report_delivery_has_serial_move_line.hide_lot.xml
new file mode 100644
index 00000000..b52a612a
--- /dev/null
+++ b/snippets/stock.stock_report_delivery_has_serial_move_line.hide_lot.xml
@@ -0,0 +1,14 @@
+<data inherit_id="stock.stock_report_delivery_has_serial_move_line" priority="50">
+
+    <xpath expr="//t[@name='move_line_lot']" position="replace">
+        <t t-if="valued"/>
+        <t t-if="not valued">
+            <t t-if="has_serial_number" name="move_line_lot">
+                <td>
+                    <span t-field="move_line.lot_id.name"/>
+                </td>
+            </t>
+        </t>
+    </xpath>
+
+</data>
\ No newline at end of file
diff --git a/snippets/stock.stock_report_delivery_has_serial_move_line.hide_packaging.xml b/snippets/stock.stock_report_delivery_has_serial_move_line.hide_packaging.xml
new file mode 100644
index 00000000..4fc6b7c1
--- /dev/null
+++ b/snippets/stock.stock_report_delivery_has_serial_move_line.hide_packaging.xml
@@ -0,0 +1,5 @@
+<data inherit_id="stock.stock_report_delivery_has_serial_move_line" priority="50">
+
+    <xpath expr="//span[@groups='product.group_stock_packaging']" position="replace"/>   
+      
+</data>
\ No newline at end of file
diff --git a/snippets/stock.stock_report_delivery_has_serial_move_line.hs_code_and_origin.xml b/snippets/stock.stock_report_delivery_has_serial_move_line.hs_code_and_origin.xml
index 35f655a2..b0bcad92 100644
--- a/snippets/stock.stock_report_delivery_has_serial_move_line.hs_code_and_origin.xml
+++ b/snippets/stock.stock_report_delivery_has_serial_move_line.hs_code_and_origin.xml
@@ -1,12 +1,12 @@
 <data inherit_id="stock.stock_report_delivery_has_serial_move_line" priority="50">
-<xpath expr="//span[@t-field='move_line.product_id']" position="after">
+    <xpath expr="//span[@t-field='move_line.product_id']" position="after">
     
-      <td id="position">
+        <td id="td_hs_code">
             <span t-esc="move_line.move_id.product_id.hs_code"/>
         </td>
-        <td id="position">
+        <td id="td_origin">
             <span t-esc="move_line.move_id.product_id.country_of_origin.code"/>
         </td>
-   
-  </xpath>
+
+    </xpath>
 </data>
\ No newline at end of file
diff --git a/snippets/stock.stock_report_delivery_has_serial_move_line.valued_document.xml b/snippets/stock.stock_report_delivery_has_serial_move_line.valued_document.xml
new file mode 100644
index 00000000..506a2a68
--- /dev/null
+++ b/snippets/stock.stock_report_delivery_has_serial_move_line.valued_document.xml
@@ -0,0 +1,18 @@
+<data inherit_id="stock.stock_report_delivery_has_serial_move_line" priority="50">
+    <xpath expr="//span[@t-field='move_line.product_uom_id']" position="after">
+
+        <td name="td_priceunit" t-if="valued" class="text-end">
+            <span t-field="move_line.move_id.move_price_unit">10.00</span>
+        </td>
+        <td name="td_discount" t-if="valued and display_discount" class="text-end">
+            <span t-field="move_line.move_id.discount">-</span>
+        </td>
+        <td name="td_taxes" t-if="valued" class="text-end">
+            <span t-out="move_line.move_id.tax_id.name"/>
+        </td>
+        <td name="td_subtotal" t-if="valued" class="text-end o_price_total">
+            <span t-field="move_line.move_id.price_subtotal">27.00</span>
+        </td>
+
+    </xpath>
+</data>
\ No newline at end of file