diff --git a/models/__init__.py b/models/__init__.py index a8de4d33d5ad8f91537b1343e382dc5ed1460aa0..dd79ce327008d2cde96d1ec29ce45c115a618e68 100644 --- a/models/__init__.py +++ b/models/__init__.py @@ -1,9 +1,7 @@ # -*- coding: utf-8 -*- -import lf_link_sale_project import product import procurement -import sale_order import sale_config_settings import res_config import project_task_type diff --git a/models/lf_link_sale_project.py b/models/lf_link_sale_project.py deleted file mode 100644 index 363e058f9b9d75728046eb556c2ca126a4452a47..0000000000000000000000000000000000000000 --- a/models/lf_link_sale_project.py +++ /dev/null @@ -1,6 +0,0 @@ -# -*- coding: utf-8 -*- - -from datetime import datetime, date -import time -from odoo import tools -from odoo import models, fields, api, osv diff --git a/models/sale_order.py b/models/sale_order.py deleted file mode 100644 index dc496d7ff5c8e6e3c2b946118d4a3ab20713040b..0000000000000000000000000000000000000000 --- a/models/sale_order.py +++ /dev/null @@ -1,12 +0,0 @@ -# -*- coding: utf-8 -*- - -# © 2017 Le Filament (<http://www.le-filament.com>) -# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). - -from odoo import api, fields, models, _ - -from odoo.exceptions import ValidationError - - -class LeFilamentSaleOrder(models.Model): - _inherit = 'sale.order' \ No newline at end of file diff --git a/wizard/sale_views_wizard.py b/wizard/sale_views_wizard.py index 57f56919881d8b640833e7913499d1331ec83654..990be25e5b475b07dd75e99b8b7c64312dadac4a 100644 --- a/wizard/sale_views_wizard.py +++ b/wizard/sale_views_wizard.py @@ -25,7 +25,10 @@ class LeFilamentSaleWizard(models.TransientModel): @api.model def _default_project_name(self): - return self._default_sale_id().partner_id.name + if self._default_sale_id().partner_id.is_company == True: + return self._default_sale_id().partner_id.name + else: + return self._default_sale_id().partner_id.parent_id.name sale_id = fields.Many2one('sale.order', string='Sale', default=_default_sale_id) project_id = fields.Many2one('project.project', string='Existing project', default=_default_project_project_id) @@ -58,7 +61,10 @@ class LeFilamentSaleWizard(models.TransientModel): date_plan = datetime.strptime(line.procurement_ids.date_planned,'%Y-%m-%d %H:%M:%S') date_deadline = (date_plan.date() + relativedelta(years=int(line.procurement_ids.product_qty))).strftime('%Y-%m-%d') stage = line.product_id.project_task_type_id - name_task = sale_id.partner_id.name + " - " + stage.name + if sale_id.partner_id.is_company == True: + name_task = sale_id.partner_id.name + " - " + stage.name + else: + name_task = sale_id.partner_id.parent_id.name + " - " + stage.name else: stage = stage_new project_id = project_id_new