From 063da04cf04ecdedb717062a954873fb99a558fa Mon Sep 17 00:00:00 2001
From: Fabien BOURGEOIS <fabien@yaltik.com>
Date: Sun, 26 Aug 2018 17:44:16 +0200
Subject: [PATCH] [IMP]GOLEM Member Family Quotient : on partner form too

---
 golem_member_familyquotient/__manifest__.py   |  7 +--
 golem_member_familyquotient/i18n/fr.po        | 13 ++++-
 .../i18n/golem_member_familyquotient.pot      | 13 ++++-
 .../models/__init__.py                        |  4 +-
 .../{golem_member.py => res_partner.py}       |  6 +--
 .../views/golem_member_views.xml              |  6 +--
 .../views/res_partner_views.xml               | 50 +++++++++++++++++++
 7 files changed, 84 insertions(+), 15 deletions(-)
 rename golem_member_familyquotient/models/{golem_member.py => res_partner.py} (90%)
 create mode 100644 golem_member_familyquotient/views/res_partner_views.xml

diff --git a/golem_member_familyquotient/__manifest__.py b/golem_member_familyquotient/__manifest__.py
index 28792a2..4adec92 100644
--- a/golem_member_familyquotient/__manifest__.py
+++ b/golem_member_familyquotient/__manifest__.py
@@ -18,12 +18,13 @@
 {
     'name': 'GOLEM Member Family Quotient',
     'summary': 'GOLEM Members Family Quotients',
-    'version': '10.0.1.0.1',
+    'version': '10.0.1.1.0',
     'category': 'GOLEM',
     'author': 'Fabien Bourgeois',
     'license': 'AGPL-3',
     'application': False,
     'installable': True,
-    'depends': ['golem_member'],
-    'data': ['views/golem_member_views.xml']
+    'depends': ['partner_contact_personal_information_page', 'golem_member'],
+    'data': ['views/golem_member_views.xml',
+             'views/res_partner_views.xml']
 }
diff --git a/golem_member_familyquotient/i18n/fr.po b/golem_member_familyquotient/i18n/fr.po
index b7871ef..8e0f2a3 100644
--- a/golem_member_familyquotient/i18n/fr.po
+++ b/golem_member_familyquotient/i18n/fr.po
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 10.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-08-03 22:59+0000\n"
-"PO-Revision-Date: 2018-08-04 01:06+0200\n"
+"POT-Creation-Date: 2018-08-26 15:40+0000\n"
+"PO-Revision-Date: 2018-08-26 17:43+0200\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -17,11 +17,15 @@ msgstr ""
 
 #. module: golem_member_familyquotient
 #: model:ir.model.fields,field_description:golem_member_familyquotient.field_golem_member_caf_number
+#: model:ir.model.fields,field_description:golem_member_familyquotient.field_res_partner_caf_number
+#: model:ir.model.fields,field_description:golem_member_familyquotient.field_res_users_caf_number
 msgid "CAF Number"
 msgstr "Numéro CAF"
 
 #. module: golem_member_familyquotient
 #: model:ir.model.fields,field_description:golem_member_familyquotient.field_golem_member_family_quotient
+#: model:ir.model.fields,field_description:golem_member_familyquotient.field_res_partner_family_quotient
+#: model:ir.model.fields,field_description:golem_member_familyquotient.field_res_users_family_quotient
 msgid "Family quotient"
 msgstr "Quotient familial"
 
@@ -30,3 +34,8 @@ msgstr "Quotient familial"
 msgid "GOLEM Member"
 msgstr "Usager"
 
+#. module: golem_member_familyquotient
+#: model:ir.model,name:golem_member_familyquotient.model_res_partner
+msgid "Partner"
+msgstr "Partenaire"
+
diff --git a/golem_member_familyquotient/i18n/golem_member_familyquotient.pot b/golem_member_familyquotient/i18n/golem_member_familyquotient.pot
index 3ab55ba..d4dac3b 100644
--- a/golem_member_familyquotient/i18n/golem_member_familyquotient.pot
+++ b/golem_member_familyquotient/i18n/golem_member_familyquotient.pot
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 10.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-08-03 22:59+0000\n"
-"PO-Revision-Date: 2018-08-03 22:59+0000\n"
+"POT-Creation-Date: 2018-08-26 15:40+0000\n"
+"PO-Revision-Date: 2018-08-26 15:40+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -17,11 +17,15 @@ msgstr ""
 
 #. module: golem_member_familyquotient
 #: model:ir.model.fields,field_description:golem_member_familyquotient.field_golem_member_caf_number
+#: model:ir.model.fields,field_description:golem_member_familyquotient.field_res_partner_caf_number
+#: model:ir.model.fields,field_description:golem_member_familyquotient.field_res_users_caf_number
 msgid "CAF Number"
 msgstr ""
 
 #. module: golem_member_familyquotient
 #: model:ir.model.fields,field_description:golem_member_familyquotient.field_golem_member_family_quotient
+#: model:ir.model.fields,field_description:golem_member_familyquotient.field_res_partner_family_quotient
+#: model:ir.model.fields,field_description:golem_member_familyquotient.field_res_users_family_quotient
 msgid "Family quotient"
 msgstr ""
 
@@ -30,3 +34,8 @@ msgstr ""
 msgid "GOLEM Member"
 msgstr ""
 
+#. module: golem_member_familyquotient
+#: model:ir.model,name:golem_member_familyquotient.model_res_partner
+msgid "Partner"
+msgstr ""
+
diff --git a/golem_member_familyquotient/models/__init__.py b/golem_member_familyquotient/models/__init__.py
index f4e5ac9..8466807 100644
--- a/golem_member_familyquotient/models/__init__.py
+++ b/golem_member_familyquotient/models/__init__.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-#    Copyright 2017 Fabien Bourgeois <fabien@yaltik.com>
+#    Copyright 2018 Fabien Bourgeois <fabien@yaltik.com>
 #
 #    This program is free software: you can redistribute it and/or modify
 #    it under the terms of the GNU Affero General Public License as
@@ -15,4 +15,4 @@
 #    You should have received a copy of the GNU Affero General Public License
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-from . import golem_member
+from . import res_partner
diff --git a/golem_member_familyquotient/models/golem_member.py b/golem_member_familyquotient/models/res_partner.py
similarity index 90%
rename from golem_member_familyquotient/models/golem_member.py
rename to golem_member_familyquotient/models/res_partner.py
index 258e069..c8bd3b1 100644
--- a/golem_member_familyquotient/models/golem_member.py
+++ b/golem_member_familyquotient/models/res_partner.py
@@ -19,9 +19,9 @@
 
 from odoo import models, fields
 
-class GolemMember(models.Model):
-    """ GOLEM Member adaptations """
-    _inherit = 'golem.member'
+class Partner(models.Model):
+    """ Partnner adaptations """
+    _inherit = 'res.partner'
 
     caf_number = fields.Char('CAF Number')
     family_quotient = fields.Monetary()
diff --git a/golem_member_familyquotient/views/golem_member_views.xml b/golem_member_familyquotient/views/golem_member_views.xml
index 2f6b48a..6e59286 100644
--- a/golem_member_familyquotient/views/golem_member_views.xml
+++ b/golem_member_familyquotient/views/golem_member_views.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <!--
-Copyright 2017 Fabien Bourgeois <fabien@yaltik.com>
+Copyright 2017-2018 Fabien Bourgeois <fabien@yaltik.com>
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU Affero General Public License as published by
@@ -22,7 +22,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
     <!-- Form -->
     <record model="ir.ui.view" id="golem_member_form_inherit_familyquotient">
-      <field name="name">Add QF to main form</field>
+      <field name="name">GOLEM Member Form adaptations</field>
       <field name="model">golem.member</field>
       <field name="inherit_id" ref="golem_member.golem_member_form" />
       <field name="arch" type="xml">
@@ -35,7 +35,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
     <!-- Searches -->
     <record model="ir.ui.view" id="golem_member_search_inherit_familyquotient">
-      <field name="name">Add Skills Search and Filter</field>
+      <field name="name">GOLEM Member Search adaptations</field>
       <field name="model">golem.member</field>
       <field name="inherit_id" ref="golem_member.golem_member_search" />
       <field name="arch" type="xml">
diff --git a/golem_member_familyquotient/views/res_partner_views.xml b/golem_member_familyquotient/views/res_partner_views.xml
new file mode 100644
index 0000000..f7bcb52
--- /dev/null
+++ b/golem_member_familyquotient/views/res_partner_views.xml
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!--
+Copyright 2018 Fabien Bourgeois <fabien@yaltik.com>
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU Affero General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU Affero General Public License for more details.
+
+You should have received a copy of the GNU Affero General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+-->
+
+<odoo>
+  <data>
+
+    <!-- Form -->
+    <record model="ir.ui.view" id="partner_personal_info_form_inherit_familyquotient">
+      <field name="name">Partner personal information form adaptations</field>
+      <field name="model">res.partner</field>
+      <field name="inherit_id"
+        ref="partner_contact_personal_information_page.personal_information" />
+      <field name="arch" type="xml">
+        <group name="personal_information_group" position="inside">
+          <field name="caf_number" />
+          <field name="family_quotient" />
+        </group>
+      </field>
+    </record>
+
+    <!-- Search -->
+    <record model="ir.ui.view" id="res_partner_golem_member_search_inherit_familyquotient">
+      <field name="name">Partner search adaptations</field>
+      <field name="model">res.partner</field>
+      <field name="inherit_id" ref="golem_member.res_partner_search_inherit_golem_member" />
+      <field name="arch" type="xml">
+        <field name="member_number" position="after">
+          <field name="caf_number" />
+        </field>
+      </field>
+    </record>
+
+  </data>
+</odoo>