From 92943193bc3d7f9c9effa1d71f848544e9610b07 Mon Sep 17 00:00:00 2001
From: khoivo1601 <khoivo1601.mytho@gmail.com>
Date: Tue, 20 Jun 2023 21:54:28 +0700
Subject: [PATCH 1/3] [IMP] add button Create Shipping Label

---
 delivery_postlogistics/models/stock_picking.py |  6 ++++++
 delivery_postlogistics/views/stock.xml         | 10 ++++++++++
 2 files changed, 16 insertions(+)

diff --git a/delivery_postlogistics/models/stock_picking.py b/delivery_postlogistics/models/stock_picking.py
index e2f2223f30..cf62eeaa8b 100644
--- a/delivery_postlogistics/models/stock_picking.py
+++ b/delivery_postlogistics/models/stock_picking.py
@@ -236,3 +236,9 @@ def generate_postlogistics_shipping_labels(self, package_ids=None):
         """Add label generation for PostLogistics"""
         self.ensure_one()
         return self._generate_postlogistics_label(package_ids=package_ids)
+
+    def action_generate_carrier_label(self):
+        self.ensure_one()
+        if not self.carrier_id:
+            raise exceptions.UserError(_("Please, set a carrier."))
+        self.env["delivery.carrier"].postlogistics_send_shipping(self)
diff --git a/delivery_postlogistics/views/stock.xml b/delivery_postlogistics/views/stock.xml
index 33b0aca601..6ae207e2bb 100644
--- a/delivery_postlogistics/views/stock.xml
+++ b/delivery_postlogistics/views/stock.xml
@@ -6,6 +6,16 @@
         <field name="model">stock.picking</field>
         <field name="inherit_id" ref="delivery.view_picking_withcarrier_out_form" />
         <field name="arch" type="xml">
+            <field name="state" position="before">
+                <button
+                    name="action_generate_carrier_label"
+                    help="Create Shipping Label 🚚"
+                    attrs="{'invisible': ['|', ('state', '!=', 'done'), ('delivery_type', '!=', 'postlogistics')]}"
+                    string="Create Shipping Label 🚚"
+                    type="object"
+                />
+            </field>
+
             <xpath expr="//page//group[@name='carrier_data']/.." position="after">
                 <separator
                     string="Delivery instructions"

From 5d24c569c79db46b5351cf3d54b01ca6996086e1 Mon Sep 17 00:00:00 2001
From: duongtq <duongtq@trobz.com>
Date: Tue, 11 Jul 2023 09:53:17 +0700
Subject: [PATCH 2/3] [IMP] use native button Print return label for Returns

---
 delivery_postlogistics/models/delivery_carrier.py | 12 ++++++++++++
 delivery_postlogistics/views/stock.xml            |  8 +++++++-
 2 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/delivery_postlogistics/models/delivery_carrier.py b/delivery_postlogistics/models/delivery_carrier.py
index 29c83b5dbd..d51dededd7 100644
--- a/delivery_postlogistics/models/delivery_carrier.py
+++ b/delivery_postlogistics/models/delivery_carrier.py
@@ -156,3 +156,15 @@ def verify_credentials(self):
             },
         }
         return message
+
+    def _compute_can_generate_return(self):
+        res = super(DeliveryCarrier, self)._compute_can_generate_return()
+        for carrier in self:
+            if carrier.delivery_type == "postlogistics":
+                carrier.can_generate_return = True
+        return res
+
+    def postlogistics_get_return_label(
+        self, picking, tracking_number=None, origin_date=None
+    ):
+        return self.postlogistics_send_shipping(picking)
diff --git a/delivery_postlogistics/views/stock.xml b/delivery_postlogistics/views/stock.xml
index 6ae207e2bb..b9e458b0ef 100644
--- a/delivery_postlogistics/views/stock.xml
+++ b/delivery_postlogistics/views/stock.xml
@@ -10,12 +10,18 @@
                 <button
                     name="action_generate_carrier_label"
                     help="Create Shipping Label 🚚"
-                    attrs="{'invisible': ['|', ('state', '!=', 'done'), ('delivery_type', '!=', 'postlogistics')]}"
+                    attrs="{'invisible': ['|', '|', ('state', '!=', 'done'), ('delivery_type', '!=', 'postlogistics'), ('picking_type_code', '=', 'incoming')]}"
                     string="Create Shipping Label 🚚"
                     type="object"
                 />
             </field>
 
+            <button name="print_return_label" position="attributes">
+                    <attribute
+                    name="attrs"
+                >{'invisible':['|', ('is_return_picking', '=', False),('picking_type_code', '!=', 'incoming')]}</attribute>
+            </button>
+
             <xpath expr="//page//group[@name='carrier_data']/.." position="after">
                 <separator
                     string="Delivery instructions"

From 8e09b121ab77a858ddd077fef4343333338f5b7d Mon Sep 17 00:00:00 2001
From: duongtq <duongtq@trobz.com>
Date: Tue, 11 Jul 2023 14:59:15 +0700
Subject: [PATCH 3/3] [IMP] returns: use same carrier as the original picking
 by default

---
 delivery_postlogistics/__init__.py                   |  1 +
 delivery_postlogistics/wizard/__init__.py            |  1 +
 .../wizard/stock_picking_return.py                   | 12 ++++++++++++
 3 files changed, 14 insertions(+)
 create mode 100644 delivery_postlogistics/wizard/__init__.py
 create mode 100644 delivery_postlogistics/wizard/stock_picking_return.py

diff --git a/delivery_postlogistics/__init__.py b/delivery_postlogistics/__init__.py
index e4a5777ced..54f68961c1 100644
--- a/delivery_postlogistics/__init__.py
+++ b/delivery_postlogistics/__init__.py
@@ -1,2 +1,3 @@
 from . import models
 from . import postlogistics
+from . import wizard
diff --git a/delivery_postlogistics/wizard/__init__.py b/delivery_postlogistics/wizard/__init__.py
new file mode 100644
index 0000000000..ad0b47c23f
--- /dev/null
+++ b/delivery_postlogistics/wizard/__init__.py
@@ -0,0 +1 @@
+from . import stock_picking_return
diff --git a/delivery_postlogistics/wizard/stock_picking_return.py b/delivery_postlogistics/wizard/stock_picking_return.py
new file mode 100644
index 0000000000..708b209d54
--- /dev/null
+++ b/delivery_postlogistics/wizard/stock_picking_return.py
@@ -0,0 +1,12 @@
+from odoo import models
+
+
+class ReturnPicking(models.TransientModel):
+    _inherit = "stock.return.picking"
+
+    def _create_returns(self):
+        new_picking, pick_type_id = super(ReturnPicking, self)._create_returns()
+        if self.picking_id.delivery_type == "postlogistics":
+            picking = self.env["stock.picking"].browse(new_picking)
+            picking.write({"carrier_id": self.picking_id.carrier_id.id})
+        return new_picking, pick_type_id