From 89a551ad435e28d1c60fba1a0115eafc211b63d7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adri=C3=A0=20Gil=20Sorribes?= Date: Tue, 23 Jul 2019 17:06:45 +0200 Subject: [PATCH 01/32] [11.0][ADD] maintenance_equipment_sequence --- maintenance_equipment_sequence/README.rst | 73 +++ maintenance_equipment_sequence/__init__.py | 1 + .../__manifest__.py | 20 + .../models/__init__.py | 1 + .../models/maintenance.py | 138 ++++++ .../readme/CONTRIBUTORS.rst | 1 + .../readme/DESCRIPTION.rst | 1 + .../static/description/icon.png | Bin 0 -> 9455 bytes .../static/description/index.html | 419 ++++++++++++++++++ .../tests/__init__.py | 1 + .../test_maintenance_equipment_sequence.py | 44 ++ .../views/maintenance_views.xml | 49 ++ 12 files changed, 748 insertions(+) create mode 100644 maintenance_equipment_sequence/README.rst create mode 100644 maintenance_equipment_sequence/__init__.py create mode 100644 maintenance_equipment_sequence/__manifest__.py create mode 100644 maintenance_equipment_sequence/models/__init__.py create mode 100644 maintenance_equipment_sequence/models/maintenance.py create mode 100644 maintenance_equipment_sequence/readme/CONTRIBUTORS.rst create mode 100644 maintenance_equipment_sequence/readme/DESCRIPTION.rst create mode 100644 maintenance_equipment_sequence/static/description/icon.png create mode 100644 maintenance_equipment_sequence/static/description/index.html create mode 100644 maintenance_equipment_sequence/tests/__init__.py create mode 100644 maintenance_equipment_sequence/tests/test_maintenance_equipment_sequence.py create mode 100644 maintenance_equipment_sequence/views/maintenance_views.xml diff --git a/maintenance_equipment_sequence/README.rst b/maintenance_equipment_sequence/README.rst new file mode 100644 index 000000000..5934b6bf7 --- /dev/null +++ b/maintenance_equipment_sequence/README.rst @@ -0,0 +1,73 @@ +============================== +Maintenance Equipment Sequence +============================== + +.. !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + !! This file is generated by oca-gen-addon-readme !! + !! changes will be overwritten. !! + !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + +.. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png + :target: https://odoo-community.org/page/development-status + :alt: Beta +.. |badge2| image:: https://img.shields.io/badge/licence-AGPL--3-blue.png + :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html + :alt: License: AGPL-3 +.. |badge3| image:: https://img.shields.io/badge/github-OCA%2Fmaintenance-lightgray.png?logo=github + :target: https://github.com/OCA/maintenance/tree/11.0/maintenance_equipment_sequence + :alt: OCA/maintenance +.. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png + :target: https://translation.odoo-community.org/projects/maintenance-11-0/maintenance-11-0-maintenance_equipment_sequence + :alt: Translate me on Weblate +.. |badge5| image:: https://img.shields.io/badge/runbot-Try%20me-875A7B.png + :target: https://runbot.odoo-community.org/runbot/240/11.0 + :alt: Try me on Runbot + +|badge1| |badge2| |badge3| |badge4| |badge5| + +This module introduces a sequence to the maintenance equipment managed from the maintenance equipment category + +**Table of contents** + +.. contents:: + :local: + +Bug Tracker +=========== + +Bugs are tracked on `GitHub Issues `_. +In case of trouble, please check there if your issue has already been reported. +If you spotted it first, help us smashing it by providing a detailed and welcomed +`feedback `_. + +Do not contact contributors directly about support or help with technical issues. + +Credits +======= + +Authors +~~~~~~~ + +* Eficent Business and IT Consulting Services S.L. + +Contributors +~~~~~~~~~~~~ + +* Adria Gil Sorribes + +Maintainers +~~~~~~~~~~~ + +This module is maintained by the OCA. + +.. image:: https://odoo-community.org/logo.png + :alt: Odoo Community Association + :target: https://odoo-community.org + +OCA, or the Odoo Community Association, is a nonprofit organization whose +mission is to support the collaborative development of Odoo features and +promote its widespread use. + +This module is part of the `OCA/maintenance `_ project on GitHub. + +You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute. diff --git a/maintenance_equipment_sequence/__init__.py b/maintenance_equipment_sequence/__init__.py new file mode 100644 index 000000000..0650744f6 --- /dev/null +++ b/maintenance_equipment_sequence/__init__.py @@ -0,0 +1 @@ +from . import models diff --git a/maintenance_equipment_sequence/__manifest__.py b/maintenance_equipment_sequence/__manifest__.py new file mode 100644 index 000000000..115a721b3 --- /dev/null +++ b/maintenance_equipment_sequence/__manifest__.py @@ -0,0 +1,20 @@ +# Copyright 2019 Eficent Business and IT Consulting Services S.L. +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). + +{ + 'name': 'Maintenance Equipment Sequence', + 'summary': """ + Adds sequence to maintenance equipment defined in the equipment's + category""", + 'version': '11.0.1.0.0', + 'license': 'AGPL-3', + 'author': 'Eficent Business and IT Consulting Services S.L.,' + 'Odoo Community Association (OCA)', + 'website': 'https://www.github.com/OCA/maintenance', + 'depends': [ + 'maintenance' + ], + 'data': [ + 'views/maintenance_views.xml', + ], +} diff --git a/maintenance_equipment_sequence/models/__init__.py b/maintenance_equipment_sequence/models/__init__.py new file mode 100644 index 000000000..12bf298f8 --- /dev/null +++ b/maintenance_equipment_sequence/models/__init__.py @@ -0,0 +1 @@ +from . import maintenance diff --git a/maintenance_equipment_sequence/models/maintenance.py b/maintenance_equipment_sequence/models/maintenance.py new file mode 100644 index 000000000..efcb057de --- /dev/null +++ b/maintenance_equipment_sequence/models/maintenance.py @@ -0,0 +1,138 @@ +# Copyright 2019 Eficent Business and IT Consulting Services S.L. +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). + +from odoo import models, fields, api + + +class MaintenanceEquipmentCategory(models.Model): + _inherit = 'maintenance.equipment.category' + + sequence_prefix = fields.Char( + string='Sequence Prefix', + help="The equipment's sequence will be created using this prefix." + ) + sequence_id = fields.Many2one( + 'ir.sequence', + string='Entry Sequence', + help="This field contains the information related to the " + "numbering of the equipments belonging to this category.", + copy=False + ) + sequence_number_next = fields.Integer( + string='Next Number', + help='The next sequence number will be used for the next equipment.', + compute='_compute_seq_number_next', + inverse='_inverse_seq_number_next' + ) + + @api.model + def _create_sequence(self, vals): + """ Create new no_gap entry sequence""" + seq = { + 'name': vals.get('name', False) or self.name, + 'implementation': 'no_gap', + 'prefix': (vals.get('sequence_prefix', False) or + self.sequence_prefix), + 'padding': 4, + 'number_increment': 1, + 'use_date_range': False, + } + seq = self.env['ir.sequence'].create(seq) + seq_date_range = seq._get_current_sequence() + seq_date_range.number_next = vals.get('sequence_number_next', 1) + return seq + + @api.multi + # do not depend on 'sequence_id.date_range_ids', because + # sequence_id._get_current_sequence() may invalidate it! + @api.depends('sequence_id.use_date_range', + 'sequence_id.number_next_actual') + def _compute_seq_number_next(self): + """ Compute 'sequence_number_next' according to the current sequence + in use, an ir.sequence or an ir.sequence.date_range. + """ + for category in self: + if category.sequence_id: + sequence = category.sequence_id._get_current_sequence() + category.sequence_number_next = sequence.number_next_actual + else: + category.sequence_number_next = 1 + + @api.multi + def _inverse_seq_number_next(self): + """ + Inverse 'sequence_number_next' to edit the current sequence next number + """ + for category in self: + if category.sequence_id and category.sequence_number_next: + sequence = category.sequence_id._get_current_sequence() + sequence.sudo().number_next = category.sequence_number_next + + @api.model + def create(self, vals): + if not vals.get('sequence_id', False): + if vals.get('sequence_prefix', False): + vals['sequence_id'] = self.sudo()._create_sequence(vals).id + else: + vals['sequence_prefix'] = self.env['ir.sequence'].browse( + vals['sequence_id']).prefix + result = super(MaintenanceEquipmentCategory, self).create(vals) + self._compute_equipment_code() + return result + + @api.multi + def write(self, vals): + if not vals.get('sequence_id', False): + if vals.get('sequence_prefix', False): + vals['sequence_id'] = self.sudo()._create_sequence(vals).id + else: + vals['sequence_prefix'] = self.env['ir.sequence'].browse( + vals['sequence_id']).prefix + result = super(MaintenanceEquipmentCategory, self).write(vals) + self._compute_equipment_code() + return result + + @api.onchange('sequence_id') + def _onchange_sequence_id(self): + if self.sequence_id: + self.sequence_prefix = self.sequence_id.prefix + + @api.multi + def _compute_equipment_code(self): + for category in self: + if category.sequence_id: + category_equipments = category.env['maintenance.equipment'].\ + search([('category_id', '=', category.id)]) + for equipment in category_equipments: + if not equipment.code and \ + equipment.category_id.sequence_id: + equipment.code = \ + equipment.category_id.sequence_id._next() + + +class MaintenanceEquipment(models.Model): + _inherit = "maintenance.equipment" + + code = fields.Char( + string='Equipment Code', + ) + + @api.model + def create(self, vals): + if vals.get('category_id') and not vals.get('code'): + sequence_id = self.env['maintenance.equipment.category'].browse( + vals['category_id']).sequence_id + if sequence_id: + vals['code'] = sequence_id._next() + return super(MaintenanceEquipment, self).create(vals) + + @api.multi + def write(self, vals): + if (not self.code or vals.get('code', None) is False) and \ + (self.category_id or vals.get('category_id', False)): + category_id = self.category_id.id or vals.get('category_id', False) + sequence_id = self.env['maintenance.equipment.category'].browse( + category_id).sequence_id + if sequence_id: + vals['code'] = sequence_id._next() + return super(MaintenanceEquipment, self).write(vals) diff --git a/maintenance_equipment_sequence/readme/CONTRIBUTORS.rst b/maintenance_equipment_sequence/readme/CONTRIBUTORS.rst new file mode 100644 index 000000000..afabf1ede --- /dev/null +++ b/maintenance_equipment_sequence/readme/CONTRIBUTORS.rst @@ -0,0 +1 @@ +* Adria Gil Sorribes diff --git a/maintenance_equipment_sequence/readme/DESCRIPTION.rst b/maintenance_equipment_sequence/readme/DESCRIPTION.rst new file mode 100644 index 000000000..2b4832241 --- /dev/null +++ b/maintenance_equipment_sequence/readme/DESCRIPTION.rst @@ -0,0 +1 @@ +This module introduces a sequence to the maintenance equipment managed from the maintenance equipment category diff --git a/maintenance_equipment_sequence/static/description/icon.png b/maintenance_equipment_sequence/static/description/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..3a0328b516c4980e8e44cdb63fd945757ddd132d GIT binary patch literal 9455 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 z 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 Xviia!U7SGha1wx#SCgwmn*{w2TRX*I literal 0 HcmV?d00001 diff --git a/maintenance_equipment_sequence/static/description/index.html b/maintenance_equipment_sequence/static/description/index.html new file mode 100644 index 000000000..6246bd289 --- /dev/null +++ b/maintenance_equipment_sequence/static/description/index.html @@ -0,0 +1,419 @@ + + + + + + +Maintenance Equipment Sequence + + + +
+

Maintenance Equipment Sequence

+ + +

Beta License: AGPL-3 OCA/maintenance Translate me on Weblate Try me on Runbot

+

This module introduces a sequence to the maintenance equipment managed from the maintenance equipment category

+

Table of contents

+ +
+

Bug Tracker

+

Bugs are tracked on GitHub Issues. +In case of trouble, please check there if your issue has already been reported. +If you spotted it first, help us smashing it by providing a detailed and welcomed +feedback.

+

Do not contact contributors directly about support or help with technical issues.

+
+
+

Credits

+
+

Authors

+
    +
  • Eficent Business and IT Consulting Services S.L.
  • +
+
+
+

Contributors

+ +
+
+

Maintainers

+

This module is maintained by the OCA.

+Odoo Community Association +

OCA, or the Odoo Community Association, is a nonprofit organization whose +mission is to support the collaborative development of Odoo features and +promote its widespread use.

+

This module is part of the OCA/maintenance project on GitHub.

+

You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute.

+
+
+
+ + diff --git a/maintenance_equipment_sequence/tests/__init__.py b/maintenance_equipment_sequence/tests/__init__.py new file mode 100644 index 000000000..10d0722fb --- /dev/null +++ b/maintenance_equipment_sequence/tests/__init__.py @@ -0,0 +1 @@ +from . import test_maintenance_equipment_sequence diff --git a/maintenance_equipment_sequence/tests/test_maintenance_equipment_sequence.py b/maintenance_equipment_sequence/tests/test_maintenance_equipment_sequence.py new file mode 100644 index 000000000..0de5656ba --- /dev/null +++ b/maintenance_equipment_sequence/tests/test_maintenance_equipment_sequence.py @@ -0,0 +1,44 @@ +# Copyright 2019 Eficent Business and IT Consulting Services S.L. +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). + +from odoo.tests.common import TransactionCase + + +class TestMaintenanceEquipmentSequence(TransactionCase): + + def setUp(self): + super(TestMaintenanceEquipmentSequence, self).setUp() + self.maintenance_equipment_categ_obj = \ + self.env['maintenance.equipment.category'] + self.maintenance_equipment_obj = self.env['maintenance.equipment'] + self.sequence_obj = self.env['ir.sequence'] + + def test_01_maintenance_equipment_sequence(self): + """ Create equipment category and check sequence has been + automatically created, create equipments inside category and check + sequence number has been set + """ + # Create category + categ_1 = self.maintenance_equipment_categ_obj.create({ + 'name': 'Test Category', + 'sequence_prefix': 'TTC', + 'sequence_number_next': 1, + }) + seq_1 = self.sequence_obj.search( + [('name', '=', categ_1.name), ('prefix', '=', 'TTC')], limit=1) + self.assertEqual(seq_1.prefix, categ_1.sequence_prefix) + self.assertEqual(seq_1.number_next_actual, + categ_1.sequence_number_next) + + # Create equipment inside category + equipment_1 = self.maintenance_equipment_obj.create({ + 'name': 'Laptop 1', + 'category_id': categ_1.id, + }) + self.assertEqual(equipment_1.code, 'TTC0001') + # Set code manually + equipment_1.write({'code': 'TTC0023'}) + self.assertEqual(equipment_1.code, 'TTC0023') + # Remove code and be automatically set to sequence next value + equipment_1.write({'code': False}) + self.assertEqual(equipment_1.code, 'TTC0002') diff --git a/maintenance_equipment_sequence/views/maintenance_views.xml b/maintenance_equipment_sequence/views/maintenance_views.xml new file mode 100644 index 000000000..62a0e63bd --- /dev/null +++ b/maintenance_equipment_sequence/views/maintenance_views.xml @@ -0,0 +1,49 @@ + + + + + + equipment.category.form + maintenance.equipment.category + + + + + + + + + + + + + + + equipment.form + maintenance.equipment + + + +
+
+
+
+
+
+
+ + + equipment.tree + maintenance.equipment + + + + + + + + +
\ No newline at end of file From 3188c6fc7756ea5cd37d6acc1575b92558e80a96 Mon Sep 17 00:00:00 2001 From: Jordi Ballester Alomar Date: Mon, 5 Aug 2019 16:38:51 +0200 Subject: [PATCH 02/32] fix sequence step --- .../models/maintenance.py | 21 +++++++++---------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/maintenance_equipment_sequence/models/maintenance.py b/maintenance_equipment_sequence/models/maintenance.py index efcb057de..90d65210e 100644 --- a/maintenance_equipment_sequence/models/maintenance.py +++ b/maintenance_equipment_sequence/models/maintenance.py @@ -119,20 +119,19 @@ class MaintenanceEquipment(models.Model): @api.model def create(self, vals): - if vals.get('category_id') and not vals.get('code'): + equipment = super(MaintenanceEquipment, self).create(vals) + if equipment.category_id and not equipment.code: sequence_id = self.env['maintenance.equipment.category'].browse( vals['category_id']).sequence_id if sequence_id: - vals['code'] = sequence_id._next() - return super(MaintenanceEquipment, self).create(vals) + equipment.code = sequence_id._next() + return equipment @api.multi def write(self, vals): - if (not self.code or vals.get('code', None) is False) and \ - (self.category_id or vals.get('category_id', False)): - category_id = self.category_id.id or vals.get('category_id', False) - sequence_id = self.env['maintenance.equipment.category'].browse( - category_id).sequence_id - if sequence_id: - vals['code'] = sequence_id._next() - return super(MaintenanceEquipment, self).write(vals) + rec = super(MaintenanceEquipment, self).write(vals) + for rec in self: + if rec.category_id and not rec.code and \ + rec.category_id.sequence_id: + rec.code = rec.category_id.sequence_id._next() + return rec From d939670a86aa1dbccaa40194c5fe7f9d747664a1 Mon Sep 17 00:00:00 2001 From: Lois Rilo Date: Wed, 14 Aug 2019 10:26:40 +0200 Subject: [PATCH 03/32] Code always displayed as "Code" to avoid confusion and add it to search view --- .../models/maintenance.py | 2 +- .../views/maintenance_views.xml | 13 ++++++++++++- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/maintenance_equipment_sequence/models/maintenance.py b/maintenance_equipment_sequence/models/maintenance.py index 90d65210e..0f59c7679 100644 --- a/maintenance_equipment_sequence/models/maintenance.py +++ b/maintenance_equipment_sequence/models/maintenance.py @@ -114,7 +114,7 @@ class MaintenanceEquipment(models.Model): _inherit = "maintenance.equipment" code = fields.Char( - string='Equipment Code', + help='Equipment Code', ) @api.model diff --git a/maintenance_equipment_sequence/views/maintenance_views.xml b/maintenance_equipment_sequence/views/maintenance_views.xml index 62a0e63bd..44788f82e 100644 --- a/maintenance_equipment_sequence/views/maintenance_views.xml +++ b/maintenance_equipment_sequence/views/maintenance_views.xml @@ -41,7 +41,18 @@ - + + + + + + + equipment.search + maintenance.equipment + + + + From 54a9ad1f96280a952b635d01f6611ba3bd793b90 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adri=C3=A0=20Gil=20Sorribes?= Date: Wed, 6 Nov 2019 12:52:53 +0100 Subject: [PATCH 04/32] fixup and increase test coverage --- .../i18n/maintenance_equipment_sequence.pot | 65 +++++++++++++++++++ .../static/description/index.html | 2 +- .../test_maintenance_equipment_sequence.py | 23 ++++++- .../views/maintenance_views.xml | 2 +- 4 files changed, 89 insertions(+), 3 deletions(-) create mode 100644 maintenance_equipment_sequence/i18n/maintenance_equipment_sequence.pot diff --git a/maintenance_equipment_sequence/i18n/maintenance_equipment_sequence.pot b/maintenance_equipment_sequence/i18n/maintenance_equipment_sequence.pot new file mode 100644 index 000000000..3aae80e03 --- /dev/null +++ b/maintenance_equipment_sequence/i18n/maintenance_equipment_sequence.pot @@ -0,0 +1,65 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * maintenance_equipment_sequence +# +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 11.0\n" +"Report-Msgid-Bugs-To: \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_sequence +#: model:ir.model,name:maintenance_equipment_sequence.model_maintenance_equipment_category +msgid "Asset Category" +msgstr "" + +#. module: maintenance_equipment_sequence +#: model:ir.model.fields,field_description:maintenance_equipment_sequence.field_maintenance_equipment_code +msgid "Code" +msgstr "" + +#. module: maintenance_equipment_sequence +#: model:ir.model.fields,field_description:maintenance_equipment_sequence.field_maintenance_equipment_category_sequence_id +msgid "Entry Sequence" +msgstr "" + +#. module: maintenance_equipment_sequence +#: model:ir.model,name:maintenance_equipment_sequence.model_maintenance_equipment +msgid "Equipment" +msgstr "" + +#. module: maintenance_equipment_sequence +#: model:ir.model.fields,help:maintenance_equipment_sequence.field_maintenance_equipment_code +msgid "Equipment Code" +msgstr "" + +#. module: maintenance_equipment_sequence +#: model:ir.model.fields,field_description:maintenance_equipment_sequence.field_maintenance_equipment_category_sequence_number_next +msgid "Next Number" +msgstr "" + +#. module: maintenance_equipment_sequence +#: model:ir.model.fields,field_description:maintenance_equipment_sequence.field_maintenance_equipment_category_sequence_prefix +msgid "Sequence Prefix" +msgstr "" + +#. module: maintenance_equipment_sequence +#: model:ir.model.fields,help:maintenance_equipment_sequence.field_maintenance_equipment_category_sequence_prefix +msgid "The equipment's sequence will be created using this prefix." +msgstr "" + +#. module: maintenance_equipment_sequence +#: model:ir.model.fields,help:maintenance_equipment_sequence.field_maintenance_equipment_category_sequence_number_next +msgid "The next sequence number will be used for the next equipment." +msgstr "" + +#. module: maintenance_equipment_sequence +#: model:ir.model.fields,help:maintenance_equipment_sequence.field_maintenance_equipment_category_sequence_id +msgid "This field contains the information related to the numbering of the equipments belonging to this category." +msgstr "" + diff --git a/maintenance_equipment_sequence/static/description/index.html b/maintenance_equipment_sequence/static/description/index.html index 6246bd289..80a9763a6 100644 --- a/maintenance_equipment_sequence/static/description/index.html +++ b/maintenance_equipment_sequence/static/description/index.html @@ -3,7 +3,7 @@ - + Maintenance Equipment Sequence