From 201d9646e79345ee9a19b38a6b527fbce9e1c8f2 Mon Sep 17 00:00:00 2001 From: Olivier Dony Date: Tue, 22 May 2018 19:26:07 +0200 Subject: [PATCH] [IMP] legal: remove Odoo.sh terms from index, add other refs The Odoo.sh terms of services were mainly drated for the initial Beta period, and should now be superseded by the generic version of the Odoo Enterprise Agreement. Kept the odoo_sh_terms.rst file until we remove direct references. --- legal.rst | 32 +++++++++++++------------------- 1 file changed, 13 insertions(+), 19 deletions(-) diff --git a/legal.rst b/legal.rst index 51c2b1b8f..0a592b0fa 100644 --- a/legal.rst +++ b/legal.rst @@ -46,10 +46,6 @@ Terms and Conditions :alt: View Terms of Sale :target: legal/terms/terms_of_sale.html -.. |view_terms_odoosh| image:: _static/banners/txt.svg - :alt: View Odoo.sh Terms - :target: legal/terms/odoo_sh_terms.html - .. |download_terms_of_sale_en| image:: _static/banners/pdf.svg :alt: Download Odoo Terms of Sale :target: terms_of_sale.pdf @@ -119,24 +115,22 @@ Terms and Conditions :target: legal/terms/i18n/partnership_es.html -+-----------------------------+-----------------------------------------------------------------------+------------------------------------------------------------------------+-----------------------------------------------------------------------+-----------------------------------------------------------------------+-----------------------------------------------------------------------+ -| | **English** | Français | Nederlands | Deutsch | Español | -+=============================+=======================================================================+========================================================================+=======================================================================+=======================================================================+=======================================================================+ -| Odoo Enterprise Agreement | |view_enterprise_en| |download_enterprise_en| | |view_enterprise_fr| |download_enterprise_fr| | (Coming soon) | |view_enterprise_de| |download_enterprise_de| | (Coming soon) | -+-----------------------------+-----------------------------------------------------------------------+------------------------------------------------------------------------+-----------------------------------------------------------------------+-----------------------------------------------------------------------+-----------------------------------------------------------------------+ -| Odoo Partnership Agreement | |view_partnership_en| |download_partnership_en| | |view_partnership_fr| |download_partnership_fr| | (Coming soon) | (Coming soon) | |view_partnership_es| |download_partnership_es| | -+-----------------------------+-----------------------------------------------------------------------+------------------------------------------------------------------------+-----------------------------------------------------------------------+-----------------------------------------------------------------------+-----------------------------------------------------------------------+ -| Odoo.sh Terms of Use | |view_terms_odoosh| | | | | | -+-----------------------------+-----------------------------------------------------------------------+------------------------------------------------------------------------+-----------------------------------------------------------------------+-----------------------------------------------------------------------+-----------------------------------------------------------------------+ -| Terms of Sale | |view_terms_of_sale_en| |download_terms_of_sale_en| | |view_terms_of_sale_fr| |download_terms_of_sale_fr| | | | | -+-----------------------------+-----------------------------------------------------------------------+------------------------------------------------------------------------+-----------------------------------------------------------------------+-----------------------------------------------------------------------+-----------------------------------------------------------------------+ ++--------------------------------------------------------------------+-----------------------------------------------------------------------+------------------------------------------------------------------------+-----------------------------------------------------------------------+-----------------------------------------------------------------------+-----------------------------------------------------------------------+ +| | **English** | Français | Nederlands | Deutsch | Español | ++====================================================================+=======================================================================+========================================================================+=======================================================================+=======================================================================+=======================================================================+ +| Odoo Enterprise Agreement (Also applies to Odoo Cloud and Odoo.sh) | |view_enterprise_en| |download_enterprise_en| | |view_enterprise_fr| |download_enterprise_fr| | (Coming soon) | |view_enterprise_de| |download_enterprise_de| | (Coming soon) | ++--------------------------------------------------------------------+-----------------------------------------------------------------------+------------------------------------------------------------------------+-----------------------------------------------------------------------+-----------------------------------------------------------------------+-----------------------------------------------------------------------+ +| Odoo Partnership Agreement | |view_partnership_en| |download_partnership_en| | |view_partnership_fr| |download_partnership_fr| | (Coming soon) | (Coming soon) | |view_partnership_es| |download_partnership_es| | ++--------------------------------------------------------------------+-----------------------------------------------------------------------+------------------------------------------------------------------------+-----------------------------------------------------------------------+-----------------------------------------------------------------------+-----------------------------------------------------------------------+ +| Terms of Sale | |view_terms_of_sale_en| |download_terms_of_sale_en| | |view_terms_of_sale_fr| |download_terms_of_sale_fr| | | | | ++--------------------------------------------------------------------+-----------------------------------------------------------------------+------------------------------------------------------------------------+-----------------------------------------------------------------------+-----------------------------------------------------------------------+-----------------------------------------------------------------------+ Other legal references ====================== -- `Odoo Online Service Level Agreement `_ -- `Odoo Online Acceptable Use Policy `_ +- `Odoo Cloud Service Level Agreement (SLA) `_ +- `Odoo Cloud Acceptable Use Policy `_ +- `Odoo SA's Privacy Policy `_ +- `Odoo SA's GDPR Compliance Guide `_ - :ref:`cla` - -.. - :ref:`privacy_policy` TODO!