diff --git a/ext/custom-addons/dp_reports/static/src/less/report_backend.less b/ext/custom-addons/dp_reports/static/src/less/report_backend.less
index 01e0a58a..9a61d816 100644
--- a/ext/custom-addons/dp_reports/static/src/less/report_backend.less
+++ b/ext/custom-addons/dp_reports/static/src/less/report_backend.less
@@ -81,7 +81,7 @@ thead.table-header {
     color: white;
 }
 
-tbody.sale-tbody {
+tbody.sale-tbody, tbody.invoice-tbody, tbody.stock-tbody {
     background-color: #E6E7E9;
     margin-top: 0;
     margin-bottom: 0;
@@ -94,13 +94,6 @@ tbody.totals-tbody {
     margin-bottom: 0;
 }
 
-tbody.invoice-tbody {
-    background-color: #E6E7E9;
-    margin-top: 0;
-    margin-bottom: 0;
-    border-bottom: 2px solid #A72523;
-}
-
 .table-condensed > tbody > tr.amount-total {
     border-top: 2px solid #A72523 !important;
 }
diff --git a/ext/custom-addons/dp_reports_stock/i18n/de.po b/ext/custom-addons/dp_reports_stock/i18n/de.po
index 6762beec..8bf8b6e0 100644
--- a/ext/custom-addons/dp_reports_stock/i18n/de.po
+++ b/ext/custom-addons/dp_reports_stock/i18n/de.po
@@ -16,4 +16,87 @@ msgstr ""
 "Language: de\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#. module: dp_reports_stock
+#: model:ir.ui.view,arch_db:dp_reports_stock.report_stockpicking_document
+msgid "<span><strong>Customer Address:</strong></span>"
+msgstr "<span><strong>Kundenadresse:</strong></span>"
+
+#. module: dp_reports_stock
+#: model:ir.ui.view,arch_db:dp_reports_stock.report_stockpicking_document
+msgid "<strong>Date</strong>"
+msgstr "<strong>Datum</strong>"
+
+#. module: dp_reports_stock
+#: model:ir.ui.view,arch_db:dp_reports_stock.report_stockpicking_document
+msgid "<strong>Delivered Quantity</strong>"
+msgstr "<strong>Gelieferte Menge</strong>"
+
+#. module: dp_reports_stock
+#: model:ir.ui.view,arch_db:dp_reports_stock.report_stockpicking_document
+msgid "<strong>Order (Origin)</strong>"
+msgstr "<strong>Bestellung (Original)</strong>"
+
+#. module: dp_reports_stock
+#: model:ir.ui.view,arch_db:dp_reports_stock.report_stockpicking_document
+msgid "<strong>Ordered Quantity</strong>"
+msgstr "<strong>Bestellte Menge</strong>"
+
+#. module: dp_reports_stock
+#: model:ir.ui.view,arch_db:dp_reports_stock.report_stockpicking_document
+msgid "<strong>Product</strong>"
+msgstr "<strong>Produkt</strong>"
+
+#. module: dp_reports_stock
+#: model:ir.ui.view,arch_db:dp_reports_stock.report_stockpicking_document
+msgid ""
+"All items couldn't be shipped, the remaining ones will be shipped as soon as they become"
+"available."
+msgstr ""
+"Alle Artikel konnten nicht versendet werden, die restlichen werden versendet, sobald sie"
+"verfügbar sind."
+
+#. module: dp_reports_stock
+#: model:ir.ui.view,arch_db:dp_reports_stock.report_stockpicking_document
+msgid "Lot/Serial Number"
+msgstr "Lot-/Seriennummer"
+
+#. module: dp_reports_stock
+#: model:ir.ui.view,arch_db:dp_reports_stock.report_stockpicking_document
+msgid "This shipment is a backorder of"
+msgstr ""
+
+#. module: dp_reports_stock
+#: model:ir.ui.view,arch_db:dp_reports_stock.report_stockpicking_document
+msgid "<strong>Carrier</strong>"
+msgstr "<strong>Frachtführer</strong>"
+
+#. module: dp_reports_stock
+#: model:ir.ui.view,arch_db:dp_reports_stock.report_stockpicking_document
+msgid "<strong>Tracking Number</strong>"
+msgstr "<strong>Verfolgungsnummer</strong>"
+
+#. module: dp_reports_stock
+#: model:ir.ui.view,arch_db:dp_reports_stock.report_stockpicking_document
+msgid "<strong>Weight</strong>"
+msgstr "<strong>Gewicht</strong>"
+
+#. module: dp_reports_stock
+#: model:ir.ui.view,arch_db:dp_reports_stock.report_stockpicking_document
+msgid "<strong>Source Document:</strong>"
+msgstr "<strong>Referenzbeleg:</strong>"
+
+#. module: dp_reports_stock
+#: model:ir.ui.view,arch_db:dp_reports_stock.report_stockpicking_document
+msgid "<strong>Customer Reference:</strong>"
+msgstr "<strong>Kundenreferenz:</strong>"
+
+#. module: dp_reports_stock
+#: model:ir.ui.view,arch_db:dp_reports_stock.report_stockpicking_document
+msgid "<strong>Total Amount:</strong>"
+msgstr "<strong>Gesamt Menge:</strong>"
+
+#. module: dp_reports_stock
+#: model:ir.ui.view,arch_db:dp_reports_stock.report_stockpicking_document
+msgid "<strong>Total Weight:</strong>"
+msgstr "<strong>Gesamtgewicht:</strong>"
 
diff --git a/ext/custom-addons/dp_reports_stock/reports/stock.xml b/ext/custom-addons/dp_reports_stock/reports/stock.xml
index c55eb82e..7166cbbe 100644
--- a/ext/custom-addons/dp_reports_stock/reports/stock.xml
+++ b/ext/custom-addons/dp_reports_stock/reports/stock.xml
@@ -7,101 +7,203 @@
                 <t t-set="o" t-value="o.with_context({'lang':o.partner_id.lang})"/>
                 <div class="page">
                     <div class="row">
-                        <div class="col-xs-6">
-                            <strong>
-                                <span t-esc="o.partner_id.name"/>
-                            </strong>
+                        <div class="col-xs-6" name="customer_address">
+                            <div>
+                                <strong>Customer Address:</strong>
+                            </div>
+                            <div t-if="o.move_lines and o.move_lines[0].partner_id" name="partner_header">
+                                <div t-field="o.move_lines[0].partner_id"
+                                     t-options='{"widget": "contact", "fields": ["address", "name", "phone"], "no_marker": True}'/>
+                            </div>
+                            <div t-if="not (o.move_lines and o.move_lines[0].partner_id) and o.partner_id"
+                                 name="partner_header">
+                                <div t-field="o.partner_id"
+                                     t-options='{"widget": "contact", "fields": ["address", "name", "phone"], "no_marker": True}'/>
+                            </div>
                             <br/>
-                            <span t-esc="o.partner_id.street"/>
-                            <br/>
-                            <span t-esc="o.partner_id.zip"/>
-                            <span t-esc="o.partner_id.city"/>
-                            <br/>
-                            <span t-esc="o.partner_id.country_id.name"/>
-                        </div>
-                    </div>
-                    <div class="row">
-                        <div class="col-xs-offset-6 col-xs-6 text-right" style="padding-right:0;">
-                            <div class="col-xs-12" style="padding-right:2px;" t-if="o.partner_id.ref">
-                                <span class="col-xs-6 text-left">Kundennr.:</span>
-                                <span class="col-xs-6" t-field="o.partner_id.ref"/>
+                            <div>
+                                <strong>Customer Reference:</strong>
+                                <p t-field="o.sale_id.client_order_ref"/>
                             </div>
-                            <div class="col-xs-12" style="padding-right:2px;" t-if="o.partner_id.vat">
-                                <span class="col-xs-6 text-left">Ihre UID:</span>
-                                <span class="col-xs-6" t-field="o.partner_id.vat"/>
-                            </div>
-                            <div class="col-xs-12" style="padding-right:2px;" t-if="o.origin">
-                                <span class="col-xs-6 text-left">Ihre Referenz:</span>
-                                <span class="col-xs-6" t-field="o.origin"/>
-                            </div>
-                            <div t-if="o.state in ['draft','sent'] and o.date_order" class="col-xs-12"
-                                 style="padding-right:2px;">
-                                <span class="col-xs-6 text-left">Lieferdatum:</span>
-                                <span class="col-xs-6" t-field="o.min_date"
-                                      t-field-options='{"format": "dd.MM.yyyy"}'/>
-                            </div>
-                            <div t-if="o.state in ['draft','sent'] and o.date_order" class="col-xs-12"
-                                 style="padding-right:2px;">
-                                <span class="col-xs-6 text-left">Auftragsnummer:</span>
-                                <span class="col-xs-6" t-field="o.name"
-                                      t-field-options='{"format": "dd.MM.yyyy"}'/>
+                            <div>
+                                <strong>Source Document:</strong>
+                                <p t-field="o.origin"/>
                             </div>
                         </div>
                     </div>
 
-                    <div class="row oe_mt32">
-                        <div class="col-xs-12 text-left">
-                            <h4>
-                                Lieferschein
-                                <span t-field="o.name"/>
-                            </h4>
-                        </div>
-                    </div>
+                    <h2>
+                        <span t-field="o.name"/>
+                    </h2>
 
-                    <table class="oe_mt32 table table-condensed">
-                        <t t-set="art_number_is_set"
-                           t-value="field_set_in_lines(o.move_lines, 'product_id.default_code')"/>
-                        <!--<t t-set="lot_ids_is_set"-->
-                           <!--t-value="field_set_in_lines(o, 'pack_operation_product_ids.pack_lot_ids')"/>-->
-                        <thead>
+                    <table class="table table-condensed">
+                        <thead class="table-header">
                             <tr>
-                                <th class="text-center">Pos</th>
-                                <th class="text-center" t-if="art_number_is_set">Art-Nr.</th>
-                                <th class="text-left">Bezeichnung</th>
-                                <th class="text-center">Menge</th>
-                                <!--<th class="text-right" t-if="lot_ids_is_set">Fertigungslos</th>-->
+                                <th t-if="o.origin">
+                                    <strong>Order (Origin)</strong>
+                                </th>
+                                <th name="td_sched_date_h">
+                                    <strong>Date</strong>
+                                </th>
+                                <th t-if="o.picking_type_id.code == 'outgoing' and o.carrier_id">
+                                    <strong>Carrier</strong>
+                                </th>
+                                <!--<th t-if="o.weight">-->
+                                <!--<strong>Weight</strong>-->
+                                <!--</th>-->
+                                <th t-if="o.carrier_tracking_ref">
+                                    <strong>Tracking Number</strong>
+                                </th>
                             </tr>
                         </thead>
-                        <tbody class="">
-                            <t t-set="pos_nr" t-value="0"/>
-                            <tr t-foreach="o.move_lines" t-as="move_line">
-                                <t t-set="pos_nr" t-value="pos_nr+1"/>
-                                <td class="text-center">
-                                    <span t-esc="pos_nr"/>
+                        <tbody class="stock-tbody">
+                            <tr>
+                                <td t-if="o.origin">
+                                    <span t-field="o.origin"/>
                                 </td>
-                                <td class="text-center" t-if="art_number_is_set">
-                                    <span t-field="move_line.product_id.default_code"/>
+                                <td name="td_sched_date">
+                                    <t t-if="o.state == 'done'">
+                                        <span t-field="o.date_done"/>
+                                    </t>
+                                    <t t-if="o.state != 'done'">
+                                        <span t-field="o.scheduled_date"/>
+                                    </t>
                                 </td>
-                                <td class="text-left">
-                                    <span t-field="move_line.name"/>
+                                <td t-if="o.picking_type_id.code == 'outgoing' and o.carrier_id">
+                                    <span t-field="o.carrier_id"/>
                                 </td>
-                                <td class="text-center">
-                                    <span t-field="move_line.product_uom_qty"/>
-                                </td>
-                                <!--<td class="text-right" t-if="lot_ids_is_set">-->
-                                    <!--<t t-foreach="o.pack_operation_product_ids.pack_lot_ids" t-as="pack_lot">-->
-                                        <!--<div class="co-xs-12" t-field="pack_lot.lot_id.name"/>-->
-                                    <!--</t>-->
+                                <!--<td t-if="o.weight">-->
+                                <!--<span t-field="o.weight"/>-->
+                                <!--<span t-field="o.weight_uom_id"/>-->
                                 <!--</td>-->
+                                <td t-if="o.carrier_tracking_ref">
+                                    <span t-field="o.carrier_tracking_ref"/>
+                                </td>
+                            </tr>
+                        </tbody>
+                    </table>
+                    <table class="table table-condensed mt48" t-if="not o.move_line_ids">
+                        <thead class="table-header">
+                            <tr>
+                                <th>
+                                    <strong>Product</strong>
+                                </th>
+                                <th>
+                                    <strong>Ordered Quantity</strong>
+                                </th>
+                            </tr>
+                        </thead>
+                        <tbody class="stock-tbody">
+                            <tr t-foreach="o.move_lines" t-as="move">
+                                <td>
+                                    <span t-field="move.product_id"/>
+                                </td>
+                                <td>
+                                    <span t-field="move.ordered_qty"/>
+                                    <span t-field="move.product_uom"/>
+                                </td>
+                            </tr>
+                        </tbody>
+                    </table>
+
+                    <t t-set="backorder" t-value="False"/>
+                    <table class="table table-condensed mt48" t-if="o.move_line_ids">
+                        <t t-set="has_serial_number" t-value="o.move_line_ids.mapped('lot_id')"
+                           groups="stock.group_production_lot"/>
+                        <thead class="table-header">
+                            <tr>
+                                <th>
+                                    <strong>Product</strong>
+                                </th>
+                                <th name="lot_serial" t-if="has_serial_number">
+                                    Lot/Serial Number
+                                </th>
+                                <th class="text-center">
+                                    <strong>Ordered Quantity</strong>
+                                </th>
+                                <th t-if="any([move_line.state == 'done' for move_line in o.move_line_ids])"
+                                    class="text-right">
+                                    <strong>Delivered Quantity</strong>
+                                </th>
+                            </tr>
+                        </thead>
+                        <tbody class="stock-tbody">
+                            <tr t-foreach="o.move_line_ids" t-as="move_line">
+                                <td>
+                                    <span t-field="move_line.product_id"/>
+                                    <p t-if="o.picking_type_code == 'outgoing'">
+                                        <span t-field="move_line.product_id.sudo().description_pickingout"/>
+                                    </p>
+                                    <p t-if="o.picking_type_code == 'incoming'">
+                                        <span t-field="move_line.product_id.sudo().description_pickingin"/>
+                                    </p>
+                                    <t t-if="not move_line.product_id and move_line.package_id">
+                                        <span t-field="move_line.package_id"/>
+                                    </t>
+                                </td>
+                                <t t-if="has_serial_number">
+                                    <td>
+                                        <table width="100%">
+                                            <tr>
+                                                <td>
+                                                    <span t-field="move_line.lot_id"/>
+                                                    <t t-if="not move_line.lot_id">
+                                                        <span t-field="move_line.lot_name"/>
+                                                    </t>
+                                                </td>
+                                                <td name="lot_qty">
+                                                    <t t-if="move_line.product_qty">
+                                                        <span t-field="move_line.product_qty"/>
+                                                    </t>
+                                                </td>
+                                            </tr>
+                                        </table>
+                                    </td>
+                                </t>
+                                <td class="text-center">
+                                    <span t-field="move_line.package_id"/>
+                                    <span t-if="move_line.package_id">:</span>
+                                    <span t-field="move_line.ordered_qty"/>
+                                    <span t-field="move_line.product_uom_id"/>
+                                </td>
+                                <td class="text-right" t-if="move_line.state == 'done'">
+                                    <t t-if="move_line.ordered_qty != move_line.qty_done">
+                                        <t t-set="backorder" t-value="True"/>
+                                    </t>
+                                    <span t-field="move_line.qty_done"/>
+                                    <span t-field="move_line.product_uom_id"/>
+                                </td>
                             </tr>
                         </tbody>
                     </table>
 
                     <div class="row">
-                        <p class="col-xs-12">
-                            <span t-field="o.note"/>
-                        </p>
+                        <div class="col-xs-6">
+                            <span style="padding-top: 5px; border-top: 1px solid;">
+                                <strong>Total Weight:</strong>
+                                <span t-field="o.weight"/>
+                            </span>
+                        </div>
+                        <div class="col-xs-6">
+                            <span class="pull-right" style="padding-top: 5px; border-top: 1px solid;">
+                                <strong>Total Amount:</strong>
+                                <span t-field="o.weight"/>
+                            </span>
+                        </div>
                     </div>
+                    <p class="col-xs-12">
+                        <span t-field="o.note"/>
+                    </p>
+
+                    <p t-if="o.backorder_id">
+                        This shipment is a backorder of<t t-esc="o.backorder_id.name"/>.
+                    </p>
+                    <p>
+                        <t t-if="backorder">
+                            All items couldn't be shipped, the remaining ones will be shipped as soon as they become
+                            available.
+                        </t>
+                    </p>
                 </div>
             </t>
         </template>