diff --git a/crm/calendar/google_calendar_credentials.rst b/crm/calendar/google_calendar_credentials.rst index ec7202307..c5b486320 100644 --- a/crm/calendar/google_calendar_credentials.rst +++ b/crm/calendar/google_calendar_credentials.rst @@ -1,51 +1,84 @@ -===================================================== -How to synchronize your calendar with Google Calendar -===================================================== +========================================================== +How to synchronize your Odoo Calendar with Google Calendar +========================================================== -- Connect on your google account and go to `https://console.developers.google.com/ `_. +Odoo is perfectly integrated with Google Calendar so that you +can see & manage your meetings from both platforms +(updates go through both directions). -- Click on **Create a project...** and enter a project name and change your id if you want. - Don't forget to accept the Terms of Services +Setup in Google +=============== +- Go to `Google APIs platform `__ + to generate Google Calendar API credentials. Log in with your Google account. + +- Choose *Calendar API*. .. image:: media/google_calendar_credentials01.png :align: center -- In the menu on left side, select the sub menu APIs (from menu APIs and auth) and click on 'Calendar API'. - Activate the Calendar API by clicking on the blue button 'Enable API'. - When it's done, the Calendar API overview will be available +- Create a new project and give it a name (e.g. Odoo). This project is needed + to store your API credentials. .. image:: media/google_calendar_credentials02.png :align: center +- Enable the API. + .. image:: media/google_calendar_credentials03.png :align: center +- Create credentials to use in Odoo. + .. image:: media/google_calendar_credentials04.png :align: center -- In the menu on left side, select the sub menu 'Credentials' (from menu APIs and auth) and click on - button 'Create new Client ID' +- Select *Web browser (Javascript)* + as calling source and *User data* as kind of data. .. image:: media/google_calendar_credentials05.png :align: center -- Check that the Application type is set on 'Web Application', then click on 'Configure consent screen'. - Specify an email address and a product name, then save. +- Then you can create a Client ID. + Enter the name of the application (e.g. Odoo) and the allowed pages on + which you will be redirected. The *Authorized JavaScript origin* is your + Odoo's instance URL. The *Authorized redirect URI* is your Odoo's instance + URL followed by '/google_account/authentication'. .. image:: media/google_calendar_credentials06.png :align: center +- Go through the Consent Screen step by entering a product name + (e.g. Odoo). Feel free to check the customizations options + but this is not mandatory. The Consent Screen will only show up when you + enter the Client ID in Odoo for the first time. + +- Finally you are provided with your **Client ID**. Go to *Credentials* to + get the **Client secret** as well. You will need both of them in Odoo. + .. image:: media/google_calendar_credentials07.png :align: center -You should now configure the allowed pages on which you will be redirected. To do it, you need to complete the field "Authorized redirect URI" and set as value (your own domain followed by '/google_account/authentication'): -==> http://mydomain.odoo.com/google_account/authentication -You can now click on 'Create Client ID' +Setup in Odoo +============= + +- Install **Google Calendar** app. .. image:: media/google_calendar_credentials08.png :align: center -- Once done, you will have the both informations (Client ID and Client Secret) that you need to insert in the 2 fields below! +- Go to :menuselection:`Settings --> General Settings` and enter your + credentials in Google Calendar option. .. image:: media/google_calendar_credentials09.png :align: center + +- The setup is now ready. Open your Odoo Calendar and sync with Google. + The first time you do it you are redirected to Google to authorize + the connection. Once back in Odoo, click the sync button again. + You can click it whenever you want to synchronize your calendar. + +.. image:: media/google_calendar_credentials10.png + :align: center + +As of now you no longer have excuses to miss a meeting! + diff --git a/crm/calendar/media/google_calendar_credentials01.png b/crm/calendar/media/google_calendar_credentials01.png index ea3fe2639..534961a15 100644 Binary files a/crm/calendar/media/google_calendar_credentials01.png and b/crm/calendar/media/google_calendar_credentials01.png differ diff --git a/crm/calendar/media/google_calendar_credentials02.png b/crm/calendar/media/google_calendar_credentials02.png index c8aa3f2dc..4a45286ab 100644 Binary files a/crm/calendar/media/google_calendar_credentials02.png and b/crm/calendar/media/google_calendar_credentials02.png differ diff --git a/crm/calendar/media/google_calendar_credentials03.png b/crm/calendar/media/google_calendar_credentials03.png index 842a2794c..a3978af38 100644 Binary files a/crm/calendar/media/google_calendar_credentials03.png and b/crm/calendar/media/google_calendar_credentials03.png differ diff --git a/crm/calendar/media/google_calendar_credentials04.png b/crm/calendar/media/google_calendar_credentials04.png index f4d24254a..567b626e8 100644 Binary files a/crm/calendar/media/google_calendar_credentials04.png and b/crm/calendar/media/google_calendar_credentials04.png differ diff --git a/crm/calendar/media/google_calendar_credentials05.png b/crm/calendar/media/google_calendar_credentials05.png index 10c460c85..52a8548ce 100644 Binary files a/crm/calendar/media/google_calendar_credentials05.png and b/crm/calendar/media/google_calendar_credentials05.png differ diff --git a/crm/calendar/media/google_calendar_credentials06.png b/crm/calendar/media/google_calendar_credentials06.png index 6da28abe7..1a7223b9a 100644 Binary files a/crm/calendar/media/google_calendar_credentials06.png and b/crm/calendar/media/google_calendar_credentials06.png differ diff --git a/crm/calendar/media/google_calendar_credentials07.png b/crm/calendar/media/google_calendar_credentials07.png index 37bd91787..140b97624 100644 Binary files a/crm/calendar/media/google_calendar_credentials07.png and b/crm/calendar/media/google_calendar_credentials07.png differ diff --git a/crm/calendar/media/google_calendar_credentials08.png b/crm/calendar/media/google_calendar_credentials08.png index db3c955e4..8a55f7ae3 100644 Binary files a/crm/calendar/media/google_calendar_credentials08.png and b/crm/calendar/media/google_calendar_credentials08.png differ diff --git a/crm/calendar/media/google_calendar_credentials09.png b/crm/calendar/media/google_calendar_credentials09.png index a2216d893..ba4d03604 100644 Binary files a/crm/calendar/media/google_calendar_credentials09.png and b/crm/calendar/media/google_calendar_credentials09.png differ diff --git a/crm/calendar/media/google_calendar_credentials10.png b/crm/calendar/media/google_calendar_credentials10.png new file mode 100644 index 000000000..3bc3d5be3 Binary files /dev/null and b/crm/calendar/media/google_calendar_credentials10.png differ diff --git a/website/optimize/google_analytics_dashboard.rst b/website/optimize/google_analytics_dashboard.rst index 49b6f5865..93d944a9a 100644 --- a/website/optimize/google_analytics_dashboard.rst +++ b/website/optimize/google_analytics_dashboard.rst @@ -1,8 +1,8 @@ -============================================================ -How to track your website's traffic from your Odoo Dashboard -============================================================ +========================================================== +How to track your website traffic from your Odoo Dashboard +========================================================== -You can follow your traffic's statistics straight from your Odoo Website +You can follow your traffic statistics straight from your Odoo Website Dashboard thanks to Google Analytics. - A preliminary step is creating a Google Analytics account and entering the @@ -13,35 +13,39 @@ Dashboard thanks to Google Analytics. - Select Analytics API. - .. image:: media/google_analytics_api.png - :align: center +.. image:: media/google_analytics_api.png + :align: center -- Create a new project and give it a name (e.g. Google Analytics in Odoo). +- Create a new project and give it a name (e.g. Odoo). + This project is needed to store your API credentials. - .. image:: media/google_analytics_create_project.png - :align: center +.. image:: media/google_analytics_create_project.png + :align: center - Enable the API. - .. image:: media/google_analytics_enable.png - :align: center +.. image:: media/google_analytics_enable.png + :align: center -- Create credentials to use in Odoo. Select *Web browser (Javascript)* +- Create credentials to use in Odoo. + +.. image:: media/google_analytics_create_credentials.png + :align: center + +- Select *Web browser (Javascript)* as calling source and *User data* as kind of data. - .. image:: media/google_analytics_create_credentials.png - :align: center +.. image:: media/google_analytics_get_credentials.png + :align: center - .. image:: media/google_analytics_get_credentials.png - :align: center - -- Then enter the name of the application (e.g. Odoo) and the allowed pages on +- Then you can create a Client ID. + Enter the name of the application (e.g. Odoo) and the allowed pages on which you will be redirected. The *Authorized JavaScript origin* is your Odoo's instance URL. The *Authorized redirect URI* is your Odoo's instance - URL followed by /google_account/authentication. + URL followed by '/google_account/authentication'. - .. image:: media/google_analytics_authorization.png - :align: center +.. image:: media/google_analytics_authorization.png + :align: center - Go through the Consent Screen step by entering a product name @@ -51,16 +55,16 @@ Dashboard thanks to Google Analytics. - Finally you are provided with your Client ID. Copy and paste it in Odoo. - .. image:: media/google_analytics_client_id.png - :align: center +.. image:: media/google_analytics_client_id.png + :align: center - Open your Website Dashboard in Odoo and link your Analytics account. to past your Client ID. - .. image:: media/google_analytics_start.png - :align: center +.. image:: media/google_analytics_start.png + :align: center - As a last step, authorize Odoo to access Google API. - .. image:: media/google_analytics_login.png - :align: center +.. image:: media/google_analytics_login.png + :align: center diff --git a/website/optimize/media/google_analytics_client_id.png b/website/optimize/media/google_analytics_client_id.png index a76a26ba5..c78ee713f 100644 Binary files a/website/optimize/media/google_analytics_client_id.png and b/website/optimize/media/google_analytics_client_id.png differ