[FIX] rma: bad field reference in rma line

ForgeFlow · Oct 30, 2023 · 3a11b21 · 3a11b21
1 parent dd2c74b
commit 3a11b21
Show file tree

Hide file tree

Showing 6 changed files with 5 additions and 16 deletions.
diff --git a/rma/models/rma_order_line.py b/rma/models/rma_order_line.py
@@ -589,7 +589,6 @@ def _prepare_rma_line_from_stock_move(self, sm, lot=False):
                 operation.location_id.id
                 or operation.in_warehouse_id.lot_rma_id.id
                 or operation.out_warehouse_id.lot_rma_id.id
-                or warehouse.lot_rma_id.id
             ),
         }
         return data

diff --git a/rma_account/models/rma_order_line.py b/rma_account/models/rma_order_line.py
@@ -222,9 +222,7 @@ def _prepare_rma_line_from_inv_line(self, line):
             "in_route_id": operation.in_route_id.id or route.id,
             "out_route_id": operation.out_route_id.id or route.id,
             "location_id": (
-                operation.location_id.id
-                or operation.in_warehouse_id.lot_rma_id.id
-                or warehouse.lot_rma_id.id
+                operation.location_id.id or operation.in_warehouse_id.lot_rma_id.id
             ),
         }
         return data

diff --git a/rma_account/wizards/rma_add_account_move.py b/rma_account/wizards/rma_add_account_move.py
@@ -100,9 +100,7 @@ def _prepare_rma_line_from_inv_line(self, line):
             "in_route_id": operation.in_route_id.id or route.id,
             "out_route_id": operation.out_route_id.id or route.id,
             "location_id": (
-                operation.location_id.id
-                or operation.in_warehouse_id.lot_rma_id.id
-                or warehouse.lot_rma_id.id
+                operation.location_id.id or operation.in_warehouse_id.lot_rma_id.id
             ),
         }
         return data

diff --git a/rma_purchase/models/rma_order_line.py b/rma_purchase/models/rma_order_line.py
@@ -168,9 +168,7 @@ def _prepare_rma_line_from_po_line(self, line):
             "receipt_policy": operation.receipt_policy,
             "currency_id": line.currency_id.id,
             "location_id": (
-                operation.location_id.id
-                or operation.in_warehouse_id.lot_rma_id.id
-                or warehouse.lot_rma_id.id
+                operation.location_id.id or operation.in_warehouse_id.lot_rma_id.id
             ),
             "refund_policy": operation.refund_policy,
             "delivery_policy": operation.delivery_policy,

diff --git a/rma_purchase/wizards/rma_add_purchase.py b/rma_purchase/wizards/rma_add_purchase.py
@@ -97,9 +97,7 @@ def _prepare_rma_line_from_po_line(self, line):
             "out_route_id": operation.out_route_id.id or route,
             "receipt_policy": operation.receipt_policy,
             "location_id": (
-                operation.location_id.id
-                or operation.in_warehouse_id.lot_rma_id.id
-                or warehouse.lot_rma_id.id
+                operation.location_id.id or operation.in_warehouse_id.lot_rma_id.id
             ),
             "refund_policy": operation.refund_policy,
             "delivery_policy": operation.delivery_policy,

diff --git a/rma_sale/models/rma_order_line.py b/rma_sale/models/rma_order_line.py
@@ -153,9 +153,7 @@ def _prepare_rma_line_from_sale_order_line(self, line):
             "receipt_policy": operation.receipt_policy,
             "currency_id": line.currency_id.id,
             "location_id": (
-                operation.location_id.id
-                or operation.in_warehouse_id.lot_rma_id.id
-                or warehouse.lot_rma_id.id
+                operation.location_id.id or operation.in_warehouse_id.lot_rma_id.id
             ),
             "refund_policy": operation.refund_policy,
             "delivery_policy": operation.delivery_policy,