[MERGE] Forward-port of 10.0 up to 2a17601b52

This commit is contained in:
Richard Mathot 2019-09-27 15:38:07 +02:00
commit 00d5bd76d7
No known key found for this signature in database
GPG Key ID: A7A432464AA3F482
5 changed files with 6 additions and 4 deletions

View File

@ -69,6 +69,8 @@ Set up your Paypal account
.. image:: media/paypal_account_optional.png
:align: center
.. tip:: For Encrypted Website Payments & EWP_SETTINGS error,
please check the `paypal documentation. <https://developer.paypal.com/docs/classic/paypal-payments-standard/integration-guide/encryptedwebpayments/#encrypted-website-payments-ewp>`__
Set up Odoo
===========

View File

@ -61,8 +61,8 @@ On your sale order, choose the carrier that will be used. Click on
The price is computed when you **save** the sale order. Confirm the sale
order and proceed to deliver the product.
The real shipping cost are computed when the delivery order is
validated.
The real shipping cost is computed when the delivery order is
validated, you can see the real cost in the chatter of the delivery order.
.. image:: media/invoicing02.png
:align: center

Binary file not shown.

Before

Width:  |  Height:  |  Size: 15 KiB

After

Width:  |  Height:  |  Size: 41 KiB