Product Return Canceled

STEPS To Reproduce :

1. Create Delivery Order With Product A (Example) 1 Unit.
2. Validate DO.
3. But Somehow we need to make Return Product to this DO.
4. Click Return Product.
5. It will make new Incoming Order Return with Product A (1 Unit). Click Cancel Button to cancel this incoming order return (I know this awkward but one of our customer did it)

Result :
Now, we can't create return of that DO anymore. It will show error message "No products to return (only lines in Done state and not fully returned yet can be returned)". But we didn't return it yet. We cancel it.

Expected Result:
Since we cancel our incoming order return of that DO, it should still can create Return Product of that DO.

Proposed Solution:
we dig into code. We found that stock return wizard in stock module (stock/wizard/stock_return_picking.py).
In function get_return_history, it check history of return but it doesn't check state of return whether it cancel or not.

So we add conditional to check it if not cancel

130: if rec.location_dest_id.id == m.location_id.id \
131: and rec.location_id.id == m.location_dest_id.id and rec.state != 'cancel' :

Thanks You

Regards

Andri