diff --git a/sales/quotation/setup.rst b/sales/quotation/setup.rst
index bf6cbcbe6..08d2b99ef 100644
--- a/sales/quotation/setup.rst
+++ b/sales/quotation/setup.rst
@@ -6,3 +6,4 @@ Setup
    :titlesonly:
 
    setup/first_quote
+   setup/different_addresses
diff --git a/sales/quotation/setup/different_addresses.rst b/sales/quotation/setup/different_addresses.rst
index 5c1574f27..b7fc71462 100644
--- a/sales/quotation/setup/different_addresses.rst
+++ b/sales/quotation/setup/different_addresses.rst
@@ -1,3 +1,62 @@
-==================================================
-How to use different invoice and delivery address?
-================================================== 
\ No newline at end of file
+====================================================
+How to use different invoice and delivery addresses?
+====================================================
+
+Overview
+========
+
+It is possible to configure different addresses for delivery and
+invoicing. This is very useful, because it could happen that your clients
+have multiple locations and that the invoice address differs from the
+delivery location.
+
+Configuration
+=============
+
+First, go to the Sales application, then click on 
+:menuselection:`Configuration --> Settings` and activate the option 
+**Enable the multiple address configuration from menu**.
+
+.. image:: media/different_addresses01.png
+    :align: center
+
+Set the addresses on the contact form
+=====================================
+
+Invoice and/or shipping addresses and even other addresses are added on
+the contact form. To do so, go to the contact application, select the
+customer and in the **Contacts & Addresses** tab click on **Create**
+
+.. image:: media/different_addresses02.png
+    :align: center
+
+A new window will open where you can specify the delivery or the invoice
+address.
+
+.. image:: media/different_addresses03.png
+    :align: center
+
+Once you validated your addresses, it will appear in the **Contacts &
+addresses** tab with distinctive logos.
+
+.. image:: media/different_addresses04.png
+    :align: center
+
+On the quotations and sales orders
+==================================
+
+When you create a new quotation, the option to select an invoice address
+and a delivery address is now available. Both addresses will
+automatically be filled in when selecting the customer.
+
+.. image:: media/different_addresses05.png
+    :align: center
+
+.. tip::
+    Note that you can also create invoice and delivery addresses on 
+    the fly by selecting **Create and edit** in the dropdown menu.
+
+When printing your sales orders, you'll notice the two addresses.
+
+.. image:: media/different_addresses06.png
+    :align: center
\ No newline at end of file
diff --git a/sales/quotation/setup/media/different_addresses01.png b/sales/quotation/setup/media/different_addresses01.png
new file mode 100644
index 000000000..409dc65dc
Binary files /dev/null and b/sales/quotation/setup/media/different_addresses01.png differ
diff --git a/sales/quotation/setup/media/different_addresses02.png b/sales/quotation/setup/media/different_addresses02.png
new file mode 100644
index 000000000..61333f8ef
Binary files /dev/null and b/sales/quotation/setup/media/different_addresses02.png differ
diff --git a/sales/quotation/setup/media/different_addresses03.png b/sales/quotation/setup/media/different_addresses03.png
new file mode 100644
index 000000000..b21b9a01b
Binary files /dev/null and b/sales/quotation/setup/media/different_addresses03.png differ
diff --git a/sales/quotation/setup/media/different_addresses04.png b/sales/quotation/setup/media/different_addresses04.png
new file mode 100644
index 000000000..2ab0c595a
Binary files /dev/null and b/sales/quotation/setup/media/different_addresses04.png differ
diff --git a/sales/quotation/setup/media/different_addresses05.png b/sales/quotation/setup/media/different_addresses05.png
new file mode 100644
index 000000000..430d64545
Binary files /dev/null and b/sales/quotation/setup/media/different_addresses05.png differ
diff --git a/sales/quotation/setup/media/different_addresses06.png b/sales/quotation/setup/media/different_addresses06.png
new file mode 100644
index 000000000..84f3635cb
Binary files /dev/null and b/sales/quotation/setup/media/different_addresses06.png differ