diff --git a/rma_sale/models/rma_operation.py b/rma_sale/models/rma_operation.py index 00c886c7..e9089dba 100644 --- a/rma_sale/models/rma_operation.py +++ b/rma_sale/models/rma_operation.py @@ -12,6 +12,5 @@ class RmaOperation(models.Model): ("ordered", "Based on Ordered Quantities"), ("received", "Based on Received Quantities"), ], - string="Sale Policy", default="no", ) diff --git a/rma_sale/models/rma_order_line.py b/rma_sale/models/rma_order_line.py index 2b08e9b3..a525b093 100644 --- a/rma_sale/models/rma_order_line.py +++ b/rma_sale/models/rma_order_line.py @@ -57,7 +57,6 @@ class RmaOrderLine(models.Model): copy=False, ) qty_to_sell = fields.Float( - string="Qty To Sell", copy=False, digits="Product Unit of Measure", readonly=True, @@ -65,7 +64,6 @@ class RmaOrderLine(models.Model): store=True, ) qty_sold = fields.Float( - string="Qty Sold", copy=False, digits="Product Unit of Measure", readonly=True, @@ -78,7 +76,6 @@ class RmaOrderLine(models.Model): ("ordered", "Based on Ordered Quantities"), ("received", "Based on Received Quantities"), ], - string="Sale Policy", default="no", required=True, readonly=False, diff --git a/rma_sale/tests/test_rma_sale.py b/rma_sale/tests/test_rma_sale.py index 7cd40421..8de84e6d 100644 --- a/rma_sale/tests/test_rma_sale.py +++ b/rma_sale/tests/test_rma_sale.py @@ -94,7 +94,7 @@ class TestRmaSale(common.SingleTransactionCase): def test_01_add_from_sale_order(self): """Test wizard to create RMA from Sales Orders.""" add_sale = self.rma_add_sale_wiz.with_context( - { + **{ "customer": True, "active_ids": self.rma_group.id, "active_model": "rma.order", @@ -134,7 +134,7 @@ class TestRmaSale(common.SingleTransactionCase): self.assertEqual(rma.qty_to_sell, 18.0) self.assertEqual(rma.qty_sold, 0.0) make_sale = self.rma_make_sale_wiz.with_context( - {"customer": True, "active_ids": rma.id, "active_model": "rma.order.line"} + **{"customer": True, "active_ids": rma.id, "active_model": "rma.order.line"} ).create({"partner_id": rma.partner_id.id}) make_sale.make_sale_order() self.assertEqual(rma.sales_count, 1) diff --git a/rma_sale/wizards/rma_order_line_make_sale_order_view.xml b/rma_sale/wizards/rma_order_line_make_sale_order_view.xml index da6d5d30..047b338b 100644 --- a/rma_sale/wizards/rma_order_line_make_sale_order_view.xml +++ b/rma_sale/wizards/rma_order_line_make_sale_order_view.xml @@ -27,7 +27,7 @@ - +