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

[IMP] COPIER UPDATE: black, isort, prettier

Browse Source
This commit is contained in:
AaronHForgeFlow
2022-04-22 12:00:44 +02:00
committed by Carlos Vallés Fuster
parent 8a0661b4eb
commit 329887509c
11 changed files with 231 additions and 261 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
rma/models/rma_operation.py
View File

@@ -33,15 +33,14 @@ class RmaOperation(models.Model):
return self.env.ref("rma.route_rma_supplier") return self.env.ref("rma.route_rma_supplier")
name = fields.Char("Description", required=True) name = fields.Char("Description", required=True)
code = fields.Char("Code", required=True) code = fields.Char(required=True)
active = fields.Boolean(string="Active", default=True) active = fields.Boolean(default=True)
receipt_policy = fields.Selection( receipt_policy = fields.Selection(
[ [
("no", "Not required"), ("no", "Not required"),
("ordered", "Based on Ordered Quantities"), ("ordered", "Based on Ordered Quantities"),
("delivered", "Based on Delivered Quantities"), ("delivered", "Based on Delivered Quantities"),
], ],
string="Receipts Policy",
default="no", default="no",
) )
delivery_policy = fields.Selection( delivery_policy = fields.Selection(
@@ -50,7 +49,6 @@ class RmaOperation(models.Model):
("ordered", "Based on Ordered Quantities"), ("ordered", "Based on Ordered Quantities"),
("received", "Based on Received Quantities"), ("received", "Based on Received Quantities"),
], ],
string="Delivery Policy",
default="no", default="no",
) )
in_route_id = fields.Many2one( in_route_id = fields.Many2one(

2
rma/models/rma_order.py
View File

@@ -77,7 +77,6 @@ class RmaOrder(models.Model):
name = fields.Char(string="Group Number", index=True, copy=False) name = fields.Char(string="Group Number", index=True, copy=False)
type = fields.Selection( type = fields.Selection(
[("customer", "Customer"), ("supplier", "Supplier")], [("customer", "Customer"), ("supplier", "Supplier")],
string="Type",
required=True, required=True,
default=lambda self: self._get_default_type(), default=lambda self: self._get_default_type(),
readonly=True, readonly=True,
@@ -145,7 +144,6 @@ class RmaOrder(models.Model):
("approved", "Approved"), ("approved", "Approved"),
("done", "Done"), ("done", "Done"),
], ],
string="State",
default="draft", default="draft",
store=True, store=True,
) )

19
rma/models/rma_order_line.py
View File

@@ -217,7 +217,7 @@ class RmaOrderLine(models.Model):
help="Add here the supplier RMA #. Otherwise an internal code is" " assigned.", help="Add here the supplier RMA #. Otherwise an internal code is" " assigned.",
copy=False, copy=False,
) )
description = fields.Text(string="Description") description = fields.Text()
conditions = fields.Html(string="Terms and conditions") conditions = fields.Html(string="Terms and conditions")
origin = fields.Char( origin = fields.Char(
string="Source Document", string="Source Document",
@@ -232,14 +232,12 @@ class RmaOrderLine(models.Model):
("approved", "Approved"), ("approved", "Approved"),
("done", "Done"), ("done", "Done"),
], ],
string="State",
default="draft", default="draft",
tracking=True, tracking=True,
) )
operation_id = fields.Many2one( operation_id = fields.Many2one(
comodel_name="rma.operation", comodel_name="rma.operation",
required=True, required=True,
string="Operation",
readonly=False, readonly=False,
tracking=True, tracking=True,
) )
@@ -258,7 +256,6 @@ class RmaOrderLine(models.Model):
required=True, required=True,
store=True, store=True,
tracking=True, tracking=True,
string="Partner",
readonly=True, readonly=True,
states={"draft": [("readonly", False)]}, states={"draft": [("readonly", False)]},
) )
@@ -267,7 +264,6 @@ class RmaOrderLine(models.Model):
) )
product_id = fields.Many2one( product_id = fields.Many2one(
comodel_name="product.product", comodel_name="product.product",
string="Product",
ondelete="restrict", ondelete="restrict",
required=True, required=True,
readonly=True, readonly=True,
@@ -295,9 +291,7 @@ class RmaOrderLine(models.Model):
readonly=True, readonly=True,
states={"draft": [("readonly", False)]}, states={"draft": [("readonly", False)]},
) )
price_unit = fields.Monetary( price_unit = fields.Monetary(readonly=True, states={"draft": [("readonly", False)]})
string="Price Unit", readonly=True, states={"draft": [("readonly", False)]}
)
in_shipment_count = fields.Integer( in_shipment_count = fields.Integer(
compute="_compute_in_shipment_count", string="# of Shipments" compute="_compute_in_shipment_count", string="# of Shipments"
) )
@@ -316,18 +310,15 @@ class RmaOrderLine(models.Model):
) )
currency_id = fields.Many2one( currency_id = fields.Many2one(
"res.currency", "res.currency",
string="Currency",
default=lambda self: self.env.company.currency_id, default=lambda self: self.env.company.currency_id,
) )
company_id = fields.Many2one( company_id = fields.Many2one(
comodel_name="res.company", comodel_name="res.company",
string="Company",
required=True, required=True,
default=lambda self: self.env.company, default=lambda self: self.env.company,
) )
type = fields.Selection( type = fields.Selection(
selection=[("customer", "Customer"), ("supplier", "Supplier")], selection=[("customer", "Customer"), ("supplier", "Supplier")],
string="Type",
required=True, required=True,
default=lambda self: self._get_default_type(), default=lambda self: self._get_default_type(),
readonly=True, readonly=True,
@@ -349,7 +340,6 @@ class RmaOrderLine(models.Model):
("delivered", "Based on Delivered Quantities"), ("delivered", "Based on Delivered Quantities"),
], ],
required=True, required=True,
string="Receipts Policy",
default="no", default="no",
readonly=False, readonly=False,
) )
@@ -360,7 +350,6 @@ class RmaOrderLine(models.Model):
("received", "Based on Received Quantities"), ("received", "Based on Received Quantities"),
], ],
required=True, required=True,
string="Delivery Policy",
default="no", default="no",
readonly=False, readonly=False,
ondelete="cascade", ondelete="cascade",
@@ -427,7 +416,6 @@ class RmaOrderLine(models.Model):
help="Address of the customer in case of Supplier RMA operation " "dropship.", help="Address of the customer in case of Supplier RMA operation " "dropship.",
) )
qty_to_receive = fields.Float( qty_to_receive = fields.Float(
string="Qty To Receive",
digits="Product Unit of Measure", digits="Product Unit of Measure",
compute="_compute_qty_to_receive", compute="_compute_qty_to_receive",
store=True, store=True,
@@ -441,14 +429,12 @@ class RmaOrderLine(models.Model):
store=True, store=True,
) )
qty_received = fields.Float( qty_received = fields.Float(
string="Qty Received",
copy=False, copy=False,
digits="Product Unit of Measure", digits="Product Unit of Measure",
compute="_compute_qty_received", compute="_compute_qty_received",
store=True, store=True,
) )
qty_to_deliver = fields.Float( qty_to_deliver = fields.Float(
string="Qty To Deliver",
copy=False, copy=False,
digits="Product Unit of Measure", digits="Product Unit of Measure",
readonly=True, readonly=True,
@@ -464,7 +450,6 @@ class RmaOrderLine(models.Model):
store=True, store=True,
) )
qty_delivered = fields.Float( qty_delivered = fields.Float(
string="Qty Delivered",
copy=False, copy=False,
digits="Product Unit of Measure", digits="Product Unit of Measure",
readonly=True, readonly=True,

3
rma/report/rma_report.xml
View File

@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8" ?> <?xml version="1.0" encoding="utf-8" ?>
<odoo> <odoo>
<data>
<record id="rma_order_line_report" model="ir.actions.report"> <record id="rma_order_line_report" model="ir.actions.report">
<field name="name">RMA</field> <field name="name">RMA</field>
<field name="model">rma.order.line</field> <field name="model">rma.order.line</field>
@@ -21,5 +21,4 @@
<field name="binding_model_id" ref="model_rma_order" /> <field name="binding_model_id" ref="model_rma_order" />
<field name="binding_type">report</field> <field name="binding_type">report</field>
</record> </record>
</data>
</odoo> </odoo>

52
rma/security/rma.xml
View File

@@ -1,6 +1,5 @@
<?xml version="1.0" ?> <?xml version="1.0" ?>
<odoo> <odoo noupdate="0">
<data noupdate="0">
<record model="ir.module.category" id="module_category_rma"> <record model="ir.module.category" id="module_category_rma">
<field name="name">RMA</field> <field name="name">RMA</field>
@@ -23,10 +22,10 @@
<record id="group_rma_manager" model="res.groups"> <record id="group_rma_manager" model="res.groups">
<field name="name">RMA Manager</field> <field name="name">RMA Manager</field>
<field <field
name="implied_ids" name="implied_ids"
eval="[(4, ref('rma.group_rma_customer_user')), eval="[(4, ref('rma.group_rma_customer_user')),
(4, ref('rma.group_rma_supplier_user'))]" (4, ref('rma.group_rma_supplier_user'))]"
/> />
<field name="users" eval="[(4, ref('base.user_root'))]" /> <field name="users" eval="[(4, ref('base.user_root'))]" />
<field name="category_id" ref="module_category_rma" /> <field name="category_id" ref="module_category_rma" />
</record> </record>
@@ -48,48 +47,47 @@
<record id="stock.group_stock_user" model="res.groups"> <record id="stock.group_stock_user" model="res.groups">
<field <field
name="implied_ids" name="implied_ids"
eval="[(4, ref('group_rma_customer_user')), eval="[(4, ref('group_rma_customer_user')),
(4, ref('group_rma_supplier_user'))]" (4, ref('group_rma_supplier_user'))]"
/> />
</record> </record>
<record model="ir.rule" id="rma_order_rule"> <record model="ir.rule" id="rma_order_rule">
<field name="name">rma order multi-company</field> <field name="name">rma order multi-company</field>
<field <field
name="model_id" name="model_id"
search="[('model','=','rma.order')]" search="[('model','=','rma.order')]"
model="ir.model" model="ir.model"
/> />
<field name="global" eval="True" /> <field name="global" eval="True" />
<field <field
name="domain_force" name="domain_force"
>['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field> >['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
</record> </record>
<record model="ir.rule" id="rma_order_line_rule"> <record model="ir.rule" id="rma_order_line_rule">
<field name="name">rma order line multi-company</field> <field name="name">rma order line multi-company</field>
<field <field
name="model_id" name="model_id"
search="[('model','=','rma.order.line')]" search="[('model','=','rma.order.line')]"
model="ir.model" model="ir.model"
/> />
<field name="global" eval="True" /> <field name="global" eval="True" />
<field <field
name="domain_force" name="domain_force"
>['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field> >['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
</record> </record>
<record model="ir.rule" id="rma_operation_rule"> <record model="ir.rule" id="rma_operation_rule">
<field name="name">rma operation multi-company</field> <field name="name">rma operation multi-company</field>
<field <field
name="model_id" name="model_id"
search="[('model','=','rma.operation')]" search="[('model','=','rma.operation')]"
model="ir.model" model="ir.model"
/> />
<field name="global" eval="True" /> <field name="global" eval="True" />
<field <field
name="domain_force" name="domain_force"
>['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field> >['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
</record> </record>
</data>
</odoo> </odoo>

20
rma/tests/test_rma.py
View File

@@ -6,7 +6,7 @@ from odoo.tests import common
class TestRma(common.TransactionCase): class TestRma(common.TransactionCase):
""" Test the routes and the quantities """ """Test the routes and the quantities"""
@classmethod @classmethod
def setUpClass(cls): def setUpClass(cls):
@@ -135,7 +135,7 @@ class TestRma(common.TransactionCase):
} }
) )
wizard.with_context( wizard.with_context(
{ **{
"move_ids": [(4, move.id)], "move_ids": [(4, move.id)],
"reference_move_id": move.id, "reference_move_id": move.id,
"customer": True, "customer": True,
@@ -157,7 +157,7 @@ class TestRma(common.TransactionCase):
} }
) )
wizard.with_context( wizard.with_context(
{ **{
"move_ids": [(4, move.id)], "move_ids": [(4, move.id)],
"reference_move_id": move.id, "reference_move_id": move.id,
"active_ids": rma_id.id, "active_ids": rma_id.id,
@@ -230,7 +230,7 @@ class TestRma(common.TransactionCase):
def test_01_rma_order_line(self): def test_01_rma_order_line(self):
for line in self.rma_customer_id.rma_line_ids: for line in self.rma_customer_id.rma_line_ids:
line.with_context( line.with_context(
{"default_rma_id": line.rma_id.id} **{"default_rma_id": line.rma_id.id}
)._default_warehouse_id() )._default_warehouse_id()
line._default_location_id() line._default_location_id()
line._onchange_delivery_address() line._onchange_delivery_address()
@@ -276,7 +276,7 @@ class TestRma(common.TransactionCase):
def test_02_customer_rma(self): def test_02_customer_rma(self):
self.rma_customer_id.rma_line_ids.action_rma_to_approve() self.rma_customer_id.rma_line_ids.action_rma_to_approve()
wizard = self.rma_make_picking.with_context( wizard = self.rma_make_picking.with_context(
{ **{
"active_ids": self.rma_customer_id.rma_line_ids.ids, "active_ids": self.rma_customer_id.rma_line_ids.ids,
"active_model": "rma.order.line", "active_model": "rma.order.line",
"picking_type": "incoming", "picking_type": "incoming",
@@ -397,7 +397,7 @@ class TestRma(common.TransactionCase):
) )
wizard = self.rma_make_picking.with_context( wizard = self.rma_make_picking.with_context(
{ **{
"active_id": 1, "active_id": 1,
"active_ids": self.rma_customer_id.rma_line_ids.ids, "active_ids": self.rma_customer_id.rma_line_ids.ids,
"active_model": "rma.order.line", "active_model": "rma.order.line",
@@ -526,7 +526,7 @@ class TestRma(common.TransactionCase):
line.action_rma_to_approve() line.action_rma_to_approve()
line.action_rma_approve() line.action_rma_approve()
wizard = self.rma_make_picking.with_context( wizard = self.rma_make_picking.with_context(
{ **{
"active_id": 1, "active_id": 1,
"active_ids": self.rma_droship_id.rma_line_ids.ids, "active_ids": self.rma_droship_id.rma_line_ids.ids,
"active_model": "rma.order.line", "active_model": "rma.order.line",
@@ -555,7 +555,7 @@ class TestRma(common.TransactionCase):
self.rma_droship_id.out_shipment_count, 0, "Incorrect Out Shipment Count" self.rma_droship_id.out_shipment_count, 0, "Incorrect Out Shipment Count"
) )
wizard = self.make_supplier_rma.with_context( wizard = self.make_supplier_rma.with_context(
{ **{
"active_ids": self.rma_droship_id.rma_line_ids.ids, "active_ids": self.rma_droship_id.rma_line_ids.ids,
"active_model": "rma.order.line", "active_model": "rma.order.line",
"active_id": 1, "active_id": 1,
@@ -626,7 +626,7 @@ class TestRma(common.TransactionCase):
self.rma_supplier_id.rma_line_ids._onchange_operation_id() self.rma_supplier_id.rma_line_ids._onchange_operation_id()
self.rma_supplier_id.rma_line_ids._onchange_delivery_address() self.rma_supplier_id.rma_line_ids._onchange_delivery_address()
wizard = self.rma_make_picking.with_context( wizard = self.rma_make_picking.with_context(
{ **{
"active_ids": self.rma_supplier_id.rma_line_ids.ids, "active_ids": self.rma_supplier_id.rma_line_ids.ids,
"active_model": "rma.order.line", "active_model": "rma.order.line",
"picking_type": "outgoing", "picking_type": "outgoing",
@@ -743,7 +743,7 @@ class TestRma(common.TransactionCase):
"Wrong qty_received", "Wrong qty_received",
) )
wizard = self.rma_make_picking.with_context( wizard = self.rma_make_picking.with_context(
{ **{
"active_id": 1, "active_id": 1,
"active_ids": self.rma_supplier_id.rma_line_ids.ids, "active_ids": self.rma_supplier_id.rma_line_ids.ids,
"active_model": "rma.order.line", "active_model": "rma.order.line",

2
rma/views/rma_operation_view.xml
View File

@@ -4,7 +4,7 @@
<field name="name">rma.operation.tree</field> <field name="name">rma.operation.tree</field>
<field name="model">rma.operation</field> <field name="model">rma.operation</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<tree string="RMA Operations"> <tree name="RMA Operations">
<field name="active" invisible="1" /> <field name="active" invisible="1" />
<field name="code" /> <field name="code" />
<field name="name" /> <field name="name" />

374
rma/views/rma_order_line_view.xml
View File

@@ -1,14 +1,10 @@
<?xml version="1.0" ?> <?xml version="1.0" ?>
<odoo> <odoo>
<data>
<record id="view_rma_line_tree" model="ir.ui.view"> <record id="view_rma_line_tree" model="ir.ui.view">
<field name="name">rma.order.line.tree</field> <field name="name">rma.order.line.tree</field>
<field name="model">rma.order.line</field> <field name="model">rma.order.line</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<tree <tree name="RMA Line" decoration-info="state in ('draft','to_approve')">
string="RMA Line"
decoration-info="state in ('draft','to_approve')"
>
<field name="name" /> <field name="name" />
<field name="partner_id" /> <field name="partner_id" />
<field name="product_id" /> <field name="product_id" />
@@ -29,10 +25,7 @@
<field name="name">rma.order.line.supplier.tree</field> <field name="name">rma.order.line.supplier.tree</field>
<field name="model">rma.order.line</field> <field name="model">rma.order.line</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<tree <tree name="RMA Line" decoration-info="state in ('draft','to_approve')">
string="RMA Line"
decoration-info="state in ('draft','to_approve')"
>
<field name="name" /> <field name="name" />
<field name="partner_id" /> <field name="partner_id" />
<field name="product_id" /> <field name="product_id" />
@@ -55,71 +48,71 @@
<form string="RMA Line"> <form string="RMA Line">
<header> <header>
<button <button
name="action_rma_to_approve" name="action_rma_to_approve"
type="object" type="object"
string="Request Approval" string="Request Approval"
attrs="{'invisible':[('state', '!=', 'draft')]}" attrs="{'invisible':[('state', '!=', 'draft')]}"
class="oe_highlight" class="oe_highlight"
groups="rma.group_rma_customer_user" groups="rma.group_rma_customer_user"
/> />
<button <button
name="action_rma_draft" name="action_rma_draft"
type="object" type="object"
string="Back to Draft" string="Back to Draft"
attrs="{'invisible':[('state', '=', 'draft')]}" attrs="{'invisible':[('state', '=', 'draft')]}"
groups="rma.group_rma_customer_user,rma.group_rma_supplier_user" groups="rma.group_rma_customer_user,rma.group_rma_supplier_user"
/> />
<button <button
name="action_rma_approve" name="action_rma_approve"
type="object" type="object"
string="Approve" string="Approve"
attrs="{'invisible':[('state', '!=', 'to_approve')]}" attrs="{'invisible':[('state', '!=', 'to_approve')]}"
class="oe_highlight" class="oe_highlight"
groups="rma.group_rma_customer_user" groups="rma.group_rma_customer_user"
/> />
<button <button
name="action_rma_approve" name="action_rma_approve"
type="object" type="object"
string="Back to Approved" string="Back to Approved"
attrs="{'invisible':[('state', '!=', 'done')]}" attrs="{'invisible':[('state', '!=', 'done')]}"
groups="rma.group_rma_customer_user" groups="rma.group_rma_customer_user"
/> />
<button <button
name="action_rma_done" name="action_rma_done"
type="object" type="object"
string="Done" string="Done"
attrs="{'invisible':[('state', 'in', ('done', 'draft'))]}" attrs="{'invisible':[('state', 'in', ('done', 'draft'))]}"
groups="rma.group_rma_customer_user" groups="rma.group_rma_customer_user"
/> />
<field name="state" widget="statusbar" nolabel="1" /> <field name="state" widget="statusbar" nolabel="1" />
</header> </header>
<sheet> <sheet>
<div name="button_box" class="oe_button_box"> <div name="button_box" class="oe_button_box">
<button <button
type="object" type="object"
name="action_view_in_shipments" name="action_view_in_shipments"
class="oe_stat_button" class="oe_stat_button"
icon="fa-truck" icon="fa-truck"
groups="stock.group_stock_user" groups="stock.group_stock_user"
> >
<field <field
name="in_shipment_count" name="in_shipment_count"
widget="statinfo" widget="statinfo"
string="Shipments" string="Shipments"
/> />
</button> </button>
<button <button
type="object" type="object"
name="action_view_out_shipments" name="action_view_out_shipments"
class="oe_stat_button" class="oe_stat_button"
icon="fa-truck" icon="fa-truck"
groups="stock.group_stock_user" groups="stock.group_stock_user"
> >
<field <field
name="out_shipment_count" name="out_shipment_count"
widget="statinfo" widget="statinfo"
string="Deliveries" string="Deliveries"
/> />
</button> </button>
<!--Move this button to rma_account--> <!--Move this button to rma_account-->
<!--<button type="object" name="action_view_invoice" <!--<button type="object" name="action_view_invoice"
@@ -128,43 +121,43 @@
string="Origin Inv"> string="Origin Inv">
</button>--> </button>-->
<button <button
type="object" type="object"
name="action_view_rma_lines" name="action_view_rma_lines"
class="oe_stat_button" class="oe_stat_button"
icon="fa-link" icon="fa-link"
groups="stock.group_stock_user" groups="stock.group_stock_user"
> >
<field <field
name="rma_line_count" name="rma_line_count"
widget="statinfo" widget="statinfo"
string="Supplier RMA" string="Supplier RMA"
/> />
</button> </button>
</div> </div>
<div class="oe_title" name="title"> <div class="oe_title" name="title">
<h1> <h1>
<field <field
name="name" name="name"
readonly="1" readonly="1"
invisible="context.get('hide_title',False)" invisible="context.get('hide_title',False)"
/> />
</h1> </h1>
</div> </div>
<group> <group>
<group name="partner"> <group name="partner">
<field <field
name="partner_id" name="partner_id"
context="{'res_partner_search_mode': 'customer'}" context="{'res_partner_search_mode': 'customer'}"
string="Customer" string="Customer"
/> />
<field <field
name="delivery_address_id" name="delivery_address_id"
domain="['|', ('parent_id', '=', partner_id), domain="['|', ('parent_id', '=', partner_id),
('id', '=', partner_id)]" ('id', '=', partner_id)]"
context="{'show_address': 1}" context="{'show_address': 1}"
options="{'always_reload': 1}" options="{'always_reload': 1}"
groups='rma.group_rma_delivery_invoice_address' groups='rma.group_rma_delivery_invoice_address'
/> />
</group> </group>
<group> <group>
<group name="contact"> <group name="contact">
@@ -180,10 +173,10 @@
<newline /> <newline />
<field name="product_tracking" invisible="1" /> <field name="product_tracking" invisible="1" />
<field <field
name="lot_id" name="lot_id"
groups="stock.group_production_lot" groups="stock.group_production_lot"
attrs="{'required': [('product_tracking', 'in', ('serial', 'lot'))]}" attrs="{'required': [('product_tracking', 'in', ('serial', 'lot'))]}"
/> />
<field name="under_warranty" /> <field name="under_warranty" />
</group> </group>
<group name="product_qty" string="Quantity"> <group name="product_qty" string="Quantity">
@@ -194,19 +187,19 @@
</group> </group>
<group name="main_info" string="Origin"> <group name="main_info" string="Origin">
<field <field
name="reference_move_id" name="reference_move_id"
options="{'no_create': True}" options="{'no_create': True}"
domain="[('picking_id.partner_id', '=', partner_id), domain="[('picking_id.partner_id', '=', partner_id),
('location_dest_id.usage', '=', 'customer'), ('location_dest_id.usage', '=', 'customer'),
('state', '=', 'done')]" ('state', '=', 'done')]"
/> />
</group> </group>
<group> <group>
<group name="operation" string="Operation"> <group name="operation" string="Operation">
<field <field
name="operation_id" name="operation_id"
domain="[('type','=','customer')]" domain="[('type','=','customer')]"
/> />
<field name="receipt_policy" /> <field name="receipt_policy" />
<field name="delivery_policy" /> <field name="delivery_policy" />
</group> </group>
@@ -228,9 +221,9 @@
<field name="qty_delivered" /> <field name="qty_delivered" />
</group> </group>
<group <group
name="supplier_rma" name="supplier_rma"
attrs="{'invisible':['|', ('type', '!=', 'customer'), ('customer_to_supplier','=',False)]}" attrs="{'invisible':['|', ('type', '!=', 'customer'), ('customer_to_supplier','=',False)]}"
> >
<field name="qty_to_supplier_rma" /> <field name="qty_to_supplier_rma" />
<field name="qty_in_supplier_rma" /> <field name="qty_in_supplier_rma" />
</group> </group>
@@ -240,42 +233,42 @@
<group name="inbound" string="Inbound"> <group name="inbound" string="Inbound">
<field name="in_warehouse_id" /> <field name="in_warehouse_id" />
<field <field
name="location_id" name="location_id"
domain="[('usage', '=', 'internal')]" domain="[('usage', '=', 'internal')]"
/> />
<field <field
name="in_route_id" name="in_route_id"
groups="stock.group_adv_location" groups="stock.group_adv_location"
/> />
<field <field
name="customer_to_supplier" name="customer_to_supplier"
attrs="{'invisible':[('type', '!=', 'customer')]}" attrs="{'invisible':[('type', '!=', 'customer')]}"
/> />
<field <field
name="supplier_address_id" name="supplier_address_id"
context="{'show_address': 1}" context="{'show_address': 1}"
options="{'always_reload': 1}" options="{'always_reload': 1}"
attrs="{'required':[('customer_to_supplier', '=', True)], attrs="{'required':[('customer_to_supplier', '=', True)],
'invisible':[('customer_to_supplier', '=', False)]}" 'invisible':[('customer_to_supplier', '=', False)]}"
/> />
</group> </group>
<group name="outbound" string="Outbound"> <group name="outbound" string="Outbound">
<field name="out_warehouse_id" /> <field name="out_warehouse_id" />
<field <field
name="out_route_id" name="out_route_id"
groups="stock.group_adv_location" groups="stock.group_adv_location"
/> />
<field <field
name="supplier_to_customer" name="supplier_to_customer"
attrs="{'invisible':[('type', '!=', 'supplier')]}" attrs="{'invisible':[('type', '!=', 'supplier')]}"
/> />
<field <field
name="customer_address_id" name="customer_address_id"
context="{'show_address': 1}" context="{'show_address': 1}"
options="{'always_reload': 1}" options="{'always_reload': 1}"
attrs="{'required':[('supplier_to_customer', '=', True)], attrs="{'required':[('supplier_to_customer', '=', True)],
'invisible':[('supplier_to_customer', '=', False)]}" 'invisible':[('supplier_to_customer', '=', False)]}"
/> />
</group> </group>
</page> </page>
<page name="stock" string="Stock Moves"> <page name="stock" string="Stock Moves">
@@ -285,16 +278,16 @@
<group name="general" string="General"> <group name="general" string="General">
<field name="conditions" /> <field name="conditions" />
<field <field
name="rma_id" name="rma_id"
groups="rma.group_rma_groups" groups="rma.group_rma_groups"
/> />
<field name="origin" /> <field name="origin" />
</group> </group>
<group <group
name="company" name="company"
string="Company" string="Company"
groups="base.group_multi_company" groups="base.group_multi_company"
> >
<field name="company_id" /> <field name="company_id" />
</group> </group>
</page> </page>
@@ -302,10 +295,10 @@
</sheet> </sheet>
<div class="oe_chatter"> <div class="oe_chatter">
<field <field
name="message_follower_ids" name="message_follower_ids"
widget="mail_followers" widget="mail_followers"
groups="base.group_user" groups="base.group_user"
/> />
<field name="message_ids" widget="mail_thread" /> <field name="message_ids" widget="mail_thread" />
</div> </div>
</form> </form>
@@ -319,24 +312,24 @@
<field name="mode">primary</field> <field name="mode">primary</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<xpath <xpath
expr="//button[@name='action_view_rma_lines']/field" expr="//button[@name='action_view_rma_lines']/field"
position="attributes" position="attributes"
> >
<attribute name="string">Customer RMA</attribute> <attribute name="string">Customer RMA</attribute>
</xpath> </xpath>
<field name="partner_id" position="attributes"> <field name="partner_id" position="attributes">
<attribute name="string">Supplier</attribute> <attribute name="string">Supplier</attribute>
<attribute <attribute
name="context" name="context"
>{'res_partner_search_mode': 'supplier'}</attribute> >{'res_partner_search_mode': 'supplier'}</attribute>
</field> </field>
<field name="under_warranty" position="attributes"> <field name="under_warranty" position="attributes">
<attribute name="invisible">1</attribute> <attribute name="invisible">1</attribute>
</field> </field>
<field name="reference_move_id" position="attributes"> <field name="reference_move_id" position="attributes">
<attribute <attribute
name="domain" name="domain"
>[('picking_id.partner_id', '=', partner_id), >[('picking_id.partner_id', '=', partner_id),
('location_id.usage', '=', 'supplier'), ('location_id.usage', '=', 'supplier'),
('state', '=', 'done')]</attribute> ('state', '=', 'done')]</attribute>
</field> </field>
@@ -360,67 +353,67 @@
<field name="lot_id" /> <field name="lot_id" />
<separator /> <separator />
<filter <filter
name="assigned_to" name="assigned_to"
domain="[('assigned_to','=',uid)]" domain="[('assigned_to','=',uid)]"
help="My RMAs" help="My RMAs"
/> />
<separator /> <separator />
<group name="stock_quantities" groups="stock.group_stock_user"> <group name="stock_quantities" groups="stock.group_stock_user">
<filter <filter
name="to_receive" name="to_receive"
domain="[('state','!=', 'done'),('qty_to_receive','>',0.0)]" domain="[('state','!=', 'done'),('qty_to_receive','>',0.0)]"
help="To Receive" help="To Receive"
/> />
<filter <filter
name="to_deliver" name="to_deliver"
domain="[('state','!=', 'done'),('qty_to_deliver','>',0.0)]" domain="[('state','!=', 'done'),('qty_to_deliver','>',0.0)]"
help="To Deliver" help="To Deliver"
/> />
</group> </group>
<group name="rma_supplier_quantities"> <group name="rma_supplier_quantities">
<filter <filter
name="to_send_to_supplier" name="to_send_to_supplier"
domain="[('state','!=', 'done'),('qty_to_supplier_rma','>',0.0)]" domain="[('state','!=', 'done'),('qty_to_supplier_rma','>',0.0)]"
help="To Send to Supplier RMA" help="To Send to Supplier RMA"
/> />
</group> </group>
<group expand="0" string="Group By"> <group expand="0" string="Group By">
<filter <filter
name="status" name="status"
string="State" string="State"
domain="[]" domain="[]"
context="{'group_by':'state'}" context="{'group_by':'state'}"
/> />
<filter <filter
name="partner" name="partner"
string="Partner" string="Partner"
domain="[]" domain="[]"
context="{'group_by':'partner_id'}" context="{'group_by':'partner_id'}"
/> />
<filter <filter
name="operation" name="operation"
string="Operation" string="Operation"
domain="[]" domain="[]"
context="{'group_by':'operation_id'}" context="{'group_by':'operation_id'}"
/> />
<filter <filter
name="product" name="product"
string="Product" string="Product"
domain="[]" domain="[]"
context="{'group_by':'product_id'}" context="{'group_by':'product_id'}"
/> />
<filter <filter
name="to_receive" name="to_receive"
string="To Receive" string="To Receive"
domain="[('qty_to_receive', '>', 0)]" domain="[('qty_to_receive', '>', 0)]"
context="{'group_by':'partner_id'}" context="{'group_by':'partner_id'}"
/> />
<filter <filter
name="to_deliver" name="to_deliver"
string="To Deliver" string="To Deliver"
domain="[('qty_to_deliver', '>', 0)]" domain="[('qty_to_deliver', '>', 0)]"
context="{'group_by':'partner_id'}" context="{'group_by':'partner_id'}"
/> />
</group> </group>
</search> </search>
</field> </field>
@@ -440,8 +433,8 @@
<field name="res_model">rma.order.line</field> <field name="res_model">rma.order.line</field>
<field name="domain">[('type','=', 'supplier')]</field> <field name="domain">[('type','=', 'supplier')]</field>
<field <field
name="context" name="context"
>{"search_default_assigned_to":uid, "supplier":1}</field> >{"search_default_assigned_to":uid, "supplier":1}</field>
<field name="view_mode">tree,form</field> <field name="view_mode">tree,form</field>
<field name="view_id" ref="view_rma_line_supplier_tree" /> <field name="view_id" ref="view_rma_line_supplier_tree" />
</record> </record>
@@ -470,5 +463,4 @@ if records.filtered(lambda x: x.state == "draft"):
</field> </field>
</record> </record>
</data>
</odoo> </odoo>

8
rma/views/rma_order_view.xml
View File

@@ -4,7 +4,7 @@
<field name="name">rma.order.tree</field> <field name="name">rma.order.tree</field>
<field name="model">rma.order</field> <field name="model">rma.order</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<tree string="RMA"> <tree name="RMA">
<field name="name" /> <field name="name" />
<field name="reference" /> <field name="reference" />
<field name="partner_id" groups="base.group_user" string="Customer" /> <field name="partner_id" groups="base.group_user" string="Customer" />
@@ -17,7 +17,7 @@
<field name="name">rma.order.supplier.tree</field> <field name="name">rma.order.supplier.tree</field>
<field name="model">rma.order</field> <field name="model">rma.order</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<tree string="RMA"> <tree name="RMA">
<field name="name" /> <field name="name" />
<field name="reference" /> <field name="reference" />
<field name="partner_id" groups="base.group_user" string="Supplier" /> <field name="partner_id" groups="base.group_user" string="Supplier" />
@@ -146,7 +146,7 @@
'default_partner_id': partner_id, 'default_partner_id': partner_id,
'hide_title': True}" 'hide_title': True}"
> >
<tree string="RMA Lines" name="lines" editable="bottom"> <tree name="lines" editable="bottom">
<field name="sequence" widget="handle" /> <field name="sequence" widget="handle" />
<field name="state" invisible="True" /> <field name="state" invisible="True" />
<field name="partner_id" invisible="True" /> <field name="partner_id" invisible="True" />
@@ -297,7 +297,7 @@
'supplier': 1, 'supplier': 1,
'hide_title': True}" 'hide_title': True}"
> >
<tree string="RMA Lines" editable="bottom"> <tree name="RMA Lines" editable="bottom">
<field name="sequence" widget="handle" /> <field name="sequence" widget="handle" />
<field name="state" invisible="True" /> <field name="state" invisible="True" />
<field name="name" /> <field name="name" />

4
rma/wizards/rma_make_picking_view.xml
View File

@@ -7,7 +7,7 @@
<form string="Select lines for picking" name="lines"> <form string="Select lines for picking" name="lines">
<separator string="Select lines for picking" /> <separator string="Select lines for picking" />
<field name="item_ids"> <field name="item_ids">
<tree string="RMA Lines" editable="bottom" create="false"> <tree name="RMA Lines" editable="bottom" create="false">
<field <field
name="rma_id" name="rma_id"
groups="rma.group_rma_groups" groups="rma.group_rma_groups"
@@ -46,7 +46,7 @@
<form string="Select lines for picking" name="lines"> <form string="Select lines for picking" name="lines">
<separator string="Select lines for picking" /> <separator string="Select lines for picking" />
<field name="item_ids"> <field name="item_ids">
<tree string="RMA Lines" editable="bottom" create="false"> <tree name="RMA Lines" editable="bottom" create="false">
<field name="rma_id" groups="rma.group_rma_groups" /> <field name="rma_id" groups="rma.group_rma_groups" />
<field name="product_id" /> <field name="product_id" />
<field name="product_qty" /> <field name="product_qty" />

2
rma/wizards/rma_order_line_make_supplier_rma_view.xml
View File

@@ -25,7 +25,7 @@
<newline /> <newline />
<group> <group>
<field name="item_ids" nolabel="1" colspan="2"> <field name="item_ids" nolabel="1" colspan="2">
<tree string="Details" editable="bottom" create="false"> <tree name="Details" editable="bottom" create="false">
<field name="line_id" options="{'no_open': true}" /> <field name="line_id" options="{'no_open': true}" />
<field name="product_id" /> <field name="product_id" />
<field name="name" /> <field name="name" />