Skip to content

[IMP] shopfloor_full_location_reservation: Code compatibility with PR… #24

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
lmignon wants to merge 3 commits into
base: 16.0-mig-shopfloor-full-location-reszrvation-dro
Choose a base branch
from
Open

[IMP] shopfloor_full_location_reservation: Code compatibility with PR… #24

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5e4b26e
[IMP] shopfloor_full_location_reservation: Code compatibility with PR…
lmignon Jul 12, 2024
9c140b8
[IMP] shopfloor_full_location_reservation: Filter lines with one loca…
rousseldenis Aug 21, 2024
d477836
[IMP] shopfloor_full_location_reservation: Use strict mode for full r…
rousseldenis Sep 4, 2024
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
16 changes: 9 additions & 7 deletions shopfloor_full_location_reservation/services/location_content_transfer.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,17 +7,19 @@
class LocationContentTransfer(Component):
_inherit = "shopfloor.location.content.transfer"

def _find_location_move_lines_from_scan_location(self, *args, **kwargs):
move_lines = super()._find_location_move_lines_from_scan_location(
*args, **kwargs
)
def _select_move_lines_first_location(self, move_lines):
if not self.work.menu.full_location_reservation:
return move_lines
return super()._select_move_lines_first_location(move_lines)

if any(move_lines.move_id.mapped("is_full_location_reservation")):
return move_lines
return super()._select_move_lines_first_location(move_lines)

move_lines |= move_lines._full_location_reservation().move_line_ids
move_lines = super()._select_move_lines_first_location(move_lines)
move_lines |= move_lines._full_location_reservation(strict=True).move_line_ids

# As lines should concern only one source location and as lines
# can have been split, we need to retrieve only those with first location
move_lines = super()._select_move_lines_first_location(move_lines.exists())
return move_lines.exists()

def _move_lines_cancel_work(self, move_lines):
Expand Down
3 changes: 1 addition & 2 deletions test-requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
vcrpy-unittest
odoo_test_helper
odoo-addon-stock-full-location-reservation @ git+https://github.com/OCA/wms.git@refs/pull/794/head#subdirectory=setup/stock_full_location_reservation
odoo-addon-shopfloor-base @ git+https://github.com/OCA/wms.git@refs/pull/899/head#subdirectory=setup/shopfloor_base
odoo-addon-shopfloor @ git+https://github.com/OCA/wms.git@refs/pull/899/head#subdirectory=setup/shopfloor
odoo-addon-shopfloor @ git+https://github.com/OCA/wms.git@refs/pull/917/head#subdirectory=setup/shopfloor