diff --git a/__manifest__.py b/__manifest__.py index 6cacc949a73b3269590a6e2a431498564fff0673..ac295f4b8f4787aa240bea07be3cf640cf30df77 100644 --- a/__manifest__.py +++ b/__manifest__.py @@ -3,7 +3,7 @@ "summary": "Modifie le module Projet pour Ecozimut", "author": "Le Filament, Odoo S.A.", "website": "https://le-filament.com", - "version": "14.0.4.2.0", + "version": "14.0.4.3.0", "license": "LGPL-3", "depends": [ "hr_timesheet", @@ -18,7 +18,6 @@ "security/ir.model.access.csv", # datas "data/ir_cron_data.xml", - "data/project_categorie_data.xml", "data/project_procedure_data.xml", "data/project_operation_data.xml", "data/project_usage_data.xml", diff --git a/data/project_categorie_data.xml b/data/project_categorie_data.xml deleted file mode 100644 index 6e826ed24a2fb01235f86658661e97230252fabb..0000000000000000000000000000000000000000 --- a/data/project_categorie_data.xml +++ /dev/null @@ -1,20 +0,0 @@ -<?xml version="1.0" encoding="utf-8" ?> -<odoo> - <data noupdate="1"> - <record model="project.categorie" id="type_bureau_etude"> - <field name="name">Bureau d'études</field> - </record> - <record model="project.categorie" id="type_formation"> - <field name="name">Formation</field> - </record> - <record model="project.categorie" id="type_maitrise_oeuvre"> - <field name="name">Maitrise d’œuvre</field> - </record> - <record model="project.categorie" id="type_materiaux"> - <field name="name">Matériaux</field> - </record> - <record model="project.categorie" id="type_admin"> - <field name="name">Admin</field> - </record> - </data> -</odoo> diff --git a/migrations/14.0.4.0.0/post-migration.py b/migrations/14.0.4.0.0/post-migration.py deleted file mode 100644 index e970bc9599c4609295ef26538e571f560f320e15..0000000000000000000000000000000000000000 --- a/migrations/14.0.4.0.0/post-migration.py +++ /dev/null @@ -1,23 +0,0 @@ -# Copyright 2023 Le Filament (<https://le-filament.com>) -# License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl.html). - -from odoo import SUPERUSER_ID, api - - -def _update_project_type(env): - for project in ( - env["project.project"] - .with_context(active_test=False) - .search([("categorie", "!=", False)]) - ): - if project.categorie == env.ref("ecozimut_project.type_bureau_etude"): - project.categorie_type = "bureau_etude" - elif project.categorie == env.ref("ecozimut_project.type_formation"): - project.categorie_type = "formation" - elif project.categorie == env.ref("ecozimut_project.type_admin"): - project.categorie_type = "interne" - - -def migrate(cr, version): - env = api.Environment(cr, SUPERUSER_ID, {}) - _update_project_type(env) diff --git a/models/__init__.py b/models/__init__.py index c3a00ab54d99eaf06439e45553e0985cfc67deaf..e724b7ff7ce59bd7e85329485d9e6dbfa10b5e4a 100644 --- a/models/__init__.py +++ b/models/__init__.py @@ -1,6 +1,5 @@ from . import account_analytic_line from . import account_move from . import project -from . import project_categorie from . import project_task_planned_hour from . import project_task diff --git a/models/project.py b/models/project.py index f339d2be78af80692e1099a69bd1a8bbbc10df57..e08dd347b3458eb4b5f9d4559c1b582e198bb368 100644 --- a/models/project.py +++ b/models/project.py @@ -24,9 +24,6 @@ class Projet(models.Model): ) account_invoice = fields.One2many("account.move", "project_id", string="Factures") - # TODO: Old Categorie - à supprimer après migration - categorie = fields.Many2one("project.categorie", string="Type") - estimation = fields.Float(compute="_compute_estimation", store=True) sale_order_ids = fields.Many2many( comodel_name="sale.order", diff --git a/models/project_categorie.py b/models/project_categorie.py deleted file mode 100644 index a3fe4ede525b608917edf4af6635b954a96ab2b8..0000000000000000000000000000000000000000 --- a/models/project_categorie.py +++ /dev/null @@ -1,15 +0,0 @@ -# © 2018-2022 Le Filament (https://le-filament.com) -# License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl.html). - -from odoo import fields, models - - -class ProjectCategorie(models.Model): - _name = "project.categorie" - _description = "Catégorie de projet" - - name = fields.Char(string="Nom") - - _sql_constraints = [ - ("name_uniq", "unique (name)", "Cette catégorie de projet existe déjà !"), - ]