From 3b2bc64e7943d0b2597aad4f80e4fc90e77caf15 Mon Sep 17 00:00:00 2001 From: Michael Tietz Date: Tue, 18 Apr 2023 06:17:33 +0200 Subject: [PATCH 1/2] [FIX] stock_release_channel: _pickings_sort_key uses now as fallback the picking.scheduled_date field The date_priority field of a stock.picking can be null, that's why with need a fallback field. The scheduled_date is a required field of a stock.move, which means it is also always computed on the a stock.picking --- stock_release_channel/models/stock_release_channel.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/stock_release_channel/models/stock_release_channel.py b/stock_release_channel/models/stock_release_channel.py index 704332b29a..9ff3594d35 100644 --- a/stock_release_channel/models/stock_release_channel.py +++ b/stock_release_channel/models/stock_release_channel.py @@ -760,7 +760,12 @@ def get_action_picking_form(self): @staticmethod def _pickings_sort_key(picking): - return (-int(picking.priority or 1), picking.date_priority, picking.id) + return ( + -int(picking.priority or 1), + picking.scheduled_date, + picking.date_priority or picking.create_date, + picking.id, + ) def _get_next_pickings(self): return getattr(self, "_get_next_pickings_{}".format(self.batch_mode))() From 1018187a1d52c36861388b3940b5db9a9c77b438 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Alix?= Date: Mon, 6 Jan 2025 16:39:54 +0100 Subject: [PATCH 2/2] oca-port: blacklist PR(s) 533, 595, 772, 860 for stock_release_channel --- .oca/oca-port/blacklist/stock_release_channel.json | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 .oca/oca-port/blacklist/stock_release_channel.json diff --git a/.oca/oca-port/blacklist/stock_release_channel.json b/.oca/oca-port/blacklist/stock_release_channel.json new file mode 100644 index 0000000000..980ce97efe --- /dev/null +++ b/.oca/oca-port/blacklist/stock_release_channel.json @@ -0,0 +1,8 @@ +{ + "pull_requests": { + "OCA/wms#533": "(auto) Nothing to port from PR #533", + "OCA/wms#595": "(auto) Nothing to port from PR #595", + "OCA/wms#772": "Lint", + "OCA/wms#860": "(auto) Nothing to port from PR #860" + } +}