diff --git a/rma_purchase/models/rma_operation.py b/rma_purchase/models/rma_operation.py index fd210876..5ee52512 100644 --- a/rma_purchase/models/rma_operation.py +++ b/rma_purchase/models/rma_operation.py @@ -14,7 +14,6 @@ class RmaOperation(models.Model): ("ordered", "Based on Ordered Quantities"), ("delivered", "Based on Delivered Quantities"), ], - string="Purchase Policy", default="no", ) diff --git a/rma_purchase/models/rma_order_line.py b/rma_purchase/models/rma_order_line.py index 2ab5696e..2015d4d9 100644 --- a/rma_purchase/models/rma_order_line.py +++ b/rma_purchase/models/rma_order_line.py @@ -64,7 +64,6 @@ class RmaOrderLine(models.Model): ("ordered", "Based on Ordered Quantities"), ("delivered", "Based on Delivered Quantities"), ], - string="Purchase Policy", default="no", required=True, ) @@ -76,14 +75,12 @@ class RmaOrderLine(models.Model): copy=False, ) qty_to_purchase = fields.Float( - string="Qty To Purchase", copy=False, digits="Product Unit of Measure", readonly=True, compute="_compute_qty_purchase", ) qty_purchased = fields.Float( - string="Qty Purchased", copy=False, digits="Product Unit of Measure", readonly=True, diff --git a/rma_purchase/tests/test_rma_purchase.py b/rma_purchase/tests/test_rma_purchase.py index 033cc6e0..c9cd65f6 100644 --- a/rma_purchase/tests/test_rma_purchase.py +++ b/rma_purchase/tests/test_rma_purchase.py @@ -78,7 +78,7 @@ class TestRmaPurchase(common.TransactionCase): """Test wizard to create supplier RMA from Purchase Orders.""" self.assertEqual(self.rma_group.origin_po_count, 0) add_purchase = self.rma_add_purchase_wiz.with_context( - { + **{ "supplier": True, "active_ids": self.rma_group.id, "active_model": "rma.order", diff --git a/rma_purchase/wizards/rma_add_purchase.xml b/rma_purchase/wizards/rma_add_purchase.xml index d32e81bd..be999935 100644 --- a/rma_purchase/wizards/rma_add_purchase.xml +++ b/rma_purchase/wizards/rma_add_purchase.xml @@ -23,7 +23,7 @@ domain="[('order_id', '=', purchase_id)]" string="Purchase Order Lines" > - + diff --git a/rma_purchase/wizards/rma_order_line_make_purchase_order_view.xml b/rma_purchase/wizards/rma_order_line_make_purchase_order_view.xml index 73e9ce2a..03eed7cc 100644 --- a/rma_purchase/wizards/rma_order_line_make_purchase_order_view.xml +++ b/rma_purchase/wizards/rma_order_line_make_purchase_order_view.xml @@ -24,7 +24,7 @@ - +