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" + } +} 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))()