[IMP] *: fix display issues

- Several content blocks were either misaligned, using the wrong display directive or not showing at all.
- Some images were missings.
- Typos
This commit is contained in:
Antoine Vandevenne (anv) 2020-01-03 11:16:17 +01:00 committed by Antoine Vandevenne (anv)
parent 934bb55eb3
commit 73fff57983
24 changed files with 139 additions and 131 deletions

View File

@ -6,12 +6,12 @@ Localizations
:titlesonly:
localizations/argentina
localizations/colombia
localizations/colombia_ES
localizations/france
localizations/germany
localizations/italy_IT
localizations/mexico
localizations/netherlands
localizations/spain
localizations/switzerland
localizations/colombia
localizations/colombia_ES
localizations/italy_IT

View File

@ -8,7 +8,7 @@ Introduction
Electronic invoicing for Colombia is available from Odoo 12 and
requires the next modules:
#. **l11n_co**: All the basic data to manage the accounting module,
#. **l10n_co**: All the basic data to manage the accounting module,
contains the default setup for: chart of accounts, taxes,
retentions, identification document types
#. **l10n_co_edi**: This module includes all the extra fields that are
@ -213,11 +213,9 @@ After this:
- A ZIP containing the legal XML and the PDF is downloaded and
displayed in the invoice chatter:
.. image:: media/colombia15.png
:align: center
.. image:: media/colombia15.png
.. image:: media/colombia16.png
:align: center
.. image:: media/colombia16.png
- The Electronic Invoice status changes to "Accepted"

View File

@ -7,25 +7,29 @@ Colombia (ES)
Introducción
============
La Facturación Electrónica para Colombia está disponible en Odoo V12 y
La Facturación Electrónica para Colombia está disponible en Odoo 12 y
requiere los siguientes Módulos:
1. **l11n_co**:** Contiene los datos básicos para manejar el
módulo de contabilidad, incluyendo la configuración por defecto
de los siguientes puntos:
#. **l10n_co**: Contiene los datos básicos para manejar el módulo de
contabilidad, incluyendo la configuración por defecto de los siguientes
puntos:
| a. Plan Contable
| b. Impuestos
| c. Retenciones
| d. Tipos de Documentos de Identificación
- Plan Contable
- Impuestos
- Retenciones
- Tipos de Documentos de Identificación
#. **l10n_co_edi**: Este módulo incluye todos los campos adicionales que son
requeridos para la Integración entre Carvajal T&S y la generación de la
Factura Electrónica, basado en los requisitos legales de la DIAN.
1. **l10n_co_edi**: Este módulo incluye todos los campos
adicionales que son requeridos para la Integración entre Carvajal
T&S y la generación de la Factura Electrónica, basado en los
requisitos legales de la DIAN.
Flujo General
-------------
=============
.. image:: media/colombia01.png
:align: center
Configuración
=============
@ -36,7 +40,8 @@ Configuración
Para esto ve a las aplicaciones y busca “Colombia”, luego da click en
Instalar a los primeros dos módulos:
cz
.. image:: media/colombia02.png
:align: center
2. Configuración de las credenciales del Servicio Web de Carvajal T&S
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@ -44,7 +49,7 @@ cz
| Una vez que los módulos están instalados, para poderte conectar con el
Servicio Web de Carvajal T&S, es necesario configurar el Usuario y las
Credenciales. Esta información será provista por Carvajal T&S.
| Ve a Facturación > Configuración > Configuración y busca la sección
| Ve a :menuselection:`Facturación --> Configuración --> Configuración` y busca la sección
**Facturación Electrónica Colombiana**
.. image:: media/colombia_ES02.png
@ -66,7 +71,7 @@ utilizada la siguiente URL: `Cenfinanciero <https://cenfinancierolab.cen.biz>`__
| Como parte de la información configurable que es enviada en el XML,
puedes definir los datos de la sección fiscal del PDF, así como de la
información Bancaria.
| Ve a Contabilidad Configuración Ajustes y busca la sección
| Ve a :menuselection:`Contabilidad --> Configuración --> Ajustes` y busca la sección
**Facturación Electrónica Colombiana**.
.. image:: media/colombia_ES03.png
@ -102,8 +107,8 @@ Los Códigos de tipo de Obligación aplicables a los terceros (sección 53
en el documento de RUT), son incluidos como parte del módulo de
Facturación Electrónica, dado que es información requerida por la DIAN.
Estos campos se encuentran en Contactos > Pestaña de Ventas y Compras
> Información Fiscal
Estos campos se encuentran en :menuselection:`Contactos --> Pestaña de Ventas y Compras
--> Información Fiscal`
.. image:: media/colombia_ES05.png
:align: center
@ -117,11 +122,10 @@ opciones.
4.2 Impuestos
-------------
| Si tus transacciones de ventas incluyen productos con impuestos, es
importante considerar que un campo adicional llamado *Tipo de Valor*
necesita ser configurado en la siguiente ruta:
| Contabilidad > Configuración > Impuestos: > Opciones Avanzadas
>Tipo de Valor
Si tus transacciones de ventas incluyen productos con impuestos, es
importante considerar que un campo adicional llamado *Tipo de Valor*
necesita ser configurado en la siguiente ruta: :menuselection:`Contabilidad
--> Configuración --> Impuestos: --> Opciones Avanzadas --> Tipo de Valor`
.. image:: media/colombia_ES06.png
:align: center
@ -143,9 +147,8 @@ relacionados con tus documentos de facturación necesitan ser
actualizados en Odoo.
La secuencia es configurada usando el modo de desarrollador en la
siguiente ruta:
Contabilidad > Configuración > Diarios > Liga de Secuencia
siguiente ruta: :menuselection:`Contabilidad --> Configuración --> Diarios
--> Liga de Secuencia`
.. image:: media/colombia_ES08.png
:align: center
@ -189,20 +192,19 @@ Electrónica son los siguientes:
Hay tres tipos de documentos
- **Factura electrónica**. Este es el documento normal y aplica
para Facturas, Notas de Crédito y Notas de Débito.
- **Factura electrónica**. Este es el documento normal y aplica
para Facturas, Notas de Crédito y Notas de Débito.
- **Factura de Importación**. Debe ser seleccionada para
transacciones de importación.
- **Factura de Importación**. Debe ser seleccionada para
transacciones de importación.
- **Factura de Contingencia**. Esta es un caso excepcional y es
utilizada como un respaldo manual en caso que la compañía no
pueda usar el ERP y hay necesidad de crear la factura
manualmente. Al ingresar esta factura en el ERP, se debe
seleccionar este tipo.
- **Factura de Contingencia**. Esta es un caso excepcional y es
utilizada como un respaldo manual en caso que la compañía no
pueda usar el ERP y hay necesidad de crear la factura
manualmente. Al ingresar esta factura en el ERP, se debe
seleccionar este tipo.
.. image:: media/colombia_ES11.png
:align: center
.. image:: media/colombia_ES11.png
1. Invoice Validation
~~~~~~~~~~~~~~~~~~~~~
@ -234,25 +236,24 @@ Electrónica, con el valor inicial **En Proceso**.
| Odoo envía una petición de actualización automáticamente para
verificar que el XML fue creado. Si este es el caso, las siguientes
acciones son hechas automáticamente.
acciones son hechas automáticamente:
- El XML Legal y el PDF son incluidos en un archivo ZIP y desplegados
en el historial de la Factura.
- El XML Legal y el PDF son incluidos en un archivo ZIP y desplegados
en el historial de la Factura.
.. image:: media/colombia_ES14.png
:align: center
.. image:: media/colombia_ES14.png
- El estatus de la Factura Electrónica es cambiado a “Aceptado”.
- El estatus de la Factura Electrónica es cambiado a “Aceptado”.
.. image:: media/colombia_ES15.png
:align: center
.. image:: media/colombia_ES15.png
Nota: En caso que el PDF y el XML sean requeridos inmediatamente, es
posible mandar manualmente la petición del estatus usando el siguiente
botón:
.. tip::
En caso que el PDF y el XML sean requeridos inmediatamente, es
posible mandar manualmente la petición del estatus usando el siguiente
botón:
.. image:: media/colombia_ES16.png
:align: center
.. image:: media/colombia_ES16.png
:align: center
1. Errores Frecuentes
~~~~~~~~~~~~~~~~~~~~~

View File

@ -16,8 +16,8 @@ Odoo uses the rules of double-entry bookkeeping system: all journal
entries are automatically balanced (sum of debits = sum of credits).
.. seealso::
`Understand Odoo's accounting transactions per document <https://odoo.com/documentation/functional/accounting.html>`__
- `Understand Odoo's accounting transactions per document
<https://odoo.com/documentation/functional/accounting.html>`_
Accrual and Cash Basis Methods
==============================
@ -128,8 +128,8 @@ inventory valuations. The available methods are standard price,
average price, LIFO (for countries allowing it) and FIFO.
.. seealso::
`View impact of the valuation method on your transactions <https://odoo.com/documentation/functional/valuation.html>`__
- `View impact of the valuation method on your transactions
<https://odoo.com/documentation/functional/valuation.html>`_
Easy retained earnings
======================

View File

@ -79,11 +79,8 @@ salesperson will trigger invoice based on activities on the contract.
Activities can be:
- fixed products/services, coming from a sale order linked to this contract
- materials purchased (that you will re-invoiced)
- materials purchased (that you will re-invoice)
- time and material based on timesheets or purchases (subcontracting)
- expenses like travel and accommodation that you re-invoice to the customer
You can invoice at the end of the contract or trigger intermediate

View File

@ -12,7 +12,7 @@ files containing pending payments made with an SDD mandate.
.. note::
| SDD is supported by all SEPA countries, which includes the 28 member states of the European Union as well as additional countries.
| `List of all SEPA countries. <https://www.europeanpaymentscouncil.eu/document-library/other/epc-list-sepa-scheme-countries>`_
| `List of all SEPA countries <https://www.europeanpaymentscouncil.eu/document-library/other/epc-list-sepa-scheme-countries>`_.
Configuration
=============
@ -120,7 +120,7 @@ Finally, upload this file to your bank to process the payments.
.. seealso::
* :doc:`../../bank/setup/create_bank_account`
* `Odoo Academy: SEPA Direct Debit Mandates (SDD) <https://www.odoo.com/r/Zxs>`_
* `List of all SEPA countries. <https://www.europeanpaymentscouncil.eu/document-library/other/epc-list-sepa-scheme-countries>`_
* `List of all SEPA countries <https://www.europeanpaymentscouncil.eu/document-library/other/epc-list-sepa-scheme-countries>`_.

View File

@ -20,10 +20,10 @@ Applications
helpdesk
livechat/livechat
expense/expense
general
iot
mobile/firebase
social_marketing
sms_marketing
fsm
planning
general

View File

@ -101,7 +101,7 @@ like installment plans (e.g.
Such a customization service is made on-demand by our technical experts
based on your own requirements. A business advisor can reach you out for
such matter. `Contact us. <https://www.odoo.com/page/contactus>`__
such matter. `Contact us <https://www.odoo.com/page/contactus>`_.
.. seealso::

View File

@ -11,7 +11,12 @@ payment.
Paypal account
==============
A business account is needed to get paid with Paypal. Create a `Paypayl Business Account <https://www.paypal.com/us/merchantsignup/applicationChecklist?signupType=CREATE_NEW_ACCOUNT&productIntentId=wp_standard>`__ or upgrade your Personal account to a Business account. Go to the Paypal settings and click on *Upgrade to a Business account*. Then follow the few configuration steps.
A business account is needed to get paid with Paypal. Create a
`Paypal Business Account <https://www.paypal.com/us/merchantsignup/
applicationChecklist?signupType=CREATE_NEW_ACCOUNT&productIntentId=wp_standard>`_
or upgrade your Personal account to a Business account. Go to the Paypal
settings and click on *Upgrade to a Business account*.
Then follow the few configuration steps.
Settings in Paypal
@ -19,8 +24,8 @@ Settings in Paypal
| First, lets see how to set up your Paypal account in order to build a
seamless customer experience with Odoo.
| Log in and open the settings. Go to *Products & Services > Website
payments* and click *Update* on *Website preferences*.
| Log in and open the settings. Go to :menuselection:`Products & Services -->
Website payments` and click **Update** on **Website preferences**.
.. image:: media/paypal01.png
:align: center
@ -30,8 +35,8 @@ Auto Return
*Auto Return* automatically redirects your customers to Odoo once the
payment is processed. Check *Auto Return* and enter your domain name
"/shop/confirmation" as *Return URL* (e.g.
https://yourcompany.odoo.com/shop/confirmation).
with the suffix ``/shop/confirmation`` as *Return URL*
(e.g. ``https://yourcompany.odoo.com/shop/confirmation``).
This URL is requested in Paypal but not used in practice as Odoo
transmits it at each transaction. Dont worry if you manage several
@ -71,8 +76,7 @@ is virtually guaranteed since IPN resends a confirmation until your site acknowl
| To activate IPN, get back to *Website payments* menu and click
*Update* in *Instant Payment Notification*.
| The *Notification URL* to set is your domain name +
“payment/paypal/ipn” (e.g.
https://yourcompany.odoo.com/payment/paypal/ipn).
“payment/paypal/ipn” (e.g. ``https://yourcompany.odoo.com/payment/paypal/ipn``).
.. image:: media/paypal05.png
:align: center
@ -104,14 +108,17 @@ Then, click *More Options* and set the two default encoding formats as **UTF-8**
Your Paypal account is ready!
.. tip:: If you want your customers to pay without creating a Paypal account,
**Paypal Account Optional** needs to be turned on.
.. tip::
If you want your customers to pay without creating a Paypal account,
*Paypal Account Optional* needs to be turned on.
.. image:: media/paypal_account_optional.png
:align: center
.. image:: media/paypal_account_optional.png
.. 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>`__
.. 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>`_.
Settings in Odoo
================
@ -151,8 +158,9 @@ Odoo and check *Add Extra Fees*.
You can refer to `Paypal Fees <https://www.paypal.com/webapps/mpp/paypal-fees>`__ to set up
fees.
..note:: `Traders in the EU <https://europa.eu/youreurope/citizens/consumers/shopping/pricing-payments/index_en.htm>`__
are not allowed to charge extra fees for paying with credit cards.
.. note::
`Traders in the EU <https://europa.eu/youreurope/citizens/consumers/shopping/pricing-payments/
index_en.htm>`_ are not allowed to charge extra fees for paying with credit cards.
Go live!
========

View File

@ -13,9 +13,9 @@ Go to *Settings* and under *Map view* click on *Get token*.
:alt: Configure Mapbox for Odoo Field Service
Click on :menuselection:`Start mapping for free --> fill the Username, email and password fields
--> agree with their Terms of Service and Privacy Policy --> Get started`.
You will be redirected to your account. Scrolling the page down you will find *Access tokens*.
Copy the *Default public token.
--> agree with their Terms of Service and Privacy Policy --> Get started`. You will be redirected to
your account. Scrolling the page down you will find *Access tokens*. Copy the *Default public
token*.
.. image:: media/plit2.png
:align: center

View File

@ -2,7 +2,8 @@
How to allow users to sign in with their Google account
=======================================================
- Connect to your Google account and go to `https://console.developers.google.com/ <https://console.developers.google.com/>`_.
- Connect to your Google account and go to the `Google API Dashboard
<https://console.developers.google.com/>`_.
- Click on **Create Project** and enter the project name and other details.

View File

@ -30,7 +30,7 @@ log-in.
.. note::
Remember that each additional user will increase your subscription fees.
Refer to our `*Pricing page* <https://www.odoo.com/pricing>`__ for more information.
Refer to our `Pricing page <https://www.odoo.com/pricing>`_ for more information.
.. image:: media/add_user03.png
:align: center

View File

@ -83,9 +83,8 @@ Ticket.
.. image:: media/helpdesk08.png
:align: center
The final option to submit tickets is thru an API connection. View the
documentation
`*here* <https://www.odoo.com/documentation/13.0/webservices/odoo.html>`__.
The final option to submit tickets is through an API connection. View the
documentation `here <https://www.odoo.com/documentation/13.0/webservices/odoo.html>`_.
Tickets have been created, now what?
------------------------------------

View File

@ -36,9 +36,7 @@ complete the registration process.
If you already have a UPS account, you can add it to your online profile as follows:
1. Log in to the UPS.com site
(`http://www.ups.com <http://www.ups.com/>`__) using your UPS.com User
ID and Password.
1. Log in to the `UPS.com website <http://www.ups.com/>`_) using your UPS.com User ID and Password.
2. Click the **My UPS** tab.
@ -59,16 +57,11 @@ Get an Access Key
After you have added your UPS account number to your user profile you
can request an Access Key from UPS using the steps below:
1. Go to the **UPS Developer Kit** web page
`https://www.ups.com/upsdeveloperkit?loc=en\_US <https://www.ups.com/upsdeveloperkit?loc=en_US>`__
2. Log into UPS.com with your user ID and password
3. Click on the link **Request an access key**.
4. Verify your contact information
6. Click the **Request Access Key** button.
#. Go to the `UPS Developer Kit web page <https://www.ups.com/upsdeveloperkit?loc=en_US>`_
#. Log into UPS.com with your user ID and password
#. Click on the link **Request an access key**.
#. Verify your contact information
#. Click the **Request Access Key** button.
The **Access Key** will be provided to you on the web page,
and an email with the Access Key will be sent to the email address of

View File

@ -32,14 +32,17 @@ We advise that:
cause side-effects if they are started more often than expected.
Can you install `pycups <https://pypi.org/project/pycups/>`_ or some similar library linked to `CUPS <https://www.cups.org/>`_ ?
--------------------------------------------------------------------------------------------------------------------------------
Can you install ``pycups`` or some similar library linked to ``CUPS`` ?
-----------------------------------------------------------------------
Several community apps for Odoo list ``pycups`` as required dependency.
- ``pycups`` is a set of Python bindings for the libcups library. They are meant to integrate your computer with a local printing server.
- CUPS is a printing server meant to be used for printers on the same local network as the Odoo server.
- `pycups <https://pypi.org/project/pycups/>`_ is a set of Python bindings for the libcups library.
They are meant to integrate your computer with a local printing server.
- `CUPS <https://www.cups.org/>`_ is a printing server meant to be used for printers on the same
local network as the Odoo server.
We consider adding new system packages as long as they are indeed used.
Regarding ``pycups``, you won't be able to configure a printer in the local network of your Odoo.sh server.
Regarding ``pycups``, you won't be able to configure a printer in the local network of your Odoo.sh
server.

View File

@ -52,7 +52,8 @@ the database is roll-backed as it was before the update.
You still have access to the log of the failed update, so you can troubleshoot it.
The demo data is not loaded, as it is not meant to be used in a production database.
The unit tests are not performed, as it would increase the unavailabity time of the production database during the updates.
The unit tests are not performed, as it would increase the unavailability time of the production
database during the updates.
Partners using trial projects should be aware their production branch, along with all the staging branches,
will automatically be set back to the development stage after 30 days.

View File

@ -45,5 +45,5 @@ is confirmed. If however you selected delivered quantities, you will
first have to validate the delivery.
Once the products are delivered, you can invoice your customer. Odoo
will automatically add the quantities to invoiced based on how many you
will automatically add the quantities to invoice based on how many you
delivered if you did a partial delivery.

View File

@ -30,7 +30,7 @@ expiration time for the quotation.
On each template, you can also specify discounts if the option is
activated in the *Sales* settings. The base price is set in the
product configuration and can be alterated by customer pricelists.
product configuration and can be changed by customer pricelists.
.. TODO (TO LINK DOC LATER WHEN DONE based on this https://www.odoo.com/documentation/user/13.0/sales/products_prices/prices/pricing.html

View File

@ -54,6 +54,8 @@ Edit an existing page
RST Cheat Sheet
---------------
.. TODO merge with our internal tutorial : https://docs.google.com/document/d/19QkK9zDpoHJ57QtBgAs0sjInfO8zR_3mfCIr-CxS85Y/
Here is a summary of the markup elements you may use while editing our documentation.
+------------------------------+--------------------------+---------------------------------------+
@ -120,14 +122,13 @@ Add images to your documents
.. Add a page about a new topic
.. ============================
.. TODO
.. TODO publish our internal tutorial : https://docs.google.com/document/d/1EP32VFjN08piZoGn1BXT6ZOVb5AKUTieeeuK10nxZz8/
Technical Details for Nerds
===========================
Advanced users may, of course, fork and clone `the GitHub repository <https://github.com/odoo/documentation-user>`_.
Advanced users may, of course, fork and clone the `GitHub repository <https://github.com/odoo/documentation-user>`_.
Then submit a pull request with the canonical Git/GitHub workflow.
See our `README <https://github.com/odoo/documentation-user/blob/13.0/README.rst>`_ file about building

View File

@ -13,8 +13,8 @@ Users who have a valid Odoo Enterprise subscription may always contact our suppo
Please include in your request:
- your subscription number,
- if your database is hosted by Odoo (Odoo Online or Odoo.sh), please also send the URL of your database.
- your subscription number
- the URL of your database if your database is hosted by Odoo (Odoo Online or Odoo.sh)
Our agents will get back to you as soon as possible.

View File

@ -24,7 +24,8 @@ To follow your website's traffic with Google Analytics:
.. image:: media/google_analytics_settings.png
:align: center
To make your first steps in Google Analytics, refer to `Google Documentation. <https://support.google.com/analytics/answer/1008015?hl=en/>`__
To make your first steps in Google Analytics, refer to `Google Documentation
<https://support.google.com/analytics/answer/1008015?hl=en/>`_.
.. seealso::

View File

@ -61,15 +61,15 @@ modules to help you build your website content:
- **Odoo Slides**: publish all your Powerpoint or PDF presentations.
Their content is automatically indexed on the web page. Example:
`https://www.odoo.com/slides/public-channel-1 <https://www.odoo.com/slides/public-channel-1>`__
`odoo.com/slides/public-channel-1 <https://www.odoo.com/slides/public-channel-1>`_
- **Odoo Forum**: let your community create contents for you. Example:
`https://odoo.com/forum/1 <https://odoo.com/forum/1>`__
`odoo.com/forum/1 <https://odoo.com/forum/1>`_
(accounts for 30% of Odoo.com landing pages)
- **Odoo Mailing List Archive**: publish mailing list archives on your
website. Example:
`https://www.odoo.com/groups/community-59 <https://www.odoo.com/groups/community-59>`__
`odoo.com/groups/community-59 <https://www.odoo.com/groups/community-59>`_
(1000 pages created per month)
.. note::
@ -130,7 +130,7 @@ Test Your Website
You can compare how your website rank, in terms of SEO, against Odoo
using WooRank free services:
`https://www.woorank.com <https://www.woorank.com>`__
`woorank.com <https://www.woorank.com>`_
URLs Handling
=============
@ -548,7 +548,7 @@ Browser Caching
Javascript, images and CSS resources have an URL that changes
dynamically when their content change. As an example, all CSS files are
loaded through this URL:
`http://localhost:8069/web/content/457-0da1d9d/web.assets\_common.0.css <http://localhost:8069/web/content/457-0da1d9d/web.assets_common.0.css>`__.
`localhost:8069/web/content/457-0da1d9d/web.assets\_common.0.css <http://localhost:8069/web/content/457-0da1d9d/web.assets_common.0.css>`__.
The ``457-0da1d9d`` part of this URL will change if you modify the CSS of
your website.
@ -563,7 +563,10 @@ In addition to being fast, Odoo is also more scalable than traditional
CMS and eCommerce (Drupal, Wordpress, Magento, Prestashop). The
following link provides an analysis of the major open source CMS and
eCommerce compared to Odoo when it comes to high query volumes:
`*https://www.odoo.com/slides/slide/197* <https://www.odoo.com/slides/slide/odoo-cms-performance-comparison-and-optimisation-197>`__
`https://www.odoo.com/slides/slide/197
<https://www.odoo.com/slides/slide/odoo-cms-performance-comparison-and-optimisation-197>`_
.. todo:: fix above link
Here is the slide that summarizes the scalability of Odoo Website & eCommerce.

View File

@ -68,7 +68,9 @@ requested to sign in.
:align: center
.. note::
When switching, you are redirected to the same domain path on the other website (e.g.,/shop/myproduct). If this URL is not used, you will be redirected to a 404 page but suggested to create a new page from there.
When switching, you are redirected to the same domain path on the other website
(e.g., ``/shop/myproduct``). If this URL is not used, you will be redirected to a 404 page but
prompted to create a new page from there.
Add features
============
@ -111,14 +113,14 @@ Manage domain names
As said earlier, your websites can either share the same domain name or
use a specific one. If you share it and want to adapt the content per
region, set country groups in the setting of each website. Visitors will
be redirected to the right website using Geo IP.
be redirected to the right website using GeoIP.
.. image:: media/multi_website18.png
:align: center
.. note::
Geo IP is installed by default in Odoo Online. If you run Odoo
on-premise, dont forget to install *Geoip* library.
on-premise, dont forget to install *GeoIP* library.
`Read the full documenation about domain names here <https://www.odoo.com/documentation/user/online/website/publish/domain_name.html>`__,

View File

@ -45,8 +45,8 @@ To translate the content of the website, click on **Translate** (here
There, if you have installed the Gengo Translator, You will see that
next to the **Translate** button you also have a button **Translate
automatically**. Once you click on that button, you will be asked some
information on your account. If you don't have an account yet, go to
`*https://gengo.com/auth/form/login/* <https://gengo.com/auth/form/login/>`__
information on your account. If you don't have an account yet, follow
`this link <https://gengo.com/auth/form/login/>`_
in order to create one. You need to ask for a public key and a private
key.