From 898e602685514ec7173e25f6747e8497056f9263 Mon Sep 17 00:00:00 2001 From: Martin Trigaux Date: Mon, 29 Oct 2018 15:19:12 +0100 Subject: [PATCH 1/6] [ADD] conf: display version number in the switcher app This commit is a cherry-pick of cd412359178 to 9.0 --- conf.py | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/conf.py b/conf.py index 39c8b439d..4668ae69d 100644 --- a/conf.py +++ b/conf.py @@ -326,11 +326,28 @@ def setup(app): app.connect('html-page-context', analytics) app.add_config_value('google_analytics_key', '', 'env') + app.connect('html-page-context', versionize) + app.add_config_value('versions', '', 'env') + app.connect('html-page-context', localize) app.add_config_value('languages', '', 'env') app.connect('doctree-resolved', tag_toctrees) +def versionize(app, pagename, templatename, context, doctree): + """ Adds a version switcher below the menu, requires ``canonical_root`` + and ``versions`` (an ordered, space-separated lists of all possible + versions). + """ + if not (app.config.canonical_root and app.config.versions): + return + + context['versions'] = [ + (vs, _build_url(app.config.canonical_root, vs, pagename)) + for vs in app.config.versions.split(',') + if vs != app.config.version + ] + def analytics(app, pagename, templatename, context, doctree): if not app.config.google_analytics_key: return From d6a3223cc3802a73852bb4089b28934a50a05cb0 Mon Sep 17 00:00:00 2001 From: Laura Piraux Date: Tue, 6 Aug 2019 11:16:00 +0200 Subject: [PATCH 2/6] [FIX] Correct grammatical errors Fixes two grammatical mistakes --- accounting/others/taxes/application.rst | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/accounting/others/taxes/application.rst b/accounting/others/taxes/application.rst index c306b85de..02803fb5c 100644 --- a/accounting/others/taxes/application.rst +++ b/accounting/others/taxes/application.rst @@ -15,8 +15,8 @@ one. (as an example, construction companies have 0% instead of 21% in Belgium for construction related work). As an example, in Belgium, for the VAT tax, there are 3 fiscal positions -that depend on on the country of the customer and some companies (like -construction companies) benefit from a specific fiscal treatments: +that depend on the country of the customer and some companies (like +construction companies) benefit from a specific fiscal treatment: - **Belgian companies:** with 21% VAT (default, on product form) @@ -129,4 +129,4 @@ in his shipping address. .. seealso:: - * :doc:`create` \ No newline at end of file + * :doc:`create` From a3809a2c8f62061e0de1795438c308053751388d Mon Sep 17 00:00:00 2001 From: Martin Trigaux Date: Tue, 10 Dec 2019 14:44:57 +0100 Subject: [PATCH 3/6] [IMP] _extension: add languages link To refer the pages in different languages for better indexing --- _extensions/odoo/layout.html | 7 +++++++ conf.py | 4 ++++ 2 files changed, 11 insertions(+) diff --git a/_extensions/odoo/layout.html b/_extensions/odoo/layout.html index 000019b32..16e27d93b 100644 --- a/_extensions/odoo/layout.html +++ b/_extensions/odoo/layout.html @@ -25,6 +25,13 @@ {{ super() }} {%- endblock -%} +{%- block linktags -%} + {% for code, url in language_codes %} + + {%- endfor %} + {{ super() }} +{%- endblock -%} + {%- block sidebar1 -%}{%- endblock -%} {%- block sidebar2 -%}{%- endblock -%} {%- block relbar1 -%}{%- endblock -%} diff --git a/conf.py b/conf.py index ebfbb1fec..c71af5c6b 100644 --- a/conf.py +++ b/conf.py @@ -394,6 +394,10 @@ def localize(app, pagename, templatename, context, doctree): for la in app.config.languages.split(',') if la != current_lang ] + context['language_codes'] = [ + (la.split('_')[0] if la != 'en' else 'x-default', _build_url(app.config.canonical_root, (la != 'en' and la or ''), pagename)) + for la in app.config.languages.split(',') + ] def _build_url(root, branch, pagename): From 7c0be017eedc833c6c3b5d050a7e58167d7f136c Mon Sep 17 00:00:00 2001 From: Martin Trigaux Date: Tue, 10 Dec 2019 16:42:25 +0100 Subject: [PATCH 4/6] [FIX] conf: avoid // urls e.g. https://www.odoo.com/documentation/user/13.0//crm.html when creating link with no branch/lang name --- conf.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/conf.py b/conf.py index c71af5c6b..abb0a508a 100644 --- a/conf.py +++ b/conf.py @@ -401,6 +401,8 @@ def localize(app, pagename, templatename, context, doctree): def _build_url(root, branch, pagename): + if not branch: + root = root.rstrip('/') return "{canonical_url}{canonical_branch}/{canonical_page}".format( canonical_url=root, canonical_branch=branch, From 72e8292371d956df1718101b121e3825a9ae4695 Mon Sep 17 00:00:00 2001 From: Martin Trigaux Date: Tue, 10 Dec 2019 18:30:46 +0100 Subject: [PATCH 5/6] [IMP] config: add canonical url Inspired by odoo/odoo@958f9106dd3fe (which was lost by the way) --- _extensions/odoo/layout.html | 1 + conf.py | 12 ++++++++++++ 2 files changed, 13 insertions(+) diff --git a/_extensions/odoo/layout.html b/_extensions/odoo/layout.html index 16e27d93b..4819928e2 100644 --- a/_extensions/odoo/layout.html +++ b/_extensions/odoo/layout.html @@ -29,6 +29,7 @@ {% for code, url in language_codes %} {%- endfor %} + {{ super() }} {%- endblock -%} diff --git a/conf.py b/conf.py index abb0a508a..1a48f70e6 100644 --- a/conf.py +++ b/conf.py @@ -328,7 +328,9 @@ def setup(app): app.add_javascript('coa-valuation-continental.js') app.add_javascript('coa-valuation-anglo-saxon.js') + app.connect('html-page-context', canonicalize) app.add_config_value('canonical_root', None, 'env') + app.add_config_value('canonical_branch', 'master', 'env') app.connect('html-page-context', analytics) app.add_config_value('google_analytics_key', '', 'env') @@ -399,6 +401,16 @@ def localize(app, pagename, templatename, context, doctree): for la in app.config.languages.split(',') ] +def canonicalize(app, pagename, templatename, context, doctree): + """ Adds a 'canonical' URL for the current document in the rendering + context. Requires the ``canonical_root`` setting being set. The canonical + branch is ``master`` but can be overridden using ``canonical_branch``. + """ + if not app.config.canonical_root: + return + + context['canonical'] = _build_url( + app.config.canonical_root, app.config.canonical_branch, pagename) def _build_url(root, branch, pagename): if not branch: From 267dd8620cf9d9e956bf2b3fe3c27868ed2a29fc Mon Sep 17 00:00:00 2001 From: jcsOdoo Date: Thu, 12 Dec 2019 17:30:59 +0100 Subject: [PATCH 6/6] [REM] Accounting: Delete mistake about Storno accounting not supported by Odoo --- accounting/overview/main_concepts/in_odoo.rst | 2 -- 1 file changed, 2 deletions(-) diff --git a/accounting/overview/main_concepts/in_odoo.rst b/accounting/overview/main_concepts/in_odoo.rst index 20e5fe4c5..ca3bd1e79 100644 --- a/accounting/overview/main_concepts/in_odoo.rst +++ b/accounting/overview/main_concepts/in_odoo.rst @@ -65,8 +65,6 @@ In particular, Odoo's core accounting engine supports: sold/delivered. * European accounting where expenses are accounted at the supplier bill. -* Storno accounting (Italy) where refund invoices have negative - credit/debit instead of a reverting the original journal items. Odoo also have modules to comply with IFRS rules.