From 2037afdedd68ca8d126cc0bf282e853c3cf58bb3 Mon Sep 17 00:00:00 2001 From: Olivier Dony Date: Wed, 25 May 2016 17:37:34 +0200 Subject: [PATCH] [WIP] legal: drafting, final v5 of enterprise agreement --- _static/latex/odoo.sty | 15 ++++----------- conf.py | 10 +++++++--- legal.rst | 9 ++++++--- legal/terms.rst | 2 -- legal/terms/enterprise.rst | 26 ++++++++++++-------------- legal/terms/enterprise_tex.rst | 2 +- legal/terms/partnership.rst | 2 +- 7 files changed, 31 insertions(+), 35 deletions(-) diff --git a/_static/latex/odoo.sty b/_static/latex/odoo.sty index 969eac050..3ca242b8c 100644 --- a/_static/latex/odoo.sty +++ b/_static/latex/odoo.sty @@ -1,17 +1,10 @@ -%\usepackage{droid} -\usepackage[default]{lato} -%\usepackage{inconsolata} +\usepackage{droid} +%\usepackage[default]{lato} +\usepackage{inconsolata} \usepackage{fancyhdr} \usepackage[usenames,dvipsnames]{xcolor} \usepackage{graphicx} -% temp while drafting! -\usepackage{draftwatermark} -\SetWatermarkText{DRAFT} -\SetWatermarkScale{1} -\SetWatermarkLightness{.9} - - % fancy titlepage \usepackage{amsmath} \usepackage{tikz} @@ -89,7 +82,7 @@ \renewcommand{\headrulewidth}{0.1pt} \renewcommand{\footrulewidth}{0.1pt} -\newcommand{\makeodootitle}{% +\newcommand{\makeodootitleold}{% \begin{titlepage} \titlepagedecoration \begin{center} diff --git a/conf.py b/conf.py index 5d83ffa4f..dbecc644b 100644 --- a/conf.py +++ b/conf.py @@ -207,8 +207,12 @@ latex_elements = { # Additional stuff for the LaTeX preamble. 'preamble': r'\usepackage{odoo}', +'tableofcontents': r'', # no TOC -'maketitle': r'\makeodootitle', +# output manually in latex docs +'releasename': '', +'release': '', +'date': '', } @@ -218,8 +222,8 @@ latex_additional_files = ['_static/latex/odoo.sty'] # (source start file, target name, title, # author, documentclass [howto, manual, or own class]). latex_documents = [ - ('legal/terms/enterprise_tex', 'odoo_enterprise_agreement_v5.tex', 'Odoo Enterprise Subscription Agreement v5', '', 'howto'), - ('legal/terms/partnership_tex', 'odoo_partnership_agreement_v5.tex', 'Odoo Partnership Agreement v5', '', 'howto'), + ('legal/terms/enterprise_tex', 'odoo_enterprise_agreement_v5.tex', 'Odoo Enterprise Subscription Agreement', '', 'howto'), + ('legal/terms/partnership_tex', 'odoo_partnership_agreement_v5.tex', 'Odoo Partnership Agreement', '', 'howto'), #('index', 'UnderstandingAccountingForEntrepreneurs.tex', u'Understanding Accounting For Entrepreneurs Documentation', u'fp, xmo', 'manual'), ] diff --git a/legal.rst b/legal.rst index 9174cb1f5..a440c53b8 100644 --- a/legal.rst +++ b/legal.rst @@ -1,4 +1,4 @@ -:banner: banners/getting_started.jpg +:banner: banners/sign.jpg ===== Legal @@ -32,11 +32,14 @@ Terms and Conditions :target: odoo_partnership_agreement_v5.pdf - :ref:`enterprise_agreement` |nbsp| |nbsp| |download_enterprise| -- :ref:`partnership_agreement` |nbsp| |nbsp| |download_partnership| +.. - :ref:`partnership_agreement` |nbsp| |nbsp| |download_partnership| + Other legal references ====================== -- :ref:`privacy_policy` +- `Odoo Online Service Level Agreement `_ - :ref:`cla` + +.. - :ref:`privacy_policy` TODO! \ No newline at end of file diff --git a/legal/terms.rst b/legal/terms.rst index 882e6383c..0269e7398 100644 --- a/legal/terms.rst +++ b/legal/terms.rst @@ -10,5 +10,3 @@ Terms and Conditions terms/online terms/enterprise terms/partnership - -.. + Link PDF version!s \ No newline at end of file diff --git a/legal/terms/enterprise.rst b/legal/terms/enterprise.rst index 0d17cdf98..fcfe52e8b 100644 --- a/legal/terms/enterprise.rst +++ b/legal/terms/enterprise.rst @@ -5,11 +5,7 @@ Odoo Enterprise Subscription Agreement ====================================== -.. raw:: latex - - \clearpage - -.. note:: Version 5 - Last revision: March 01, 2016. +.. note:: Version 5a - Last revision: May 24, 2016. By subscribing to the Odoo Enterprise services (the "Services") provided by Odoo SA and its affiliates (collectively, "Odoo SA") in relation with Odoo Enterprise Edition or @@ -62,7 +58,7 @@ For the duration of this Agreement, Odoo SA gives the Customer a non-exclusive, license to use (execute, modify, execute after modification) the Odoo Enterprise Edition software, under the terms set forth in :ref:`appendix_a`. -In return, the Customer agrees take all necessary measures to guarantee the unmodified execution of +The Customer agrees to take all necessary measures to guarantee the unmodified execution of the part of the Software that verifies the validity of the Odoo Enterprise Edition usage and collects statistics for that purpose, including but not limited to the running of an instance and the number of Users. @@ -71,11 +67,13 @@ Odoo SA commits not to disclose individual or named figures to third parties wit of the Customer, and to deal with all collected data in compliance with its official Privacy Policy, as published on `Odoo SA's website `_. -.. FIXME: reword this sentence. +Upon expiration or termination of this Agreement, this license is revoked immediately and the +Customer agrees to stop using the Odoo Enterprise Edition software. Should the Customer breach the terms of this section, the Customer agrees to pay Odoo SA an extra fee equal to 300% of the applicable list price for the actual number of Users. + .. _services: 4 Included Services @@ -289,7 +287,7 @@ supplier, on websites, press releases and other marketing materials. 6.4 Confidentiality ------------------- -Definition of "Confidential Information" +Definition of "Confidential Information": All information disclosed by a party (the "Disclosing Party") to the other party (the "Receiving Party"), whether orally or in writing, that is designated as confidential or that reasonably should be understood to be confidential given the nature of the information and @@ -317,8 +315,10 @@ breach, this Agreement may be terminated immediately by the non-breaching Party. Further, Odoo SA may terminate the Agreement immediately in the event the Customer fails to pay the applicable fees for the Services within the due date specified on the corresponding invoice. -The sections ":ref:`confidentiality`”, “:ref:`disclaimers`”, “:ref:`liability`”, -and “:ref:`general_provisions`” will survive any termination or expiration of this Agreement. +Surviving Provisions: + The sections ":ref:`confidentiality`”, “:ref:`disclaimers`”, + “:ref:`liability`”, and “:ref:`general_provisions`” will survive any termination or expiration of + this Agreement. .. _warranties_disclaimers: @@ -332,7 +332,6 @@ and “:ref:`general_provisions`” will survive any termination or expiration o -------------- .. industry-standard warranties regarding our Services while Agreement in effect -.. clarified "perform again the services" For the duration of this Agreement, Odoo SA commits to using commercially reasonable efforts to execute the Services in accordance with the generally accepted industry standards provided that: @@ -366,8 +365,8 @@ Odoo SA does not warrant that the Software complies with any local or internatio --------------------------- To the maximum extent permitted by law, the aggregate liability of each party together with its -affiliates arising out of or related to this Agreement will not exceed the total amount paid by the -Customer under this Agreement during the 6 months immediately preceding the date of the event +affiliates arising out of or related to this Agreement will not exceed 50% of the total amount +paid by the Customer under this Agreement during the 12 months immediately preceding the date of the event giving rise to such claim. Multiple claims shall not enlarge this limitation. In no event will either party or its affiliates be liable for any indirect, special, exemplary, @@ -391,7 +390,6 @@ whether of like or different nature, beyond the reasonable control of such party cause or causes exist. - .. _general_provisions: 8 General Provisions diff --git a/legal/terms/enterprise_tex.rst b/legal/terms/enterprise_tex.rst index 50ac3f67f..a294dd362 100644 --- a/legal/terms/enterprise_tex.rst +++ b/legal/terms/enterprise_tex.rst @@ -1,6 +1,6 @@ .. toctree:: :maxdepth: 4 - :numbered: + :hidden: enterprise diff --git a/legal/terms/partnership.rst b/legal/terms/partnership.rst index 078855d3c..567d59051 100644 --- a/legal/terms/partnership.rst +++ b/legal/terms/partnership.rst @@ -39,7 +39,7 @@ like "Odoo Community Edition", should it be needed. ======================= The duration of this Agreement (the “Term”) shall be one year beginning on the date of the signature. It is automatically renewed for an equal Term, unless either party provides a written notice of -termination minimum 30 days before the end of the Term by registered mail to the other party. +termination minimum 30 days before the end of the Term to the other party. 3 Access to Odoo Enterprise Edition