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

[14.0][IMP] added default operation on rma group, easy setup before rma lines created (#452)

Browse Source 
* [14.0][IMP] added default operation on rma group, easy setup before rma lines created

* [IMP] added fields for default route created by wizard on rma group

* fix: get right price after create rma order line
This commit is contained in:
ChrisOForgeFlow
2023-10-27 07:41:54 -05:00
committed by JasminSForgeFlow
parent f8879a51ac
commit 7d979ebc60
5 changed files with 162 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
rma/models/rma_order.py
View File

@@ -124,12 +124,32 @@ class RmaOrder(models.Model):
tracking=True,
default=lambda self: self.env.uid,
)
in_route_id = fields.Many2one(
"stock.route",
string="Inbound Route",
domain=[("rma_selectable", "=", True)],
)
out_route_id = fields.Many2one(
"stock.route",
string="Outbound Route",
domain=[("rma_selectable", "=", True)],
)
in_warehouse_id = fields.Many2one(
comodel_name="stock.warehouse",
string="Inbound Warehouse",
required=True,
required=False,
default=_default_warehouse_id,
)
out_warehouse_id = fields.Many2one(
comodel_name="stock.warehouse",
string="Outbound Warehouse",
required=False,
default=_default_warehouse_id,
)
location_id = fields.Many2one(
comodel_name="stock.location",
string="Send To This Company Location",
)
customer_to_supplier = fields.Boolean("The customer will send to the supplier")
supplier_to_customer = fields.Boolean("The supplier will send to the customer")
supplier_address_id = fields.Many2one(
@@ -153,6 +173,26 @@ class RmaOrder(models.Model):
default="draft",
store=True,
)
operation_default_id = fields.Many2one(
comodel_name="rma.operation",
required=False,
string="Default Operation Type",
)
@api.onchange(
"operation_default_id",
)
def _onchange_operation(self):
if self.operation_default_id:
self.in_warehouse_id = self.operation_default_id.in_warehouse_id
self.out_warehouse_id = self.operation_default_id.out_warehouse_id
self.location_id = (
self.operation_default_id.location_id or self.in_warehouse_id.lot_rma_id
)
self.customer_to_supplier = self.operation_default_id.customer_to_supplier
self.supplier_to_customer = self.operation_default_id.supplier_to_customer
self.in_route_id = self.operation_default_id.in_route_id
self.out_route_id = self.operation_default_id.out_route_id
@api.depends("rma_line_ids.date_rma")
def _compute_date_rma(self):

24
rma/models/rma_order_line.py
View File

@@ -739,13 +739,25 @@ class RmaOrderLine(models.Model):
return result
self.receipt_policy = self.operation_id.receipt_policy
self.delivery_policy = self.operation_id.delivery_policy
self.in_warehouse_id = self.operation_id.in_warehouse_id
self.out_warehouse_id = self.operation_id.out_warehouse_id
self.location_id = (
self.operation_id.location_id or self.in_warehouse_id.lot_rma_id
self.customer_to_supplier = (
self.rma_id.customer_to_supplier or self.operation_id.customer_to_supplier
)
self.customer_to_supplier = self.operation_id.customer_to_supplier
self.supplier_to_customer = self.operation_id.supplier_to_customer
self.supplier_to_customer = (
self.rma_id.supplier_to_customer or self.operation_id.supplier_to_customer
)
self.in_warehouse_id = (
self.rma_id.in_warehouse_id or self.operation_id.in_warehouse_id
)
self.out_warehouse_id = (
self.rma_id.out_warehouse_id or self.operation_id.out_warehouse_id
)
self.location_id = (
self.rma_id.location_id
or self.operation_id.location_id
or self.in_warehouse_id.lot_rma_id
)
self.in_route_id = self.rma_id.in_route_id or self.operation_id.in_route_id
self.out_route_id = self.rma_id.out_route_id or self.operation_id.out_route_id
return result
@api.depends("operation_id")

37
rma/views/rma_order_view.xml
View File

@@ -117,10 +117,32 @@
</group>
<group>
<group name="inbound_route" string="Inbound">
<field
name="operation_default_id"
domain="[('type','=','customer')]"
/>
<field
name="in_warehouse_id"
attrs="{'readonly':[('state', '!=', 'draft')]}"
/>
<field
name="in_route_id"
attrs="{'readonly':[('state', '!=', 'draft')]}"
/>
<field
name="out_warehouse_id"
invisible="1"
attrs="{'readonly':[('state', '!=', 'draft')]}"
/>
<field
name="location_id"
attrs="{'readonly':[('state', '!=', 'draft')]}"
/>
<field
name="out_route_id"
invisible="1"
attrs="{'readonly':[('state', '!=', 'draft')]}"
/>
<field
name="customer_to_supplier"
attrs="{'readonly':[('state', '!=', 'draft')],
@@ -247,6 +269,21 @@
'hide_title': True}
</attribute>
</field>
<field name="operation_default_id" position="attributes">
<attribute name="domain">[('type','=','supplier')]</attribute>
</field>
<field name="in_warehouse_id" position="attributes">
<attribute name="invisible">1</attribute>
</field>
<field name="out_warehouse_id" position="attributes">
<attribute name="invisible">1</attribute>
</field>
<field name="in_route_id" position="attributes">
<attribute name="invisible">0</attribute>
</field>
<field name="out_route_id" position="attributes">
<attribute name="invisible">0</attribute>
</field>
</field>
</record>

33
rma/wizards/rma_add_serial.py
View File

@@ -58,6 +58,8 @@ class RmaAddSerialWiz(models.TransientModel):
)
def _prepare_rma_line_from_lot_vals(self, lot):
operation = self.rma_id.operation_default_id
if not operation:
if self.env.context.get("customer"):
operation = (
lot.product_id.rma_customer_operation_id
@@ -82,7 +84,11 @@ class RmaAddSerialWiz(models.TransientModel):
if not route:
raise ValidationError(_("Please define an RMA route"))
if not operation.in_warehouse_id or not operation.out_warehouse_id:
in_warehouse = self.rma_id.in_warehouse_id or operation.in_warehouse_id
in_route = self.rma_id.in_route_id or operation.in_route_id
out_warehouse = self.rma_id.out_warehouse_id or operation.out_warehouse_id
out_route = self.rma_id.out_route_id or operation.out_route_id
if not in_warehouse or not out_warehouse:
warehouse = self.env["stock.warehouse"].search(
[
("company_id", "=", self.rma_id.company_id.id),
@@ -94,6 +100,16 @@ class RmaAddSerialWiz(models.TransientModel):
raise ValidationError(
_("Please define a warehouse with a default RMA location")
)
in_warehouse = in_warehouse or warehouse
out_warehouse = out_warehouse or warehouse
location = self.rma_id.location_id
if not location:
location = (
operation.location_id
or operation.in_warehouse_id.lot_rma_id
or in_warehouse.lot_rma_id
or out_warehouse.lot_rma_id
)
product_qty = 1 # serial
if lot.product_id.tracking == "lot":
@@ -112,15 +128,11 @@ class RmaAddSerialWiz(models.TransientModel):
"rma_id": self.rma_id.id,
"receipt_policy": operation.receipt_policy,
"delivery_policy": operation.delivery_policy,
"in_warehouse_id": operation.in_warehouse_id.id or warehouse.id,
"out_warehouse_id": operation.out_warehouse_id.id or warehouse.id,
"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
),
"in_warehouse_id": in_warehouse.id,
"out_warehouse_id": out_warehouse.id,
"in_route_id": in_route.id,
"out_route_id": out_route.id,
"location_id": location.id,
}
return vals
@@ -141,4 +153,5 @@ class RmaAddSerialWiz(models.TransientModel):
# favor of (pre)computed stored editable fields for all policies
# and configuration in the RMA operation.
rec._onchange_operation_id()
rec.price_unit = rec._get_price_unit()
return {"type": "ir.actions.act_window_close"}

34
rma/wizards/rma_add_stock_move.py
View File

@@ -73,6 +73,8 @@ class RmaAddStockMove(models.TransientModel):
}
def _prepare_rma_line_from_stock_move(self, sm, lot=False):
operation = self.rma_id.operation_default_id
if not operation:
if self.env.context.get("customer"):
operation = (
sm.product_id.rma_customer_operation_id
@@ -96,8 +98,11 @@ class RmaAddStockMove(models.TransientModel):
)
if not route:
raise ValidationError(_("Please define an RMA route"))
if not operation.in_warehouse_id or not operation.out_warehouse_id:
in_warehouse = self.rma_id.in_warehouse_id or operation.in_warehouse_id
in_route = self.rma_id.in_route_id or operation.in_route_id
out_warehouse = self.rma_id.out_warehouse_id or operation.out_warehouse_id
out_route = self.rma_id.out_route_id or operation.out_route_id
if not in_warehouse or not out_warehouse:
warehouse = self.env["stock.warehouse"].search(
[
("company_id", "=", self.rma_id.company_id.id),
@@ -109,6 +114,16 @@ class RmaAddStockMove(models.TransientModel):
raise ValidationError(
_("Please define a warehouse with a default RMA location")
)
in_warehouse = in_warehouse or warehouse
out_warehouse = out_warehouse or warehouse
location = self.rma_id.location_id
if not location:
location = (
operation.location_id
or operation.in_warehouse_id.lot_rma_id
or in_warehouse.lot_rma_id
or out_warehouse.lot_rma_id
)
product_qty = sm.product_uom_qty
if sm.product_id.tracking == "serial":
product_qty = 1
@@ -132,15 +147,11 @@ class RmaAddStockMove(models.TransientModel):
"rma_id": self.rma_id.id,
"receipt_policy": operation.receipt_policy,
"delivery_policy": operation.delivery_policy,
"in_warehouse_id": operation.in_warehouse_id.id or warehouse.id,
"out_warehouse_id": operation.out_warehouse_id.id or warehouse.id,
"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
),
"in_warehouse_id": in_warehouse.id,
"out_warehouse_id": out_warehouse.id,
"in_route_id": in_route.id,
"out_route_id": out_route.id,
"location_id": location.id,
}
return data
@@ -184,4 +195,5 @@ class RmaAddStockMove(models.TransientModel):
# favor of (pre)computed stored editable fields for all policies
# and configuration in the RMA operation.
rec._onchange_operation_id()
rec.price_unit = rec._get_price_unit()
return {"type": "ir.actions.act_window_close"}