From 9566fd54107b22209c134923ed0ac33829ea0515 Mon Sep 17 00:00:00 2001 From: Vimal Patel Date: Fri, 23 Jul 2021 15:39:00 +0530 Subject: [PATCH] [14.0][MIG]agreement_maintenance: Travis --- agreement_maintenance/__manifest__.py | 38 +++++++++---------- agreement_maintenance/models/agreement.py | 8 ++-- .../models/agreement_serviceprofile.py | 3 +- .../models/maintenance_equipment.py | 7 ++-- .../models/maintenance_request.py | 5 +-- .../views/agreement_serviceprofile_view.xml | 8 ++-- .../views/agreement_view.xml | 20 ++++++---- .../views/maintenance_equipment_view.xml | 32 +++++++++------- .../views/maintenance_request_view.xml | 22 ++++++----- .../odoo/addons/agreement_maintenance | 1 + setup/agreement_maintenance/setup.py | 6 +++ 11 files changed, 85 insertions(+), 65 deletions(-) create mode 120000 setup/agreement_maintenance/odoo/addons/agreement_maintenance create mode 100644 setup/agreement_maintenance/setup.py diff --git a/agreement_maintenance/__manifest__.py b/agreement_maintenance/__manifest__.py index 18a334125..8126bd77f 100644 --- a/agreement_maintenance/__manifest__.py +++ b/agreement_maintenance/__manifest__.py @@ -3,25 +3,25 @@ # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). { - 'name': 'Maintenance Agreements', - 'summary': 'Manage maintenance agreements and contracts', - 'author': 'Pavlov Media, ' - 'Open Source Integrators, ' - 'Odoo Community Association (OCA)', - 'website': 'https://github.com/OCA/contract', - 'category': 'Maintenance', - 'license': 'AGPL-3', - 'version': '12.0.1.1.1', - 'depends': [ - 'maintenance', - 'agreement_serviceprofile', + "name": "Maintenance Agreements", + "summary": "Manage maintenance agreements and contracts", + "author": "Pavlov Media, " + "Open Source Integrators, " + "Odoo Community Association (OCA)", + "website": "https://github.com/OCA/contract", + "category": "Maintenance", + "license": "AGPL-3", + "version": "14.0.1.0.0", + "depends": [ + "maintenance", + "agreement_serviceprofile", ], - 'data': [ - 'views/agreement_view.xml', - 'views/agreement_serviceprofile_view.xml', - 'views/maintenance_request_view.xml', - 'views/maintenance_equipment_view.xml', + "data": [ + "views/agreement_view.xml", + "views/agreement_serviceprofile_view.xml", + "views/maintenance_request_view.xml", + "views/maintenance_equipment_view.xml", ], - 'development_status': 'Beta', - 'maintainers': ['max3903'], + "development_status": "Beta", + "maintainers": ["max3903"], } diff --git a/agreement_maintenance/models/agreement.py b/agreement_maintenance/models/agreement.py index c5d9458b0..e1e80ca57 100644 --- a/agreement_maintenance/models/agreement.py +++ b/agreement_maintenance/models/agreement.py @@ -7,11 +7,11 @@ from odoo import api, fields, models class Agreement(models.Model): _inherit = "agreement" - mr_count = fields.Integer('# Maintenance Requests', - compute='_compute_mr_count') + mr_count = fields.Integer("# Maintenance Requests", compute="_compute_mr_count") @api.multi def _compute_mr_count(self): for ag_rec in self: - ag_rec.mr_count = self.env['maintenance.request'].search_count( - [('agreement_id', 'in', ag_rec.ids)]) + ag_rec.mr_count = self.env["maintenance.request"].search_count( + [("agreement_id", "in", ag_rec.ids)] + ) diff --git a/agreement_maintenance/models/agreement_serviceprofile.py b/agreement_maintenance/models/agreement_serviceprofile.py index a2f3202cb..f88412fba 100644 --- a/agreement_maintenance/models/agreement_serviceprofile.py +++ b/agreement_maintenance/models/agreement_serviceprofile.py @@ -7,5 +7,4 @@ from odoo import fields, models class AgreementServiceProfile(models.Model): _inherit = "agreement.serviceprofile" - equipment_id = fields.Many2one('maintenance.equipment', - string='Equipment') + equipment_id = fields.Many2one("maintenance.equipment", string="Equipment") diff --git a/agreement_maintenance/models/maintenance_equipment.py b/agreement_maintenance/models/maintenance_equipment.py index 32963f0f5..3e3546a74 100644 --- a/agreement_maintenance/models/maintenance_equipment.py +++ b/agreement_maintenance/models/maintenance_equipment.py @@ -5,8 +5,9 @@ from odoo import fields, models class MaintenanceEquipment(models.Model): - _inherit = 'maintenance.equipment' + _inherit = "maintenance.equipment" - agreement_id = fields.Many2one('agreement', string='Agreement') + agreement_id = fields.Many2one("agreement", string="Agreement") serviceprofile_ids = fields.One2many( - 'agreement.serviceprofile', 'equipment_id', string='Service Profiles') + "agreement.serviceprofile", "equipment_id", string="Service Profiles" + ) diff --git a/agreement_maintenance/models/maintenance_request.py b/agreement_maintenance/models/maintenance_request.py index afc454a44..6c94d110c 100644 --- a/agreement_maintenance/models/maintenance_request.py +++ b/agreement_maintenance/models/maintenance_request.py @@ -7,6 +7,5 @@ from odoo import fields, models class MaintenanceRequest(models.Model): _inherit = "maintenance.request" - agreement_id = fields.Many2one('agreement', 'Agreement') - serviceprofile_id = fields.Many2one('agreement.serviceprofile', - 'Service Profile') + agreement_id = fields.Many2one("agreement", "Agreement") + serviceprofile_id = fields.Many2one("agreement.serviceprofile", "Service Profile") diff --git a/agreement_maintenance/views/agreement_serviceprofile_view.xml b/agreement_maintenance/views/agreement_serviceprofile_view.xml index d1e19a1b1..4c39d4833 100644 --- a/agreement_maintenance/views/agreement_serviceprofile_view.xml +++ b/agreement_maintenance/views/agreement_serviceprofile_view.xml @@ -6,11 +6,13 @@ agreement.serviceprofile.form.equipment agreement.serviceprofile - + - + diff --git a/agreement_maintenance/views/agreement_view.xml b/agreement_maintenance/views/agreement_view.xml index 7037fe0f4..3aa80581f 100644 --- a/agreement_maintenance/views/agreement_view.xml +++ b/agreement_maintenance/views/agreement_view.xml @@ -3,8 +3,10 @@ # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). --> - + Maintenance Requests ir.actions.act_window maintenance.request @@ -21,16 +23,18 @@ agreement.form.maintenance.request agreement - + -