diff --git a/agreement_maintenance/README.rst b/agreement_maintenance/README.rst index 482cc501b..c835ca1e0 100644 --- a/agreement_maintenance/README.rst +++ b/agreement_maintenance/README.rst @@ -14,13 +14,13 @@ Maintenance Agreements :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_maintenance + :target: https://github.com/OCA/contract/tree/12.0/agreement_maintenance :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_maintenance + :target: https://translation.odoo-community.org/projects/contract-12-0/contract-12-0-agreement_maintenance :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| @@ -62,7 +62,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. @@ -82,6 +82,7 @@ Contributors * Bhavesh Odedra * Wolfgang Hall * Maxime Chambreuil +* Serpent Consulting Services Pvt. Ltd. Other credits ~~~~~~~~~~~~~ @@ -112,6 +113,6 @@ Current `maintainer `__: |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_maintenance/__manifest__.py b/agreement_maintenance/__manifest__.py index 3fef7447b..b62ede729 100644 --- a/agreement_maintenance/__manifest__.py +++ b/agreement_maintenance/__manifest__.py @@ -10,10 +10,10 @@ 'website': 'https://github.com/OCA/contract', 'category': 'Maintenance', 'license': 'AGPL-3', - 'version': '11.0.0.0.1', + 'version': '12.0.1.0.0', 'depends': [ - 'agreement', 'maintenance', + 'agreement_serviceprofile', ], 'data': [ 'views/agreement_view.xml', diff --git a/agreement_maintenance/i18n/agreement_maintenance.pot b/agreement_maintenance/i18n/agreement_maintenance.pot index dd5d89856..474b9e3c2 100644 --- a/agreement_maintenance/i18n/agreement_maintenance.pot +++ b/agreement_maintenance/i18n/agreement_maintenance.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,22 +14,23 @@ msgstr "" "Plural-Forms: \n" #. module: agreement_maintenance -#: model:ir.model.fields,field_description:agreement_maintenance.field_agreement_mr_count +#: model:ir.model.fields,field_description:agreement_maintenance.field_agreement__mr_count msgid "# Maintenance Requests" msgstr "" #. module: agreement_maintenance -#: model:ir.ui.view,arch_db:agreement_maintenance.partner_agreement_form_view +#: model_terms:ir.ui.view,arch_db:agreement_maintenance.partner_agreement_form_view msgid "Maintenance Requests" msgstr "" #. module: agreement_maintenance -#: model:ir.model.fields,field_description:agreement_maintenance.field_maintenance_request_agreement_id +#: model:ir.model,name:agreement_maintenance.model_agreement +#: model:ir.model.fields,field_description:agreement_maintenance.field_maintenance_request__agreement_id msgid "Agreement" msgstr "" #. module: agreement_maintenance -#: model:ir.actions.act_window,help:agreement_maintenance.action_maintenance_request_agreement_specific +#: model_terms:ir.actions.act_window,help:agreement_maintenance.action_maintenance_request_agreement_specific msgid "Create Maintenance Requests" msgstr "" @@ -40,17 +41,12 @@ msgstr "" #. module: agreement_maintenance #: model:ir.model,name:agreement_maintenance.model_maintenance_request -msgid "Maintenance Requests" +msgid "Maintenance Request" msgstr "" #. module: agreement_maintenance -#: model:ir.model.fields,field_description:agreement_maintenance.field_maintenance_request_serviceprofile_id -#: model:ir.ui.view,arch_db:agreement_maintenance.view_maintenance_request_filter_agreement +#: model:ir.model.fields,field_description:agreement_maintenance.field_maintenance_request__serviceprofile_id +#: model_terms:ir.ui.view,arch_db:agreement_maintenance.view_maintenance_request_filter_agreement msgid "Service Profile" msgstr "" -#. module: agreement_maintenance -#: model:ir.model,name:agreement_maintenance.model_agreement -msgid "agreement" -msgstr "" - diff --git a/agreement_maintenance/i18n/de.po b/agreement_maintenance/i18n/de.po index 8b45c7560..634ee15f3 100644 --- a/agreement_maintenance/i18n/de.po +++ b/agreement_maintenance/i18n/de.po @@ -1,12 +1,12 @@ # Translation of Odoo Server. # This file contains the translation of the following modules: -# * agreement_maintenance +# * agreement_maintenance # msgid "" msgstr "" "Project-Id-Version: Odoo Server 11.0\n" "Report-Msgid-Bugs-To: \n" -"PO-Revision-Date: 2019-02-22 14:50+0000\n" +"PO-Revision-Date: 2019-06-28 13:42+0000\n" "Last-Translator: Maria Sparenberg \n" "Language-Team: none\n" "Language: de\n" @@ -14,25 +14,26 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Generator: Weblate 3.4\n" +"X-Generator: Weblate 3.6.1\n" #. module: agreement_maintenance -#: model:ir.model.fields,field_description:agreement_maintenance.field_agreement_mr_count +#: model:ir.model.fields,field_description:agreement_maintenance.field_agreement__mr_count msgid "# Maintenance Requests" msgstr "# Wartungsanfragen" #. module: agreement_maintenance -#: model:ir.ui.view,arch_db:agreement_maintenance.partner_agreement_form_view +#: model_terms:ir.ui.view,arch_db:agreement_maintenance.partner_agreement_form_view msgid "Maintenance Requests" msgstr "Wartungsanfragen" #. module: agreement_maintenance -#: model:ir.model.fields,field_description:agreement_maintenance.field_maintenance_request_agreement_id +#: model:ir.model,name:agreement_maintenance.model_agreement +#: model:ir.model.fields,field_description:agreement_maintenance.field_maintenance_request__agreement_id msgid "Agreement" msgstr "Vereinbarung" #. module: agreement_maintenance -#: model:ir.actions.act_window,help:agreement_maintenance.action_maintenance_request_agreement_specific +#: model_terms:ir.actions.act_window,help:agreement_maintenance.action_maintenance_request_agreement_specific msgid "Create Maintenance Requests" msgstr "Wartungsanfrage erzeugen" @@ -43,16 +44,14 @@ msgstr "Wartungsanfragen" #. module: agreement_maintenance #: model:ir.model,name:agreement_maintenance.model_maintenance_request -msgid "Maintenance Requests" -msgstr "Wartungsanfragen" +msgid "Maintenance Request" +msgstr "Wartungsanfrage" #. module: agreement_maintenance -#: model:ir.model.fields,field_description:agreement_maintenance.field_maintenance_request_serviceprofile_id -#: model:ir.ui.view,arch_db:agreement_maintenance.view_maintenance_request_filter_agreement +#: model:ir.model.fields,field_description:agreement_maintenance.field_maintenance_request__serviceprofile_id +#: model_terms:ir.ui.view,arch_db:agreement_maintenance.view_maintenance_request_filter_agreement msgid "Service Profile" msgstr "Dienstleistungsprofil" -#. module: agreement_maintenance -#: model:ir.model,name:agreement_maintenance.model_agreement -msgid "agreement" -msgstr "Vereinbarung" +#~ msgid "agreement" +#~ msgstr "Vereinbarung" diff --git a/agreement_maintenance/models/agreement.py b/agreement_maintenance/models/agreement.py index 5d7ea34da..c5d9458b0 100644 --- a/agreement_maintenance/models/agreement.py +++ b/agreement_maintenance/models/agreement.py @@ -12,10 +12,6 @@ class Agreement(models.Model): @api.multi def _compute_mr_count(self): - data = self.env['maintenance.request'].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.mr_count = count_data.get(agreement.id, 0) + for ag_rec in self: + ag_rec.mr_count = self.env['maintenance.request'].search_count( + [('agreement_id', 'in', ag_rec.ids)]) diff --git a/agreement_maintenance/readme/CONTRIBUTORS.rst b/agreement_maintenance/readme/CONTRIBUTORS.rst index 4e2eb061a..fd055b017 100644 --- a/agreement_maintenance/readme/CONTRIBUTORS.rst +++ b/agreement_maintenance/readme/CONTRIBUTORS.rst @@ -2,3 +2,4 @@ * Bhavesh Odedra * Wolfgang Hall * Maxime Chambreuil +* Serpent Consulting Services Pvt. Ltd. diff --git a/agreement_maintenance/static/description/index.html b/agreement_maintenance/static/description/index.html index f50477983..895ceb4ec 100644 --- a/agreement_maintenance/static/description/index.html +++ b/agreement_maintenance/static/description/index.html @@ -3,7 +3,7 @@ - + Maintenance Agreements