From 11673e4be0293eeec2fdee5e0dff5b0147908977 Mon Sep 17 00:00:00 2001 From: Maxime Chambreuil Date: Thu, 5 Sep 2019 12:18:45 -0500 Subject: [PATCH] [FIX] agreement_legal_sale: Github Issue #370 --- agreement_legal_sale/__manifest__.py | 1 - agreement_legal_sale/models/__init__.py | 1 - agreement_legal_sale/models/product.py | 13 ------------ agreement_legal_sale/models/sale_order.py | 3 ++- agreement_legal_sale/views/product.xml | 25 ----------------------- 5 files changed, 2 insertions(+), 41 deletions(-) delete mode 100644 agreement_legal_sale/models/product.py delete mode 100644 agreement_legal_sale/views/product.xml diff --git a/agreement_legal_sale/__manifest__.py b/agreement_legal_sale/__manifest__.py index 7ed16142..968cc551 100644 --- a/agreement_legal_sale/__manifest__.py +++ b/agreement_legal_sale/__manifest__.py @@ -15,7 +15,6 @@ ], 'data': [ 'views/agreement.xml', - 'views/product.xml', 'views/sale_order.xml', ], 'installable': True, diff --git a/agreement_legal_sale/models/__init__.py b/agreement_legal_sale/models/__init__.py index 2f3b40d7..fdabc477 100644 --- a/agreement_legal_sale/models/__init__.py +++ b/agreement_legal_sale/models/__init__.py @@ -3,5 +3,4 @@ from . import ( sale_order, agreement, - product, ) diff --git a/agreement_legal_sale/models/product.py b/agreement_legal_sale/models/product.py deleted file mode 100644 index 59d7c8f0..00000000 --- a/agreement_legal_sale/models/product.py +++ /dev/null @@ -1,13 +0,0 @@ -# Copyright (C) 2019 - TODAY, Open Source Integrators -# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). - -from odoo import fields, models - - -class ProductTemplate(models.Model): - _inherit = 'product.template' - - is_serviceprofile = fields.Boolean( - string="Create a Service Profile", - help="""If True, this product will create a service profile on the - agreement when the sales order is confirmed.""") diff --git a/agreement_legal_sale/models/sale_order.py b/agreement_legal_sale/models/sale_order.py index a6713a61..95cde3dd 100644 --- a/agreement_legal_sale/models/sale_order.py +++ b/agreement_legal_sale/models/sale_order.py @@ -36,10 +36,11 @@ class SaleOrder(models.Model): 'sale_line_id': line.id, 'uom_id': line.product_uom.id }) - # If the product is a service profile, create one + # If the product creates service profiles, create one if line.product_id.product_tmpl_id.is_serviceprofile: self.env['agreement.serviceprofile'].create({ 'name': line.name, + 'product_id': line.product_id.product_tmpl_id.id, 'agreement_id': order.agreement_id.id, }) return res diff --git a/agreement_legal_sale/views/product.xml b/agreement_legal_sale/views/product.xml deleted file mode 100644 index 54fa92cb..00000000 --- a/agreement_legal_sale/views/product.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - product.template.form.view - product.template - - - - - - - - - - - - - - - -