[MERGE] Forward-port of branch 11.0 up to 17fc4219bd

This commit is contained in:
Richard Mathot 2019-10-18 18:03:40 +02:00
commit 7a65f48d41
No known key found for this signature in database
GPG Key ID: A7A432464AA3F482
2 changed files with 18 additions and 6 deletions

View File

@ -7,3 +7,15 @@
<li><a href="https://www.odoo.com/documentation/12.0/setup/install.html">Installation</a></li> <li><a href="https://www.odoo.com/documentation/12.0/setup/install.html">Installation</a></li>
<li><a href="https://www.odoo.com/page/odoo-white-paper">White Papers</a></li> <li><a href="https://www.odoo.com/page/odoo-white-paper">White Papers</a></li>
<li><a href="https://www.odoo.com/page/legal">Legal</a></li> <li><a href="https://www.odoo.com/page/legal">Legal</a></li>
{%- if pagename != "search" and builder != "singlehtml" %}
<li id="searchbox" style="display: none; margin: 0 0 0 10px;" role="search">
<form class="search form-inline" action="{{ pathto('search') }}" method="get">
<input type="text" class="form-control" name="q" id="q" placeholder="Search..." />
<input type="hidden" name="area" value="default" />
<input type="hidden" name="check_keywords" value="yes" />
<button type="submit" value="Go" class="btn btn-default">Go</button>
</form>
</li>
<script type="text/javascript">$('#searchbox').show(0);</script>
{%- endif %}

View File

@ -34,10 +34,10 @@ Configure currencies
-------------------- --------------------
Once the Odoo is configured to support multiple currencies, you should Once the Odoo is configured to support multiple currencies, you should
activate the currencies you plan to work with. To do that, go the menu activate the currencies you plan to work with. To do that, go to the menu
:menuselection:`Configuration --> Currencies`. All the currencies are created by default, :menuselection:`Configuration --> Currencies`. All the currencies are created by default,
but you should activate the ones you plan to support. (to activate a but you should activate the ones you plan to support (to activate a
currency, check his active field) currency, check its "Active" field).
After having activated the currencies, you can configure the parameters After having activated the currencies, you can configure the parameters
to automate the currency rate update. These options are also in the to automate the currency rate update. These options are also in the
@ -108,9 +108,9 @@ in the report below.
In the above report, the account receivable associated to Camptocamp is In the above report, the account receivable associated to Camptocamp is
not managed in a secondary currency, which means that it keeps every not managed in a secondary currency, which means that it keeps every
transaction in his own currency. If you prefer, you can set the account transaction in its own currency. If you prefer, you can set the account
receivable of this customer with a secondary currency and all his debts receivable for this customer in a secondary currency and all its debts
will automatically be converted in this currency. will automatically be converted to this currency.
In such a case, the customer statement always has only one currency. In In such a case, the customer statement always has only one currency. In
general, this is not what the customer expect as he prefers to see the general, this is not what the customer expect as he prefers to see the