From 79cf6dd7b9fc2be8e0bf734a0ab0f4e2fdbe35dd Mon Sep 17 00:00:00 2001
From: Sandip Mangukiya <smangukiya@ursainfosystems.com>
Date: Wed, 10 Oct 2018 07:38:13 -0700
Subject: [PATCH 1/5] [ADD]12567: extended fsm.location object

---
 fieldservice/models/fsm_location.py | 40 ++++++++++++-
 fieldservice/views/fsm_location.xml | 87 ++++++++++++++++++++++++++++-
 2 files changed, 122 insertions(+), 5 deletions(-)

diff --git a/fieldservice/models/fsm_location.py b/fieldservice/models/fsm_location.py
index b5f0cad13c..7f5b35c1ba 100644
--- a/fieldservice/models/fsm_location.py
+++ b/fieldservice/models/fsm_location.py
@@ -13,8 +13,44 @@ class FSMLocation(models.Model):
     partner_id = fields.Many2one('res.partner', string='Related Partner',
                                  required=True, ondelete='restrict',
                                  auto_join=True)
-
+    owner_id = fields.Many2one('res.partner', string='Related Owner',
+                                 required=True, ondelete='restrict',
+                                 auto_join=True)
+    customer_id = fields.Many2one('res.partner', string='Related Customer',
+                                 required=True, ondelete='restrict',
+                                 auto_join=True)
+    location_type_ids = fields.Many2many('fsm.tag',
+        'location_type_fsm_tag', 'fsm_location_id', 'loc_type_id',
+        string='Location Type')
+    location_material_ids = fields.Many2many('fsm.tag',
+        'location_material_fsm_tag', 'fsm_location_id', 'loc_material_id',
+        string='Location Material')
+    tanent_categ_ids = fields.Many2many('fsm.tag',
+        'tanent_categ_fsm_tag', 'fsm_location_id', 'tanent_categ_id',
+        string='Tanent Category')
+    location_destination_ids = fields.Many2many('fsm.tag',
+        'location_destination_fsm_tag', 'fsm_location_id', 'loc_destination_id',
+        string='Location Destination')
+    building = fields.Char(string='Building', size=35)
+    floor = fields.Char(string='Floor', size=35)
+    unit = fields.Char(string='Unit', size=35)
+    room = fields.Char(string='Room', size=35)
+    fsm_longitude = fields.Float(string='FSM Longitude')
+    fsm_latitude = fields.Float(string='FSM Latitude')
+    description = fields.Char(string='Description')
+    territory = fields.Char(string='Territory', size=35)
+    branch = fields.Char(string='Branch', size=35)
+    district = fields.Char(string='District', size=35)
+    region = fields.Char(string='Region', size=35)
+    fsm_address1 = fields.Char(string='FSM Address1', size=35)
+    fsm_address2 = fields.Char(string='FSM Address2', size=35)
+    fsm_city = fields.Char(string='FSM City', size=35)
+    fsm_state = fields.Char(string='FSM State', size=35)
+    fsm_country = fields.Char(string='FSM Country', size=35)
+    fsm_postal = fields.Char(string='FSM Postal', size=35)
+    timezone = fields.Char(string='Timezone', size=35)
+    
     @api.model
     def create(self, vals):
         vals.update({'fsm_location': True})
-        return super(FSMLocation, self).create(vals)
+        return super(FSMLocation, self).create(vals)
\ No newline at end of file
diff --git a/fieldservice/views/fsm_location.xml b/fieldservice/views/fsm_location.xml
index 2545459669..1e8c7b493b 100644
--- a/fieldservice/views/fsm_location.xml
+++ b/fieldservice/views/fsm_location.xml
@@ -1,17 +1,27 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
 
-    <!-- Field Service Location -->
+    <!-- Field Service Location Tree View-->
     <record id="fsm_location_tree_view" model="ir.ui.view">
         <field name="name">fsm.location.tree</field>
         <field name="model">fsm.location</field>
         <field name="arch" type="xml">
             <tree string="Locations">
                 <field name="name"/>
+                <field name="partner_id"/>
+                <field name="owner_id"/>
+                <field name="customer_id"/>
+                <field name="building"/>
+                <field name="floor"/>
+                <field name="unit"/>
+                <field name="room"/>
+                <field name="fsm_longitude"/>
+                <field name="fsm_latitude"/>
             </tree>
         </field>
     </record>
 
+    <!-- Field Service Location Form View-->
     <record id="fsm_location_form_view" model="ir.ui.view">
         <field name="name">fsm.location.form</field>
         <field name="model">fsm.location</field>
@@ -21,18 +31,88 @@
                     <group>
                         <group>
                             <field name="name"/>
+                            <field name="partner_id"/>
+                            <field name="owner_id"/>
+                            <field name="customer_id"/>
+                        </group>
+                        <group>
+                            <field name="building"/>
+                            <field name="floor"/>
+                            <field name="unit"/>
+                            <field name="room"/>
+                            <field name="fsm_longitude"/>
+                            <field name="fsm_latitude"/>
                         </group>
-                        <group></group>
                     </group>
                     <notebook>
                         <page string="Directions">
                             <field name="direction" nolabel="1" widget="html"/>
                         </page>
+                        <page string="Address Information">
+                            <group>
+                                <group>
+                                    <field name="territory"/>
+                                    <field name="branch"/>
+                                    <field name="district"/>
+                                    <field name="region"/>
+                                </group>
+                                <group>
+                                    <field name="fsm_address1"/>
+                                    <field name="fsm_address2"/>
+                                    <field name="fsm_city"/>
+                                    <field name="fsm_state"/>
+                                    <field name="fsm_postal"/>
+                                    <field name="fsm_country"/>
+                                </group>
+                            </group>
+                            <newline/>
+                            <group>
+                                <field name="description"/>
+                                <field name="timezone"/>
+                            </group>
+                        </page>
                     </notebook>
                 </sheet>
             </form>
         </field>
     </record>
+    
+    <!-- Field Service Location Search View-->
+    <record id="fsm_location_search_view" model="ir.ui.view">
+        <field name="name">fsm.location.search</field>
+        <field name="model">fsm.location</field>
+        <field name="arch" type="xml">
+            <search string="Search FSM Location">
+                <field name="name" filter_domain="['|', ('name','ilike',self)]" string="FSM Location"/>
+                <field name="partner_id"/>
+                <field name="owner_id"/>
+                <field name="customer_id"/>
+                <field name="building"/>
+                <field name="floor"/>
+                <field name="unit"/>
+                <field name="room"/>
+                <field name="fsm_longitude"/>
+                <field name="fsm_latitude"/>
+                <field name="territory"/>
+                <field name="branch"/>
+                <field name="district"/>
+                <field name="region"/>
+                <field name="fsm_address1"/>
+                <field name="fsm_address2"/>
+                <field name="fsm_city"/>
+                <field name="fsm_state"/>
+                <field name="fsm_postal"/>
+                <field name="fsm_country"/>
+                <field name="description"/>
+                <field name="timezone"/>
+                <group expand="0" string="Group By">
+                    <filter string="Partner" domain="[]" context="{'group_by':'partner_id'}"/>
+                    <filter string="Owner" domain="[]" context="{'group_by':'owner_id'}"/>
+                    <filter string="Customer" domain="[]" context="{'group_by':'customer_id'}"/>
+               </group>
+            </search>
+        </field>
+    </record>
 
     <record id="action_fsm_location" model="ir.actions.act_window">
         <field name="name">Service Locations</field>
@@ -40,6 +120,7 @@
         <field name="view_id" ref="fsm_location_tree_view"/>
         <field name="view_type">form</field>
         <field name="view_mode">tree,form</field>
+        <field name="search_view_id" ref="fsm_location_search_view"/>
         <field name="help" type="html">
             <p class="oe_view_nocontent_create">
                 Create a Service Locations.
@@ -50,4 +131,4 @@
         </field>
     </record>
 
-</odoo>
+</odoo>
\ No newline at end of file

From 82244c7a6382034060add21b4ab2e996a3691935 Mon Sep 17 00:00:00 2001
From: Sandip Mangukiya <smangukiya@ursainfosystems.com>
Date: Wed, 10 Oct 2018 08:02:04 -0700
Subject: [PATCH 2/5] [ADD]12567: Update README.rst file

---
 fieldservice/README.rst | 1 +
 1 file changed, 1 insertion(+)

diff --git a/fieldservice/README.rst b/fieldservice/README.rst
index 53b4fa715f..a0766d36ea 100644
--- a/fieldservice/README.rst
+++ b/fieldservice/README.rst
@@ -85,6 +85,7 @@ Contributors
 * Wolfgang Hall <whall@opensourceintegrators.com>
 * Maxime Chambreuil <mchambreuil@opensourceintegrators.com>
 * Steve Campbell <scampbell@opensourceintegrators.com>
+* Sandip Mangukiya <smangukiya@opensourceintegrators.com>
 
 Other credits
 ~~~~~~~~~~~~~

From 7f68ef55b760a8ab46e9ed3fa581f51d1903a406 Mon Sep 17 00:00:00 2001
From: Maxime Chambreuil <mchambreuil@opensourceintegrators.com>
Date: Fri, 12 Oct 2018 13:31:10 -0500
Subject: [PATCH 3/5] [IMP]

---
 fieldservice/__manifest__.py        |  1 +
 fieldservice/models/fsm_location.py | 27 ++++-------------
 fieldservice/views/fsm_location.xml | 47 +++++++++++++----------------
 3 files changed, 28 insertions(+), 47 deletions(-)

diff --git a/fieldservice/__manifest__.py b/fieldservice/__manifest__.py
index beee4c86e6..3fbc12de82 100644
--- a/fieldservice/__manifest__.py
+++ b/fieldservice/__manifest__.py
@@ -9,6 +9,7 @@
     'author': 'Open Source Integrators, Odoo Community Association (OCA)',
     'website': 'https://github.com/OCA/field-service',
     'depends': [
+        'base_geolocalize',
         'mail',
         'web_timeline',
     ],
diff --git a/fieldservice/models/fsm_location.py b/fieldservice/models/fsm_location.py
index 7f5b35c1ba..c39b8a7f5a 100644
--- a/fieldservice/models/fsm_location.py
+++ b/fieldservice/models/fsm_location.py
@@ -19,38 +19,23 @@ class FSMLocation(models.Model):
     customer_id = fields.Many2one('res.partner', string='Related Customer',
                                  required=True, ondelete='restrict',
                                  auto_join=True)
-    location_type_ids = fields.Many2many('fsm.tag',
-        'location_type_fsm_tag', 'fsm_location_id', 'loc_type_id',
-        string='Location Type')
-    location_material_ids = fields.Many2many('fsm.tag',
-        'location_material_fsm_tag', 'fsm_location_id', 'loc_material_id',
-        string='Location Material')
-    tanent_categ_ids = fields.Many2many('fsm.tag',
-        'tanent_categ_fsm_tag', 'fsm_location_id', 'tanent_categ_id',
-        string='Tanent Category')
-    location_destination_ids = fields.Many2many('fsm.tag',
-        'location_destination_fsm_tag', 'fsm_location_id', 'loc_destination_id',
-        string='Location Destination')
+    tag_ids = fields.Many2many('fsm.tag',
+                               'location_tag',
+                               'fsm_location_id',
+                               'fsm_location_id',
+                               string='Tags')
     building = fields.Char(string='Building', size=35)
     floor = fields.Char(string='Floor', size=35)
     unit = fields.Char(string='Unit', size=35)
     room = fields.Char(string='Room', size=35)
-    fsm_longitude = fields.Float(string='FSM Longitude')
-    fsm_latitude = fields.Float(string='FSM Latitude')
     description = fields.Char(string='Description')
     territory = fields.Char(string='Territory', size=35)
     branch = fields.Char(string='Branch', size=35)
     district = fields.Char(string='District', size=35)
     region = fields.Char(string='Region', size=35)
-    fsm_address1 = fields.Char(string='FSM Address1', size=35)
-    fsm_address2 = fields.Char(string='FSM Address2', size=35)
-    fsm_city = fields.Char(string='FSM City', size=35)
-    fsm_state = fields.Char(string='FSM State', size=35)
-    fsm_country = fields.Char(string='FSM Country', size=35)
-    fsm_postal = fields.Char(string='FSM Postal', size=35)
     timezone = fields.Char(string='Timezone', size=35)
     
     @api.model
     def create(self, vals):
         vals.update({'fsm_location': True})
-        return super(FSMLocation, self).create(vals)
\ No newline at end of file
+        return super(FSMLocation, self).create(vals)
diff --git a/fieldservice/views/fsm_location.xml b/fieldservice/views/fsm_location.xml
index 1e8c7b493b..c14dabe918 100644
--- a/fieldservice/views/fsm_location.xml
+++ b/fieldservice/views/fsm_location.xml
@@ -8,15 +8,14 @@
         <field name="arch" type="xml">
             <tree string="Locations">
                 <field name="name"/>
-                <field name="partner_id"/>
                 <field name="owner_id"/>
                 <field name="customer_id"/>
                 <field name="building"/>
                 <field name="floor"/>
                 <field name="unit"/>
                 <field name="room"/>
-                <field name="fsm_longitude"/>
-                <field name="fsm_latitude"/>
+                <field name="partner_latitude"/>
+                <field name="partner_longitude"/>
             </tree>
         </field>
     </record>
@@ -40,8 +39,8 @@
                             <field name="floor"/>
                             <field name="unit"/>
                             <field name="room"/>
-                            <field name="fsm_longitude"/>
-                            <field name="fsm_latitude"/>
+                            <field name="partner_latitude"/>
+                            <field name="partner_longitude"/>
                         </group>
                     </group>
                     <notebook>
@@ -57,12 +56,12 @@
                                     <field name="region"/>
                                 </group>
                                 <group>
-                                    <field name="fsm_address1"/>
-                                    <field name="fsm_address2"/>
-                                    <field name="fsm_city"/>
-                                    <field name="fsm_state"/>
-                                    <field name="fsm_postal"/>
-                                    <field name="fsm_country"/>
+                                    <field name="street"/>
+                                    <field name="street2"/>
+                                    <field name="city"/>
+                                    <field name="state_id"/>
+                                    <field name="zip"/>
+                                    <field name="country_id"/>
                                 </group>
                             </group>
                             <newline/>
@@ -76,7 +75,7 @@
             </form>
         </field>
     </record>
-    
+
     <!-- Field Service Location Search View-->
     <record id="fsm_location_search_view" model="ir.ui.view">
         <field name="name">fsm.location.search</field>
@@ -91,25 +90,24 @@
                 <field name="floor"/>
                 <field name="unit"/>
                 <field name="room"/>
-                <field name="fsm_longitude"/>
-                <field name="fsm_latitude"/>
+                <field name="partner_latitude"/>
+                <field name="partner_longitude"/>
                 <field name="territory"/>
                 <field name="branch"/>
                 <field name="district"/>
                 <field name="region"/>
-                <field name="fsm_address1"/>
-                <field name="fsm_address2"/>
-                <field name="fsm_city"/>
-                <field name="fsm_state"/>
-                <field name="fsm_postal"/>
-                <field name="fsm_country"/>
+                <field name="stree"/>
+                <field name="street2"/>
+                <field name="city"/>
+                <field name="state_id"/>
+                <field name="zip"/>
+                <field name="country_id"/>
                 <field name="description"/>
                 <field name="timezone"/>
                 <group expand="0" string="Group By">
-                    <filter string="Partner" domain="[]" context="{'group_by':'partner_id'}"/>
                     <filter string="Owner" domain="[]" context="{'group_by':'owner_id'}"/>
                     <filter string="Customer" domain="[]" context="{'group_by':'customer_id'}"/>
-               </group>
+                </group>
             </search>
         </field>
     </record>
@@ -125,10 +123,7 @@
             <p class="oe_view_nocontent_create">
                 Create a Service Locations.
             </p>
-            <p>
-                Module not yet enabled.
-            </p>
         </field>
     </record>
 
-</odoo>
\ No newline at end of file
+</odoo>

From 74479f3c215241f65cd90ea09933116e59810164 Mon Sep 17 00:00:00 2001
From: Maxime Chambreuil <mchambreuil@opensourceintegrators.com>
Date: Fri, 12 Oct 2018 13:57:27 -0500
Subject: [PATCH 4/5] [FIX]

---
 fieldservice/models/fsm_location.py | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/fieldservice/models/fsm_location.py b/fieldservice/models/fsm_location.py
index c39b8a7f5a..7c3f5a8f6d 100644
--- a/fieldservice/models/fsm_location.py
+++ b/fieldservice/models/fsm_location.py
@@ -14,15 +14,12 @@ class FSMLocation(models.Model):
                                  required=True, ondelete='restrict',
                                  auto_join=True)
     owner_id = fields.Many2one('res.partner', string='Related Owner',
-                                 required=True, ondelete='restrict',
-                                 auto_join=True)
+                               required=True, ondelete='restrict',
+                               auto_join=True)
     customer_id = fields.Many2one('res.partner', string='Related Customer',
-                                 required=True, ondelete='restrict',
-                                 auto_join=True)
+                                  required=True, ondelete='restrict',
+                                  auto_join=True)
     tag_ids = fields.Many2many('fsm.tag',
-                               'location_tag',
-                               'fsm_location_id',
-                               'fsm_location_id',
                                string='Tags')
     building = fields.Char(string='Building', size=35)
     floor = fields.Char(string='Floor', size=35)
@@ -34,7 +31,7 @@ class FSMLocation(models.Model):
     district = fields.Char(string='District', size=35)
     region = fields.Char(string='Region', size=35)
     timezone = fields.Char(string='Timezone', size=35)
-    
+
     @api.model
     def create(self, vals):
         vals.update({'fsm_location': True})

From a5f9d6d7de1327c715b2c99552c5d0b13262f19e Mon Sep 17 00:00:00 2001
From: Maxime Chambreuil <mchambreuil@opensourceintegrators.com>
Date: Fri, 12 Oct 2018 14:04:33 -0500
Subject: [PATCH 5/5] [FIX]

---
 fieldservice/views/fsm_location.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fieldservice/views/fsm_location.xml b/fieldservice/views/fsm_location.xml
index c14dabe918..949df5a0ab 100644
--- a/fieldservice/views/fsm_location.xml
+++ b/fieldservice/views/fsm_location.xml
@@ -96,7 +96,7 @@
                 <field name="branch"/>
                 <field name="district"/>
                 <field name="region"/>
-                <field name="stree"/>
+                <field name="street"/>
                 <field name="street2"/>
                 <field name="city"/>
                 <field name="state_id"/>