From a578531ca3fe932faaeadcc39fa162e0c856b475 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miquel=20Ra=C3=AFch?= Date: Tue, 12 Dec 2017 17:19:01 +0100 Subject: [PATCH] [FIX] v11 urls Was still pointing to old links Closes #21590 --- CONTRIBUTING.md | 2 +- .../base_import/static/src/xml/base_import.xml | 2 +- addons/crm/data/mail_template_data.xml | 2 +- addons/crm/data/web_planner_data.xml | 6 +++--- addons/crm/i18n/crm.pot | 2 +- addons/hr_expense/data/web_planner_data.xml | 16 ++++++++-------- addons/point_of_sale/views/pos_config_view.xml | 2 +- .../project/data/project_mail_template_data.xml | 2 +- addons/project/i18n/project.pot | 2 +- .../purchase/views/res_config_settings_views.xml | 2 +- addons/stock/data/web_planner_data.xml | 2 +- doc/_extensions/odoo_ext/sub-menu_list.html | 13 +++++++------ odoo/http.py | 2 +- 13 files changed, 28 insertions(+), 27 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index dc5c856f649..5e2dc5dfb11 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -8,7 +8,7 @@ TL;DR * If you [make a pull request](https://github.com/odoo/odoo/wiki/Contributing#making-pull-requests), do not create an issue! Use the PR description for that * Issues are handled with a much lower priority than pull requests -* Use this [template](https://github.com/odoo/odoo/tree/10.0/.github/ISSUE_TEMPLATE.md) +* Use this [template](https://github.com/odoo/odoo/tree/11.0/.github/ISSUE_TEMPLATE.md) when reporting issues. Please search for duplicates first! * Pull requests must be made against the [correct version](https://github.com/odoo/odoo/wiki/Contributing#against-which-version-should-i-submit-a-patch) * There are restrictions on the kind of [changes allowed in stable series](https://github.com/odoo/odoo/wiki/Contributing#what-does-stable-mean) diff --git a/addons/base_import/static/src/xml/base_import.xml b/addons/base_import/static/src/xml/base_import.xml index 42fb892c60f..c9c4e8a5037 100644 --- a/addons/base_import/static/src/xml/base_import.xml +++ b/addons/base_import/static/src/xml/base_import.xml @@ -8,7 +8,7 @@
-

Select a CSV or Excel file to import. Help

+

Select a CSV or Excel file to import. Help

diff --git a/addons/crm/data/mail_template_data.xml b/addons/crm/data/mail_template_data.xml index a1a8195a1e2..a59118f5dc8 100644 --- a/addons/crm/data/mail_template_data.xml +++ b/addons/crm/data/mail_template_data.xml @@ -94,7 +94,7 @@ We would be delighted to assist you along the way. Contact us through our support form if you have any question. You can also discover how to get the best out of Odoo CRM with our - + User Documentation or with our diff --git a/addons/crm/data/web_planner_data.xml b/addons/crm/data/web_planner_data.xml index f007fd4e366..b1de907a7fd 100644 --- a/addons/crm/data/web_planner_data.xml +++ b/addons/crm/data/web_planner_data.xml @@ -456,7 +456,7 @@ Tip: For developers, you can use our API to load data through scripts: read - the API documentation + the API documentation
@@ -505,7 +505,7 @@ For complex imports (>5000 items, product variants, pictures, etc.):
  • Online users: we do it for you! Ask Our Experts
    • -
  • Community & Enterprise users: use Odoo API to import through scripts
    • +
  • Community & Enterprise users: use Odoo API to import through scripts
    • @@ -572,7 +572,7 @@
  • Select your pricing preference and allow discounts
  • Configure your pricelists
  • Apply multi-currencies
    • -
  • Read the documentation about pricing & discounts
    • +
  • Read the documentation about pricing & discounts
    • diff --git a/addons/crm/i18n/crm.pot b/addons/crm/i18n/crm.pot index 10e509cb8d4..26f34560612 100644 --- a/addons/crm/i18n/crm.pot +++ b/addons/crm/i18n/crm.pot @@ -100,7 +100,7 @@ msgid "\n" " We would be delighted to assist you along the way. Contact us through our\n" " support form if you have any question.\n" " You can also discover how to get the best out of Odoo CRM with our \n" -" \n" +" \n" " User Documentation\n" " or with our \n" " \n" diff --git a/addons/hr_expense/data/web_planner_data.xml b/addons/hr_expense/data/web_planner_data.xml index c5d9e719967..d250858b4c8 100644 --- a/addons/hr_expense/data/web_planner_data.xml +++ b/addons/hr_expense/data/web_planner_data.xml @@ -44,7 +44,7 @@ Expense Types

    The first step if to - + configure the expense types that your company allows. Here are some examples: @@ -90,7 +90,7 @@ Recording Mode

    As employees, there are - 2 ways to record expenses: + 2 ways to record expenses:

    @@ -153,7 +153,7 @@ Submit for Approval

    The next step is to settle an internal policy to - submit expenses to managers + submit expenses to managers

    @@ -191,7 +191,7 @@

    Depending on your company structure, the - approval process + approval process can be:

    @@ -245,7 +245,7 @@ Reimbursement

    Once expense reports approved by managers, the accounting department checks accounts, products and taxes used. Then they - post them into the books and proceed with the employee reimbursement. + post them into the books and proceed with the employee reimbursement.

    To do: @@ -260,7 +260,7 @@ Set Home Address to employees(used for reimbursement)

  • - See how to manage payables + See how to manage payables

    • @@ -269,7 +269,7 @@ Invoice Customers

    - If you track expenses on customer projects, you can charge them back to your customers automatically. Here are some advises to avoid conflictual situations: + If you track expenses on customer projects, you can charge them back to your customers automatically. Here are some advises to avoid conflictual situations:

    diff --git a/addons/point_of_sale/views/pos_config_view.xml b/addons/point_of_sale/views/pos_config_view.xml index 9d67eb5ff95..552e18053dd 100644 --- a/addons/point_of_sale/views/pos_config_view.xml +++ b/addons/point_of_sale/views/pos_config_view.xml @@ -221,7 +221,7 @@
    - How to manage tax-included prices + How to manage tax-included prices
    diff --git a/addons/project/data/project_mail_template_data.xml b/addons/project/data/project_mail_template_data.xml index 9dabed072dc..1b86d20040a 100644 --- a/addons/project/data/project_mail_template_data.xml +++ b/addons/project/data/project_mail_template_data.xml @@ -96,7 +96,7 @@ We would be delighted to assist you along the way. Contact us through our support form if you have any question. You can also discover how to get the best out of Odoo Project with our - + User Documentation or with our diff --git a/addons/project/i18n/project.pot b/addons/project/i18n/project.pot index fdde1397284..1e46012c59e 100644 --- a/addons/project/i18n/project.pot +++ b/addons/project/i18n/project.pot @@ -102,7 +102,7 @@ msgid "\n" " We would be delighted to assist you along the way. Contact us through our\n" " support form if you have any question.\n" " You can also discover how to get the best out of Odoo Project with our \n" -" \n" +" \n" " User Documentation\n" " or with our \n" " \n" diff --git a/addons/purchase/views/res_config_settings_views.xml b/addons/purchase/views/res_config_settings_views.xml index 1ad55e12968..ac4309e3523 100644 --- a/addons/purchase/views/res_config_settings_views.xml +++ b/addons/purchase/views/res_config_settings_views.xml @@ -110,7 +110,7 @@
    - + How to import
    diff --git a/addons/stock/data/web_planner_data.xml b/addons/stock/data/web_planner_data.xml index 0dd72bc5dd1..94268d87915 100644 --- a/addons/stock/data/web_planner_data.xml +++ b/addons/stock/data/web_planner_data.xml @@ -108,7 +108,7 @@
    If you are a developer you can use our API to load data automatically through - scripts: take a look at our API Documentation for more + scripts: take a look at our API Documentation for more information.
    diff --git a/doc/_extensions/odoo_ext/sub-menu_list.html b/doc/_extensions/odoo_ext/sub-menu_list.html index 3b4d21620f3..14fd476c9c3 100644 --- a/doc/_extensions/odoo_ext/sub-menu_list.html +++ b/doc/_extensions/odoo_ext/sub-menu_list.html @@ -1,8 +1,9 @@ {# note: if odoo.com/page/docs sub-menu's structure change, these links have to change as well #} -
  • User
    • -
  • Developer
    • -
  • API
    • -
  • Installation
    • -
  • White Papers
    • -
  • Legal
    • +
  • User
    • +
  • Developer
    • +
  • Training center
    • +
  • API
    • +
  • Installation
    • +
  • White Papers
    • +
  • Legal
    • diff --git a/odoo/http.py b/odoo/http.py index 450ac1ce76a..e3d95dc2425 100644 --- a/odoo/http.py +++ b/odoo/http.py @@ -795,7 +795,7 @@ class HttpRequest(WebRequest): Odoo URLs are CSRF-protected by default (when accessed with unsafe HTTP methods). See -https://www.odoo.com/documentation/9.0/reference/http.html#csrf for +https://www.odoo.com/documentation/11.0/reference/http.html#csrf for more details. * if this endpoint is accessed through Odoo via py-QWeb form, embed a CSRF