From cc8b10f964ef612e68642628a513f0dbd8d89cd1 Mon Sep 17 00:00:00 2001
From: Marc Durepos <marc@bemade.org>
Date: Wed, 14 Jun 2023 15:51:20 -0400
Subject: [PATCH] bemade_fsm: Imported code from durpro_fso to represent
 equipment models and views for bemade_fsm. Re: #11.

---
 .gitignore                                    |   1 -
 __manifest__.py                               |   3 +
 __pycache__/__init__.cpython-310.pyc          | Bin 185 -> 0 bytes
 models/__init__.py                            |   3 +
 models/__pycache__/__init__.cpython-310.pyc   | Bin 271 -> 0 bytes
 .../product_template.cpython-310.pyc          | Bin 561 -> 0 bytes
 models/__pycache__/sale_order.cpython-310.pyc | Bin 3366 -> 0 bytes
 .../__pycache__/task_template.cpython-310.pyc | Bin 1766 -> 0 bytes
 models/equipment.py                           | 119 ++++++++++++++++++
 models/res_partner.py                         |  41 ++++++
 models/task.py                                |   7 ++
 security/ir.model.access.csv                  |   6 +-
 tests/__pycache__/__init__.cpython-310.pyc    | Bin 255 -> 0 bytes
 .../test_task_template.cpython-310.pyc        | Bin 4176 -> 0 bytes
 views/equipment.xml                           |  96 ++++++++++++++
 views/equipment_location.xml                  | 109 ++++++++++++++++
 views/res_partner.xml                         |  36 ++++++
 17 files changed, 419 insertions(+), 2 deletions(-)
 delete mode 100644 __pycache__/__init__.cpython-310.pyc
 delete mode 100644 models/__pycache__/__init__.cpython-310.pyc
 delete mode 100644 models/__pycache__/product_template.cpython-310.pyc
 delete mode 100644 models/__pycache__/sale_order.cpython-310.pyc
 delete mode 100644 models/__pycache__/task_template.cpython-310.pyc
 create mode 100644 models/equipment.py
 create mode 100644 models/res_partner.py
 create mode 100644 models/task.py
 delete mode 100644 tests/__pycache__/__init__.cpython-310.pyc
 delete mode 100644 tests/__pycache__/test_task_template.cpython-310.pyc
 create mode 100644 views/equipment.xml
 create mode 100644 views/equipment_location.xml
 create mode 100644 views/res_partner.xml

diff --git a/.gitignore b/.gitignore
index 2f78cf5..0d20b64 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1 @@
 *.pyc
-
diff --git a/__manifest__.py b/__manifest__.py
index ddf00be..fa19fd6 100644
--- a/__manifest__.py
+++ b/__manifest__.py
@@ -29,8 +29,11 @@
     'license': 'OPL-1',
     'depends': ['project', 'stock', 'sale', 'sale_project', 'sale_stock', 'industry_fsm_sale'],
     'data': ['views/task_template_views.xml',
+             'views/equipment.xml',
+             'views/equipment_location.xml',
              'security/ir.model.access.csv',
              'views/product_views.xml',
+             'views/res_partner.xml',
              ],
     'assets': {
         'web.assets_tests': [
diff --git a/__pycache__/__init__.cpython-310.pyc b/__pycache__/__init__.cpython-310.pyc
deleted file mode 100644
index c093db2bbda286584dc51910b357fc3543466865..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 185
zcmd1j<>g`kf@h}9DWX97F^Gc<n1CDyATAaF5-AKRj5!Rsj8Tk?3@J>(44TX@8G*u@
zjJMcw^HWlDiv2X1ZZQ;r^sHnkVgXWM;+L&{XmM&$v3_n!X;ErHezAUWQL?^EX;DE@
zzOJFEo`HU1N=klSv3^o&ZemJmd|Gj?etdjpUS>&ryk0@&Ee;!?>7_ZTb|A}&L8c2Z
F007OMD(nCN

diff --git a/models/__init__.py b/models/__init__.py
index 08966cb..997de6e 100644
--- a/models/__init__.py
+++ b/models/__init__.py
@@ -1,3 +1,6 @@
 from . import task_template
 from . import product_template
 from . import sale_order
+from . import equipment
+from . import task
+from . import res_partner
diff --git a/models/__pycache__/__init__.cpython-310.pyc b/models/__pycache__/__init__.cpython-310.pyc
deleted file mode 100644
index 1c58b7fe508881d2fcada6fe01cec131cdb8511a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 271
zcmYk0v2Fq}42F}tqpA=m@ff|K1O_&Q7?``XEVo1{HWDHsCp$MV_i6e{w^pjeD=^_O
zVadNg|FUeyx*jWu|K$&SN&U;sa}?5SB>7DQ6lkx4Zne%_2p4Vf;8M73OX2EMHKVJR
z@kS4Ia(uE0L+4#WF{T|w==bT_8?*ChBLUJ!Qw@spQ7W@kBEO1WGH1DM&5n`S1n3F7
z$cAZewmr$(_r-EHHx3}4*?ePgfcC(_gb3)_SbIDlleM$%GQ6(D>^-jYo17O<)I?A9
E9Rff@1^@s6

diff --git a/models/__pycache__/product_template.cpython-310.pyc b/models/__pycache__/product_template.cpython-310.pyc
deleted file mode 100644
index 9398263e0940004a168f3aadafa294ce11434e20..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 561
zcmYjOu};J=3{9K1REPrxU}ileu7Jdb5CakmAS7VP5|!FOkESU}I=~7mAHpw1Y)DA_
z0u#<12Uv<@KRfnwtOtX6M)I-y1aEY|2j{;e<Q&kk8>E0i)G!r^NW~&nT=0k;F^GXb
zGvFAHlP4}xNY2?X{iJ+0<UYHuu>tEdr2!l3dD+!fi2aw8oC7*`ofI+=0TVGqf@3mH
zLw!gfec>X5jB3yMr8A?UuiOQyt|=WpE_YL4<Yve!A!DrE$d&f)4<1~QyFPp8bA#5I
zx^lzVXTfT3e6Cw!iVjbyQ!Zs&DwNXCOGzX2O|TcFyzk5ACz8v$y+u<y6BB)(pOo#x
zj&4ybhu(5VN!IYn%p#>s)YoxwY0=n1L2t0rwy>ru4tqnyH@A03TSW<=TU%VADgouS
zRmJoVi=SbCE04Md6TUDk%Vwl<mP9M@1UnsOKGC4{gq-1_eaQ3aNm$4v=a1CXS_<)e
QZ#wRNM4k;#R@fT<1~$@_wg3PC

diff --git a/models/__pycache__/sale_order.cpython-310.pyc b/models/__pycache__/sale_order.cpython-310.pyc
deleted file mode 100644
index c87196c617a49c631a6894750948f1667c749ee4..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3366
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
Cs@Nz1

diff --git a/models/__pycache__/task_template.cpython-310.pyc b/models/__pycache__/task_template.cpython-310.pyc
deleted file mode 100644
index 7334f4c77634069c9c8d824220b78d14191b2c79..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1766
zcma)7&2rpC5Y|Xqt#+-o*N)e5fCNEu*#o<fs=$S!lCmktAtqHe7hP0}de+uPf0@zR
zv5K2h-24W-KpucA4>DIyd4+JHdnCb@IS_44?|iME?wPN<N5yC~H1PTL$rb$GGmJk8
ztUoq_$2jB+1sK3mBVz%}%)rd7z{>2vX2uT&m|(pzz~XG#yRrfY>|<lvdxvX`sjZx>
z0G>+aEE1lAR8~|biiI(~UVj_}k8#L9P;et)U<4+xz~c6@*MzuYfy4Vt7i{Q(b8Q9#
zL__F<d(DCkoO>{UA#8wmZ3QF5n=pb+*wT1Q<1uW*j>cnce+zbDqVcwV&tMO3!#=Lx
zL3|4s+<}kaW5m0NC-8}mwWn?G!aewuJK$g2!EN{qK7V5b`*0r*|3G;sk$ic=voeh;
z{(e%5V#(ubR-txQwd$DRNxO&UG!Ae`7sW5e(pWNd#*U_@vUq;3`f-t!QGWTBDO>V%
z@zxL?TE2fe|5<V&=NYU7FAF)BBAy?v1V;Vht4Fgh=Mg}W%lQkQMZm*_%;rr}=Cq%%
z+s~}LRO2vS3BmI!Y-9ClKPC#-tnaQLYIf7I9@1<7B&kw<f?IZEC6fG9xq`o1C4z(6
zIOH-GNm(UDK4oGHz19Q4<!nXUueT5RB3h-D|3u2<H0NB_-+Ye@7MD2nqecmSRrs`R
z>BoX2x!^BEk@?kGBK?0(GBve#WuNi1tT!k|8Hp<Aq8@iq4py=%GSqzCY2sGnFADMh
zG3u=@tL=Zi)j4|Jq`Q99DO!sUbnJDGtLRkLUgzY5(8CVVyASlY`#hqQ`b~b?>ceV^
zWQ_IDape{{HY%^Ua*!*uueXm^FNkWtD`bgj^^*J?v&F+aLh>kw%00#m^E~Da({1Ib
z{y|f&@2IY)R%6>sFv@GyhbGtm=>fV1bPw#}1l!M~J^%|P1N*lg-7H7S#sp=8O0%9M
zViv_zQIh_{3-n)HOnYi@p74v1>ReHc=~=2AnkJy^>ayh2P<h2)S9mNFl`a;&#)9re
z-CK<qAynfgOjwjW4~dpN)JkeV(=?gQXgGh}Xp)<2j;41ojOH#3)i9)Otx}G2FAQI;
zqLf%g)NAOa8(8&pvx-fe3yT!?!C54fO{U8JvC2}l0snTE8a%^0;$em&7_?o(rE;~l
z$hmU6I#>O+(2x$SCNUxB?oT;y7Q3=Zzf}FFNXsb~%9U-V)v(Pnk|`e0&WMOLL6iwf
zCLKZEL*W`Wv&|vfv^+Lm`+01Kd8W2Kn)a1lKv4*~ar9vYtrz%pLLQ#cmqZ(`1=4YK
Tg4}N#GQXpGleBK%*t7ly8<YnI

diff --git a/models/equipment.py b/models/equipment.py
new file mode 100644
index 0000000..c928988
--- /dev/null
+++ b/models/equipment.py
@@ -0,0 +1,119 @@
+from odoo import api, fields, models
+
+
+class EquipmentTag(models.Model):
+
+    _name = "bemade_fsm.equipment.tag"
+    _description = 'Field service equipment category'
+
+    name = fields.Char('Name', required=True, translate=True)
+    color = fields.Integer('Color Index', default=10)
+
+    _sql_constraints = [
+        ('name_uniq', 'unique (name)', "Tag name already exists !"),
+    ]
+
+
+class EquipmentType(models.Model):
+    _name = 'bemade_fsm.equipment.type'
+    _description = 'Field service equipment type'
+    _order = 'id'
+
+    name = fields.Char(string='Intervention Name', required=True, translate=True)
+
+
+class EquipmentLocation(models.Model):
+    _name = 'bemade_fsm.equipment.location'
+    _description = 'Field service location for equipment'
+    _inherit = ['mail.thread', 'mail.activity.mixin']
+
+    name = fields.Char(string='Name', required=True, translate=True)
+
+    more_info = fields.Char(string='MOre info')
+
+    partner_id = fields.Many2one(comodel_name='res.partner',
+                                 string="Address",
+                                 tracking=True,
+                                 domain="[('is_site', '=', True)]",
+                                 required=True)
+
+    equipment_count = fields.Integer(compute='_compute_equipment_count',
+                                     string='Equipment Count')
+
+    equipment_ids = fields.One2many(comodel_name='bemade_fsm.equipment',
+                                    inverse_name='equipment_location_id',
+                                    string='Equipments')
+
+    @api.depends('equipment_ids')
+    def _compute_equipment_count(self):
+        for rec in self:
+            all_equipmemt_ids = self.env['bemade_fsm.equipment'].search([('equipment_location_id', '=', rec.id)])
+            rec.equipment_count = len(all_equipmemt_ids)
+
+
+class Equipment(models.Model):
+    _name = 'bemade_fsm.equipment'
+    _rec_name = 'complete_name'
+    _description = 'Field service equipment'
+    _inherit = ['mail.thread', 'mail.activity.mixin']
+
+    pid_tag = fields.Char(string="P&ID Tag", tracking=True)
+
+    name = fields.Char(string="Name", tracking=True, required=True)
+
+    complete_name = fields.Char(string="Equipment Name", compute="_compute_complete_name", store=True)
+
+    tag_ids = fields.Many2many('bemade_fsm.equipment.tag',
+                               string='Application',
+                               tracking=True,
+                               help="Classify and analyze your equipment categories like: Boiler, Laboratory, "
+                                    "Waste water, Pure water")
+
+    partner_id = fields.Many2one('res.partner',
+                                 string="Owner",
+                                 tracking=True,
+                                 domain="[('is_company', '=', True)]",
+                                 required=True)
+
+    description = fields.Text(string="Description",
+                              tracking=True,
+                              )
+
+    partner_location_id = fields.Many2one('res.partner',
+                                          string="Physical Location",
+                                          tracking=True,
+                                          domain="[('parent_id', '=', partner_id), ('is_site', '=', 'True')]",
+                                          required=True)
+
+    equipment_location_id = fields.Many2one('bemade_fsm.equipment.location',
+                                            string="Location",
+                                            tracking=True,
+                                            domain="[('partner_id', '=', partner_location_id)]")
+
+    location_notes = fields.Text(string="Physical Location Notes",
+                                 tracking=True,
+                                 )
+
+    intervention_ids = fields.One2many(comodel_name='project.task',
+                                       inverse_name='equipment_id',
+                                       string='Interventions')
+
+    @api.depends('pid_tag', 'name')
+    def _compute_complete_name(self):
+        for rec in self:
+            rec.complete_name = "[%s] %s" % (rec.pid_tag or ' ', rec.name)
+
+    @api.model
+    def name_search(self, name='', args=None, operator='ilike', limit=100):
+        args = args or []
+        if name:
+            equipments = self.search([
+                    '|', '|', '|',
+                    ('pid_tag', operator, name),
+                    ('name', operator, name),
+                    ('partner_id.name', operator, name),
+                    ('partner_location_id.name', operator, name)],
+                limit=limit)
+        else:
+            equipments = self.search(args, limit=limit)
+        return equipments.name_get()
diff --git a/models/res_partner.py b/models/res_partner.py
new file mode 100644
index 0000000..ab516d3
--- /dev/null
+++ b/models/res_partner.py
@@ -0,0 +1,41 @@
+from odoo import api, fields, models
+
+
+class Partner(models.Model):
+    _inherit = 'res.partner'
+
+    equipment_count = fields.Integer(compute='_compute_equipment_count',
+                                     string='Equipment Count')
+
+    equipment_ids = fields.One2many(comodel_name='bemade_fsm.equipment',
+                                    inverse_name='partner_id',
+                                    string='Equipments')
+
+    equipment_location_count = fields.Integer(compute='_compute_equipment_location_count',
+                                              string='Equipment Location Count')
+
+    equipment_location_ids = fields.One2many(comodel_name='bemade_fsm.equipment.location',
+                                             inverse_name='partner_id',
+                                             string='Equipment Location')
+
+    is_site = fields.Boolean(string='Is an Equipment Site',
+                             tracking=True,
+                             default=False,
+                             help="Check if the contact is an equipment site, otherwise it is not in that list")
+
+    is_site_contact = fields.Boolean(string='Is a site contact',
+                                     tracking=True,
+                                     default=False,
+                                     help="Check if the contact is a site contact, otherwise it is a not in that list")
+
+    @api.depends('equipment_ids')
+    def _compute_equipment_count(self):
+        for rec in self:
+            all_equipmemt_ids = self.env['bemade_fsm.equipment'].search([('partner_id', '=', rec.id)])
+            rec.equipment_count = len(all_equipmemt_ids)
+
+    @api.depends('equipment_location_ids')
+    def _compute_equipment_location_count(self):
+        for rec in self:
+            all_equipmemt_location_ids = self.env['bemade_fsm.equipment.location'].search([('partner_id', '=', rec.id)])
+            rec.equipment_location_count = len(all_equipmemt_location_ids)
diff --git a/models/task.py b/models/task.py
new file mode 100644
index 0000000..7ee4a71
--- /dev/null
+++ b/models/task.py
@@ -0,0 +1,7 @@
+from odoo import fields, models, api
+
+
+class Task(models.Model):
+    _inherit = "project.task"
+
+    equipment_id = fields.Many2one("bemade_fsm.equipment", string="Target Equipment")
diff --git a/security/ir.model.access.csv b/security/ir.model.access.csv
index e48e8e7..086f935 100644
--- a/security/ir.model.access.csv
+++ b/security/ir.model.access.csv
@@ -1,3 +1,7 @@
 id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
 access_bemade_fsm_task_template,bemade_fsm_task_template,model_project_task_template,project.group_project_manager,1,1,1,1
-access_bemade_fsm_task_template,bemade_fsm_task_template,model_project_task_template,project.group_project_user,1,1,1,1
\ No newline at end of file
+access_bemade_fsm_task_template,bemade_fsm_task_template,model_project_task_template,project.group_project_user,1,1,1,1
+access_bemade_fsm_equipment,bemade_fsm_equipment,model_bemade_fsm_equipment,base.group_user,1,1,1,1
+access_bemade_fsm_equipment_tag,bemade_fsm_equipment_tag,model_bemade_fsm_equipment_tag,base.group_user,1,1,1,1
+access_bemade_fsm_equipment_type,access_bemade_fsm_equipment_type,model_bemade_fsm_equipment_type,base.group_user,1,0,0,0
+access_bemade_fsm_equipment_location,access_bemade_fsm_equipment_location,model_bemade_fsm_equipment_location,base.group_user,1,0,0,0
\ No newline at end of file
diff --git a/tests/__pycache__/__init__.cpython-310.pyc b/tests/__pycache__/__init__.cpython-310.pyc
deleted file mode 100644
index fad409285a012dc968a5d67edfa01a8dc449790f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 255
zcmZWjv1$TA5Z%2qAQC}R#}Bwd*A(eO5KI?LBQ`d}>Wm<{b&r|7!a8+6B)@d6mA_z>
z*-r4mym{|2@Fot21Ecu;{K2K}b2hgq)Xa6{SqTl=+623?HtRxlu_;uSD^v9@R!=J1
zJtdL^$;&q+3Qg@3X*#}7L3~XR8HvBDvNN2^xK#Qx{E&5~>%y&tSX{uCsfpr*ckZL*
whU4Vrbvkn%F&@QjDR?B<OK`bM9KhjtNC4C3)b-y&#I~mQ{G{}h9?i)91Hl49A^-pY

diff --git a/tests/__pycache__/test_task_template.cpython-310.pyc b/tests/__pycache__/test_task_template.cpython-310.pyc
deleted file mode 100644
index f21b926f21144adcb76ddf4dc3d952d4d6e802e3..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4176
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

diff --git a/views/equipment.xml b/views/equipment.xml
new file mode 100644
index 0000000..0041182
--- /dev/null
+++ b/views/equipment.xml
@@ -0,0 +1,96 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+    <!-- Equipment Form View -->
+    <record id="equipment_view_form" model="ir.ui.view">
+        <field name="name">durpro_fso.equipment.form</field>
+        <field name="model">durpro_fso.equipment</field>
+        <field name="arch" type="xml">
+            <form string="Equipment">
+                <sheet>
+                    <group>
+                        <group name="left">
+                            <field name="pid_tag"/>
+                            <field name="name"/>
+                            <field name="description"/>
+                            <field name="location_notes"/>
+                        </group>
+                        <group name="right">
+                            <field name="partner_id"/>
+                            <field name="partner_location_id"
+                                   groups="sale.group_delivery_invoice_address"
+                                   context="{'default_type': 'delivery', 'show_address': 1}"
+                                   options='{"always_reload": True}'/>
+                            <field name="equipment_location_id"/>
+                            <field name="tag_ids" widget="many2many_tags" options="{'no_open': False}"/>
+                        </group>
+                    </group>
+                    <notebook>
+                        <page string="Interventions">
+                            <field name="intervention_ids" mode="tree">
+                                <tree string="Interventions" create="0" edit="0">
+                                    <field name="name"/>
+                                    <field name="description"/>
+                                    <field name="date_planned"/>
+                                    <field name="state"/>
+                                </tree>
+                            </field>
+                        </page>
+                    </notebook>
+
+                </sheet>
+                <div class="oe_chatter">
+                    <field name="message_follower_ids" widget="mail_followers"/>
+                    <field name="activity_ids" widget="mail_activity"/>
+                    <field name="message_ids" widget="mail_thread"/>
+                </div>
+            </form>
+        </field>
+    </record>
+
+    <record id="equipment_view_tree" model="ir.ui.view">
+        <field name="name">durpro_fso.equipment.tree</field>
+        <field name="model">durpro_fso.equipment</field>
+        <field name="arch" type="xml">
+            <tree string="Equipment">
+                <field name="pid_tag"/>
+                <field name="name"/>
+                <field name="description"/>
+                <field name="tag_ids" widget="many2many_tags" options="{'no_open': False}"/>
+                <field name="partner_id"/>
+            </tree>
+        </field>
+    </record>
+
+<!--   BV: AN OTHER SEARCH VIEW TO BRING BACK
+    <record id="equipment_view_search" model="ir.ui.view">
+        <field name="name">durpro_fso.equipment.search</field>
+        <field name="model">durpro_fso.equipment</field>
+        <field name="arch" type="xml">
+            <search string="Equipments">
+                <field name="name"/>
+                <field name="partner_id"/>
+                <field name="pid_tag"/>
+                <field name="partner_location_id"/>
+
+                <group expand="0" string="Group By">
+                    <filter string="Partner" context="{'group_by':'partner_id'}"/>
+                    <filter string="Location" context="{'group_by':'partner_location_id'}"/>
+                </group>
+            </search>
+        </field>
+    </record>
+  -->
+
+    <record model="ir.actions.act_window" id="action_window_equipment">
+        <field name="name">Equipment</field>
+        <field name="res_model">durpro_fso.equipment</field>
+        <field name="view_mode">tree,form</field>
+    </record>
+
+    <record model="ir.actions.act_window" id="action_window_equipment_tags">
+        <field name="name">Equipment Tag</field>
+        <field name="res_model">durpro_fso.equipment.tag</field>
+        <field name="view_mode">tree,form</field>
+    </record>
+
+</odoo>
diff --git a/views/equipment_location.xml b/views/equipment_location.xml
new file mode 100644
index 0000000..01776a9
--- /dev/null
+++ b/views/equipment_location.xml
@@ -0,0 +1,109 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+
+    <record id="partner_equipment_location_view_form" model="ir.ui.view">
+        <field name="name">bemade_fsm.partner.equipment.location.form</field>
+        <field name="model">res.partner</field>
+        <field name="inherit_id" ref="base.view_partner_form"/>
+        <field name="arch" type="xml">
+            <xpath expr="//page[@name='internal_notes']" position="before">
+                <page name="equipment_locations" string="Equipment Locations">
+                    <field name="equipment_location_ids" mode="kanban" context="{'default_partner_id': active_id }">
+                        <kanban>
+                            <field name="name"/>
+                            <field name="more_info"/>
+                            <field name="equipment_count"/>
+                            <templates>
+                                <t t-name="kanban-box">
+                                    <div t-att-class="oe_kanban_global_click">
+                                        <div class="oe_kanban_details">
+                                            <field name="name"/>
+                                            <field name="equipment_count"/>
+                                        </div>
+                                    </div>
+                                </t>
+                            </templates>
+                        </kanban>
+                    </field>
+                </page>
+            </xpath>
+        </field>
+    </record>
+
+
+    <!-- Equipment Location Form View -->
+    <record id="equipment_location_view_form" model="ir.ui.view">
+        <field name="name">bemade_fsm.equipment.location.form</field>
+        <field name="model">bemade_fsm.equipment.location</field>
+        <field name="arch" type="xml">
+            <form string="Equipment Location">
+                <sheet>
+                    <group>
+                        <group name="left">
+                            <field name="name"/>
+                            <field name="more_info"/>
+                            <field name="partner_id"/>
+                        </group>
+                    </group>
+                    <notebook>
+                        <page string="Equipments">
+                            <field name="equipment_ids" mode="tree" class="oe_edit_only">
+                                <tree string="Equipments" create="0" edit="0">
+                                    <field name="name"/>
+                                </tree>
+                            </field>
+                        </page>
+                    </notebook>
+
+                </sheet>
+                <div class="oe_chatter">
+                    <field name="message_follower_ids" widget="mail_followers"/>
+                    <field name="activity_ids" widget="mail_activity"/>
+                    <field name="message_ids" widget="mail_thread"/>
+                </div>
+            </form>
+        </field>
+    </record>
+
+    <record id="equipment_location_view_tree" model="ir.ui.view">
+        <field name="name">bemade_fsm.equipment.location.tree</field>
+        <field name="model">bemade_fsm.equipment.location</field>
+        <field name="arch" type="xml">
+            <tree string="Equipment">
+                <field name="name"/>
+                <field name="more_info"/>
+                <field name="partner_id"/>
+            </tree>
+        </field>
+    </record>
+
+<!--  BV: AGAIN A SEARCH VIEW TO FIX
+
+    <record id="equipment_location_view_search" model="ir.ui.view">
+        <field name="name">bemade_fsm.equipment.location.search</field>
+        <field name="model">bemade_fsm.equipment.location</field>
+        <field name="arch" type="xml">
+            <search string="Equipment Locations">
+                <field name="name"/>
+                <field name="partner_id"/>
+                <field name="more_info"/>
+                <group expand="0" string="Group By">
+                    <filter string="Partner" context="{'group_by':'partner_id'}"/>
+                </group>
+            </search>
+        </field>
+    </record>
+
+-->
+
+    <record model="ir.actions.act_window" id="action_window_equipment_location">
+        <field name="name">Equipment Location</field>
+        <field name="res_model">bemade_fsm.equipment.location</field>
+        <field name="view_mode">tree,form</field>
+    </record>
+
+
+
+
+
+</odoo>
diff --git a/views/res_partner.xml b/views/res_partner.xml
new file mode 100644
index 0000000..165a83f
--- /dev/null
+++ b/views/res_partner.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0"?>
+<odoo>
+    <record id="act_res_partner_2_equipment" model="ir.actions.act_window">
+        <field name="name">Equipments</field>
+        <field name="res_model">bemade_fsm.equipment</field>
+        <field name="view_mode">tree,form</field>
+        <field name="context">{'default_partner_id': active_id}</field>
+        <field name="domain">[("partner_id", "=", active_id)]</field>
+    </record>
+
+    <record id="res_partner_view_fso" model="ir.ui.view">
+        <field name="name">res.partner.view.buttons.fso</field>
+        <field name="model">res.partner</field>
+        <field name="inherit_id" ref="base.view_partner_form" />
+        <field name="priority" eval="3"/>
+        <field name="arch" type="xml">
+            <div name="button_box" position="inside">
+                <button class="oe_stat_button" type="action" name="%(bemade_fsm.act_res_partner_2_equipment)d"
+                    icon="fa-tachometer">
+                    <field string="Equipments" name="equipment_count" widget="statinfo"/>
+                </button>
+            </div>
+            <field name="lang" position="after">
+                <field name="is_site"/>
+                <field name="is_site_contact"/>
+            </field>
+            <xpath expr="/form//field[@name='child_ids']/form//field[@name='comment']" position="after">
+                <field name="is_site_contact"/>
+            </xpath>
+            <xpath expr="/form//field[@name='child_ids']/form/sheet/group/group" position="inside">
+                <field name="is_site"/>
+            </xpath>
+        </field>
+    </record>
+
+</odoo>