From b624473b2ac5f5cbae35c679cd22c1f3ad51f7d3 Mon Sep 17 00:00:00 2001
From: nla-odoo <nla@odoo.com>
Date: Wed, 13 Dec 2017 18:43:29 +0530
Subject: [PATCH] [FIX] google_calendar: GC settings are now on the general
 settings page

---
 addons/google_calendar/controllers/main.py             |  2 +-
 .../views/res_config_settings_views.xml                | 10 +---------
 2 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/addons/google_calendar/controllers/main.py b/addons/google_calendar/controllers/main.py
index 43138713a0e..fb40a631a03 100644
--- a/addons/google_calendar/controllers/main.py
+++ b/addons/google_calendar/controllers/main.py
@@ -24,7 +24,7 @@ class GoogleCalendarController(http.Controller):
             if not client_id or client_id == '':
                 action_id = ''
                 if GoogleCal.can_authorize_google():
-                    action_id = request.env.ref('google_calendar.action_config_settings_google_calendar').id
+                    action_id = request.env.ref('base_setup.action_general_configuration').id
                 return {
                     "status": "need_config_from_admin",
                     "url": '',
diff --git a/addons/google_calendar/views/res_config_settings_views.xml b/addons/google_calendar/views/res_config_settings_views.xml
index a17e5aa4156..a7874c34c69 100644
--- a/addons/google_calendar/views/res_config_settings_views.xml
+++ b/addons/google_calendar/views/res_config_settings_views.xml
@@ -19,18 +19,10 @@
             </field>
         </record>
 
-        <record id="action_config_settings_google_calendar" model="ir.actions.act_window">
-            <field name="name">Settings</field>
-            <field name="type">ir.actions.act_window</field>
-            <field name="res_model">res.config.settings</field>
-            <field name="view_mode">form</field>
-            <field name="target">inline</field>
-        </record>
-
         <menuitem id="menu_calendar_google_tech_config"
             name="API Credentials"
             parent="calendar.menu_calendar_configuration"
             groups="base.group_no_one"
-            action="action_config_settings_google_calendar"/>
+            action="base_setup.action_general_configuration"/>
 
 </odoo>