diff --git a/.circleci/config.yml b/.circleci/config.yml index 09af132..5952797 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -21,34 +21,30 @@ jobs: name: Setup Log Folder For Reports command: sudo mkdir -p .log && sudo chmod 777 .log - - run: - name: Run Test - command: docker-compose run --rm odoo run_pytest.sh - - - run: - name: Codacy Coverage - command: bash <(curl -Ls https://coverage.codacy.com/get.sh) report -l python -r .log/coverage.xml + # - run: + # name: Run Test + # command: docker-compose run --rm odoo run_pytest.sh - - store_test_results: - path: .log + # - store_test_results: + # path: .log # job that find the next tag for the current branch/repo and push the tag to github. # it will trigger the publish of a new docker image. - auto-tag: - machine: true - steps: - - checkout - - run: - <<: *quay_io_login - - run: - name: Get nws - command: | - curl -L $NWS_BIN_LOCATION > ./nws - chmod +x ./nws - - run: - name: Set tag - command: | - ./nws circleci create-tag -t odoo-base + # auto-tag: + # machine: true + # steps: + # - checkout + # - run: + # <<: *quay_io_login + # - run: + # name: Get nws + # command: | + # curl -L $NWS_BIN_LOCATION > ./nws + # chmod +x ./nws + # - run: + # name: Set tag + # command: | + # ./nws circleci create-tag -t odoo-base workflows: version: 2 @@ -57,10 +53,10 @@ workflows: - tests: context: quay.io - - auto-tag: - context: nws - requires: - - tests - filters: - branches: - only: /^1\d\.0/ + # - auto-tag: + # context: nws + # requires: + # - tests + # filters: + # branches: + # only: /^1\d\.0/ diff --git a/.docker_files/main/__init__.py b/.docker_files/main/__init__.py index 728525c..aa680fd 100644 --- a/.docker_files/main/__init__.py +++ b/.docker_files/main/__init__.py @@ -1,2 +1,2 @@ -# © 2023 Numigi +# © 2024 Numigi # License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl). diff --git a/.docker_files/main/__manifest__.py b/.docker_files/main/__manifest__.py index ccf93bd..5471a4c 100644 --- a/.docker_files/main/__manifest__.py +++ b/.docker_files/main/__manifest__.py @@ -1,4 +1,4 @@ -# © 2023 Numigi +# © 2024 Numigi # License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl). { @@ -11,8 +11,7 @@ 'category': 'Other', 'summary': 'Install all addons required for testing.', 'depends': [ - 'maintenance_equipment_model', - 'maintenance_sale_service', + 'maintenance', ], 'installable': True, } diff --git a/.docker_files/odoo.conf b/.docker_files/odoo.conf index 2a7cdc7..973acdb 100644 --- a/.docker_files/odoo.conf +++ b/.docker_files/odoo.conf @@ -49,7 +49,7 @@ test_report_directory = False translate_modules = ['all'] unaccent = False without_demo = False -workers = 2 +workers = 0 xmlrpc = True xmlrpc_interface = xmlrpc_port = 8069 diff --git a/.github/workflows/pre-commit.yml b/.github/workflows/pre-commit.yml index 2894822..fe3c490 100644 --- a/.github/workflows/pre-commit.yml +++ b/.github/workflows/pre-commit.yml @@ -3,10 +3,10 @@ name: pre-commit on: pull_request: branches: - - "14.0*" + - "16.0" push: branches: - - "14.0" + - "16.0" jobs: pre-commit: diff --git a/.gitignore b/.gitignore index 2f55feb..8f88206 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,5 @@ /.idea/ venv -extra-addons log /.idea __pycache__/ @@ -9,6 +8,5 @@ __pycache__/ Pipfile docker-compose.override.yml .DS_STORE -.third-party-addons .pytest_cache .vscode/ \ No newline at end of file diff --git a/Dockerfile b/Dockerfile index dd284a3..881fde3 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM quay.io/numigi/odoo-public:14.latest +FROM quay.io/numigi/odoo-public:16.latest LABEL maintainer="contact@numigi.com" USER root @@ -10,8 +10,5 @@ RUN gitoo install-all --conf_file /gitoo.yml --destination "${THIRD_PARTY_ADDONS USER odoo -COPY maintenance_equipment_model /mnt/extra-addons/maintenance_equipment_model -COPY maintenance_sale_service /mnt/extra-addons/maintenance_sale_service - COPY .docker_files/main /mnt/extra-addons/main COPY .docker_files/odoo.conf /etc/odoo diff --git a/docker-compose.yml b/docker-compose.yml index dad15e8..a61165e 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -5,7 +5,7 @@ services: context: . dockerfile: Dockerfile volumes: - - odoo-web-data:/var/lib/odoo + - odoo16-web-data:/var/lib/odoo - ./.log:/var/log/odoo ports: - "8069:8069" @@ -16,16 +16,16 @@ services: environment: - LOG_ODOO=/var/log/odoo db: - image: postgres:9.6 + image: postgres:16.0 environment: - POSTGRES_PASSWORD=odoo - POSTGRES_USER=odoo - PGDATA=/var/lib/postgresql/data/pgdata volumes: - - odoo-db-data:/var/lib/postgresql/data/pgdata + - odoo16-db-data:/var/lib/postgresql/data/pgdata expose: - 5432 volumes: - odoo-web-data: - odoo-db-data: + odoo16-web-data: + odoo16-db-data: diff --git a/gitoo.yml b/gitoo.yml index 1b5c2b5..3e6c4a2 100644 --- a/gitoo.yml +++ b/gitoo.yml @@ -1,4 +1,4 @@ - url: https://github.com/OCA/maintenance - branch: "14.0" + branch: "16.0" includes: - base_maintenance_group diff --git a/maintenance_equipment_model/README.rst b/maintenance_equipment_model/README.rst deleted file mode 100644 index 250a961..0000000 --- a/maintenance_equipment_model/README.rst +++ /dev/null @@ -1,20 +0,0 @@ -Maintenance Equipment Model -=========================== -This module adds maintenance equipment model and compute name of maintenance equipment base on vendor, model and serial number. - -New model: Maintenance Equipment Model - -.. image:: static/description/maintenance_equipment_model.png - -Make vendor and model required fields and compute maintenance equipment's name base on vendor, model and serial number. - -.. image:: static/description/maintenance_equipment_name.png - -Contributors ------------- -* Numigi (tm) and all its contributors (https://bit.ly/numigiens) -* Komit (https://komit-consulting.com) - -More information ----------------- -* Meet us at https://bit.ly/numigi-com diff --git a/maintenance_equipment_model/__init__.py b/maintenance_equipment_model/__init__.py deleted file mode 100644 index 39692e2..0000000 --- a/maintenance_equipment_model/__init__.py +++ /dev/null @@ -1,4 +0,0 @@ -# © 2022 - today Numigi (tm) and all its contributors (https://bit.ly/numigiens) -# License LGPL-3.0 or later (http://www.gnu.org/licenses/agpl). - -from . import models diff --git a/maintenance_equipment_model/__manifest__.py b/maintenance_equipment_model/__manifest__.py deleted file mode 100644 index 67992f1..0000000 --- a/maintenance_equipment_model/__manifest__.py +++ /dev/null @@ -1,22 +0,0 @@ -# © 2022 - today Numigi (tm) and all its contributors (https://bit.ly/numigiens) -# License LGPL-3.0 or later (http://www.gnu.org/licenses/agpl). - -{ - "name": "Maintenance Equipment Model", - "version": "1.0.1", - "author": "Numigi", - "maintainer": "Numigi", - "website": "https://bit.ly/numigi-com", - "license": "LGPL-3", - "category": "Maintenance", - "summary": "Add maintenance equipment model and compute equipment's name", - "depends": [ - "base_maintenance_group", - ], - "data": [ - "security/ir.model.access.csv", - "views/maintenance_equipment.xml", - "views/maintenance_equipment_model.xml", - ], - "installable": True, -} diff --git a/maintenance_equipment_model/i18n/fr.po b/maintenance_equipment_model/i18n/fr.po deleted file mode 100644 index 732e117..0000000 --- a/maintenance_equipment_model/i18n/fr.po +++ /dev/null @@ -1,100 +0,0 @@ -# Translation of Odoo Server. -# This file contains the translation of the following modules: -# * maintenance_equipment_model -# -msgid "" -msgstr "" -"Project-Id-Version: Odoo Server 12.0\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-06-10 10:54+0000\n" -"PO-Revision-Date: 2022-06-10 10:54+0000\n" -"Last-Translator: <>\n" -"Language-Team: \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: \n" -"Plural-Forms: \n" - -#. module: maintenance_equipment_model -#: model:ir.model.fields,field_description:maintenance_equipment_model.field_maintenance_equipment_model__active -msgid "Active" -msgstr "Actif" - -#. module: maintenance_equipment_model -#: model:ir.model.fields,field_description:maintenance_equipment_model.field_maintenance_equipment_model__create_uid -msgid "Created by" -msgstr "Créé par" - -#. module: maintenance_equipment_model -#: model:ir.model.fields,field_description:maintenance_equipment_model.field_maintenance_equipment_model__create_date -msgid "Created on" -msgstr "Créé le" - -#. module: maintenance_equipment_model -#: model:ir.model.fields,field_description:maintenance_equipment_model.field_maintenance_equipment_model__display_name -msgid "Display Name" -msgstr "Nom affiché" - -#. module: maintenance_equipment_model -#: model:ir.model.fields,field_description:maintenance_equipment_model.field_maintenance_equipment__name -msgid "Equipment Name" -msgstr "Nom de l'équipement" - -#. module: maintenance_equipment_model -#: model:ir.model.fields,field_description:maintenance_equipment_model.field_maintenance_equipment_model__id -msgid "ID" -msgstr "ID" - -#. module: maintenance_equipment_model -#: model:ir.model.fields,field_description:maintenance_equipment_model.field_maintenance_equipment_model____last_update -msgid "Last Modified on" -msgstr "Dernière modification le" - -#. module: maintenance_equipment_model -#: model:ir.model.fields,field_description:maintenance_equipment_model.field_maintenance_equipment_model__write_uid -msgid "Last Updated by" -msgstr "Dernière mise à jour par" - -#. module: maintenance_equipment_model -#: model:ir.model.fields,field_description:maintenance_equipment_model.field_maintenance_equipment_model__write_date -msgid "Last Updated on" -msgstr "Dernière mise à jour le" - -#. module: maintenance_equipment_model -#: model:ir.model,name:maintenance_equipment_model.model_maintenance_equipment -msgid "Maintenance Equipment" -msgstr "Equipement de maintenance" - -#. module: maintenance_equipment_model -#: model:ir.model,name:maintenance_equipment_model.model_maintenance_equipment_model -msgid "Maintenance Equipment Model" -msgstr "Modèle d'Equipement de maintenance" - -#. module: maintenance_equipment_model -#: model:ir.model.fields,field_description:maintenance_equipment_model.field_maintenance_equipment_model__manufacturer_id -msgid "Manufacturer" -msgstr "Fabricant" - -#. module: maintenance_equipment_model -#: model:ir.model.fields,field_description:maintenance_equipment_model.field_maintenance_equipment__model_id -msgid "Model" -msgstr "Modèle" - -#. module: maintenance_equipment_model -#: model:ir.actions.act_window,name:maintenance_equipment_model.action_maintenance_equipment_model -#: model:ir.ui.menu,name:maintenance_equipment_model.menu_maintenance_equipment_model -#: model_terms:ir.ui.view,arch_db:maintenance_equipment_model.view_maintenance_equipment_model_form -#: model_terms:ir.ui.view,arch_db:maintenance_equipment_model.view_maintenance_equipment_model_tree -msgid "Models" -msgstr "Modèles" - -#. module: maintenance_equipment_model -#: model:ir.model.fields,field_description:maintenance_equipment_model.field_maintenance_equipment_model__name -msgid "Name" -msgstr "Nom" - -#. module: maintenance_equipment_model -#: model:ir.model.fields,field_description:maintenance_equipment_model.field_maintenance_equipment__partner_id -msgid "Vendor" -msgstr "Fournisseur" - diff --git a/maintenance_equipment_model/models/__init__.py b/maintenance_equipment_model/models/__init__.py deleted file mode 100644 index 662f717..0000000 --- a/maintenance_equipment_model/models/__init__.py +++ /dev/null @@ -1,5 +0,0 @@ -# © 2022 - today Numigi (tm) and all its contributors (https://bit.ly/numigiens) -# License LGPL-3.0 or later (http://www.gnu.org/licenses/agpl). - -from . import maintenance_equipment -from . import maintenance_equipment_model diff --git a/maintenance_equipment_model/models/maintenance_equipment.py b/maintenance_equipment_model/models/maintenance_equipment.py deleted file mode 100644 index 2974917..0000000 --- a/maintenance_equipment_model/models/maintenance_equipment.py +++ /dev/null @@ -1,37 +0,0 @@ -# © 2022 - today Numigi (tm) and all its contributors (https://bit.ly/numigiens) -# License LGPL-3.0 or later (http://www.gnu.org/licenses/agpl). - -from odoo import api, fields, models - - -class MaintenanceEquipment(models.Model): - _inherit = "maintenance.equipment" - - def name_get(self): - result = [] - for record in self: - result.append((record.id, record.name)) - return result - - model_id = fields.Many2one( - "maintenance.equipment.model", - domain="[('manufacturer_id','=?',partner_id)]", - required=True - ) - name = fields.Char(compute="_compute_name", store=True, required=False, translate=False) - partner_id = fields.Many2one(required=True) - - @api.depends("partner_id", "model_id", "serial_no") - def _compute_name(self): - for rec in self: - if rec.serial_no: - rec.name = "{} - {} [{}]".format( - rec.partner_id.name, rec.model_id.name, rec.serial_no - ) - else: - rec.name = "{} - {}".format(rec.partner_id.name, rec.model_id.name) - - @api.onchange("model_id") - def _onchange_model_id(self): - if self.model_id.manufacturer_id: - self.partner_id = self.model_id.manufacturer_id diff --git a/maintenance_equipment_model/models/maintenance_equipment_model.py b/maintenance_equipment_model/models/maintenance_equipment_model.py deleted file mode 100644 index a9d4bfd..0000000 --- a/maintenance_equipment_model/models/maintenance_equipment_model.py +++ /dev/null @@ -1,13 +0,0 @@ -# © 2022 - today Numigi (tm) and all its contributors (https://bit.ly/numigiens) -# License LGPL-3.0 or later (http://www.gnu.org/licenses/agpl). - -from odoo import fields, models - - -class MaintenanceEquipmentModel(models.Model): - _name = "maintenance.equipment.model" - _description = "Maintenance Equipment Model" - - name = fields.Char(required=True) - manufacturer_id = fields.Many2one("res.partner") - active = fields.Boolean(default=True) diff --git a/maintenance_equipment_model/security/ir.model.access.csv b/maintenance_equipment_model/security/ir.model.access.csv deleted file mode 100644 index 4819cda..0000000 --- a/maintenance_equipment_model/security/ir.model.access.csv +++ /dev/null @@ -1,3 +0,0 @@ -id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink -access_maintenance_equipment_model_user,access_maintenance_equipment_model_user,model_maintenance_equipment_model,base_maintenance_group.group_maintenance_user,1,0,0,0 -access_maintenance_equipment_model_manager,access_maintenance_equipment_model_manager,model_maintenance_equipment_model,maintenance.group_equipment_manager,1,1,1,0 diff --git a/maintenance_equipment_model/static/description/icon.png b/maintenance_equipment_model/static/description/icon.png deleted file mode 100644 index 92a86b1..0000000 Binary files a/maintenance_equipment_model/static/description/icon.png and /dev/null differ diff --git a/maintenance_equipment_model/static/description/maintenance_equipment_model.png b/maintenance_equipment_model/static/description/maintenance_equipment_model.png deleted file mode 100644 index 4370447..0000000 Binary files a/maintenance_equipment_model/static/description/maintenance_equipment_model.png and /dev/null differ diff --git a/maintenance_equipment_model/static/description/maintenance_equipment_name.png b/maintenance_equipment_model/static/description/maintenance_equipment_name.png deleted file mode 100644 index 8062144..0000000 Binary files a/maintenance_equipment_model/static/description/maintenance_equipment_name.png and /dev/null differ diff --git a/maintenance_equipment_model/tests/__init__.py b/maintenance_equipment_model/tests/__init__.py deleted file mode 100644 index 84b1565..0000000 --- a/maintenance_equipment_model/tests/__init__.py +++ /dev/null @@ -1,4 +0,0 @@ -# © 2022 - today Numigi (tm) and all its contributors (https://bit.ly/numigiens) -# License LGPL-3.0 or later (http://www.gnu.org/licenses/agpl). - -from . import test_maintenance_equipment_model diff --git a/maintenance_equipment_model/tests/test_maintenance_equipment_model.py b/maintenance_equipment_model/tests/test_maintenance_equipment_model.py deleted file mode 100644 index 4381aec..0000000 --- a/maintenance_equipment_model/tests/test_maintenance_equipment_model.py +++ /dev/null @@ -1,20 +0,0 @@ -from odoo.tests import common - - -class TestMaintenanceEquipmentModel(common.SavepointCase): - def setUp(self): - super(TestMaintenanceEquipmentModel, self).setUp() - self.partner = self.env["res.partner"].create({"name": "Partner A"}) - self.model = self.env["maintenance.equipment.model"].create({"name": "Model A"}) - - def test_compute_maintenance_equipment_name_with_serial_number(self): - equipment = self.env["maintenance.equipment"].create( - {"partner_id": self.partner.id, "model_id": self.model.id, "serial_no": "#1"} - ) - self.assertEqual(equipment.name, "Partner A - Model A [#1]") - - def test_compute_maintenance_equipment_name_without_serial_number(self): - equipment = self.env["maintenance.equipment"].create( - {"partner_id": self.partner.id, "model_id": self.model.id} - ) - self.assertEqual(equipment.name, "Partner A - Model A") diff --git a/maintenance_equipment_model/views/maintenance_equipment.xml b/maintenance_equipment_model/views/maintenance_equipment.xml deleted file mode 100644 index 57e1db6..0000000 --- a/maintenance_equipment_model/views/maintenance_equipment.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - Maintenance Equipment Form: Add relation model field - maintenance.equipment - tree - - - - 1 - - - - - - - - diff --git a/maintenance_equipment_model/views/maintenance_equipment_model.xml b/maintenance_equipment_model/views/maintenance_equipment_model.xml deleted file mode 100644 index 47a3271..0000000 --- a/maintenance_equipment_model/views/maintenance_equipment_model.xml +++ /dev/null @@ -1,56 +0,0 @@ - - - - - Maintenance Equipment Model Form - maintenance.equipment.model - tree - -
- - - - - - - - - - - -
- - - - - Maintenance Equipment Model Tree - maintenance.equipment.model - tree - - - - - - - - - - - Models - maintenance.equipment.model - tree,form - - - - - - diff --git a/maintenance_sale_service/README.rst b/maintenance_sale_service/README.rst deleted file mode 100644 index 41ecb55..0000000 --- a/maintenance_sale_service/README.rst +++ /dev/null @@ -1,22 +0,0 @@ -Maintenance Sale Service -======================== -This module adds propagation of Equipment from the sale order line to the task when the sales line creates a task - -Sale order line's equipment - -.. image:: static/description/sale_order_line_equipment.png - -Task's equipment - -.. image:: static/description/task_equipment.png - -Task's manufacturer, model, serial number get value from task's equipment. - -Contributors ------------- -* Numigi (tm) and all its contributors (https://bit.ly/numigiens) -* Komit (https://komit-consulting.com) - -More information ----------------- -* Meet us at https://bit.ly/numigi-com diff --git a/maintenance_sale_service/__init__.py b/maintenance_sale_service/__init__.py deleted file mode 100644 index 39692e2..0000000 --- a/maintenance_sale_service/__init__.py +++ /dev/null @@ -1,4 +0,0 @@ -# © 2022 - today Numigi (tm) and all its contributors (https://bit.ly/numigiens) -# License LGPL-3.0 or later (http://www.gnu.org/licenses/agpl). - -from . import models diff --git a/maintenance_sale_service/__manifest__.py b/maintenance_sale_service/__manifest__.py deleted file mode 100644 index 32112e0..0000000 --- a/maintenance_sale_service/__manifest__.py +++ /dev/null @@ -1,26 +0,0 @@ -# © 2022 - today Numigi (tm) and all its contributors (https://bit.ly/numigiens) -# License LGPL-3.0 or later (http://www.gnu.org/licenses/agpl). - -{ - "name": "Maintenance Sale Service", - "version": "1.0.0", - "author": "Numigi", - "maintainer": "Numigi", - "website": "https://bit.ly/numigi-com", - "license": "LGPL-3", - "category": "Sales", - "summary": """ - Propagation of Equipment from the sale order line to - the task when the sales line creates a task. - """, - "depends": [ - "maintenance_equipment_model", - "sale_timesheet", - ], - "data": [ - "security/ir.model.access.csv", - "views/project_task.xml", - "views/sale_order_line.xml", - ], - "installable": True, -} diff --git a/maintenance_sale_service/i18n/fr.po b/maintenance_sale_service/i18n/fr.po deleted file mode 100644 index c8b195e..0000000 --- a/maintenance_sale_service/i18n/fr.po +++ /dev/null @@ -1,48 +0,0 @@ -# Translation of Odoo Server. -# This file contains the translation of the following modules: -# * maintenance_sale_service -# -msgid "" -msgstr "" -"Project-Id-Version: Odoo Server 12.0\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-06-13 11:33+0000\n" -"PO-Revision-Date: 2022-06-13 11:33+0000\n" -"Last-Translator: <>\n" -"Language-Team: \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: \n" -"Plural-Forms: \n" - -#. module: maintenance_sale_service -#: model:ir.model.fields,field_description:maintenance_sale_service.field_project_task__equipment_id -#: model:ir.model.fields,field_description:maintenance_sale_service.field_sale_order_line__equipment_id -#: model_terms:ir.ui.view,arch_db:maintenance_sale_service.view_task_form2 -msgid "Equipment" -msgstr "Équipement" - -#. module: maintenance_sale_service -#: model:ir.model.fields,field_description:maintenance_sale_service.field_project_task__manufacturer_id -msgid "Manufacturer" -msgstr "Fabricant" - -#. module: maintenance_sale_service -#: model:ir.model.fields,field_description:maintenance_sale_service.field_project_task__model_id -msgid "Model" -msgstr "Modèle" - -#. module: maintenance_sale_service -#: model:ir.model,name:maintenance_sale_service.model_sale_order_line -msgid "Sales Order Line" -msgstr "Ligne de bons de commande" - -#. module: maintenance_sale_service -#: model:ir.model.fields,field_description:maintenance_sale_service.field_project_task__serial_no -msgid "Serial Number" -msgstr "Numéro de série" - -#. module: maintenance_sale_service -#: model:ir.model,name:maintenance_sale_service.model_project_task -msgid "Task" -msgstr "Tâche" diff --git a/maintenance_sale_service/models/__init__.py b/maintenance_sale_service/models/__init__.py deleted file mode 100644 index 09448f4..0000000 --- a/maintenance_sale_service/models/__init__.py +++ /dev/null @@ -1,5 +0,0 @@ -# © 2022 - today Numigi (tm) and all its contributors (https://bit.ly/numigiens) -# License LGPL-3.0 or later (http://www.gnu.org/licenses/agpl). - -from . import project_task -from . import sale_order_line diff --git a/maintenance_sale_service/models/project_task.py b/maintenance_sale_service/models/project_task.py deleted file mode 100644 index 6f94da8..0000000 --- a/maintenance_sale_service/models/project_task.py +++ /dev/null @@ -1,17 +0,0 @@ -# © 2022 - today Numigi (tm) and all its contributors (https://bit.ly/numigiens) -# License LGPL-3.0 or later (http://www.gnu.org/licenses/agpl). - -from odoo import fields, models - - -class ProjectTask(models.Model): - _inherit = "project.task" - - equipment_id = fields.Many2one("maintenance.equipment") - manufacturer_id = fields.Many2one( - "res.partner", related="equipment_id.model_id.manufacturer_id" - ) - model_id = fields.Many2one( - "maintenance.equipment.model", related="equipment_id.model_id" - ) - serial_no = fields.Char("Serial Number", related="equipment_id.serial_no") diff --git a/maintenance_sale_service/models/sale_order_line.py b/maintenance_sale_service/models/sale_order_line.py deleted file mode 100644 index dcbb9bc..0000000 --- a/maintenance_sale_service/models/sale_order_line.py +++ /dev/null @@ -1,16 +0,0 @@ -# © 2022 - today Numigi (tm) and all its contributors (https://bit.ly/numigiens) -# License LGPL-3.0 or later (http://www.gnu.org/licenses/agpl). - -from odoo import fields, models - - -class SaleOrderLine(models.Model): - _inherit = "sale.order.line" - - equipment_id = fields.Many2one("maintenance.equipment") - - def _timesheet_create_task_prepare_values(self, project): - res = super()._timesheet_create_task_prepare_values(project) - if self.equipment_id: - res["equipment_id"] = self.equipment_id.id - return res diff --git a/maintenance_sale_service/security/ir.model.access.csv b/maintenance_sale_service/security/ir.model.access.csv deleted file mode 100644 index 090a3e6..0000000 --- a/maintenance_sale_service/security/ir.model.access.csv +++ /dev/null @@ -1,5 +0,0 @@ -id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink -access_maintenance_equipment_sale_user,access_maintenance_equipment_sale_user,maintenance.model_maintenance_equipment,sales_team.group_sale_salesman,1,0,0,0 -access_maintenance_equipment_project_user,access_maintenance_equipment_project_user,maintenance.model_maintenance_equipment,project.group_project_user,1,0,0,0 -access_maintenance_equipment_model_sale_user,access_maintenance_equipment_model_sale_user,maintenance_equipment_model.model_maintenance_equipment_model,sales_team.group_sale_salesman,1,0,0,0 -access_maintenance_equipment_model_project_user,access_maintenance_equipment_model_project_user,maintenance_equipment_model.model_maintenance_equipment_model,project.group_project_user,1,0,0,0 diff --git a/maintenance_sale_service/static/description/icon.png b/maintenance_sale_service/static/description/icon.png deleted file mode 100644 index 92a86b1..0000000 Binary files a/maintenance_sale_service/static/description/icon.png and /dev/null differ diff --git a/maintenance_sale_service/static/description/sale_order_line_equipment.png b/maintenance_sale_service/static/description/sale_order_line_equipment.png deleted file mode 100644 index 36f7b2f..0000000 Binary files a/maintenance_sale_service/static/description/sale_order_line_equipment.png and /dev/null differ diff --git a/maintenance_sale_service/static/description/task_equipment.png b/maintenance_sale_service/static/description/task_equipment.png deleted file mode 100644 index 8793d26..0000000 Binary files a/maintenance_sale_service/static/description/task_equipment.png and /dev/null differ diff --git a/maintenance_sale_service/tests/__init__.py b/maintenance_sale_service/tests/__init__.py deleted file mode 100644 index 29842f8..0000000 --- a/maintenance_sale_service/tests/__init__.py +++ /dev/null @@ -1,4 +0,0 @@ -# © 2022 - today Numigi (tm) and all its contributors (https://bit.ly/numigiens) -# License LGPL-3.0 or later (http://www.gnu.org/licenses/agpl). - -from . import test_maintenance_sale_service diff --git a/maintenance_sale_service/tests/test_maintenance_sale_service.py b/maintenance_sale_service/tests/test_maintenance_sale_service.py deleted file mode 100644 index 98df39d..0000000 --- a/maintenance_sale_service/tests/test_maintenance_sale_service.py +++ /dev/null @@ -1,55 +0,0 @@ -from odoo.tests import common - - -class TestMaintenanceSaleService(common.SavepointCase): - def setUp(self): - super(TestMaintenanceSaleService, self).setUp() - self.partner = self.env["res.partner"].create({"name": "Partner A"}) - self.model = self.env["maintenance.equipment.model"].create({"name": "Model A"}) - self.equipment = self.env["maintenance.equipment"].create( - { - "partner_id": self.partner.id, - "model_id": self.model.id, - "serial_no": "#1", - } - ) - - def test_sale_product_with_equipment(self): - product = self._create_service_product_task_new_project() - sale = self._create_sale_order() - sale_line = self._create_sale_order_line(sale, product, self.equipment) - sale.action_confirm() - self.assertEqual(sale_line.equipment_id, sale_line.task_id.equipment_id) - self.assertEqual(sale_line.equipment_id, self.equipment) - - def test_sale_product_without_equipment(self): - product = self._create_service_product_task_new_project() - sale = self._create_sale_order() - sale_line = self._create_sale_order_line(sale, product, False) - sale.action_confirm() - self.assertEqual( - sale_line.task_id.equipment_id, self.env["maintenance.equipment"] - ) - - def _create_service_product_task_new_project(self): - return self.env["product.product"].create( - { - "name": "Service Product", - "type": "service", - "service_tracking": "task_in_project", - } - ) - - def _create_sale_order(self): - return self.env["sale.order"].create({"partner_id": self.partner.id}) - - def _create_sale_order_line(self, sale_order, product, equipment): - return self.env["sale.order.line"].create( - { - "order_id": sale_order.id, - "product_id": product.id, - "equipment_id": equipment and equipment.id or False, - "product_uom_qty": 1, - "name": "line", - } - ) diff --git a/maintenance_sale_service/views/project_task.xml b/maintenance_sale_service/views/project_task.xml deleted file mode 100644 index 53291e7..0000000 --- a/maintenance_sale_service/views/project_task.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - project.task.form - project.task - - - - - - - - - - - - - - - - - - diff --git a/maintenance_sale_service/views/sale_order_line.xml b/maintenance_sale_service/views/sale_order_line.xml deleted file mode 100644 index 1c1673b..0000000 --- a/maintenance_sale_service/views/sale_order_line.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - sale.order.form - sale.order - - - - - - - - - - - -