Skip to content

Commit 31216b2

Browse files
committed
Merge PR #967 into 16.0
Signed-off-by sebalix
2 parents fa7e372 + 1018187 commit 31216b2

File tree

2 files changed

+14
-1
lines changed

2 files changed

+14
-1
lines changed
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
{
2+
"pull_requests": {
3+
"OCA/wms#533": "(auto) Nothing to port from PR #533",
4+
"OCA/wms#595": "(auto) Nothing to port from PR #595",
5+
"OCA/wms#772": "Lint",
6+
"OCA/wms#860": "(auto) Nothing to port from PR #860"
7+
}
8+
}

stock_release_channel/models/stock_release_channel.py

+6-1
Original file line numberDiff line numberDiff line change
@@ -760,7 +760,12 @@ def get_action_picking_form(self):
760760

761761
@staticmethod
762762
def _pickings_sort_key(picking):
763-
return (-int(picking.priority or 1), picking.date_priority, picking.id)
763+
return (
764+
-int(picking.priority or 1),
765+
picking.scheduled_date,
766+
picking.date_priority or picking.create_date,
767+
picking.id,
768+
)
764769

765770
def _get_next_pickings(self):
766771
return getattr(self, "_get_next_pickings_{}".format(self.batch_mode))()

0 commit comments

Comments
 (0)