Skip to content

Commit

Permalink
[MIG] rma_sale: Migration to 18.0
Browse files Browse the repository at this point in the history
  • Loading branch information
JasminSForgeFlow committed Nov 28, 2024
1 parent 74fbce6 commit 924e565
Show file tree
Hide file tree
Showing 7 changed files with 10 additions and 10 deletions.
2 changes: 1 addition & 1 deletion rma_sale/__manifest__.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

{
"name": "RMA Sale",
"version": "17.0.1.0.0",
"version": "18.0.1.0.0",
"license": "LGPL-3",
"category": "RMA",
"summary": "Links RMA with Sales Orders",
Expand Down
4 changes: 2 additions & 2 deletions rma_sale/tests/test_rma_sale.py
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,10 @@ def setUpClass(cls):

# Create products
cls.product_1 = cls.product_obj.create(
{"name": "Test Product 1", "type": "product", "list_price": 100.0}
{"name": "Test Product 1", "is_storable": True, "list_price": 100.0}
)
cls.product_2 = cls.product_obj.create(
{"name": "Test Product 2", "type": "product", "list_price": 150.0}
{"name": "Test Product 2", "is_storable": True, "list_price": 150.0}
)

# Create SO:
Expand Down
2 changes: 1 addition & 1 deletion rma_sale/tests/test_rma_stock_account_sale.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Copyright 2022 ForgeFlow S.L.
# License LGPL-3.0 or later (https://www.gnu.org/licenses/lgpl.html)

from odoo.tests.common import Form
from odoo.tests import Form

# pylint: disable=odoo-addons-relative-import
from odoo.addons.rma_account.tests.test_rma_stock_account import TestRmaStockAccount
Expand Down
2 changes: 1 addition & 1 deletion rma_sale/views/rma_operation_view.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<odoo>

<record id="rma_operation_tree" model="ir.ui.view">
<field name="name">rma.operation.tree</field>
<field name="name">rma.operation.list</field>
<field name="model">rma.operation</field>
<field name="inherit_id" ref="rma.rma_operation_tree" />
<field name="arch" type="xml">
Expand Down
2 changes: 1 addition & 1 deletion rma_sale/views/rma_order_view.xml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
<field name="sale_count" widget="statinfo" string="Origin SO" />
</button>
</div>
<xpath expr="//field[@name='rma_line_ids']/tree" position="inside">
<xpath expr="//field[@name='rma_line_ids']/list" position="inside">
<field name="sale_policy" invisible="True" />
</xpath>
</field>
Expand Down
4 changes: 2 additions & 2 deletions rma_sale/wizards/rma_add_sale.xml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
domain="[('order_id', '=', sale_id)]"
string="Sale Order Lines"
>
<tree>
<list>
<field name="product_id" invisible="1" />
<field name="order_id" />
<field name="order_partner_id" />
Expand All @@ -39,7 +39,7 @@
groups="uom.group_uom"
/>
<field name="price_subtotal" sum="Total" widget="monetary" />
</tree>
</list>

</field>
<field name="show_lot_filter" invisible="1" />
Expand Down
4 changes: 2 additions & 2 deletions rma_sale/wizards/rma_order_line_make_sale_order_view.xml
Original file line number Diff line number Diff line change
Expand Up @@ -27,15 +27,15 @@
<newline />
<group>
<field name="item_ids" nolabel="1" colspan="2">
<tree name="Details" editable="bottom">
<list name="Details" editable="bottom">
<field name="wiz_id" invisible="True" />
<field name="line_id" invisible="True" />
<field name="product_id" />
<field name="name" />
<field name="product_qty" />
<field name="product_uom_id" groups="uom.group_uom" />
<field name="free_of_charge" />
</tree>
</list>
</field>
</group>
<footer colspan="2">
Expand Down

0 comments on commit 924e565

Please sign in to comment.