[MERGE] Forward-port of branch 13.0 to 14.0

This commit is contained in:
Victor Feyens 2021-03-02 16:39:17 +01:00
commit 4136c801cf
5 changed files with 24 additions and 33 deletions

View File

@ -1,7 +1,8 @@
=============
Cash Rounding
=============
**Cash rounding** is required when the lowest physical denomination
**Cash rounding** is required when the lowest physical denomination
of currency, or the smallest coin, is higher than the minimum unit
of account.
@ -11,7 +12,8 @@ the payment is made in cash.
Configuration
=============
Go to :menuselection:`Accounting --> Configuration --> Settings`
Go to :menuselection:`Accounting --> Configuration --> Settings`
and enable *Cash Rounding*, then click on *Save*.
.. image:: media/cash_rounding01.png
@ -32,6 +34,7 @@ Odoo supports two **rounding strategies**:
Apply roundings
===============
When editing a draft invoice, open the *Other Info* tab, go to the
When editing a draft invoice, open the *Other Info* tab, go to the
*Accounting Information* section, and select the appropriate *Cash
Rounding Method*.
Rounding Method*.

View File

@ -19,12 +19,4 @@ You should contact DHL account manager and request integration for XML Express A
Getting SiteID and Password for United States
==============================================
You need to write to xmlrequests@dhl.com along with your full Account details like account number, region, address, etc. to get API Access.
In meantime, for testing the solution, you can use the tests credentials as given in the demo data:
- **SiteID**: CustomerTest
- **Password**: alkd89nBV
- **DHL Account Number**: 803921577
You need to write to xmlrequests@dhl.com along with your full Account details like account number, region, address, etc. to get API Access.

View File

@ -133,7 +133,7 @@ In this last command,
If you activated the two-factor authentication on Github,
you can create a
`personal access token <https://help.github.com/articles/creating-a-personal-access-token-for-the-command-line/>`_
and use it as password. Granting the `repo` permission suffices.
and use it as password. Granting the ``repo`` permission suffices.
.. Note::

View File

@ -1,6 +1,7 @@
=============
Cash Rounding
=============
**Cash rounding** is required when the lowest physical denomination
of currency, or the smallest coin, is higher than the minimum unit
of account.
@ -10,14 +11,11 @@ down the total amount of an invoice to the nearest five cents, when
the payment is made in cash.
Each point of sale in Odoo can be configured to apply cash rounding
to the totals of its bills or receipts.
.. note::
This feature will soon be added to Odoo. We are currently working
to make it available for all supported versions as soon as possible.
to the totals of its bills or receipts.
Configuration
=============
Go to :menuselection:`Point of Sale --> Configuration --> Settings`
and enable *Cash Rounding*, then click on *Save*.
@ -46,5 +44,4 @@ rounding according to your settings.
.. note::
Odoo Point of Sale only support the *Add a rounding line*
rounding strategies and *Half-up* rounding methods.
rounding strategies and *Half-up* rounding methods.

View File

@ -17,7 +17,7 @@ and Odoo: documents such as quotations, sales orders, invoices and subscriptions
top-right corner and select "My Account".
.. image:: media/my_portal.png
:align: center
:align: center
Quotations
----------
@ -27,14 +27,14 @@ quotation can be generated for you after adding an application or a user to your
database or if your contract has to be renewed.
.. image:: media/quotations.png
:align: center
:align: center
The *Valid Until* column shows the date through which the quotation is valid; after that date,
the quotation will be "Expired". By clicking on the quotation, you will see all
the details of the offer, such as the pricing and other useful information.
.. image:: media/quotation_accept.png
:align: center
:align: center
If you want to accept the quotation, just click "Accept & Pay," and the quote
will get confirmed. If you don't want to accept it, or you need to ask for some
@ -47,7 +47,7 @@ All your purchases within Odoo (Upsells, Themes, Applications, etc.)
will be registered under this section.
.. image:: media/sales.png
:align: center
:align: center
By clicking on the sale order, you can review the details of the products purchased
and process the payment.
@ -60,7 +60,7 @@ shown in this section. The tag before the Amount Due will indicate if the
invoice has been paid.
.. image:: media/invoices.png
:align: center
:align: center
Just click on the invoice if you wish to see more information, pay the invoice,
or download a PDF version of the document.
@ -68,12 +68,12 @@ or download a PDF version of the document.
Tickets
-------
When you submit a ticket through `Odoo Support <https://www.odoo.com/help>`,
When you submit a ticket through `Odoo Support <https://www.odoo.com/help>`_,
a ticket will be created. Here you can find all the tickets that you have opened,
the conversations between you and our Agents, and the statuses and IDs (# Ref) of the tickets.
.. image:: media/tickets.png
:align: center
:align: center
Subscriptions
-------------
@ -82,7 +82,7 @@ You can access your subscriptions with Odoo from this section. The first page
shows you the subscriptions that you have and their status.
.. image:: media/subscriptionstatus.png
:align: center
:align: center
By clicking on the subscription you will access all the details regarding your
plan: the number of applications purchased, the billing information,
@ -92,14 +92,14 @@ To change the payment method, click on "Change Payment Method" and enter the new
credit card details.
.. image:: media/changemethod.png
:align: center
:align: center
If you want to remove the credit cards that are saved, you can do so by clicking on
"Manage your payment methods" at the bottom of the page. Click "Delete" to
delete the payment method.
.. image:: media/managepayment.png
:align: center
:align: center
.. warning::
At the date of the next invoice, if there is no payment information provided or if your credit
@ -111,8 +111,7 @@ Success Packs
-------------
With a Success Pack/Partner Success Pack, you are assigned an expert to provide
unique personalized assistance to help you customize your solution and optimize
your workflows as part of your initial implementation. These hours never expire,
allowing you to utilize them whenever you need support.
your workflows as part of your initial implementation.
.. seealso::
If you need information about how to manage your database see :ref:`db_online`