From f57bc96d322cb01858ee2c60437d65c49c4de348 Mon Sep 17 00:00:00 2001
From: Simon Lejeune <sle@openerp.com>
Date: Thu, 16 Aug 2018 14:11:44 +0200
Subject: [PATCH] [REF] stock: add a group to display/hide the lot name on the
 delivery

initial work by Alexandre Moens <mao@odoo.com>
task 1832574
closes #24299
---
 addons/stock/models/res_config_settings.py       |  7 +++++++
 addons/stock/models/res_users.py                 |  5 +++++
 addons/stock/report/report_deliveryslip.xml      |  7 +++++++
 addons/stock/security/stock_security.xml         |  5 +++++
 addons/stock/views/res_config_settings_views.xml | 11 +++++++++++
 addons/stock/views/res_users_views.xml           |  4 ++++
 6 files changed, 39 insertions(+)

diff --git a/addons/stock/models/res_config_settings.py b/addons/stock/models/res_config_settings.py
index 50fe6558a9c..544209a5cef 100644
--- a/addons/stock/models/res_config_settings.py
+++ b/addons/stock/models/res_config_settings.py
@@ -16,6 +16,8 @@ class ResConfigSettings(models.TransientModel):
         help="Track following dates on lots & serial numbers: best before, removal, end of life, alert. \n Such dates are set automatically at lot/serial number creation based on values set on the product (in days).")
     group_stock_production_lot = fields.Boolean("Lots & Serial Numbers",
         implied_group='stock.group_production_lot')
+    group_lot_on_delivery_slip = fields.Boolean("Display Lots & Serial Numbers",
+        implied_group='stock.group_lot_on_delivery_slip')
     group_stock_tracking_lot = fields.Boolean("Delivery Packages",
         implied_group='stock.group_tracking_lot')
     group_stock_tracking_owner = fields.Boolean("Consignment",
@@ -58,6 +60,11 @@ class ResConfigSettings(models.TransientModel):
         if self.group_stock_multi_warehouses:
             self.group_stock_multi_locations = True
 
+    @api.onchange('group_stock_production_lot')
+    def _onchange_group_stock_production_lot(self):
+        if not self.group_stock_production_lot:
+            self.group_lot_on_delivery_slip = False
+
     @api.onchange('group_stock_adv_location')
     def onchange_adv_location(self):
         if self.group_stock_adv_location and not self.group_stock_multi_locations:
diff --git a/addons/stock/models/res_users.py b/addons/stock/models/res_users.py
index e6d1ccd5262..2a8cf3e743d 100644
--- a/addons/stock/models/res_users.py
+++ b/addons/stock/models/res_users.py
@@ -22,6 +22,11 @@ class ResUsers(models.Model):
         compute='_compute_groups_id', inverse='_inverse_groups_id',
         group_xml_id='stock.group_production_lot')
 
+    has_group_lot_on_delivery_slip = fields.Boolean(
+        'Display Lots & Serial Numbers on Delivery Slip',
+        compute='_compute_groups_id', inverse='_inverse_groups_id',
+        group_xml_id='stock.group_lot_on_delivery_slip')
+
     has_group_tracking_lot = fields.Boolean(
         'Manage Packages',
         compute='_compute_groups_id', inverse='_inverse_groups_id',
diff --git a/addons/stock/report/report_deliveryslip.xml b/addons/stock/report/report_deliveryslip.xml
index 350aa8b0a70..469d2e8383e 100644
--- a/addons/stock/report/report_deliveryslip.xml
+++ b/addons/stock/report/report_deliveryslip.xml
@@ -65,9 +65,13 @@
                         </tbody>
                     </table>
                     <table class="table table-sm mt48" t-if="o.move_line_ids and o.state=='done'">
+                        <t t-set="has_serial_number" t-value="o.move_line_ids.mapped('lot_id')" />
                         <thead>
                             <tr>
                                 <th><strong>Product</strong></th>
+                                <th name="lot_serial" t-if="has_serial_number" groups="stock.group_lot_on_delivery_slip">
+                                    Lot/Serial Number
+                                </th>
                                 <th class="text-center"><strong>Quantity</strong></th>
                             </tr>
                         </thead>
@@ -82,6 +86,9 @@
                                         <span t-field="move_line.product_id.sudo().description_pickingin"/>
                                     </p>
                                 </td>
+                                <td t-if="has_serial_number" groups="stock.group_lot_on_delivery_slip">
+                                    <span t-field="move_line.lot_name"/>
+                                </td>
                                 <td class="text-center">
                                     <span t-field="move_line.qty_done"/>
                                     <span t-field="move_line.product_uom_id"/>
diff --git a/addons/stock/security/stock_security.xml b/addons/stock/security/stock_security.xml
index a402bead1ae..30ac02a45fc 100644
--- a/addons/stock/security/stock_security.xml
+++ b/addons/stock/security/stock_security.xml
@@ -26,6 +26,11 @@
         <field name="name">Manage Lots / Serial Numbers</field>
     </record>
 
+    <record id="group_lot_on_delivery_slip" model="res.groups">
+        <field name="name">Display Serial &amp; Lot Number in Delivery Slips</field>
+        <field name="category_id" ref="base.module_category_hidden"/>
+    </record>
+
     <record id="group_tracking_lot" model="res.groups">
         <field name="name">Manage Packages</field>
     </record>
diff --git a/addons/stock/views/res_config_settings_views.xml b/addons/stock/views/res_config_settings_views.xml
index 19a3a8eb6bb..fe5c6518979 100644
--- a/addons/stock/views/res_config_settings_views.xml
+++ b/addons/stock/views/res_config_settings_views.xml
@@ -222,6 +222,17 @@
                                     </div>
                                 </div>
                             </div>
+                            <div class="col-12 col-lg-6 o_setting_box" attrs="{'invisible': [('group_stock_production_lot', '=', False)]}" id="group_lot_on_delivery_slip">
+                                <div class="o_setting_left_pane">
+                                    <field name="group_lot_on_delivery_slip"/>
+                                </div>
+                                <div class="o_setting_right_pane">
+                                    <label for="group_lot_on_delivery_slip"/>
+                                    <div class="text-muted">
+                                        Lots &amp; Serial numbers will appear on the delivery slip
+                                    </div>
+                                </div>
+                            </div>
                             <div class="col-12 col-lg-6 o_setting_box">
                                 <div class="o_setting_left_pane">
                                     <field name="group_stock_tracking_owner"/>
diff --git a/addons/stock/views/res_users_views.xml b/addons/stock/views/res_users_views.xml
index 7d736825fc0..beb0aaf5951 100644
--- a/addons/stock/views/res_users_views.xml
+++ b/addons/stock/views/res_users_views.xml
@@ -22,6 +22,10 @@
                 <div>
                     <field name='has_group_production_lot' colspan="1" class="oe_inline"/>
                 </div>
+                <label for="has_group_lot_on_delivery_slip" colspan="3"/>
+                <div>
+                    <field name='has_group_lot_on_delivery_slip' colspan="1" class="oe_inline"/>
+                </div>
                 <label for="has_group_tracking_lot" colspan="3"/>
                 <div>
                     <field name='has_group_tracking_lot' colspan="1" class="oe_inline"/>