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")
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(

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)
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,
)

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.",
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,

3
rma/report/rma_report.xml
View File

@@ -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>

4
rma/security/rma.xml
View File

@@ -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>
@@ -91,5 +90,4 @@
>['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
</record>
</data>
</odoo>

18
rma/tests/test_rma.py
View File

@@ -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",

2
rma/views/rma_operation_view.xml
View File

@@ -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" />

12
rma/views/rma_order_line_view.xml
View File

@@ -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" />
@@ -470,5 +463,4 @@ if records.filtered(lambda x: x.state == "draft"):
</field>
</record>
</data>
</odoo>

8
rma/views/rma_order_view.xml
View File

@@ -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" />

4
rma/wizards/rma_make_picking_view.xml
View File

@@ -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" />

2
rma/wizards/rma_order_line_make_supplier_rma_view.xml
View File

@@ -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" />