mirror of
https://github.com/ForgeFlow/stock-rma.git
synced 2025-01-21 12:57:49 +02:00
[IMP] COPIER UPDATE: black, isort, prettier
This commit is contained in:
AaronHForgeFlow
committed by
Carlos Vallés Fuster
Carlos Vallés Fuster
parent
8a0661b4eb
commit
329887509c
@@ -33,15 +33,14 @@ class RmaOperation(models.Model):
|
||||
return self.env.ref("rma.route_rma_supplier")
|
||||
|
||||
name = fields.Char("Description", required=True)
|
||||
code = fields.Char("Code", required=True)
|
||||
active = fields.Boolean(string="Active", default=True)
|
||||
code = fields.Char(required=True)
|
||||
active = fields.Boolean(default=True)
|
||||
receipt_policy = fields.Selection(
|
||||
[
|
||||
("no", "Not required"),
|
||||
("ordered", "Based on Ordered Quantities"),
|
||||
("delivered", "Based on Delivered Quantities"),
|
||||
],
|
||||
string="Receipts Policy",
|
||||
default="no",
|
||||
)
|
||||
delivery_policy = fields.Selection(
|
||||
@@ -50,7 +49,6 @@ class RmaOperation(models.Model):
|
||||
("ordered", "Based on Ordered Quantities"),
|
||||
("received", "Based on Received Quantities"),
|
||||
],
|
||||
string="Delivery Policy",
|
||||
default="no",
|
||||
)
|
||||
in_route_id = fields.Many2one(
|
||||
|
||||
@@ -77,7 +77,6 @@ class RmaOrder(models.Model):
|
||||
name = fields.Char(string="Group Number", index=True, copy=False)
|
||||
type = fields.Selection(
|
||||
[("customer", "Customer"), ("supplier", "Supplier")],
|
||||
string="Type",
|
||||
required=True,
|
||||
default=lambda self: self._get_default_type(),
|
||||
readonly=True,
|
||||
@@ -145,7 +144,6 @@ class RmaOrder(models.Model):
|
||||
("approved", "Approved"),
|
||||
("done", "Done"),
|
||||
],
|
||||
string="State",
|
||||
default="draft",
|
||||
store=True,
|
||||
)
|
||||
|
||||
@@ -217,7 +217,7 @@ class RmaOrderLine(models.Model):
|
||||
help="Add here the supplier RMA #. Otherwise an internal code is" " assigned.",
|
||||
copy=False,
|
||||
)
|
||||
description = fields.Text(string="Description")
|
||||
description = fields.Text()
|
||||
conditions = fields.Html(string="Terms and conditions")
|
||||
origin = fields.Char(
|
||||
string="Source Document",
|
||||
@@ -232,14 +232,12 @@ class RmaOrderLine(models.Model):
|
||||
("approved", "Approved"),
|
||||
("done", "Done"),
|
||||
],
|
||||
string="State",
|
||||
default="draft",
|
||||
tracking=True,
|
||||
)
|
||||
operation_id = fields.Many2one(
|
||||
comodel_name="rma.operation",
|
||||
required=True,
|
||||
string="Operation",
|
||||
readonly=False,
|
||||
tracking=True,
|
||||
)
|
||||
@@ -258,7 +256,6 @@ class RmaOrderLine(models.Model):
|
||||
required=True,
|
||||
store=True,
|
||||
tracking=True,
|
||||
string="Partner",
|
||||
readonly=True,
|
||||
states={"draft": [("readonly", False)]},
|
||||
)
|
||||
@@ -267,7 +264,6 @@ class RmaOrderLine(models.Model):
|
||||
)
|
||||
product_id = fields.Many2one(
|
||||
comodel_name="product.product",
|
||||
string="Product",
|
||||
ondelete="restrict",
|
||||
required=True,
|
||||
readonly=True,
|
||||
@@ -295,9 +291,7 @@ class RmaOrderLine(models.Model):
|
||||
readonly=True,
|
||||
states={"draft": [("readonly", False)]},
|
||||
)
|
||||
price_unit = fields.Monetary(
|
||||
string="Price Unit", readonly=True, states={"draft": [("readonly", False)]}
|
||||
)
|
||||
price_unit = fields.Monetary(readonly=True, states={"draft": [("readonly", False)]})
|
||||
in_shipment_count = fields.Integer(
|
||||
compute="_compute_in_shipment_count", string="# of Shipments"
|
||||
)
|
||||
@@ -316,18 +310,15 @@ class RmaOrderLine(models.Model):
|
||||
)
|
||||
currency_id = fields.Many2one(
|
||||
"res.currency",
|
||||
string="Currency",
|
||||
default=lambda self: self.env.company.currency_id,
|
||||
)
|
||||
company_id = fields.Many2one(
|
||||
comodel_name="res.company",
|
||||
string="Company",
|
||||
required=True,
|
||||
default=lambda self: self.env.company,
|
||||
)
|
||||
type = fields.Selection(
|
||||
selection=[("customer", "Customer"), ("supplier", "Supplier")],
|
||||
string="Type",
|
||||
required=True,
|
||||
default=lambda self: self._get_default_type(),
|
||||
readonly=True,
|
||||
@@ -349,7 +340,6 @@ class RmaOrderLine(models.Model):
|
||||
("delivered", "Based on Delivered Quantities"),
|
||||
],
|
||||
required=True,
|
||||
string="Receipts Policy",
|
||||
default="no",
|
||||
readonly=False,
|
||||
)
|
||||
@@ -360,7 +350,6 @@ class RmaOrderLine(models.Model):
|
||||
("received", "Based on Received Quantities"),
|
||||
],
|
||||
required=True,
|
||||
string="Delivery Policy",
|
||||
default="no",
|
||||
readonly=False,
|
||||
ondelete="cascade",
|
||||
@@ -427,7 +416,6 @@ class RmaOrderLine(models.Model):
|
||||
help="Address of the customer in case of Supplier RMA operation " "dropship.",
|
||||
)
|
||||
qty_to_receive = fields.Float(
|
||||
string="Qty To Receive",
|
||||
digits="Product Unit of Measure",
|
||||
compute="_compute_qty_to_receive",
|
||||
store=True,
|
||||
@@ -441,14 +429,12 @@ class RmaOrderLine(models.Model):
|
||||
store=True,
|
||||
)
|
||||
qty_received = fields.Float(
|
||||
string="Qty Received",
|
||||
copy=False,
|
||||
digits="Product Unit of Measure",
|
||||
compute="_compute_qty_received",
|
||||
store=True,
|
||||
)
|
||||
qty_to_deliver = fields.Float(
|
||||
string="Qty To Deliver",
|
||||
copy=False,
|
||||
digits="Product Unit of Measure",
|
||||
readonly=True,
|
||||
@@ -464,7 +450,6 @@ class RmaOrderLine(models.Model):
|
||||
store=True,
|
||||
)
|
||||
qty_delivered = fields.Float(
|
||||
string="Qty Delivered",
|
||||
copy=False,
|
||||
digits="Product Unit of Measure",
|
||||
readonly=True,
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
<?xml version="1.0" encoding="utf-8" ?>
|
||||
<odoo>
|
||||
<data>
|
||||
|
||||
<record id="rma_order_line_report" model="ir.actions.report">
|
||||
<field name="name">RMA</field>
|
||||
<field name="model">rma.order.line</field>
|
||||
@@ -21,5 +21,4 @@
|
||||
<field name="binding_model_id" ref="model_rma_order" />
|
||||
<field name="binding_type">report</field>
|
||||
</record>
|
||||
</data>
|
||||
</odoo>
|
||||
|
||||
@@ -1,6 +1,5 @@
|
||||
<?xml version="1.0" ?>
|
||||
<odoo>
|
||||
<data noupdate="0">
|
||||
<odoo noupdate="0">
|
||||
|
||||
<record model="ir.module.category" id="module_category_rma">
|
||||
<field name="name">RMA</field>
|
||||
@@ -23,10 +22,10 @@
|
||||
<record id="group_rma_manager" model="res.groups">
|
||||
<field name="name">RMA Manager</field>
|
||||
<field
|
||||
name="implied_ids"
|
||||
eval="[(4, ref('rma.group_rma_customer_user')),
|
||||
name="implied_ids"
|
||||
eval="[(4, ref('rma.group_rma_customer_user')),
|
||||
(4, ref('rma.group_rma_supplier_user'))]"
|
||||
/>
|
||||
/>
|
||||
<field name="users" eval="[(4, ref('base.user_root'))]" />
|
||||
<field name="category_id" ref="module_category_rma" />
|
||||
</record>
|
||||
@@ -48,48 +47,47 @@
|
||||
|
||||
<record id="stock.group_stock_user" model="res.groups">
|
||||
<field
|
||||
name="implied_ids"
|
||||
eval="[(4, ref('group_rma_customer_user')),
|
||||
name="implied_ids"
|
||||
eval="[(4, ref('group_rma_customer_user')),
|
||||
(4, ref('group_rma_supplier_user'))]"
|
||||
/>
|
||||
/>
|
||||
</record>
|
||||
|
||||
<record model="ir.rule" id="rma_order_rule">
|
||||
<field name="name">rma order multi-company</field>
|
||||
<field
|
||||
name="model_id"
|
||||
search="[('model','=','rma.order')]"
|
||||
model="ir.model"
|
||||
/>
|
||||
name="model_id"
|
||||
search="[('model','=','rma.order')]"
|
||||
model="ir.model"
|
||||
/>
|
||||
<field name="global" eval="True" />
|
||||
<field
|
||||
name="domain_force"
|
||||
>['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
|
||||
name="domain_force"
|
||||
>['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
|
||||
</record>
|
||||
<record model="ir.rule" id="rma_order_line_rule">
|
||||
<field name="name">rma order line multi-company</field>
|
||||
<field
|
||||
name="model_id"
|
||||
search="[('model','=','rma.order.line')]"
|
||||
model="ir.model"
|
||||
/>
|
||||
name="model_id"
|
||||
search="[('model','=','rma.order.line')]"
|
||||
model="ir.model"
|
||||
/>
|
||||
<field name="global" eval="True" />
|
||||
<field
|
||||
name="domain_force"
|
||||
>['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
|
||||
name="domain_force"
|
||||
>['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
|
||||
</record>
|
||||
<record model="ir.rule" id="rma_operation_rule">
|
||||
<field name="name">rma operation multi-company</field>
|
||||
<field
|
||||
name="model_id"
|
||||
search="[('model','=','rma.operation')]"
|
||||
model="ir.model"
|
||||
/>
|
||||
name="model_id"
|
||||
search="[('model','=','rma.operation')]"
|
||||
model="ir.model"
|
||||
/>
|
||||
<field name="global" eval="True" />
|
||||
<field
|
||||
name="domain_force"
|
||||
>['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
|
||||
name="domain_force"
|
||||
>['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
|
||||
</record>
|
||||
|
||||
</data>
|
||||
</odoo>
|
||||
|
||||
@@ -6,7 +6,7 @@ from odoo.tests import common
|
||||
|
||||
|
||||
class TestRma(common.TransactionCase):
|
||||
""" Test the routes and the quantities """
|
||||
"""Test the routes and the quantities"""
|
||||
|
||||
@classmethod
|
||||
def setUpClass(cls):
|
||||
@@ -135,7 +135,7 @@ class TestRma(common.TransactionCase):
|
||||
}
|
||||
)
|
||||
wizard.with_context(
|
||||
{
|
||||
**{
|
||||
"move_ids": [(4, move.id)],
|
||||
"reference_move_id": move.id,
|
||||
"customer": True,
|
||||
@@ -157,7 +157,7 @@ class TestRma(common.TransactionCase):
|
||||
}
|
||||
)
|
||||
wizard.with_context(
|
||||
{
|
||||
**{
|
||||
"move_ids": [(4, move.id)],
|
||||
"reference_move_id": move.id,
|
||||
"active_ids": rma_id.id,
|
||||
@@ -230,7 +230,7 @@ class TestRma(common.TransactionCase):
|
||||
def test_01_rma_order_line(self):
|
||||
for line in self.rma_customer_id.rma_line_ids:
|
||||
line.with_context(
|
||||
{"default_rma_id": line.rma_id.id}
|
||||
**{"default_rma_id": line.rma_id.id}
|
||||
)._default_warehouse_id()
|
||||
line._default_location_id()
|
||||
line._onchange_delivery_address()
|
||||
@@ -276,7 +276,7 @@ class TestRma(common.TransactionCase):
|
||||
def test_02_customer_rma(self):
|
||||
self.rma_customer_id.rma_line_ids.action_rma_to_approve()
|
||||
wizard = self.rma_make_picking.with_context(
|
||||
{
|
||||
**{
|
||||
"active_ids": self.rma_customer_id.rma_line_ids.ids,
|
||||
"active_model": "rma.order.line",
|
||||
"picking_type": "incoming",
|
||||
@@ -397,7 +397,7 @@ class TestRma(common.TransactionCase):
|
||||
)
|
||||
|
||||
wizard = self.rma_make_picking.with_context(
|
||||
{
|
||||
**{
|
||||
"active_id": 1,
|
||||
"active_ids": self.rma_customer_id.rma_line_ids.ids,
|
||||
"active_model": "rma.order.line",
|
||||
@@ -526,7 +526,7 @@ class TestRma(common.TransactionCase):
|
||||
line.action_rma_to_approve()
|
||||
line.action_rma_approve()
|
||||
wizard = self.rma_make_picking.with_context(
|
||||
{
|
||||
**{
|
||||
"active_id": 1,
|
||||
"active_ids": self.rma_droship_id.rma_line_ids.ids,
|
||||
"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"
|
||||
)
|
||||
wizard = self.make_supplier_rma.with_context(
|
||||
{
|
||||
**{
|
||||
"active_ids": self.rma_droship_id.rma_line_ids.ids,
|
||||
"active_model": "rma.order.line",
|
||||
"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_delivery_address()
|
||||
wizard = self.rma_make_picking.with_context(
|
||||
{
|
||||
**{
|
||||
"active_ids": self.rma_supplier_id.rma_line_ids.ids,
|
||||
"active_model": "rma.order.line",
|
||||
"picking_type": "outgoing",
|
||||
@@ -743,7 +743,7 @@ class TestRma(common.TransactionCase):
|
||||
"Wrong qty_received",
|
||||
)
|
||||
wizard = self.rma_make_picking.with_context(
|
||||
{
|
||||
**{
|
||||
"active_id": 1,
|
||||
"active_ids": self.rma_supplier_id.rma_line_ids.ids,
|
||||
"active_model": "rma.order.line",
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<field name="name">rma.operation.tree</field>
|
||||
<field name="model">rma.operation</field>
|
||||
<field name="arch" type="xml">
|
||||
<tree string="RMA Operations">
|
||||
<tree name="RMA Operations">
|
||||
<field name="active" invisible="1" />
|
||||
<field name="code" />
|
||||
<field name="name" />
|
||||
|
||||
@@ -1,14 +1,10 @@
|
||||
<?xml version="1.0" ?>
|
||||
<odoo>
|
||||
<data>
|
||||
<record id="view_rma_line_tree" model="ir.ui.view">
|
||||
<field name="name">rma.order.line.tree</field>
|
||||
<field name="model">rma.order.line</field>
|
||||
<field name="arch" type="xml">
|
||||
<tree
|
||||
string="RMA Line"
|
||||
decoration-info="state in ('draft','to_approve')"
|
||||
>
|
||||
<tree name="RMA Line" decoration-info="state in ('draft','to_approve')">
|
||||
<field name="name" />
|
||||
<field name="partner_id" />
|
||||
<field name="product_id" />
|
||||
@@ -29,10 +25,7 @@
|
||||
<field name="name">rma.order.line.supplier.tree</field>
|
||||
<field name="model">rma.order.line</field>
|
||||
<field name="arch" type="xml">
|
||||
<tree
|
||||
string="RMA Line"
|
||||
decoration-info="state in ('draft','to_approve')"
|
||||
>
|
||||
<tree name="RMA Line" decoration-info="state in ('draft','to_approve')">
|
||||
<field name="name" />
|
||||
<field name="partner_id" />
|
||||
<field name="product_id" />
|
||||
@@ -55,71 +48,71 @@
|
||||
<form string="RMA Line">
|
||||
<header>
|
||||
<button
|
||||
name="action_rma_to_approve"
|
||||
type="object"
|
||||
string="Request Approval"
|
||||
attrs="{'invisible':[('state', '!=', 'draft')]}"
|
||||
class="oe_highlight"
|
||||
groups="rma.group_rma_customer_user"
|
||||
/>
|
||||
name="action_rma_to_approve"
|
||||
type="object"
|
||||
string="Request Approval"
|
||||
attrs="{'invisible':[('state', '!=', 'draft')]}"
|
||||
class="oe_highlight"
|
||||
groups="rma.group_rma_customer_user"
|
||||
/>
|
||||
<button
|
||||
name="action_rma_draft"
|
||||
type="object"
|
||||
string="Back to Draft"
|
||||
attrs="{'invisible':[('state', '=', 'draft')]}"
|
||||
groups="rma.group_rma_customer_user,rma.group_rma_supplier_user"
|
||||
/>
|
||||
name="action_rma_draft"
|
||||
type="object"
|
||||
string="Back to Draft"
|
||||
attrs="{'invisible':[('state', '=', 'draft')]}"
|
||||
groups="rma.group_rma_customer_user,rma.group_rma_supplier_user"
|
||||
/>
|
||||
<button
|
||||
name="action_rma_approve"
|
||||
type="object"
|
||||
string="Approve"
|
||||
attrs="{'invisible':[('state', '!=', 'to_approve')]}"
|
||||
class="oe_highlight"
|
||||
groups="rma.group_rma_customer_user"
|
||||
/>
|
||||
name="action_rma_approve"
|
||||
type="object"
|
||||
string="Approve"
|
||||
attrs="{'invisible':[('state', '!=', 'to_approve')]}"
|
||||
class="oe_highlight"
|
||||
groups="rma.group_rma_customer_user"
|
||||
/>
|
||||
<button
|
||||
name="action_rma_approve"
|
||||
type="object"
|
||||
string="Back to Approved"
|
||||
attrs="{'invisible':[('state', '!=', 'done')]}"
|
||||
groups="rma.group_rma_customer_user"
|
||||
/>
|
||||
name="action_rma_approve"
|
||||
type="object"
|
||||
string="Back to Approved"
|
||||
attrs="{'invisible':[('state', '!=', 'done')]}"
|
||||
groups="rma.group_rma_customer_user"
|
||||
/>
|
||||
<button
|
||||
name="action_rma_done"
|
||||
type="object"
|
||||
string="Done"
|
||||
attrs="{'invisible':[('state', 'in', ('done', 'draft'))]}"
|
||||
groups="rma.group_rma_customer_user"
|
||||
/>
|
||||
name="action_rma_done"
|
||||
type="object"
|
||||
string="Done"
|
||||
attrs="{'invisible':[('state', 'in', ('done', 'draft'))]}"
|
||||
groups="rma.group_rma_customer_user"
|
||||
/>
|
||||
<field name="state" widget="statusbar" nolabel="1" />
|
||||
</header>
|
||||
<sheet>
|
||||
<div name="button_box" class="oe_button_box">
|
||||
<button
|
||||
type="object"
|
||||
name="action_view_in_shipments"
|
||||
class="oe_stat_button"
|
||||
icon="fa-truck"
|
||||
groups="stock.group_stock_user"
|
||||
>
|
||||
type="object"
|
||||
name="action_view_in_shipments"
|
||||
class="oe_stat_button"
|
||||
icon="fa-truck"
|
||||
groups="stock.group_stock_user"
|
||||
>
|
||||
<field
|
||||
name="in_shipment_count"
|
||||
widget="statinfo"
|
||||
string="Shipments"
|
||||
/>
|
||||
name="in_shipment_count"
|
||||
widget="statinfo"
|
||||
string="Shipments"
|
||||
/>
|
||||
</button>
|
||||
<button
|
||||
type="object"
|
||||
name="action_view_out_shipments"
|
||||
class="oe_stat_button"
|
||||
icon="fa-truck"
|
||||
groups="stock.group_stock_user"
|
||||
>
|
||||
type="object"
|
||||
name="action_view_out_shipments"
|
||||
class="oe_stat_button"
|
||||
icon="fa-truck"
|
||||
groups="stock.group_stock_user"
|
||||
>
|
||||
<field
|
||||
name="out_shipment_count"
|
||||
widget="statinfo"
|
||||
string="Deliveries"
|
||||
/>
|
||||
name="out_shipment_count"
|
||||
widget="statinfo"
|
||||
string="Deliveries"
|
||||
/>
|
||||
</button>
|
||||
<!--Move this button to rma_account-->
|
||||
<!--<button type="object" name="action_view_invoice"
|
||||
@@ -128,43 +121,43 @@
|
||||
string="Origin Inv">
|
||||
</button>-->
|
||||
<button
|
||||
type="object"
|
||||
name="action_view_rma_lines"
|
||||
class="oe_stat_button"
|
||||
icon="fa-link"
|
||||
groups="stock.group_stock_user"
|
||||
>
|
||||
type="object"
|
||||
name="action_view_rma_lines"
|
||||
class="oe_stat_button"
|
||||
icon="fa-link"
|
||||
groups="stock.group_stock_user"
|
||||
>
|
||||
<field
|
||||
name="rma_line_count"
|
||||
widget="statinfo"
|
||||
string="Supplier RMA"
|
||||
/>
|
||||
name="rma_line_count"
|
||||
widget="statinfo"
|
||||
string="Supplier RMA"
|
||||
/>
|
||||
</button>
|
||||
</div>
|
||||
<div class="oe_title" name="title">
|
||||
<h1>
|
||||
<field
|
||||
name="name"
|
||||
readonly="1"
|
||||
invisible="context.get('hide_title',False)"
|
||||
/>
|
||||
name="name"
|
||||
readonly="1"
|
||||
invisible="context.get('hide_title',False)"
|
||||
/>
|
||||
</h1>
|
||||
</div>
|
||||
<group>
|
||||
<group name="partner">
|
||||
<field
|
||||
name="partner_id"
|
||||
context="{'res_partner_search_mode': 'customer'}"
|
||||
string="Customer"
|
||||
/>
|
||||
name="partner_id"
|
||||
context="{'res_partner_search_mode': 'customer'}"
|
||||
string="Customer"
|
||||
/>
|
||||
<field
|
||||
name="delivery_address_id"
|
||||
domain="['|', ('parent_id', '=', partner_id),
|
||||
name="delivery_address_id"
|
||||
domain="['|', ('parent_id', '=', partner_id),
|
||||
('id', '=', partner_id)]"
|
||||
context="{'show_address': 1}"
|
||||
options="{'always_reload': 1}"
|
||||
groups='rma.group_rma_delivery_invoice_address'
|
||||
/>
|
||||
context="{'show_address': 1}"
|
||||
options="{'always_reload': 1}"
|
||||
groups='rma.group_rma_delivery_invoice_address'
|
||||
/>
|
||||
</group>
|
||||
<group>
|
||||
<group name="contact">
|
||||
@@ -180,10 +173,10 @@
|
||||
<newline />
|
||||
<field name="product_tracking" invisible="1" />
|
||||
<field
|
||||
name="lot_id"
|
||||
groups="stock.group_production_lot"
|
||||
attrs="{'required': [('product_tracking', 'in', ('serial', 'lot'))]}"
|
||||
/>
|
||||
name="lot_id"
|
||||
groups="stock.group_production_lot"
|
||||
attrs="{'required': [('product_tracking', 'in', ('serial', 'lot'))]}"
|
||||
/>
|
||||
<field name="under_warranty" />
|
||||
</group>
|
||||
<group name="product_qty" string="Quantity">
|
||||
@@ -194,19 +187,19 @@
|
||||
</group>
|
||||
<group name="main_info" string="Origin">
|
||||
<field
|
||||
name="reference_move_id"
|
||||
options="{'no_create': True}"
|
||||
domain="[('picking_id.partner_id', '=', partner_id),
|
||||
name="reference_move_id"
|
||||
options="{'no_create': True}"
|
||||
domain="[('picking_id.partner_id', '=', partner_id),
|
||||
('location_dest_id.usage', '=', 'customer'),
|
||||
('state', '=', 'done')]"
|
||||
/>
|
||||
/>
|
||||
</group>
|
||||
<group>
|
||||
<group name="operation" string="Operation">
|
||||
<field
|
||||
name="operation_id"
|
||||
domain="[('type','=','customer')]"
|
||||
/>
|
||||
name="operation_id"
|
||||
domain="[('type','=','customer')]"
|
||||
/>
|
||||
<field name="receipt_policy" />
|
||||
<field name="delivery_policy" />
|
||||
</group>
|
||||
@@ -228,9 +221,9 @@
|
||||
<field name="qty_delivered" />
|
||||
</group>
|
||||
<group
|
||||
name="supplier_rma"
|
||||
attrs="{'invisible':['|', ('type', '!=', 'customer'), ('customer_to_supplier','=',False)]}"
|
||||
>
|
||||
name="supplier_rma"
|
||||
attrs="{'invisible':['|', ('type', '!=', 'customer'), ('customer_to_supplier','=',False)]}"
|
||||
>
|
||||
<field name="qty_to_supplier_rma" />
|
||||
<field name="qty_in_supplier_rma" />
|
||||
</group>
|
||||
@@ -240,42 +233,42 @@
|
||||
<group name="inbound" string="Inbound">
|
||||
<field name="in_warehouse_id" />
|
||||
<field
|
||||
name="location_id"
|
||||
domain="[('usage', '=', 'internal')]"
|
||||
/>
|
||||
name="location_id"
|
||||
domain="[('usage', '=', 'internal')]"
|
||||
/>
|
||||
<field
|
||||
name="in_route_id"
|
||||
groups="stock.group_adv_location"
|
||||
/>
|
||||
name="in_route_id"
|
||||
groups="stock.group_adv_location"
|
||||
/>
|
||||
<field
|
||||
name="customer_to_supplier"
|
||||
attrs="{'invisible':[('type', '!=', 'customer')]}"
|
||||
/>
|
||||
name="customer_to_supplier"
|
||||
attrs="{'invisible':[('type', '!=', 'customer')]}"
|
||||
/>
|
||||
<field
|
||||
name="supplier_address_id"
|
||||
context="{'show_address': 1}"
|
||||
options="{'always_reload': 1}"
|
||||
attrs="{'required':[('customer_to_supplier', '=', True)],
|
||||
name="supplier_address_id"
|
||||
context="{'show_address': 1}"
|
||||
options="{'always_reload': 1}"
|
||||
attrs="{'required':[('customer_to_supplier', '=', True)],
|
||||
'invisible':[('customer_to_supplier', '=', False)]}"
|
||||
/>
|
||||
/>
|
||||
</group>
|
||||
<group name="outbound" string="Outbound">
|
||||
<field name="out_warehouse_id" />
|
||||
<field
|
||||
name="out_route_id"
|
||||
groups="stock.group_adv_location"
|
||||
/>
|
||||
name="out_route_id"
|
||||
groups="stock.group_adv_location"
|
||||
/>
|
||||
<field
|
||||
name="supplier_to_customer"
|
||||
attrs="{'invisible':[('type', '!=', 'supplier')]}"
|
||||
/>
|
||||
name="supplier_to_customer"
|
||||
attrs="{'invisible':[('type', '!=', 'supplier')]}"
|
||||
/>
|
||||
<field
|
||||
name="customer_address_id"
|
||||
context="{'show_address': 1}"
|
||||
options="{'always_reload': 1}"
|
||||
attrs="{'required':[('supplier_to_customer', '=', True)],
|
||||
name="customer_address_id"
|
||||
context="{'show_address': 1}"
|
||||
options="{'always_reload': 1}"
|
||||
attrs="{'required':[('supplier_to_customer', '=', True)],
|
||||
'invisible':[('supplier_to_customer', '=', False)]}"
|
||||
/>
|
||||
/>
|
||||
</group>
|
||||
</page>
|
||||
<page name="stock" string="Stock Moves">
|
||||
@@ -285,16 +278,16 @@
|
||||
<group name="general" string="General">
|
||||
<field name="conditions" />
|
||||
<field
|
||||
name="rma_id"
|
||||
groups="rma.group_rma_groups"
|
||||
/>
|
||||
name="rma_id"
|
||||
groups="rma.group_rma_groups"
|
||||
/>
|
||||
<field name="origin" />
|
||||
</group>
|
||||
<group
|
||||
name="company"
|
||||
string="Company"
|
||||
groups="base.group_multi_company"
|
||||
>
|
||||
name="company"
|
||||
string="Company"
|
||||
groups="base.group_multi_company"
|
||||
>
|
||||
<field name="company_id" />
|
||||
</group>
|
||||
</page>
|
||||
@@ -302,10 +295,10 @@
|
||||
</sheet>
|
||||
<div class="oe_chatter">
|
||||
<field
|
||||
name="message_follower_ids"
|
||||
widget="mail_followers"
|
||||
groups="base.group_user"
|
||||
/>
|
||||
name="message_follower_ids"
|
||||
widget="mail_followers"
|
||||
groups="base.group_user"
|
||||
/>
|
||||
<field name="message_ids" widget="mail_thread" />
|
||||
</div>
|
||||
</form>
|
||||
@@ -319,24 +312,24 @@
|
||||
<field name="mode">primary</field>
|
||||
<field name="arch" type="xml">
|
||||
<xpath
|
||||
expr="//button[@name='action_view_rma_lines']/field"
|
||||
position="attributes"
|
||||
>
|
||||
expr="//button[@name='action_view_rma_lines']/field"
|
||||
position="attributes"
|
||||
>
|
||||
<attribute name="string">Customer RMA</attribute>
|
||||
</xpath>
|
||||
<field name="partner_id" position="attributes">
|
||||
<attribute name="string">Supplier</attribute>
|
||||
<attribute
|
||||
name="context"
|
||||
>{'res_partner_search_mode': 'supplier'}</attribute>
|
||||
name="context"
|
||||
>{'res_partner_search_mode': 'supplier'}</attribute>
|
||||
</field>
|
||||
<field name="under_warranty" position="attributes">
|
||||
<attribute name="invisible">1</attribute>
|
||||
</field>
|
||||
<field name="reference_move_id" position="attributes">
|
||||
<attribute
|
||||
name="domain"
|
||||
>[('picking_id.partner_id', '=', partner_id),
|
||||
name="domain"
|
||||
>[('picking_id.partner_id', '=', partner_id),
|
||||
('location_id.usage', '=', 'supplier'),
|
||||
('state', '=', 'done')]</attribute>
|
||||
</field>
|
||||
@@ -360,67 +353,67 @@
|
||||
<field name="lot_id" />
|
||||
<separator />
|
||||
<filter
|
||||
name="assigned_to"
|
||||
domain="[('assigned_to','=',uid)]"
|
||||
help="My RMAs"
|
||||
/>
|
||||
name="assigned_to"
|
||||
domain="[('assigned_to','=',uid)]"
|
||||
help="My RMAs"
|
||||
/>
|
||||
<separator />
|
||||
<group name="stock_quantities" groups="stock.group_stock_user">
|
||||
<filter
|
||||
name="to_receive"
|
||||
domain="[('state','!=', 'done'),('qty_to_receive','>',0.0)]"
|
||||
help="To Receive"
|
||||
/>
|
||||
name="to_receive"
|
||||
domain="[('state','!=', 'done'),('qty_to_receive','>',0.0)]"
|
||||
help="To Receive"
|
||||
/>
|
||||
<filter
|
||||
name="to_deliver"
|
||||
domain="[('state','!=', 'done'),('qty_to_deliver','>',0.0)]"
|
||||
help="To Deliver"
|
||||
/>
|
||||
name="to_deliver"
|
||||
domain="[('state','!=', 'done'),('qty_to_deliver','>',0.0)]"
|
||||
help="To Deliver"
|
||||
/>
|
||||
</group>
|
||||
<group name="rma_supplier_quantities">
|
||||
<filter
|
||||
name="to_send_to_supplier"
|
||||
domain="[('state','!=', 'done'),('qty_to_supplier_rma','>',0.0)]"
|
||||
help="To Send to Supplier RMA"
|
||||
/>
|
||||
name="to_send_to_supplier"
|
||||
domain="[('state','!=', 'done'),('qty_to_supplier_rma','>',0.0)]"
|
||||
help="To Send to Supplier RMA"
|
||||
/>
|
||||
</group>
|
||||
<group expand="0" string="Group By">
|
||||
<filter
|
||||
name="status"
|
||||
string="State"
|
||||
domain="[]"
|
||||
context="{'group_by':'state'}"
|
||||
/>
|
||||
name="status"
|
||||
string="State"
|
||||
domain="[]"
|
||||
context="{'group_by':'state'}"
|
||||
/>
|
||||
<filter
|
||||
name="partner"
|
||||
string="Partner"
|
||||
domain="[]"
|
||||
context="{'group_by':'partner_id'}"
|
||||
/>
|
||||
name="partner"
|
||||
string="Partner"
|
||||
domain="[]"
|
||||
context="{'group_by':'partner_id'}"
|
||||
/>
|
||||
<filter
|
||||
name="operation"
|
||||
string="Operation"
|
||||
domain="[]"
|
||||
context="{'group_by':'operation_id'}"
|
||||
/>
|
||||
name="operation"
|
||||
string="Operation"
|
||||
domain="[]"
|
||||
context="{'group_by':'operation_id'}"
|
||||
/>
|
||||
<filter
|
||||
name="product"
|
||||
string="Product"
|
||||
domain="[]"
|
||||
context="{'group_by':'product_id'}"
|
||||
/>
|
||||
name="product"
|
||||
string="Product"
|
||||
domain="[]"
|
||||
context="{'group_by':'product_id'}"
|
||||
/>
|
||||
<filter
|
||||
name="to_receive"
|
||||
string="To Receive"
|
||||
domain="[('qty_to_receive', '>', 0)]"
|
||||
context="{'group_by':'partner_id'}"
|
||||
/>
|
||||
name="to_receive"
|
||||
string="To Receive"
|
||||
domain="[('qty_to_receive', '>', 0)]"
|
||||
context="{'group_by':'partner_id'}"
|
||||
/>
|
||||
<filter
|
||||
name="to_deliver"
|
||||
string="To Deliver"
|
||||
domain="[('qty_to_deliver', '>', 0)]"
|
||||
context="{'group_by':'partner_id'}"
|
||||
/>
|
||||
name="to_deliver"
|
||||
string="To Deliver"
|
||||
domain="[('qty_to_deliver', '>', 0)]"
|
||||
context="{'group_by':'partner_id'}"
|
||||
/>
|
||||
</group>
|
||||
</search>
|
||||
</field>
|
||||
@@ -440,8 +433,8 @@
|
||||
<field name="res_model">rma.order.line</field>
|
||||
<field name="domain">[('type','=', 'supplier')]</field>
|
||||
<field
|
||||
name="context"
|
||||
>{"search_default_assigned_to":uid, "supplier":1}</field>
|
||||
name="context"
|
||||
>{"search_default_assigned_to":uid, "supplier":1}</field>
|
||||
<field name="view_mode">tree,form</field>
|
||||
<field name="view_id" ref="view_rma_line_supplier_tree" />
|
||||
</record>
|
||||
@@ -470,5 +463,4 @@ if records.filtered(lambda x: x.state == "draft"):
|
||||
</field>
|
||||
</record>
|
||||
|
||||
</data>
|
||||
</odoo>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<field name="name">rma.order.tree</field>
|
||||
<field name="model">rma.order</field>
|
||||
<field name="arch" type="xml">
|
||||
<tree string="RMA">
|
||||
<tree name="RMA">
|
||||
<field name="name" />
|
||||
<field name="reference" />
|
||||
<field name="partner_id" groups="base.group_user" string="Customer" />
|
||||
@@ -17,7 +17,7 @@
|
||||
<field name="name">rma.order.supplier.tree</field>
|
||||
<field name="model">rma.order</field>
|
||||
<field name="arch" type="xml">
|
||||
<tree string="RMA">
|
||||
<tree name="RMA">
|
||||
<field name="name" />
|
||||
<field name="reference" />
|
||||
<field name="partner_id" groups="base.group_user" string="Supplier" />
|
||||
@@ -146,7 +146,7 @@
|
||||
'default_partner_id': partner_id,
|
||||
'hide_title': True}"
|
||||
>
|
||||
<tree string="RMA Lines" name="lines" editable="bottom">
|
||||
<tree name="lines" editable="bottom">
|
||||
<field name="sequence" widget="handle" />
|
||||
<field name="state" invisible="True" />
|
||||
<field name="partner_id" invisible="True" />
|
||||
@@ -297,7 +297,7 @@
|
||||
'supplier': 1,
|
||||
'hide_title': True}"
|
||||
>
|
||||
<tree string="RMA Lines" editable="bottom">
|
||||
<tree name="RMA Lines" editable="bottom">
|
||||
<field name="sequence" widget="handle" />
|
||||
<field name="state" invisible="True" />
|
||||
<field name="name" />
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
<form string="Select lines for picking" name="lines">
|
||||
<separator string="Select lines for picking" />
|
||||
<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"
|
||||
@@ -46,7 +46,7 @@
|
||||
<form string="Select lines for picking" name="lines">
|
||||
<separator string="Select lines for picking" />
|
||||
<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="product_id" />
|
||||
<field name="product_qty" />
|
||||
|
||||
@@ -25,7 +25,7 @@
|
||||
<newline />
|
||||
<group>
|
||||
<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="product_id" />
|
||||
<field name="name" />
|
||||
|
||||
Reference in New Issue
Block a user