khanh.pndc/odoo-docs
1
0
Fork 0
mirror of https://github.com/odoo/documentation.git synced 2025-12-14 08:29:13 +07:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Richard Mathot
2019-09-27 15:38:07 +02:00
parent fca83e5672 2a17601b52
commit 00d5bd76d7
5 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ecommerce/shopper_experience/paypal.rst
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
===========

4
inventory/shipping/operation/invoicing.rst
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

BIN
inventory/shipping/operation/media/invoicing02.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 15 KiB

After

Width:  |  Height:  |  Size: 41 KiB