From 4592be3bfa1fc3a1805a8108526864934ac85d73 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Tue, 18 Aug 2015 12:42:16 +0200
Subject: [PATCH] [RENAME] event: type -> event_type_id

At last I will be able to remember that the type of an event is not
a string, but a m2o to event.type model.
---
 addons/event/data/event_demo.xml                  |  8 ++++----
 addons/event/models/event.py                      | 15 ++++++++-------
 addons/event/report/report_event_registration.py  |  6 +++---
 .../report/report_event_registration_view.xml     |  4 ++--
 addons/event/views/event_views.xml                | 12 ++++++------
 addons/event_sale/test/confirm.yml                |  2 +-
 addons/website_event/controllers/main.py          |  6 +++---
 addons/website_event/views/website_event.xml      |  8 ++++----
 8 files changed, 31 insertions(+), 30 deletions(-)

diff --git a/addons/event/data/event_demo.xml b/addons/event/data/event_demo.xml
index fd48b63de91..713b4e2da8d 100644
--- a/addons/event/data/event_demo.xml
+++ b/addons/event/data/event_demo.xml
@@ -34,7 +34,7 @@
         <field name="seats_availability">limited</field>
         <field name="seats_max">500</field>
         <field name="address_id" ref="base.res_partner_6"/>
-        <field name="type" ref="event_type_1"/>
+        <field name="event_type_id" ref="event_type_1"/>
         <field name="description"><![CDATA[
 <div class="oe_structure">
     <center><strong>Join us to our main event of the year: the Open Days</strong></center>
@@ -76,7 +76,7 @@
         <field name="name">Functional Webinar</field>
         <field eval="(DateTime.now() + timedelta(days=3)).strftime('%Y-%m-%d 7:00:00')" name="date_begin"/>
         <field eval="(DateTime.now() + timedelta(days=3)).strftime('%Y-%m-%d 11:00:00')" name="date_end"/>
-        <field name="type" ref="event_type_0"/>
+        <field name="event_type_id" ref="event_type_0"/>
         <field name="address_id" ref="base.res_partner_5"/>
         <field name="seats_availability">limited</field>
         <field name="seats_max">350</field>
@@ -112,7 +112,7 @@
         <field name="name">Conference on Business Apps</field>
         <field eval="(DateTime.today()+ timedelta(days=5)).strftime('%Y-%m-%d 7:00:00')" name="date_begin"/>
         <field eval="(DateTime.today()+ timedelta(days=5)).strftime('%Y-%m-%d 16:30:00')" name="date_end"/>
-        <field name="type" ref="event_type_2"/>
+        <field name="event_type_id" ref="event_type_2"/>
         <field name="address_id" ref="base.res_partner_14"/>
         <field name="seats_availability">limited</field>
         <field name="seats_max">200</field>
@@ -154,7 +154,7 @@
         <field name="name">Technical Training</field>
         <field eval="(DateTime.now() + timedelta(15)).strftime('%Y-%m-%d 7:00:00')" name="date_begin"/>
         <field eval="(DateTime.now() + timedelta(20)).strftime('%Y-%m-%d 16:00:00')" name="date_end"/>
-        <field name="type" ref="event_type_4"/>
+        <field name="event_type_id" ref="event_type_4"/>
         <field name="user_id" ref="base.user_root"/>
         <field name="address_id" ref="base.res_partner_2"/>
         <field name="seats_availability">unlimited</field>
diff --git a/addons/event/models/event.py b/addons/event/models/event.py
index 1b0b25f6637..59f34be38b7 100644
--- a/addons/event/models/event.py
+++ b/addons/event/models/event.py
@@ -42,9 +42,10 @@ class event_event(models.Model):
     organizer_id = fields.Many2one(
         'res.partner', string='Organizer',
         default=lambda self: self.env.user.company_id.partner_id)
-    type = fields.Many2one(
+    event_type_id = fields.Many2one(
         'event.type', string='Category',
-        readonly=False, states={'done': [('readonly', True)]})
+        readonly=False, states={'done': [('readonly', True)]},
+        oldname='type')
     color = fields.Integer('Kanban Color Index')
     event_mail_ids = fields.One2many('event.mail', 'event_id', string='Mail Schedule', default=lambda self: self._default_event_mail_ids())
 
@@ -237,12 +238,12 @@ class event_event(models.Model):
     def button_confirm(self):
         self.state = 'confirm'
 
-    @api.onchange('type')
+    @api.onchange('event_type_id')
     def _onchange_type(self):
-        if self.type:
-            self.seats_min = self.type.default_registration_min
-            self.seats_max = self.type.default_registration_max
-            self.reply_to = self.type.default_reply_to
+        if self.event_type_id:
+            self.seats_min = self.event_type_id.default_registration_min
+            self.seats_max = self.event_type_id.default_registration_max
+            self.reply_to = self.event_type_id.default_reply_to
 
     @api.multi
     def action_event_registration_report(self):
diff --git a/addons/event/report/report_event_registration.py b/addons/event/report/report_event_registration.py
index f57bbc970e1..ec58f656991 100644
--- a/addons/event/report/report_event_registration.py
+++ b/addons/event/report/report_event_registration.py
@@ -20,7 +20,7 @@ class report_event_registration(models.Model):
     seats_max = fields.Integer('Max Seats')
     nbevent = fields.Integer('Number of Events')
     nbregistration = fields.Integer('Number of Registrations')
-    event_type = fields.Many2one('event.type', 'Event Type')
+    event_type_id = fields.Many2one('event.type', 'Event Type')
     registration_state = fields.Selection([('draft', 'Draft'), ('confirm', 'Confirmed'), ('done', 'Attended'), ('cancel', 'Cancelled')], 'Registration State', readonly=True, required=True)
     event_state = fields.Selection([('draft', 'Draft'), ('confirm', 'Confirmed'), ('done', 'Done'), ('cancel', 'Cancelled')], 'Event State', readonly=True, required=True)
     user_id = fields.Many2one('res.users', 'Event Responsible', readonly=True)
@@ -46,7 +46,7 @@ class report_event_registration(models.Model):
                 CASE WHEN r.state IN ('draft') THEN count(r.event_id) ELSE 0 END AS draft_state,
                 CASE WHEN r.state IN ('open','done') THEN count(r.event_id) ELSE 0 END AS confirm_state,
                 CASE WHEN r.state IN ('cancel') THEN count(r.event_id) ELSE 0 END AS cancel_state,
-                e.type AS event_type,
+                e.event_type_id AS event_type_id,
                 e.seats_max AS seats_max,
                 e.state AS event_state,
                 r.state AS registration_state
@@ -58,7 +58,7 @@ class report_event_registration(models.Model):
                 event_id,
                 r.id,
                 registration_state,
-                event_type,
+                event_type_id,
                 e.id,
                 e.date_begin,
                 e.user_id,
diff --git a/addons/event/report/report_event_registration_view.xml b/addons/event/report/report_event_registration_view.xml
index fa141824eed..814cb31f7d2 100644
--- a/addons/event/report/report_event_registration_view.xml
+++ b/addons/event/report/report_event_registration_view.xml
@@ -38,13 +38,13 @@
                     <field name="event_id" string="Event"/>
                     <field name="user_id"/>
                     <group expand="0" string="Extended Filters...">
-                        <field name="event_type" widget="selection"/>
+                        <field name="event_type_id" widget="selection"/>
                         <field name="event_date"/>
                     </group>
                     <newline/>
                     <group expand="1" string="Group By">
                         <filter string="Attendee / Contact" context="{'group_by':'name_registration'}" help="Registration contact"/>
-                        <filter string="Event Type" context="{'group_by':'event_type'}"/>
+                        <filter string="Event Type" context="{'group_by':'event_type_id'}"/>
                         <filter string="Event" name="event" context="{'group_by':'event_id', 'max_reg_event_visible':0}"/>
                         <filter string="Event State" context="{'group_by':'event_state'}"/>
                         <filter string="Company" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
diff --git a/addons/event/views/event_views.xml b/addons/event/views/event_views.xml
index 0523fde6e43..9940627f6b6 100644
--- a/addons/event/views/event_views.xml
+++ b/addons/event/views/event_views.xml
@@ -86,7 +86,7 @@
                             </group>
                             <group>
                                 <field name="user_id"/>
-                                <field name="type"/>
+                                <field name="event_type_id"/>
                                 <field name="date_begin"/>
                                 <field name="date_end"/>
                                 <field name="date_tz" />
@@ -134,7 +134,7 @@
             <field name="arch" type="xml">
                 <tree string="Events" decoration-bf="message_unread==True" decoration-danger="(seats_min and seats_min&gt;seats_reserved) or (seats_max and seats_max&lt;seats_reserved)" decoration-muted="state=='cancel'">
                     <field name="name"/>
-                    <field name="type"/>
+                    <field name="event_type_id"/>
                     <field name="date_begin"/>
                     <field name="date_end"/>
                     <field name="seats_reserved"/>
@@ -213,9 +213,9 @@
             <field name="model">event.event</field>
             <field eval="2" name="priority"/>
             <field name="arch" type="xml">
-                <calendar color="type" date_start="date_begin" date_stop="date_end" string="Event Organization">
+                <calendar color="event_type_id" date_start="date_begin" date_stop="date_end" string="Event Organization">
                     <field name="name"/>
-                    <field name="type"/>
+                    <field name="event_type_id"/>
                 </calendar>
             </field>
         </record>
@@ -234,11 +234,11 @@
                     <filter string="My Events" help="My Events" domain="[('user_id','=',uid)]"/>
                     <separator/>
                     <filter string="Upcoming" name="upcoming" domain="[('date_begin','&gt;=', datetime.datetime.combine(context_today(), datetime.time(0,0,0)))]" help="Upcoming events from today" />
-                    <field name="type"/>
+                    <field name="event_type_id"/>
                     <field name="user_id"/>
                     <group expand="0" string="Group By">
                         <filter string="Responsible" context="{'group_by': 'user_id'}"/>
-                        <filter string="Event Type" context="{'group_by':'type'}"/>
+                        <filter string="Event Type" context="{'group_by':'event_type_id'}"/>
                         <filter string="Status" context="{'group_by':'state'}"/>
                         <filter string="Start Month" domain="[]" context="{'group_by':'date_begin'}"/>
                     </group>
diff --git a/addons/event_sale/test/confirm.yml b/addons/event_sale/test/confirm.yml
index c32e84954d2..64283b3f808 100644
--- a/addons/event_sale/test/confirm.yml
+++ b/addons/event_sale/test/confirm.yml
@@ -13,7 +13,7 @@
 -
     !record {model: event.event,id: event}:
          name: test_event
-         type: 1
+         event_type_id: 1
          date_end: '2012-01-01 19:05:15'
          date_begin: '2012-01-01 18:05:15'
 -
diff --git a/addons/website_event/controllers/main.py b/addons/website_event/controllers/main.py
index f094402897f..d6e42dd00e2 100644
--- a/addons/website_event/controllers/main.py
+++ b/addons/website_event/controllers/main.py
@@ -72,7 +72,7 @@ class website_event(http.Controller):
                     current_date = date[1]
         if searches["type"] != 'all':
             current_type = type_obj.browse(cr, uid, int(searches['type']), context=context)
-            domain_search["type"] = [("type", "=", int(searches["type"]))]
+            domain_search["type"] = [("event_type_id", "=", int(searches["type"]))]
 
         if searches["country"] != 'all' and searches["country"] != 'online':
             current_country = country_obj.browse(cr, uid, int(searches['country']), context=context)
@@ -96,8 +96,8 @@ class website_event(http.Controller):
 
         domain = dom_without('type')
         types = event_obj.read_group(
-            request.cr, request.uid, domain, ["id", "type"], groupby="type",
-            orderby="type", context=request.context)
+            request.cr, request.uid, domain, ["id", "event_type_id"], groupby="event_type_id",
+            orderby="event_type_id", context=request.context)
         type_count = event_obj.search(request.cr, request.uid, domain,
                                       count=True, context=request.context)
         types.insert(0, {
diff --git a/addons/website_event/views/website_event.xml b/addons/website_event/views/website_event.xml
index 02345d0a81d..c1dca8cf4d9 100644
--- a/addons/website_event/views/website_event.xml
+++ b/addons/website_event/views/website_event.xml
@@ -73,8 +73,8 @@
                                     "widget": "contact",
                                     "fields": ["city"]
                                     }'/>
-                                <div class="text-muted" t-if="event.type">
-                                    <i class="fa fa-tag"></i> <span t-field="event.type"/>
+                                <div class="text-muted" t-if="event.event_type_id">
+                                    <i class="fa fa-tag"></i> <span t-field="event.event_type_id"/>
                                 </div>
                             </div>
                         </li>
@@ -204,8 +204,8 @@
                 <div class="col-sm-7" id="event_menu">
                     <ol class="breadcrumb mb0" t-if="not event.menu_id">
                         <li><a href="/event">All Events</a></li>
-                        <li t-if="event.type">
-                            <a t-attf-href="/event?type=#{event.type.id}" t-esc="event.type.name"/>
+                        <li t-if="event.event_type_id">
+                            <a t-attf-href="/event?type=#{event.event_type_id.id}" t-esc="event.event_type_id.name"/>
                         </li>
                         <li t-if="event.country_id">
                             <a t-attf-href="/event?country=#{event.country_id.id}" t-esc="event.country_id.name"/>