From f668d587716bac56a96f46444e44893a1dec4e4e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jorge=20E=2E=20G=C3=B3mez?= <jegomez@agofer.com.co>
Date: Tue, 25 Apr 2023 19:07:27 -0500
Subject: [PATCH] [ADD] Patches Core stock picking return wizard

---
 apply_patches.sh                                   |  1 +
 .../20230425_stock_picking-type-from-return.patch  | 14 ++++++++++++++
 rejected_vendor_modules.txt                        |  1 +
 3 files changed, 16 insertions(+)
 create mode 100644 patches/20230425_stock_picking-type-from-return.patch

diff --git a/apply_patches.sh b/apply_patches.sh
index b509e43..879a451 100755
--- a/apply_patches.sh
+++ b/apply_patches.sh
@@ -41,6 +41,7 @@ pt_core ()
     #git apply $OPTIONS $SRC/patches/20230206_ir-attachment_allow-portal-users-attachment-access.patch
     # Reverted in https://github.com/odoo/odoo/commit/8d1d62a8c0746abb30f97290304b761f74111a89:
     #git apply $OPTIONS $SRC/patches/20220204_mail_re-enables-buttons-in-notifications.patch
+    git apply $OPTIONS $SRC/patches/20230425_stock_picking-type-from-return.patch
     popd
 }
 
diff --git a/patches/20230425_stock_picking-type-from-return.patch b/patches/20230425_stock_picking-type-from-return.patch
new file mode 100644
index 0000000..ccddc00
--- /dev/null
+++ b/patches/20230425_stock_picking-type-from-return.patch
@@ -0,0 +1,14 @@
+diff --git a/addons/stock/wizard/stock_picking_return.py b/addons/stock/wizard/stock_picking_return.py
+index 9049254a..c2338e7b 100644
+--- a/addons/stock/wizard/stock_picking_return.py
++++ b/addons/stock/wizard/stock_picking_return.py
+@@ -117,6 +117,8 @@ class ReturnPicking(models.TransientModel):
+ 
+         # create new picking for returned products
+         picking_type_id = self.picking_id.picking_type_id.return_picking_type_id.id or self.picking_id.picking_type_id.id
++        if self.env.context.get('return_picking_type_id'):
++            picking_type_id = self.env.context.get('return_picking_type_id')
+         new_picking = self.picking_id.copy({
+             'move_lines': [],
+             'picking_type_id': picking_type_id,
+
diff --git a/rejected_vendor_modules.txt b/rejected_vendor_modules.txt
index 125fdb6..a595d75 100644
--- a/rejected_vendor_modules.txt
+++ b/rejected_vendor_modules.txt
@@ -3,3 +3,4 @@ account_accountant
 mail_enterprise
 web_mobile
 hr_avancys_backup
+hr_avancys_new