diff --git a/agreement_mrp/README.rst b/agreement_mrp/README.rst index e9bd57b97..6f393dc7f 100644 --- a/agreement_mrp/README.rst +++ b/agreement_mrp/README.rst @@ -14,13 +14,13 @@ Agreement - MRP :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_mrp + :target: https://github.com/OCA/contract/tree/12.0/agreement_mrp :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_mrp + :target: https://translation.odoo-community.org/projects/contract-12-0/contract-12-0-agreement_mrp :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_mrp/__manifest__.py b/agreement_mrp/__manifest__.py index 1dc9802e2..274920524 100644 --- a/agreement_mrp/__manifest__.py +++ b/agreement_mrp/__manifest__.py @@ -4,13 +4,13 @@ { 'name': 'Agreement - MRP', 'summary': 'Link manufacturing 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', + 'agreement_serviceprofile', 'mrp', ], 'data': [ diff --git a/agreement_mrp/i18n/agreement_mrp.pot b/agreement_mrp/i18n/agreement_mrp.pot index 900d656a9..d615901fb 100644 --- a/agreement_mrp/i18n/agreement_mrp.pot +++ b/agreement_mrp/i18n/agreement_mrp.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_mrp -#: model:ir.model.fields,field_description:agreement_mrp.field_agreement_mo_count +#: model:ir.model.fields,field_description:agreement_mrp.field_agreement__mo_count msgid "# MOs" msgstr "" #. module: agreement_mrp -#: model:ir.ui.view,arch_db:agreement_mrp.partner_agreement_form_view +#: model_terms:ir.ui.view,arch_db:agreement_mrp.partner_agreement_form_view msgid "MOs" msgstr "" #. module: agreement_mrp -#: model:ir.model.fields,field_description:agreement_mrp.field_mrp_production_agreement_id +#: model:ir.model,name:agreement_mrp.model_agreement +#: model:ir.model.fields,field_description:agreement_mrp.field_mrp_production__agreement_id msgid "Agreement" msgstr "" #. module: agreement_mrp -#: model:ir.actions.act_window,help:agreement_mrp.action_mrp_production_agreement_specific +#: model_terms:ir.actions.act_window,help:agreement_mrp.action_mrp_production_agreement_specific msgid "Create MOs" msgstr "" @@ -40,17 +41,12 @@ msgstr "" #. module: agreement_mrp #: model:ir.model,name:agreement_mrp.model_mrp_production -msgid "Manufacturing Order" +msgid "Production Order" msgstr "" #. module: agreement_mrp -#: model:ir.model.fields,field_description:agreement_mrp.field_mrp_production_serviceprofile_id -#: model:ir.ui.view,arch_db:agreement_mrp.view_mrp_production_filter_agreement +#: model:ir.model.fields,field_description:agreement_mrp.field_mrp_production__serviceprofile_id +#: model_terms:ir.ui.view,arch_db:agreement_mrp.view_mrp_production_filter_agreement msgid "Service Profile" msgstr "" -#. module: agreement_mrp -#: model:ir.model,name:agreement_mrp.model_agreement -msgid "agreement" -msgstr "" - diff --git a/agreement_mrp/i18n/de.po b/agreement_mrp/i18n/de.po index 3f9252c51..31770324a 100644 --- a/agreement_mrp/i18n/de.po +++ b/agreement_mrp/i18n/de.po @@ -1,12 +1,12 @@ # Translation of Odoo Server. # This file contains the translation of the following modules: -# * agreement_mrp +# * agreement_mrp # msgid "" msgstr "" "Project-Id-Version: Odoo Server 11.0\n" "Report-Msgid-Bugs-To: \n" -"PO-Revision-Date: 2019-01-11 17:41+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.3\n" +"X-Generator: Weblate 3.6.1\n" #. module: agreement_mrp -#: model:ir.model.fields,field_description:agreement_mrp.field_agreement_mo_count +#: model:ir.model.fields,field_description:agreement_mrp.field_agreement__mo_count msgid "# MOs" msgstr "# Fertigungsaufträge" #. module: agreement_mrp -#: model:ir.ui.view,arch_db:agreement_mrp.partner_agreement_form_view +#: model_terms:ir.ui.view,arch_db:agreement_mrp.partner_agreement_form_view msgid "MOs" msgstr "Fertigungsaufträge" #. module: agreement_mrp -#: model:ir.model.fields,field_description:agreement_mrp.field_mrp_production_agreement_id +#: model:ir.model,name:agreement_mrp.model_agreement +#: model:ir.model.fields,field_description:agreement_mrp.field_mrp_production__agreement_id msgid "Agreement" msgstr "Vereinbarung" #. module: agreement_mrp -#: model:ir.actions.act_window,help:agreement_mrp.action_mrp_production_agreement_specific +#: model_terms:ir.actions.act_window,help:agreement_mrp.action_mrp_production_agreement_specific msgid "Create MOs" msgstr "Fertigungsaufträge anlegen" @@ -43,16 +44,14 @@ msgstr "Fertigungsaufträge" #. module: agreement_mrp #: model:ir.model,name:agreement_mrp.model_mrp_production -msgid "Manufacturing Order" +msgid "Production Order" msgstr "Fertigungsauftrag" #. module: agreement_mrp -#: model:ir.model.fields,field_description:agreement_mrp.field_mrp_production_serviceprofile_id -#: model:ir.ui.view,arch_db:agreement_mrp.view_mrp_production_filter_agreement +#: model:ir.model.fields,field_description:agreement_mrp.field_mrp_production__serviceprofile_id +#: model_terms:ir.ui.view,arch_db:agreement_mrp.view_mrp_production_filter_agreement msgid "Service Profile" msgstr "Dienstleistungsprofil" -#. module: agreement_mrp -#: model:ir.model,name:agreement_mrp.model_agreement -msgid "agreement" -msgstr "Vereinbarung" +#~ msgid "agreement" +#~ msgstr "Vereinbarung" diff --git a/agreement_mrp/i18n/es.po b/agreement_mrp/i18n/es.po new file mode 100644 index 000000000..863832d0f --- /dev/null +++ b/agreement_mrp/i18n/es.po @@ -0,0 +1,52 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * agreement_mrp +# +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 12.0\n" +"Report-Msgid-Bugs-To: \n" +"Last-Translator: Automatically generated\n" +"Language-Team: none\n" +"Language: es\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" + +#. module: agreement_mrp +#: model:ir.model.fields,field_description:agreement_mrp.field_agreement__mo_count +msgid "# MOs" +msgstr "" + +#. module: agreement_mrp +#: model_terms:ir.ui.view,arch_db:agreement_mrp.partner_agreement_form_view +msgid "MOs" +msgstr "" + +#. module: agreement_mrp +#: model:ir.model,name:agreement_mrp.model_agreement +#: model:ir.model.fields,field_description:agreement_mrp.field_mrp_production__agreement_id +msgid "Agreement" +msgstr "" + +#. module: agreement_mrp +#: model_terms:ir.actions.act_window,help:agreement_mrp.action_mrp_production_agreement_specific +msgid "Create MOs" +msgstr "" + +#. module: agreement_mrp +#: model:ir.actions.act_window,name:agreement_mrp.action_mrp_production_agreement_specific +msgid "Manufacture Orders" +msgstr "" + +#. module: agreement_mrp +#: model:ir.model,name:agreement_mrp.model_mrp_production +msgid "Production Order" +msgstr "" + +#. module: agreement_mrp +#: model:ir.model.fields,field_description:agreement_mrp.field_mrp_production__serviceprofile_id +#: model_terms:ir.ui.view,arch_db:agreement_mrp.view_mrp_production_filter_agreement +msgid "Service Profile" +msgstr "" diff --git a/agreement_mrp/i18n/fr.po b/agreement_mrp/i18n/fr.po new file mode 100644 index 000000000..c3fecf54c --- /dev/null +++ b/agreement_mrp/i18n/fr.po @@ -0,0 +1,52 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * agreement_mrp +# +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 12.0\n" +"Report-Msgid-Bugs-To: \n" +"Last-Translator: Automatically generated\n" +"Language-Team: none\n" +"Language: fr\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Plural-Forms: nplurals=2; plural=n > 1;\n" + +#. module: agreement_mrp +#: model:ir.model.fields,field_description:agreement_mrp.field_agreement__mo_count +msgid "# MOs" +msgstr "" + +#. module: agreement_mrp +#: model_terms:ir.ui.view,arch_db:agreement_mrp.partner_agreement_form_view +msgid "MOs" +msgstr "" + +#. module: agreement_mrp +#: model:ir.model,name:agreement_mrp.model_agreement +#: model:ir.model.fields,field_description:agreement_mrp.field_mrp_production__agreement_id +msgid "Agreement" +msgstr "" + +#. module: agreement_mrp +#: model_terms:ir.actions.act_window,help:agreement_mrp.action_mrp_production_agreement_specific +msgid "Create MOs" +msgstr "" + +#. module: agreement_mrp +#: model:ir.actions.act_window,name:agreement_mrp.action_mrp_production_agreement_specific +msgid "Manufacture Orders" +msgstr "" + +#. module: agreement_mrp +#: model:ir.model,name:agreement_mrp.model_mrp_production +msgid "Production Order" +msgstr "" + +#. module: agreement_mrp +#: model:ir.model.fields,field_description:agreement_mrp.field_mrp_production__serviceprofile_id +#: model_terms:ir.ui.view,arch_db:agreement_mrp.view_mrp_production_filter_agreement +msgid "Service Profile" +msgstr "" diff --git a/agreement_mrp/i18n/it.po b/agreement_mrp/i18n/it.po new file mode 100644 index 000000000..be1a6dac4 --- /dev/null +++ b/agreement_mrp/i18n/it.po @@ -0,0 +1,52 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * agreement_mrp +# +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 12.0\n" +"Report-Msgid-Bugs-To: \n" +"Last-Translator: Automatically generated\n" +"Language-Team: none\n" +"Language: it\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" + +#. module: agreement_mrp +#: model:ir.model.fields,field_description:agreement_mrp.field_agreement__mo_count +msgid "# MOs" +msgstr "" + +#. module: agreement_mrp +#: model_terms:ir.ui.view,arch_db:agreement_mrp.partner_agreement_form_view +msgid "MOs" +msgstr "" + +#. module: agreement_mrp +#: model:ir.model,name:agreement_mrp.model_agreement +#: model:ir.model.fields,field_description:agreement_mrp.field_mrp_production__agreement_id +msgid "Agreement" +msgstr "" + +#. module: agreement_mrp +#: model_terms:ir.actions.act_window,help:agreement_mrp.action_mrp_production_agreement_specific +msgid "Create MOs" +msgstr "" + +#. module: agreement_mrp +#: model:ir.actions.act_window,name:agreement_mrp.action_mrp_production_agreement_specific +msgid "Manufacture Orders" +msgstr "" + +#. module: agreement_mrp +#: model:ir.model,name:agreement_mrp.model_mrp_production +msgid "Production Order" +msgstr "" + +#. module: agreement_mrp +#: model:ir.model.fields,field_description:agreement_mrp.field_mrp_production__serviceprofile_id +#: model_terms:ir.ui.view,arch_db:agreement_mrp.view_mrp_production_filter_agreement +msgid "Service Profile" +msgstr "" diff --git a/agreement_mrp/i18n/pt_BR.po b/agreement_mrp/i18n/pt_BR.po new file mode 100644 index 000000000..16f2e4368 --- /dev/null +++ b/agreement_mrp/i18n/pt_BR.po @@ -0,0 +1,54 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * agreement_mrp +# +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 12.0\n" +"Report-Msgid-Bugs-To: \n" +"PO-Revision-Date: 2020-02-12 05:03+0000\n" +"Last-Translator: Marcel Savegnago \n" +"Language-Team: none\n" +"Language: pt_BR\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Plural-Forms: nplurals=2; plural=n > 1;\n" +"X-Generator: Weblate 3.10\n" + +#. module: agreement_mrp +#: model:ir.model.fields,field_description:agreement_mrp.field_agreement__mo_count +msgid "# MOs" +msgstr "# OPs" + +#. module: agreement_mrp +#: model_terms:ir.ui.view,arch_db:agreement_mrp.partner_agreement_form_view +msgid "MOs" +msgstr "OPs" + +#. module: agreement_mrp +#: model:ir.model,name:agreement_mrp.model_agreement +#: model:ir.model.fields,field_description:agreement_mrp.field_mrp_production__agreement_id +msgid "Agreement" +msgstr "Acordo" + +#. module: agreement_mrp +#: model_terms:ir.actions.act_window,help:agreement_mrp.action_mrp_production_agreement_specific +msgid "Create MOs" +msgstr "Criar OPs" + +#. module: agreement_mrp +#: model:ir.actions.act_window,name:agreement_mrp.action_mrp_production_agreement_specific +msgid "Manufacture Orders" +msgstr "Ordens de Fabricação" + +#. module: agreement_mrp +#: model:ir.model,name:agreement_mrp.model_mrp_production +msgid "Production Order" +msgstr "Ordem de Produção" + +#. module: agreement_mrp +#: model:ir.model.fields,field_description:agreement_mrp.field_mrp_production__serviceprofile_id +#: model_terms:ir.ui.view,arch_db:agreement_mrp.view_mrp_production_filter_agreement +msgid "Service Profile" +msgstr "Perfil de Serviço" diff --git a/agreement_mrp/i18n/zh_CN.po b/agreement_mrp/i18n/zh_CN.po new file mode 100644 index 000000000..ede40ebe9 --- /dev/null +++ b/agreement_mrp/i18n/zh_CN.po @@ -0,0 +1,54 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * agreement_mrp +# +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 12.0\n" +"Report-Msgid-Bugs-To: \n" +"PO-Revision-Date: 2019-09-04 18:23+0000\n" +"Last-Translator: 黎伟杰 <674416404@qq.com>\n" +"Language-Team: none\n" +"Language: zh_CN\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Plural-Forms: nplurals=1; plural=0;\n" +"X-Generator: Weblate 3.8\n" + +#. module: agreement_mrp +#: model:ir.model.fields,field_description:agreement_mrp.field_agreement__mo_count +msgid "# MOs" +msgstr "# 制造订单" + +#. module: agreement_mrp +#: model_terms:ir.ui.view,arch_db:agreement_mrp.partner_agreement_form_view +msgid "MOs" +msgstr "制造订单" + +#. module: agreement_mrp +#: model:ir.model,name:agreement_mrp.model_agreement +#: model:ir.model.fields,field_description:agreement_mrp.field_mrp_production__agreement_id +msgid "Agreement" +msgstr "协议" + +#. module: agreement_mrp +#: model_terms:ir.actions.act_window,help:agreement_mrp.action_mrp_production_agreement_specific +msgid "Create MOs" +msgstr "创建制造订单" + +#. module: agreement_mrp +#: model:ir.actions.act_window,name:agreement_mrp.action_mrp_production_agreement_specific +msgid "Manufacture Orders" +msgstr "制造订单" + +#. module: agreement_mrp +#: model:ir.model,name:agreement_mrp.model_mrp_production +msgid "Production Order" +msgstr "生产单" + +#. module: agreement_mrp +#: model:ir.model.fields,field_description:agreement_mrp.field_mrp_production__serviceprofile_id +#: model_terms:ir.ui.view,arch_db:agreement_mrp.view_mrp_production_filter_agreement +msgid "Service Profile" +msgstr "服务资料" diff --git a/agreement_mrp/models/agreement.py b/agreement_mrp/models/agreement.py index 09425d2bf..3e41c9606 100644 --- a/agreement_mrp/models/agreement.py +++ b/agreement_mrp/models/agreement.py @@ -11,10 +11,6 @@ class Agreement(models.Model): @api.multi def _compute_mo_count(self): - data = self.env['mrp.production'].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.mo_count = count_data.get(agreement.id, 0) + for ag_rec in self: + ag_rec.mo_count = self.env['mrp.production'].search_count( + [('agreement_id', 'in', ag_rec.ids)]) diff --git a/agreement_mrp/readme/CONTRIBUTORS.rst b/agreement_mrp/readme/CONTRIBUTORS.rst index a76235f8a..373b2a6a2 100644 --- a/agreement_mrp/readme/CONTRIBUTORS.rst +++ b/agreement_mrp/readme/CONTRIBUTORS.rst @@ -1 +1,2 @@ * Sandip Mangukiya +* Serpent Consulting Services Pvt. Ltd. diff --git a/agreement_mrp/static/description/index.html b/agreement_mrp/static/description/index.html index b57ce74f8..d7b0e60ec 100644 --- a/agreement_mrp/static/description/index.html +++ b/agreement_mrp/static/description/index.html @@ -3,7 +3,7 @@ - + Agreement - MRP