From 42634e587c86705e29b6901f6158199307bc1bdd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niels=20G=C3=B6ttsch?= <ng@ife.de>
Date: Wed, 29 May 2024 17:05:45 +0200
Subject: [PATCH] [imp] adjust to ticket description

---
 nfu_ekg_stock/views/report_deliveryslip.xml | 154 ++------------------
 1 file changed, 9 insertions(+), 145 deletions(-)

diff --git a/nfu_ekg_stock/views/report_deliveryslip.xml b/nfu_ekg_stock/views/report_deliveryslip.xml
index 5170aed..7608377 100644
--- a/nfu_ekg_stock/views/report_deliveryslip.xml
+++ b/nfu_ekg_stock/views/report_deliveryslip.xml
@@ -15,174 +15,38 @@
                             <span t-field="o.note"/>
                         </div>
                     </div>
-                    <table class="table table-sm" t-if="o.state!='done'" name="stock_move_table">
+                    <table class="table table-sm" name="stock_move_table">
                         <thead>
                             <tr>
+                                <th name="th_sm_product_qty"><strong>Batch Size</strong></th>
                                 <th name="th_sm_product"><strong>Product</strong></th>
                                 <th name="th_sm_ordered"><strong>Ordered</strong></th>
-                                <th name="th_sm_quantity"><strong>Delivered</strong></th>
                             </tr>
                         </thead>
                         <tbody>
                             <t t-set="lines" t-value="o.move_ids.filtered(lambda x: x.product_uom_qty)"/>
                             <tr t-foreach="lines" t-as="move">
                                 <td class="fit">
-                                    <span t-field="move.product_uom_qty"/>
-                                    <span t-field="move.product_uom"/>
+                                <!-- Needs to be filled later -->
+                                    <!-- <span t-field="move.product_uom_qty"/> -->
+                                    <!-- <span t-field="move.product_uom"/> -->
                                 </td>
                                 <td>
-                                    <span t-field="move.product_id"/>
+                                    <span t-field="move.product_id.name"/>
                                     <p
                                 t-if="move.description_picking != move.product_id.name and move.description_picking != move.product_id.display_name"
                             >
                                         <span t-field="move.description_picking"/>
                                     </p>
                                 </td>
-                                <td>
-                                    <span t-field="move.quantity_done"/>
+                                <td class="fit">
+                                    <span t-field="move.product_uom_qty"/>
                                     <span t-field="move.product_uom"/>
                                 </td>
+
                             </tr>
                         </tbody>
                     </table>
-                    <table
-                class="table table-sm mt48"
-                t-if="o.move_line_ids and o.state=='done'"
-                name="stock_move_line_table"
-            >
-                        <t t-set="has_serial_number" t-value="False"/>
-                        <t
-                    t-set="has_serial_number"
-                    t-value="o.move_line_ids.mapped('lot_id')"
-                    groups="stock.group_lot_on_delivery_slip"
-                />
-                        <thead>
-                            <tr>
-                                <th name="th_sml_product"><strong>Product</strong></th>
-                                <t name="lot_serial" t-if="has_serial_number">
-                                    <th>
-                                        Lot/Serial Number
-                                    </th>
-                                </t>
-                                <th name="th_sml_qty_ordered" class="text-center" t-if="not has_serial_number">
-                                    <strong>Ordered</strong>
-                                </th>
-                                <th name="th_sml_quantity" class="text-center"><strong>Delivered</strong></th>
-                            </tr>
-                        </thead>
-                        <tbody>
-                        <!-- This part gets complicated with different use cases (additional use cases in extensions of this report):
-                                1. If serial numbers are used and set to print on delivery slip => print lines as is, otherwise group them by overlapping
-                                    product + description + uom combinations
-                                2. If any packages are assigned => split products up by package (or non-package) and then apply use case 1 -->
-                            <!-- If has destination packages => create sections of corresponding products -->
-                            <t t-if="o.has_packages" name="has_packages">
-                                <t t-set="packages" t-value="o.move_line_ids.mapped('result_package_id')"/>
-                                <t t-foreach="packages" t-as="package">
-                                    <t t-call="stock.stock_report_delivery_package_section_line"/>
-                                    <t
-                                t-set="package_move_lines"
-                                t-value="o.move_line_ids.filtered(lambda l: l.result_package_id == package)"
-                            />
-                                    <!-- If printing lots/serial numbers => keep products in original lines -->
-                                    <t t-if="has_serial_number">
-                                        <tr t-foreach="package_move_lines" t-as="move_line">
-                                            <t t-call="stock.stock_report_delivery_has_serial_move_line"/>
-                                        </tr>
-                                    </t>
-                                    <!-- If not printing lots/serial numbers => merge lines with same product+description+uom -->
-                                    <t t-else="">
-                                        <t
-                                    t-set="aggregated_lines"
-                                    t-value="package_move_lines._get_aggregated_product_quantities(strict=True)"
-                                />
-                                        <t t-call="stock.stock_report_delivery_aggregated_move_lines"/>
-                                    </t>
-                                </t>
-                                <!-- Make sure we do another section for package-less products if they exist -->
-                                <t
-                            t-set="move_lines"
-                            t-value="o.move_line_ids.filtered(lambda l: not l.result_package_id)"
-                        />
-                                <t
-                            t-set="aggregated_lines"
-                            t-value="o.move_line_ids._get_aggregated_product_quantities(except_package=True)"
-                        />
-                                <t t-if="move_lines or aggregated_lines" name="no_package_move_lines">
-                                    <t
-                                t-call="stock.stock_report_delivery_no_package_section_line"
-                                name="no_package_section"
-                            />
-                                    <t t-if="has_serial_number">
-                                        <tr t-foreach="move_lines" t-as="move_line">
-                                            <t t-call="stock.stock_report_delivery_has_serial_move_line"/>
-                                        </tr>
-                                    </t>
-                                    <t t-elif="aggregated_lines">
-                                        <t t-call="stock.stock_report_delivery_aggregated_move_lines"/>
-                                    </t>
-                                </t>
-                            </t>
-                            <!-- No destination packages -->
-                            <t t-else="">
-                                <!-- If printing lots/serial numbers => keep products in original lines -->
-                                <t t-if="has_serial_number">
-                                    <tr t-foreach="o.move_line_ids" t-as="move_line">
-                                        <t t-call="stock.stock_report_delivery_has_serial_move_line"/>
-                                    </tr>
-                                </t>
-                                <!-- If not printing lots/serial numbers => merge lines with same product -->
-                                <t t-else="" name="aggregated_move_lines">
-                                    <t
-                                t-set="aggregated_lines"
-                                t-value="o.move_line_ids._get_aggregated_product_quantities()"
-                            />
-                                    <t t-call="stock.stock_report_delivery_aggregated_move_lines"/>
-                                </t>
-                            </t>
-                        </tbody>
-                    </table>
-                    <t
-                t-set="backorders"
-                t-value="o.backorder_ids.filtered(lambda x: x.state not in ('done', 'cancel'))"
-            />
-                    <t t-if="o.backorder_ids and backorders">
-                        <p class="mt-5">
-                            <span>Remaining quantities not yet delivered:</span>
-                        </p>
-                        <table class="table table-sm" name="stock_backorder_table" style="table-layout: fixed;">
-                            <thead>
-                                <tr>
-                                    <th name="th_sb_product"><strong>Product</strong></th>
-                                    <th/>
-                                    <th name="th_sb_quantity" class="text-center"><strong>Quantity</strong></th>
-                                </tr>
-                            </thead>
-                            <tbody>
-                                <t t-foreach="backorders" t-as="backorder">
-                                    <t
-                                t-set="bo_lines"
-                                t-value="backorder.move_ids.filtered(lambda x: x.product_uom_qty)"
-                            />
-                                    <tr t-foreach="bo_lines" t-as="bo_line">
-                                        <td class="w-auto">
-                                            <span t-field="bo_line.product_id"/>
-                                            <p
-                                        t-if="bo_line.description_picking != bo_line.product_id.name and bo_line.description_picking != bo_line.product_id.display_name"
-                                    >
-                                                <span t-field="bo_line.description_picking"/>
-                                            </p>
-                                        </td>
-                                        <td/>
-                                        <td class="text-center w-auto">
-                                            <span t-field="bo_line.product_uom_qty"/>
-                                            <span t-field="bo_line.product_uom"/>
-                                        </td>
-                                    </tr>
-                                </t>
-                            </tbody>
-                        </table>
-                    </t>
 
                     <div t-if="o.signature" class="mt32 ml64 mr4" name="signature">
                         <div class="offset-8">