From 04c6c65a93daa703fda9e47f703f5fcfc74a302e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Didderen?= Date: Sun, 12 Jun 2022 11:44:12 +0200 Subject: [PATCH 1/2] [FIX] agreement_legal_sale - ignore sale order lines with display_type --- agreement_legal_sale/models/sale_order.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/agreement_legal_sale/models/sale_order.py b/agreement_legal_sale/models/sale_order.py index dd07f6e83..5ecdd7cfb 100644 --- a/agreement_legal_sale/models/sale_order.py +++ b/agreement_legal_sale/models/sale_order.py @@ -27,7 +27,7 @@ class SaleOrder(models.Model): or False, } ) - for line in order.order_line: + for line in order.order_line.filtered(lambda l: not l.display_type): # Create agreement line self.env["agreement.line"].create( self._get_agreement_line_vals(line) From d16b521ea71686069d9b5ba086768b81b188c62d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Didderen?= Date: Thu, 16 Jun 2022 14:04:26 +0200 Subject: [PATCH 2/2] [FIX] agreement_legal_sale - add test lines for display type --- agreement_legal_sale/tests/test_sale_order.py | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/agreement_legal_sale/tests/test_sale_order.py b/agreement_legal_sale/tests/test_sale_order.py index 46da72808..b99bc0b05 100644 --- a/agreement_legal_sale/tests/test_sale_order.py +++ b/agreement_legal_sale/tests/test_sale_order.py @@ -53,7 +53,13 @@ class TestSaleOrder(TransactionCase): "agreement_template_id": self.test_agreement_template.id, "date_order": fields.Date.today(), "order_line": [ - (0, 0, {"product_id": self.test_product.id, "product_uom_qty": 1.0}) + (0, 0, {"display_type": "line_section", "name": "Test section"}), + (0, 0, {"display_type": "line_note", "name": "Test note"}), + ( + 0, + 0, + {"product_id": self.test_product.id, "product_uom_qty": 1.0}, + ), ], } ) @@ -73,6 +79,8 @@ class TestSaleOrder(TransactionCase): "agreement_template_id": self.test_agreement_template.id, "date_order": fields.Date.today(), "order_line": [ + (0, 0, {"display_type": "line_section", "name": "Test section"}), + (0, 0, {"display_type": "line_note", "name": "Test note"}), ( 0, 0, @@ -80,7 +88,7 @@ class TestSaleOrder(TransactionCase): "product_id": self.test_product_is_serviceprofile.id, "product_uom_qty": 1.0, }, - ) + ), ], } )