audrius/stock-rma
1
0
Fork 0
mirror of https://github.com/ForgeFlow/stock-rma.git synced 2025-01-21 12:57:49 +02:00
Code Issues Packages Projects Releases Wiki Activity

[FIX] rma: bad field reference in rma line

Browse Source
This commit is contained in:
AaronHForgeFlow
2023-10-30 13:42:09 +01:00
parent cfdba4500b
commit 305bb6ff11
11 changed files with 28 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
rma/models/rma_order_line.py
View File

@@ -596,7 +596,6 @@ class RmaOrderLine(models.Model):
operation.location_id.id operation.location_id.id
or operation.in_warehouse_id.lot_rma_id.id or operation.in_warehouse_id.lot_rma_id.id
or operation.out_warehouse_id.lot_rma_id.id or operation.out_warehouse_id.lot_rma_id.id
or warehouse.lot_rma_id.id
), ),
} }
return data return data

14
rma/models/stock_warehouse.py
View File

@@ -29,11 +29,11 @@ class StockWarehouse(models.Model):
"for this warehouse.", "for this warehouse.",
) )
rma_customer_pull_id = fields.Many2one( rma_customer_pull_id = fields.Many2one(
comodel_name="stock.location.route", comodel_name="stock.route",
string="RMA Customer Route", string="RMA Customer Route",
) )
rma_supplier_pull_id = fields.Many2one( rma_supplier_pull_id = fields.Many2one(
comodel_name="stock.location.route", comodel_name="stock.route",
string="RMA Supplier Route", string="RMA Supplier Route",
) )
@@ -196,7 +196,7 @@ class StockWarehouse(models.Model):
"warehouse_id": self.id, "warehouse_id": self.id,
"company_id": self.company_id.id, "company_id": self.company_id.id,
"location_src_id": customer_loc.id, "location_src_id": customer_loc.id,
"location_id": self.lot_rma_id.id, "location_dest_id": self.lot_rma_id.id,
"procure_method": "make_to_stock", "procure_method": "make_to_stock",
"picking_type_id": self.rma_cust_in_type_id.id, "picking_type_id": self.rma_cust_in_type_id.id,
"active": True, "active": True,
@@ -213,7 +213,7 @@ class StockWarehouse(models.Model):
"warehouse_id": self.id, "warehouse_id": self.id,
"company_id": self.company_id.id, "company_id": self.company_id.id,
"location_src_id": self.lot_rma_id.id, "location_src_id": self.lot_rma_id.id,
"location_id": customer_loc.id, "location_dest_id": customer_loc.id,
"procure_method": "make_to_stock", "procure_method": "make_to_stock",
"picking_type_id": self.rma_cust_out_type_id.id, "picking_type_id": self.rma_cust_out_type_id.id,
"active": True, "active": True,
@@ -243,7 +243,7 @@ class StockWarehouse(models.Model):
"warehouse_id": self.id, "warehouse_id": self.id,
"company_id": self.company_id.id, "company_id": self.company_id.id,
"location_src_id": supplier_loc.id, "location_src_id": supplier_loc.id,
"location_id": self.lot_rma_id.id, "location_dest_id": self.lot_rma_id.id,
"procure_method": "make_to_stock", "procure_method": "make_to_stock",
"picking_type_id": self.rma_sup_in_type_id.id, "picking_type_id": self.rma_sup_in_type_id.id,
"active": True, "active": True,
@@ -260,7 +260,7 @@ class StockWarehouse(models.Model):
"warehouse_id": self.id, "warehouse_id": self.id,
"company_id": self.company_id.id, "company_id": self.company_id.id,
"location_src_id": self.lot_rma_id.id, "location_src_id": self.lot_rma_id.id,
"location_id": supplier_loc.id, "location_dest_id": supplier_loc.id,
"procure_method": "make_to_stock", "procure_method": "make_to_stock",
"picking_type_id": self.rma_sup_out_type_id.id, "picking_type_id": self.rma_sup_out_type_id.id,
"active": True, "active": True,
@@ -272,7 +272,7 @@ class StockWarehouse(models.Model):
return rma_route return rma_route
def _create_rma_pull(self): def _create_rma_pull(self):
route_obj = self.env["stock.location.route"] route_obj = self.env["stock.route"]
for wh in self: for wh in self:
if not wh.rma_customer_pull_id: if not wh.rma_customer_pull_id:
wh.rma_customer_pull_id = ( wh.rma_customer_pull_id = (

12
rma/tests/test_rma.py
View File

@@ -1083,9 +1083,9 @@ class TestRma(common.TransactionCase):
self.wh.reception_steps = "two_steps" self.wh.reception_steps = "two_steps"
self.wh.delivery_steps = "pick_ship" self.wh.delivery_steps = "pick_ship"
cust_in_pull_rule = self.customer_route.rule_ids.filtered( cust_in_pull_rule = self.customer_route.rule_ids.filtered(
lambda r: r.location_id == self.stock_rma_location lambda r: r.location_dest_id == self.stock_rma_location
) )
cust_in_pull_rule.location_id = self.input_location cust_in_pull_rule.location_dest_id = self.input_location
cust_out_pull_rule = self.customer_route.rule_ids.filtered( cust_out_pull_rule = self.customer_route.rule_ids.filtered(
lambda r: r.location_src_id == self.env.ref("rma.location_rma") lambda r: r.location_src_id == self.env.ref("rma.location_rma")
) )
@@ -1097,7 +1097,7 @@ class TestRma(common.TransactionCase):
"action": "pull", "action": "pull",
"warehouse_id": self.wh.id, "warehouse_id": self.wh.id,
"location_src_id": self.wh.lot_rma_id.id, "location_src_id": self.wh.lot_rma_id.id,
"location_id": self.output_location.id, "location_dest_id": self.output_location.id,
"procure_method": "make_to_stock", "procure_method": "make_to_stock",
"route_id": self.customer_route.id, "route_id": self.customer_route.id,
"picking_type_id": self.env.ref("stock.picking_type_internal").id, "picking_type_id": self.env.ref("stock.picking_type_internal").id,
@@ -1109,7 +1109,7 @@ class TestRma(common.TransactionCase):
"action": "pull", "action": "pull",
"warehouse_id": self.wh.id, "warehouse_id": self.wh.id,
"location_src_id": self.output_location.id, "location_src_id": self.output_location.id,
"location_id": self.customer_location.id, "location_dest_id": self.customer_location.id,
"procure_method": "make_to_order", "procure_method": "make_to_order",
"route_id": self.customer_route.id, "route_id": self.customer_route.id,
"picking_type_id": self.env.ref("stock.picking_type_internal").id, "picking_type_id": self.env.ref("stock.picking_type_internal").id,
@@ -1121,7 +1121,7 @@ class TestRma(common.TransactionCase):
"action": "pull", "action": "pull",
"warehouse_id": self.wh.id, "warehouse_id": self.wh.id,
"location_src_id": self.customer_location.id, "location_src_id": self.customer_location.id,
"location_id": self.input_location.id, "location_dest_id": self.input_location.id,
"procure_method": "make_to_stock", "procure_method": "make_to_stock",
"route_id": self.customer_route.id, "route_id": self.customer_route.id,
"picking_type_id": self.env.ref("stock.picking_type_internal").id, "picking_type_id": self.env.ref("stock.picking_type_internal").id,
@@ -1133,7 +1133,7 @@ class TestRma(common.TransactionCase):
"action": "pull", "action": "pull",
"warehouse_id": self.wh.id, "warehouse_id": self.wh.id,
"location_src_id": self.input_location.id, "location_src_id": self.input_location.id,
"location_id": self.wh.lot_rma_id.id, "location_dest_id": self.wh.lot_rma_id.id,
"procure_method": "make_to_order", "procure_method": "make_to_order",
"route_id": self.customer_route.id, "route_id": self.customer_route.id,
"picking_type_id": self.env.ref("stock.picking_type_internal").id, "picking_type_id": self.env.ref("stock.picking_type_internal").id,

7
rma/views/stock_warehouse.xml
View File

@@ -7,14 +7,11 @@
<field name="arch" type="xml"> <field name="arch" type="xml">
<xpath expr="//field[@name='wh_output_stock_loc_id']" position="after"> <xpath expr="//field[@name='wh_output_stock_loc_id']" position="after">
<field name="lot_rma_id" /> <field name="lot_rma_id" />
</xpath>
<field name="resupply_wh_ids" position="after">
<field name="rma_in_this_wh" /> <field name="rma_in_this_wh" />
</xpath>
<xpath expr="//field[@name='out_type_id']" position="after">
<field name="rma_customer_pull_id" /> <field name="rma_customer_pull_id" />
<field name="rma_supplier_pull_id" /> <field name="rma_supplier_pull_id" />
</field>
<xpath expr="//field[@name='out_type_id']" position="after">
<field name="rma_cust_in_type_id" /> <field name="rma_cust_in_type_id" />
<field name="rma_cust_out_type_id" /> <field name="rma_cust_out_type_id" />
<field name="rma_sup_in_type_id" /> <field name="rma_sup_in_type_id" />

6
rma_account/models/rma_order_line.py
View File

@@ -183,7 +183,7 @@ class RmaOrderLine(models.Model):
raise ValidationError(_("Please define an operation first")) raise ValidationError(_("Please define an operation first"))
if not operation.in_route_id or not operation.out_route_id: if not operation.in_route_id or not operation.out_route_id:
route = self.env["stock.location.route"].search( route = self.env["stock.route"].search(
[("rma_selectable", "=", True)], limit=1 [("rma_selectable", "=", True)], limit=1
) )
if not route: if not route:
@@ -222,9 +222,7 @@ class RmaOrderLine(models.Model):
"in_route_id": operation.in_route_id.id or route.id, "in_route_id": operation.in_route_id.id or route.id,
"out_route_id": operation.out_route_id.id or route.id, "out_route_id": operation.out_route_id.id or route.id,
"location_id": ( "location_id": (
operation.location_id.id operation.location_id.id or operation.in_warehouse_id.lot_rma_id.id
or operation.in_warehouse_id.lot_rma_id.id
or warehouse.lot_rma_id.id
), ),
} }
return data return data

4
rma_account/tests/test_rma_stock_account.py
View File

@@ -283,7 +283,7 @@ class TestRmaStockAccount(TestRma):
"action": "pull", "action": "pull",
"warehouse_id": self.wh.id, "warehouse_id": self.wh.id,
"location_src_id": self.output_location.id, "location_src_id": self.output_location.id,
"location_id": self.customer_location.id, "location_dest_id": self.customer_location.id,
"procure_method": "make_to_order", "procure_method": "make_to_order",
"route_id": self.customer_route.id, "route_id": self.customer_route.id,
"picking_type_id": self.env.ref("stock.picking_type_internal").id, "picking_type_id": self.env.ref("stock.picking_type_internal").id,
@@ -295,7 +295,7 @@ class TestRmaStockAccount(TestRma):
"action": "pull", "action": "pull",
"warehouse_id": self.wh.id, "warehouse_id": self.wh.id,
"location_src_id": self.customer_location.id, "location_src_id": self.customer_location.id,
"location_id": self.input_location.id, "location_dest_id": self.input_location.id,
"procure_method": "make_to_stock", "procure_method": "make_to_stock",
"route_id": self.customer_route.id, "route_id": self.customer_route.id,
"picking_type_id": self.env.ref("stock.picking_type_internal").id, "picking_type_id": self.env.ref("stock.picking_type_internal").id,

6
rma_account/wizards/rma_add_account_move.py
View File

@@ -56,7 +56,7 @@ class RmaAddAccountMove(models.TransientModel):
if not operation: if not operation:
raise ValidationError(_("Please define an operation first")) raise ValidationError(_("Please define an operation first"))
if not operation.in_route_id or not operation.out_route_id: if not operation.in_route_id or not operation.out_route_id:
route = self.env["stock.location.route"].search( route = self.env["stock.route"].search(
[("rma_selectable", "=", True)], limit=1 [("rma_selectable", "=", True)], limit=1
) )
if not route: if not route:
@@ -100,9 +100,7 @@ class RmaAddAccountMove(models.TransientModel):
"in_route_id": operation.in_route_id.id or route.id, "in_route_id": operation.in_route_id.id or route.id,
"out_route_id": operation.out_route_id.id or route.id, "out_route_id": operation.out_route_id.id or route.id,
"location_id": ( "location_id": (
operation.location_id.id operation.location_id.id or operation.in_warehouse_id.lot_rma_id.id
or operation.in_warehouse_id.lot_rma_id.id
or warehouse.lot_rma_id.id
), ),
} }
return data return data

6
rma_purchase/models/rma_order_line.py
View File

@@ -134,7 +134,7 @@ class RmaOrderLine(models.Model):
raise ValidationError(_("Please define an operation first")) raise ValidationError(_("Please define an operation first"))
if not operation.in_route_id or not operation.out_route_id: if not operation.in_route_id or not operation.out_route_id:
route = self.env["stock.location.route"].search( route = self.env["stock.route"].search(
[("rma_selectable", "=", True)], limit=1 [("rma_selectable", "=", True)], limit=1
) )
if not route: if not route:
@@ -168,9 +168,7 @@ class RmaOrderLine(models.Model):
"receipt_policy": operation.receipt_policy, "receipt_policy": operation.receipt_policy,
"currency_id": line.currency_id.id, "currency_id": line.currency_id.id,
"location_id": ( "location_id": (
operation.location_id.id operation.location_id.id or operation.in_warehouse_id.lot_rma_id.id
or operation.in_warehouse_id.lot_rma_id.id
or warehouse.lot_rma_id.id
), ),
"refund_policy": operation.refund_policy, "refund_policy": operation.refund_policy,
"delivery_policy": operation.delivery_policy, "delivery_policy": operation.delivery_policy,

6
rma_purchase/wizards/rma_add_purchase.py
View File

@@ -59,7 +59,7 @@ class RmaAddPurchase(models.TransientModel):
if not operation: if not operation:
raise ValidationError(_("Please define an operation first")) raise ValidationError(_("Please define an operation first"))
if not operation.in_route_id or not operation.out_route_id: if not operation.in_route_id or not operation.out_route_id:
route = self.env["stock.location.route"].search( route = self.env["stock.route"].search(
[("rma_selectable", "=", True)], limit=1 [("rma_selectable", "=", True)], limit=1
) )
if not route: if not route:
@@ -97,9 +97,7 @@ class RmaAddPurchase(models.TransientModel):
"out_route_id": operation.out_route_id.id or route, "out_route_id": operation.out_route_id.id or route,
"receipt_policy": operation.receipt_policy, "receipt_policy": operation.receipt_policy,
"location_id": ( "location_id": (
operation.location_id.id operation.location_id.id or operation.in_warehouse_id.lot_rma_id.id
or operation.in_warehouse_id.lot_rma_id.id
or warehouse.lot_rma_id.id
), ),
"refund_policy": operation.refund_policy, "refund_policy": operation.refund_policy,
"delivery_policy": operation.delivery_policy, "delivery_policy": operation.delivery_policy,

6
rma_sale/models/rma_order_line.py
View File

@@ -119,7 +119,7 @@ class RmaOrderLine(models.Model):
if not operation: if not operation:
raise ValidationError(_("Please define an operation first")) raise ValidationError(_("Please define an operation first"))
if not operation.in_route_id or not operation.out_route_id: if not operation.in_route_id or not operation.out_route_id:
route = self.env["stock.location.route"].search( route = self.env["stock.route"].search(
[("rma_selectable", "=", True)], limit=1 [("rma_selectable", "=", True)], limit=1
) )
if not route: if not route:
@@ -153,9 +153,7 @@ class RmaOrderLine(models.Model):
"receipt_policy": operation.receipt_policy, "receipt_policy": operation.receipt_policy,
"currency_id": line.currency_id.id, "currency_id": line.currency_id.id,
"location_id": ( "location_id": (
operation.location_id.id operation.location_id.id or operation.in_warehouse_id.lot_rma_id.id
or operation.in_warehouse_id.lot_rma_id.id
or warehouse.lot_rma_id.id
), ),
"refund_policy": operation.refund_policy, "refund_policy": operation.refund_policy,
"delivery_policy": operation.delivery_policy, "delivery_policy": operation.delivery_policy,

2
rma_sale/wizards/rma_add_sale.py
View File

@@ -95,7 +95,7 @@ class RmaAddSale(models.TransientModel):
if not operation: if not operation:
raise ValidationError(_("Please define an operation first")) raise ValidationError(_("Please define an operation first"))
if not operation.in_route_id or not operation.out_route_id: if not operation.in_route_id or not operation.out_route_id:
route = self.env["stock.location.route"].search( route = self.env["stock.route"].search(
[("rma_selectable", "=", True)], limit=1 [("rma_selectable", "=", True)], limit=1
) )
if not route: if not route: