Skip to content

Commit d6d3367

Browse files
committed
Merge PR #3790 into 16.0
Signed-off-by rousseldenis
2 parents fa1b7c8 + 3f9608b commit d6d3367

File tree

2 files changed

+16
-1
lines changed

2 files changed

+16
-1
lines changed

sale_order_line_cancel/models/stock_move.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,6 @@ def _is_move_to_take_into_account_for_qty_canceled(self):
3939
return (
4040
self.state == "cancel"
4141
and self.sale_line_id
42-
and self.sale_line_id.state != "draft"
42+
and self.sale_line_id.state not in ["draft", "sent"]
4343
and self.picking_type_id.code == "outgoing"
4444
)

sale_order_line_cancel/tests/test_sale_order_line_cancel.py

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -125,3 +125,18 @@ def test_draft_sale_order_with_picking_cancel(self):
125125
self.assertEqual(sale.order_line.product_qty_canceled, 0)
126126
self.assertEqual(sale.order_line.qty_to_deliver, 10)
127127
self.assertEqual(sale.order_line.product_qty_remains_to_deliver, 10)
128+
129+
def test_sent_sale_order_with_picking_cancel(self):
130+
sale = self.sale
131+
sale.action_cancel()
132+
sale.action_draft()
133+
sale.state = "sent"
134+
picking = sale.picking_ids.copy()
135+
picking.action_assign()
136+
self.assertEqual(sale.order_line.product_qty_canceled, 0)
137+
self.assertEqual(sale.order_line.qty_to_deliver, 10)
138+
self.assertEqual(sale.order_line.product_qty_remains_to_deliver, 10)
139+
picking.action_cancel()
140+
self.assertEqual(sale.order_line.product_qty_canceled, 0)
141+
self.assertEqual(sale.order_line.qty_to_deliver, 10)
142+
self.assertEqual(sale.order_line.product_qty_remains_to_deliver, 10)

0 commit comments

Comments
 (0)