NextERP/documentation
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[MERGE] Forward-port of branch 12.0 to 13.0

Browse Source
This commit is contained in:
Victor Feyens
2021-05-17 18:29:11 +02:00
parent 9e77998bc1 ba72b396a4
commit 87ab494b42
80 changed files with 173 additions and 173 deletions
Download Patch File Download Diff File Expand all files Collapse all files
content/applications/websites/ecommerce/getting_started/product_page.rst
+1 -1
View File
@@ -24,7 +24,7 @@ See how to configure your products from links here below.
.. seealso::
* :doc:`../managing_products/variants`
* :doc:`../../../sales/sales/products_prices/taxes`
* :doc:`/applications/sales/sales/products_prices/taxes`
* :doc:`../managing_products/stock`
* :doc:`../maximizing_revenue/cross_selling`
* :doc:`../maximizing_revenue/reviews`
content/applications/websites/ecommerce/maximizing_revenue/pricing.rst
+3 -3
View File
@@ -9,7 +9,7 @@ This section sheds light on pricing features found in the eCommerce app:
* let the customer choose the currency.
As a pre-requisite, check out how to managing product pricing:
:doc:`../../../sales/sales/products_prices/prices/pricing`).
:doc:`/applications/sales/sales/products_prices/prices/pricing`).
Geo-IP automatically applies the right price
============================================
@@ -32,6 +32,6 @@ can be found in *Pricelists* under the *Products* menu, located in the Website a
.. seealso::
* :doc:`../../../sales/sales/products_prices/prices/pricing`
* :doc:`../../../sales/sales/products_prices/prices/currencies`
* :doc:`/applications/sales/sales/products_prices/prices/pricing`
* :doc:`/applications/sales/sales/products_prices/prices/currencies`
* :doc:`promo_code`
content/applications/websites/ecommerce/shopper_experience/payment_acquirer.rst
+1 -1
View File
@@ -56,7 +56,7 @@ orders straight on.
Select your **bank account** if you get paid immediately on your bank account. If you don't you
can create a specific journal for the payment acquirer (type = Bank). That way, you can track
online payments in an intermediary account of your books until you get paid into your bank
account (see :doc:`../../../general/payment_acquirers/payment_acquirers`).
account (see :doc:`/applications/general/payment_acquirers/payment_acquirers`).
Capture the payment after the delivery
content/applications/websites/website/optimize/link_tracker.rst
+2 -2
View File
@@ -52,5 +52,5 @@ clicks.
get access to the *Link Tracker* module and its back-end functionalities.
#. Integrated with :doc:`Google Analytics <google_analytics>`, those trackers allow you to see
the number of clicks and visitors to keep you on top of your marketing campaigns.
#. The integration with the :doc:`CRM <../../../sales/crm/track_leads/prospect_visits>` application allows
you to understand where your leads and opportunities are coming from.
#. The integration with the :doc:`CRM </applications/sales/crm/track_leads/prospect_visits>` application allows
you to understand where your leads and opportunities are coming from.
content/applications/websites/website/optimize/seo.rst
+2 -2
View File
@@ -480,7 +480,7 @@ page. As these files are shared across all pages, further clicks by the
same visitor will not load any other Javascript resource.
.. note::
If you work on :doc:`Developer mode <../../../../applications/general/developer_mode>`, the CSS and
If you work on :doc:`Developer mode </applications/general/developer_mode>`, the CSS and
Javascript are neither concatenated, nor minified. Thus, it's much slower. But it allows you to
easily debug with the Chrome debugger as CSS and Javascript resources are not transformed from
their original versions.
@@ -639,6 +639,6 @@ and there is no other indexing rule than specified in the sitemap
to be found at following address.
You can customize the file *robots* in
:doc:`Developer mode <../../../../applications/general/developer_mode>` from *Settings --> Technical -->
:doc:`Developer mode </applications/general/developer_mode>` from *Settings --> Technical -->
User Interface --> Views* (exclude robots, exclude some pages, redirect to a custom Sitemap).
Make the Model Data of the view *Non Updatable* to not reset the file after system upgrades.
content/applications/websites/website/publish/domain_name.rst
+13 -13
View File
@@ -2,14 +2,14 @@
How to use my own domain name
=============================
By default, your Odoo Online instance and website have a *.odoo.com* domain name,
for both the URL and the emails.
By default, your Odoo Online instance and website have a *.odoo.com* domain name,
for both the URL and the emails.
But you can change to a custom one (e.g. www.yourcompany.com).
What is a good domain name
==========================
Your website address is as important to your branding as the name of your
business or organization, so put some thought into changing it for a proper
Your website address is as important to your branding as the name of your
business or organization, so put some thought into changing it for a proper
domain. Here are some tips:
- Simple and obvious
@@ -24,18 +24,18 @@ How to buy a domain name
========================
Buy your domain name at a popular registrar:
- `GoDaddy <https://www.godaddy.com>`__
- `Namecheap <https://www.namecheap.com>`__
- `OVH <https://www.ovh.com>`__
- `GoDaddy <https://www.godaddy.com>`__
- `Namecheap <https://www.namecheap.com>`__
- `OVH <https://www.ovh.com>`__
.. note:: Steps to buy a domain name are pretty much straight forward.
.. note:: Steps to buy a domain name are pretty much straight forward.
In case of issue, check out those easy tutorials:
- `GoDaddy <https://roadtoblogging.com/buy-domain-name-from-godaddy>`__
- `Namecheap <https://www.loudtips.com/buy-domain-name-hosting-namecheap//>`__
Feel free to buy an email server to have email addresses using your domain name.
However don't buy any extra service to create or host your website.
However don't buy any extra service to create or host your website.
This is Odoo's job!
.. _custom_domain:
@@ -60,7 +60,7 @@ First let's authorize the redirection (yourcompany.com -> yourcompany.odoo.com):
.. image:: media/domain_name03.png
:align: center
* A database domain prompt will appear. Enter your custom domain
* A database domain prompt will appear. Enter your custom domain
(e.g. www.yourcompany.com).
@@ -72,7 +72,7 @@ We can now apply the redirection from your domain name's manager account:
* Log in to your account and search for the DNS Zones management page.
* Create a CNAME record *www.yourdomain.com* pointing to *mywebsite.odoo.com*.
If you want to use the naked domain (e.g. yourdomain.com), you need to redirect
If you want to use the naked domain (e.g. yourdomain.com), you need to redirect
*yourdomain.com* to *www.yourdomain.com*.
.. note:: Here are some specific guidelines to create a CNAME record:
@@ -100,7 +100,7 @@ How to make sure that all my URLs use my custom domain?
To set up the root URL of your website and of all the links sent in emails, you can ask an administrator of your database (any user in the *Settings* group) to perform a login from the login screen. It's as simple as that!
If you want to do it manually, you can go to :menuselection:`Settings --> Technical --> System Parameters` .
If you want to do it manually, you can go to :menuselection:`Settings --> Technical --> System Parameters` .
Find the entry called ``web.base.url`` (you can create it if it does not exist) and enter the full URL of your website, like ``https://www.myodoowebsite.com``.
.. warning::
@@ -117,4 +117,4 @@ Google indexes your website under both names. This is a limitation of the Odoo c
.. seealso::
* :doc:`../../../productivity/discuss/advanced/email_servers`
* :doc:`/applications/productivity/discuss/advanced/email_servers`
content/applications/websites/website/publish/on-premise_geo-ip-installation.rst
+3 -8
View File
@@ -33,11 +33,11 @@ Installation
./odoo-bin --geoip-db= ~/Downloads/GeoLite2-City.mmdb
.. seealso::
- `CLI documentation <https://www.odoo.com/documentation/13.0/reference/cmdline.html>`_.
- :doc:`CLI documentation </developer/reference/cmdline>`.
.. warning::
``GeoIP`` Python library can also be used. However this version is discontinued since January
2019. See `GeoLite Legacy databases are now discontinued
1. See `GeoLite Legacy databases are now discontinued
<https://support.maxmind.com/geolite-legacy-discontinuation-notice/>`_
How To Test GeoIP Geolocation In Your Odoo Website
@@ -59,11 +59,6 @@ You should end up with a dictionary indicating the location of the IP address.
If the curly braces are empty ``{}``, it can be for any of the following reasons :
- The browsing IP address is the localhost (``127.0.0.1``) or a local area network one (``192.168.*.*``)
- If a reversed proxy is used, make sure to configure it correctly. See `--proxy-mode <https://www.odoo.com/documentation/13.0/reference/cmdline.html#cmdoption-odoo-bin-proxy-mode>`__
- If a reversed proxy is used, make sure to configure it correctly. See :option:`proxy mode <odoo-bin --proxy-mode>`
- ``geoip2`` is not installed or the GeoIP database file wasn't found
- The GeoIP database was unable to resolve the given IP address