From 898e602685514ec7173e25f6747e8497056f9263 Mon Sep 17 00:00:00 2001 From: Martin Trigaux Date: Mon, 29 Oct 2018 15:19:12 +0100 Subject: [PATCH 1/3] [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/3] [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 267dd8620cf9d9e956bf2b3fe3c27868ed2a29fc Mon Sep 17 00:00:00 2001 From: jcsOdoo Date: Thu, 12 Dec 2019 17:30:59 +0100 Subject: [PATCH 3/3] [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.