Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions shopfloor_reception/actions/message.py
Original file line number Diff line number Diff line change
Expand Up @@ -64,3 +64,13 @@ def lot_product_not_found(self, product_barcode):
product_barcode=product_barcode,
),
}

def line_destination_set_success(self, move_line):
return {
"message_type": "success",
"body": _(
"Product '%(product)s' moved to '%(location)s'.",
product=move_line.product_id.display_name,
location=move_line.location_dest_id.display_name,
),
}
4 changes: 3 additions & 1 deletion shopfloor_reception/services/reception.py
Original file line number Diff line number Diff line change
Expand Up @@ -1751,7 +1751,9 @@ def set_destination(
message = self.msg_store.transfer_done_success(picking)
return self._response_for_select_document(message=message)
# Else return select move
return self._response_for_select_move(picking)
return self._response_for_select_move(
picking, message=self.msg_store.line_destination_set_success(selected_line)
)

def select_dest_package(
self, picking_id, selected_line_id, barcode, confirmation=False
Expand Down
1 change: 1 addition & 0 deletions shopfloor_reception/tests/test_select_move.py
Original file line number Diff line number Diff line change
Expand Up @@ -121,6 +121,7 @@ def test_scan_product_partial(self):
response,
next_state="select_move",
data=self._data_for_select_move(picking),
message=self.msg_store.line_destination_set_success(selected_move_line),
)
lines = picking.move_line_ids.filtered(lambda l: l.product_id == self.product_a)
self.assertEqual(2, len(lines))
Expand Down
20 changes: 16 additions & 4 deletions shopfloor_reception/tests/test_set_destination.py
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,10 @@ def test_scan_location_child_of_dest_location(self):
)
self.assertEqual(selected_move_line.location_dest_id, self.sub_input_location)
self.assert_response(
response, next_state="select_move", data=self._data_for_select_move(picking)
response,
next_state="select_move",
data=self._data_for_select_move(picking),
message=self.msg_store.line_destination_set_success(selected_move_line),
)

def test_scan_location_valid_but_unexpected(self):
Expand Down Expand Up @@ -102,7 +105,10 @@ def test_scan_location_valid_but_unexpected(self):
)
self.assertEqual(selected_move_line.location_dest_id, self.sub_input_location_2)
self.assert_response(
response, next_state="select_move", data=self._data_for_select_move(picking)
response,
next_state="select_move",
data=self._data_for_select_move(picking),
message=self.msg_store.line_destination_set_success(selected_move_line),
)

def test_scan_location_not_child_of_dest_locations(self):
Expand Down Expand Up @@ -163,7 +169,10 @@ def test_auto_posting_partial(self):
)
# Next screen is select move, because picking is not done
self.assert_response(
response, next_state="select_move", data=self._data_for_select_move(picking)
response,
next_state="select_move",
data=self._data_for_select_move(picking),
message=self.msg_store.line_destination_set_success(selected_move_line),
)
# The line has been moved to a different picking.
self.assertNotEqual(picking, selected_move_line.picking_id)
Expand Down Expand Up @@ -241,7 +250,10 @@ def test_auto_posting_full_two_lines(self):
},
)
self.assert_response(
response, next_state="select_move", data=self._data_for_select_move(picking)
response,
next_state="select_move",
data=self._data_for_select_move(picking),
message=self.msg_store.line_destination_set_success(selected_move_line),
)
# Lines has been moved in another picking
self.assertNotEqual(picking, selected_move_line.picking_id)
Expand Down
5 changes: 4 additions & 1 deletion shopfloor_reception/tests/test_set_quantity.py
Original file line number Diff line number Diff line change
Expand Up @@ -877,7 +877,10 @@ def test_move_states(self):
# When posted, the move line reserved_uom_qty has been set to qty_done
self.assertEqual(move_line_user_2.qty_done, move_line_user_2.reserved_uom_qty)
self.assert_response(
response, next_state="select_move", data=self._data_for_select_move(picking)
response,
next_state="select_move",
data=self._data_for_select_move(picking),
message=self.msg_store.line_destination_set_success(move_line_user_2),
)
# Now, user1 can start working on this again
service_user_1.dispatch(
Expand Down
Loading