From be572ce013ba6d92a66c136c0f44a48e45c0f725 Mon Sep 17 00:00:00 2001 From: Maxime Chambreuil Date: Sat, 31 Aug 2019 14:47:09 -0500 Subject: [PATCH] [IMP] agreement_serviceprofile --- agreement_serviceprofile/README.rst | 25 ++- agreement_serviceprofile/__init__.py | 3 + agreement_serviceprofile/__manifest__.py | 6 +- .../data/serviceprofile_stage.xml | 4 +- .../i18n/agreement_serviceprofile.pot | 20 ++- agreement_serviceprofile/i18n/en_US.po | 20 ++- agreement_serviceprofile/i18n/fr.po | 25 ++- agreement_serviceprofile/i18n/zh_CN.po | 144 ++++++++++++++++++ .../models/agreement_serviceprofile.py | 7 +- .../readme/CONTRIBUTORS.rst | 25 ++- .../static/description/index.html | 14 +- agreement_serviceprofile/views/agreement.xml | 15 +- .../views/agreement_serviceprofile.xml | 6 +- 13 files changed, 284 insertions(+), 30 deletions(-) create mode 100644 agreement_serviceprofile/i18n/zh_CN.po diff --git a/agreement_serviceprofile/README.rst b/agreement_serviceprofile/README.rst index 9d5884874..f623ce5ee 100644 --- a/agreement_serviceprofile/README.rst +++ b/agreement_serviceprofile/README.rst @@ -58,13 +58,24 @@ Authors Contributors ~~~~~~~~~~~~ -* Patrick Wilson -* Bhavesh Odedra -* Wolfgang Hall -* Maxime Chambreuil -* Sandip Mangukiya -* Serpent Consulting Services Pvt. Ltd. -* Brian McMaster +* `Pavlov Media `_: + + * Patrick Wilson + +* `Open Source Integrators `_: + + * Bhavesh Odedra + * Wolfgang Hall + * Maxime Chambreuil + * Sandip Mangukiya + +* `Serpent Consulting Services Pvt. Ltd. `_: + + * Murtuza Saleh + +* `Mc Master Lawn and Pest Services `_: + + * Brian McMaster Maintainers ~~~~~~~~~~~ diff --git a/agreement_serviceprofile/__init__.py b/agreement_serviceprofile/__init__.py index 0650744f6..83c9c2d42 100644 --- a/agreement_serviceprofile/__init__.py +++ b/agreement_serviceprofile/__init__.py @@ -1 +1,4 @@ +# Copyright (C) 2018 Pavlov Media +# Copyright (C) 2019 Open Source Integrators +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). from . import models diff --git a/agreement_serviceprofile/__manifest__.py b/agreement_serviceprofile/__manifest__.py index 4e104fd55..7813d2374 100644 --- a/agreement_serviceprofile/__manifest__.py +++ b/agreement_serviceprofile/__manifest__.py @@ -1,10 +1,10 @@ -# Copyright (C) 2018 - TODAY, Pavlov Media +# Copyright (C) 2018 Pavlov Media +# Copyright (C) 2019 Open Source Integrators # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). - { 'name': 'Agreement Service Profile', 'summary': "Adds an Agreement Service Profile object", - 'version': '12.0.1.0.0', + 'version': '12.0.1.1.0', 'category': 'Contract', 'author': 'Pavlov Media, ' 'Open Source Integrators, ' diff --git a/agreement_serviceprofile/data/serviceprofile_stage.xml b/agreement_serviceprofile/data/serviceprofile_stage.xml index 584c47e5d..7ee477635 100644 --- a/agreement_serviceprofile/data/serviceprofile_stage.xml +++ b/agreement_serviceprofile/data/serviceprofile_stage.xml @@ -1,4 +1,6 @@ - + diff --git a/agreement_serviceprofile/i18n/agreement_serviceprofile.pot b/agreement_serviceprofile/i18n/agreement_serviceprofile.pot index 8f61bafbc..a8b5b3308 100644 --- a/agreement_serviceprofile/i18n/agreement_serviceprofile.pot +++ b/agreement_serviceprofile/i18n/agreement_serviceprofile.pot @@ -20,7 +20,7 @@ msgstr "" #. module: agreement_serviceprofile #: model_terms:ir.ui.view,arch_db:agreement_serviceprofile.agreement_fsm_order_form_view -msgid "Add Notes Here..." +msgid "Add notes here..." msgstr "" #. module: agreement_serviceprofile @@ -88,13 +88,24 @@ msgstr "" #. module: agreement_serviceprofile #: model:ir.model.fields,field_description:agreement_serviceprofile.field_agreement_serviceprofile__notes +#: model_terms:ir.ui.view,arch_db:agreement_serviceprofile.agreement_fsm_order_form_view #: model_terms:ir.ui.view,arch_db:agreement_serviceprofile.agreement_serviceprofile_form msgid "Notes" msgstr "" +#. module: agreement_serviceprofile +#: model:ir.model.fields,field_description:agreement_serviceprofile.field_agreement_serviceprofile__partner_id +msgid "Partner" +msgstr "" + +#. module: agreement_serviceprofile +#: model_terms:ir.ui.view,arch_db:agreement_serviceprofile.agreement_serviceprofile_search +msgid "Product" +msgstr "" + #. module: agreement_serviceprofile #: model:ir.model.fields,field_description:agreement_serviceprofile.field_agreement_serviceprofile__product_id -msgid "Service" +msgid "Service Product" msgstr "" #. module: agreement_serviceprofile @@ -119,6 +130,11 @@ msgstr "" msgid "Stage" msgstr "" +#. module: agreement_serviceprofile +#: model:ir.model.fields,help:agreement_serviceprofile.field_agreement_serviceprofile__partner_id +msgid "The customer or vendor this agreement is related to." +msgstr "" + #. module: agreement_serviceprofile #: model:ir.model.fields,field_description:agreement_serviceprofile.field_agreement_stage__stage_type msgid "Type" diff --git a/agreement_serviceprofile/i18n/en_US.po b/agreement_serviceprofile/i18n/en_US.po index 2eb7c2828..b723dc8ab 100644 --- a/agreement_serviceprofile/i18n/en_US.po +++ b/agreement_serviceprofile/i18n/en_US.po @@ -23,7 +23,7 @@ msgstr "" #. module: agreement_serviceprofile #: model_terms:ir.ui.view,arch_db:agreement_serviceprofile.agreement_fsm_order_form_view -msgid "Add Notes Here..." +msgid "Add notes here..." msgstr "" #. module: agreement_serviceprofile @@ -93,13 +93,24 @@ msgstr "" #. module: agreement_serviceprofile #: model:ir.model.fields,field_description:agreement_serviceprofile.field_agreement_serviceprofile__notes +#: model_terms:ir.ui.view,arch_db:agreement_serviceprofile.agreement_fsm_order_form_view #: model_terms:ir.ui.view,arch_db:agreement_serviceprofile.agreement_serviceprofile_form msgid "Notes" msgstr "" +#. module: agreement_serviceprofile +#: model:ir.model.fields,field_description:agreement_serviceprofile.field_agreement_serviceprofile__partner_id +msgid "Partner" +msgstr "" + +#. module: agreement_serviceprofile +#: model_terms:ir.ui.view,arch_db:agreement_serviceprofile.agreement_serviceprofile_search +msgid "Product" +msgstr "" + #. module: agreement_serviceprofile #: model:ir.model.fields,field_description:agreement_serviceprofile.field_agreement_serviceprofile__product_id -msgid "Service" +msgid "Service Product" msgstr "" #. module: agreement_serviceprofile @@ -124,6 +135,11 @@ msgstr "" msgid "Stage" msgstr "" +#. module: agreement_serviceprofile +#: model:ir.model.fields,help:agreement_serviceprofile.field_agreement_serviceprofile__partner_id +msgid "The customer or vendor this agreement is related to." +msgstr "" + #. module: agreement_serviceprofile #: model:ir.model.fields,field_description:agreement_serviceprofile.field_agreement_stage__stage_type msgid "Type" diff --git a/agreement_serviceprofile/i18n/fr.po b/agreement_serviceprofile/i18n/fr.po index 91d6f7d28..17f29c268 100644 --- a/agreement_serviceprofile/i18n/fr.po +++ b/agreement_serviceprofile/i18n/fr.po @@ -23,7 +23,7 @@ msgstr "Actif" #. module: agreement_serviceprofile #: model_terms:ir.ui.view,arch_db:agreement_serviceprofile.agreement_fsm_order_form_view -msgid "Add Notes Here..." +msgid "Add notes here..." msgstr "" #. module: agreement_serviceprofile @@ -97,15 +97,26 @@ msgstr "Nom" #. module: agreement_serviceprofile #: model:ir.model.fields,field_description:agreement_serviceprofile.field_agreement_serviceprofile__notes +#: model_terms:ir.ui.view,arch_db:agreement_serviceprofile.agreement_fsm_order_form_view #: model_terms:ir.ui.view,arch_db:agreement_serviceprofile.agreement_serviceprofile_form msgid "Notes" msgstr "" +#. module: agreement_serviceprofile +#: model:ir.model.fields,field_description:agreement_serviceprofile.field_agreement_serviceprofile__partner_id +msgid "Partner" +msgstr "" + +#. module: agreement_serviceprofile +#: model_terms:ir.ui.view,arch_db:agreement_serviceprofile.agreement_serviceprofile_search +msgid "Product" +msgstr "" + #. module: agreement_serviceprofile #: model:ir.model.fields,field_description:agreement_serviceprofile.field_agreement_serviceprofile__product_id #, fuzzy #| msgid "Service Profile" -msgid "Service" +msgid "Service Product" msgstr "Profil de service" #. module: agreement_serviceprofile @@ -130,7 +141,17 @@ msgstr "Profils de service" msgid "Stage" msgstr "" +#. module: agreement_serviceprofile +#: model:ir.model.fields,help:agreement_serviceprofile.field_agreement_serviceprofile__partner_id +msgid "The customer or vendor this agreement is related to." +msgstr "" + #. module: agreement_serviceprofile #: model:ir.model.fields,field_description:agreement_serviceprofile.field_agreement_stage__stage_type msgid "Type" msgstr "" + +#, fuzzy +#~| msgid "Service Profile" +#~ msgid "Service" +#~ msgstr "Profil de service" diff --git a/agreement_serviceprofile/i18n/zh_CN.po b/agreement_serviceprofile/i18n/zh_CN.po new file mode 100644 index 000000000..4c45a777e --- /dev/null +++ b/agreement_serviceprofile/i18n/zh_CN.po @@ -0,0 +1,144 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * agreement_serviceprofile +# +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_serviceprofile +#: model:ir.model.fields,field_description:agreement_serviceprofile.field_agreement_serviceprofile__active +msgid "Active" +msgstr "有效" + +#. module: agreement_serviceprofile +#: model_terms:ir.ui.view,arch_db:agreement_serviceprofile.agreement_fsm_order_form_view +msgid "Add notes here..." +msgstr "在这里添加备注..." + +#. module: agreement_serviceprofile +#: selection:agreement.stage,stage_type:0 +#: model:ir.model,name:agreement_serviceprofile.model_agreement +#: model:ir.model.fields,field_description:agreement_serviceprofile.field_agreement_serviceprofile__agreement_id +#: model_terms:ir.ui.view,arch_db:agreement_serviceprofile.agreement_serviceprofile_search +msgid "Agreement" +msgstr "协议" + +#. module: agreement_serviceprofile +#: model:ir.model,name:agreement_serviceprofile.model_agreement_serviceprofile +msgid "Agreement Service Profiles" +msgstr "协议服务配置文件" + +#. module: agreement_serviceprofile +#: model:ir.model,name:agreement_serviceprofile.model_agreement_stage +msgid "Agreement Stages" +msgstr "协议阶段" + +#. module: agreement_serviceprofile +#: model:ir.model.fields,field_description:agreement_serviceprofile.field_agreement_serviceprofile__create_uid +msgid "Created by" +msgstr "创建者" + +#. module: agreement_serviceprofile +#: model:ir.model.fields,field_description:agreement_serviceprofile.field_agreement_serviceprofile__create_date +msgid "Created on" +msgstr "创建时间" + +#. module: agreement_serviceprofile +#: model:ir.model.fields,field_description:agreement_serviceprofile.field_agreement_serviceprofile__display_name +msgid "Display Name" +msgstr "显示名称" + +#. module: agreement_serviceprofile +#: model:ir.model.fields,field_description:agreement_serviceprofile.field_agreement_serviceprofile__id +msgid "ID" +msgstr "ID" + +#. module: agreement_serviceprofile +#: model:ir.model.fields,help:agreement_serviceprofile.field_agreement_serviceprofile__active +msgid "If unchecked, it will allow you to hide this service profile without removing it." +msgstr "如果未选中，则允许您隐藏此服务配置文件而不删除它。" + +#. module: agreement_serviceprofile +#: model:ir.model.fields,field_description:agreement_serviceprofile.field_agreement_serviceprofile____last_update +msgid "Last Modified on" +msgstr "最后修改时间" + +#. module: agreement_serviceprofile +#: model:ir.model.fields,field_description:agreement_serviceprofile.field_agreement_serviceprofile__write_uid +msgid "Last Updated by" +msgstr "最后更新者" + +#. module: agreement_serviceprofile +#: model:ir.model.fields,field_description:agreement_serviceprofile.field_agreement_serviceprofile__write_date +msgid "Last Updated on" +msgstr "最后更新时间" + +#. module: agreement_serviceprofile +#: model:ir.model.fields,field_description:agreement_serviceprofile.field_agreement_serviceprofile__name +msgid "Name" +msgstr "名称" + +#. module: agreement_serviceprofile +#: model:ir.model.fields,field_description:agreement_serviceprofile.field_agreement_serviceprofile__notes +#: model_terms:ir.ui.view,arch_db:agreement_serviceprofile.agreement_fsm_order_form_view +#: model_terms:ir.ui.view,arch_db:agreement_serviceprofile.agreement_serviceprofile_form +msgid "Notes" +msgstr "备注" + +#. module: agreement_serviceprofile +#: model:ir.model.fields,field_description:agreement_serviceprofile.field_agreement_serviceprofile__partner_id +msgid "Partner" +msgstr "业务伙伴" + +#. module: agreement_serviceprofile +#: model_terms:ir.ui.view,arch_db:agreement_serviceprofile.agreement_serviceprofile_search +msgid "Product" +msgstr "产品" + +#. module: agreement_serviceprofile +#: model:ir.model.fields,field_description:agreement_serviceprofile.field_agreement_serviceprofile__product_id +msgid "Service Product" +msgstr "服务产品" + +#. module: agreement_serviceprofile +#: selection:agreement.stage,stage_type:0 +#: model_terms:ir.ui.view,arch_db:agreement_serviceprofile.agreement_serviceprofile_form +msgid "Service Profile" +msgstr "服务资料" + +#. module: agreement_serviceprofile +#: model:ir.actions.act_window,name:agreement_serviceprofile.agreement_serviceprofile_action +#: model:ir.actions.act_window,name:agreement_serviceprofile.agreement_serviceprofile_dashboard +#: model:ir.model.fields,field_description:agreement_serviceprofile.field_agreement__serviceprofile_ids +#: model:ir.ui.menu,name:agreement_serviceprofile.agreement_serviceprofiles +#: model:ir.ui.menu,name:agreement_serviceprofile.dashboard_serviceprofiles +#: model_terms:ir.ui.view,arch_db:agreement_serviceprofile.agreement_fsm_order_form_view +#: model_terms:ir.ui.view,arch_db:agreement_serviceprofile.agreement_serviceprofile_tree +msgid "Service Profiles" +msgstr "服务资料" + +#. module: agreement_serviceprofile +#: model:ir.model.fields,field_description:agreement_serviceprofile.field_agreement_serviceprofile__stage_id +msgid "Stage" +msgstr "阶段" + +#. module: agreement_serviceprofile +#: model:ir.model.fields,help:agreement_serviceprofile.field_agreement_serviceprofile__partner_id +msgid "The customer or vendor this agreement is related to." +msgstr "与本协议相关的客户或供应商。" + +#. module: agreement_serviceprofile +#: model:ir.model.fields,field_description:agreement_serviceprofile.field_agreement_stage__stage_type +msgid "Type" +msgstr "类型" diff --git a/agreement_serviceprofile/models/agreement_serviceprofile.py b/agreement_serviceprofile/models/agreement_serviceprofile.py index 3ec22e8d5..0e5ac4524 100644 --- a/agreement_serviceprofile/models/agreement_serviceprofile.py +++ b/agreement_serviceprofile/models/agreement_serviceprofile.py @@ -25,8 +25,11 @@ class AgreementServiceProfile(models.Model): " without removing it.") notes = fields.Text(string="Notes") - product_id = fields.Many2one('product.template', 'Service', - domain="[('type', '=', 'service')]") + product_id = fields.Many2one('product.template', 'Service Product', + domain="[('type', '=', 'service')]", + required=True) + partner_id = fields.Many2one(related='agreement_id.partner_id', + string='Partner') # Used for Kanban grouped_by view @api.model diff --git a/agreement_serviceprofile/readme/CONTRIBUTORS.rst b/agreement_serviceprofile/readme/CONTRIBUTORS.rst index 4f31127a0..8967a87d0 100644 --- a/agreement_serviceprofile/readme/CONTRIBUTORS.rst +++ b/agreement_serviceprofile/readme/CONTRIBUTORS.rst @@ -1,7 +1,18 @@ -* Patrick Wilson -* Bhavesh Odedra -* Wolfgang Hall -* Maxime Chambreuil -* Sandip Mangukiya -* Serpent Consulting Services Pvt. Ltd. -* Brian McMaster +* `Pavlov Media `_: + + * Patrick Wilson + +* `Open Source Integrators `_: + + * Bhavesh Odedra + * Wolfgang Hall + * Maxime Chambreuil + * Sandip Mangukiya + +* `Serpent Consulting Services Pvt. Ltd. `_: + + * Murtuza Saleh + +* `Mc Master Lawn and Pest Services `_: + + * Brian McMaster diff --git a/agreement_serviceprofile/static/description/index.html b/agreement_serviceprofile/static/description/index.html index e0a3d9b08..1f1600667 100644 --- a/agreement_serviceprofile/static/description/index.html +++ b/agreement_serviceprofile/static/description/index.html @@ -406,14 +406,26 @@ If you spotted it first, help us smashing it by providing a detailed and welcome

Maintainers

diff --git a/agreement_serviceprofile/views/agreement.xml b/agreement_serviceprofile/views/agreement.xml index 6307dd7a2..c7e605b84 100644 --- a/agreement_serviceprofile/views/agreement.xml +++ b/agreement_serviceprofile/views/agreement.xml @@ -11,10 +11,21 @@ +
- - + + + + + + + + + + + diff --git a/agreement_serviceprofile/views/agreement_serviceprofile.xml b/agreement_serviceprofile/views/agreement_serviceprofile.xml index e227240eb..1c94c698a 100644 --- a/agreement_serviceprofile/views/agreement_serviceprofile.xml +++ b/agreement_serviceprofile/views/agreement_serviceprofile.xml @@ -9,6 +9,7 @@ + @@ -87,7 +88,10 @@ + context="{'group_by': 'agreement_id'}"/> +