From daf79fb11f76eaa2e0ba12f5bc9ca91f864667c9 Mon Sep 17 00:00:00 2001
From: Ethan Hildick <ethan@studio73.es>
Date: Fri, 19 May 2023 13:02:15 +0200
Subject: [PATCH] =?UTF-8?q?[IMP]=20delivery=5Fgls=5Fasm:=20Notas=20env?=
 =?UTF-8?q?=C3=ADo=20GLS?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 delivery_gls_asm/models/delivery_carrier.py   |  2 +-
 delivery_gls_asm/models/stock_picking.py      |  1 +
 .../views/stock_picking_views.xml             | 19 +++++++++++++++++++
 3 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/delivery_gls_asm/models/delivery_carrier.py b/delivery_gls_asm/models/delivery_carrier.py
index d69a663519f..b843bb85537 100644
--- a/delivery_gls_asm/models/delivery_carrier.py
+++ b/delivery_gls_asm/models/delivery_carrier.py
@@ -174,7 +174,7 @@ def _prepare_gls_asm_shipping(self, picking):
             "destinatario_email": escape(
                 consignee.email or consignee_entity.email or ""
             ),
-            "destinatario_observaciones": "",
+            "destinatario_observaciones": picking.gls_shipping_notes or "",
             "destinatario_att": "",
             "destinatario_departamento": "",
             "destinatario_nif": "",
diff --git a/delivery_gls_asm/models/stock_picking.py b/delivery_gls_asm/models/stock_picking.py
index 545ae67ab53..3a6199530c8 100644
--- a/delivery_gls_asm/models/stock_picking.py
+++ b/delivery_gls_asm/models/stock_picking.py
@@ -71,6 +71,7 @@ class StockPicking(models.Model):
         ],
         copy=False,
     )
+    gls_shipping_notes = fields.Text(string="Notas de envío GLS")
 
     def gls_asm_get_label(self):
         """Get GLS Label for this picking expedition"""
diff --git a/delivery_gls_asm/views/stock_picking_views.xml b/delivery_gls_asm/views/stock_picking_views.xml
index 881b2af7b59..27ce5864079 100644
--- a/delivery_gls_asm/views/stock_picking_views.xml
+++ b/delivery_gls_asm/views/stock_picking_views.xml
@@ -103,4 +103,23 @@
             </xpath>
         </field>
     </record>
+    <record id="view_picking_gls_form" model="ir.ui.view">
+        <field name="model">stock.picking</field>
+        <field name="inherit_id" ref="stock.view_picking_form" />
+        <field name="arch" type="xml">
+            <xpath expr="//field[@name='note']" position="after">
+                <field
+                    name="gls_shipping_notes"
+                    placeholder="Notas para GLS"
+                    attrs="{
+                    'invisible': [
+                        '|',
+                        ('gls_carrier_is_pickup_service', '=', True),
+                        ('delivery_type', '!=', 'gls_asm')
+                    ]
+                }"
+                />
+            </xpath>
+        </field>
+    </record>
 </odoo>