From f61f35880ad4b24b69746c1f9aa9ed2fa446c6ba Mon Sep 17 00:00:00 2001 From: Murtuza Saleh Date: Thu, 28 Mar 2019 19:01:09 +0530 Subject: [PATCH] [MIG][WIP][12.0] agreement_repair --- agreement_repair/README.rst | 11 ++++---- agreement_repair/__manifest__.py | 6 ++--- agreement_repair/i18n/agreement_repair.pot | 24 ++++++++---------- agreement_repair/i18n/de.po | 25 +++++++++---------- agreement_repair/models/agreement.py | 10 +++----- agreement_repair/models/repair.py | 4 +-- agreement_repair/readme/CONTRIBUTORS.rst | 1 + .../static/description/index.html | 9 ++++--- agreement_repair/views/agreement_view.xml | 10 +++++--- agreement_repair/views/repair_view.xml | 16 ++++++------ 10 files changed, 57 insertions(+), 59 deletions(-) diff --git a/agreement_repair/README.rst b/agreement_repair/README.rst index 6eb68d623..20f9bd893 100644 --- a/agreement_repair/README.rst +++ b/agreement_repair/README.rst @@ -14,13 +14,13 @@ Agreement - Repair :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html :alt: License: AGPL-3 .. |badge3| image:: https://img.shields.io/badge/github-OCA%2Fcontract-lightgray.png?logo=github - :target: https://github.com/OCA/contract/tree/11.0/agreement_repair + :target: https://github.com/OCA/contract/tree/12.0/agreement_repair :alt: OCA/contract .. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png - :target: https://translation.odoo-community.org/projects/contract-11-0/contract-11-0-agreement_repair + :target: https://translation.odoo-community.org/projects/contract-12-0/contract-12-0-agreement_repair :alt: Translate me on Weblate .. |badge5| image:: https://img.shields.io/badge/runbot-Try%20me-875A7B.png - :target: https://runbot.odoo-community.org/runbot/110/11.0 + :target: https://runbot.odoo-community.org/runbot/110/12.0 :alt: Try me on Runbot |badge1| |badge2| |badge3| |badge4| |badge5| @@ -59,7 +59,7 @@ 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 `_. +`feedback `_. Do not contact contributors directly about support or help with technical issues. @@ -75,6 +75,7 @@ Contributors ~~~~~~~~~~~~ * Sandip Mangukiya +* Serpent Consulting Services Pvt. Ltd. Other credits ~~~~~~~~~~~~~ @@ -107,6 +108,6 @@ Current `maintainers `__: |maintainer-smangukiya| |maintainer-max3903| -This module is part of the `OCA/contract `_ project on GitHub. +This module is part of the `OCA/contract `_ project on GitHub. You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute. diff --git a/agreement_repair/__manifest__.py b/agreement_repair/__manifest__.py index 50d310d4f..d4a222ad9 100644 --- a/agreement_repair/__manifest__.py +++ b/agreement_repair/__manifest__.py @@ -4,14 +4,14 @@ { 'name': 'Agreement - Repair', 'summary': 'Link repair orders to an agreement', - 'version': '11.0.0.0.1', + 'version': '12.0.1.0.0', 'category': 'Contract', 'author': 'Open Source Integrators, ' 'Odoo Community Association (OCA)', 'website': 'https://github.com/OCA/contract', 'depends': [ - 'agreement', - 'mrp_repair', + 'agreement_serviceprofile', + 'repair', ], 'data': [ 'views/agreement_view.xml', diff --git a/agreement_repair/i18n/agreement_repair.pot b/agreement_repair/i18n/agreement_repair.pot index c0a706314..fe32d2596 100644 --- a/agreement_repair/i18n/agreement_repair.pot +++ b/agreement_repair/i18n/agreement_repair.pot @@ -4,7 +4,7 @@ # msgid "" msgstr "" -"Project-Id-Version: Odoo Server 11.0\n" +"Project-Id-Version: Odoo Server 12.0\n" "Report-Msgid-Bugs-To: \n" "Last-Translator: <>\n" "Language-Team: \n" @@ -14,28 +14,29 @@ msgstr "" "Plural-Forms: \n" #. module: agreement_repair -#: model:ir.model.fields,field_description:agreement_repair.field_agreement_repair_count +#: model:ir.model.fields,field_description:agreement_repair.field_agreement__repair_count msgid "# Repair Orders" msgstr "" #. module: agreement_repair -#: model:ir.ui.view,arch_db:agreement_repair.partner_agreement_form_view_repair +#: model_terms:ir.ui.view,arch_db:agreement_repair.partner_agreement_form_view_repair msgid "Repair Orders" msgstr "" #. module: agreement_repair -#: model:ir.model.fields,field_description:agreement_repair.field_mrp_repair_agreement_id -#: model:ir.ui.view,arch_db:agreement_repair.view_repair_order_form_agreement +#: model:ir.model,name:agreement_repair.model_agreement +#: model:ir.model.fields,field_description:agreement_repair.field_repair_order__agreement_id +#: model_terms:ir.ui.view,arch_db:agreement_repair.view_repair_order_form_agreement msgid "Agreement" msgstr "" #. module: agreement_repair -#: model:ir.actions.act_window,help:agreement_repair.action_mrp_repair_agreement_specific +#: model_terms:ir.actions.act_window,help:agreement_repair.action_mrp_repair_agreement_specific msgid "Create Repair Orders" msgstr "" #. module: agreement_repair -#: model:ir.model,name:agreement_repair.model_mrp_repair +#: model:ir.model,name:agreement_repair.model_repair_order msgid "Repair Order" msgstr "" @@ -45,13 +46,8 @@ msgid "Repair Orders" msgstr "" #. module: agreement_repair -#: model:ir.model.fields,field_description:agreement_repair.field_mrp_repair_serviceprofile_id -#: model:ir.ui.view,arch_db:agreement_repair.view_repair_order_form_filter_agreement +#: model:ir.model.fields,field_description:agreement_repair.field_repair_order__serviceprofile_id +#: model_terms:ir.ui.view,arch_db:agreement_repair.view_repair_order_form_filter_agreement msgid "Service Profile" msgstr "" -#. module: agreement_repair -#: model:ir.model,name:agreement_repair.model_agreement -msgid "agreement" -msgstr "" - diff --git a/agreement_repair/i18n/de.po b/agreement_repair/i18n/de.po index 846df71a9..c2e201157 100644 --- a/agreement_repair/i18n/de.po +++ b/agreement_repair/i18n/de.po @@ -1,6 +1,6 @@ # Translation of Odoo Server. # This file contains the translation of the following modules: -# * agreement_repair +# * agreement_repair # msgid "" msgstr "" @@ -17,28 +17,29 @@ msgstr "" "X-Generator: Weblate 3.3\n" #. module: agreement_repair -#: model:ir.model.fields,field_description:agreement_repair.field_agreement_repair_count +#: model:ir.model.fields,field_description:agreement_repair.field_agreement__repair_count msgid "# Repair Orders" msgstr "# Reparaturaufträge" #. module: agreement_repair -#: model:ir.ui.view,arch_db:agreement_repair.partner_agreement_form_view_repair +#: model_terms:ir.ui.view,arch_db:agreement_repair.partner_agreement_form_view_repair msgid "Repair Orders" msgstr "Reparaturaufträge" #. module: agreement_repair -#: model:ir.model.fields,field_description:agreement_repair.field_mrp_repair_agreement_id -#: model:ir.ui.view,arch_db:agreement_repair.view_repair_order_form_agreement +#: model:ir.model,name:agreement_repair.model_agreement +#: model:ir.model.fields,field_description:agreement_repair.field_repair_order__agreement_id +#: model_terms:ir.ui.view,arch_db:agreement_repair.view_repair_order_form_agreement msgid "Agreement" msgstr "Vereinbarung" #. module: agreement_repair -#: model:ir.actions.act_window,help:agreement_repair.action_mrp_repair_agreement_specific +#: model_terms:ir.actions.act_window,help:agreement_repair.action_mrp_repair_agreement_specific msgid "Create Repair Orders" msgstr "Reparaturaufträge anlegen" #. module: agreement_repair -#: model:ir.model,name:agreement_repair.model_mrp_repair +#: model:ir.model,name:agreement_repair.model_repair_order msgid "Repair Order" msgstr "Reparaturauftrag" @@ -48,12 +49,10 @@ msgid "Repair Orders" msgstr "Reparaturaufträge" #. module: agreement_repair -#: model:ir.model.fields,field_description:agreement_repair.field_mrp_repair_serviceprofile_id -#: model:ir.ui.view,arch_db:agreement_repair.view_repair_order_form_filter_agreement +#: model:ir.model.fields,field_description:agreement_repair.field_repair_order__serviceprofile_id +#: model_terms:ir.ui.view,arch_db:agreement_repair.view_repair_order_form_filter_agreement msgid "Service Profile" msgstr "Dienstleistungsprofil" -#. module: agreement_repair -#: model:ir.model,name:agreement_repair.model_agreement -msgid "agreement" -msgstr "Vereinbarung" +#~ msgid "agreement" +#~ msgstr "Vereinbarung" diff --git a/agreement_repair/models/agreement.py b/agreement_repair/models/agreement.py index f47a4492c..b05c85b60 100644 --- a/agreement_repair/models/agreement.py +++ b/agreement_repair/models/agreement.py @@ -12,10 +12,6 @@ class Agreement(models.Model): @api.multi def _compute_repair_count(self): - data = self.env['mrp.repair'].read_group( - [('agreement_id', 'in', self.ids)], - ['agreement_id'], ['agreement_id']) - count_data = dict((item['agreement_id'][0], - item['agreement_id_count']) for item in data) - for agreement in self: - agreement.repair_count = count_data.get(agreement.id, 0) + for ag_rec in self: + ag_rec.repair_count = self.env['repair.order'].search_count( + [('agreement_id', 'in', ag_rec.ids)]) diff --git a/agreement_repair/models/repair.py b/agreement_repair/models/repair.py index fa8feceab..ea77a91f5 100644 --- a/agreement_repair/models/repair.py +++ b/agreement_repair/models/repair.py @@ -4,8 +4,8 @@ from odoo import fields, models -class MRPRepair(models.Model): - _inherit = "mrp.repair" +class Repair(models.Model): + _inherit = "repair.order" agreement_id = fields.Many2one('agreement', 'Agreement') serviceprofile_id = fields.Many2one('agreement.serviceprofile', diff --git a/agreement_repair/readme/CONTRIBUTORS.rst b/agreement_repair/readme/CONTRIBUTORS.rst index a76235f8a..373b2a6a2 100644 --- a/agreement_repair/readme/CONTRIBUTORS.rst +++ b/agreement_repair/readme/CONTRIBUTORS.rst @@ -1 +1,2 @@ * Sandip Mangukiya +* Serpent Consulting Services Pvt. Ltd. diff --git a/agreement_repair/static/description/index.html b/agreement_repair/static/description/index.html index c4a06b39f..3bea51e98 100644 --- a/agreement_repair/static/description/index.html +++ b/agreement_repair/static/description/index.html @@ -3,7 +3,7 @@ - + Agreement - Repair