diff --git a/_static/example_files/Ontvangen_CODA.2013-01-11-18.59.15.txt b/_static/example_files/Ontvangen_CODA.2013-01-11-18.59.15.txt
deleted file mode 100644
index 158fa587b..000000000
--- a/_static/example_files/Ontvangen_CODA.2013-01-11-18.59.15.txt
+++ /dev/null
@@ -1,24 +0,0 @@
-0000011011172505 00178299 DE MEYER LUC KREDBEBB 00820512013 00000 2
-12135BE33737018595246 EUR0000000011812700270710NOVIAT NV KBC-Business Comfortrekening 003
-2100010000OL44483FW SCTOFBIONLO1000000000435000110111001010000MEDEDELING 11011113501 0
-2200010000 GKCCBEBB 1 0
-2300010000BE41063012345610 PARTNER 1 0 1
-3100010001OL44483FW SCTOFBIONLO001010001001PARTNER 1 0 0
-2100020000OL4414AC8BOVSOVSOVERS0000000003044450110111001500001101240283842818 11011113501 0
-2200020000 BBRUBEBB 1 0
-2300020000BE61310126985517 PARTNER 2 0 1
-3100020001OL4414AC8BOVSOVSOVERS001500001001PARTNER 2 1 0
-3200020001MOLENSTRAAT 60 9340 LEDE 0 0
-2100030000AFECA0BIS IKLINNINBIS1000000000479040110111313410000 KBC-INVESTERINGSKREDIET 737-6543210-21 11011113510 0
-2100030001AFECA0BIS IKLINNINBIS1000000000419920110111813410660 11011113500 0
-2100030002AFECA0BIS IKLINNINBIS1000000000059120110111813410020 11011113510 0
-2100040000AFECA0CVA IKLINNINNIG1000000000479040110111313410000 KBC-INVESTERINGSKREDIET 737-6543210-21 11011113510 0
-2100040001AFECA0CVA IKLINNINNIG1000000000419920110111813410660 11011113500 0
-2100040002AFECA0CVA IKLINNINNIG1000000000059120110111813410020 11011113510 0
-2100050000AOGM00160BSCTOBOGOVER0000000000063740110111001500000TERUGGAVE 37232481 8400083296 . 11011113501 0
-2200050000 362/363 KREDBEBB 1 0
-2300050000BE43730004200601 KBC VERZEKERINGEN NV 0 1
-3100050001AOGM00160BSCTOBOGOVER001500001001KBC VERZEKERINGEN NV 1 0
-3200050001VAN OVERSTRAETENPLEIN 2 3000 LEUVEN 0 0
-8135BE44734024486445 EUR0000000013646050110111 0
-9 000022000000001393080000000003108190 2
diff --git a/_static/example_files/test_ofx.ofx b/_static/example_files/test_ofx.ofx
deleted file mode 100644
index 37df4d0c9..000000000
--- a/_static/example_files/test_ofx.ofx
+++ /dev/null
@@ -1,100 +0,0 @@
-
-
-
-
-
-
- 0
- INFO
-
- 20130831165153.000[-8:PST]
- ENG
-
-
-
-
- 0
-
- 0
- INFO
-
-
- USD
-
- 000000123
- 123456
- CHECKING
-
-
- 20130801
- 20130831165153.000[-8:PST]
-
- POS
- 20130824080000
- -80
- 219378
- Agrolait
-
-
-
- 20130801
- 20130831165153.000[-8:PST]
-
- POS
- 20130824080000
- -90
- 219379
- China Export
-
-
-
- 20130801
- 20130831165153.000[-8:PST]
-
- POS
- 20130824080000
- -100
- 219380
- Axelor Scuba
-
-
-
- 20130801
- 20130831165153.000[-8:PST]
-
- POS
- 20130824080000
- -90
- 219381
- China Scuba
-
-
-
- 2156.56
- 20130831165153
-
-
-
-
-
-
- 0
-
- 0
- INFO
-
-
- USD
-
- 123412341234
-
-
-
-
- -562.00
- 20130831165153
-
-
-
-
-
diff --git a/_static/example_files/test_qif.qif b/_static/example_files/test_qif.qif
deleted file mode 100644
index 5388e6dae..000000000
--- a/_static/example_files/test_qif.qif
+++ /dev/null
@@ -1,21 +0,0 @@
-!Type:Bank
-D8/12/13
-T-1,000.00
-PDelta PC
-^
-D8/15/13
-T-75.46
-PWalts Drugs
-^
-D3/3/13
-T-379.00
-PEpic Technologies
-^
-D3/4/13
-T-20.28
-PYOUR LOCAL SUPERMARKET
-^
-D3/3/13
-T-421.35
-PSPRINGFIELD WATER UTILITY
-^
diff --git a/_static/example_files/vendor_pricelists_template.csv b/_static/example_files/vendor_pricelists_template.csv
deleted file mode 100644
index dc8097faa..000000000
--- a/_static/example_files/vendor_pricelists_template.csv
+++ /dev/null
@@ -1,8 +0,0 @@
-Vendor,Product Template,Vendor Product Name,Vendor Product Code,Price,Minimal Quantity,Start Date,End Date,Delivery Lead Time
-ASUSTeK,iMac,"Apple iMac 27""",ART439872,1299,5,,,2
-Camptocamp,iMac,"Apple iMac 27""",IT98764,1399,1,,,4
-ASUSTeK,"Switch, 24 ports",Bluetek Switch,ART439456,66,,,,4
-ASUSTeK,Datacard,LS DC02,ART672098,35,,,,5
-ASUSTeK,Laptop Customized,Asus ROG CS,ART439870,3300,,01/01/2018,12/31/2018,10
-ASUSTeK,"Mouse, Wireless",Logitech G950,ART859562,12.5,,,,3
-ASUSTeK,iPad Mini,Apple iPad Mini 32GB,ART547892,750,,01/01/2018,05/05/2018,3
\ No newline at end of file
diff --git a/_static/files/certificate.cer b/accounting/fiscal_localizations/localizations/files/certificate.cer
similarity index 100%
rename from _static/files/certificate.cer
rename to accounting/fiscal_localizations/localizations/files/certificate.cer
diff --git a/_static/files/certificate.key b/accounting/fiscal_localizations/localizations/files/certificate.key
similarity index 100%
rename from _static/files/certificate.key
rename to accounting/fiscal_localizations/localizations/files/certificate.key
diff --git a/accounting/fiscal_localizations/localizations/mexico.rst b/accounting/fiscal_localizations/localizations/mexico.rst
index e9bb2a82a..1c9a498cd 100644
--- a/accounting/fiscal_localizations/localizations/mexico.rst
+++ b/accounting/fiscal_localizations/localizations/mexico.rst
@@ -249,8 +249,8 @@ digital certificate, your key and your password. To finish, click on *Save and C
If you still do not have one of the contracted PACs and you want to test electronic invoicing you
can use the following SAT test certificates:
- - :download:`Certificate <../../../_static/files/certificate.cer>`
- - :download:`Certificate Key <../../../_static/files/certificate.key>`
+ - :download:`Certificate `
+ - :download:`Certificate Key `
- **Password:** ``12345678a``
You must also configure the company with a real address within Mexico (including all fields) and
@@ -1509,4 +1509,4 @@ Glossary
digits, shown in 5 groups separated by hyphens.
- LCO: List of Obliged Taxpayers (LCO) is a list issued by the SAT that accounts for all the
taxpayers whom it authorizes the issuance of invoices and payroll receipts. This means that, to
- be able to electronically bill your clients, you must be in this database.
\ No newline at end of file
+ be able to electronically bill your clients, you must be in this database.
diff --git a/discuss/advanced/email_servers.rst b/discuss/advanced/email_servers.rst
index db69205ee..68649274a 100644
--- a/discuss/advanced/email_servers.rst
+++ b/discuss/advanced/email_servers.rst
@@ -179,3 +179,31 @@ alias in your mail server.
.. _Office 365 documentation:
https://support.office.com/en-us/article/how-to-set-up-a-multifunction-device-or-application-to-send-email-using-office-365-69f58e99-c550-4274-ad18-c805d654b4c4
+
+Set up different dedicated servers for transactional and mass mails
+===================================================================
+
+Odoo's e-mail server has the capability of sending 200 e-mails per day on Odoo SH Cloud Platform.
+However, if needed, you can use a separate Mail Transfer Agent (MTA) servers for transactional
+e-mails and mass mailings.
+Example: use Odoo's own mail server for transactional e-mails, and Sendgrid, Amazon SES, or Mailgun
+for mass mailings. Another alternative is to use Postmark for transactional e-mails, and Amazon SES
+or Sendgrid for mass mailings.
+
+.. note::
+ A default outgoing email server is already configured. You should not create an alternative one
+ unless you want to use a specific external outgoing email server for technical reasons.
+
+To do this, you should first enable the :doc:`Developer mode
+<../../general/developer_mode/activate>` and then go to :menuselection:`Settings --> Technical
+--> Outgoing` e-mail servers. There you have to create two e-mail MTA server settings. One for
+transactional e-mails and one for mass mail servers. Be sure to mark the priority of transactional
+e-mail servers as low as the mass email servers.
+
+Now, go to :menuselection:`Email Marketing --> Settings` and enable *Dedicated Server*.
+With these settings, Odoo uses the server with the lower priority for transactional emails, and the
+server here selected for mass mails.
+Note that in this case, you have to set your domain's Sender Policy Framework (SPF) records to
+include both transactional and mass mail servers. If your server resides with xxxx.odoo.com, the
+available options are Sendinblue and Mailchimp, as your e-mails would be originated from the
+xxxx.odoo.com domain.
\ No newline at end of file
diff --git a/_static/example_files/External_id_3rd_party_application_product_categories.csv b/general/base_import/files/External_id_3rd_party_application_product_categories.csv
similarity index 100%
rename from _static/example_files/External_id_3rd_party_application_product_categories.csv
rename to general/base_import/files/External_id_3rd_party_application_product_categories.csv
diff --git a/_static/example_files/External_id_3rd_party_application_products.csv b/general/base_import/files/External_id_3rd_party_application_products.csv
similarity index 100%
rename from _static/example_files/External_id_3rd_party_application_products.csv
rename to general/base_import/files/External_id_3rd_party_application_products.csv
diff --git a/_static/example_files/database_import_test.sql b/general/base_import/files/database_import_test.sql
similarity index 100%
rename from _static/example_files/database_import_test.sql
rename to general/base_import/files/database_import_test.sql
diff --git a/_static/example_files/m2m_customers_tags.csv b/general/base_import/files/m2m_customers_tags.csv
similarity index 100%
rename from _static/example_files/m2m_customers_tags.csv
rename to general/base_import/files/m2m_customers_tags.csv
diff --git a/_static/example_files/o2m_customers_contacts.csv b/general/base_import/files/o2m_customers_contacts.csv
similarity index 100%
rename from _static/example_files/o2m_customers_contacts.csv
rename to general/base_import/files/o2m_customers_contacts.csv
diff --git a/_static/example_files/o2m_purchase_order_lines.csv b/general/base_import/files/o2m_purchase_order_lines.csv
similarity index 100%
rename from _static/example_files/o2m_purchase_order_lines.csv
rename to general/base_import/files/o2m_purchase_order_lines.csv
diff --git a/_static/example_files/purchase.order_functional_error_line_cant_adpat.csv b/general/base_import/files/purchase.order_functional_error_line_cant_adpat.csv
similarity index 100%
rename from _static/example_files/purchase.order_functional_error_line_cant_adpat.csv
rename to general/base_import/files/purchase.order_functional_error_line_cant_adpat.csv
diff --git a/general/base_import/import_faq.rst b/general/base_import/import_faq.rst
index bd5ed16a0..115d79a18 100644
--- a/general/base_import/import_faq.rst
+++ b/general/base_import/import_faq.rst
@@ -176,10 +176,10 @@ with columns like "Field/External ID". The following two CSV files give you an e
and their Categories.
:download:`CSV file for categories
-<../../_static/example_files/External_id_3rd_party_application_product_categories.csv>`.
+`.
:download:`CSV file for Products
-<../../_static/example_files/External_id_3rd_party_application_products.csv>`.
+`.
What can I do if I have multiple matches for a field?
-----------------------------------------------------
@@ -200,7 +200,7 @@ The tags should be separated by a comma without any spacing. For example, if you
to be linked to both tags 'Manufacturer' and 'Retailer' then you will encode "Manufacturer,Retailer"
in the same column of your CSV file.
-:download:`CSV file for Manufacturer, Retailer <../../_static/example_files/m2m_customers_tags.csv>`
+:download:`CSV file for Manufacturer, Retailer `
How can I import a one2many relationship (e.g. several Order Lines of a Sales Order)?
@@ -213,19 +213,16 @@ any information in the fields relative to the order. As an example, here is
``purchase.order_functional_error_line_cant_adpat.CSV`` file of some quotations you can import,
based on demo data.
-:download:`File for some Quotations
-<../../_static/example_files/purchase.order_functional_error_line_cant_adpat.csv>`.
+:download:`File for some Quotations `.
The following CSV file shows how to import purchase orders with their respective purchase order
lines:
-:download:`Purchase orders with their respective purchase order lines
-<../../_static/example_files/o2m_purchase_order_lines.csv>`.
+:download:`Purchase orders with their respective purchase order lines `.
The following CSV file shows how to import customers and their respective contacts:
-:download:`Customers and their respective contacts
-<../../_static/example_files/o2m_customers_contacts.csv>`.
+:download:`Customers and their respective contacts `.
Can I import several times the same record?
-------------------------------------------
@@ -261,7 +258,7 @@ must be unique across all the records of all objects, so it's a good practice to
As an example, suppose you have a SQL database with two tables you want to import: companies and
persons. Each person belong to one company, so you will have to recreate the link between a person
and the company he work for. (If you want to test this example, here is a :download:`dump of such a
-PostgreSQL database <../../_static/example_files/database_import_test.sql>`)
+PostgreSQL database `)
We will first export all companies and their "External ID". In PSQL, write the following command:
diff --git a/general/multi_companies/manage_multi_companies.rst b/general/multi_companies/manage_multi_companies.rst
index 6f9589d1e..f91423d39 100644
--- a/general/multi_companies/manage_multi_companies.rst
+++ b/general/multi_companies/manage_multi_companies.rst
@@ -121,7 +121,7 @@ at an invoice/bills level or at a sales/purchase orders level.
:alt: View of the purchase created on JS Store US from JS Store Belgium in Odoo
.. note::
- Products have to be configured as *Can be sold*.
+ Products have to be configured as *Can be sold* and must be shared between the companies.
.. tip::
Remember to test all workflows as an user other than the administrator.
diff --git a/inventory/management/products/uom.rst b/inventory/management/products/uom.rst
index b13926c03..05b7ac436 100644
--- a/inventory/management/products/uom.rst
+++ b/inventory/management/products/uom.rst
@@ -58,7 +58,7 @@ the product.
Transfer from One Unit to Another
=================================
-Buy in the Pruchase UoM
+Buy in the Purchase UoM
-----------------------
In the *Purchase* application, *Create* a new request for quotation
diff --git a/odoo_sh/advanced/containers.rst b/odoo_sh/advanced/containers.rst
index 5d205837e..7d818e6df 100644
--- a/odoo_sh/advanced/containers.rst
+++ b/odoo_sh/advanced/containers.rst
@@ -9,15 +9,9 @@ Overview
Each build is isolated within its own container (Linux namespaced container).
-The base is an Ubuntu 16.04 system, where all of Odoo's required dependencies,
+The base is an Ubuntu system, where all of Odoo's required dependencies,
as well as common useful packages, are installed.
-The Odoo.sh team is open to install system packages as long as they are
-distributed in the official Ubuntu repositories and meets the platform's
-`dependency requirements `_.
-You can use `the feedback form `_ in order to
-submit a package request to the Odoo.sh team.
-
If your project requires additional Python dependencies, or more recent releases,
you can define a :file:`requirements.txt` file in the root of your branches listing them.
The platform will take care to install these dependencies in your containers.
diff --git a/odoo_sh/overview/introduction.rst b/odoo_sh/overview/introduction.rst
index 207db543d..ff4472b4a 100644
--- a/odoo_sh/overview/introduction.rst
+++ b/odoo_sh/overview/introduction.rst
@@ -10,6 +10,3 @@ Introduction to Odoo.sh
:height: 394
The documentation will help you go live with your Odoo.sh project in no time.
-
-You can suggest new documentation topics
-or report typos and inaccuracies by `contacting us `_.