Merge branch 'OCA:16.0' into 16.0

README.md

@@ -21,15 +21,18 @@ Available addons
 ----------------
 addon | version | maintainers | summary
 --- | --- | --- | ---
-[website_cookiebot](website_cookiebot/) | 16.0.1.0.0 |  | Ask for cookies consent connecting with Cookiebot
+[website_analytics_matomo](website_analytics_matomo/) | 16.0.1.0.0 |  | Track website users using matomo
+[website_cookiebot](website_cookiebot/) | 16.0.2.0.0 |  | Ask for cookies consent connecting with Cookiebot
 [website_cookiefirst](website_cookiefirst/) | 16.0.1.0.0 |  | Cookiefirst integration
 [website_crm_privacy_policy](website_crm_privacy_policy/) | 16.0.2.0.0 |  | Website CRM privacy policy
 [website_crm_quick_answer](website_crm_quick_answer/) | 16.0.1.0.0 |  | Add an automatic answer for contacts asking for info
 [website_form_require_legal](website_form_require_legal/) | 16.0.1.1.0 |  | Add possibility to require confirm legal terms.
 [website_forum_subscription](website_forum_subscription/) | 16.0.1.0.0 |  | Adds a button to allow subscription from the website
-[website_google_tag_manager](website_google_tag_manager/) | 16.0.1.0.0 |  | Add support for Google Tag Manager
+[website_google_tag_manager](website_google_tag_manager/) | 16.0.1.0.1 |  | Add support for Google Tag Manager
 [website_legal_page](website_legal_page/) | 16.0.1.1.0 |  | Website Legal Page
+[website_menu_by_user_status](website_menu_by_user_status/) | 16.0.1.0.0 |  | Allow to manage the display of website.menus
 [website_odoo_debranding](website_odoo_debranding/) | 16.0.1.0.0 |  | Remove Odoo Branding from Website
+[website_recaptcha_v2](website_recaptcha_v2/) | 16.0.1.0.0 |  | Helper module to add reCAPTCHA v2 to website forms
 [website_require_login](website_require_login/) | 16.0.1.0.0 |  | Website Login Required
 [website_snippet_country_dropdown](website_snippet_country_dropdown/) | 16.0.1.0.0 |  | Allow to select country in a dropdown
 [website_whatsapp](website_whatsapp/) | 16.0.1.0.1 | [![ioans73](https://github.com/ioans73.png?size=30px)](https://github.com/ioans73) | Whatsapp integration

setup/_metapackage/VERSION.txt

@@ -1 +1 @@
-16.0.20240605.0
+16.0.20241217.0

setup/_metapackage/setup.py

@@ -8,6 +8,7 @@
     description="Meta package for oca-website Odoo addons",
     version=version,
     install_requires=[
+        'odoo-addon-website_analytics_matomo>=16.0dev,<16.1dev',
         'odoo-addon-website_cookiebot>=16.0dev,<16.1dev',
         'odoo-addon-website_cookiefirst>=16.0dev,<16.1dev',
         'odoo-addon-website_crm_privacy_policy>=16.0dev,<16.1dev',
@@ -16,7 +17,9 @@
         'odoo-addon-website_forum_subscription>=16.0dev,<16.1dev',
         'odoo-addon-website_google_tag_manager>=16.0dev,<16.1dev',
         'odoo-addon-website_legal_page>=16.0dev,<16.1dev',
+        'odoo-addon-website_menu_by_user_status>=16.0dev,<16.1dev',
         'odoo-addon-website_odoo_debranding>=16.0dev,<16.1dev',
+        'odoo-addon-website_recaptcha_v2>=16.0dev,<16.1dev',
         'odoo-addon-website_require_login>=16.0dev,<16.1dev',
         'odoo-addon-website_snippet_country_dropdown>=16.0dev,<16.1dev',
         'odoo-addon-website_whatsapp>=16.0dev,<16.1dev',

setup/website_analytics_matomo/odoo/addons/website_analytics_matomo

@@ -0,0 +1 @@
+../../../../website_analytics_matomo

setup/website_analytics_matomo/setup.py

@@ -0,0 +1,6 @@
+import setuptools
+
+setuptools.setup(
+    setup_requires=['setuptools-odoo'],
+    odoo_addon=True,
+)

setup/website_menu_by_user_status/odoo/addons/website_menu_by_user_status

@@ -0,0 +1 @@
+../../../../website_menu_by_user_status

setup/website_menu_by_user_status/setup.py

@@ -0,0 +1,6 @@
+import setuptools
+
+setuptools.setup(
+    setup_requires=['setuptools-odoo'],
+    odoo_addon=True,
+)

setup/website_recaptcha_v2/odoo/addons/website_recaptcha_v2

@@ -0,0 +1 @@
+../../../../website_recaptcha_v2

setup/website_recaptcha_v2/setup.py

@@ -0,0 +1,6 @@
+import setuptools
+
+setuptools.setup(
+    setup_requires=['setuptools-odoo'],
+    odoo_addon=True,
+)

website_analytics_matomo/README.rst

@@ -0,0 +1,138 @@
+================
+Matomo analytics
+================
+
+.. 
+   !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+   !! This file is generated by oca-gen-addon-readme !!
+   !! changes will be overwritten.                   !!
+   !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+   !! source digest: sha256:f3a346379593d7db197fd607e40aa8ce6e9cfa93d882d88c9de993ced8ba4433
+   !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+
+.. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png
+    :target: https://odoo-community.org/page/development-status
+    :alt: Beta
+.. |badge2| image:: https://img.shields.io/badge/licence-AGPL--3-blue.png
+    :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html
+    :alt: License: AGPL-3
+.. |badge3| image:: https://img.shields.io/badge/github-OCA%2Fwebsite-lightgray.png?logo=github
+    :target: https://github.com/OCA/website/tree/16.0/website_analytics_matomo
+    :alt: OCA/website
+.. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png
+    :target: https://translation.odoo-community.org/projects/website-16-0/website-16-0-website_analytics_matomo
+    :alt: Translate me on Weblate
+.. |badge5| image:: https://img.shields.io/badge/runboat-Try%20me-875A7B.png
+    :target: https://runboat.odoo-community.org/builds?repo=OCA/website&target_branch=16.0
+    :alt: Try me on Runboat
+
+|badge1| |badge2| |badge3| |badge4| |badge5|
+
+This module allows to simply configure your odoo website for using Matomo_.
+
+.. _Matomo: http://matomo.org
+
+If your website is a webshop, also consider to install the OCA module
+`website_sale_analytics_matomo` to enable full Ecommerce reporting with Matomo Analytics.
+
+**Table of contents**
+
+.. contents::
+   :local:
+
+Configuration
+=============
+
+To configure this module, you need to:
+
+* go to Settings/General Settings/Website
+* enable `Matomo Analytics`
+* fill in `Matomo website ID` and `Matomo host`
+
+At this point your website is already setup for being tracked in Matomo.
+
+Some more advanced features offered by Matomo can be configured as follows:
+
+User ID feature
+~~~~~~~~~~~~~~~
+
+Matomo includes a User ID feature for enhanced tracking on those websites that offer the ability for visitors to log in.
+By tracking the User ID (unique identifier), it is possible to connect visitors between visits across multiple dates
+and devices.
+
+To enable this feature, set `Enable User ID`: Matomo will track the user's `ID` (model `res.users`).
+If you want to use a different field, eg: user's `name` or `login`, you need to override method `compute_matomo_userid()`.
+
+Enable a Heartbeat timer
+~~~~~~~~~~~~~~~~~~~~~~~~
+
+In order to better measure the time spent in the visit, the active page can send additional
+ping requests to Matomo. These requests will not track additional actions or page views.
+They just allow Matomo to know whether the user is actively viewing the page (the tab
+should be active and in focus).
+
+To enable this feature, set `Enable heartbeat` and define the Active Time.
+
+By default, the Active Time is set to 15 seconds, meaning only if the page was viewed
+for at least 15 seconds (and the user leaves the page or focuses away from the tab)
+then a ping request will be sent.
+
+Matomo Event Tracking
+~~~~~~~~~~~~~~~~~~~~~
+
+As explained in this page https://matomo.org/faq/reports/implement-event-tracking-with-matomo/
+on the official documentation of Matomo, there are two main ways to set up event tracking within Matomo:
+
+1. with the "Matomo Tag Manager" feature: this is the easiest and recommended way;
+2. by adding snippets of JavaScript code to your website itself.
+
+The first method is not supported by this module, however in OCA there's
+a dedicated module for that purpose: `website_matomo_tag_manager`.
+
+The second method can be used along with this module and requires a little more technical confidence.
+You will need to integrate a JavaScript snippet directly into your website’s code.
+
+Technical documentation can be found in:
+https://developer.matomo.org/guides/tracking-javascript-guide#manually-trigger-events
+
+Bug Tracker
+===========
+
+Bugs are tracked on `GitHub Issues <https://github.com/OCA/website/issues>`_.
+In case of trouble, please check there if your issue has already been reported.
+If you spotted it first, help us to smash it by providing a detailed and welcomed
+`feedback <https://github.com/OCA/website/issues/new?body=module:%20website_analytics_matomo%0Aversion:%2016.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**>`_.
+
+Do not contact contributors directly about support or help with technical issues.
+
+Credits
+=======
+
+Authors
+~~~~~~~
+
+* Onestein
+* Therp BV
+
+Contributors
+~~~~~~~~~~~~
+
+* Holger Brunn <[email protected]>
+* Andrea Stirpe <[email protected]>
+
+Maintainers
+~~~~~~~~~~~
+
+This module is maintained by the OCA.
+
+.. image:: https://odoo-community.org/logo.png
+   :alt: Odoo Community Association
+   :target: https://odoo-community.org
+
+OCA, or the Odoo Community Association, is a nonprofit organization whose
+mission is to support the collaborative development of Odoo features and
+promote its widespread use.
+
+This module is part of the `OCA/website <https://github.com/OCA/website/tree/16.0/website_analytics_matomo>`_ project on GitHub.
+
+You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute.

website_analytics_matomo/__init__.py

@@ -0,0 +1,4 @@
+# Copyright 2015 Therp BV <http://therp.nl>
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
+
+from . import models

website_analytics_matomo/__manifest__.py

@@ -0,0 +1,20 @@
+# Copyright 2015 Therp BV <http://therp.nl>
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
+
+{
+    "name": "Matomo analytics",
+    "version": "16.0.1.0.0",
+    "author": "Onestein,Therp BV,Odoo Community Association (OCA)",
+    "license": "AGPL-3",
+    "category": "Website",
+    "summary": "Track website users using matomo",
+    "website": "https://github.com/OCA/website",
+    "depends": [
+        "website",
+    ],
+    "data": [
+        "views/res_config_settings.xml",
+        "views/templates.xml",
+    ],
+    "installable": True,
+}

website_analytics_matomo/i18n/af.po

@@ -0,0 +1,129 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# * website_analytics_matomo
+#
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: website (8.0)\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2016-11-25 01:52+0000\n"
+"PO-Revision-Date: 2015-09-25 08:26+0000\n"
+"Last-Translator: <>\n"
+"Language-Team: Afrikaans (http://www.transifex.com/oca/OCA-website-8-0/"
+"language/af/)\n"
+"Language: af\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. module: website_analytics_matomo
+#: model_terms:ir.ui.view,arch_db:website_analytics_matomo.res_config_settings_view_form
+msgid "Active Time (seconds)"
+msgstr ""
+
+#. module: website_analytics_matomo
+#: model:ir.model,name:website_analytics_matomo.model_res_config_settings
+msgid "Config Settings"
+msgstr ""
+
+#. module: website_analytics_matomo
+#: model_terms:ir.ui.view,arch_db:website_analytics_matomo.res_config_settings_view_form
+msgid "Enable User ID"
+msgstr ""
+
+#. module: website_analytics_matomo
+#: model_terms:ir.ui.view,arch_db:website_analytics_matomo.res_config_settings_view_form
+msgid "Enable heartbeat"
+msgstr ""
+
+#. module: website_analytics_matomo
+#: model:ir.model.fields,help:website_analytics_matomo.field_res_config_settings__matomo_heartbeat_timer
+#: model:ir.model.fields,help:website_analytics_matomo.field_website__matomo_heartbeat_timer
+msgid "How many seconds a tab needs to be active to be counted as viewed."
+msgstr ""
+
+#. module: website_analytics_matomo
+#: model:ir.model.fields,field_description:website_analytics_matomo.field_res_config_settings__has_matomo_analytics
+#: model:ir.model.fields,field_description:website_analytics_matomo.field_website__has_matomo_analytics
+msgid "Matomo Analytics"
+msgstr ""
+
+#. module: website_analytics_matomo
+#: model:ir.model.fields,field_description:website_analytics_matomo.field_res_config_settings__matomo_enable_heartbeat
+#: model:ir.model.fields,field_description:website_analytics_matomo.field_website__matomo_enable_heartbeat
+msgid "Matomo Enable Heartbeat"
+msgstr ""
+
+#. module: website_analytics_matomo
+#: model:ir.model.fields,field_description:website_analytics_matomo.field_res_config_settings__matomo_enable_userid
+#: model:ir.model.fields,field_description:website_analytics_matomo.field_website__matomo_enable_userid
+msgid "Matomo Enable Userid"
+msgstr ""
+
+#. module: website_analytics_matomo
+#: model:ir.model.fields,field_description:website_analytics_matomo.field_website__matomo_get_userid
+msgid "Matomo Get Userid"
+msgstr ""
+
+#. module: website_analytics_matomo
+#: model:ir.model.fields,field_description:website_analytics_matomo.field_res_config_settings__matomo_heartbeat_timer
+#: model:ir.model.fields,field_description:website_analytics_matomo.field_website__matomo_heartbeat_timer
+msgid "Matomo Heartbeat Timer"
+msgstr ""
+
+#. module: website_analytics_matomo
+#: model:ir.model.fields,field_description:website_analytics_matomo.field_res_config_settings__matomo_analytics_host
+#: model:ir.model.fields,field_description:website_analytics_matomo.field_website__matomo_analytics_host
+msgid "Matomo host"
+msgstr ""
+
+#. module: website_analytics_matomo
+#: model:ir.model.fields,field_description:website_analytics_matomo.field_website__matomo_analytics_host_url
+msgid "Matomo host URL"
+msgstr ""
+
+#. module: website_analytics_matomo
+#: model:ir.model.fields,field_description:website_analytics_matomo.field_res_config_settings__matomo_analytics_id
+#: model:ir.model.fields,field_description:website_analytics_matomo.field_website__matomo_analytics_id
+msgid "Matomo website ID"
+msgstr ""
+
+#. module: website_analytics_matomo
+#: model_terms:ir.ui.view,arch_db:website_analytics_matomo.res_config_settings_view_form
+msgid ""
+"Set the Active Time in seconds. Only if the page was viewed for at least "
+"this\n"
+"                                    amount of time (and the user leaves the "
+"page or focuses away from the tab)\n"
+"                                    then a ping request will be sent."
+msgstr ""
+
+#. module: website_analytics_matomo
+#: model:ir.model.fields,help:website_analytics_matomo.field_res_config_settings__matomo_analytics_id
+#: model:ir.model.fields,help:website_analytics_matomo.field_website__matomo_analytics_id
+msgid "The ID Matomo uses to identify the website"
+msgstr ""
+
+#. module: website_analytics_matomo
+#: model:ir.model.fields,help:website_analytics_matomo.field_res_config_settings__matomo_analytics_host
+#: model:ir.model.fields,help:website_analytics_matomo.field_website__matomo_analytics_host
+msgid ""
+"The host/path your Matomo installation is accessible by on the internet."
+msgstr ""
+
+#. module: website_analytics_matomo
+#: model_terms:ir.ui.view,arch_db:website_analytics_matomo.res_config_settings_view_form
+msgid "Track visits in Matomo Analytics"
+msgstr ""
+
+#. module: website_analytics_matomo
+#: model:ir.model,name:website_analytics_matomo.model_website
+msgid "Website"
+msgstr "Webtuiste"
+
+#. module: website_analytics_matomo
+#: model_terms:ir.ui.view,arch_db:website_analytics_matomo.res_config_settings_view_form
+msgid "https://matomo.host.name/"
+msgstr ""