Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .tx/config
Original file line number Diff line number Diff line change
Expand Up @@ -60,4 +60,4 @@ source_lang = en
[odoo-16-doc.websites]
file_filter = locale/<lang>/LC_MESSAGES/websites.po
source_file = locale/sources/websites.pot
source_lang = en
source_lang = en
2 changes: 1 addition & 1 deletion commit_template.txt
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,4 @@
# [REM] = Removal
# [REF] = Refactoring (restructuring)
# [MOV] = Move/rename
#
#
16 changes: 8 additions & 8 deletions content/administration/install/deploy.rst
Original file line number Diff line number Diff line change
Expand Up @@ -392,7 +392,7 @@ The solutions to support livechat/motifications in a WSGI application are:

* Deploy a threaded version of Odoo (instead of a process-based preforking
one) and redirect only requests to URLs starting with ``/websocket/`` to
that Odoo, this is the simplest and the websocket URL can double up as the cron
that Odoo, this is the simplest and the websocket URL can double up as the cron
instance.
* Deploy an evented Odoo via ``odoo-gevent`` and proxy requests starting
with ``/websocket/`` to
Expand All @@ -410,7 +410,7 @@ a static HTTP server.
Serving static files
--------------------

Odoo static files are located in each module's :file:`static/` folder, so static files can be served
Odoo static files are located in each module's :file:`static/` folder, so static files can be served
by intercepting all requests to :samp:`/{MODULE}/static/{FILE}`, and looking up the right module
(and file) in the various addons paths.

Expand All @@ -420,13 +420,13 @@ by intercepting all requests to :samp:`/{MODULE}/static/{FILE}`, and looking up

Using the above NGINX (https) configuration, the following location block should be added to
serve static files via NGINX.

.. code-block:: nginx

location @odoo {
# copy-paste the content of the / location block
}

# Serve static files right away
location ~ ^/[^/]+/static/.+$ {
root /usr/lib/python3/dist-packages/odoo/addons;
Expand All @@ -444,11 +444,11 @@ by intercepting all requests to :samp:`/{MODULE}/static/{FILE}`, and looking up
serve static files via NGINX.

.. code-block:: nginx

location @odoo {
# copy-paste the content of the / location block
}

# Serve static files right away
location ~ ^/[^/]+/static/.+$ {
root /opt/odoo;
Expand Down Expand Up @@ -483,7 +483,7 @@ X-Sendfile and X-Accel).
- The X-Accel extension for NGINX **does** require the following additionnal configuration:

.. code-block:: nginx

location /web/filestore {
internal;
alias /path/to/odoo/data-dir/filestore;
Expand Down
2 changes: 1 addition & 1 deletion content/administration/maintain/domain_names.rst
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ You can use a custom domain name to access your Odoo database and websites:
``odoo.com`` for both the URL and the emails (e.g., ``https://example.odoo.com``).

.. important::
Odoo offers a :ref:`free custom domain name <domain-name/odoo-register>` to all Odoo Online
Odoo offers a :ref:`free custom domain name <domain-name/odoo-register>` to all Odoo Online
databases for one year. Visitors can then access your website with an address such as
``www.example.com`` rather than the default ``example.odoo.com``.

Expand Down
2 changes: 1 addition & 1 deletion content/administration/maintain/enterprise.rst
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ On Linux, using an installer
.. code-block:: console

$ sudo dpkg -i <path_to_enterprise_deb>

* Update your database to the enterprise packages using

.. code-block:: console
Expand Down
2 changes: 1 addition & 1 deletion content/administration/maintain/google_oauth.rst
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ server in Odoo. The configuration automatically loads the token in Odoo, and a t
:align: center
:alt: Configure Outgoing Email Servers in Odoo.

Finally, save the settings and :guilabel:`Test the Connection`. A confirmation message should
Finally, save the settings and :guilabel:`Test the Connection`. A confirmation message should
appear. The Odoo database can now send safe, secure emails through Google using OAuth
authentication.

Expand Down
1 change: 0 additions & 1 deletion content/administration/maintain/hosting_changes.rst
Original file line number Diff line number Diff line change
Expand Up @@ -85,4 +85,3 @@ From Odoo.sh to on-premises

1. Grab a :ref:`backup of your Odoo.sh production database <odoo_sh_branches_backups>`.
2. Restore it from the database manager on your local server.

Original file line number Diff line number Diff line change
Expand Up @@ -29,4 +29,3 @@ We advise that:
- Your scheduled actions should be
`idempotent <https://stackoverflow.com/a/1077421/3332416>`_: they must not
cause side-effects if they are started more often than expected.

16 changes: 8 additions & 8 deletions content/administration/odoo_sh/getting_started/branches.rst
Original file line number Diff line number Diff line change
Expand Up @@ -259,16 +259,16 @@ This server only keeps one month of backups: 7 daily and 4 weekly backups.
Dedicated backup servers keep the same backups, as well as 3 additional monthly backups.
To restore or download one of these monthly backups, please `contact us <https://www.odoo.com/help>`_.

If you merge a commit updating the version of one or several modules (in :file:`__manifest__.py`), or their linked python
dependencies (in :file:`requirements.txt`), then Odoo.sh performs a backup automatically (flagged with type Update in the list),
as either the container will be changed by the installation of new pip packages, either the database itself will be
changed with the module update triggered afterwards. In these two cases, we are doing a backup as it may potentially
If you merge a commit updating the version of one or several modules (in :file:`__manifest__.py`), or their linked python
dependencies (in :file:`requirements.txt`), then Odoo.sh performs a backup automatically (flagged with type Update in the list),
as either the container will be changed by the installation of new pip packages, either the database itself will be
changed with the module update triggered afterwards. In these two cases, we are doing a backup as it may potentially
break things.

If you merge a commit that only changes some code without the above-mentioned modifications, then no backup is done
by Odoo.sh, as neither the container nor the database is modified so the platform considers this safe enough. Of course,
as an extra precaution, you can make a backup manually before making big changes in your production sources in case
something goes wrong (those manual backups are available for about one week). To avoid abuse, we limit manual backups
If you merge a commit that only changes some code without the above-mentioned modifications, then no backup is done
by Odoo.sh, as neither the container nor the database is modified so the platform considers this safe enough. Of course,
as an extra precaution, you can make a backup manually before making big changes in your production sources in case
something goes wrong (those manual backups are available for about one week). To avoid abuse, we limit manual backups
to 5 per day.

The *import database* feature accepts database archives in the format provided by:
Expand Down
2 changes: 1 addition & 1 deletion content/administration/upgrade.rst
Original file line number Diff line number Diff line change
Expand Up @@ -254,4 +254,4 @@ Agreement <upgrade>` page.
.. seealso::
- :doc:`upgrade/faq`
- :doc:`odoo_sh`
- :doc:`maintain/supported_versions`
- :doc:`maintain/supported_versions`
2 changes: 1 addition & 1 deletion content/administration/upgrade/on_premise.rst
Original file line number Diff line number Diff line change
Expand Up @@ -56,4 +56,4 @@ Depending on your contract, the upgrade of your custom modules can be done

#. by yourself.
#. by your Partner.
#. by Odoo (if you hold a subscription to 'Maintenance of Customizations').
#. by Odoo (if you hold a subscription to 'Maintenance of Customizations').
2 changes: 1 addition & 1 deletion content/applications/finance.rst
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,4 @@ Finance
finance/expenses
finance/documents
finance/sign
finance/payment_providers
finance/payment_providers
Original file line number Diff line number Diff line change
Expand Up @@ -59,4 +59,4 @@ transaction written on the original bank statement.

.. note::
The **Ending Balance** and the **Computed Balance** should have the same amount. If this is not
the case, make sure there are no mistakes in the transactions’ amounts.
the case, make sure there are no mistakes in the transactions’ amounts.
12 changes: 6 additions & 6 deletions content/applications/finance/accounting/bank/feeds/saltedge.rst
Original file line number Diff line number Diff line change
Expand Up @@ -80,12 +80,12 @@ FAQ
I have an error when I try to delete my synchronization within Odoo
-------------------------------------------------------------------

Odoo can't permanently delete the connection you have created with the banking institution. However,
it can revoke the consent you gave so that Odoo won't be able to access your account anymore. The
error you are seeing is probably a message telling you that the consent was revoked, but the record
could not be deleted as it still exists within Salt edge. If you want to remove the connection
completely, please connect to your `Salt Edge account <https://www.saltedge.com/dashboard>`_
and manually delete your synchronization. Once this is done, you can go back to Odoo to delete the
Odoo can't permanently delete the connection you have created with the banking institution. However,
it can revoke the consent you gave so that Odoo won't be able to access your account anymore. The
error you are seeing is probably a message telling you that the consent was revoked, but the record
could not be deleted as it still exists within Salt edge. If you want to remove the connection
completely, please connect to your `Salt Edge account <https://www.saltedge.com/dashboard>`_
and manually delete your synchronization. Once this is done, you can go back to Odoo to delete the
record.

I have an error saying that I have already synchronized this account
Expand Down
2 changes: 1 addition & 1 deletion content/applications/finance/accounting/bank/misc.rst
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,4 @@ Miscellaneous
.. toctree::
:titlesonly:

misc/interbank
misc/interbank
Original file line number Diff line number Diff line change
Expand Up @@ -144,4 +144,4 @@ Bank journal entry
- $1,000
* - Bank Account (BANK B)
- **$1,000**
-
-
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,4 @@ Bank reconciliation
:titlesonly:

reconciliation/use_cases
reconciliation/reconciliation_models
reconciliation/reconciliation_models
Original file line number Diff line number Diff line change
Expand Up @@ -126,4 +126,4 @@ line*.

- :doc:`use_cases`
- :doc:`../feeds/bank_synchronization`
- :doc:`../../receivables/customer_invoices/cash_discounts`
- :doc:`../../receivables/customer_invoices/cash_discounts`
Original file line number Diff line number Diff line change
Expand Up @@ -102,4 +102,4 @@ right and validate all related payments :
:align: center

.. seealso::
* :doc:`../feeds/bank_synchronization`
* :doc:`../feeds/bank_synchronization`
Original file line number Diff line number Diff line change
Expand Up @@ -114,4 +114,4 @@ gains/losses** have been adjusted.

.. image:: foreign_currency/foreign-adjustment.png
:align: center
:alt: Unrealized Currency Gains/Losses report once adjusted.
:alt: Unrealized Currency Gains/Losses report once adjusted.
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ Configuration
.. image:: manage_cash_register/journal.png
:align: center

1. Configure the Cash journal in :menuselection:`Accounting --> Configuration -->
1. Configure the Cash journal in :menuselection:`Accounting --> Configuration -->
Journals`.

2. In the tab Journal Entries, the Default Debit and Credit Account can be
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,4 @@ Fiscal localizations
:titlesonly:

fiscal_localizations/overview
fiscal_localizations/localizations
fiscal_localizations/localizations
Loading