From cf64335ed5ec3d4267c085707d530db4896eb1c8 Mon Sep 17 00:00:00 2001 From: Dan Stoica Date: Thu, 11 Jul 2024 10:31:24 +0300 Subject: [PATCH] modif views (#1547) --- README.md | 2 +- deltatech_service_maintenance/README.rst | 2 +- deltatech_service_maintenance/__manifest__.py | 2 +- deltatech_service_maintenance/i18n/ro.po | 47 ++++++++++++++++--- .../models/service_equipment.py | 15 ++++++ .../models/service_warranty.py | 8 ++++ deltatech_service_maintenance/models/stock.py | 21 +++++++++ .../static/description/index.html | 2 +- .../views/service_equipment_view.xml | 7 +++ .../views/service_warranty_view.xml | 22 +++++++-- .../views/stock_view.xml | 17 +++++++ 11 files changed, 131 insertions(+), 14 deletions(-) diff --git a/README.md b/README.md index f7f83e3535..896c8c743d 100644 --- a/README.md +++ b/README.md @@ -118,7 +118,7 @@ addon | version | maintainers | summary | price [deltatech_service_consumable](deltatech_service_consumable/) | 14.0.1.1.3 | [![dhongu](https://github.com/dhongu.png?size=30px)](https://github.com/dhongu) | Service Consumable | Free [deltatech_service_equipment](deltatech_service_equipment/) | 14.0.1.2.0 | [![dhongu](https://github.com/dhongu.png?size=30px)](https://github.com/dhongu) | Service Equipment Management | Free [deltatech_service_equipment_base](deltatech_service_equipment_base/) | 14.0.1.1.3 | [![dhongu](https://github.com/dhongu.png?size=30px)](https://github.com/dhongu) | Service Equipment Management | Free -[deltatech_service_maintenance](deltatech_service_maintenance/) | 14.0.1.0.7 | [![dhongu](https://github.com/dhongu.png?size=30px)](https://github.com/dhongu) | Services Maintenance | Free +[deltatech_service_maintenance](deltatech_service_maintenance/) | 14.0.1.0.8 | [![dhongu](https://github.com/dhongu.png?size=30px)](https://github.com/dhongu) | Services Maintenance | Free [deltatech_service_maintenance_agreement](deltatech_service_maintenance_agreement/) | 14.0.1.0.4 | [![dhongu](https://github.com/dhongu.png?size=30px)](https://github.com/dhongu) | Services Maintenance | Free [deltatech_service_maintenance_plan](deltatech_service_maintenance_plan/) | 14.0.1.0.6 | [![dhongu](https://github.com/dhongu.png?size=30px)](https://github.com/dhongu) | Services Maintenance Plan | Free [deltatech_sms](deltatech_sms/) | 14.0.1.0.0 | [![dhongu](https://github.com/dhongu.png?size=30px)](https://github.com/dhongu) | Send SMS to custom endpoint | Free diff --git a/deltatech_service_maintenance/README.rst b/deltatech_service_maintenance/README.rst index 81deb7169c..e9c3864471 100644 --- a/deltatech_service_maintenance/README.rst +++ b/deltatech_service_maintenance/README.rst @@ -7,7 +7,7 @@ Deltatech Services Maintenance !! This file is generated by oca-gen-addon-readme !! !! changes will be overwritten. !! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! - !! source digest: sha256:c669805bbd4f1e6bb2221044caeead348716793e0346d9cbdc474832d386ca6b + !! source digest: sha256:db844b4f79e8c19bb5fabd0b6cf7a51526519c8b1dec193efe3c0e7cc660023d !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! .. |badge1| image:: https://img.shields.io/badge/maturity-Production%2FStable-green.png diff --git a/deltatech_service_maintenance/__manifest__.py b/deltatech_service_maintenance/__manifest__.py index 1d1fed3629..21e9479a6c 100644 --- a/deltatech_service_maintenance/__manifest__.py +++ b/deltatech_service_maintenance/__manifest__.py @@ -5,7 +5,7 @@ { "name": "Deltatech Services Maintenance", "summary": "Services Maintenance", - "version": "14.0.1.0.7", + "version": "14.0.1.0.8", "author": "Terrabit, Dorin Hongu", "website": "https://www.terrabit.ro", "category": "Services/Maintenance", diff --git a/deltatech_service_maintenance/i18n/ro.po b/deltatech_service_maintenance/i18n/ro.po index 7bf0d8243c..8bd8a10f50 100644 --- a/deltatech_service_maintenance/i18n/ro.po +++ b/deltatech_service_maintenance/i18n/ro.po @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: Odoo Server 14.0+e\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-06-25 09:43+0000\n" -"PO-Revision-Date: 2024-06-25 09:43+0000\n" +"POT-Creation-Date: 2024-07-11 06:45+0000\n" +"PO-Revision-Date: 2024-07-11 06:45+0000\n" "Last-Translator: \n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -357,6 +357,7 @@ msgstr "" #: model:ir.model.fields,field_description:deltatech_service_maintenance.field_service_warranty__display_name #: model:ir.model.fields,field_description:deltatech_service_maintenance.field_service_warranty_item__display_name #: model:ir.model.fields,field_description:deltatech_service_maintenance.field_stock_picking__display_name +#: model:ir.model.fields,field_description:deltatech_service_maintenance.field_stock_production_lot__display_name msgid "Display Name" msgstr "Nume afișat" @@ -373,7 +374,7 @@ msgstr "" #: model_terms:ir.ui.view,arch_db:deltatech_service_maintenance.view_service_order_form #: model_terms:ir.ui.view,arch_db:deltatech_service_maintenance.view_service_warranty_filter msgid "Done" -msgstr "Efectuat" +msgstr "Soluționat" #. module: deltatech_service_maintenance #: model:ir.model.fields,field_description:deltatech_service_maintenance.field_service_notification__date_done @@ -501,6 +502,7 @@ msgstr "" #: model:ir.model.fields,field_description:deltatech_service_maintenance.field_service_warranty__id #: model:ir.model.fields,field_description:deltatech_service_maintenance.field_service_warranty_item__id #: model:ir.model.fields,field_description:deltatech_service_maintenance.field_stock_picking__id +#: model:ir.model.fields,field_description:deltatech_service_maintenance.field_stock_production_lot__id msgid "ID" msgstr "" @@ -596,6 +598,7 @@ msgstr "" #: model:ir.model.fields,field_description:deltatech_service_maintenance.field_service_warranty____last_update #: model:ir.model.fields,field_description:deltatech_service_maintenance.field_service_warranty_item____last_update #: model:ir.model.fields,field_description:deltatech_service_maintenance.field_stock_picking____last_update +#: model:ir.model.fields,field_description:deltatech_service_maintenance.field_stock_production_lot____last_update msgid "Last Modified on" msgstr "Ultima modificare la" @@ -653,6 +656,11 @@ msgstr "" msgid "Location" msgstr "Punct de lucru" +#. module: deltatech_service_maintenance +#: model:ir.model,name:deltatech_service_maintenance.model_stock_production_lot +msgid "Lot/Serial" +msgstr "" + #. module: deltatech_service_maintenance #: model:ir.model.fields.selection,name:deltatech_service_maintenance.selection__service_notification__priority__1 msgid "Low" @@ -735,7 +743,7 @@ msgstr "Sesizare nouă" #: model_terms:ir.ui.view,arch_db:deltatech_service_maintenance.view_service_notification_form #: model_terms:ir.ui.view,arch_db:deltatech_service_maintenance.view_service_warranty_form msgid "New transfer" -msgstr "Creează transfer" +msgstr "Creează transfer intern" #. module: deltatech_service_maintenance #: model:ir.model.fields,field_description:deltatech_service_maintenance.field_service_notification__activity_date_deadline @@ -758,6 +766,13 @@ msgstr "" msgid "Next Activity Type" msgstr "" +#. module: deltatech_service_maintenance +#: code:addons/deltatech_service_maintenance/models/service_equipment.py:0 +#: code:addons/deltatech_service_maintenance/models/stock.py:0 +#, python-format +msgid "No warranties for this serial!" +msgstr "" + #. module: deltatech_service_maintenance #: model:ir.model.fields.selection,name:deltatech_service_maintenance.selection__service_notification__priority__2 msgid "Normal" @@ -1052,7 +1067,7 @@ msgstr "Prioritate" #: model:ir.model.fields,field_description:deltatech_service_maintenance.field_service_order_component__product_id #: model:ir.model.fields,field_description:deltatech_service_maintenance.field_service_warranty_item__product_id msgid "Product" -msgstr "Produs" +msgstr "Serviciu" #. module: deltatech_service_maintenance #: model:ir.model.fields,field_description:deltatech_service_maintenance.field_service_notification_item__quantity @@ -1319,7 +1334,7 @@ msgstr "" #. module: deltatech_service_maintenance #: model_terms:ir.ui.view,arch_db:deltatech_service_maintenance.view_service_warranty_form msgid "Set done" -msgstr "Setează efectuat" +msgstr "Setează soluționat" #. module: deltatech_service_maintenance #: model_terms:ir.ui.view,arch_db:deltatech_service_maintenance.view_service_warranty_form @@ -1546,6 +1561,24 @@ msgstr "" msgid "Very Low" msgstr "" +#. module: deltatech_service_maintenance +#: model_terms:ir.ui.view,arch_db:deltatech_service_maintenance.view_production_lot_form +#: model_terms:ir.ui.view,arch_db:deltatech_service_maintenance.view_service_equipment_form +msgid "Warranties" +msgstr "Sesizări garanție" + +#. module: deltatech_service_maintenance +#: code:addons/deltatech_service_maintenance/models/service_equipment.py:0 +#, python-format +msgid "Warranties for equipment %s" +msgstr "Sesizări garanție pentru echipament %s" + +#. module: deltatech_service_maintenance +#: code:addons/deltatech_service_maintenance/models/stock.py:0 +#, python-format +msgid "Warranties for serial %s" +msgstr "Sesizări garanție pentru serial %s" + #. module: deltatech_service_maintenance #: model:ir.actions.act_window,name:deltatech_service_maintenance.action_service_warranty #: model:ir.model,name:deltatech_service_maintenance.model_service_warranty @@ -1556,7 +1589,7 @@ msgstr "" #: model_terms:ir.ui.view,arch_db:deltatech_service_maintenance.view_service_warranty_form #: model_terms:ir.ui.view,arch_db:deltatech_service_maintenance.view_service_warranty_tree msgid "Warranty" -msgstr "Garanție" +msgstr "Sesizări garanție" #. module: deltatech_service_maintenance #: model:ir.model,name:deltatech_service_maintenance.model_service_warranty_item diff --git a/deltatech_service_maintenance/models/service_equipment.py b/deltatech_service_maintenance/models/service_equipment.py index 865197972b..ace83e0396 100644 --- a/deltatech_service_maintenance/models/service_equipment.py +++ b/deltatech_service_maintenance/models/service_equipment.py @@ -4,6 +4,7 @@ from odoo import _, fields, models +from odoo.exceptions import UserError class ServiceEquipment(models.Model): @@ -62,3 +63,17 @@ def order_button(self): "context": context, "type": "ir.actions.act_window", } + + def action_equipment_open_warranty(self): + self.ensure_one() + warranties = self.env["service.warranty"].search([("equipment_id", "=", self.id)]) + if warranties: + action = { + "res_model": "service.warranty", + "type": "ir.actions.act_window", + "name": _("Warranties for equipment %s", self.name), + "domain": [("id", "in", warranties.ids)], + "view_mode": "tree,form", + } + return action + raise UserError(_("No warranties for this serial!")) diff --git a/deltatech_service_maintenance/models/service_warranty.py b/deltatech_service_maintenance/models/service_warranty.py index 2757685490..c50036c66e 100644 --- a/deltatech_service_maintenance/models/service_warranty.py +++ b/deltatech_service_maintenance/models/service_warranty.py @@ -32,6 +32,7 @@ class ServiceWarranty(models.Model): string="Status", tracking=True, ) + state_editable = fields.Boolean(compute="_compute_state_editable") equipment_id = fields.Many2one( "service.equipment", string="Equipment", index=True, readonly=True, states={"new": [("readonly", False)]} ) @@ -50,6 +51,13 @@ class ServiceWarranty(models.Model): copy=True, ) + def _compute_state_editable(self): + for warranty in self: + if self.env.user.has_group("deltatech_service.group_warranty_manager"): + warranty.state_editable = True + else: + warranty.state_editable = False + @api.onchange("equipment_id") def onchange_equipment_id(self): if self.equipment_id: diff --git a/deltatech_service_maintenance/models/stock.py b/deltatech_service_maintenance/models/stock.py index 5023ace1c3..462305cbce 100644 --- a/deltatech_service_maintenance/models/stock.py +++ b/deltatech_service_maintenance/models/stock.py @@ -3,6 +3,7 @@ # See README.rst file on addons root folder for license details from odoo import _, api, fields, models +from odoo.exceptions import UserError class StockPicking(models.Model): @@ -54,3 +55,23 @@ def new_notification(self): "context": context, "type": "ir.actions.act_window", } + + +class StockLot(models.Model): + _inherit = "stock.production.lot" + + def action_lot_open_warranty(self): + self.ensure_one() + equipments = self.env["service.equipment"].search([("serial_id", "=", self.id)]) + if equipments: + warranties = self.env["service.warranty"].search([("equipment_id", "in", equipments.ids)]) + if warranties: + action = { + "res_model": "service.warranty", + "type": "ir.actions.act_window", + "name": _("Warranties for serial %s", self.name), + "domain": [("id", "in", warranties.ids)], + "view_mode": "tree,form", + } + return action + raise UserError(_("No warranties for this serial!")) diff --git a/deltatech_service_maintenance/static/description/index.html b/deltatech_service_maintenance/static/description/index.html index 8ea5e7b2ac..e93dd0bcf1 100644 --- a/deltatech_service_maintenance/static/description/index.html +++ b/deltatech_service_maintenance/static/description/index.html @@ -368,7 +368,7 @@

Deltatech Services Maintenance

!! This file is generated by oca-gen-addon-readme !! !! changes will be overwritten. !! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -!! source digest: sha256:c669805bbd4f1e6bb2221044caeead348716793e0346d9cbdc474832d386ca6b +!! source digest: sha256:db844b4f79e8c19bb5fabd0b6cf7a51526519c8b1dec193efe3c0e7cc660023d !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->

Production/Stable License: AGPL-3 dhongu/deltatech

diff --git a/deltatech_service_maintenance/views/service_equipment_view.xml b/deltatech_service_maintenance/views/service_equipment_view.xml index f6dadfb0b9..ecf04ee148 100644 --- a/deltatech_service_maintenance/views/service_equipment_view.xml +++ b/deltatech_service_maintenance/views/service_equipment_view.xml @@ -12,6 +12,13 @@ +