diff --git a/rma_repair/README.rst b/rma_repair/README.rst index e19e5f22..2076ecb7 100644 --- a/rma_repair/README.rst +++ b/rma_repair/README.rst @@ -1,5 +1,5 @@ -.. image:: https://img.shields.io/badge/licence-LGPL--3-blue.svg - :alt: License LGPL-3 +.. image:: https://img.shields.io/badge/licence-AGPL--3-blue.svg + :alt: License AGPL-3 ========== RMA Repair diff --git a/rma_repair/__init__.py b/rma_repair/__init__.py index 8051eeb4..35d24ece 100644 --- a/rma_repair/__init__.py +++ b/rma_repair/__init__.py @@ -1,5 +1,5 @@ # Copyright 2020 ForgeFlow S.L. -# License LGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html). +# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html). from . import models from . import wizards diff --git a/rma_repair/__manifest__.py b/rma_repair/__manifest__.py index 3a6e1cb6..a63ea83e 100644 --- a/rma_repair/__manifest__.py +++ b/rma_repair/__manifest__.py @@ -1,9 +1,9 @@ # Copyright 2020 ForgeFlow S.L. -# License LGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html). +# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html). { "name": "RMA Repair", "version": "15.0.1.0.0", - "license": "LGPL-3", + "license": "AGPL-3", "category": "RMA", "summary": "Links RMA with Repairs.", "author": "ForgeFlow S.L., Odoo Community Association (OCA)", diff --git a/rma_repair/models/__init__.py b/rma_repair/models/__init__.py index 71df692a..dc5f3eb0 100644 --- a/rma_repair/models/__init__.py +++ b/rma_repair/models/__init__.py @@ -1,4 +1,4 @@ -# License LGPL-3.0 or later (https://www.gnu.org/licenses/lgpl.html) +# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html) from . import repair from . import rma_order_line diff --git a/rma_repair/models/repair.py b/rma_repair/models/repair.py index 90da8bc4..f48b1d93 100644 --- a/rma_repair/models/repair.py +++ b/rma_repair/models/repair.py @@ -1,5 +1,5 @@ # Copyright 2020-21 ForgeFlow S.L. -# License LGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html). +# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html). from odoo import fields, models diff --git a/rma_repair/models/rma_operation.py b/rma_repair/models/rma_operation.py index c2ee3dd1..8b6e8a2a 100644 --- a/rma_repair/models/rma_operation.py +++ b/rma_repair/models/rma_operation.py @@ -1,5 +1,5 @@ # Copyright 2020 ForgeFlow S.L. -# License LGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html). +# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html). from odoo import fields, models diff --git a/rma_repair/models/rma_order.py b/rma_repair/models/rma_order.py index 08440e88..b3091f0c 100644 --- a/rma_repair/models/rma_order.py +++ b/rma_repair/models/rma_order.py @@ -1,5 +1,5 @@ # Copyright 2020 ForgeFlow S.L. -# License LGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html). +# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html). from odoo import fields, models diff --git a/rma_repair/models/rma_order_line.py b/rma_repair/models/rma_order_line.py index 0b911b92..e3c6e317 100644 --- a/rma_repair/models/rma_order_line.py +++ b/rma_repair/models/rma_order_line.py @@ -1,5 +1,5 @@ # Copyright 2020-21 ForgeFlow S.L. -# License LGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html). +# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html). from odoo import api, fields, models @@ -45,7 +45,6 @@ class RmaOrderLine(models.Model): copy=False, ) qty_to_repair = fields.Float( - string="Qty To Repair", copy=False, digits="Product Unit of Measure", readonly=True, @@ -53,7 +52,6 @@ class RmaOrderLine(models.Model): store=True, ) qty_under_repair = fields.Float( - string="Qty Under Repair", copy=False, digits="Product Unit of Measure", readonly=True, @@ -61,7 +59,6 @@ class RmaOrderLine(models.Model): store=True, ) qty_repaired = fields.Float( - string="Qty Repaired", copy=False, digits="Product Unit of Measure", readonly=True, diff --git a/rma_repair/tests/__init__.py b/rma_repair/tests/__init__.py index f962eaf8..498024c3 100644 --- a/rma_repair/tests/__init__.py +++ b/rma_repair/tests/__init__.py @@ -1,2 +1,2 @@ -# License LGPL-3.0 or later (https://www.gnu.org/licenses/lgpl.html) +# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html) from . import test_rma_repair diff --git a/rma_repair/tests/test_rma_repair.py b/rma_repair/tests/test_rma_repair.py index 3dde84b4..a1b2c5bc 100644 --- a/rma_repair/tests/test_rma_repair.py +++ b/rma_repair/tests/test_rma_repair.py @@ -1,5 +1,5 @@ # Copyright 2020-21 ForgeFlow S.L. -# License LGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html). +# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html). from odoo import fields from odoo.tests import common @@ -156,7 +156,7 @@ class TestRmaRepair(common.SingleTransactionCase): def test_01_add_from_invoice_customer(self): """Test wizard to create RMA from a customer invoice.""" add_inv = self.rma_add_invoice_wiz.with_context( - { + **{ "customer": True, "active_ids": self.rma_group_customer.id, "active_model": "rma.order", @@ -209,7 +209,11 @@ class TestRmaRepair(common.SingleTransactionCase): self.assertEqual(rma.qty_to_repair, 15.0) self.assertEqual(rma.qty_repaired, 0.0) make_repair = self.rma_make_repair_wiz.with_context( - {"customer": True, "active_ids": rma.ids, "active_model": "rma.order.line"} + **{ + "customer": True, + "active_ids": rma.ids, + "active_model": "rma.order.line", + } ).new() make_repair.make_repair_order() rma.repair_ids.action_repair_confirm() @@ -221,7 +225,7 @@ class TestRmaRepair(common.SingleTransactionCase): def test_04_deliver_after_repair(self): """Only deliver after repair""" add_inv = self.rma_add_invoice_wiz.with_context( - { + **{ "customer": True, "active_ids": self.rma_group_customer_2.id, "active_model": "rma.order", @@ -237,7 +241,11 @@ class TestRmaRepair(common.SingleTransactionCase): rma.action_rma_approve() self.assertEqual(rma.qty_to_deliver, 0.0) make_repair = self.rma_make_repair_wiz.with_context( - {"customer": True, "active_ids": rma.ids, "active_model": "rma.order.line"} + **{ + "customer": True, + "active_ids": rma.ids, + "active_model": "rma.order.line", + } ).new() make_repair.make_repair_order() repair = rma.repair_ids diff --git a/rma_repair/wizards/__init__.py b/rma_repair/wizards/__init__.py index 9a165090..cad4c62a 100644 --- a/rma_repair/wizards/__init__.py +++ b/rma_repair/wizards/__init__.py @@ -1,4 +1,4 @@ # Copyright 2020 ForgeFlow S.L. -# License LGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html). +# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html). from . import rma_order_line_make_repair diff --git a/rma_repair/wizards/rma_order_line_make_repair.py b/rma_repair/wizards/rma_order_line_make_repair.py index 29d7d2f4..a40c923c 100644 --- a/rma_repair/wizards/rma_order_line_make_repair.py +++ b/rma_repair/wizards/rma_order_line_make_repair.py @@ -1,5 +1,5 @@ # Copyright 2020 ForgeFlow S.L. -# License LGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html). +# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html). from odoo import _, api, fields, models from odoo.exceptions import ValidationError @@ -130,7 +130,6 @@ class RmaLineMakeRepairItem(models.TransientModel): comodel_name="product.product", string="Refurbished Product" ) invoice_method = fields.Selection( - string="Invoice Method", selection=[ ("none", "No Invoice"), ("b4repair", "Before Repair"), diff --git a/rma_repair/wizards/rma_order_line_make_repair_view.xml b/rma_repair/wizards/rma_order_line_make_repair_view.xml index 54ffaf6b..0c9b8bf0 100644 --- a/rma_repair/wizards/rma_order_line_make_repair_view.xml +++ b/rma_repair/wizards/rma_order_line_make_repair_view.xml @@ -11,7 +11,7 @@ - +