[IMP] agreement_serviceprofile

agreement_serviceprofile/README.rst

@@ -58,13 +58,24 @@ Authors
 Contributors
 ~~~~~~~~~~~~
 
-* Patrick Wilson <pwilson@pavlovmedia.com>
+* `Pavlov Media <https://www.pavlovmedia.com>`_:
-* Bhavesh Odedra <bodedra@opensourceintegrators.com>
+
-* Wolfgang Hall <whall@opensourceintegrators.com>
+  * Patrick Wilson <pwilson@pavlovmedia.com>
-* Maxime Chambreuil <mchambreuil@opensourceintegrators.com>
+
-* Sandip Mangukiya <smangukiya@opensourceintegrators.com>
+* `Open Source Integrators <https://www.opensourceintegrators.com>`_:
-* Serpent Consulting Services Pvt. Ltd. <support@serpentcs.com>
+
-* Brian McMaster <brian@mcmpest.com>
+  * Bhavesh Odedra <bodedra@opensourceintegrators.com>
+  * Wolfgang Hall <whall@opensourceintegrators.com>
+  * Maxime Chambreuil <mchambreuil@opensourceintegrators.com>
+  * Sandip Mangukiya <smangukiya@opensourceintegrators.com>
+
+* `Serpent Consulting Services Pvt. Ltd. <https://www.serpentcs.com>`_:
+
+  * Murtuza Saleh <murtuzasaleh@serpentcs.com>
+
+* `Mc Master Lawn and Pest Services <https://www.mcmpest.com>`_:
+
+  * Brian McMaster <brian@mcmpest.com>
 
 Maintainers
 ~~~~~~~~~~~

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

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, '

agreement_serviceprofile/data/serviceprofile_stage.xml

@@ -1,4 +1,6 @@
-<?xml version="1.0" encoding="utf-8"?>
+<!-- # Copyright (C) 2018 Pavlov Media
+     # Copyright (C) 2019 Open Source Integrators
+     # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). -->
 <odoo noupdate="1">
 
     <record id="servpro_stage_draft" model="agreement.stage">

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"

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"

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"

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 "类型"

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',
+    product_id = fields.Many2one('product.template', 'Service Product',
-                                 domain="[('type', '=', 'service')]")
+                                 domain="[('type', '=', 'service')]",
+                                 required=True)
+    partner_id = fields.Many2one(related='agreement_id.partner_id',
+                                 string='Partner')
 
     # Used for Kanban grouped_by view
     @api.model

agreement_serviceprofile/readme/CONTRIBUTORS.rst

@@ -1,7 +1,18 @@
-* Patrick Wilson <pwilson@pavlovmedia.com>
+* `Pavlov Media <https://www.pavlovmedia.com>`_:
-* Bhavesh Odedra <bodedra@opensourceintegrators.com>
+
-* Wolfgang Hall <whall@opensourceintegrators.com>
+  * Patrick Wilson <pwilson@pavlovmedia.com>
-* Maxime Chambreuil <mchambreuil@opensourceintegrators.com>
+
-* Sandip Mangukiya <smangukiya@opensourceintegrators.com>
+* `Open Source Integrators <https://www.opensourceintegrators.com>`_:
-* Serpent Consulting Services Pvt. Ltd. <support@serpentcs.com>
+
-* Brian McMaster <brian@mcmpest.com>
+  * Bhavesh Odedra <bodedra@opensourceintegrators.com>
+  * Wolfgang Hall <whall@opensourceintegrators.com>
+  * Maxime Chambreuil <mchambreuil@opensourceintegrators.com>
+  * Sandip Mangukiya <smangukiya@opensourceintegrators.com>
+
+* `Serpent Consulting Services Pvt. Ltd. <https://www.serpentcs.com>`_:
+
+  * Murtuza Saleh <murtuzasaleh@serpentcs.com>
+
+* `Mc Master Lawn and Pest Services <https://www.mcmpest.com>`_:
+
+  * Brian McMaster <brian@mcmpest.com>

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
 <div class="section" id="contributors">
 <h2><a class="toc-backref" href="#id4">Contributors</a></h2>
 <ul class="simple">
+<li><a class="reference external" href="https://www.pavlovmedia.com">Pavlov Media</a>:<ul>
 <li>Patrick Wilson &lt;<a class="reference external" href="mailto:pwilson&#64;pavlovmedia.com">pwilson&#64;pavlovmedia.com</a>&gt;</li>
+</ul>
+</li>
+<li><a class="reference external" href="https://www.opensourceintegrators.com">Open Source Integrators</a>:<ul>
 <li>Bhavesh Odedra &lt;<a class="reference external" href="mailto:bodedra&#64;opensourceintegrators.com">bodedra&#64;opensourceintegrators.com</a>&gt;</li>
 <li>Wolfgang Hall &lt;<a class="reference external" href="mailto:whall&#64;opensourceintegrators.com">whall&#64;opensourceintegrators.com</a>&gt;</li>
 <li>Maxime Chambreuil &lt;<a class="reference external" href="mailto:mchambreuil&#64;opensourceintegrators.com">mchambreuil&#64;opensourceintegrators.com</a>&gt;</li>
 <li>Sandip Mangukiya &lt;<a class="reference external" href="mailto:smangukiya&#64;opensourceintegrators.com">smangukiya&#64;opensourceintegrators.com</a>&gt;</li>
-<li>Serpent Consulting Services Pvt. Ltd. &lt;<a class="reference external" href="mailto:support&#64;serpentcs.com">support&#64;serpentcs.com</a>&gt;</li>
+</ul>
+</li>
+<li><a class="reference external" href="https://www.serpentcs.com">Serpent Consulting Services Pvt. Ltd.</a>:<ul>
+<li>Murtuza Saleh &lt;<a class="reference external" href="mailto:murtuzasaleh&#64;serpentcs.com">murtuzasaleh&#64;serpentcs.com</a>&gt;</li>
+</ul>
+</li>
+<li><a class="reference external" href="https://www.mcmpest.com">Mc Master Lawn and Pest Services</a>:<ul>
 <li>Brian McMaster &lt;<a class="reference external" href="mailto:brian&#64;mcmpest.com">brian&#64;mcmpest.com</a>&gt;</li>
 </ul>
+</li>
+</ul>
 </div>
 <div class="section" id="maintainers">
 <h2><a class="toc-backref" href="#id5">Maintainers</a></h2>

agreement_serviceprofile/views/agreement.xml

@@ -11,10 +11,21 @@
                     <field name="serviceprofile_ids">
                         <tree>
                             <field name="name"/>
+                            <field name="product_id"/>
                         </tree>
                         <form>
+                            <group>
+                                <group>
                                     <field name="name"/>
-                            <field name="notes" placeholder="Add Notes Here..."/>
+                                </group>
+                                <group>
+                                    <field name="product_id"/>
+                                </group>
+                            </group>
+                            <group string="Notes">
+                                <field name="notes" nolabel="1"
+                                       placeholder="Add notes here..."/>
+                            </group>
                         </form>
                     </field>
                 </page>

agreement_serviceprofile/views/agreement_serviceprofile.xml

@@ -9,6 +9,7 @@
             <tree string="Service Profiles" default_order='agreement_id'>
                 <field name="name"/>
                 <field name="agreement_id"/>
+                <field name="partner_id"/>
                 <field name="product_id"/>
                 <field name="active" invisible="1"/>
             </tree>
@@ -87,7 +88,10 @@
             <search>
                 <filter string="Agreement" name="group_agreement"
                         icon="terp-partner"
-                        context="{'group_by':'agreement_id'}"/>
+                        context="{'group_by': 'agreement_id'}"/>
+                <filter string="Product" name="group_product"
+                        icon="terp-product"
+                        context="{'group_by': 'product_id'}"/>
             </search>
         </field>
     </record>