8000 [MERGE] Forward-port 11.0 up to ff2c6db · victorcel/documentation-user@b0560e8 · GitHub
[go: up one dir, main page]
Skip to content

Commit b0560e8

Browse files
odonyodony
committed
[MERGE] Forward-port 11.0 up to ff2c6db 
2 parents 9bc251d + ff2c6db commit b0560e8

File tree

61 files changed

+438
-1292
lines changed
  • locale/fr/LC_MESSAGES
  • sales.rst
  • sales

    • Some content is hidden

    Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

    61 files changed

    +438
    -1292
    lines changed

    ‎_extensions/odoo/layout.html

    Lines changed: 1 addition & 0 deletions
    Original file line numberDiff line numberDiff line change
    @@ -39,6 +39,7 @@
    3939
    })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
    4040

    4141
    ga('create', '{{ google_analytics_key }}', 'auto');
    42+
    ga('set', 'anonymizeIp', true);
    4243
    ga('send','pageview');
    4344
    </script>
    4445
    {%- endif -%}

    ‎_extensions/odoo/translator.py

    Lines changed: 1 addition & 1 deletion
    Original file line numberDiff line numberDiff line change
    @@ -109,7 +109,7 @@ def astext(self):
    109109
    return u''.join(self.body)
    110110

    111111
    def unknown_visit(self, node):
    112-
    print "unknown node", node.__class__.__name__
    112+
    print("unknown node", node.__class__.__name__)
    113113
    self.body.append(u'[UNKNOWN NODE {}]'.format(node.__class__.__name__))
    114114
    raise nodes.SkipNode
    115115

    ‎db_management/db_online.rst

    Lines changed: 19 additions & 5 deletions
    Original file line numberDiff line numberDiff line change
    @@ -50,13 +50,19 @@ Several actions are available:
    5050
    Upgrade
    5151
    =======
    5252

    53-
    Make sure to be connected to the database you want to upgrade and access to the
    53+
    Make sure to be connected to the database you want to upgrade and access the
    5454
    database management page. On the line of the database you want to upgrade, click
    5555
    on the "Upgrade" button.
    5656

    5757
    .. image:: media/upgrade1.png
    5858
    :align: center
    5959

    60+
    You have the possibility to choose the target version of the upgrade. By default,
    61+
    we select the highest available version available for your database; if you were
    62+
    already in the process of testing a migration, we will automatically select the
    63+
    version you were already testing (even if we released a more recent version during
    64+
    your tests).
    65+
    6066
    By clicking on the "Test upgrade" button an upgrade request will be generated.
    6167
    If our automated system does not encounter any problem, you will receive a
    6268
    "Test" version of your upgraded database.
    @@ -68,14 +74,22 @@ If our automated system does not encounter any problem, you will receive a
    6874
    test database, our dedicated team will have to work on it. You will be
    6975
    notified by email and the process will take up to 4 weeks.
    7076
    71-
    You will have the possibility to test it for 1 month. When you will be ready,
    72-
    and be sure that there are no problem compared to your actual version, you can
    73-
    click again on the Upgrade button, and confirm by clicking on Upgrade (the button
    74-
    with the little rocket!) to definitely switch to the upgraded version of Odoo.
    77+
    You will have the possibility to test it for 1 month. Inspect your data (e.g.
    78+
    accounting reports, stock valuation, etc.), check that all your usual flows
    79+
    work correctly (CRM flow, Sales flow, etc.).
    80+
    81+
    Once you are ready and that everything is correct in your test migration, you
    82+
    can click again on the Upgrade button, and confirm by clicking on Upgrade
    83+
    (the button with the little rocket!) to switch your production database to
    84+
    the new version.
    7585

    7686
    .. image:: media/upgrade.png
    7787
    :align: center
    7888

    89+
    .. warning :: Your database will be taken offline during the upgrade
    90+
    (usually between 30min up to several hours for big databases),
    91+
    so make sure to plan your migration during non-business hours.
    92+
    7993
    .. _duplicate_online:
    8094

    8195
    Duplicating a database

    ‎db_management/media/test_upgrade.png

    3.56 KB
    Loading

    ‎legal.rst

    Lines changed: 13 additions & 19 deletions
    Original file line numberDiff line numberDiff line change
    @@ -46,10 +46,6 @@ Terms and Conditions
    4646
    :alt: View Terms of Sale
    4747
    :target: legal/terms/terms_of_sale.html
    4848

    49-
    .. |view_terms_odoosh| image:: _static/banners/txt.svg
    50-
    :alt: View Odoo.sh Terms
    51-
    :target: legal/terms/odoo_sh_terms.html
    52-
    5349
    .. |download_terms_of_sale_en| image:: _static/banners/pdf.svg
    5450
    :alt: Download Odoo Terms of Sale
    5551
    :target: terms_of_sale.pdf
    @@ -119,24 +115,22 @@ Terms and Conditions
    119115
    :target: legal/terms/i18n/partnership_es.html
    120116

    121117

    122-
    +-----------------------------+-----------------------------------------------------------------------+------------------------------------------------------------------------+-----------------------------------------------------------------------+-----------------------------------------------------------------------+-----------------------------------------------------------------------+
    123-
    | | **English** | Français | Nederlands | Deutsch | Español |
    124-
    +=============================+=======================================================================+========================================================================+=======================================================================+=======================================================================+=======================================================================+
    125-
    | 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) |
    126-
    +-----------------------------+-----------------------------------------------------------------------+------------------------------------------------------------------------+-----------------------------------------------------------------------+-----------------------------------------------------------------------+-----------------------------------------------------------------------+
    127-
    | 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| |
    128-
    +-----------------------------+-----------------------------------------------------------------------+------------------------------------------------------------------------+-----------------------------------------------------------------------+-----------------------------------------------------------------------+-----------------------------------------------------------------------+
    129-
    | Odoo.sh Terms of Use | |view_terms_odoosh| | | | | |
    130-
    +-----------------------------+-----------------------------------------------------------------------+------------------------------------------------------------------------+-----------------------------------------------------------------------+-----------------------------------------------------------------------+-----------------------------------------------------------------------+
    131-
    | Terms of Sale | |view_terms_of_sale_en| |download_terms_of_sale_en| | |view_terms_of_sale_fr| |download_terms_of_sale_fr| | | | |
    132-
    +-----------------------------+-----------------------------------------------------------------------+------------------------------------------------------------------------+-----------------------------------------------------------------------+-----------------------------------------------------------------------+-----------------------------------------------------------------------+
    118+
    +--------------------------------------------------------------------+-----------------------------------------------------------------------+------------------------------------------------------------------------+-----------------------------------------------------------------------+-----------------------------------------------------------------------+-----------------------------------------------------------------------+
    119+
    | | **English** | Français | Nederlands | Deutsch | Español |
    120+
    +====================================================================+=======================================================================+========================================================================+=======================================================================+=======================================================================+=======================================================================+
    121+
    | 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) |
    122+
    +--------------------------------------------------------------------+-----------------------------------------------------------------------+------------------------------------------------------------------------+-----------------------------------------------------------------------+-----------------------------------------------------------------------+-----------------------------------------------------------------------+
    123+
    | 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| |
    124+
    +--------------------------------------------------------------------+-----------------------------------------------------------------------+------------------------------------------------------------------------+-----------------------------------------------------------------------+-----------------------------------------------------------------------+-----------------------------------------------------------------------+
    125+
    | Terms of Sale | |view_terms_of_sale_en| |download_terms_of_sale_en| | |view_terms_of_sale_fr| |download_terms_of_sale_fr| | | | |
    126+
    +--------------------------------------------------------------------+-----------------------------------------------------------------------+------------------------------------------------------------------------+-----------------------------------------------------------------------+-----------------------------------------------------------------------+-----------------------------------------------------------------------+
    133127

    134128

    135129
    Other legal references
    136130
    ======================
    137131

    138-
    - `Odoo Online Service Level Agreement <https://www.odoo.com/page/odoo-online-sla>`_
    139-
    - `Odoo Online Acceptable Use Policy <https://www.odoo.com/page/odoo-online-acceptable-use-policy>`_
    132+
    - `Odoo Cloud Service Level Agreement (SLA) <https://www.odoo.com/cloud-sla>`_
    133+
    - `Odoo Cloud Acceptable Use Policy <https://www.odoo.com/acceptable-use>`_
    134+
    - `Odoo SA's Privacy Policy <https://www.odoo.com/privacy>`_
    135+
    - `Odoo SA's GDPR Compliance Guide <https://www.odoo.com/gdpr>`_
    140136
    - :ref:`cla`
    141-
    142-
    .. - :ref:`privacy_policy` TODO!

    ‎legal/terms.rst

    Lines changed: 0 additions & 1 deletion
    Original file line numberDiff line numberDiff line change
    @@ -7,7 +7,6 @@ Terms and Conditions
    77
    .. toctree::
    88
    :titlesonly:
    99

    10-
    terms/online
    1110
    terms/odoo_sh_terms
    1211
    terms/enterprise
    1312
    terms/partnership

    0 commit comments

    Comments
     (0)
    0