Skip to content

Commit

Permalink
[ADD][IMP] shipment_advice
Browse files Browse the repository at this point in the history
- modified shipment_advice, so it has validate_when_fully_done method that sets shipment to done if its moves are in "done" state, updated tests.
- added functionality that autovalidates shipment advice when move is done
  • Loading branch information
vnikolayev1 committed Jun 19, 2024
1 parent 6c247ac commit 7bfce51
Show file tree
Hide file tree
Showing 6 changed files with 73 additions and 3 deletions.
4 changes: 4 additions & 0 deletions shipment_advice/models/res_config_settings.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,3 +10,7 @@ class ResConfigSettings(models.TransientModel):
shipment_advice_outgoing_backorder_policy = fields.Selection(
related="company_id.shipment_advice_outgoing_backorder_policy", readonly=False
)
shipment_advice_auto_validate = fields.Boolean(
string="Enable Shipment Advice Auto Validation",
config_parameter='shipment_advice.shipment_advice_auto_validate',
)
21 changes: 19 additions & 2 deletions shipment_advice/models/shipment_advice.py
Original file line number Diff line number Diff line change
Expand Up @@ -432,10 +432,27 @@ def action_done(self):
lambda m: m.state not in ("cancel", "done") and not m.quantity_done
)
moves_to_unplan.shipment_advice_id = False
shipment.departure_date = fields.Datetime.now()
shipment.state = "done"
shipment._action_done()
return True

def _action_done(self):
self.ensure_one()
self.write({"departure_date": fields.Datetime.now(), "state": "done"})

def _is_fully_done(self):
self.ensure_one()
for move in self.planned_move_ids:
if move.state not in ["cancel", "done"]:
return False
return True

def validate_when_fully_done(self):
"""set the shipment advice to done if all the planned_move_ids
are done or cancel"""
for shipment in self:
if shipment._is_fully_done():
shipment._action_done()

def action_cancel(self):
for shipment in self:
if shipment.state not in ("confirmed", "in_progress"):
Expand Down
10 changes: 10 additions & 0 deletions shipment_advice/models/stock_move.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,3 +17,13 @@ class StockMove(models.Model):
def _plan_in_shipment(self, shipment_advice):
"""Plan the moves into the given shipment advice."""
self.shipment_advice_id = shipment_advice

def _action_done(self, cancel_backorder=False):
res = super()._action_done(cancel_backorder=cancel_backorder)
for rec in self:
if rec.shipment_advice_id.shipment_type == "incoming":
auto_validate_enabled = self.env['ir.config_parameter'].sudo().get_param(
'shipment_advice.shipment_advice_auto_validate', default=False)
if auto_validate_enabled:
rec.shipment_advice_id._action_done()
return res
2 changes: 1 addition & 1 deletion shipment_advice/tests/common.py
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,7 @@ def _plan_records_in_shipment(self, shipment_advice, records, user=None):
return wiz

def _load_records_in_shipment(self, shipment_advice, records, user=None):
"""Load pickings, move lines or package levels in the givent shipment."""
"""Load pickings, move lines or package levels in the given shipment."""
wiz_model = self.env["wizard.load.shipment"].with_context(
active_model=records._name,
active_ids=records.ids,
Expand Down
28 changes: 28 additions & 0 deletions shipment_advice/tests/test_shipment_advice.py
Original file line number Diff line number Diff line change
Expand Up @@ -246,3 +246,31 @@ def test_shipment_advice_draft(self):
def test_shipment_name(self):
self.assertTrue("OUT" in self.shipment_advice_out.name)
self.assertTrue("IN" in self.shipment_advice_in.name)

def test_validate_shipment_advice_when_fully_done(self):
picking = self._prepare_picking_with_two_packages()
line1, line2 = picking.move_line_ids
# Load first package in shipment advice 2
pl1 = line1.package_level_id
self._in_progress_shipment_advice(self.shipment_advice_out)
self.assertEqual(self.shipment_advice_out.state, "in_progress")
self._load_records_in_shipment(self.shipment_advice_out, pl1)
pl2 = line2.package_level_id
# Load second package into shipment advice
self._load_records_in_shipment(self.shipment_advice_out, pl2)
# Assign planned move_ids that are assigned to test function
self.shipment_advice_out.planned_move_ids = line2.move_id + line1.move_id
self.assertEqual(line1.move_id.state, "assigned")
self.assertEqual(line2.move_id.state, "assigned")
self.assertEqual(self.shipment_advice_out.state, "in_progress")
# Validating if moves in "incorrect" states do not trigger _action_done()
self.shipment_advice_out.validate_when_fully_done()
self.assertEqual(self.shipment_advice_out.state, "in_progress")
# Validating if moves in one "incorrect" state do not trigger _action_done()
line1.move_id.state = "done"
self.shipment_advice_out.validate_when_fully_done()
self.assertEqual(self.shipment_advice_out.state, "in_progress")
line2.move_id.state = "done"
self.shipment_advice_out.validate_when_fully_done()
self.assertEqual(self.shipment_advice_out.state, "done")
self.assertEqual(picking.state, "done")
11 changes: 11 additions & 0 deletions shipment_advice/views/res_config_settings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,17 @@
<field name="shipment_advice_outgoing_backorder_policy" />
</div>
</div>
<div class="col-12 col-lg-6 o_setting_box">
<div class="o_setting_left_pane">
<field name="shipment_advice_auto_validate"/>
</div>
<div class="o_setting_right_pane">
<label for="shipment_advice_auto_validate"/>
<div class="text-muted">
Validates shipment advice automatically whenever stock move is done
</div>
</div>
</div>
</xpath>
</field>
</record>
Expand Down

0 comments on commit 7bfce51

Please sign in to comment.