From c1e062c1f4aca756ff50726fee01d10c201a738b Mon Sep 17 00:00:00 2001 From: Martin Trigaux Date: Fri, 22 Jul 2022 11:37:58 +0200 Subject: [PATCH] [I18N] *: export 15.0 source terms --- locale/sources/administration.pot | 1244 ++++++++----- locale/sources/contributing.pot | 2456 +++++++++++++++++--------- locale/sources/finance.pot | 2336 ++++++++++++++---------- locale/sources/general.pot | 104 +- locale/sources/inventory_and_mrp.pot | 106 +- locale/sources/legal.pot | 82 +- locale/sources/productivity.pot | 114 +- locale/sources/sales.pot | 775 ++++---- locale/sources/services.pot | 81 +- locale/sources/sphinx.pot | 10 +- locale/sources/websites.pot | 266 +-- 11 files changed, 4836 insertions(+), 2738 deletions(-) diff --git a/locale/sources/administration.pot b/locale/sources/administration.pot index c77f474e7..9aa971e7f 100644 --- a/locale/sources/administration.pot +++ b/locale/sources/administration.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: Odoo 15.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-04-08 13:26+0000\n" +"POT-Creation-Date: 2022-07-22 09:36+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -160,9 +160,9 @@ msgid "Setting a proper :option:`--db-filter ` is an impor msgstr "" #: ../../content/administration/install/deploy.rst:76 -#: ../../content/administration/install/install.rst:325 -#: ../../content/administration/install/install.rst:488 -#: ../../content/administration/install/install.rst:659 +#: ../../content/administration/install/install.rst:338 +#: ../../content/administration/install/install.rst:514 +#: ../../content/administration/install/install.rst:698 msgid "PostgreSQL" msgstr "" @@ -865,7 +865,7 @@ msgid "Official Community packages with all relevant dependency requirements are msgstr "" #: ../../content/administration/install/install.rst:90 -#: ../../content/administration/install/install.rst:252 +#: ../../content/administration/install/install.rst:254 msgid "Windows" msgstr "" @@ -898,7 +898,7 @@ msgid "Odoo will automatically be started at the end of the installation." msgstr "" #: ../../content/administration/install/install.rst:105 -#: ../../content/administration/install/install.rst:418 +#: ../../content/administration/install/install.rst:433 msgid "Linux" msgstr "" @@ -912,9 +912,9 @@ msgstr "" #: ../../content/administration/install/install.rst:113 #: ../../content/administration/install/install.rst:186 -#: ../../content/administration/install/install.rst:300 -#: ../../content/administration/install/install.rst:466 -#: ../../content/administration/install/install.rst:637 +#: ../../content/administration/install/install.rst:313 +#: ../../content/administration/install/install.rst:492 +#: ../../content/administration/install/install.rst:676 msgid "Prepare" msgstr "" @@ -924,9 +924,9 @@ msgstr "" #: ../../content/administration/install/install.rst:123 #: ../../content/administration/install/install.rst:198 -#: ../../content/administration/install/install.rst:367 -#: ../../content/administration/install/install.rst:540 -#: ../../content/administration/install/install.rst:704 +#: ../../content/administration/install/install.rst:380 +#: ../../content/administration/install/install.rst:566 +#: ../../content/administration/install/install.rst:748 msgid "`wkhtmltopdf` is not installed through **pip** and must be installed manually in version `0.12.5 `_ for it to support headers and footers. See our `wiki `_ for more details on the various versions." msgstr "" @@ -1027,342 +1027,353 @@ msgstr "" msgid "Finally it provides greater control over the system's set up, and allows to more easily keep (and run) multiple versions of Odoo side-by-side." msgstr "" -#: ../../content/administration/install/install.rst:255 -#: ../../content/administration/install/install.rst:421 -#: ../../content/administration/install/install.rst:592 +#: ../../content/administration/install/install.rst:257 +#: ../../content/administration/install/install.rst:436 +#: ../../content/administration/install/install.rst:620 msgid "Fetch the sources" msgstr "" -#: ../../content/administration/install/install.rst:257 -#: ../../content/administration/install/install.rst:423 -#: ../../content/administration/install/install.rst:594 +#: ../../content/administration/install/install.rst:259 +#: ../../content/administration/install/install.rst:438 +#: ../../content/administration/install/install.rst:622 msgid "There are two ways to obtain the source code of Odoo: as a zip **archive** or through **git**." msgstr "" -#: ../../content/administration/install/install.rst:260 -#: ../../content/administration/install/install.rst:426 -#: ../../content/administration/install/install.rst:597 +#: ../../content/administration/install/install.rst:262 +#: ../../content/administration/install/install.rst:441 +#: ../../content/administration/install/install.rst:625 msgid "Archive" msgstr "" -#: ../../content/administration/install/install.rst:262 -#: ../../content/administration/install/install.rst:279 -#: ../../content/administration/install/install.rst:428 -#: ../../content/administration/install/install.rst:445 -#: ../../content/administration/install/install.rst:599 -#: ../../content/administration/install/install.rst:616 +#: ../../content/administration/install/install.rst:264 +#: ../../content/administration/install/install.rst:443 +#: ../../content/administration/install/install.rst:627 msgid "Community Edition:" msgstr "" -#: ../../content/administration/install/install.rst:264 -#: ../../content/administration/install/install.rst:270 -#: ../../content/administration/install/install.rst:430 -#: ../../content/administration/install/install.rst:436 -#: ../../content/administration/install/install.rst:601 -#: ../../content/administration/install/install.rst:607 +#: ../../content/administration/install/install.rst:266 +#: ../../content/administration/install/install.rst:272 +#: ../../content/administration/install/install.rst:445 +#: ../../content/administration/install/install.rst:451 +#: ../../content/administration/install/install.rst:629 +#: ../../content/administration/install/install.rst:635 msgid "`Official download page `_" msgstr "" -#: ../../content/administration/install/install.rst:265 -#: ../../content/administration/install/install.rst:431 -#: ../../content/administration/install/install.rst:602 +#: ../../content/administration/install/install.rst:267 +#: ../../content/administration/install/install.rst:446 +#: ../../content/administration/install/install.rst:630 msgid "`GitHub repository `_" msgstr "" -#: ../../content/administration/install/install.rst:266 -#: ../../content/administration/install/install.rst:432 -#: ../../content/administration/install/install.rst:603 +#: ../../content/administration/install/install.rst:268 +#: ../../content/administration/install/install.rst:447 +#: ../../content/administration/install/install.rst:631 msgid "`Nightly server `_" msgstr "" -#: ../../content/administration/install/install.rst:268 -#: ../../content/administration/install/install.rst:434 -#: ../../content/administration/install/install.rst:605 +#: ../../content/administration/install/install.rst:270 +#: ../../content/administration/install/install.rst:449 +#: ../../content/administration/install/install.rst:633 msgid "Enterprise Edition:" msgstr "" -#: ../../content/administration/install/install.rst:271 -#: ../../content/administration/install/install.rst:437 -#: ../../content/administration/install/install.rst:608 +#: ../../content/administration/install/install.rst:273 +#: ../../content/administration/install/install.rst:452 +#: ../../content/administration/install/install.rst:636 msgid "`GitHub repository `_" msgstr "" -#: ../../content/administration/install/install.rst:274 -#: ../../content/administration/install/install.rst:440 -#: ../../content/administration/install/install.rst:611 +#: ../../content/administration/install/install.rst:278 +#: ../../content/administration/install/install.rst:457 +#: ../../content/administration/install/install.rst:641 msgid "Git" msgstr "" -#: ../../content/administration/install/install.rst:276 -#: ../../content/administration/install/install.rst:442 -#: ../../content/administration/install/install.rst:613 -msgid "The following requires git_ to be installed on your machine and that you have basic knowledge of git commands." +#: ../../content/administration/install/install.rst:280 +#: ../../content/administration/install/install.rst:459 +#: ../../content/administration/install/install.rst:643 +msgid "The following requires `Git `_ to be installed on your machine and that you have basic knowledge of Git commands. To clone a Git repository, you must choose between cloning with HTTPS or SSH. If you do not know the difference between the two, the best option is most likely HTTPS. If you are following the :doc:`Getting started ` developer tutorial, or plan on contributing to Odoo source code, choose SSH." msgstr "" -#: ../../content/administration/install/install.rst:286 -#: ../../content/administration/install/install.rst:452 -#: ../../content/administration/install/install.rst:623 -msgid "Enterprise Edition: (see :ref:`setup/install/editions` to get access)" +#: ../../content/administration/install/install.rst:287 +#: ../../content/administration/install/install.rst:466 +#: ../../content/administration/install/install.rst:650 +msgid "**The Enterprise Git repository does not contain the full Odoo source code**. It is only a collection of extra add-ons. The main server code is in the Community version. Running the Enterprise version actually means running the server from the Community version with the addons-path option set to the folder with the Enterprise version. You need to clone both the Community and Enterprise repository to have a working Odoo Enterprise installation. See :ref:`setup/install/editions` to get access to the Enterprise repository." msgstr "" -#: ../../content/administration/install/install.rst:292 -#: ../../content/administration/install/install.rst:458 -#: ../../content/administration/install/install.rst:629 -msgid "**The Enterprise git repository does not contain the full Odoo source code**. It is only a collection of extra add-ons. The main server code is in the Community version. Running the Enterprise version actually means running the server from the Community version with the addons-path option set to the folder with the Enterprise version. You need to clone both the Community and Enterprise repository to have a working Odoo Enterprise installation." +#: ../../content/administration/install/install.rst:296 +#: ../../content/administration/install/install.rst:475 +#: ../../content/administration/install/install.rst:659 +msgid "Clone with HTTPS" msgstr "" #: ../../content/administration/install/install.rst:303 -#: ../../content/administration/install/install.rst:469 -#: ../../content/administration/install/install.rst:640 +#: ../../content/administration/install/install.rst:482 +#: ../../content/administration/install/install.rst:666 +msgid "Clone with SSH" +msgstr "" + +#: ../../content/administration/install/install.rst:316 +#: ../../content/administration/install/install.rst:495 +#: ../../content/administration/install/install.rst:679 msgid "Python" msgstr "" -#: ../../content/administration/install/install.rst:305 +#: ../../content/administration/install/install.rst:318 msgid "Odoo requires Python 3.7 or later to run. Visit `Python's download page `_ to download and install the latest version of Python 3 on your machine." msgstr "" -#: ../../content/administration/install/install.rst:308 +#: ../../content/administration/install/install.rst:321 msgid "During installation, check **Add Python 3 to PATH**, then click **Customize Installation** and make sure that **pip** is checked." msgstr "" -#: ../../content/administration/install/install.rst:311 -#: ../../content/administration/install/install.rst:474 -#: ../../content/administration/install/install.rst:645 +#: ../../content/administration/install/install.rst:324 +#: ../../content/administration/install/install.rst:500 +#: ../../content/administration/install/install.rst:684 msgid "If Python 3 is already installed, make sure that the version is 3.7 or above, as previous versions are not compatible with Odoo." msgstr "" -#: ../../content/administration/install/install.rst:318 -#: ../../content/administration/install/install.rst:481 -#: ../../content/administration/install/install.rst:652 +#: ../../content/administration/install/install.rst:331 +#: ../../content/administration/install/install.rst:507 +#: ../../content/administration/install/install.rst:691 msgid "Verify also that pip_ is installed for this version." msgstr "" -#: ../../content/administration/install/install.rst:327 +#: ../../content/administration/install/install.rst:340 msgid "Odoo uses PostgreSQL as database management system. `Download and install PostgreSQL `_ (supported version: 10.0 and later)." msgstr "" -#: ../../content/administration/install/install.rst:330 -#: ../../content/administration/install/install.rst:499 -#: ../../content/administration/install/install.rst:664 +#: ../../content/administration/install/install.rst:343 +#: ../../content/administration/install/install.rst:525 +#: ../../content/administration/install/install.rst:708 msgid "By default, the only user is `postgres` but Odoo forbids connecting as `postgres`, so you need to create a new PostgreSQL user:" msgstr "" -#: ../../content/administration/install/install.rst:333 +#: ../../content/administration/install/install.rst:346 msgid "Add PostgreSQL's `bin` directory (by default: `C:\\\\Program Files\\\\PostgreSQL\\\\\\\\bin`) to your `PATH`." msgstr "" -#: ../../content/administration/install/install.rst:335 +#: ../../content/administration/install/install.rst:348 msgid "Create a postgres user with a password using the pg admin gui:" msgstr "" -#: ../../content/administration/install/install.rst:337 +#: ../../content/administration/install/install.rst:350 msgid "Open **pgAdmin**." msgstr "" -#: ../../content/administration/install/install.rst:338 +#: ../../content/administration/install/install.rst:351 msgid "Double-click the server to create a connection." msgstr "" -#: ../../content/administration/install/install.rst:339 +#: ../../content/administration/install/install.rst:352 msgid "Select :menuselection:`Object --> Create --> Login/Group Role`." msgstr "" -#: ../../content/administration/install/install.rst:340 +#: ../../content/administration/install/install.rst:353 msgid "Enter the username in the **Role Name** field (e.g. `odoo`)." msgstr "" -#: ../../content/administration/install/install.rst:341 +#: ../../content/administration/install/install.rst:354 msgid "Open the **Definition** tab and enter the password (e.g. ``odoo``), then click **Save**." msgstr "" -#: ../../content/administration/install/install.rst:342 +#: ../../content/administration/install/install.rst:355 msgid "Open the **Privileges** tab and switch **Can login?** to `Yes` and **Create database?** to `Yes`." msgstr "" -#: ../../content/administration/install/install.rst:346 -#: ../../content/administration/install/install.rst:511 -#: ../../content/administration/install/install.rst:676 +#: ../../content/administration/install/install.rst:359 +#: ../../content/administration/install/install.rst:537 +#: ../../content/administration/install/install.rst:720 msgid "Dependencies" msgstr "" -#: ../../content/administration/install/install.rst:348 +#: ../../content/administration/install/install.rst:361 msgid "Before installing the dependencies, you must download and install the `Build Tools for Visual Studio `_. When prompted, select **C++ build tools** in the **Workloads** tab and install them." msgstr "" -#: ../../content/administration/install/install.rst:352 -#: ../../content/administration/install/install.rst:525 -#: ../../content/administration/install/install.rst:678 +#: ../../content/administration/install/install.rst:365 +#: ../../content/administration/install/install.rst:551 +#: ../../content/administration/install/install.rst:722 msgid "Odoo dependencies are listed in the `requirements.txt` file located at the root of the Odoo community directory." msgstr "" -#: ../../content/administration/install/install.rst:355 -#: ../../content/administration/install/install.rst:528 -#: ../../content/administration/install/install.rst:681 +#: ../../content/administration/install/install.rst:368 +#: ../../content/administration/install/install.rst:554 +#: ../../content/administration/install/install.rst:725 msgid "It can be preferable to not mix python modules packages between different instances of Odoo or with your system. You can use virtualenv_ to create isolated Python environments." msgstr "" -#: ../../content/administration/install/install.rst:358 +#: ../../content/administration/install/install.rst:371 msgid "Navigate to the path of your Odoo Community installation (`CommunityPath`) and run **pip** on the requirements file in a terminal **with Administrator privileges**:" msgstr "" -#: ../../content/administration/install/install.rst:372 -#: ../../content/administration/install/install.rst:545 -#: ../../content/administration/install/install.rst:709 +#: ../../content/administration/install/install.rst:385 +#: ../../content/administration/install/install.rst:571 +#: ../../content/administration/install/install.rst:753 msgid "For languages with right-to-left interface (such as Arabic or Hebrew), the package `rtlcss` is needed:" msgstr "" -#: ../../content/administration/install/install.rst:375 +#: ../../content/administration/install/install.rst:388 msgid "Download and install `nodejs `_." msgstr "" -#: ../../content/administration/install/install.rst:376 -#: ../../content/administration/install/install.rst:549 -#: ../../content/administration/install/install.rst:713 +#: ../../content/administration/install/install.rst:389 +#: ../../content/administration/install/install.rst:575 +#: ../../content/administration/install/install.rst:757 msgid "Install `rtlcss`:" msgstr "" -#: ../../content/administration/install/install.rst:382 +#: ../../content/administration/install/install.rst:395 msgid "Edit the System Environment's variable `PATH` to add the folder where `rtlcss.cmd` is located (typically: `C:\\\\Users\\\\\\\\AppData\\\\Roaming\\\\npm\\\\`)." msgstr "" -#: ../../content/administration/install/install.rst:386 -#: ../../content/administration/install/install.rst:556 -#: ../../content/administration/install/install.rst:720 +#: ../../content/administration/install/install.rst:399 +#: ../../content/administration/install/install.rst:582 +#: ../../content/administration/install/install.rst:764 msgid "Running Odoo" msgstr "" -#: ../../content/administration/install/install.rst:388 -#: ../../content/administration/install/install.rst:558 -#: ../../content/administration/install/install.rst:722 +#: ../../content/administration/install/install.rst:401 +#: ../../content/administration/install/install.rst:584 +#: ../../content/administration/install/install.rst:766 msgid "Once all dependencies are set up, Odoo can be launched by running `odoo-bin`, the command-line interface of the server. It is located at the root of the Odoo Community directory." msgstr "" -#: ../../content/administration/install/install.rst:391 -#: ../../content/administration/install/install.rst:561 -#: ../../content/administration/install/install.rst:725 +#: ../../content/administration/install/install.rst:404 +#: ../../content/administration/install/install.rst:587 +#: ../../content/administration/install/install.rst:769 msgid "To configure the server, you can either specify :ref:`command-line arguments ` or a :ref:`configuration file `." msgstr "" -#: ../../content/administration/install/install.rst:394 -#: ../../content/administration/install/install.rst:564 -#: ../../content/administration/install/install.rst:728 +#: ../../content/administration/install/install.rst:407 +#: ../../content/administration/install/install.rst:590 +#: ../../content/administration/install/install.rst:772 msgid "For the Enterprise edition, you must add the path to the `enterprise` addons to the `addons-path` argument. Note that it must come before the other paths in `addons-path` for addons to be loaded correctly." msgstr "" -#: ../../content/administration/install/install.rst:398 -#: ../../content/administration/install/install.rst:568 -#: ../../content/administration/install/install.rst:732 +#: ../../content/administration/install/install.rst:411 +#: ../../content/administration/install/install.rst:594 +#: ../../content/administration/install/install.rst:776 msgid "Common necessary configurations are:" msgstr "" -#: ../../content/administration/install/install.rst:400 +#: ../../content/administration/install/install.rst:413 msgid "PostgreSQL user and password." msgstr "" -#: ../../content/administration/install/install.rst:401 -#: ../../content/administration/install/install.rst:573 -#: ../../content/administration/install/install.rst:737 +#: ../../content/administration/install/install.rst:414 +#: ../../content/administration/install/install.rst:599 +#: ../../content/administration/install/install.rst:781 msgid "Custom addon paths beyond the defaults, to load your own modules." msgstr "" -#: ../../content/administration/install/install.rst:403 -#: ../../content/administration/install/install.rst:575 -#: ../../content/administration/install/install.rst:739 +#: ../../content/administration/install/install.rst:416 +#: ../../content/administration/install/install.rst:601 +#: ../../content/administration/install/install.rst:783 msgid "A typical way to run the server would be:" msgstr "" -#: ../../content/administration/install/install.rst:410 +#: ../../content/administration/install/install.rst:423 msgid "Where `CommunityPath` is the path of the Odoo Community installation, `dbuser` is the PostgreSQL login, `dbpassword` is the PostgreSQL password and `mydb` is the default database to serve on `localhost:8069`." msgstr "" -#: ../../content/administration/install/install.rst:415 -#: ../../content/administration/install/install.rst:586 -#: ../../content/administration/install/install.rst:750 -msgid ":doc:`The exhaustive list of arguments for odoo-bin `." +#: ../../content/administration/install/install.rst:428 +#: ../../content/administration/install/install.rst:612 +#: ../../content/administration/install/install.rst:799 +msgid ":doc:`The exhaustive list of arguments for odoo-bin `." msgstr "" -#: ../../content/administration/install/install.rst:471 +#: ../../content/administration/install/install.rst:497 msgid "Odoo requires Python 3.7 or later to run. Use your package manager to download and install Python 3 on your machine if it is not already done." msgstr "" -#: ../../content/administration/install/install.rst:490 +#: ../../content/administration/install/install.rst:516 msgid "Odoo uses PostgreSQL as database management system. Use your package manager to download and install PostgreSQL (supported version: 10.0 and later)." msgstr "" -#: ../../content/administration/install/install.rst:493 +#: ../../content/administration/install/install.rst:519 msgid "On Debian/Unbuntu, it can be achieved by executing the following:" msgstr "" -#: ../../content/administration/install/install.rst:507 -#: ../../content/administration/install/install.rst:672 +#: ../../content/administration/install/install.rst:533 +#: ../../content/administration/install/install.rst:716 msgid "Because your PostgreSQL user has the same name as your Unix login, you will be able to connect to the database without password." msgstr "" -#: ../../content/administration/install/install.rst:513 +#: ../../content/administration/install/install.rst:539 msgid "For libraries using native code, it is necessary to install development tools and native dependencies before the Python dependencies of Odoo. They are available in `-dev` or `-devel` packages for Python, PostgreSQL, libxml2, libxslt1, libevent, libsasl2 and libldap2." msgstr "" -#: ../../content/administration/install/install.rst:517 +#: ../../content/administration/install/install.rst:543 msgid "On Debian/Unbuntu, the following command should install all the required libraries:" msgstr "" -#: ../../content/administration/install/install.rst:531 -#: ../../content/administration/install/install.rst:684 +#: ../../content/administration/install/install.rst:557 +#: ../../content/administration/install/install.rst:728 msgid "Navigate to the path of your Odoo Community installation (`CommunityPath`) and run **pip** on the requirements file:" msgstr "" -#: ../../content/administration/install/install.rst:548 +#: ../../content/administration/install/install.rst:574 msgid "Download and install **nodejs** and **npm** with your package manager." msgstr "" -#: ../../content/administration/install/install.rst:570 -#: ../../content/administration/install/install.rst:734 +#: ../../content/administration/install/install.rst:596 +#: ../../content/administration/install/install.rst:778 msgid "PostgreSQL user and password. Odoo has no defaults beyond `psycopg2's defaults `_: connects over a UNIX socket on port `5432` with the current user and no password." msgstr "" -#: ../../content/administration/install/install.rst:582 -#: ../../content/administration/install/install.rst:746 +#: ../../content/administration/install/install.rst:608 +#: ../../content/administration/install/install.rst:790 msgid "Where `CommunityPath` is the path of the Odoo Community installation and `mydb` is the default database to serve on `localhost:8069`." msgstr "" -#: ../../content/administration/install/install.rst:589 +#: ../../content/administration/install/install.rst:617 msgid "Mac OS" msgstr "" -#: ../../content/administration/install/install.rst:642 +#: ../../content/administration/install/install.rst:681 msgid "Odoo requires Python 3.7 or later to run. Use your preferred package manager (homebrew_, macports_) to download and install Python 3 on your machine if it is not already done." msgstr "" -#: ../../content/administration/install/install.rst:661 +#: ../../content/administration/install/install.rst:700 msgid "Odoo uses PostgreSQL as database management system. Use `postgres.app `_ to download and install PostgreSQL (supported version: 10.0 and later)." msgstr "" -#: ../../content/administration/install/install.rst:693 +#: ../../content/administration/install/install.rst:704 +msgid "To make the command line tools bundled with `postgres.app` available, make sure to setup your `$PATH` variable by following the `Postgres.app CLI Tools Instructions `_." +msgstr "" + +#: ../../content/administration/install/install.rst:737 msgid "Non-Python dependencies need to be installed with a package manager:" msgstr "" -#: ../../content/administration/install/install.rst:695 +#: ../../content/administration/install/install.rst:739 msgid "Download and install the **Command Line Tools**:" msgstr "" -#: ../../content/administration/install/install.rst:701 +#: ../../content/administration/install/install.rst:745 msgid "Download and install the package manager of your choice (homebrew_, macports_)." msgstr "" -#: ../../content/administration/install/install.rst:702 +#: ../../content/administration/install/install.rst:746 msgid "Install non-python dependencies." msgstr "" -#: ../../content/administration/install/install.rst:712 +#: ../../content/administration/install/install.rst:756 msgid "Download and install **nodejs** with your preferred package manager (homebrew_, macports_)." msgstr "" -#: ../../content/administration/install/install.rst:755 +#: ../../content/administration/install/install.rst:794 +msgid "Some versions of python on Mac might lead to the following error message: `current limit exceeds maximum limit`. In that case, add the following parameter `--limit-memory-hard 0` to avoid the problem." +msgstr "" + +#: ../../content/administration/install/install.rst:804 #: ../../content/administration/maintain/update.rst:147 msgid "Docker" msgstr "" -#: ../../content/administration/install/install.rst:757 +#: ../../content/administration/install/install.rst:806 msgid "The full documentation on how to use Odoo with Docker can be found on the official Odoo `docker image `_ page." msgstr "" @@ -1398,362 +1409,370 @@ msgstr "" msgid "Odoo offers a :ref:`free custom domain name ` 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``." msgstr "" +#: ../../content/administration/maintain/domain_names.rst:25 +msgid "`Odoo Tutorials: Register a Free Domain Name `_" +msgstr "" + #: ../../content/administration/maintain/domain_names.rst:27 +msgid "`Odoo Quick Tips: Get a free domain name! `_" +msgstr "" + +#: ../../content/administration/maintain/domain_names.rst:32 msgid "About domain names" msgstr "" -#: ../../content/administration/maintain/domain_names.rst:29 +#: ../../content/administration/maintain/domain_names.rst:34 msgid "Having a **good domain name** is as important to your branding as the name of your business or organization as it is the first thing your visitors will notice. We recommend you keep them *simple, short, easy to remember and spell*." msgstr "" -#: ../../content/administration/maintain/domain_names.rst:33 +#: ../../content/administration/maintain/domain_names.rst:38 msgid "A **subdomain** is a domain that is a part of another domain. It often refers to the additional part that comes before the main domain name. Traditionally, most websites use the ``www.`` subdomain, but any string of letters can be used as well. You can use subdomains to direct your visitors to other websites than your main website or to specific pages (e.g., ``experience.odoo.com`` points to a specific page.)" msgstr "" -#: ../../content/administration/maintain/domain_names.rst:39 +#: ../../content/administration/maintain/domain_names.rst:44 msgid "All domain names are referenced in the **Domain Name System**, or **DNS**, which works as a giant directory for the Internet. There are many DNS servers, so any modification to the DNS can take up to 72 hours to propagate worldwide on all servers." msgstr "" -#: ../../content/administration/maintain/domain_names.rst:46 +#: ../../content/administration/maintain/domain_names.rst:51 msgid "Register a free domain name with Odoo" msgstr "" -#: ../../content/administration/maintain/domain_names.rst:48 +#: ../../content/administration/maintain/domain_names.rst:53 msgid "You can register a domain name for your Odoo Online database directly from Odoo Website or your database manager." msgstr "" -#: ../../content/administration/maintain/domain_names.rst:52 +#: ../../content/administration/maintain/domain_names.rst:57 msgid "Your domain name is **free for one year** if you register it with Odoo!" msgstr "" -#: ../../content/administration/maintain/domain_names.rst:53 +#: ../../content/administration/maintain/domain_names.rst:58 msgid "The domain name is registered with `Gandi `_, the domain name registrar." msgstr "" -#: ../../content/administration/maintain/domain_names.rst:55 +#: ../../content/administration/maintain/domain_names.rst:60 msgid "You are the owner of the domain name and can use it for other purposes." msgstr "" -#: ../../content/administration/maintain/domain_names.rst:56 +#: ../../content/administration/maintain/domain_names.rst:61 msgid "Odoo manages payment and technical support for you." msgstr "" -#: ../../content/administration/maintain/domain_names.rst:58 +#: ../../content/administration/maintain/domain_names.rst:63 msgid "To do so, go to :menuselection:`Website --> Go to website --> Promote --> Domain Name`. Alternatively, open your `database manager `_, click on the :guilabel:`settings` button next to your database, then on :guilabel:`Domain names`." msgstr "" -#: ../../content/administration/maintain/domain_names.rst:66 +#: ../../content/administration/maintain/domain_names.rst:71 msgid "Search for the domain name of your choice to check its availability, then select the one you want to register for your website." msgstr "" -#: ../../content/administration/maintain/domain_names.rst:73 +#: ../../content/administration/maintain/domain_names.rst:78 msgid "Next, fill in the form with your information to become the domain name owner." msgstr "" -#: ../../content/administration/maintain/domain_names.rst:75 +#: ../../content/administration/maintain/domain_names.rst:80 msgid "Your domain name is directly linked to your database, but you still have to :ref:`map your domain name with your website `." msgstr "" -#: ../../content/administration/maintain/domain_names.rst:79 +#: ../../content/administration/maintain/domain_names.rst:84 msgid "Free domain names are also available for free Odoo Online databases (if you installed one app only, for example). In this case, Odoo reviews your request and your website to avoid abuse. This process may take up to three days." msgstr "" -#: ../../content/administration/maintain/domain_names.rst:82 +#: ../../content/administration/maintain/domain_names.rst:87 msgid "This is not available for Odoo.sh databases yet." msgstr "" -#: ../../content/administration/maintain/domain_names.rst:87 +#: ../../content/administration/maintain/domain_names.rst:92 msgid "Manage your domain name registered with Odoo" msgstr "" -#: ../../content/administration/maintain/domain_names.rst:89 +#: ../../content/administration/maintain/domain_names.rst:94 msgid "To manage the DNS records of your domain name registered with Odoo or to visualize the contacts associated with it, open your `database manager `_, click on the :guilabel:`settings` button next to your database, on :guilabel:`Domain names`, and then on :guilabel:`Contacts` or :guilabel:`DNS`." msgstr "" -#: ../../content/administration/maintain/domain_names.rst:99 +#: ../../content/administration/maintain/domain_names.rst:104 msgid "Please `submit a support ticket `_ if you need further assistance to manage your domain name." msgstr "" -#: ../../content/administration/maintain/domain_names.rst:105 +#: ../../content/administration/maintain/domain_names.rst:110 msgid "Configure your existing domain name" msgstr "" -#: ../../content/administration/maintain/domain_names.rst:107 +#: ../../content/administration/maintain/domain_names.rst:112 msgid "If you already own a domain name, you can use it to point to your website." msgstr "" -#: ../../content/administration/maintain/domain_names.rst:109 +#: ../../content/administration/maintain/domain_names.rst:114 msgid "To avoid any issue with the :ref:`SSL certificate validation `, we highly recommend that you proceed with the following actions in this order:" msgstr "" -#: ../../content/administration/maintain/domain_names.rst:112 +#: ../../content/administration/maintain/domain_names.rst:117 msgid ":ref:`Add a CNAME record ` on your domain name's DNS zone." msgstr "" -#: ../../content/administration/maintain/domain_names.rst:113 +#: ../../content/administration/maintain/domain_names.rst:118 msgid ":ref:`Map your domain name with your Odoo database `." msgstr "" -#: ../../content/administration/maintain/domain_names.rst:114 +#: ../../content/administration/maintain/domain_names.rst:119 msgid ":ref:`Map your domain name with your Odoo website `." msgstr "" -#: ../../content/administration/maintain/domain_names.rst:119 +#: ../../content/administration/maintain/domain_names.rst:124 msgid "Add a CNAME record" msgstr "" -#: ../../content/administration/maintain/domain_names.rst:121 +#: ../../content/administration/maintain/domain_names.rst:126 msgid "A **CNAME record** is a type of DNS record that points to the IP address of another website rather than to directly to an IP address." msgstr "" -#: ../../content/administration/maintain/domain_names.rst:124 +#: ../../content/administration/maintain/domain_names.rst:129 msgid "You need a CNAME record that points to your Odoo database. The requirements are detailed in your database manager." msgstr "" -#: ../../content/administration/maintain/domain_names.rst:129 -#: ../../content/administration/maintain/domain_names.rst:199 +#: ../../content/administration/maintain/domain_names.rst:134 +#: ../../content/administration/maintain/domain_names.rst:204 #: ../../content/administration/maintain/supported_versions.rst:26 msgid "Odoo Online" msgstr "" -#: ../../content/administration/maintain/domain_names.rst:131 +#: ../../content/administration/maintain/domain_names.rst:136 msgid "The target address is the current address of your database, as defined at its creation (e.g., ``example.odoo.com``)" msgstr "" -#: ../../content/administration/maintain/domain_names.rst:134 -#: ../../content/administration/maintain/domain_names.rst:213 +#: ../../content/administration/maintain/domain_names.rst:139 +#: ../../content/administration/maintain/domain_names.rst:218 #: ../../content/administration/maintain/supported_versions.rst:26 #: ../../content/administration/odoo_sh.rst:5 -#: ../../content/administration/upgrade/odoo_sh.rst:4 +#: ../../content/administration/upgrade/odoo_sh.rst:3 msgid "Odoo.sh" msgstr "" -#: ../../content/administration/maintain/domain_names.rst:136 +#: ../../content/administration/maintain/domain_names.rst:141 msgid "Your project's main address is defined in :menuselection:`Settings --> Project Name`." msgstr "" -#: ../../content/administration/maintain/domain_names.rst:138 +#: ../../content/administration/maintain/domain_names.rst:143 msgid "If you want to target a specific branch (production, staging or development), go to :menuselection:`Branches --> select your branch --> Settings --> Custom domains`, and click on :guilabel:`How to set up my domain?`. A message indicates which address your CNAME record should target." msgstr "" -#: ../../content/administration/maintain/domain_names.rst:143 -#: ../../content/administration/maintain/domain_names.rst:185 +#: ../../content/administration/maintain/domain_names.rst:148 +#: ../../content/administration/maintain/domain_names.rst:190 msgid "Open your domain name's manager dashboard." msgstr "" -#: ../../content/administration/maintain/domain_names.rst:144 +#: ../../content/administration/maintain/domain_names.rst:149 msgid "Open the **DNS zone** management page for the domain name you want to configure." msgstr "" -#: ../../content/administration/maintain/domain_names.rst:145 +#: ../../content/administration/maintain/domain_names.rst:150 msgid "Create a **CNAME record** pointing to the address of your database." msgstr "" -#: ../../content/administration/maintain/domain_names.rst:147 +#: ../../content/administration/maintain/domain_names.rst:152 msgid "While Odoo suggests creating a CNAME record for your ``www.`` subdomain (``www.example.com``, you can of course use any domain name of your choice, with any subdomain (e.g., ``anything.example.com``)." msgstr "" -#: ../../content/administration/maintain/domain_names.rst:152 +#: ../../content/administration/maintain/domain_names.rst:157 msgid "You own the domain name ``example.com``, and you have an Odoo Online database at the address ``example.odoo.com``. You want to access your Odoo database primarily with the domain ``www.example.com`` but also with the :ref:`naked domain ` ``example.com``." msgstr "" -#: ../../content/administration/maintain/domain_names.rst:157 +#: ../../content/administration/maintain/domain_names.rst:162 msgid "To do so, you create a CNAME record for the ``www`` subdomain, with ``example.odoo.com`` as the target. The DNS zone manager generates the following rule and adds it to your DNS zone: ``www IN CNAME example.odoo.com.``" msgstr "" -#: ../../content/administration/maintain/domain_names.rst:161 +#: ../../content/administration/maintain/domain_names.rst:166 msgid "You also create a redirection from ``example.com`` to ``wwww.example.com``." msgstr "" -#: ../../content/administration/maintain/domain_names.rst:163 +#: ../../content/administration/maintain/domain_names.rst:168 msgid "Your new DNS records are propagated to all DNS servers." msgstr "" -#: ../../content/administration/maintain/domain_names.rst:166 +#: ../../content/administration/maintain/domain_names.rst:171 msgid "Here are some specific guidelines to create a CNAME record:" msgstr "" -#: ../../content/administration/maintain/domain_names.rst:168 +#: ../../content/administration/maintain/domain_names.rst:173 msgid "`GoDaddy `_" msgstr "" -#: ../../content/administration/maintain/domain_names.rst:169 +#: ../../content/administration/maintain/domain_names.rst:174 msgid "`Namecheap `_" msgstr "" -#: ../../content/administration/maintain/domain_names.rst:170 +#: ../../content/administration/maintain/domain_names.rst:175 msgid "`OVH `_" msgstr "" -#: ../../content/administration/maintain/domain_names.rst:171 +#: ../../content/administration/maintain/domain_names.rst:176 msgid "`CloudFlare `_" msgstr "" -#: ../../content/administration/maintain/domain_names.rst:172 +#: ../../content/administration/maintain/domain_names.rst:177 msgid "`Google Domains `_" msgstr "" -#: ../../content/administration/maintain/domain_names.rst:177 +#: ../../content/administration/maintain/domain_names.rst:182 msgid "Naked domain" msgstr "" -#: ../../content/administration/maintain/domain_names.rst:179 +#: ../../content/administration/maintain/domain_names.rst:184 msgid "A **naked domain** is a domain name that doesn't have any subdomain at the beginning of the address (e.g., ``odoo.com`` instead of ``www.odoo.com``)." msgstr "" -#: ../../content/administration/maintain/domain_names.rst:182 +#: ../../content/administration/maintain/domain_names.rst:187 msgid "You may want your naked domain to redirect to your website as some visitors may not type the full domain name to access your website." msgstr "" -#: ../../content/administration/maintain/domain_names.rst:186 +#: ../../content/administration/maintain/domain_names.rst:191 msgid "Create a **redirection** from the naked domain (``example.com``) to your main domain name (``www.example.com``)." msgstr "" -#: ../../content/administration/maintain/domain_names.rst:190 +#: ../../content/administration/maintain/domain_names.rst:195 msgid "Depending on your domain name registrar, this redirection may be already pre-configured." msgstr "" -#: ../../content/administration/maintain/domain_names.rst:195 +#: ../../content/administration/maintain/domain_names.rst:200 msgid "Map your domain name with your Odoo database" msgstr "" -#: ../../content/administration/maintain/domain_names.rst:201 +#: ../../content/administration/maintain/domain_names.rst:206 msgid "Open your `database manager `_, click on the :guilabel:`settings` button next to your database, on :guilabel:`Domain names`, and then on :guilabel:`Use my own domain` at the bottom of the right column." msgstr "" -#: ../../content/administration/maintain/domain_names.rst:205 +#: ../../content/administration/maintain/domain_names.rst:210 msgid "Type the domain name you want to add to this database, then click on :guilabel:`Verify` to check if the CNAME record is correctly configured. Once done, click on :guilabel:`I confirm, it's done`." msgstr "" -#: ../../content/administration/maintain/domain_names.rst:215 +#: ../../content/administration/maintain/domain_names.rst:220 msgid "Go to :menuselection:`Branches --> select your branch --> Settings --> Custom domains`, type the domain name you want to add to this database, then click on :guilabel:`Add domain`." msgstr "" -#: ../../content/administration/maintain/domain_names.rst:223 +#: ../../content/administration/maintain/domain_names.rst:228 msgid ":ref:`Odoo.sh branches: settings tab `" msgstr "" -#: ../../content/administration/maintain/domain_names.rst:226 +#: ../../content/administration/maintain/domain_names.rst:231 msgid "Make sure to :ref:`add a CNAME record ` to your domain name's DNS **before** mapping your domain name with your Odoo database." msgstr "" -#: ../../content/administration/maintain/domain_names.rst:229 +#: ../../content/administration/maintain/domain_names.rst:234 msgid "Failing to do so may impede the validation of the :ref:`SSL certificate ` and would result in a *certificate name mismatch* error. This is often displayed by web browsers as a warning such as *\"Your connection is not private\"*." msgstr "" -#: ../../content/administration/maintain/domain_names.rst:233 +#: ../../content/administration/maintain/domain_names.rst:238 msgid "If this is the case and you have added the domain name to your database's settings less than five days ago, wait 24 hours as the validation may still happen. Otherwise, please `submit a support ticket `_ including screenshots of your CNAME records." msgstr "" -#: ../../content/administration/maintain/domain_names.rst:240 +#: ../../content/administration/maintain/domain_names.rst:245 msgid "SSL encryption (HTTPS protocol)" msgstr "" -#: ../../content/administration/maintain/domain_names.rst:242 +#: ../../content/administration/maintain/domain_names.rst:247 msgid "**SSL encryption** is an encryption-based Internet security protocol. It allows your visitors to navigate your website through a secure connection, which appears as an ``https://`` protocol at the beginning of your web address, rather than a non-secure ``http://`` protocol." msgstr "" -#: ../../content/administration/maintain/domain_names.rst:246 +#: ../../content/administration/maintain/domain_names.rst:251 msgid "Odoo generates a separate SSL certificate for each domain :ref:`mapped in the database manager `, using integration with `Let's Encrypt Certificate Authority and ACME protocol `_." msgstr "" -#: ../../content/administration/maintain/domain_names.rst:251 +#: ../../content/administration/maintain/domain_names.rst:256 msgid "The certificate generation may take up to 24h." msgstr "" -#: ../../content/administration/maintain/domain_names.rst:252 +#: ../../content/administration/maintain/domain_names.rst:257 msgid "Several attempts to validate your certificate are made during the five days following the moment you add your domain name in your database's settings." msgstr "" -#: ../../content/administration/maintain/domain_names.rst:254 +#: ../../content/administration/maintain/domain_names.rst:259 msgid "If you already use another service, you can keep using it or simply change for Odoo." msgstr "" -#: ../../content/administration/maintain/domain_names.rst:259 +#: ../../content/administration/maintain/domain_names.rst:264 msgid "Web base URL of a database" msgstr "" -#: ../../content/administration/maintain/domain_names.rst:262 +#: ../../content/administration/maintain/domain_names.rst:267 msgid "If you have Odoo Website, you can disregard this part and directly :ref:`map your domain name with your website `." msgstr "" -#: ../../content/administration/maintain/domain_names.rst:265 +#: ../../content/administration/maintain/domain_names.rst:270 msgid "The **web base URL** of a database, or **root URL** affects your main website address and all the links sent to your customers (e.g., quotations, portal links, etc.)." msgstr "" -#: ../../content/administration/maintain/domain_names.rst:268 +#: ../../content/administration/maintain/domain_names.rst:273 msgid "To configure it, access your Odoo database with your custom address, then log in as an administrator of your database (any user in the *Settings* group) from the login screen." msgstr "" -#: ../../content/administration/maintain/domain_names.rst:272 +#: ../../content/administration/maintain/domain_names.rst:277 msgid "Connecting to your database with the original Odoo subdomain address (e.g., ``example.odoo.com`` also updates the web base URL of your database. See below to prevent these automatic updates." msgstr "" -#: ../../content/administration/maintain/domain_names.rst:275 +#: ../../content/administration/maintain/domain_names.rst:280 msgid "Alternatively, you can do it manually. To do so, activate the :ref:`developer mode `, then go to :menuselection:`Settings --> Technical --> System Parameters`." msgstr "" -#: ../../content/administration/maintain/domain_names.rst:278 +#: ../../content/administration/maintain/domain_names.rst:283 msgid "Find the key called ``web.base.url`` (or create it if it does not exist) and enter the full address of your website as value, such as ``https://www.example.com``." msgstr "" -#: ../../content/administration/maintain/domain_names.rst:282 +#: ../../content/administration/maintain/domain_names.rst:287 msgid "The URL must include the protocol ``https://`` (or ``http://``) and must not end with a slash (``/``)." msgstr "" -#: ../../content/administration/maintain/domain_names.rst:285 +#: ../../content/administration/maintain/domain_names.rst:290 msgid "To prevent the automatic update of the web base URL when an administrator logs in the database, you can create the following System Parameter:" msgstr "" -#: ../../content/administration/maintain/domain_names.rst:288 +#: ../../content/administration/maintain/domain_names.rst:293 msgid "key: ``web.base.url.freeze``" msgstr "" -#: ../../content/administration/maintain/domain_names.rst:289 +#: ../../content/administration/maintain/domain_names.rst:294 msgid "value: ``True``" msgstr "" -#: ../../content/administration/maintain/domain_names.rst:294 +#: ../../content/administration/maintain/domain_names.rst:299 msgid "Map your domain name with your website" msgstr "" -#: ../../content/administration/maintain/domain_names.rst:296 +#: ../../content/administration/maintain/domain_names.rst:301 msgid "Mapping your domain name to your website isn't the same as mapping it with your database:" msgstr "" -#: ../../content/administration/maintain/domain_names.rst:298 +#: ../../content/administration/maintain/domain_names.rst:303 msgid "It defines your domain name as the main one for your website, helping search engines to index your website properly." msgstr "" -#: ../../content/administration/maintain/domain_names.rst:300 +#: ../../content/administration/maintain/domain_names.rst:305 msgid "It defines your domain name as the base URL for your database, including the portal links sent by email to your customers." msgstr "" -#: ../../content/administration/maintain/domain_names.rst:302 +#: ../../content/administration/maintain/domain_names.rst:307 msgid "If you have multiple websites, it maps your domain name with the appropriate website." msgstr "" -#: ../../content/administration/maintain/domain_names.rst:304 +#: ../../content/administration/maintain/domain_names.rst:309 msgid "Go to :menuselection:`Website --> Configuration --> Settings --> Website Info`. If you have multiple websites, select the one you want to configure." msgstr "" -#: ../../content/administration/maintain/domain_names.rst:307 +#: ../../content/administration/maintain/domain_names.rst:312 msgid "In the :guilabel:`Domain` field, fill in the web address of your website (e.g., ``https://www.example.com``) and click on :guilabel:`Save`." msgstr "" -#: ../../content/administration/maintain/domain_names.rst:315 +#: ../../content/administration/maintain/domain_names.rst:320 msgid "Mapping your domain name with your Odoo website prevents Google from indexing both your custom domain name ``www.example.com`` and your original odoo database address ``example.odoo.com``." msgstr "" -#: ../../content/administration/maintain/domain_names.rst:318 +#: ../../content/administration/maintain/domain_names.rst:323 msgid "If both addresses are already indexed, it may take some time before Google removes the indexation of the second address. You may also try using the `Google Search Console `_ to fix this." msgstr "" -#: ../../content/administration/maintain/domain_names.rst:323 +#: ../../content/administration/maintain/domain_names.rst:328 msgid "If you have multiple websites and companies on your database, make sure that you select the right :guilabel:`Company` in the website settings, next to the :guilabel:`Domain` settings. Doing so indicates Odoo which URL to use as the :ref:`base URL ` according to the company in use." msgstr "" -#: ../../content/administration/maintain/domain_names.rst:329 +#: ../../content/administration/maintain/domain_names.rst:334 msgid ":doc:`/applications/general/email_communication/email_servers`" msgstr "" @@ -1853,6 +1872,202 @@ msgstr "" msgid "No need to manually launch the server, the service is running. You should be able to connect to your Odoo Enterprise instance using your usual mean of identification. You can then link your database with your Odoo Enterprise Subscription by entering the code you received by e-mail in the form input" msgstr "" +#: ../../content/administration/maintain/google_oauth.rst:3 +msgid "Connect Gmail to Odoo using Google OAuth" +msgstr "" + +#: ../../content/administration/maintain/google_oauth.rst:5 +msgid "Odoo is compatible with Google's OAuth for Gmail. In order to send secure emails from a custom domain, all that is required is to configure a few settings on Google's *Workspace* platform, as well as on the back end of the Odoo database. This configuration works by using either a personal email address or an address created by a custom domain." +msgstr "" + +#: ../../content/administration/maintain/google_oauth.rst:11 +msgid "For more information, visit `Google's documentation `_ on setting up OAuth." +msgstr "" + +#: ../../content/administration/maintain/google_oauth.rst:15 +msgid "Setup in Google" +msgstr "" + +#: ../../content/administration/maintain/google_oauth.rst:18 +msgid "Create a new project" +msgstr "" + +#: ../../content/administration/maintain/google_oauth.rst:20 +msgid "To get started, go to the `Google API Platform `_. Log in with your *Google Workspace* account if you have one, otherwise log in with your personal Gmail account (this should match the email address you want to configure in Odoo)." +msgstr "" + +#: ../../content/administration/maintain/google_oauth.rst:25 +msgid "After that, click on :guilabel:`Create Project`, located on the far right of the OAuth consent screen. If a project has already been created in this account, then the :guilabel:`New Project` option will be located on the top left under the :guilabel:`Select a project` drop-down menu." +msgstr "" + +#: ../../content/administration/maintain/google_oauth.rst:29 +msgid "On the :guilabel:`New Project` screen, rename the :guilabel:`Project name` to `Odoo` and browse for the :guilabel:`Location`. Set the :guilabel:`Location` as the `Google Workspace` organization. If you are using a personal Gmail account, then leave the :guilabel:`Location` as `No Organization`." +msgstr "" + +#: ../../content/administration/maintain/google_oauth.rst:37 +msgid "Click on :guilabel:`Create` to finish this step. On the next screen, :guilabel:`User Type` options, select the :guilabel:`External` option, and then click on :guilabel:`Create` again, which will finally navigate to the :guilabel:`Edit app registration` page." +msgstr "" + +#: ../../content/administration/maintain/google_oauth.rst:42 +msgid "Edit app registration" +msgstr "" + +#: ../../content/administration/maintain/google_oauth.rst:44 +msgid "On the :guilabel:`Oauth consent screen` step, under the :guilabel:`App information` section, enter `Odoo` in the :guilabel:`App name` field. Select the organization's email address under the :guilabel:`User support` email field." +msgstr "" + +#: ../../content/administration/maintain/google_oauth.rst:47 +msgid "Next, under :menuselection:`App Domain --> Authorized domains`, click on :guilabel:`Add Domain` and enter `odoo.com`." +msgstr "" + +#: ../../content/administration/maintain/google_oauth.rst:49 +msgid "After that, under the :guilabel:`Developer contact information` section, enter the organization's email address. Google uses this email address to notify the organization about any changes to your project." +msgstr "" + +#: ../../content/administration/maintain/google_oauth.rst:52 +msgid "Next, click on the :guilabel:`Save and Continue` button." +msgstr "" + +#: ../../content/administration/maintain/google_oauth.rst:53 +msgid "Then, skip the :guilabel:`Scopes` page by scrolling to the bottom and clicking on :guilabel:`Save and Continue`." +msgstr "" + +#: ../../content/administration/maintain/google_oauth.rst:55 +msgid "Next, add the email being configured under the :guilabel:`Test users` step by clicking on :guilabel:`Add Users` and then the :guilabel:`Save and Continue` button. A summary of the :guilabel:`App registration` appears." +msgstr "" + +#: ../../content/administration/maintain/google_oauth.rst:58 +msgid "Finally, scroll to the bottom and click on :guilabel:`Back to Dashboard`." +msgstr "" + +#: ../../content/administration/maintain/google_oauth.rst:61 +msgid "Create Credentials" +msgstr "" + +#: ../../content/administration/maintain/google_oauth.rst:63 +msgid "Now that you have set up the project, you need to create credentials, which includes the :guilabel:`Client ID` and :guilabel:`Client Secret`. First, click on :guilabel:`Credentials` in the left sidebar menu." +msgstr "" + +#: ../../content/administration/maintain/google_oauth.rst:67 +msgid "Then, click on :guilabel:`Create Credentials` in the top menu and select :guilabel:`OAuth client ID` from the dropdown menu." +msgstr "" + +#: ../../content/administration/maintain/google_oauth.rst:70 +msgid "Under :guilabel:`Application Type`, select :guilabel:`Web Application` from the dropdown menu." +msgstr "" + +#: ../../content/administration/maintain/google_oauth.rst:71 +msgid "In the :guilabel:`Client ID` field, enter `Odoo`." +msgstr "" + +#: ../../content/administration/maintain/google_oauth.rst:72 +msgid "Under the :guilabel:`Authorized redirect URIs` label, click the button :guilabel:`ADD URI`, and then input `https://yourdbname.odoo.com/google_gmail/confirm` in the :guilabel:`URIs 1` field. Be sure to replace the *yourdbname* part of the URL with your actual Odoo database name." +msgstr "" + +#: ../../content/administration/maintain/google_oauth.rst:75 +msgid "Next, click on :guilabel:`Create` to generate an OAuth :guilabel:`Client ID` and :guilabel:`Client Secret`. Finally, copy each generated value for later use when configuring in Odoo, and then navigate to the Odoo database." +msgstr "" + +#: ../../content/administration/maintain/google_oauth.rst:84 +msgid "Setup in Odoo" +msgstr "" + +#: ../../content/administration/maintain/google_oauth.rst:87 +msgid "Enter Google Credentials" +msgstr "" + +#: ../../content/administration/maintain/google_oauth.rst:89 +msgid "First, open Odoo and navigate to the :guilabel:`Apps` module. Then, remove the :guilabel:`Apps` filter from the search bar and type in `Google`. Install the module called :guilabel:`Google Gmail`." +msgstr "" + +#: ../../content/administration/maintain/google_oauth.rst:92 +msgid "Next, navigate to :menuselection:`Settings --> General Settings`, and under the :guilabel:`Discuss` section, ensure that the checkbox for :guilabel:`Custom Email Servers` is checked. This populates a new option for :guilabel:`Gmail Credentials`. Then, copy and paste the :guilabel:`Client ID` and :guilabel:`Client Secret` into the respective fields and :guilabel:`Save` the settings." +msgstr "" + +#: ../../content/administration/maintain/google_oauth.rst:98 +msgid "Configure outgoing email server" +msgstr "" + +#: ../../content/administration/maintain/google_oauth.rst:100 +msgid "After that, on the :guilabel:`General Settings` page, under :guilabel:`Custom Email Servers`, click :guilabel:`Outgoing Email Servers` to configure the external Gmail account." +msgstr "" + +#: ../../content/administration/maintain/google_oauth.rst:107 +msgid "Then, :guilabel:`Create` a new email server and select the option for :guilabel:`Gmail`. Next, fill in the :guilabel:`Description` (can be anything) and the email :guilabel:`Username` and click on :guilabel:`Connect your Gmail account`." +msgstr "" + +#: ../../content/administration/maintain/google_oauth.rst:111 +msgid "A new window from :guilabel:`Google` opens to complete the authorization process. Select the appropriate email address that is being configured in Odoo." +msgstr "" + +#: ../../content/administration/maintain/google_oauth.rst:114 +msgid "If the email address is a personal account, an extra step pops up, click :guilabel:`Continue` to allow the verification and connect the Gmail account to Odoo." +msgstr "" + +#: ../../content/administration/maintain/google_oauth.rst:117 +msgid "Then, allow Odoo to access the Google account by clicking on :guilabel:`Continue` or :guilabel:`Allow`. After that, the page navigates back to the newly configured outgoing email server in Odoo. The configuration automatically loads the token in Odoo, and a tag stating :guilabel:`Gmail Token Valid` appears in green." +msgstr "" + +#: ../../content/administration/maintain/google_oauth.rst:126 +msgid "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." +msgstr "" + +#: ../../content/administration/maintain/google_oauth.rst:131 +msgid "Google OAuth FAQ" +msgstr "" + +#: ../../content/administration/maintain/google_oauth.rst:134 +msgid "Production VS Testing Publishing Status" +msgstr "" + +#: ../../content/administration/maintain/google_oauth.rst:136 +msgid "Choosing :guilabel:`Production` as the :guilabel:`Publishing Status` (instead of Testing) will display the following warning message:" +msgstr "" + +#: ../../content/administration/maintain/google_oauth.rst:143 +msgid "To correct this warning, navigate to the `Google API Platform `_. If the :guilabel:`Publishing status` is :guilabel:`In Production`, click :guilabel:`Back to Testing` to correct the issue." +msgstr "" + +#: ../../content/administration/maintain/google_oauth.rst:148 +msgid "No Test Users Added" +msgstr "" + +#: ../../content/administration/maintain/google_oauth.rst:150 +msgid "If no test users are added to the OAuth consent screen, then a 403 access denied error will populate." +msgstr "" + +#: ../../content/administration/maintain/google_oauth.rst:157 +msgid "To correct this error, return to the :guilabel:`OAuth consent screen` under :guilabel:`APIs & Services` and add test user(s) to the app. Add the email that you are configuring in Odoo." +msgstr "" + +#: ../../content/administration/maintain/google_oauth.rst:162 +msgid "Gmail Module not updated" +msgstr "" + +#: ../../content/administration/maintain/google_oauth.rst:164 +msgid "If the :guilabel:`Gmail Module` in Odoo has not been updated to the latest version, then a :guilabel:`Forbidden` error message populates." +msgstr "" + +#: ../../content/administration/maintain/google_oauth.rst:171 +msgid "To correct this error, go to the :guilabel:`Apps` module and clear out the search terms. Then, search for `Gmail` or `Google` and upgrade the :guilabel:`Google Gmail` module. Finally, click on the three dots on the upper right of the module and select :guilabel:`Upgrade`." +msgstr "" + +#: ../../content/administration/maintain/google_oauth.rst:176 +msgid "Application Type" +msgstr "" + +#: ../../content/administration/maintain/google_oauth.rst:178 +msgid "When creating the :guilabel:`Credentials` (OAuth Client ID and Client Secret), if :guilabel:`Desktop App` is selected for the :guilabel:`Application Type`, an :guilabel:`Authorization Error` appears." +msgstr "" + +#: ../../content/administration/maintain/google_oauth.rst:186 +msgid "To correct this error, delete the credentials already created and create new credentials, selecting :guilabel:`Web Application` for the :guilabel:`Application Type`. Then, under :guilabel:`Authorized redirect URIs`, click :guilabel:`ADD URI` and type: `https://yourdbname.odoo.com/google_gmail/confirm` in the field." +msgstr "" + +#: ../../content/administration/maintain/google_oauth.rst:192 +msgid "Replace *yourdbname* in the URL with the Odoo database name." +msgstr "" + #: ../../content/administration/maintain/hosting_changes.rst:6 msgid "Change hosting solution" msgstr "" @@ -1866,98 +2081,164 @@ msgid "From on-premises to Odoo Online" msgstr "" #: ../../content/administration/maintain/hosting_changes.rst:14 -#: ../../content/administration/maintain/hosting_changes.rst:48 -msgid "Odoo Online is not compatible with **non-standard apps**." -msgstr "" - -#: ../../content/administration/maintain/hosting_changes.rst:16 msgid "Create a :ref:`duplicate ` of your database: in this duplicate, uninstall all the **non-standard apps**." msgstr "" -#: ../../content/administration/maintain/hosting_changes.rst:17 +#: ../../content/administration/maintain/hosting_changes.rst:15 msgid "Grab a \"dump with filestore\" of your database by using the Database Manager." msgstr "" -#: ../../content/administration/maintain/hosting_changes.rst:18 -#: ../../content/administration/maintain/hosting_changes.rst:51 +#: ../../content/administration/maintain/hosting_changes.rst:16 msgid "**If you have time constraints, contact us earlier to schedule the transfer.**" msgstr "" -#: ../../content/administration/maintain/hosting_changes.rst:19 +#: ../../content/administration/maintain/hosting_changes.rst:17 msgid "`Create a support ticket `_ and attach the dump (if the file is too large, use any file transfer service and attach the link to your ticket). Also include your subscription number and the URL you want to use for your database (e.g.: my-company.odoo.com)." msgstr "" -#: ../../content/administration/maintain/hosting_changes.rst:20 -#: ../../content/administration/maintain/hosting_changes.rst:53 +#: ../../content/administration/maintain/hosting_changes.rst:18 +#: ../../content/administration/maintain/hosting_changes.rst:66 msgid "We will make sure your database is compatible and upload it to our cloud. In case of technical issues, we will get in touch with you." msgstr "" -#: ../../content/administration/maintain/hosting_changes.rst:21 -#: ../../content/administration/maintain/hosting_changes.rst:54 +#: ../../content/administration/maintain/hosting_changes.rst:19 msgid "It's done!" msgstr "" -#: ../../content/administration/maintain/hosting_changes.rst:24 -msgid "From on-premises to Odoo.sh" +#: ../../content/administration/maintain/hosting_changes.rst:22 +#: ../../content/administration/maintain/hosting_changes.rst:71 +msgid "Odoo Online is not compatible with **non-standard apps**." msgstr "" -#: ../../content/administration/maintain/hosting_changes.rst:26 -#: ../../content/administration/maintain/hosting_changes.rst:43 -msgid "Follow the :ref:`Import your database section of the Odoo.sh documentation `." +#: ../../content/administration/maintain/hosting_changes.rst:23 +msgid "The database you are moving to Odoo Online must be in a :doc:`supported version `." msgstr "" #: ../../content/administration/maintain/hosting_changes.rst:27 -msgid "...and voilà!" +msgid "From on-premises to Odoo.sh" +msgstr "" + +#: ../../content/administration/maintain/hosting_changes.rst:29 +#: ../../content/administration/maintain/hosting_changes.rst:46 +msgid "Follow the :ref:`Import your database section of the Odoo.sh documentation `." msgstr "" #: ../../content/administration/maintain/hosting_changes.rst:30 -msgid "From Odoo Online to on-premises" -msgstr "" - -#: ../../content/administration/maintain/hosting_changes.rst:32 -#: ../../content/administration/maintain/hosting_changes.rst:40 -msgid "Log into `your Odoo Online user portal `_ and look for the version number of your database." +msgid "...and voilà!" msgstr "" #: ../../content/administration/maintain/hosting_changes.rst:33 -msgid "If your database does not run a :ref:`major version ` of Odoo, you cannot host it on-premises yet, you have to upgrade it first to a new major version. (*e.g.: If your database runs Odoo 12.3 which is not a major version, you have to upgrade it first to Odoo 13.0 or 14.0.*)" -msgstr "" - -#: ../../content/administration/maintain/hosting_changes.rst:34 -#: ../../content/administration/maintain/hosting_changes.rst:42 -msgid "Download a backup of your database by clicking on the \"Gear\" icon next to your database name then :menuselection:`Download` (if the download fails due to your backup file being too large, contact `our support `_)" +msgid "From Odoo Online to on-premises" msgstr "" #: ../../content/administration/maintain/hosting_changes.rst:35 -#: ../../content/administration/maintain/hosting_changes.rst:60 -msgid "Restore it from the database manager on your local server." +#: ../../content/administration/maintain/hosting_changes.rst:43 +msgid "Log into `your Odoo Online user portal `_ and look for the version number of your database." +msgstr "" + +#: ../../content/administration/maintain/hosting_changes.rst:36 +msgid "If your database does not run a :ref:`major version ` of Odoo, you cannot host it on-premises yet, you have to upgrade it first to a new major version. (*e.g.: If your database runs Odoo 12.3 which is not a major version, you have to upgrade it first to Odoo 13.0 or 14.0.*)" +msgstr "" + +#: ../../content/administration/maintain/hosting_changes.rst:37 +#: ../../content/administration/maintain/hosting_changes.rst:45 +msgid "Download a backup of your database by clicking on the \"Gear\" icon next to your database name then :menuselection:`Download` (if the download fails due to your backup file being too large, contact `our support `_)" msgstr "" #: ../../content/administration/maintain/hosting_changes.rst:38 -msgid "From Odoo Online to Odoo.sh" +#: ../../content/administration/maintain/hosting_changes.rst:87 +msgid "Restore it from the database manager on your local server." msgstr "" #: ../../content/administration/maintain/hosting_changes.rst:41 +msgid "From Odoo Online to Odoo.sh" +msgstr "" + +#: ../../content/administration/maintain/hosting_changes.rst:44 msgid "If your database does not run a :ref:`major version ` of Odoo, you cannot host it on Odoo.sh yet, you have to upgrade it first to a new major version. (*e.g.: If your database runs Odoo 12.3 which is not a major version, you have to upgrade it first to Odoo 13.0 or 14.0.*)" msgstr "" -#: ../../content/administration/maintain/hosting_changes.rst:46 +#: ../../content/administration/maintain/hosting_changes.rst:49 msgid "From Odoo.sh to Odoo Online" msgstr "" -#: ../../content/administration/maintain/hosting_changes.rst:50 -msgid "Uninstall all the **non-standard apps**: test it in a staging build first, then do it in your production build." +#: ../../content/administration/maintain/hosting_changes.rst:51 +msgid "Uninstall all the **non-standard apps**." msgstr "" #: ../../content/administration/maintain/hosting_changes.rst:52 -msgid "`Create a support ticket `_ and include your subscription number and the URL you want to use for your database (e.g.: my-company.odoo.com)." +msgid "`Create a support ticket `_ and include the following:" +msgstr "" + +#: ../../content/administration/maintain/hosting_changes.rst:54 +msgid "Your subscription number" +msgstr "" + +#: ../../content/administration/maintain/hosting_changes.rst:55 +msgid "The URL you want to use for your database (e.g., `example.odoo.com`)" +msgstr "" + +#: ../../content/administration/maintain/hosting_changes.rst:56 +msgid "Which brand you want to migrate" msgstr "" #: ../../content/administration/maintain/hosting_changes.rst:57 -msgid "From Odoo.sh to on-premises" +msgid "In which region you want to be hosted:" msgstr "" #: ../../content/administration/maintain/hosting_changes.rst:59 +msgid "Americas" +msgstr "" + +#: ../../content/administration/maintain/hosting_changes.rst:60 +msgid "Europe" +msgstr "" + +#: ../../content/administration/maintain/hosting_changes.rst:61 +msgid "Asia" +msgstr "" + +#: ../../content/administration/maintain/hosting_changes.rst:63 +msgid "Which user(s) will be the administrator(s)" +msgstr "" + +#: ../../content/administration/maintain/hosting_changes.rst:64 +msgid "When (and in which timezone) you want the database to be up and running" +msgstr "" + +#: ../../content/administration/maintain/hosting_changes.rst:68 +msgid "All done!" +msgstr "" + +#: ../../content/administration/maintain/hosting_changes.rst:72 +msgid "Make sure to uninstall all the **non-standard apps** in a staging build before doing it in your production build." +msgstr "" + +#: ../../content/administration/maintain/hosting_changes.rst:76 +msgid "Make sure you select the **region** that is closest to your users to reduce latency." +msgstr "" + +#: ../../content/administration/maintain/hosting_changes.rst:77 +msgid "The future **administrator(s)** must have an odoo.com account." +msgstr "" + +#: ../../content/administration/maintain/hosting_changes.rst:78 +msgid "The specific **date and time** at which you want the database to be up and running are mainly helpful to organize the switch from the odoo.sh server to the Odoo Online servers." +msgstr "" + +#: ../../content/administration/maintain/hosting_changes.rst:80 +msgid "Databases are **not reachable** during their migration." +msgstr "" + +#: ../../content/administration/maintain/hosting_changes.rst:81 +msgid "**If you have time constraints, contact us earlier to schedule the transfer**." +msgstr "" + +#: ../../content/administration/maintain/hosting_changes.rst:84 +msgid "From Odoo.sh to on-premises" +msgstr "" + +#: ../../content/administration/maintain/hosting_changes.rst:86 msgid "Grab a :ref:`backup of your Odoo.sh production database `." msgstr "" @@ -2177,6 +2458,7 @@ msgid ":ref:`online/users`" msgstr "" #: ../../content/administration/maintain/online.rst:36 +#: ../../content/administration/odoo_sh/getting_started/branches.rst:285 #: ../../content/administration/upgrade.rst:10 msgid "Upgrade" msgstr "" @@ -2270,7 +2552,7 @@ msgid "Add tags to sort your databases out. You can search the tags in the searc msgstr "" #: ../../content/administration/maintain/online.rst:110 -#: ../../content/administration/odoo_sh/getting_started/branches.rst:528 +#: ../../content/administration/odoo_sh/getting_started/branches.rst:539 msgid "Delete" msgstr "" @@ -2594,19 +2876,19 @@ msgstr "" msgid "🏁 Future version, not released yet" msgstr "" -#: ../../content/administration/maintain/supported_versions.rst:81 +#: ../../content/administration/maintain/supported_versions.rst:80 msgid "I run an older version of Odoo/OpenERP/TinyERP" msgstr "" -#: ../../content/administration/maintain/supported_versions.rst:83 +#: ../../content/administration/maintain/supported_versions.rst:82 msgid "OpenERP 7.0, 6.1, 6.0 and 5.0 is not supported anymore, on any platform." msgstr "" -#: ../../content/administration/maintain/supported_versions.rst:85 +#: ../../content/administration/maintain/supported_versions.rst:84 msgid "TinyERP 4.0, 3.0, 2.0 and 1.0 is not supported anymore, on any platform." msgstr "" -#: ../../content/administration/maintain/supported_versions.rst:87 +#: ../../content/administration/maintain/supported_versions.rst:86 msgid "Even though we don't support older versions, you can always `upgrade from any version `_." msgstr "" @@ -2771,6 +3053,7 @@ msgstr "" #: ../../content/administration/odoo_sh/getting_started/settings.rst:7 #: ../../content/administration/odoo_sh/getting_started/status.rst:7 #: ../../content/administration/odoo_sh/overview.rst:5 +#: ../../content/administration/upgrade/odoo_sh.rst:8 msgid "Overview" msgstr "" @@ -2883,7 +3166,7 @@ msgid "``--stop-after-init`` will immediately shutdown the server instance after msgstr "" #: ../../content/administration/odoo_sh/advanced/containers.rst:169 -msgid "More options are available and detailed in the :doc:`CLI documentation `." +msgid "More options are available and detailed in the :doc:`CLI documentation `." msgstr "" #: ../../content/administration/odoo_sh/advanced/containers.rst:172 @@ -3157,7 +3440,7 @@ msgid "If your changes require the update of a module, such as a change in a for msgstr "" #: ../../content/administration/odoo_sh/getting_started/branches.rst:43 -msgid "This method is equivalent to perform an upgrade of the module through the Apps menu, or through the :code:`-u` switch of :doc:`the command line `." +msgid "This method is equivalent to perform an upgrade of the module through the Apps menu, or through the :code:`-u` switch of :doc:`the command line `." msgstr "" #: ../../content/administration/odoo_sh/getting_started/branches.rst:47 @@ -3452,7 +3735,15 @@ msgstr "" msgid "the Odoo.sh dump download button in the :ref:`Builds view `." msgstr "" -#: ../../content/administration/odoo_sh/getting_started/branches.rst:285 +#: ../../content/administration/odoo_sh/getting_started/branches.rst:287 +msgid "Available for production and staging branches for valid projects." +msgstr "" + +#: ../../content/administration/odoo_sh/getting_started/branches.rst:290 +msgid ":doc:`Upgrade - Odoo.sh <../../upgrade/odoo_sh>`" +msgstr "" + +#: ../../content/administration/odoo_sh/getting_started/branches.rst:295 #: ../../content/administration/odoo_sh/getting_started/settings.rst:4 #: ../../content/administration/odoo_sh/getting_started/settings.rst:62 #: ../../content/administration/odoo_sh/getting_started/settings.rst:78 @@ -3460,300 +3751,300 @@ msgstr "" msgid "Settings" msgstr "" -#: ../../content/administration/odoo_sh/getting_started/branches.rst:286 +#: ../../content/administration/odoo_sh/getting_started/branches.rst:297 msgid "Here you can find a couple of settings that only apply to the currently selected branch." msgstr "" -#: ../../content/administration/odoo_sh/getting_started/branches.rst:291 +#: ../../content/administration/odoo_sh/getting_started/branches.rst:302 msgid "**Behaviour upon new commit**" msgstr "" -#: ../../content/administration/odoo_sh/getting_started/branches.rst:293 +#: ../../content/administration/odoo_sh/getting_started/branches.rst:304 msgid "For development and staging branches, you can change the branch's behavior upon receiving a new commit. By default, a development branch will create a new build and a staging branch will update the previous build (see the :ref:`Production Stage `). This is especially useful should the feature you're working on require a particular setup or configuration, to avoid having to manually set it up again on every commit. If you choose new build for a staging branch, it will make a fresh copy from the production build every time a commit is pushed. A branch that is put back from staging to development will automatically be set to 'Do nothing'." msgstr "" -#: ../../content/administration/odoo_sh/getting_started/branches.rst:301 +#: ../../content/administration/odoo_sh/getting_started/branches.rst:312 msgid "**Modules installation**" msgstr "" -#: ../../content/administration/odoo_sh/getting_started/branches.rst:303 +#: ../../content/administration/odoo_sh/getting_started/branches.rst:314 msgid "Choose the modules to install automatically for your development builds." msgstr "" -#: ../../content/administration/odoo_sh/getting_started/branches.rst:308 +#: ../../content/administration/odoo_sh/getting_started/branches.rst:319 msgid "*Install only my modules* will install the modules of the branch only. This is the default option. The :ref:`submodules ` are excluded." msgstr "" -#: ../../content/administration/odoo_sh/getting_started/branches.rst:310 +#: ../../content/administration/odoo_sh/getting_started/branches.rst:321 msgid "*Full installation (all modules)* will install the modules of the branch, the modules included in the submodules and all standard modules of Odoo. When running the full installation, the test suite is disabled." msgstr "" -#: ../../content/administration/odoo_sh/getting_started/branches.rst:312 +#: ../../content/administration/odoo_sh/getting_started/branches.rst:323 msgid "*Install a list of modules* will install the modules specified in the input just below this option. The names are the technical name of the modules, and they must be comma-separated." msgstr "" -#: ../../content/administration/odoo_sh/getting_started/branches.rst:315 +#: ../../content/administration/odoo_sh/getting_started/branches.rst:326 msgid "If the tests are enabled, the standard Odoo modules suite can take up to 1 hour. This setting applies to development builds only. Staging builds duplicate the production build and the production build only installs base." msgstr "" -#: ../../content/administration/odoo_sh/getting_started/branches.rst:320 +#: ../../content/administration/odoo_sh/getting_started/branches.rst:331 msgid "**Test suite**" msgstr "" -#: ../../content/administration/odoo_sh/getting_started/branches.rst:322 +#: ../../content/administration/odoo_sh/getting_started/branches.rst:333 msgid "For development branches, you can choose to enable or disable the test suite. It's enabled by default. When the test suite is enabled, you can restrict them by specifying test tags :ref:`test tags `." msgstr "" -#: ../../content/administration/odoo_sh/getting_started/branches.rst:326 +#: ../../content/administration/odoo_sh/getting_started/branches.rst:337 msgid "**Odoo Version**" msgstr "" -#: ../../content/administration/odoo_sh/getting_started/branches.rst:328 +#: ../../content/administration/odoo_sh/getting_started/branches.rst:339 msgid "For development branches only, you can change the version of Odoo, should you want to test upgraded code or develop features while your production database is in the process of being upgraded to a newer version." msgstr "" -#: ../../content/administration/odoo_sh/getting_started/branches.rst:331 +#: ../../content/administration/odoo_sh/getting_started/branches.rst:342 msgid "In addition, for each version you have two options regarding the code update." msgstr "" -#: ../../content/administration/odoo_sh/getting_started/branches.rst:333 +#: ../../content/administration/odoo_sh/getting_started/branches.rst:344 msgid "You can choose to benefit from the latest bug, security and performance fixes automatically. The sources of your Odoo server will be updated weekly. This is the 'Latest' option." msgstr "" -#: ../../content/administration/odoo_sh/getting_started/branches.rst:335 +#: ../../content/administration/odoo_sh/getting_started/branches.rst:346 msgid "You can choose to pin the Odoo sources to a specific revision by selecting them from a list of dates. Revisions will expire after 3 months. You will be notified by mail when the expiration date approaches and if you don't take action afterwards, you will automatically be set to the latest revision." msgstr "" -#: ../../content/administration/odoo_sh/getting_started/branches.rst:340 +#: ../../content/administration/odoo_sh/getting_started/branches.rst:351 msgid "**Custom domains**" msgstr "" -#: ../../content/administration/odoo_sh/getting_started/branches.rst:342 +#: ../../content/administration/odoo_sh/getting_started/branches.rst:353 msgid "Here you can configure additional domains for the selected branch. It's possible to add other *.odoo.com* domains or your own custom domains. For the latter you have to:" msgstr "" -#: ../../content/administration/odoo_sh/getting_started/branches.rst:345 +#: ../../content/administration/odoo_sh/getting_started/branches.rst:356 msgid "own or purchase the domain name," msgstr "" -#: ../../content/administration/odoo_sh/getting_started/branches.rst:346 +#: ../../content/administration/odoo_sh/getting_started/branches.rst:357 msgid "add the domain name in this list," msgstr "" -#: ../../content/administration/odoo_sh/getting_started/branches.rst:347 +#: ../../content/administration/odoo_sh/getting_started/branches.rst:358 msgid "in your registrar's domain name manager, configure the domain name with a ``CNAME`` record set to your production database domain name." msgstr "" -#: ../../content/administration/odoo_sh/getting_started/branches.rst:350 +#: ../../content/administration/odoo_sh/getting_started/branches.rst:361 msgid "For instance, to associate *www.mycompany.com* to your database *mycompany.odoo.com*:" msgstr "" -#: ../../content/administration/odoo_sh/getting_started/branches.rst:352 +#: ../../content/administration/odoo_sh/getting_started/branches.rst:363 msgid "in Odoo.sh, add *www.mycompany.com* in the custom domains of your project settings," msgstr "" -#: ../../content/administration/odoo_sh/getting_started/branches.rst:353 +#: ../../content/administration/odoo_sh/getting_started/branches.rst:364 msgid "in your domain name manager (e.g. *godaddy.com*, *gandi.net*, *ovh.com*), configure *www.mycompany.com* with a ``CNAME`` record with as value *mycompany.odoo.com*." msgstr "" -#: ../../content/administration/odoo_sh/getting_started/branches.rst:356 +#: ../../content/administration/odoo_sh/getting_started/branches.rst:367 msgid "Bare domains (e.g. *mycompany.com*) are not accepted:" msgstr "" -#: ../../content/administration/odoo_sh/getting_started/branches.rst:358 +#: ../../content/administration/odoo_sh/getting_started/branches.rst:369 msgid "they can only be configured using ``A`` records," msgstr "" -#: ../../content/administration/odoo_sh/getting_started/branches.rst:359 +#: ../../content/administration/odoo_sh/getting_started/branches.rst:370 msgid "``A`` records only accept IP addresses as value," msgstr "" -#: ../../content/administration/odoo_sh/getting_started/branches.rst:360 +#: ../../content/administration/odoo_sh/getting_started/branches.rst:371 msgid "the IP address of your database can change, following an upgrade, a hardware failure or your wish to host your database in another country or continent." msgstr "" -#: ../../content/administration/odoo_sh/getting_started/branches.rst:363 +#: ../../content/administration/odoo_sh/getting_started/branches.rst:374 msgid "Therefore, bare domains could suddenly no longer work because of this change of IP address." msgstr "" -#: ../../content/administration/odoo_sh/getting_started/branches.rst:365 +#: ../../content/administration/odoo_sh/getting_started/branches.rst:376 msgid "In addition, if you would like both *mycompany.com* and *www.mycompany.com* to work with your database, having the first redirecting to the second is amongst the `SEO best practices `_ (See *Provide one version of a URL to reach a document*) in order to have one dominant URL. You can therefore just configure *mycompany.com* to redirect to *www.mycompany.com*. Most domain managers have the feature to configure this redirection. This is commonly called a web redirection." msgstr "" -#: ../../content/administration/odoo_sh/getting_started/branches.rst:372 +#: ../../content/administration/odoo_sh/getting_started/branches.rst:383 msgid "**HTTPS/SSL**" msgstr "" -#: ../../content/administration/odoo_sh/getting_started/branches.rst:374 +#: ../../content/administration/odoo_sh/getting_started/branches.rst:385 msgid "If the redirection is correctly set up, the platform will automatically generate an SSL certificate with `Let's Encrypt `_ within the hour and your domain will be accessible through HTTPS." msgstr "" -#: ../../content/administration/odoo_sh/getting_started/branches.rst:378 +#: ../../content/administration/odoo_sh/getting_started/branches.rst:389 msgid "While it is currently not possible to configure your own SSL certificates on the Odoo.sh platform we are considering the feature if there is enough demand." msgstr "" -#: ../../content/administration/odoo_sh/getting_started/branches.rst:382 +#: ../../content/administration/odoo_sh/getting_started/branches.rst:393 msgid "**SPF and DKIM compliance**" msgstr "" -#: ../../content/administration/odoo_sh/getting_started/branches.rst:384 +#: ../../content/administration/odoo_sh/getting_started/branches.rst:395 msgid "In case the domain of your users email addresses use SPF (Sender Policy Framework) or DKIM (DomainKeys Identified Mail), don't forget to authorize Odoo as a sending host in your domain name settings to increase the deliverability of your outgoing emails. The configuration steps are explained in the documentation about :ref:`SPF ` and :ref:`DKIM `." msgstr "" -#: ../../content/administration/odoo_sh/getting_started/branches.rst:392 +#: ../../content/administration/odoo_sh/getting_started/branches.rst:403 msgid "Forgetting to configure your SPF or DKIM to authorize Odoo as a sending host can lead to the delivery of your emails as spam in your contacts inbox." msgstr "" -#: ../../content/administration/odoo_sh/getting_started/branches.rst:397 +#: ../../content/administration/odoo_sh/getting_started/branches.rst:408 msgid "Shell commands" msgstr "" -#: ../../content/administration/odoo_sh/getting_started/branches.rst:398 +#: ../../content/administration/odoo_sh/getting_started/branches.rst:409 msgid "In the top right-hand corner of the view, different shell commands are available." msgstr "" -#: ../../content/administration/odoo_sh/getting_started/branches.rst:403 +#: ../../content/administration/odoo_sh/getting_started/branches.rst:414 msgid "Each command can be copied in the clipboard to be used in a terminal, and some of them can be used directly from Odoo.sh by clicking the *run* button in such case a popup will prompt the user in order to define eventual placeholders such as ````, ````, ..." msgstr "" -#: ../../content/administration/odoo_sh/getting_started/branches.rst:409 +#: ../../content/administration/odoo_sh/getting_started/branches.rst:420 msgid "Clone" msgstr "" -#: ../../content/administration/odoo_sh/getting_started/branches.rst:410 +#: ../../content/administration/odoo_sh/getting_started/branches.rst:421 msgid "Download the Git repository." msgstr "" -#: ../../content/administration/odoo_sh/getting_started/branches.rst:416 +#: ../../content/administration/odoo_sh/getting_started/branches.rst:427 msgid "Clones the repository *odoo/odoo*." msgstr "" -#: ../../content/administration/odoo_sh/getting_started/branches.rst:418 +#: ../../content/administration/odoo_sh/getting_started/branches.rst:429 msgid ":code:`--recurse-submodules`: Downloads the submodules of your repository. Submodules included in the submodules are downloaded as well." msgstr "" -#: ../../content/administration/odoo_sh/getting_started/branches.rst:419 +#: ../../content/administration/odoo_sh/getting_started/branches.rst:430 msgid ":code:`--branch`: checks out a specific branch of the repository, in this case *master*." msgstr "" -#: ../../content/administration/odoo_sh/getting_started/branches.rst:421 +#: ../../content/administration/odoo_sh/getting_started/branches.rst:432 msgid "The *run* button is not available for this command, as it is meant to be used on your machines." msgstr "" -#: ../../content/administration/odoo_sh/getting_started/branches.rst:424 +#: ../../content/administration/odoo_sh/getting_started/branches.rst:435 msgid "Fork" msgstr "" -#: ../../content/administration/odoo_sh/getting_started/branches.rst:425 +#: ../../content/administration/odoo_sh/getting_started/branches.rst:436 msgid "Create a new branch based on the current branch." msgstr "" -#: ../../content/administration/odoo_sh/getting_started/branches.rst:431 +#: ../../content/administration/odoo_sh/getting_started/branches.rst:442 msgid "Creates a new branch called *feature-1* based on the branch *master*, and then checkouts it." msgstr "" -#: ../../content/administration/odoo_sh/getting_started/branches.rst:437 +#: ../../content/administration/odoo_sh/getting_started/branches.rst:448 msgid "Uploads the new branch *feature-1* on your remote repository." msgstr "" -#: ../../content/administration/odoo_sh/getting_started/branches.rst:440 +#: ../../content/administration/odoo_sh/getting_started/branches.rst:451 msgid "Merge" msgstr "" -#: ../../content/administration/odoo_sh/getting_started/branches.rst:441 +#: ../../content/administration/odoo_sh/getting_started/branches.rst:452 msgid "Merge the current branch in another branch." msgstr "" -#: ../../content/administration/odoo_sh/getting_started/branches.rst:447 +#: ../../content/administration/odoo_sh/getting_started/branches.rst:458 msgid "Merges the branch *staging-1* in the current branch." msgstr "" -#: ../../content/administration/odoo_sh/getting_started/branches.rst:453 -#: ../../content/administration/odoo_sh/getting_started/branches.rst:525 +#: ../../content/administration/odoo_sh/getting_started/branches.rst:464 +#: ../../content/administration/odoo_sh/getting_started/branches.rst:536 msgid "Uploads the changes you just added in the *master* branch on your remote repository." msgstr "" -#: ../../content/administration/odoo_sh/getting_started/branches.rst:456 +#: ../../content/administration/odoo_sh/getting_started/branches.rst:467 msgid "SSH" msgstr "" -#: ../../content/administration/odoo_sh/getting_started/branches.rst:458 +#: ../../content/administration/odoo_sh/getting_started/branches.rst:469 msgid "Setup" msgstr "" -#: ../../content/administration/odoo_sh/getting_started/branches.rst:459 +#: ../../content/administration/odoo_sh/getting_started/branches.rst:470 msgid "In order to use SSH, you have to set up your profile SSH public key (if it is not already done). To do so, follow these steps:" msgstr "" -#: ../../content/administration/odoo_sh/getting_started/branches.rst:462 +#: ../../content/administration/odoo_sh/getting_started/branches.rst:473 msgid "`Generate a new SSH key `_" msgstr "" -#: ../../content/administration/odoo_sh/getting_started/branches.rst:464 +#: ../../content/administration/odoo_sh/getting_started/branches.rst:475 msgid "`Copy the SSH key to your clipboard `_ (only apply the step 1)" msgstr "" -#: ../../content/administration/odoo_sh/getting_started/branches.rst:467 +#: ../../content/administration/odoo_sh/getting_started/branches.rst:478 msgid "Paste the copied content to your profile SSH keys and press \"Add\"" msgstr "" -#: ../../content/administration/odoo_sh/getting_started/branches.rst:472 +#: ../../content/administration/odoo_sh/getting_started/branches.rst:483 msgid "The key should appear below" msgstr "" -#: ../../content/administration/odoo_sh/getting_started/branches.rst:478 +#: ../../content/administration/odoo_sh/getting_started/branches.rst:489 msgid "Connection" msgstr "" -#: ../../content/administration/odoo_sh/getting_started/branches.rst:480 +#: ../../content/administration/odoo_sh/getting_started/branches.rst:491 msgid "To connect to your builds using ssh use the following command in a terminal:" msgstr "" -#: ../../content/administration/odoo_sh/getting_started/branches.rst:486 +#: ../../content/administration/odoo_sh/getting_started/branches.rst:497 msgid "You will find a shortcut for this command into the SSH tab in the upper right corner." msgstr "" -#: ../../content/administration/odoo_sh/getting_started/branches.rst:491 +#: ../../content/administration/odoo_sh/getting_started/branches.rst:502 msgid "Provided you have the :ref:`correct access rights ` on the project, you'll be granted ssh access to the build." msgstr "" -#: ../../content/administration/odoo_sh/getting_started/branches.rst:495 +#: ../../content/administration/odoo_sh/getting_started/branches.rst:506 msgid "Long running ssh connections are not guaranteed. Idle connections will be disconnected in order to free up resources." msgstr "" -#: ../../content/administration/odoo_sh/getting_started/branches.rst:500 +#: ../../content/administration/odoo_sh/getting_started/branches.rst:511 msgid "Submodule" msgstr "" -#: ../../content/administration/odoo_sh/getting_started/branches.rst:502 +#: ../../content/administration/odoo_sh/getting_started/branches.rst:513 msgid "Add a branch from another repository in your current branch as a *submodule*." msgstr "" -#: ../../content/administration/odoo_sh/getting_started/branches.rst:504 +#: ../../content/administration/odoo_sh/getting_started/branches.rst:515 msgid "*Submodules* allows you to use modules from other repositories in your project." msgstr "" -#: ../../content/administration/odoo_sh/getting_started/branches.rst:506 +#: ../../content/administration/odoo_sh/getting_started/branches.rst:517 msgid "The submodules feature is detailed in the chapter :ref:`Submodules ` of this documentation." msgstr "" -#: ../../content/administration/odoo_sh/getting_started/branches.rst:513 +#: ../../content/administration/odoo_sh/getting_started/branches.rst:524 msgid "Adds the branch *master* of the repository ** as a submodule under the path ** in your current branch." msgstr "" -#: ../../content/administration/odoo_sh/getting_started/branches.rst:519 +#: ../../content/administration/odoo_sh/getting_started/branches.rst:530 msgid "Commits all your current changes." msgstr "" -#: ../../content/administration/odoo_sh/getting_started/branches.rst:530 +#: ../../content/administration/odoo_sh/getting_started/branches.rst:541 msgid "Delete a branch from your repository." msgstr "" -#: ../../content/administration/odoo_sh/getting_started/branches.rst:536 +#: ../../content/administration/odoo_sh/getting_started/branches.rst:547 msgid "Deletes the branch in your remote repository." msgstr "" -#: ../../content/administration/odoo_sh/getting_started/branches.rst:542 +#: ../../content/administration/odoo_sh/getting_started/branches.rst:553 msgid "Deletes the branch in your local copy of the repository." msgstr "" @@ -4214,7 +4505,7 @@ msgid "Or, from your computer, if you have an :ref:`installation of Odoo ` in which you replace every occurrences of *my_module* to the name of your choice." +msgid "If you do not want to bother installing Odoo on your computer, you can also :download:`download this module structure template ` in which you replace every occurrences of *my_module* to the name of your choice." msgstr "" #: ../../content/administration/odoo_sh/getting_started/first_module.rst:101 @@ -4600,143 +4891,143 @@ msgstr "" msgid "The working directory is composed of the following folders:" msgstr "" -#: ../../content/administration/odoo_sh/getting_started/online-editor.rst:50 +#: ../../content/administration/odoo_sh/getting_started/online-editor.rst:49 msgid "You can edit the source code (files under */src*) in development and staging builds." msgstr "" -#: ../../content/administration/odoo_sh/getting_started/online-editor.rst:53 +#: ../../content/administration/odoo_sh/getting_started/online-editor.rst:52 msgid "Your changes won't be propagated to a new build, you must commit them in your source code if you want to make them persist." msgstr "" -#: ../../content/administration/odoo_sh/getting_started/online-editor.rst:57 +#: ../../content/administration/odoo_sh/getting_started/online-editor.rst:56 msgid "For production builds, the source code is read-only, because applying local changes on a production server is not a good practice." msgstr "" -#: ../../content/administration/odoo_sh/getting_started/online-editor.rst:60 +#: ../../content/administration/odoo_sh/getting_started/online-editor.rst:59 msgid "The source code of your Github repository is located under */src/user*," msgstr "" -#: ../../content/administration/odoo_sh/getting_started/online-editor.rst:61 +#: ../../content/administration/odoo_sh/getting_started/online-editor.rst:60 msgid "The source code of Odoo is located under" msgstr "" -#: ../../content/administration/odoo_sh/getting_started/online-editor.rst:63 +#: ../../content/administration/odoo_sh/getting_started/online-editor.rst:62 msgid "*/src/odoo* (`odoo/odoo `_)," msgstr "" -#: ../../content/administration/odoo_sh/getting_started/online-editor.rst:64 +#: ../../content/administration/odoo_sh/getting_started/online-editor.rst:63 msgid "*/src/enterprise* (`odoo/enterprise `_)," msgstr "" -#: ../../content/administration/odoo_sh/getting_started/online-editor.rst:65 +#: ../../content/administration/odoo_sh/getting_started/online-editor.rst:64 msgid "*/src/themes* (`odoo/design-themes `_)." msgstr "" -#: ../../content/administration/odoo_sh/getting_started/online-editor.rst:67 +#: ../../content/administration/odoo_sh/getting_started/online-editor.rst:66 msgid "To open a file in the editor, just double-click on it in the file browser panel on the left." msgstr "" -#: ../../content/administration/odoo_sh/getting_started/online-editor.rst:72 +#: ../../content/administration/odoo_sh/getting_started/online-editor.rst:71 msgid "You can then begin to make your changes. You can save your changes with the menu :menuselection:`File --> Save .. File` or by hitting the :kbd:`Ctrl+S` shortcut." msgstr "" -#: ../../content/administration/odoo_sh/getting_started/online-editor.rst:78 +#: ../../content/administration/odoo_sh/getting_started/online-editor.rst:77 msgid "If you save a Python file which is under your Odoo server addons path, Odoo will detect it and reload automatically so your changes are reflected immediately, without having to restart the server manually." msgstr "" -#: ../../content/administration/odoo_sh/getting_started/online-editor.rst:85 +#: ../../content/administration/odoo_sh/getting_started/online-editor.rst:84 msgid "However, if the change is a data stored in database, such as the label of a field, or a view, you have to update the according module to apply the change. You can update the module of the currently opened file by using the menu :menuselection:`Odoo --> Update current module`. Note that the file considered as currently opened is the file focused in the text editor, not the file highlighted in the file browser." msgstr "" -#: ../../content/administration/odoo_sh/getting_started/online-editor.rst:94 +#: ../../content/administration/odoo_sh/getting_started/online-editor.rst:93 msgid "You can also open a terminal and execute the command:" msgstr "" -#: ../../content/administration/odoo_sh/getting_started/online-editor.rst:103 +#: ../../content/administration/odoo_sh/getting_started/online-editor.rst:102 msgid "Commit & Push your changes" msgstr "" -#: ../../content/administration/odoo_sh/getting_started/online-editor.rst:105 +#: ../../content/administration/odoo_sh/getting_started/online-editor.rst:104 msgid "You have the possibility to commit and push your changes to your Github repository." msgstr "" -#: ../../content/administration/odoo_sh/getting_started/online-editor.rst:107 +#: ../../content/administration/odoo_sh/getting_started/online-editor.rst:106 msgid "Open a terminal (:menuselection:`File --> New --> Terminal`)," msgstr "" -#: ../../content/administration/odoo_sh/getting_started/online-editor.rst:108 +#: ../../content/administration/odoo_sh/getting_started/online-editor.rst:107 msgid "Change the directory to *~/src/user* using :code:`cd ~/src/user`," msgstr "" -#: ../../content/administration/odoo_sh/getting_started/online-editor.rst:109 +#: ../../content/administration/odoo_sh/getting_started/online-editor.rst:108 msgid "Stage your changes using :code:`git add`," msgstr "" -#: ../../content/administration/odoo_sh/getting_started/online-editor.rst:110 +#: ../../content/administration/odoo_sh/getting_started/online-editor.rst:109 msgid "Commit your changes using :code:`git commit`," msgstr "" -#: ../../content/administration/odoo_sh/getting_started/online-editor.rst:111 +#: ../../content/administration/odoo_sh/getting_started/online-editor.rst:110 msgid "Push your changes using :code:`git push https HEAD:`." msgstr "" -#: ../../content/administration/odoo_sh/getting_started/online-editor.rst:113 +#: ../../content/administration/odoo_sh/getting_started/online-editor.rst:112 msgid "In this last command," msgstr "" -#: ../../content/administration/odoo_sh/getting_started/online-editor.rst:115 +#: ../../content/administration/odoo_sh/getting_started/online-editor.rst:114 msgid "*https* is the name of your *HTTPS* Github remote repository (e.g. https://github.com/username/repository.git)," msgstr "" -#: ../../content/administration/odoo_sh/getting_started/online-editor.rst:117 +#: ../../content/administration/odoo_sh/getting_started/online-editor.rst:116 msgid "HEAD is the reference to the latest revision you committed," msgstr "" -#: ../../content/administration/odoo_sh/getting_started/online-editor.rst:118 +#: ../../content/administration/odoo_sh/getting_started/online-editor.rst:117 msgid " must be replaced by the name of the branch to which you want to push the changes, most-likely the current branch if you work in a development build." msgstr "" -#: ../../content/administration/odoo_sh/getting_started/online-editor.rst:125 +#: ../../content/administration/odoo_sh/getting_started/online-editor.rst:124 msgid "The SSH Github remote is not used because your SSH private key is not hosted in your build containers (for obvious security concerns) nor forwarded through an SSH Agent (as you access this editor through a web browser) and you therefore cannot authenticate yourself to Github using SSH. You have to use the HTTPS remote of your Github repository to push your changes, which is added automatically named as *https* in your Git remotes. You will be prompted to enter your Github username and password. If you activated the two-factor authentication on Github, you can create a `personal access token `_ and use it as password. Granting the ``repo`` permission suffices." msgstr "" -#: ../../content/administration/odoo_sh/getting_started/online-editor.rst:139 +#: ../../content/administration/odoo_sh/getting_started/online-editor.rst:138 msgid "The Git source folder *~/src/user* is not checked out on a branch but rather on a detached revision: This is because builds work on specific revisions rather than branches. In other words, this means you can have multiple builds on the same branch, but on different revisions." msgstr "" -#: ../../content/administration/odoo_sh/getting_started/online-editor.rst:143 +#: ../../content/administration/odoo_sh/getting_started/online-editor.rst:142 msgid "Once your changes are pushed, according to your :ref:`branch push behavior `, a new build may be created. You can continue to work in the editor you pushed from, as it will have the same revision as the new build that was created, but always make sure to be in an editor of a build using the latest revision of your branch." msgstr "" -#: ../../content/administration/odoo_sh/getting_started/online-editor.rst:150 +#: ../../content/administration/odoo_sh/getting_started/online-editor.rst:149 msgid "Consoles" msgstr "" -#: ../../content/administration/odoo_sh/getting_started/online-editor.rst:152 +#: ../../content/administration/odoo_sh/getting_started/online-editor.rst:151 msgid "You can open Python consoles, which are `IPython interactive shells `_. One of the most interesting addition to use a Python console rather than a IPython shell within a terminal is the `rich display `_ capabilities. Thanks to this, you will be able to display objects in HTML." msgstr "" -#: ../../content/administration/odoo_sh/getting_started/online-editor.rst:160 +#: ../../content/administration/odoo_sh/getting_started/online-editor.rst:159 msgid "You can for instance display cells of a CSV file using `pandas `_." msgstr "" -#: ../../content/administration/odoo_sh/getting_started/online-editor.rst:166 +#: ../../content/administration/odoo_sh/getting_started/online-editor.rst:165 msgid "You can also open an Odoo Shell console to play around with the Odoo registry and model methods of your database. You can also directly read or write on your records." msgstr "" -#: ../../content/administration/odoo_sh/getting_started/online-editor.rst:171 +#: ../../content/administration/odoo_sh/getting_started/online-editor.rst:170 msgid "In an Odoo Console, transactions are automatically committed. This means, for instance, that changes in records are applied effectively in the database. If you change the name of a user, the name of the user is changed in your database as well. You therefore should use Odoo consoles carefully on production databases." msgstr "" -#: ../../content/administration/odoo_sh/getting_started/online-editor.rst:177 +#: ../../content/administration/odoo_sh/getting_started/online-editor.rst:176 msgid "You can use *env* to invoke models of your database registry, e.g. :code:`env['res.users']`." msgstr "" -#: ../../content/administration/odoo_sh/getting_started/online-editor.rst:187 +#: ../../content/administration/odoo_sh/getting_started/online-editor.rst:186 msgid "The class :code:`Pretty` gives you the possibility to easily display lists and dicts in a pretty way, using the `rich display `_ mentioned above." msgstr "" -#: ../../content/administration/odoo_sh/getting_started/online-editor.rst:195 +#: ../../content/administration/odoo_sh/getting_started/online-editor.rst:194 msgid "You can also use `pandas `_ to display graphs." msgstr "" @@ -5025,7 +5316,6 @@ msgid "|assistance-contact|" msgstr "" #: ../../content/administration/upgrade.rst:32 -#: ../../content/administration/upgrade/odoo_sh.rst:66 msgid ":ref:`upgrade/sla`" msgstr "" @@ -5584,89 +5874,133 @@ msgstr "" msgid "If you are using the Website or Studio app, we recommend you always do a test upgrade before upgrading your production instance." msgstr "" -#: ../../content/administration/upgrade/odoo_sh.rst:7 -#: ../../content/administration/upgrade/on_premise.rst:6 -msgid "Test upgrade request" +#: ../../content/administration/upgrade/odoo_sh.rst:10 +msgid "Odoo.sh is integrated with the upgrade platform to make the upgrade process easier." msgstr "" -#: ../../content/administration/upgrade/odoo_sh.rst:9 -msgid "Download a dump of your database (from the :ref:`Builds view `), choose the **exact copy** and **without filestore** options. Upload the .sql.gz dump on https://upgrade.odoo.com/upload and select the testing purpose. Once it's processed, you'll get a dump of the database in return." -msgstr "" - -#: ../../content/administration/upgrade/odoo_sh.rst:15 -msgid "To have the most up-to-date test version of your database, create a backup of your production database just before creating your request. Upload it in your staging branch, select **Exact dump** and **Without filestore**, and then click *start*." +#: ../../content/administration/upgrade/odoo_sh.rst:13 +msgid "The :guilabel:`Upgrade` tab is available in the branches view. It is only available for valid projects with a valid production build." msgstr "" #: ../../content/administration/upgrade/odoo_sh.rst:20 -msgid "Test your upgraded database" +msgid "The suggested upgrade steps on Odoo.sh are:" msgstr "" #: ../../content/administration/upgrade/odoo_sh.rst:22 -msgid "At the beginning of your upgrade project, make sure that you create a new staging branch for testing purposes by forking your main branch." +msgid "On a :guilabel:`Development` branch, upgrade your custom modules to keep them compatible with the new version and thoroughly **test them**." msgstr "" -#: ../../content/administration/upgrade/odoo_sh.rst:25 -msgid "Once the staging build is complete (it doesn't matter if it failed due to the version incompatibility), import your upgraded dump in the *Backups* tab of the branch." +#: ../../content/administration/upgrade/odoo_sh.rst:24 +msgid "Switch that branch to the :guilabel:`Staging` branch, **upgrade** the last daily production backup and **test it**. Write upgrade scripts if necessary." +msgstr "" + +#: ../../content/administration/upgrade/odoo_sh.rst:26 +msgid "Trigger the production upgrade from your :guilabel:`Production` branch and sit tight." msgstr "" #: ../../content/administration/upgrade/odoo_sh.rst:29 -msgid "The platform automatically detects the version of the dump and changes the version of Odoo's source code to the corresponding version of the build." +msgid ":doc:`../../administration/upgrade`" msgstr "" -#: ../../content/administration/upgrade/odoo_sh.rst:32 -msgid "Test the upgraded database and make sure everything runs as it's supposed to." +#: ../../content/administration/upgrade/odoo_sh.rst:30 +msgid ":doc:`Upgrade FAQ <../upgrade/faq>`" msgstr "" -#: ../../content/administration/upgrade/odoo_sh.rst:35 -#: ../../content/administration/upgrade/on_premise.rst:41 -msgid "Upgrade your production database" +#: ../../content/administration/upgrade/odoo_sh.rst:31 +msgid ":doc:`Introduction to Odoo.sh <../odoo_sh/overview/introduction>`" msgstr "" -#: ../../content/administration/upgrade/odoo_sh.rst:37 -msgid "Once you've tested everything and you're satisfied, start the process over to get an up-to-date upgraded dump:" +#: ../../content/administration/upgrade/odoo_sh.rst:36 +msgid "Upgrade your custom modules" msgstr "" -#: ../../content/administration/upgrade/odoo_sh.rst:40 -msgid "Make a new dump of your production database (as described in step 1)" -msgstr "" - -#: ../../content/administration/upgrade/odoo_sh.rst:41 -msgid "Upload it on upgrade.odoo.com and select the Production purpose" -msgstr "" - -#: ../../content/administration/upgrade/odoo_sh.rst:42 -msgid "Receive the newly upgraded dump and import it in your production branch. The build might get marked as failed because the platform will run it with the upgraded databases' Odoo version together with the old custom code." +#: ../../content/administration/upgrade/odoo_sh.rst:38 +msgid "The first step is to upgrade your custom modules to keep them compatible with the new version. Fork your :guilabel:`Production` branch in the :guilabel:`Development` stage, then go to the settings of your :guilabel:`Development` branch and select the Odoo version you target. If needed, modify your code to be compatible with the new version. Make sure to **test** your features are still working correctly." msgstr "" #: ../../content/administration/upgrade/odoo_sh.rst:45 -msgid "Merge or commit the upgraded custom code in the production branch" +msgid "Depending on your contract, the upgrade of your custom modules can be done by yourself, by your Partner or by Odoo (if you hold a subscription including maintenance of customizations)." msgstr "" -#: ../../content/administration/upgrade/odoo_sh.rst:47 -msgid "If anything goes wrong, remember you can restore a backup. The platform will always make one before you make any Odoo.sh operation on the production database. If the restored backup comes from a previous version, the platform will detect it and change the project's Odoo version back if it needs to." +#: ../../content/administration/upgrade/odoo_sh.rst:51 +msgid "Upgrade your database on a staging branch" msgstr "" #: ../../content/administration/upgrade/odoo_sh.rst:53 -#: ../../content/administration/upgrade/on_premise.rst:48 -msgid "Custom modules (if applicable)" +msgid "Take the upgraded development branch and drag & drop it to :guilabel:`Staging`." msgstr "" #: ../../content/administration/upgrade/odoo_sh.rst:55 -msgid "The upgrade of a database that contains custom modules is a 2 step process." +msgid "Go to the :guilabel:`Upgrade` tab and select the :guilabel:`target version`. Then, click on :guilabel:`Test Upgrade`." msgstr "" -#: ../../content/administration/upgrade/odoo_sh.rst:57 -#: ../../content/administration/upgrade/on_premise.rst:52 -msgid "The standard upgrade is done when your upgrade request is completed." +#: ../../content/administration/upgrade/odoo_sh.rst:62 +msgid "The **latest production daily automatic backup** is sent to the `upgrade platform `_ to start the upgrade test process." msgstr "" -#: ../../content/administration/upgrade/odoo_sh.rst:58 -#: ../../content/administration/upgrade/on_premise.rst:53 -msgid "Your custom modules also need to be upgraded to keep them compatible with the new version." +#: ../../content/administration/upgrade/odoo_sh.rst:66 +msgid "You can follow the upgrade process by going to the :guilabel:`Upgrade` menu of your :guilabel:`Production` branch." msgstr "" -#: ../../content/administration/upgrade/odoo_sh.rst:60 -msgid "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')" +#: ../../content/administration/upgrade/odoo_sh.rst:69 +msgid "When the upgraded backup is ready on the `upgrade platform `_, it is automatically downloaded back to your project." +msgstr "" + +#: ../../content/administration/upgrade/odoo_sh.rst:72 +msgid "The branch is now in a **special mode**: each time a **commit is pushed** on the branch, a **restore operation** of the upgraded backup occurs, and an **update of all the custom modules** happens. This allows you to quickly iterate on your custom modules upgrade scripts. The log file of the upgrade process can be found at :file:`~/logs/upgrade.log` in your newly upgraded staging build." +msgstr "" + +#: ../../content/administration/upgrade/odoo_sh.rst:78 +msgid "The **special upgrade mode** is automatically closed after 30 days." +msgstr "" + +#: ../../content/administration/upgrade/odoo_sh.rst:79 +#: ../../content/administration/upgrade/odoo_sh.rst:128 +msgid "It may happen that custom modules are no longer needed after an upgrade. Custom modules in the upgraded database are set to be updated. If the modules are missing in the code, the update fails, thus failing the whole process. An empty module with a manifest and possibly some custom upgrade script are necessary to clean up the database. The complete removal of the module has to be handled afterwards." +msgstr "" + +#: ../../content/administration/upgrade/odoo_sh.rst:86 +msgid "Functionally test your upgraded database" +msgstr "" + +#: ../../content/administration/upgrade/odoo_sh.rst:88 +msgid "Now that the test upgraded database is available on your staging branch, **thoroughly test it** and make sure everything runs as it's supposed to. Once you are satisfied with the result, you are ready to upgrade your production database." +msgstr "" + +#: ../../content/administration/upgrade/odoo_sh.rst:93 +msgid "Production upgrade" +msgstr "" + +#: ../../content/administration/upgrade/odoo_sh.rst:95 +msgid "Once you are happy with your testing, you can start the process on the :guilabel:`Production` branch." +msgstr "" + +#: ../../content/administration/upgrade/odoo_sh.rst:98 +msgid "On your :guilabel:`Production` branch, go to the :guilabel:`Upgrade` tab, select the :guilabel:`targeted version` and click on the :guilabel:`start Upgrade` button." +msgstr "" + +#: ../../content/administration/upgrade/odoo_sh.rst:105 +msgid "The actual process is **triggered as soon as you push a new commit** in your branch. Make sure you are pushing code that is compatible with the new version. For example by merging the code from your upgraded staging branch." +msgstr "" + +#: ../../content/administration/upgrade/odoo_sh.rst:110 +msgid "You can see the progress of the upgrade by going to the :guilabel:`Upgrade` tab of the main branch." +msgstr "" + +#: ../../content/administration/upgrade/odoo_sh.rst:118 +msgid "Your database is unavailable throughout the process." +msgstr "" + +#: ../../content/administration/upgrade/odoo_sh.rst:121 +msgid "If anything goes wrong, the platform automatically reverts the upgrade, the same as it would be for a regular update. In case of success, a backup is always made." +msgstr "" + +#: ../../content/administration/upgrade/odoo_sh.rst:124 +msgid "The update of your custom modules must be successful to complete the entire upgrade process. Make sure the status of your staging upgrade is :guilabel:`successful` before trying it in production." +msgstr "" + +#: ../../content/administration/upgrade/on_premise.rst:6 +msgid "Test upgrade request" msgstr "" #: ../../content/administration/upgrade/on_premise.rst:8 @@ -5713,14 +6047,30 @@ msgstr "" msgid "Any problem found during testing should be reported via the `helpdesk `_." msgstr "" +#: ../../content/administration/upgrade/on_premise.rst:41 +msgid "Upgrade your production database" +msgstr "" + #: ../../content/administration/upgrade/on_premise.rst:43 msgid "Once you have completed the testing successfully, you can proceed to upgrade your live database in production. Download your upgraded database from the link in the email and import it onto your live environment." msgstr "" +#: ../../content/administration/upgrade/on_premise.rst:48 +msgid "Custom modules (if applicable)" +msgstr "" + #: ../../content/administration/upgrade/on_premise.rst:50 msgid "The upgrade of a database that contains custom modules is a two-step process." msgstr "" +#: ../../content/administration/upgrade/on_premise.rst:52 +msgid "The standard upgrade is done when your upgrade request is completed." +msgstr "" + +#: ../../content/administration/upgrade/on_premise.rst:53 +msgid "Your custom modules also need to be upgraded to keep them compatible with the new version." +msgstr "" + #: ../../content/administration/upgrade/on_premise.rst:55 msgid "Depending on your contract, the upgrade of your custom modules can be done" msgstr "" diff --git a/locale/sources/contributing.pot b/locale/sources/contributing.pot index 90bb366af..9cd1a3bb6 100644 --- a/locale/sources/contributing.pot +++ b/locale/sources/contributing.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: Odoo 15.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-03-18 14:56+0000\n" +"POT-Creation-Date: 2022-07-22 09:36+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -16,95 +16,987 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: ../../content/contributing.rst:5 +#: ../../content/contributing.rst:7 msgid "Contributing" msgstr "" +#: ../../content/contributing.rst:9 +msgid "First, **thank you** for landing here and helping us improve Odoo!" +msgstr "" + +#: ../../content/contributing.rst:11 +msgid "This documentation section is intended as a guide to making contributions for first-timers and veterans." +msgstr "" + +#: ../../content/contributing.rst:14 +msgid "As an open-core project, Odoo accepts contributions from everyone, Odoo employees and members of the Odoo community alike, in all of its open-source `GitHub repositories `_." +msgstr "" + +#: ../../content/contributing/development.rst:6 +msgid "Development" +msgstr "" + +#: ../../content/contributing/development/coding_guidelines.rst:6 +msgid "Coding Guidelines" +msgstr "" + +#: ../../content/contributing/development/coding_guidelines.rst:8 +msgid "This page introduces the Odoo Coding Guidelines. Those aim to improve the quality of Odoo Apps code. Indeed proper code improves readability, eases maintenance, helps debugging, lowers complexity and promotes reliability. These guidelines should be applied to every new module and to all new development." +msgstr "" + +#: ../../content/contributing/development/coding_guidelines.rst:15 +msgid "When modifying existing files in **stable version** the original file style strictly supersedes any other style guidelines. In other words please never modify existing files in order to apply these guidelines. It avoids disrupting the revision history of code lines. Diff should be kept minimal. For more details, see our `pull request guide `_." +msgstr "" + +#: ../../content/contributing/development/coding_guidelines.rst:23 +msgid "When modifying existing files in **master (development) version** apply those guidelines to existing code only for modified code or if most of the file is under revision. In other words modify existing files structure only if it is going under major changes. In that case first do a **move** commit then apply the changes related to the feature." +msgstr "" + +#: ../../content/contributing/development/coding_guidelines.rst:30 +msgid "Module structure" +msgstr "" + +#: ../../content/contributing/development/coding_guidelines.rst:33 +msgid "Directories" +msgstr "" + +#: ../../content/contributing/development/coding_guidelines.rst:34 +msgid "A module is organized in important directories. Those contain the business logic; having a look at them should make you understand the purpose of the module." +msgstr "" + +#: ../../content/contributing/development/coding_guidelines.rst:37 +msgid "*data/* : demo and data xml" +msgstr "" + +#: ../../content/contributing/development/coding_guidelines.rst:38 +msgid "*models/* : models definition" +msgstr "" + +#: ../../content/contributing/development/coding_guidelines.rst:39 +msgid "*controllers/* : contains controllers (HTTP routes)" +msgstr "" + +#: ../../content/contributing/development/coding_guidelines.rst:40 +msgid "*views/* : contains the views and templates" +msgstr "" + +#: ../../content/contributing/development/coding_guidelines.rst:41 +msgid "*static/* : contains the web assets, separated into *css/, js/, img/, lib/, ...*" +msgstr "" + +#: ../../content/contributing/development/coding_guidelines.rst:43 +msgid "Other optional directories compose the module." +msgstr "" + +#: ../../content/contributing/development/coding_guidelines.rst:45 +msgid "*wizard/* : regroups the transient models (``models.TransientModel``) and their views" +msgstr "" + +#: ../../content/contributing/development/coding_guidelines.rst:46 +msgid "*report/* : contains the printable reports and models based on SQL views. Python objects and XML views are included in this directory" +msgstr "" + +#: ../../content/contributing/development/coding_guidelines.rst:47 +msgid "*tests/* : contains the Python tests" +msgstr "" + +#: ../../content/contributing/development/coding_guidelines.rst:51 +msgid "File naming" +msgstr "" + +#: ../../content/contributing/development/coding_guidelines.rst:53 +msgid "File naming is important to quickly find information through all odoo addons. This section explains how to name files in a standard odoo module. As an example we use a `plant nursery `_ application. It holds two main models *plant.nursery* and *plant.order*." +msgstr "" + +#: ../../content/contributing/development/coding_guidelines.rst:58 +msgid "Concerning *models*, split the business logic by sets of models belonging to a same main model. Each set lies in a given file named based on its main model. If there is only one model, its name is the same as the module name. Each inherited model should be in its own file to help understanding of impacted models." +msgstr "" + +#: ../../content/contributing/development/coding_guidelines.rst:72 +msgid "Concerning *security*, three main files should be used:" +msgstr "" + +#: ../../content/contributing/development/coding_guidelines.rst:74 +msgid "First one is the definition of access rights done in a :file:`ir.model.access.csv` file." +msgstr "" + +#: ../../content/contributing/development/coding_guidelines.rst:75 +msgid "User groups are defined in :file:`_groups.xml`." +msgstr "" + +#: ../../content/contributing/development/coding_guidelines.rst:76 +msgid "Record rules are defined in :file:`_security.xml`." +msgstr "" + +#: ../../content/contributing/development/coding_guidelines.rst:87 +msgid "Concerning *views*, backend views should be split like models and suffixed by ``_views.xml``. Backend views are list, form, kanban, activity, graph, pivot, .. views. To ease split by model in views main menus not linked to specific actions may be extracted into an optional ``_menus.xml`` file. Templates (QWeb pages used notably for portal / website display) and bundles (import of JS and CSS assets) are put in separate files. Those are respectively ``_templates.xml`` and ``assets.xml`` files." +msgstr "" + +#: ../../content/contributing/development/coding_guidelines.rst:107 +msgid "Concerning *data*, split them by purpose (demo or data) and main model. Filenames will be the main_model name suffixed by ``_demo.xml`` or ``_data.xml``. For instance for an application having demo and data for its main model as well as subtypes, activities and mail templates all related to mail module:" +msgstr "" + +#: ../../content/contributing/development/coding_guidelines.rst:120 +msgid "Concerning *controllers*, generally all controllers belong to a single controller contained in a file named ``.py``. An old convention in Odoo is to name this file ``main.py`` but it is considered as outdated. If you need to inherit an existing controller from another module do it in ``.py``. For example adding portal controller in an application is done in ``portal.py``." +msgstr "" + +#: ../../content/contributing/development/coding_guidelines.rst:134 +msgid "Concerning *static files*, Javascript files follow globally the same logic as python models. Each component should be in its own file with a meaningful name. For instance, the activity widgets are located in ``activity.js`` of mail module. Subdirectories can also be created to structure the 'package' (see web module for more details). The same logic should be applied for the templates of JS widgets (static XML files) and for their styles (scss files). Don't link data (image, libraries) outside Odoo: do not use an URL to an image but copy it in the codebase instead." +msgstr "" + +#: ../../content/contributing/development/coding_guidelines.rst:143 +msgid "Concerning *wizards*, naming convention is the same of for python models: ``.py`` and ``_views.xml``. Both are put in the wizard directory. This naming comes from old odoo applications using the wizard keyword for transient models." +msgstr "" + +#: ../../content/contributing/development/coding_guidelines.rst:155 +msgid "Concerning *statistics reports* done with python / SQL views and classic views naming is the following :" +msgstr "" + +#: ../../content/contributing/development/coding_guidelines.rst:165 +msgid "Concerning *printable reports* which contain mainly data preparation and Qweb templates naming is the following :" +msgstr "" + +#: ../../content/contributing/development/coding_guidelines.rst:175 +msgid "The complete tree of our Odoo module therefore looks like" +msgstr "" + +#: ../../content/contributing/development/coding_guidelines.rst:234 +msgid "File names should only contain ``[a-z0-9_]`` (lowercase alphanumerics and ``_``)" +msgstr "" + +#: ../../content/contributing/development/coding_guidelines.rst:237 +msgid "Use correct file permissions : folder 755 and file 644." +msgstr "" + +#: ../../content/contributing/development/coding_guidelines.rst:242 +msgid "XML files" +msgstr "" + +#: ../../content/contributing/development/coding_guidelines.rst:245 +msgid "Format" +msgstr "" + +#: ../../content/contributing/development/coding_guidelines.rst:246 +msgid "To declare a record in XML, the **record** notation (using **) is recommended:" +msgstr "" + +#: ../../content/contributing/development/coding_guidelines.rst:248 +msgid "Place ``id`` attribute before ``model``" +msgstr "" + +#: ../../content/contributing/development/coding_guidelines.rst:249 +msgid "For field declaration, ``name`` attribute is first. Then place the *value* either in the ``field`` tag, either in the ``eval`` attribute, and finally other attributes (widget, options, ...) ordered by importance." +msgstr "" + +#: ../../content/contributing/development/coding_guidelines.rst:254 +msgid "Try to group the record by model. In case of dependencies between action/menu/views, this convention may not be applicable." +msgstr "" + +#: ../../content/contributing/development/coding_guidelines.rst:256 +msgid "Use naming convention defined at the next point" +msgstr "" + +#: ../../content/contributing/development/coding_guidelines.rst:257 +msgid "The tag ** is only used to set not-updatable data with ``noupdate=1``. If there is only not-updatable data in the file, the ``noupdate=1`` can be set on the ```` tag and do not set a ```` tag." +msgstr "" + +#: ../../content/contributing/development/coding_guidelines.rst:275 +msgid "Odoo supports custom tags acting as syntactic sugar:" +msgstr "" + +#: ../../content/contributing/development/coding_guidelines.rst:277 +msgid "menuitem: use it as a shortcut to declare a ``ir.ui.menu``" +msgstr "" + +#: ../../content/contributing/development/coding_guidelines.rst:278 +msgid "template: use it to declare a QWeb View requiring only the ``arch`` section of the view." +msgstr "" + +#: ../../content/contributing/development/coding_guidelines.rst:279 +msgid "report: use to declare a :ref:`report action `" +msgstr "" + +#: ../../content/contributing/development/coding_guidelines.rst:280 +msgid "act_window: use it if the record notation can't do what you want" +msgstr "" + +#: ../../content/contributing/development/coding_guidelines.rst:282 +msgid "The 4 first tags are preferred over the *record* notation." +msgstr "" + +#: ../../content/contributing/development/coding_guidelines.rst:286 +msgid "XML IDs and naming" +msgstr "" + +#: ../../content/contributing/development/coding_guidelines.rst:289 +msgid "Security, View and Action" +msgstr "" + +#: ../../content/contributing/development/coding_guidelines.rst:291 +msgid "Use the following pattern :" +msgstr "" + +#: ../../content/contributing/development/coding_guidelines.rst:293 +msgid "For a menu: :samp:`{}_menu`, or :samp:`{}_menu_{do_stuff}` for submenus." +msgstr "" + +#: ../../content/contributing/development/coding_guidelines.rst:294 +msgid "For a view: :samp:`{}_view_{}`, where *view_type* is ``kanban``, ``form``, ``tree``, ``search``, ..." +msgstr "" + +#: ../../content/contributing/development/coding_guidelines.rst:296 +msgid "For an action: the main action respects :samp:`{}_action`. Others are suffixed with :samp:`_{}`, where *detail* is a lowercase string briefly explaining the action. This is used only if multiple actions are declared for the model." +msgstr "" + +#: ../../content/contributing/development/coding_guidelines.rst:300 +msgid "For window actions: suffix the action name by the specific view information like :samp:`{}_action_view_{}`." +msgstr "" + +#: ../../content/contributing/development/coding_guidelines.rst:302 +msgid "For a group: :samp:`{}_group_{}` where *group_name* is the name of the group, generally 'user', 'manager', ..." +msgstr "" + +#: ../../content/contributing/development/coding_guidelines.rst:304 +msgid "For a rule: :samp:`{}_rule_{}` where *concerned_group* is the short name of the concerned group ('user' for the 'model_name_group_user', 'public' for public user, 'company' for multi-company rules, ...)." +msgstr "" + +#: ../../content/contributing/development/coding_guidelines.rst:309 +msgid "Name should be identical to xml id with dots replacing underscores. Actions should have a real naming as it is used as display name." +msgstr "" + +#: ../../content/contributing/development/coding_guidelines.rst:363 +msgid "Inheriting XML" +msgstr "" + +#: ../../content/contributing/development/coding_guidelines.rst:365 +msgid "Xml Ids of inheriting views should use the same ID as the original record. It helps finding all inheritance at a glance. As final Xml Ids are prefixed by the module that creates them there is no overlap." +msgstr "" + +#: ../../content/contributing/development/coding_guidelines.rst:369 +msgid "Naming should contain an ``.inherit.{details}`` suffix to ease understanding the override purpose when looking at its name." +msgstr "" + +#: ../../content/contributing/development/coding_guidelines.rst:380 +msgid "New primary views do not require the inherit suffix as those are new records based upon the first one." +msgstr "" + +#: ../../content/contributing/development/coding_guidelines.rst:395 +#: ../../content/contributing/documentation.rst:204 +#: ../../content/contributing/documentation/rst_cheat_sheet.rst:861 +#: ../../content/contributing/documentation/rst_cheat_sheet.rst:863 +#: ../../content/contributing/documentation/rst_cheat_sheet.rst:879 +msgid "Python" +msgstr "" + +#: ../../content/contributing/development/coding_guidelines.rst:399 +msgid "Do not forget to read the :ref:`Security Pitfalls ` section as well to write secure code." +msgstr "" + +#: ../../content/contributing/development/coding_guidelines.rst:403 +msgid "PEP8 options" +msgstr "" + +#: ../../content/contributing/development/coding_guidelines.rst:405 +msgid "Using a linter can help show syntax and semantic warnings or errors. Odoo source code tries to respect Python standard, but some of them can be ignored." +msgstr "" + +#: ../../content/contributing/development/coding_guidelines.rst:408 +msgid "E501: line too long" +msgstr "" + +#: ../../content/contributing/development/coding_guidelines.rst:409 +msgid "E301: expected 1 blank line, found 0" +msgstr "" + +#: ../../content/contributing/development/coding_guidelines.rst:410 +msgid "E302: expected 2 blank lines, found 1" +msgstr "" + +#: ../../content/contributing/development/coding_guidelines.rst:413 +msgid "Imports" +msgstr "" + +#: ../../content/contributing/development/coding_guidelines.rst:414 +msgid "The imports are ordered as" +msgstr "" + +#: ../../content/contributing/development/coding_guidelines.rst:416 +msgid "External libraries (one per line sorted and split in python stdlib)" +msgstr "" + +#: ../../content/contributing/development/coding_guidelines.rst:417 +msgid "Imports of ``odoo``" +msgstr "" + +#: ../../content/contributing/development/coding_guidelines.rst:418 +msgid "Imports from Odoo modules (rarely, and only if necessary)" +msgstr "" + +#: ../../content/contributing/development/coding_guidelines.rst:420 +msgid "Inside these 3 groups, the imported lines are alphabetically sorted." +msgstr "" + +#: ../../content/contributing/development/coding_guidelines.rst:438 +msgid "Idiomatics of Programming (Python)" +msgstr "" + +#: ../../content/contributing/development/coding_guidelines.rst:440 +msgid "Always favor *readability* over *conciseness* or using the language features or idioms." +msgstr "" + +#: ../../content/contributing/development/coding_guidelines.rst:441 +msgid "Don't use ``.clone()``" +msgstr "" + +#: ../../content/contributing/development/coding_guidelines.rst:452 +msgid "Python dictionary : creation and update" +msgstr "" + +#: ../../content/contributing/development/coding_guidelines.rst:477 +msgid "Use meaningful variable/class/method names" +msgstr "" + +#: ../../content/contributing/development/coding_guidelines.rst:478 +msgid "Useless variable : Temporary variables can make the code clearer by giving names to objects, but that doesn't mean you should create temporary variables all the time:" +msgstr "" + +#: ../../content/contributing/development/coding_guidelines.rst:490 +msgid "Multiple return points are OK, when they're simpler" +msgstr "" + +#: ../../content/contributing/development/coding_guidelines.rst:510 +msgid "Know your builtins : You should at least have a basic understanding of all the Python builtins (http://docs.python.org/library/functions.html)" +msgstr "" + +#: ../../content/contributing/development/coding_guidelines.rst:518 +msgid "Also, ``if 'key' in my_dict`` and ``if my_dict.get('key')`` have very different meaning, be sure that you're using the right one." +msgstr "" + +#: ../../content/contributing/development/coding_guidelines.rst:521 +msgid "Learn list comprehensions : Use list comprehension, dict comprehension, and basic manipulation using ``map``, ``filter``, ``sum``, ... They make the code easier to read." +msgstr "" + +#: ../../content/contributing/development/coding_guidelines.rst:534 +msgid "Collections are booleans too : In python, many objects have \"boolean-ish\" value when evaluated in a boolean context (such as an if). Among these are collections (lists, dicts, sets, ...) which are \"falsy\" when empty and \"truthy\" when containing items:" +msgstr "" + +#: ../../content/contributing/development/coding_guidelines.rst:545 +msgid "So, you can write ``if some_collection:`` instead of ``if len(some_collection):``." +msgstr "" + +#: ../../content/contributing/development/coding_guidelines.rst:548 +msgid "Iterate on iterables" +msgstr "" + +#: ../../content/contributing/development/coding_guidelines.rst:562 +msgid "Use dict.setdefault" +msgstr "" + +#: ../../content/contributing/development/coding_guidelines.rst:578 +msgid "As a good developer, document your code (docstring on methods, simple comments for tricky part of code)" +msgstr "" + +#: ../../content/contributing/development/coding_guidelines.rst:580 +msgid "In additions to these guidelines, you may also find the following link interesting: http://python.net/~goodger/projects/pycon/2007/idiomatic/handout.html (a little bit outdated, but quite relevant)" +msgstr "" + +#: ../../content/contributing/development/coding_guidelines.rst:585 +msgid "Programming in Odoo" +msgstr "" + +#: ../../content/contributing/development/coding_guidelines.rst:587 +msgid "Avoid to create generators and decorators: only use the ones provided by the Odoo API." +msgstr "" + +#: ../../content/contributing/development/coding_guidelines.rst:589 +msgid "As in python, use ``filtered``, ``mapped``, ``sorted``, ... methods to ease code reading and performance." +msgstr "" + +#: ../../content/contributing/development/coding_guidelines.rst:594 +msgid "Make your method work in batch" +msgstr "" + +#: ../../content/contributing/development/coding_guidelines.rst:595 +msgid "When adding a function, make sure it can process multiple records by iterating on self to treat each record." +msgstr "" + +#: ../../content/contributing/development/coding_guidelines.rst:604 +msgid "For performance issue, when developing a 'stat button' (for instance), do not perform a ``search`` or a ``search_count`` in a loop. It is recommended to use ``read_group`` method, to compute all value in only one request." +msgstr "" + +#: ../../content/contributing/development/coding_guidelines.rst:619 +msgid "Propagate the context" +msgstr "" + +#: ../../content/contributing/development/coding_guidelines.rst:620 +msgid "The context is a ``frozendict`` that cannot be modified. To call a method with a different context, the ``with_context`` method should be used :" +msgstr "" + +#: ../../content/contributing/development/coding_guidelines.rst:629 +msgid "Passing parameter in context can have dangerous side-effects." +msgstr "" + +#: ../../content/contributing/development/coding_guidelines.rst:631 +msgid "Since the values are propagated automatically, some unexpected behavior may appear. Calling ``create()`` method of a model with *default_my_field* key in context will set the default value of *my_field* for the concerned model. But if during this creation, other objects (such as sale.order.line, on sale.order creation) having a field name *my_field* are created, their default value will be set too." +msgstr "" + +#: ../../content/contributing/development/coding_guidelines.rst:637 +msgid "If you need to create a key context influencing the behavior of some object, choice a good name, and eventually prefix it by the name of the module to isolate its impact. A good example are the keys of ``mail`` module : *mail_create_nosubscribe*, *mail_notrack*, *mail_notify_user_signature*, ..." +msgstr "" + +#: ../../content/contributing/development/coding_guidelines.rst:644 +msgid "Think extendable" +msgstr "" + +#: ../../content/contributing/development/coding_guidelines.rst:646 +msgid "Functions and methods should not contain too much logic: having a lot of small and simple methods is more advisable than having few large and complex methods. A good rule of thumb is to split a method as soon as it has more than one responsibility (see http://en.wikipedia.org/wiki/Single_responsibility_principle)." +msgstr "" + +#: ../../content/contributing/development/coding_guidelines.rst:651 +msgid "Hardcoding a business logic in a method should be avoided as it prevents to be easily extended by a submodule." +msgstr "" + +#: ../../content/contributing/development/coding_guidelines.rst:677 +msgid "The above code is over extendable for the sake of example but the readability must be taken into account and a tradeoff must be made." +msgstr "" + +#: ../../content/contributing/development/coding_guidelines.rst:680 +msgid "Also, name your functions accordingly: small and properly named functions are the starting point of readable/maintainable code and tighter documentation." +msgstr "" + +#: ../../content/contributing/development/coding_guidelines.rst:683 +msgid "This recommendation is also relevant for classes, files, modules and packages. (See also http://en.wikipedia.org/wiki/Cyclomatic_complexity)" +msgstr "" + +#: ../../content/contributing/development/coding_guidelines.rst:688 +msgid "Never commit the transaction" +msgstr "" + +#: ../../content/contributing/development/coding_guidelines.rst:689 +msgid "The Odoo framework is in charge of providing the transactional context for all RPC calls. The principle is that a new database cursor is opened at the beginning of each RPC call, and committed when the call has returned, just before transmitting the answer to the RPC client, approximately like this:" +msgstr "" + +#: ../../content/contributing/development/coding_guidelines.rst:710 +msgid "If any error occurs during the execution of the RPC call, the transaction is rolled back atomically, preserving the state of the system." +msgstr "" + +#: ../../content/contributing/development/coding_guidelines.rst:713 +msgid "Similarly, the system also provides a dedicated transaction during the execution of tests suites, so it can be rolled back or not depending on the server startup options." +msgstr "" + +#: ../../content/contributing/development/coding_guidelines.rst:717 +msgid "The consequence is that if you manually call ``cr.commit()`` anywhere there is a very high chance that you will break the system in various ways, because you will cause partial commits, and thus partial and unclean rollbacks, causing among others:" +msgstr "" + +#: ../../content/contributing/development/coding_guidelines.rst:722 +msgid "inconsistent business data, usually data loss" +msgstr "" + +#: ../../content/contributing/development/coding_guidelines.rst:723 +msgid "workflow desynchronization, documents stuck permanently" +msgstr "" + +#: ../../content/contributing/development/coding_guidelines.rst:724 +msgid "tests that can't be rolled back cleanly, and will start polluting the database, and triggering error (this is true even if no error occurs during the transaction)" +msgstr "" + +#: ../../content/contributing/development/coding_guidelines.rst:735 +msgid "Here is the very simple rule:" +msgstr "" + +#: ../../content/contributing/development/coding_guidelines.rst:729 +msgid "You should **NEVER** call ``cr.commit()`` yourself, **UNLESS** you have created your own database cursor explicitly! And the situations where you need to do that are exceptional!" +msgstr "" + +#: ../../content/contributing/development/coding_guidelines.rst:733 +msgid "And by the way if you did create your own cursor, then you need to handle error cases and proper rollback, as well as properly close the cursor when you're done with it." +msgstr "" + +#: ../../content/contributing/development/coding_guidelines.rst:737 +msgid "And contrary to popular belief, you do not even need to call ``cr.commit()`` in the following situations: - in the ``_auto_init()`` method of an *models.Model* object: this is taken care of by the addons initialization method, or by the ORM transaction when creating custom models - in reports: the ``commit()`` is handled by the framework too, so you can update the database even from within a report - within *models.Transient* methods: these methods are called exactly like regular *models.Model* ones, within a transaction and with the corresponding ``cr.commit()/rollback()`` at the end - etc. (see general rule above if you have in doubt!)" +msgstr "" + +#: ../../content/contributing/development/coding_guidelines.rst:749 +msgid "All ``cr.commit()`` calls outside of the server framework from now on must have an **explicit comment** explaining why they are absolutely necessary, why they are indeed correct, and why they do not break the transactions. Otherwise they can and will be removed !" +msgstr "" + +#: ../../content/contributing/development/coding_guidelines.rst:756 +msgid "Use translation method correctly" +msgstr "" + +#: ../../content/contributing/development/coding_guidelines.rst:758 +msgid "Odoo uses a GetText-like method named \"underscore\" ``_( )`` to indicate that a static string used in the code needs to be translated at runtime using the language of the context. This pseudo-method is accessed within your code by importing as follows:" +msgstr "" + +#: ../../content/contributing/development/coding_guidelines.rst:767 +msgid "A few very important rules must be followed when using it, in order for it to work and to avoid filling the translations with useless junk." +msgstr "" + +#: ../../content/contributing/development/coding_guidelines.rst:770 +msgid "Basically, this method should only be used for static strings written manually in the code, it will not work to translate field values, such as Product names, etc. This must be done instead using the translate flag on the corresponding field." +msgstr "" + +#: ../../content/contributing/development/coding_guidelines.rst:775 +msgid "The method accepts optional positional or named parameter The rule is very simple: calls to the underscore method should always be in the form ``_('literal string')`` and nothing else:" +msgstr "" + +#: ../../content/contributing/development/coding_guidelines.rst:818 +msgid "Also, keep in mind that translators will have to work with the literal values that are passed to the underscore function, so please try to make them easy to understand and keep spurious characters and formatting to a minimum. Translators must be aware that formatting patterns such as ``%s`` or ``%d``, newlines, etc. need to be preserved, but it's important to use these in a sensible and obvious manner:" +msgstr "" + +#: ../../content/contributing/development/coding_guidelines.rst:838 +msgid "In general in Odoo, when manipulating strings, prefer ``%`` over ``.format()`` (when only one variable to replace in a string), and prefer ``%(varname)`` instead of position (when multiple variables have to be replaced). This makes the translation easier for the community translators." +msgstr "" + +#: ../../content/contributing/development/coding_guidelines.rst:845 +msgid "Symbols and Conventions" +msgstr "" + +#: ../../content/contributing/development/coding_guidelines.rst:855 +msgid "Model name (using the dot notation, prefix by the module name) :" +msgstr "" + +#: ../../content/contributing/development/coding_guidelines.rst:848 +msgid "When defining an Odoo Model : use singular form of the name (*res.partner* and *sale.order* instead of *res.partnerS* and *saleS.orderS*)" +msgstr "" + +#: ../../content/contributing/development/coding_guidelines.rst:850 +msgid "When defining an Odoo Transient (wizard) : use ``.`` where *related_base_model* is the base model (defined in *models/*) related to the transient, and *action* is the short name of what the transient do. Avoid the *wizard* word. For instance : ``account.invoice.make``, ``project.task.delegate.batch``, ..." +msgstr "" + +#: ../../content/contributing/development/coding_guidelines.rst:854 +msgid "When defining *report* model (SQL views e.i.) : use ``.report.``, based on the Transient convention." +msgstr "" + +#: ../../content/contributing/development/coding_guidelines.rst:857 +msgid "Odoo Python Class : use camelcase (Object-oriented style)." +msgstr "" + +#: ../../content/contributing/development/coding_guidelines.rst:868 +msgid "Variable name :" +msgstr "" + +#: ../../content/contributing/development/coding_guidelines.rst:866 +msgid "use camelcase for model variable" +msgstr "" + +#: ../../content/contributing/development/coding_guidelines.rst:867 +msgid "use underscore lowercase notation for common variable." +msgstr "" + +#: ../../content/contributing/development/coding_guidelines.rst:868 +msgid "suffix your variable name with *_id* or *_ids* if it contains a record id or list of id. Don't use ``partner_id`` to contain a record of res.partner" +msgstr "" + +#: ../../content/contributing/development/coding_guidelines.rst:876 +msgid "``One2Many`` and ``Many2Many`` fields should always have *_ids* as suffix (example: sale_order_line_ids)" +msgstr "" + +#: ../../content/contributing/development/coding_guidelines.rst:877 +msgid "``Many2One`` fields should have *_id* as suffix (example : partner_id, user_id, ...)" +msgstr "" + +#: ../../content/contributing/development/coding_guidelines.rst:887 +msgid "Method conventions" +msgstr "" + +#: ../../content/contributing/development/coding_guidelines.rst:879 +msgid "Compute Field : the compute method pattern is *_compute_*" +msgstr "" + +#: ../../content/contributing/development/coding_guidelines.rst:880 +msgid "Search method : the search method pattern is *_search_*" +msgstr "" + +#: ../../content/contributing/development/coding_guidelines.rst:881 +msgid "Default method : the default method pattern is *_default_*" +msgstr "" + +#: ../../content/contributing/development/coding_guidelines.rst:882 +msgid "Selection method: the selection method pattern is *_selection_*" +msgstr "" + +#: ../../content/contributing/development/coding_guidelines.rst:883 +msgid "Onchange method : the onchange method pattern is *_onchange_*" +msgstr "" + +#: ../../content/contributing/development/coding_guidelines.rst:884 +msgid "Constraint method : the constraint method pattern is *_check_*" +msgstr "" + +#: ../../content/contributing/development/coding_guidelines.rst:885 +msgid "Action method : an object action method is prefix with *action_*. Since it uses only one record, add ``self.ensure_one()`` at the beginning of the method." +msgstr "" + +#: ../../content/contributing/development/coding_guidelines.rst:898 +msgid "In a Model attribute order should be" +msgstr "" + +#: ../../content/contributing/development/coding_guidelines.rst:890 +msgid "Private attributes (``_name``, ``_description``, ``_inherit``, ...)" +msgstr "" + +#: ../../content/contributing/development/coding_guidelines.rst:891 +msgid "Default method and ``_default_get``" +msgstr "" + +#: ../../content/contributing/development/coding_guidelines.rst:892 +msgid "Field declarations" +msgstr "" + +#: ../../content/contributing/development/coding_guidelines.rst:893 +msgid "Compute, inverse and search methods in the same order as field declaration" +msgstr "" + +#: ../../content/contributing/development/coding_guidelines.rst:894 +msgid "Selection method (methods used to return computed values for selection fields)" +msgstr "" + +#: ../../content/contributing/development/coding_guidelines.rst:895 +msgid "Constrains methods (``@api.constrains``) and onchange methods (``@api.onchange``)" +msgstr "" + +#: ../../content/contributing/development/coding_guidelines.rst:896 +msgid "CRUD methods (ORM overrides)" +msgstr "" + +#: ../../content/contributing/development/coding_guidelines.rst:897 +msgid "Action methods" +msgstr "" + +#: ../../content/contributing/development/coding_guidelines.rst:898 +msgid "And finally, other business methods." +msgstr "" + +#: ../../content/contributing/development/coding_guidelines.rst:954 +msgid "Javascript and CSS" +msgstr "" + +#: ../../content/contributing/development/coding_guidelines.rst:957 +msgid "Static files organization" +msgstr "" + +#: ../../content/contributing/development/coding_guidelines.rst:959 +msgid "Odoo addons have some conventions on how to structure various files. We explain here in more details how web assets are supposed to be organized." +msgstr "" + +#: ../../content/contributing/development/coding_guidelines.rst:962 +msgid "The first thing to know is that the Odoo server will serve (statically) all files located in a *static/* folder, but prefixed with the addon name. So, for example, if a file is located in *addons/web/static/src/js/some_file.js*, then it will be statically available at the url *your-odoo-server.com/web/static/src/js/some_file.js*" +msgstr "" + +#: ../../content/contributing/development/coding_guidelines.rst:967 +msgid "The convention is to organize the code according to the following structure:" +msgstr "" + +#: ../../content/contributing/development/coding_guidelines.rst:969 +msgid "*static*: all static files in general" +msgstr "" + +#: ../../content/contributing/development/coding_guidelines.rst:971 +msgid "*static/lib*: this is the place where js libs should be located, in a sub folder. So, for example, all files from the *jquery* library are in *addons/web/static/lib/jquery*" +msgstr "" + +#: ../../content/contributing/development/coding_guidelines.rst:973 +msgid "*static/src*: the generic static source code folder" +msgstr "" + +#: ../../content/contributing/development/coding_guidelines.rst:975 +msgid "*static/src/css*: all css files" +msgstr "" + +#: ../../content/contributing/development/coding_guidelines.rst:976 +msgid "*static/fonts*" +msgstr "" + +#: ../../content/contributing/development/coding_guidelines.rst:977 +msgid "*static/img*" +msgstr "" + +#: ../../content/contributing/development/coding_guidelines.rst:978 +msgid "*static/src/js*" +msgstr "" + +#: ../../content/contributing/development/coding_guidelines.rst:980 +msgid "*static/src/js/tours*: end user tour files (tutorials, not tests)" +msgstr "" + +#: ../../content/contributing/development/coding_guidelines.rst:982 +msgid "*static/src/scss*: scss files" +msgstr "" + +#: ../../content/contributing/development/coding_guidelines.rst:983 +msgid "*static/src/xml*: all qweb templates that will be rendered in JS" +msgstr "" + +#: ../../content/contributing/development/coding_guidelines.rst:985 +msgid "*static/tests*: this is where we put all test related files." +msgstr "" + +#: ../../content/contributing/development/coding_guidelines.rst:987 +msgid "*static/tests/tours*: this is where we put all tour test files (not tutorials)." +msgstr "" + +#: ../../content/contributing/development/coding_guidelines.rst:990 +msgid "Javascript coding guidelines" +msgstr "" + +#: ../../content/contributing/development/coding_guidelines.rst:992 +msgid "``use strict;`` is recommended for all javascript files" +msgstr "" + +#: ../../content/contributing/development/coding_guidelines.rst:993 +msgid "Use a linter (jshint, ...)" +msgstr "" + +#: ../../content/contributing/development/coding_guidelines.rst:994 +msgid "Never add minified Javascript Libraries" +msgstr "" + +#: ../../content/contributing/development/coding_guidelines.rst:995 +msgid "Use camelcase for class declaration" +msgstr "" + +#: ../../content/contributing/development/coding_guidelines.rst:997 +msgid "More precise JS guidelines are detailed in the `github wiki `_. You may also have a look at existing API in Javascript by looking Javascript References." +msgstr "" + +#: ../../content/contributing/development/coding_guidelines.rst:1002 +msgid "CSS coding guidelines" +msgstr "" + +#: ../../content/contributing/development/coding_guidelines.rst:1004 +msgid "Prefix all your classes with *o_* where *module_name* is the technical name of the module ('sale', 'im_chat', ...) or the main route reserved by the module (for website module mainly, i.e. : 'o_forum' for *website_forum* module). The only exception for this rule is the webclient: it simply uses *o_* prefix." +msgstr "" + +#: ../../content/contributing/development/coding_guidelines.rst:1009 +msgid "Avoid using *id* tag" +msgstr "" + +#: ../../content/contributing/development/coding_guidelines.rst:1010 +msgid "Use Bootstrap native classes" +msgstr "" + +#: ../../content/contributing/development/coding_guidelines.rst:1011 +msgid "Use underscore lowercase notation to name class" +msgstr "" + +#: ../../content/contributing/development/coding_guidelines.rst:1016 +msgid "Git" +msgstr "" + +#: ../../content/contributing/development/coding_guidelines.rst:1019 +msgid "Configure your git" +msgstr "" + +#: ../../content/contributing/development/coding_guidelines.rst:1021 +msgid "Based on ancestral experience and oral tradition, the following things go a long way towards making your commits more helpful:" +msgstr "" + +#: ../../content/contributing/development/coding_guidelines.rst:1024 +msgid "Be sure to define both the user.email and user.name in your local git config" +msgstr "" + +#: ../../content/contributing/development/coding_guidelines.rst:1030 +msgid "Be sure to add your full name to your Github profile here. Please feel fancy and add your team, avatar, your favorite quote, and whatnot ;-)" +msgstr "" + +#: ../../content/contributing/development/coding_guidelines.rst:1034 +msgid "Commit message structure" +msgstr "" + +#: ../../content/contributing/development/coding_guidelines.rst:1036 +msgid "Commit message has four parts: tag, module, short description and full description. Try to follow the preferred structure for your commit messages" +msgstr "" + +#: ../../content/contributing/development/coding_guidelines.rst:1059 +msgid "Tag and module name" +msgstr "" + +#: ../../content/contributing/development/coding_guidelines.rst:1061 +msgid "Tags are used to prefix your commit. They should be one of the following" +msgstr "" + +#: ../../content/contributing/development/coding_guidelines.rst:1063 +msgid "**[FIX]** for bug fixes: mostly used in stable version but also valid if you are fixing a recent bug in development version;" +msgstr "" + +#: ../../content/contributing/development/coding_guidelines.rst:1065 +msgid "**[REF]** for refactoring: when a feature is heavily rewritten;" +msgstr "" + +#: ../../content/contributing/development/coding_guidelines.rst:1066 +msgid "**[ADD]** for adding new modules;" +msgstr "" + +#: ../../content/contributing/development/coding_guidelines.rst:1067 +msgid "**[REM]** for removing resources: removing dead code, removing views, removing modules, ...;" +msgstr "" + +#: ../../content/contributing/development/coding_guidelines.rst:1069 +msgid "**[REV]** for reverting commits: if a commit causes issues or is not wanted reverting it is done using this tag;" +msgstr "" + +#: ../../content/contributing/development/coding_guidelines.rst:1071 +msgid "**[MOV]** for moving files: use git move and do not change content of moved file otherwise Git may loose track and history of the file; also used when moving code from one file to another;" +msgstr "" + +#: ../../content/contributing/development/coding_guidelines.rst:1074 +msgid "**[REL]** for release commits: new major or minor stable versions;" +msgstr "" + +#: ../../content/contributing/development/coding_guidelines.rst:1075 +msgid "**[IMP]** for improvements: most of the changes done in development version are incremental improvements not related to another tag;" +msgstr "" + +#: ../../content/contributing/development/coding_guidelines.rst:1077 +msgid "**[MERGE]** for merge commits: used in forward port of bug fixes but also as main commit for feature involving several separated commits;" +msgstr "" + +#: ../../content/contributing/development/coding_guidelines.rst:1079 +msgid "**[CLA]** for signing the Odoo Individual Contributor License;" +msgstr "" + +#: ../../content/contributing/development/coding_guidelines.rst:1080 +msgid "**[I18N]** for changes in translation files;" +msgstr "" + +#: ../../content/contributing/development/coding_guidelines.rst:1082 +msgid "After tag comes the modified module name. Use the technical name as functional name may change with time. If several modules are modified, list them or use various to tell it is cross-modules. Unless really required or easier avoid modifying code across several modules in the same commit. Understanding module history may become difficult." +msgstr "" + +#: ../../content/contributing/development/coding_guidelines.rst:1089 +msgid "Commit message header" +msgstr "" + +#: ../../content/contributing/development/coding_guidelines.rst:1091 +msgid "After tag and module name comes a meaningful commit message header. It should be self explanatory and include the reason behind the change. Do not use single words like \"bugfix\" or \"improvements\". Try to limit the header length to about 50 characters for readability." +msgstr "" + +#: ../../content/contributing/development/coding_guidelines.rst:1096 +msgid "Commit message header should make a valid sentence once concatenated with ``if applied, this commit will
``. For example ``[IMP] base: prevent to archive users linked to active partners`` is correct as it makes a valid sentence ``if applied, this commit will prevent users to archive...``." +msgstr "" + +#: ../../content/contributing/development/coding_guidelines.rst:1102 +msgid "Commit message full description" +msgstr "" + +#: ../../content/contributing/development/coding_guidelines.rst:1104 +msgid "In the message description specify the part of the code impacted by your changes (module name, lib, transversal object, ...) and a description of the changes." +msgstr "" + +#: ../../content/contributing/development/coding_guidelines.rst:1107 +msgid "First explain WHY you are modifying code. What is important if someone goes back to your commit in about 4 decades (or 3 days) is why you did it. It is the purpose of the change." +msgstr "" + +#: ../../content/contributing/development/coding_guidelines.rst:1111 +msgid "What you did can be found in the commit itself. If there was some technical choices involved it is a good idea to explain it also in the commit message after the why. For Odoo R&D developers \"PO team asked me to do it\" is not a valid why, by the way." +msgstr "" + +#: ../../content/contributing/development/coding_guidelines.rst:1115 +msgid "Please avoid commits which simultaneously impact multiple modules. Try to split into different commits where impacted modules are different. It will be helpful if we need to revert changes in a given module separately." +msgstr "" + +#: ../../content/contributing/development/coding_guidelines.rst:1119 +msgid "Don't hesitate to be a bit verbose. Most people will only see your commit message and judge everything you did in your life just based on those few sentences. No pressure at all." +msgstr "" + +#: ../../content/contributing/development/coding_guidelines.rst:1123 +msgid "**You spend several hours, days or weeks working on meaningful features. Take some time to calm down and write clear and understandable commit messages.**" +msgstr "" + +#: ../../content/contributing/development/coding_guidelines.rst:1126 +msgid "If you are an Odoo R&D developer the WHY should be the purpose of the task you are working on. Full specifications make the core of the commit message. **If you are working on a task that lacks purpose and specifications please consider making them clear before continuing.**" +msgstr "" + +#: ../../content/contributing/development/coding_guidelines.rst:1131 +msgid "Finally here are some examples of correct commit messages :" +msgstr "" + +#: ../../content/contributing/development/coding_guidelines.rst:1154 +msgid "Use the long description to explain the *why* not the *what*, the *what* can be seen in the diff" +msgstr "" + #: ../../content/contributing/documentation.rst:5 -msgid "Write documentation" +msgid "Documentation" msgstr "" #: ../../content/contributing/documentation.rst:14 -msgid "**First of all, thank you for landing here and helping us improve the user documentation of Odoo!**" -msgstr "" - -#: ../../content/contributing/documentation.rst:16 msgid "This introductory guide will help you acquire the tools and knowledge you need to write documentation, whether you plan to make a minor content change or document an application from scratch." msgstr "" -#: ../../content/contributing/documentation.rst:23 +#: ../../content/contributing/documentation.rst:21 msgid "reStructuredText" msgstr "" -#: ../../content/contributing/documentation.rst:25 +#: ../../content/contributing/documentation.rst:23 msgid "Our documentation is written in **reStructuredText** (RST), a `lightweight markup language `_ consisting of normal text augmented with markup which allows including headings, images, notes, and so on. This might seem a bit abstract but there is no need to worry. :abbr:`RST (reStructuredText)` is not hard to learn, especially if you intend to make only small changes to the content." msgstr "" -#: ../../content/contributing/documentation.rst:31 +#: ../../content/contributing/documentation.rst:29 msgid "If you need to learn about a specific markup, head over to :doc:`our cheat sheet for RST ` which contains all the information that you should ever need for the user documentation of Odoo." msgstr "" -#: ../../content/contributing/documentation.rst:36 +#: ../../content/contributing/documentation.rst:34 msgid "We kindly ask you to observe a set of :doc:`content ` and :doc:`RST ` guidelines as you write documentation. This ensures that you stay consistent with the rest of the documentation and facilitates the approval of your content changes as they are reviewed by a redactor at Odoo." msgstr "" -#: ../../content/contributing/documentation.rst:42 +#: ../../content/contributing/documentation.rst:40 msgid ":doc:`documentation/content_guidelines`" msgstr "" -#: ../../content/contributing/documentation.rst:43 +#: ../../content/contributing/documentation.rst:41 msgid ":doc:`documentation/rst_cheat_sheet`" msgstr "" -#: ../../content/contributing/documentation.rst:44 +#: ../../content/contributing/documentation.rst:42 msgid ":doc:`documentation/rst_guidelines`" msgstr "" -#: ../../content/contributing/documentation.rst:49 +#: ../../content/contributing/documentation.rst:47 msgid "Getting started" msgstr "" -#: ../../content/contributing/documentation.rst:51 +#: ../../content/contributing/documentation.rst:49 msgid "As our documentation is maintained on GitHub, you will need a free GitHub account. Click `here `_ to create one." msgstr "" -#: ../../content/contributing/documentation.rst:54 +#: ../../content/contributing/documentation.rst:52 msgid "Now, depending on whether you want to update existing content, or rather work on new content and make file changes, you have two courses of action:" msgstr "" -#: ../../content/contributing/documentation.rst:57 +#: ../../content/contributing/documentation.rst:55 msgid "**For small changes** in ``.rst`` files only, i.e. addition/edition of paragraphs or typos, **we suggest that you use the GitHub interface**. This is the easiest and fasted way to submit your request for changes for the documentation and is suitable for non-technical people. Read :ref:`contributing/github-interface` to learn how to use this method." msgstr "" -#: ../../content/contributing/documentation.rst:61 +#: ../../content/contributing/documentation.rst:59 msgid "**For more complex cases**, it is necessary to **use Git and work from a local copy of the documentation**. This method seems intimidating but only requires basic knowledge of Git. See :ref:`contributing/canonical-git-workflow` for more information on this method." msgstr "" -#: ../../content/contributing/documentation.rst:68 +#: ../../content/contributing/documentation.rst:66 msgid "Use the GitHub interface" msgstr "" -#: ../../content/contributing/documentation.rst:70 +#: ../../content/contributing/documentation.rst:68 msgid "Verify that you are browsing the documentation in the version that you intend to change. The version can be selected from the dropdown in the top menu." msgstr "" -#: ../../content/contributing/documentation.rst:73 +#: ../../content/contributing/documentation.rst:71 msgid "Head over to the page that you want to change and click on the **Edit on GitHub** button in the top right corner of the page." msgstr "" -#: ../../content/contributing/documentation.rst:76 +#: ../../content/contributing/documentation.rst:74 msgid "If you do not have edit rights on the repository (`odoo/documentation `_), you need to fork it by clicking on the appropriate button. In other terms, you create a copy of the entire repository on your own account. If you do have the edit rights, skip this step." msgstr "" -#: ../../content/contributing/documentation.rst:83 +#: ../../content/contributing/documentation.rst:81 msgid "Make the appropriate changes while taking care of following the :doc:`content ` and :doc:`RST ` guidelines." msgstr "" -#: ../../content/contributing/documentation.rst:86 +#: ../../content/contributing/documentation.rst:84 msgid "Click on the **Preview changes** button to review your contribution in a more human-readable format. Be aware that the preview is not able to handle all markups correctly. Notes and tips, for instance, are not correctly rendered. The version of your content published to the website will be, however." msgstr "" -#: ../../content/contributing/documentation.rst:91 +#: ../../content/contributing/documentation.rst:89 msgid "Go to the bottom of the page to create a commit (:dfn:`what packs your changes together and labels them with a commit message`) of your changes." msgstr "" @@ -116,259 +1008,256 @@ msgstr "" msgid "In the second text box, justify *why* you made these changes, if you feel that it is not obvious." msgstr "" -#: ../../content/contributing/documentation.rst:98 +#: ../../content/contributing/documentation.rst:96 msgid "Select the option \"Create a new branch for this commit and start a pull request.\" if you have the choice (if you have partial or full edit writes on the repository). If not, skip this step." msgstr "" -#: ../../content/contributing/documentation.rst:101 +#: ../../content/contributing/documentation.rst:99 msgid "Click on the green button. It is either labelled \"Commit changes\" or \"Propose file change\"." msgstr "" -#: ../../content/contributing/documentation.rst:105 +#: ../../content/contributing/documentation.rst:103 msgid "In the dropdown for the selection of the base branch (i.e., the version of the documentation that your changes concern), make sure to select the same version as in the first step of this guide and click on the **Create pull request** button." msgstr "" -#: ../../content/contributing/documentation.rst:111 +#: ../../content/contributing/documentation.rst:109 msgid "Double-check your :abbr:`PR (Pull Request)` and, when ready, click again on the **Create pull request** button to submit your changes for review by a content writer at Odoo." msgstr "" -#: ../../content/contributing/documentation.rst:116 -#: ../../content/contributing/documentation.rst:395 +#: ../../content/contributing/documentation.rst:114 +#: ../../content/contributing/documentation.rst:396 msgid "You're done! If your changes are approved straight away they will appear in the documentation the very next day. It may also be the case that the reviewer has a question or a remark, so make sure to check your notifications or your emails, depending on your account settings." msgstr "" -#: ../../content/contributing/documentation.rst:123 +#: ../../content/contributing/documentation.rst:121 msgid "Use the canonical Git workflow" msgstr "" -#: ../../content/contributing/documentation.rst:128 +#: ../../content/contributing/documentation.rst:126 msgid "Prepare your machine" msgstr "" -#: ../../content/contributing/documentation.rst:133 +#: ../../content/contributing/documentation.rst:131 msgid "Install Git" msgstr "" -#: ../../content/contributing/documentation.rst:135 +#: ../../content/contributing/documentation.rst:133 msgid "We use `Git `_ to manage the files of the user documentation. It is a tool that allows to track the history of changes made to a file and, more importantly, to work on different versions of those files at the same time. It means that you do not need to worry about overwriting someone else’s pending work when you start editing the documentation." msgstr "" -#: ../../content/contributing/documentation.rst:140 +#: ../../content/contributing/documentation.rst:138 msgid "You must then configure Git to identify yourself as the author of your future contribution. Enter the same email address as the one you used to register on GitHub." msgstr "" -#: ../../content/contributing/documentation.rst:143 +#: ../../content/contributing/documentation.rst:141 msgid "Download and install **Git** on your machine." msgstr "" -#: ../../content/contributing/documentation.rst:144 +#: ../../content/contributing/documentation.rst:142 msgid "Verify that `the installation folder of Git is included in your system's PATH variable `_." msgstr "" -#: ../../content/contributing/documentation.rst:146 -#: ../../content/contributing/documentation.rst:171 -#: ../../content/contributing/documentation.rst:319 -#: ../../content/contributing/documentation.rst:336 -#: ../../content/contributing/documentation.rst:367 +#: ../../content/contributing/documentation.rst:144 +#: ../../content/contributing/documentation.rst:169 +#: ../../content/contributing/documentation.rst:317 +#: ../../content/contributing/documentation.rst:337 +#: ../../content/contributing/documentation.rst:368 msgid "Execute the following commands in a terminal:" msgstr "" -#: ../../content/contributing/documentation.rst:156 +#: ../../content/contributing/documentation.rst:154 msgid "Fetch the sources" msgstr "" -#: ../../content/contributing/documentation.rst:158 +#: ../../content/contributing/documentation.rst:156 msgid "As stated earlier, our documentation (in all its versions) is maintained on GitHub at `github.com/odoo/documentation `_. A modification is made by the mean of a :abbr:`PR (Pull Request)` (:dfn:`proposal of content changes`) to allow for a review of the changes before updating the sources of the documentation." msgstr "" -#: ../../content/contributing/documentation.rst:163 +#: ../../content/contributing/documentation.rst:161 msgid "Prior to submitting a modification, you need to make a copy of the sources and download that copy on your machine." msgstr "" -#: ../../content/contributing/documentation.rst:166 +#: ../../content/contributing/documentation.rst:164 msgid "Go to `github.com/odoo/documentation `_ and click on the **Fork** button in the top right corner." msgstr "" -#: ../../content/contributing/documentation.rst:179 +#: ../../content/contributing/documentation.rst:177 msgid "If you do not have edit rights on the repository owned by Odoo, replace \"odoo\" with your Github username in the URL of the command above. If you do have edit rights, it is not necessary to fork the repository." msgstr "" -#: ../../content/contributing/documentation.rst:183 +#: ../../content/contributing/documentation.rst:181 msgid "In order to ease the collaboration between writers coming from many different systems and teams, execute the following group of commands that correspond to your :abbr:`OS (Operating System)` in a terminal." msgstr "" -#: ../../content/contributing/documentation.rst:187 +#: ../../content/contributing/documentation.rst:185 msgid "Windows:" msgstr "" -#: ../../content/contributing/documentation.rst:195 +#: ../../content/contributing/documentation.rst:193 msgid "Linux or Mac OS:" msgstr "" #: ../../content/contributing/documentation.rst:206 -#: ../../content/contributing/documentation/rst_cheat_sheet.rst:742 -#: ../../content/contributing/documentation/rst_cheat_sheet.rst:744 -#: ../../content/contributing/documentation/rst_cheat_sheet.rst:760 -msgid "Python" -msgstr "" - -#: ../../content/contributing/documentation.rst:208 msgid "Because the documentation is written in :abbr:`RST (reStructuredText)`, it needs to be built (:dfn:`converted to HTML`) in order to display nicely. This is done by the documentation generator which takes the original :abbr:`RST (reStructuredText)` files as input, transforms the markups in a human-readable format, and outputs HTML files to be read in your web browser." msgstr "" -#: ../../content/contributing/documentation.rst:213 +#: ../../content/contributing/documentation.rst:211 msgid "The documentation generator that we use is called `Sphinx `_. and is written in `Python `_. You have to install Python in order to use Sphinx. For the record, Sphinx is the program and Python the programming language, but you do not need to know much more about them so don't panic!" msgstr "" -#: ../../content/contributing/documentation.rst:218 +#: ../../content/contributing/documentation.rst:216 msgid "Python comes with its own package manager: `pip `_. It allows installing Python dependencies in a single command." msgstr "" -#: ../../content/contributing/documentation.rst:222 +#: ../../content/contributing/documentation.rst:220 msgid "Download and install the recommended release (`see README file `_) of **Python 3** on your machine." msgstr "" -#: ../../content/contributing/documentation.rst:224 +#: ../../content/contributing/documentation.rst:222 msgid "Make sure to have **pip** installed on your machine (on Windows, you can install pip alongside Python)." msgstr "" -#: ../../content/contributing/documentation.rst:226 +#: ../../content/contributing/documentation.rst:224 msgid "Execute the following commands in a terminal to verify that both installations finished successfully:" msgstr "" -#: ../../content/contributing/documentation.rst:234 +#: ../../content/contributing/documentation.rst:232 msgid "Execute the following commands in a terminal to install the Python dependencies of the documentation:" msgstr "" -#: ../../content/contributing/documentation.rst:243 +#: ../../content/contributing/documentation.rst:241 msgid "Depending on your :abbr:`OS (Operating System)`, you may need to run the commands ``python`` and ``pip`` instead of ``python3`` and ``pip3``" msgstr "" -#: ../../content/contributing/documentation.rst:249 +#: ../../content/contributing/documentation.rst:247 msgid "Make" msgstr "" -#: ../../content/contributing/documentation.rst:251 +#: ../../content/contributing/documentation.rst:249 msgid "`Make `_ is a tool that packs a bunch of command-lines into one to be easier to remember and to type. In our case, it is used to execute complex Sphinx build commands by using a single and simpler one instead." msgstr "" -#: ../../content/contributing/documentation.rst:255 +#: ../../content/contributing/documentation.rst:253 msgid "Download and install **Make** on your machine." msgstr "" -#: ../../content/contributing/documentation.rst:256 +#: ../../content/contributing/documentation.rst:254 msgid "Verify that `the installation folder of Make is included in your system's PATH variable `_." msgstr "" -#: ../../content/contributing/documentation.rst:262 +#: ../../content/contributing/documentation.rst:260 msgid "pngquant" msgstr "" -#: ../../content/contributing/documentation.rst:264 +#: ../../content/contributing/documentation.rst:262 msgid "`pngquant `_ is a tool that we use to compress PNG images so that the documentation does not end up weighting several Gigabytes in a few year span." msgstr "" -#: ../../content/contributing/documentation.rst:267 +#: ../../content/contributing/documentation.rst:265 msgid "Download and install **pngquant** on your machine." msgstr "" -#: ../../content/contributing/documentation.rst:268 +#: ../../content/contributing/documentation.rst:266 msgid "Verify that `the installation folder of pngquant is included in your system's PATH variable `_." msgstr "" -#: ../../content/contributing/documentation.rst:274 +#: ../../content/contributing/documentation.rst:272 msgid "Prepare your version" msgstr "" -#: ../../content/contributing/documentation.rst:276 +#: ../../content/contributing/documentation.rst:274 msgid "Now that your machine is all set up, it is time to do the same for your version of the documentation files. As it would not be convenient to have several people working on the version 13.0 in parallel (conflicts of content would occur all the time), and in order to be able to create a :abbr:`PR (Pull Request)`, you must `create a new branch `_ starting from the branch 13.0. In other words, you copy the entirety of this version’s files and give it another name. For this example, we will go with ``13.0-my_contribution``." msgstr "" -#: ../../content/contributing/documentation.rst:284 +#: ../../content/contributing/documentation.rst:282 msgid "Execute the following commands in a terminal to..." msgstr "" -#: ../../content/contributing/documentation.rst:286 +#: ../../content/contributing/documentation.rst:284 msgid "Navigate to the documentation folder:" msgstr "" -#: ../../content/contributing/documentation.rst:292 +#: ../../content/contributing/documentation.rst:290 msgid "Switch to the version 13.0:" msgstr "" -#: ../../content/contributing/documentation.rst:298 +#: ../../content/contributing/documentation.rst:296 msgid "Create your own branch which will be a copy of 13.0:" msgstr "" -#: ../../content/contributing/documentation.rst:307 +#: ../../content/contributing/documentation.rst:305 msgid "Perform your changes" msgstr "" -#: ../../content/contributing/documentation.rst:309 +#: ../../content/contributing/documentation.rst:307 msgid "You can now perform any change you want to the documentation files. These changes must be compliant with :abbr:`RST (reStructuredText)` syntax (see :doc:`documentation/rst_cheat_sheet`) and with our :doc:`content ` and :doc:`RST ` guidelines." msgstr "" -#: ../../content/contributing/documentation.rst:315 -msgid "If your changes include the addition of a new image, for instance :file:`my_image.png`, proceed as follows:" +#: ../../content/contributing/documentation.rst:313 +msgid "If your changes include the addition of a new image, for instance :file:`my-image.png`, proceed as follows:" msgstr "" -#: ../../content/contributing/documentation.rst:318 +#: ../../content/contributing/documentation.rst:316 msgid "Make sure that the image is in ``.png`` format." msgstr "" +#: ../../content/contributing/documentation.rst:324 +msgid "Delete :file:`my-image.png`." +msgstr "" + +#: ../../content/contributing/documentation.rst:325 +msgid "Rename :file:`my-image-fs8.png` to :file:`my-image.png`." +msgstr "" + #: ../../content/contributing/documentation.rst:326 -msgid "Delete :file:`my_image.png`." +msgid "If your changes include renaming or moving an RST file to a new location, follow the `manual for redirect rules `_ to create the appropriate redirect rule(s)." msgstr "" -#: ../../content/contributing/documentation.rst:327 -msgid "Rename :file:`my_image-fs8.png` to :file:`my_image.png`." -msgstr "" - -#: ../../content/contributing/documentation.rst:332 +#: ../../content/contributing/documentation.rst:333 msgid "Preview your changes" msgstr "" -#: ../../content/contributing/documentation.rst:334 +#: ../../content/contributing/documentation.rst:335 msgid "To preview your changes in a generated documentation, proceed as follows:" msgstr "" -#: ../../content/contributing/documentation.rst:345 +#: ../../content/contributing/documentation.rst:346 msgid "You can omit the :command:`make clean` command when no recent change has been made to the hierarchy of documentation files." msgstr "" -#: ../../content/contributing/documentation.rst:348 +#: ../../content/contributing/documentation.rst:349 msgid "Fix any error or warning shown in the logs of the build." msgstr "" -#: ../../content/contributing/documentation.rst:349 +#: ../../content/contributing/documentation.rst:350 msgid "Open the file :file:`documentation/_build/html/index.html` with your default web browser." msgstr "" -#: ../../content/contributing/documentation.rst:352 +#: ../../content/contributing/documentation.rst:353 msgid "These steps have for only purpose to show you the final results of your changes. They have no impact on the documentation source files." msgstr "" -#: ../../content/contributing/documentation.rst:358 +#: ../../content/contributing/documentation.rst:359 msgid "Submit your changes" msgstr "" -#: ../../content/contributing/documentation.rst:361 +#: ../../content/contributing/documentation.rst:362 msgid "We expect you to have basic knowledge of Git, which should be enough to cover the basic flow of a one-time contribution. If you plan on submitting several contributions, work on older versions of the documentation or perform any other advanced action, we recommend you to be confident with Git. Help yourself with `this manual of Git `_ and `this interactive tutorial `_." msgstr "" -#: ../../content/contributing/documentation.rst:375 +#: ../../content/contributing/documentation.rst:376 msgid "Go to `github.com/odoo/documentation/pulls `_ and click on the **New pull request** button." msgstr "" -#: ../../content/contributing/documentation.rst:380 +#: ../../content/contributing/documentation.rst:381 msgid "If you forked the base repository in the section :ref:`contributing/fetch-sources`, click on the link **compare across forks** If not, skip this step." msgstr "" -#: ../../content/contributing/documentation.rst:385 +#: ../../content/contributing/documentation.rst:386 msgid "In the dropdown for the selection of the base branch (i.e., the version of the documentation that your changes concern), make sure to select the version that your changes target (here **13.0**)." msgstr "" -#: ../../content/contributing/documentation.rst:390 +#: ../../content/contributing/documentation.rst:391 msgid "Double-check your :abbr:`PR (Pull Request)` and, when ready, click again on the **Create pull request** button to submit your changes for review by a redactor at Odoo." msgstr "" @@ -468,131 +1357,95 @@ msgstr "" msgid "**Be concise.**" msgstr "" -#: ../../content/contributing/documentation/content_guidelines.rst:75 -msgid "**Avoid sentences**, questions, and titles starting with \"how to.\"" -msgstr "" - #: ../../content/contributing/documentation/content_guidelines.rst:76 -msgid "**Don't use pronouns** in your titles, especially 2nd person (*your*)" +msgid "**Avoid sentences**, unnecessary verbs, questions, and titles starting with \"how to.\"" msgstr "" -#: ../../content/contributing/documentation/content_guidelines.rst:77 -msgid "Use **sentence case**. This means you capitalize only:" +#: ../../content/contributing/documentation/content_guidelines.rst:78 +msgid "**Don't use pronouns** in your titles, especially 2nd person (*your*)." msgstr "" #: ../../content/contributing/documentation/content_guidelines.rst:79 -msgid "the first word of the title or heading" -msgstr "" - -#: ../../content/contributing/documentation/content_guidelines.rst:80 -msgid "the first word after a colon" +msgid "Use **sentence case**. This means you capitalize only:" msgstr "" #: ../../content/contributing/documentation/content_guidelines.rst:81 -msgid "proper nouns (brands, product and service names, etc.)" +msgid "the first word of the title or heading" msgstr "" #: ../../content/contributing/documentation/content_guidelines.rst:82 -msgid "app features, as written in the apps" +msgid "the first word after a colon" msgstr "" -#: ../../content/contributing/documentation/content_guidelines.rst:85 -msgid "Do not capitalize common nouns when they are not referred to as features. This is more likely to happen in headings rather than in titles." +#: ../../content/contributing/documentation/content_guidelines.rst:83 +msgid "proper nouns (brands, product and service names, etc.)" +msgstr "" + +#: ../../content/contributing/documentation/content_guidelines.rst:86 +msgid "Most titles and headings generally refer to a concept and do *not* represent the name of a feature or a model." +msgstr "" + +#: ../../content/contributing/documentation/content_guidelines.rst:88 +msgid "Do not capitalize the words of an acronym if they don't entail a proper noun." msgstr "" #: ../../content/contributing/documentation/content_guidelines.rst:89 -msgid "Examples" +msgid "Verbs in headings are fine since they often describe an action." msgstr "" -#: ../../content/contributing/documentation/content_guidelines.rst:89 -msgid "Explanations" +#: ../../content/contributing/documentation/content_guidelines.rst:92 +msgid "**Titles** (H1)" msgstr "" -#: ../../content/contributing/documentation/content_guidelines.rst:0 -msgid "**Titles**" -msgstr "" - -#: ../../content/contributing/documentation/content_guidelines.rst:0 -msgid "(H1)" -msgstr "" - -#: ../../content/contributing/documentation/content_guidelines.rst:91 -msgid "*Quotation Templates*" -msgstr "" - -#: ../../content/contributing/documentation/content_guidelines.rst:91 -msgid "\"Quotation Templates\" is a feature in Odoo." -msgstr "" - -#: ../../content/contributing/documentation/content_guidelines.rst:93 -msgid "*Lead Mining*" -msgstr "" - -#: ../../content/contributing/documentation/content_guidelines.rst:93 -msgid "\"Lead Mining\" is a feature in Odoo." +#: ../../content/contributing/documentation/content_guidelines.rst:94 +msgid "Quotation templates" msgstr "" #: ../../content/contributing/documentation/content_guidelines.rst:95 -msgid "*Resupply from another Warehouse*" +msgid "Lead mining" msgstr "" -#: ../../content/contributing/documentation/content_guidelines.rst:95 -msgid "\"Warehouse\" is capitalized as we refer to the feature in the app rather than to a real warehouse." +#: ../../content/contributing/documentation/content_guidelines.rst:96 +msgid "Resupply from another warehouse" +msgstr "" + +#: ../../content/contributing/documentation/content_guidelines.rst:97 +msgid "Synchronize Google Calendar with Odoo" msgstr "" #: ../../content/contributing/documentation/content_guidelines.rst:98 -msgid "*Synchronize Google Calendar with Odoo*" +msgid "Batch payments: SEPA Direct Debit (SDD)" msgstr "" -#: ../../content/contributing/documentation/content_guidelines.rst:98 -msgid "\"Google Calendar\" is a product and \"Odoo\" is a brand." -msgstr "" - -#: ../../content/contributing/documentation/content_guidelines.rst:0 -msgid "**Headings**" -msgstr "" - -#: ../../content/contributing/documentation/content_guidelines.rst:0 -msgid "(H2, H3, etc.)" +#: ../../content/contributing/documentation/content_guidelines.rst:99 +msgid "Digitize vendor bills with optical character recognition (OCR)" msgstr "" #: ../../content/contributing/documentation/content_guidelines.rst:101 -msgid "*Confirm the quotation*" +msgid "**Headings** (H2, H3)" msgstr "" -#: ../../content/contributing/documentation/content_guidelines.rst:101 -msgid "\"The quotation\" is a common noun not referring to a feature in Odoo." +#: ../../content/contributing/documentation/content_guidelines.rst:103 +msgid "Project stages" msgstr "" #: ../../content/contributing/documentation/content_guidelines.rst:104 -msgid "*Test environment*" +msgid "Email alias" msgstr "" -#: ../../content/contributing/documentation/content_guidelines.rst:104 -msgid "\"Environment\" is a common noun." +#: ../../content/contributing/documentation/content_guidelines.rst:105 +msgid "Confirm the quotation" msgstr "" #: ../../content/contributing/documentation/content_guidelines.rst:106 -msgid "*Add a new Payment Acquirer*" +msgid "Generate SEPA Direct Debit XML files to submit payments" msgstr "" -#: ../../content/contributing/documentation/content_guidelines.rst:106 -msgid "\"Payment Acquirers\" is a feature in Odoo." -msgstr "" - -#: ../../content/contributing/documentation/content_guidelines.rst:108 -msgid "*Generate SEPA Direct Debit XML files to submit payments*" -msgstr "" - -#: ../../content/contributing/documentation/content_guidelines.rst:108 -msgid "\"SEPA Direct Debit\" and \"XML\" are considered as proper nouns." -msgstr "" - -#: ../../content/contributing/documentation/content_guidelines.rst:115 +#: ../../content/contributing/documentation/content_guidelines.rst:111 msgid "Document structure" msgstr "" -#: ../../content/contributing/documentation/content_guidelines.rst:117 +#: ../../content/contributing/documentation/content_guidelines.rst:113 msgid "Use different **heading levels** to organize your text by sections and sub-sections. Your headings are not only displayed in the document but also on the navigation menu (only the H1) and on the \"On this page\" sidebar (all H2 to H6)." msgstr "" @@ -604,11 +1457,11 @@ msgstr "" msgid "Your *page title* gives your reader a quick and clear understanding of what your content is about." msgstr "" -#: ../../content/contributing/documentation/content_guidelines.rst:126 +#: ../../content/contributing/documentation/content_guidelines.rst:122 msgid "The *content* in this section describes the upcoming content from a **business point of view**, and shouldn't put the emphasis on Odoo, as this is documentation and not marketing." msgstr "" -#: ../../content/contributing/documentation/content_guidelines.rst:130 +#: ../../content/contributing/documentation/content_guidelines.rst:126 msgid "Start first with a **lead paragraph**, which helps the reader make sure that they've found the right page, then explain the **business aspects of this topic** in the following paragraphs." msgstr "" @@ -644,755 +1497,878 @@ msgstr "" msgid "Subsections are perfect for assessing very specific points. The title can be in the form of a question, if appropriate." msgstr "" -#: ../../content/contributing/documentation/content_guidelines.rst:151 +#: ../../content/contributing/documentation/content_guidelines.rst:147 msgid "**H2: Next Section**" msgstr "" -#: ../../content/contributing/documentation/content_guidelines.rst:155 +#: ../../content/contributing/documentation/content_guidelines.rst:151 msgid ":ref:`RST cheat sheet: headings `" msgstr "" -#: ../../content/contributing/documentation/content_guidelines.rst:156 -msgid ":ref:`RST cheat sheet: specialized directives `" +#: ../../content/contributing/documentation/content_guidelines.rst:152 +msgid ":ref:`RST cheat sheet: markups `" msgstr "" -#: ../../content/contributing/documentation/content_guidelines.rst:161 +#: ../../content/contributing/documentation/content_guidelines.rst:157 msgid "Organizing the documentation" msgstr "" -#: ../../content/contributing/documentation/content_guidelines.rst:163 +#: ../../content/contributing/documentation/content_guidelines.rst:159 msgid "When writing documentation about a given topic, try to keep pages within the same folder organized." msgstr "" -#: ../../content/contributing/documentation/content_guidelines.rst:165 +#: ../../content/contributing/documentation/content_guidelines.rst:161 msgid "For most topics, a single page should do the job. Place it in the appropriate section of the documentation (e.g., content related to the CRM app go under :menuselection:`Applications -> Sales -> CRM`) and follow the :ref:`document structure ` guidelines." msgstr "" -#: ../../content/contributing/documentation/content_guidelines.rst:170 +#: ../../content/contributing/documentation/content_guidelines.rst:166 msgid "For more complex topics, you may need several pages to cover all their aspects. Usually, you will find yourself adding documentation to a topic that is already partially covered. In that case, either create a new page and place it at the same level as other related pages or add new sections to an existing page. If you are documenting a complex topic from scratch, organize your content between one parent page (the :abbr:`TOC (Tree Of Contents)` page) and several child pages. Whenever possible, write content on the parent page and not only on the child pages. Make the parent page accessible from the navigation menu by using the :ref:`show-content ` metadata directive." msgstr "" -#: ../../content/contributing/documentation/content_guidelines.rst:182 +#: ../../content/contributing/documentation/content_guidelines.rst:178 +#: ../../content/contributing/documentation/rst_cheat_sheet.rst:440 msgid "Images" msgstr "" -#: ../../content/contributing/documentation/content_guidelines.rst:184 +#: ../../content/contributing/documentation/content_guidelines.rst:180 msgid "Adding a few images to illustrate your text helps the readers to understand and memorize your content. However, avoid adding too many images: it isn't necessary to illustrate all steps and features, and it may overload your page." msgstr "" -#: ../../content/contributing/documentation/content_guidelines.rst:189 +#: ../../content/contributing/documentation/content_guidelines.rst:185 msgid "Don't forget to :ref:`compress your PNG files with pngquant `." msgstr "" -#: ../../content/contributing/documentation/content_guidelines.rst:194 +#: ../../content/contributing/documentation/content_guidelines.rst:190 msgid "Screenshots" msgstr "" -#: ../../content/contributing/documentation/content_guidelines.rst:196 +#: ../../content/contributing/documentation/content_guidelines.rst:192 msgid "Screenshots are automatically resized to fit the content block's width. This implies that screenshots can't be too wide, else they would appear very small on-screen. Therefore, we recommend to avoid to take screenshots of a full screen display of the app, unless it is relevant to do so." msgstr "" -#: ../../content/contributing/documentation/content_guidelines.rst:200 +#: ../../content/contributing/documentation/content_guidelines.rst:196 msgid "A few tips to improve your screenshots:" msgstr "" -#: ../../content/contributing/documentation/content_guidelines.rst:202 +#: ../../content/contributing/documentation/content_guidelines.rst:198 msgid "**Zoom** in your browser. We recommend a 110% zoom for better results." msgstr "" -#: ../../content/contributing/documentation/content_guidelines.rst:203 +#: ../../content/contributing/documentation/content_guidelines.rst:199 msgid "**Resize** your browser's width, either by *resizing the window* itself or by opening the *browser's developer tools* (press the ``F12`` key) and resizing the width." msgstr "" -#: ../../content/contributing/documentation/content_guidelines.rst:205 +#: ../../content/contributing/documentation/content_guidelines.rst:201 msgid "**Select** the relevant area, rather than keeping the full window." msgstr "" -#: ../../content/contributing/documentation/content_guidelines.rst:206 +#: ../../content/contributing/documentation/content_guidelines.rst:202 msgid "If necessary, you can **edit** the screenshot to remove unnecessary fields and to narrow even more Odoo's display." msgstr "" -#: ../../content/contributing/documentation/content_guidelines.rst:214 +#: ../../content/contributing/documentation/content_guidelines.rst:210 msgid "Resizing the window's width is the most important step to do as Odoo's responsive design automatically resizes all fields to match the window's width." msgstr "" -#: ../../content/contributing/documentation/content_guidelines.rst:220 +#: ../../content/contributing/documentation/content_guidelines.rst:216 msgid "Media files" msgstr "" -#: ../../content/contributing/documentation/content_guidelines.rst:222 +#: ../../content/contributing/documentation/content_guidelines.rst:218 msgid "A **media filename**:" msgstr "" -#: ../../content/contributing/documentation/content_guidelines.rst:224 +#: ../../content/contributing/documentation/content_guidelines.rst:220 msgid "is written in **lower-case letters**" msgstr "" -#: ../../content/contributing/documentation/content_guidelines.rst:225 +#: ../../content/contributing/documentation/content_guidelines.rst:221 msgid "is **relevant** to the media's content. (E.g., :file:`screenshot-tips.gif`.)" msgstr "" -#: ../../content/contributing/documentation/content_guidelines.rst:226 +#: ../../content/contributing/documentation/content_guidelines.rst:222 msgid "separates its words with a **hyphen** ``-`` (E.g., :file:`awesome-filename.png`.)" msgstr "" -#: ../../content/contributing/documentation/content_guidelines.rst:228 +#: ../../content/contributing/documentation/content_guidelines.rst:224 msgid "Each document has its own folder in which the media files are located. The folder's name must be the same as the document's filename." msgstr "" -#: ../../content/contributing/documentation/content_guidelines.rst:231 +#: ../../content/contributing/documentation/content_guidelines.rst:227 msgid "For example, the document :file:`doc_filename.rst` refers to two images that are placed in the folder ``doc_filename``." msgstr "" -#: ../../content/contributing/documentation/content_guidelines.rst:243 +#: ../../content/contributing/documentation/content_guidelines.rst:239 msgid "Previously, image filenames would mostly be named with numbers (e.g., :file:`feature01.png`) and placed in a single ``media`` folder. While it is advised not to name your *new* images in that fashion, it is also essential **not to rename unchanged files**, as doing this would double the weight of renamed image files on the repository. They will eventually all be replaced as the content referencing those images is updated." msgstr "" -#: ../../content/contributing/documentation/content_guidelines.rst:252 +#: ../../content/contributing/documentation/content_guidelines.rst:248 msgid "ALT tags" msgstr "" -#: ../../content/contributing/documentation/content_guidelines.rst:254 +#: ../../content/contributing/documentation/content_guidelines.rst:250 msgid "An **ALT tag** is a *text alternative* to an image. This text is displayed if the browser fails to render the image. It is also helpful for users who are visually impaired. Finally, it helps search engines, such as Google, to understand what the image is about and index it correctly, which improves the :abbr:`SEO (Search Engine Optimization)` significantly." msgstr "" -#: ../../content/contributing/documentation/content_guidelines.rst:259 +#: ../../content/contributing/documentation/content_guidelines.rst:255 msgid "Good ALT tags are:" msgstr "" -#: ../../content/contributing/documentation/content_guidelines.rst:261 +#: ../../content/contributing/documentation/content_guidelines.rst:257 msgid "**Short** (one line maximum)" msgstr "" -#: ../../content/contributing/documentation/content_guidelines.rst:262 +#: ../../content/contributing/documentation/content_guidelines.rst:258 msgid "**Not a repetition** of a previous sentence or title" msgstr "" -#: ../../content/contributing/documentation/content_guidelines.rst:263 +#: ../../content/contributing/documentation/content_guidelines.rst:259 msgid "A **good description** of the action happening on the image" msgstr "" -#: ../../content/contributing/documentation/content_guidelines.rst:264 +#: ../../content/contributing/documentation/content_guidelines.rst:260 msgid "Easily **understandable** if read aloud" msgstr "" -#: ../../content/contributing/documentation/content_guidelines.rst:267 +#: ../../content/contributing/documentation/content_guidelines.rst:263 msgid ":ref:`RST cheat sheet: image directive `" msgstr "" -#: ../../content/contributing/documentation/rst_cheat_sheet.rst:3 +#: ../../content/contributing/documentation/rst_cheat_sheet.rst:5 msgid "RST cheat sheet" msgstr "" -#: ../../content/contributing/documentation/rst_cheat_sheet.rst:8 +#: ../../content/contributing/documentation/rst_cheat_sheet.rst:10 msgid "Headings" msgstr "" -#: ../../content/contributing/documentation/rst_cheat_sheet.rst:11 +#: ../../content/contributing/documentation/rst_cheat_sheet.rst:13 msgid "For each formatting line (e.g., ``===``), write as many symbols (``=``) as there are characters in the header." msgstr "" -#: ../../content/contributing/documentation/rst_cheat_sheet.rst:15 +#: ../../content/contributing/documentation/rst_cheat_sheet.rst:17 msgid "The symbols used for the formatting are, in fact, not important. Only the order in which they are written matters, as it determines the size of the decorated heading. This means that you may encounter different heading formatting and in a different order, in which case you should follow the formatting in place in the document. In any other case, use the formatting shown below." msgstr "" -#: ../../content/contributing/documentation/rst_cheat_sheet.rst:18 +#: ../../content/contributing/documentation/rst_cheat_sheet.rst:20 msgid "Heading size" msgstr "" -#: ../../content/contributing/documentation/rst_cheat_sheet.rst:18 +#: ../../content/contributing/documentation/rst_cheat_sheet.rst:20 msgid "Formatting" msgstr "" -#: ../../content/contributing/documentation/rst_cheat_sheet.rst:20 +#: ../../content/contributing/documentation/rst_cheat_sheet.rst:22 msgid "H1" msgstr "" -#: ../../content/contributing/documentation/rst_cheat_sheet.rst:0 -#: ../../content/contributing/documentation/rst_cheat_sheet.rst:0 -#: ../../content/contributing/documentation/rst_cheat_sheet.rst:0 -msgid "``=======``" -msgstr "" - -#: ../../content/contributing/documentation/rst_cheat_sheet.rst:0 -#: ../../content/contributing/documentation/rst_cheat_sheet.rst:0 -#: ../../content/contributing/documentation/rst_cheat_sheet.rst:0 -#: ../../content/contributing/documentation/rst_cheat_sheet.rst:0 -#: ../../content/contributing/documentation/rst_cheat_sheet.rst:0 -#: ../../content/contributing/documentation/rst_cheat_sheet.rst:0 -msgid "``Heading``" -msgstr "" - -#: ../../content/contributing/documentation/rst_cheat_sheet.rst:24 +#: ../../content/contributing/documentation/rst_cheat_sheet.rst:28 msgid "H2" msgstr "" -#: ../../content/contributing/documentation/rst_cheat_sheet.rst:27 +#: ../../content/contributing/documentation/rst_cheat_sheet.rst:33 msgid "H3" msgstr "" -#: ../../content/contributing/documentation/rst_cheat_sheet.rst:0 -msgid "``-------``" -msgstr "" - -#: ../../content/contributing/documentation/rst_cheat_sheet.rst:30 +#: ../../content/contributing/documentation/rst_cheat_sheet.rst:38 msgid "H4" msgstr "" -#: ../../content/contributing/documentation/rst_cheat_sheet.rst:0 -msgid "``~~~~~~~``" -msgstr "" - -#: ../../content/contributing/documentation/rst_cheat_sheet.rst:33 +#: ../../content/contributing/documentation/rst_cheat_sheet.rst:43 msgid "H5" msgstr "" -#: ../../content/contributing/documentation/rst_cheat_sheet.rst:0 -msgid "``*******``" -msgstr "" - -#: ../../content/contributing/documentation/rst_cheat_sheet.rst:36 +#: ../../content/contributing/documentation/rst_cheat_sheet.rst:48 msgid "H6" msgstr "" -#: ../../content/contributing/documentation/rst_cheat_sheet.rst:0 -msgid "``^^^^^^^``" -msgstr "" - -#: ../../content/contributing/documentation/rst_cheat_sheet.rst:41 +#: ../../content/contributing/documentation/rst_cheat_sheet.rst:55 msgid "Each document must have **exactly one H1 heading**. No less, no more." msgstr "" -#: ../../content/contributing/documentation/rst_cheat_sheet.rst:46 -msgid "Markup" -msgstr "" - -#: ../../content/contributing/documentation/rst_cheat_sheet.rst:51 -msgid "Inline markup" -msgstr "" - -#: ../../content/contributing/documentation/rst_cheat_sheet.rst:53 -msgid "Use the following markups to emphasize your text to your liking:" -msgstr "" - -#: ../../content/contributing/documentation/rst_cheat_sheet.rst:56 -msgid "\\*\\*Text\\*\\*" -msgstr "" - -#: ../../content/contributing/documentation/rst_cheat_sheet.rst:56 -msgid "**Text**" -msgstr "" - -#: ../../content/contributing/documentation/rst_cheat_sheet.rst:58 -msgid "\\*Text\\*" -msgstr "" - -#: ../../content/contributing/documentation/rst_cheat_sheet.rst:58 -msgid "*Text*" -msgstr "" - #: ../../content/contributing/documentation/rst_cheat_sheet.rst:60 -msgid "\\`Text\\`" +msgid "Markups" msgstr "" -#: ../../content/contributing/documentation/rst_cheat_sheet.rst:60 -msgid "``Text``" +#: ../../content/contributing/documentation/rst_cheat_sheet.rst:65 +msgid "Emphasis (italic)" msgstr "" -#: ../../content/contributing/documentation/rst_cheat_sheet.rst:64 -msgid ":ref:`contributing/specialized-directives`" +#: ../../content/contributing/documentation/rst_cheat_sheet.rst:67 +msgid "To emphasize a part of the text. The text is rendered in italic." msgstr "" -#: ../../content/contributing/documentation/rst_cheat_sheet.rst:69 +#: ../../content/contributing/documentation/rst_cheat_sheet.rst:72 +msgid "Fill out the information *before* saving the form." +msgstr "" + +#: ../../content/contributing/documentation/rst_cheat_sheet.rst:81 +msgid "Strong emphasis (bold)" +msgstr "" + +#: ../../content/contributing/documentation/rst_cheat_sheet.rst:83 +msgid "To emphasize a part of the text. The text is rendered in bold." +msgstr "" + +#: ../../content/contributing/documentation/rst_cheat_sheet.rst:88 +msgid "A **subdomain** is a domain that is a part of another domain." +msgstr "" + +#: ../../content/contributing/documentation/rst_cheat_sheet.rst:97 +msgid "Technical term (literal)" +msgstr "" + +#: ../../content/contributing/documentation/rst_cheat_sheet.rst:99 +msgid "To write a technical term or a specific value to insert. The text is rendered in literal." +msgstr "" + +#: ../../content/contributing/documentation/rst_cheat_sheet.rst:104 +msgid "Insert the IP address of your printer, for example, `192.168.1.25`." +msgstr "" + +#: ../../content/contributing/documentation/rst_cheat_sheet.rst:113 +msgid "Definitions" +msgstr "" + +#: ../../content/contributing/documentation/rst_cheat_sheet.rst:115 +msgid "Use the `dfn` markup to define a term." +msgstr "" + +#: ../../content/contributing/documentation/rst_cheat_sheet.rst:120 +msgid "The documentation is written in RST and needs to be built (:dfn:`converted to HTML`) to display nicely." +msgstr "" + +#: ../../content/contributing/documentation/rst_cheat_sheet.rst:131 +msgid "Abbreviations" +msgstr "" + +#: ../../content/contributing/documentation/rst_cheat_sheet.rst:133 +msgid "Use the `abbr` markup to write a self-defining abbreviation that is displayed as a tooltip." +msgstr "" + +#: ../../content/contributing/documentation/rst_cheat_sheet.rst:138 +msgid "Odoo uses :abbr:`OCR (optical character recognition)` and artificial intelligence technologies to recognize the content of the documents." +msgstr "" + +#: ../../content/contributing/documentation/rst_cheat_sheet.rst:149 +msgid ":abbr:`GUI (Graphical User Interface)` element" +msgstr "" + +#: ../../content/contributing/documentation/rst_cheat_sheet.rst:151 +msgid "Use the `guilabel` markup to identify any text of the interactive user interface (e.g., button labels, view titles, field names, lists items, ...)." +msgstr "" + +#: ../../content/contributing/documentation/rst_cheat_sheet.rst:157 +msgid "Update your credentials, then click on :guilabel:`Save`." +msgstr "" + +#: ../../content/contributing/documentation/rst_cheat_sheet.rst:166 +msgid "Menu selection" +msgstr "" + +#: ../../content/contributing/documentation/rst_cheat_sheet.rst:168 +msgid "Use the `menuselection` markup to guide the user through a sequence of menus." +msgstr "" + +#: ../../content/contributing/documentation/rst_cheat_sheet.rst:173 +msgid "To review your sales performance, go to :menuselection:`Sales --> Reporting --> Dashboard`." +msgstr "" + +#: ../../content/contributing/documentation/rst_cheat_sheet.rst:182 +msgid "File" +msgstr "" + +#: ../../content/contributing/documentation/rst_cheat_sheet.rst:184 +msgid "Use the `file` markup to indicate a file path or name." +msgstr "" + +#: ../../content/contributing/documentation/rst_cheat_sheet.rst:190 +msgid "Create redirections with the :file:`redirects.txt` file at the root of the repository." +msgstr "" + +#: ../../content/contributing/documentation/rst_cheat_sheet.rst:199 +msgid "Command" +msgstr "" + +#: ../../content/contributing/documentation/rst_cheat_sheet.rst:201 +msgid "Use the `command` markup to highlight a command." +msgstr "" + +#: ../../content/contributing/documentation/rst_cheat_sheet.rst:206 +msgid "Run the command :command:`make clean html` to delete existing built files and build the documentation to HTML." +msgstr "" + +#: ../../content/contributing/documentation/rst_cheat_sheet.rst:217 +msgid "Lists" +msgstr "" + +#: ../../content/contributing/documentation/rst_cheat_sheet.rst:222 msgid "Bulleted list" msgstr "" -#: ../../content/contributing/documentation/rst_cheat_sheet.rst:85 +#: ../../content/contributing/documentation/rst_cheat_sheet.rst:227 +msgid "This is a bulleted list." +msgstr "" + +#: ../../content/contributing/documentation/rst_cheat_sheet.rst:228 +msgid "It has two items, the second item uses two lines." +msgstr "" + +#: ../../content/contributing/documentation/rst_cheat_sheet.rst:240 msgid "Numbered list" msgstr "" -#: ../../content/contributing/documentation/rst_cheat_sheet.rst:100 +#: ../../content/contributing/documentation/rst_cheat_sheet.rst:245 +msgid "This is a numbered list." +msgstr "" + +#: ../../content/contributing/documentation/rst_cheat_sheet.rst:246 +msgid "Numbering is automatic." +msgstr "" + +#: ../../content/contributing/documentation/rst_cheat_sheet.rst:256 +msgid "Use this format to start the numbering with a number other than one." +msgstr "" + +#: ../../content/contributing/documentation/rst_cheat_sheet.rst:258 +msgid "The numbering is automatic from there." +msgstr "" + +#: ../../content/contributing/documentation/rst_cheat_sheet.rst:267 +msgid "Prefer the use of autonumbered lists with `#.` for better code resilience." +msgstr "" + +#: ../../content/contributing/documentation/rst_cheat_sheet.rst:272 msgid "Nested lists" msgstr "" -#: ../../content/contributing/documentation/rst_cheat_sheet.rst:112 +#: ../../content/contributing/documentation/rst_cheat_sheet.rst:277 +msgid "This is the first item of a bulleted list." +msgstr "" + +#: ../../content/contributing/documentation/rst_cheat_sheet.rst:279 +msgid "It has a nested numbered list" +msgstr "" + +#: ../../content/contributing/documentation/rst_cheat_sheet.rst:280 +msgid "with two items." +msgstr "" + +#: ../../content/contributing/documentation/rst_cheat_sheet.rst:292 msgid "Hyperlinks" msgstr "" -#: ../../content/contributing/documentation/rst_cheat_sheet.rst:117 -msgid "Hyperlink references" +#: ../../content/contributing/documentation/rst_cheat_sheet.rst:297 +msgid "External hyperlinks" msgstr "" -#: ../../content/contributing/documentation/rst_cheat_sheet.rst:119 -msgid "Hyperlink references are links to a URL with a custom label. They follow this syntax: ```label `_``" +#: ../../content/contributing/documentation/rst_cheat_sheet.rst:299 +msgid "External hyperlinks are links to a URL with a custom label. They follow this syntax: ```label `_``" msgstr "" -#: ../../content/contributing/documentation/rst_cheat_sheet.rst:123 +#: ../../content/contributing/documentation/rst_cheat_sheet.rst:303 msgid "The URL can be a relative path to a file within the documentation." msgstr "" -#: ../../content/contributing/documentation/rst_cheat_sheet.rst:126 -#: ../../content/contributing/documentation/rst_cheat_sheet.rst:147 -#: ../../content/contributing/documentation/rst_cheat_sheet.rst:193 -#: ../../content/contributing/documentation/rst_cheat_sheet.rst:233 -#: ../../content/contributing/documentation/rst_cheat_sheet.rst:264 -#: ../../content/contributing/documentation/rst_cheat_sheet.rst:289 -#: ../../content/contributing/documentation/rst_cheat_sheet.rst:314 +#: ../../content/contributing/documentation/rst_cheat_sheet.rst:304 +msgid "Use the :ref:`documentation pages hyperlinks ` if you target another documentation page." +msgstr "" + +#: ../../content/contributing/documentation/rst_cheat_sheet.rst:310 +msgid "For instance, `this is an external hyperlink to Odoo's website `_." +msgstr "" + +#: ../../content/contributing/documentation/rst_cheat_sheet.rst:319 +msgid "External hyperlink aliases" +msgstr "" + +#: ../../content/contributing/documentation/rst_cheat_sheet.rst:321 +msgid "External hyperlink aliases allow creating shortcuts for external hyperlinks." +msgstr "" + +#: ../../content/contributing/documentation/rst_cheat_sheet.rst:322 +msgid "The definition syntax is as follows: ``.. _target: URL``" +msgstr "" + +#: ../../content/contributing/documentation/rst_cheat_sheet.rst:323 +msgid "There are two ways to reference them, depending on the use case:" +msgstr "" + +#: ../../content/contributing/documentation/rst_cheat_sheet.rst:325 +msgid "``target_`` creates a hyperlink with the target name as label and the URL as reference. Note that the ``_`` moved after the target!" +msgstr "" + +#: ../../content/contributing/documentation/rst_cheat_sheet.rst:327 +msgid "```label `_`` does exactly what you expect: the label replaces the name of the target, and the target is replaced by the URL." +msgstr "" + +#: ../../content/contributing/documentation/rst_cheat_sheet.rst:333 +msgid "A `proof-of-concept `_ is a simplified version, a prototype of what is expected to agree on the main lines of expected changes. `PoC `_ is a common abbreviation." +msgstr "" + +#: ../../content/contributing/documentation/rst_cheat_sheet.rst:347 +msgid "Custom anchors" +msgstr "" + +#: ../../content/contributing/documentation/rst_cheat_sheet.rst:349 +msgid "Custom anchors follow the same syntax as external hyperlink aliases but without any URL. Indeed, they are internal. They allow referencing a specific part of a document by using the target as an anchor. When the user clicks on the reference, the documentation scrolls to the part of the page containing the anchor." +msgstr "" + +#: ../../content/contributing/documentation/rst_cheat_sheet.rst:354 +msgid "The definition syntax is: ``.. _target:``" +msgstr "" + +#: ../../content/contributing/documentation/rst_cheat_sheet.rst:355 +msgid "There are two ways to reference them, both using the ``ref`` markup:" +msgstr "" + +#: ../../content/contributing/documentation/rst_cheat_sheet.rst:357 +msgid "``:ref:`target``` creates a hyperlink to the anchor with the heading defined below as label." +msgstr "" + +#: ../../content/contributing/documentation/rst_cheat_sheet.rst:358 +msgid "``:ref:`label ``` creates a hyperlink to the anchor with the given label." +msgstr "" + +#: ../../content/contributing/documentation/rst_cheat_sheet.rst:360 +msgid "See :ref:`contributing/relative-links` to learn how to write proper relative links for internal references." +msgstr "" + +#: ../../content/contributing/documentation/rst_cheat_sheet.rst:364 +msgid "Custom anchors can be referenced from other files than the ones in which they are defined." +msgstr "" + +#: ../../content/contributing/documentation/rst_cheat_sheet.rst:365 +msgid "Notice that there is no ``_`` at the end, contrary to what is done with :ref:`external hyperlinks `." +msgstr "" + +#: ../../content/contributing/documentation/rst_cheat_sheet.rst:371 +msgid "This can easily be done by creating a new product, see `How to create a product? `_ for additional help." +msgstr "" + +#: ../../content/contributing/documentation/rst_cheat_sheet.rst:374 +msgid "**How to create a product?**" +msgstr "" + +#: ../../content/contributing/documentation/rst_cheat_sheet.rst:376 +msgid "As explained at the `start of the page `_, ..." +msgstr "" + +#: ../../content/contributing/documentation/rst_cheat_sheet.rst:394 +msgid "Documentation pages hyperlinks" +msgstr "" + +#: ../../content/contributing/documentation/rst_cheat_sheet.rst:397 +msgid "The ``doc`` markup allows referencing a documentation page wherever it is in the file tree through a relative file path." +msgstr "" + +#: ../../content/contributing/documentation/rst_cheat_sheet.rst:398 +msgid "As usual, there are two ways to use the markup:" +msgstr "" + +#: ../../content/contributing/documentation/rst_cheat_sheet.rst:401 +msgid "``:doc:`path_to_doc_page``` creates a hyperlink to the documentation page with the title of the page as label." +msgstr "" + +#: ../../content/contributing/documentation/rst_cheat_sheet.rst:403 +msgid "``:doc:`label ``` creates a hyperlink to the documentation page with the given label." +msgstr "" + #: ../../content/contributing/documentation/rst_cheat_sheet.rst:409 +msgid "Please refer to `this documentation `_ and to `Send a pro-forma invoice `_." +msgstr "" + +#: ../../content/contributing/documentation/rst_cheat_sheet.rst:420 +msgid "File download hyperlinks" +msgstr "" + +#: ../../content/contributing/documentation/rst_cheat_sheet.rst:422 +msgid "The ``download`` markup allows referencing files (that are not necessarily :abbr:`RST (reStructuredText)` documents) within the source tree to be downloaded." +msgstr "" + +#: ../../content/contributing/documentation/rst_cheat_sheet.rst:428 +msgid "Download this `module structure template `_ to start building your module in no time." +msgstr "" + +#: ../../content/contributing/documentation/rst_cheat_sheet.rst:442 +msgid "The ``image`` markup allows inserting images in a document." +msgstr "" + +#: ../../content/contributing/documentation/rst_cheat_sheet.rst:458 +msgid "Add the :code:`:class: o-no-modal` `option `_ to an image to prevent opening it in a modal." +msgstr "" + +#: ../../content/contributing/documentation/rst_cheat_sheet.rst:465 +msgid "Alert blocks (admonitions)" +msgstr "" + +#: ../../content/contributing/documentation/rst_cheat_sheet.rst:470 +msgid "Seealso" +msgstr "" + +#: ../../content/contributing/documentation/rst_cheat_sheet.rst:476 +msgid "`Customer invoices `_" +msgstr "" + +#: ../../content/contributing/documentation/rst_cheat_sheet.rst:477 +msgid "`Pro-forma invoices `_" +msgstr "" + +#: ../../content/contributing/documentation/rst_cheat_sheet.rst:488 +msgid "Note" +msgstr "" + +#: ../../content/contributing/documentation/rst_cheat_sheet.rst:494 +msgid "Use this alert block to grab the reader's attention about additional information." +msgstr "" + +#: ../../content/contributing/documentation/rst_cheat_sheet.rst:504 +msgid "Tip" +msgstr "" + +#: ../../content/contributing/documentation/rst_cheat_sheet.rst:510 +msgid "Use this alert block to inform the reader about a useful trick that requires an action." +msgstr "" + +#: ../../content/contributing/documentation/rst_cheat_sheet.rst:520 #: ../../content/contributing/documentation/rst_guidelines.rst:17 msgid "Example" msgstr "" -#: ../../content/contributing/documentation/rst_cheat_sheet.rst:128 -msgid "This excerpt of :abbr:`RST (reStructuredText)`: ``For instance, `this is a hyperlink reference `_.`` is rendered as follows in HTML: “For instance, `this is a hyperlink reference `_.”" +#: ../../content/contributing/documentation/rst_cheat_sheet.rst:526 +msgid "Use this alert block to show an example." msgstr "" -#: ../../content/contributing/documentation/rst_cheat_sheet.rst:135 -msgid "External hyperlink targets" -msgstr "" - -#: ../../content/contributing/documentation/rst_cheat_sheet.rst:137 -msgid "External hyperlink targets allow creating shortcuts for hyperlink references." -msgstr "" - -#: ../../content/contributing/documentation/rst_cheat_sheet.rst:138 -msgid "The definition syntax is as follows: ``.. _target: URL``" -msgstr "" - -#: ../../content/contributing/documentation/rst_cheat_sheet.rst:139 -msgid "There are two ways to reference them, depending on the use case:" -msgstr "" - -#: ../../content/contributing/documentation/rst_cheat_sheet.rst:141 -msgid "``target_`` creates a hyperlink with the target name as label and the URL as reference. Note that the ``_`` moved after the target!" -msgstr "" - -#: ../../content/contributing/documentation/rst_cheat_sheet.rst:143 -msgid "```label `_`` does exactly what you expect: the label replaces the name of the target, and the target is replaced by the URL." -msgstr "" - -#: ../../content/contributing/documentation/rst_cheat_sheet.rst:150 -#: ../../content/contributing/documentation/rst_cheat_sheet.rst:196 -#: ../../content/contributing/documentation/rst_cheat_sheet.rst:236 -#: ../../content/contributing/documentation/rst_cheat_sheet.rst:267 -#: ../../content/contributing/documentation/rst_cheat_sheet.rst:292 -#: ../../content/contributing/documentation/rst_cheat_sheet.rst:317 -#: ../../content/contributing/documentation/rst_cheat_sheet.rst:353 -#: ../../content/contributing/documentation/rst_cheat_sheet.rst:374 -#: ../../content/contributing/documentation/rst_cheat_sheet.rst:393 -#: ../../content/contributing/documentation/rst_cheat_sheet.rst:412 -#: ../../content/contributing/documentation/rst_cheat_sheet.rst:431 -#: ../../content/contributing/documentation/rst_cheat_sheet.rst:450 -#: ../../content/contributing/documentation/rst_cheat_sheet.rst:469 -#: ../../content/contributing/documentation/rst_cheat_sheet.rst:490 -#: ../../content/contributing/documentation/rst_cheat_sheet.rst:509 -#: ../../content/contributing/documentation/rst_cheat_sheet.rst:530 -#: ../../content/contributing/documentation/rst_cheat_sheet.rst:570 -#: ../../content/contributing/documentation/rst_cheat_sheet.rst:613 -#: ../../content/contributing/documentation/rst_cheat_sheet.rst:690 -#: ../../content/contributing/documentation/rst_cheat_sheet.rst:786 -#: ../../content/contributing/documentation/rst_cheat_sheet.rst:876 -msgid "RST" -msgstr "" - -#: ../../content/contributing/documentation/rst_cheat_sheet.rst:160 -#: ../../content/contributing/documentation/rst_cheat_sheet.rst:212 -#: ../../content/contributing/documentation/rst_cheat_sheet.rst:244 -#: ../../content/contributing/documentation/rst_cheat_sheet.rst:275 -#: ../../content/contributing/documentation/rst_cheat_sheet.rst:300 -#: ../../content/contributing/documentation/rst_cheat_sheet.rst:331 -#: ../../content/contributing/documentation/rst_cheat_sheet.rst:362 -#: ../../content/contributing/documentation/rst_cheat_sheet.rst:382 -#: ../../content/contributing/documentation/rst_cheat_sheet.rst:401 -#: ../../content/contributing/documentation/rst_cheat_sheet.rst:420 -#: ../../content/contributing/documentation/rst_cheat_sheet.rst:439 -#: ../../content/contributing/documentation/rst_cheat_sheet.rst:458 -#: ../../content/contributing/documentation/rst_cheat_sheet.rst:478 -#: ../../content/contributing/documentation/rst_cheat_sheet.rst:498 -#: ../../content/contributing/documentation/rst_cheat_sheet.rst:518 -#: ../../content/contributing/documentation/rst_cheat_sheet.rst:540 -#: ../../content/contributing/documentation/rst_cheat_sheet.rst:589 -#: ../../content/contributing/documentation/rst_cheat_sheet.rst:648 -#: ../../content/contributing/documentation/rst_cheat_sheet.rst:734 -#: ../../content/contributing/documentation/rst_cheat_sheet.rst:810 -#: ../../content/contributing/documentation/rst_cheat_sheet.rst:885 -msgid "Render" -msgstr "" - -#: ../../content/contributing/documentation/rst_cheat_sheet.rst:162 -msgid "A `proof-of-concept `_ is a simplified version, a prototype of what is expected to agree on the main lines of expected changes. `PoC `_ is a common abbreviation." -msgstr "" - -#: ../../content/contributing/documentation/rst_cheat_sheet.rst:169 -msgid "Internal hyperlink targets" -msgstr "" - -#: ../../content/contributing/documentation/rst_cheat_sheet.rst:171 -msgid "Internal hyperlink targets follow the same syntax as external hyperlink targets but without any URL. Indeed, they are internal. They allow referencing a specific part of a document by using the target as an anchor. When the user clicks on the reference, the documentation scrolls to the part of the page containing the target." -msgstr "" - -#: ../../content/contributing/documentation/rst_cheat_sheet.rst:177 -msgid "Targets can be referenced from other files than the ones in which they are defined." -msgstr "" - -#: ../../content/contributing/documentation/rst_cheat_sheet.rst:179 -msgid "The definition syntax is: ``.. _target:``" -msgstr "" - -#: ../../content/contributing/documentation/rst_cheat_sheet.rst:180 -msgid "There are two ways to reference them, both using the ``ref`` directive:" -msgstr "" - -#: ../../content/contributing/documentation/rst_cheat_sheet.rst:182 -msgid "``:ref:`target``` creates a hyperlink to the anchor with the heading defined below as label." -msgstr "" - -#: ../../content/contributing/documentation/rst_cheat_sheet.rst:183 -msgid "``:ref:`label ``` creates a hyperlink to the anchor with the given label." -msgstr "" - -#: ../../content/contributing/documentation/rst_cheat_sheet.rst:185 -msgid "See :ref:`contributing/relative-links` to learn how to write proper relative links for internal references." -msgstr "" - -#: ../../content/contributing/documentation/rst_cheat_sheet.rst:189 -msgid "Notice that there is no ``_`` at the end, as it is done with :ref:`hyperlink targets `." -msgstr "" - -#: ../../content/contributing/documentation/rst_cheat_sheet.rst:214 -msgid "This can easily be done by creating a new product, see `How to create a product? `_ for additional help." -msgstr "" - -#: ../../content/contributing/documentation/rst_cheat_sheet.rst:217 -msgid "**How to create a product?**" -msgstr "" - -#: ../../content/contributing/documentation/rst_cheat_sheet.rst:219 -msgid "As explained at the `start of the page `_, ..." -msgstr "" - -#: ../../content/contributing/documentation/rst_cheat_sheet.rst:224 -msgid "Implicit hyperlink targets" -msgstr "" - -#: ../../content/contributing/documentation/rst_cheat_sheet.rst:228 -msgid "Implicit hyperlink targets are a special kind of internal hyperlink targets: they are automatically generated by section titles, footnotes, etc. Consequently, they don’t have a definition syntax." -msgstr "" - -#: ../../content/contributing/documentation/rst_cheat_sheet.rst:230 -msgid "They can be referenced the same first way as external hyperlink targets by using the name of the section title as URL." -msgstr "" - -#: ../../content/contributing/documentation/rst_cheat_sheet.rst:246 -msgid "This can easily be done by creating a new user, see `How to create a new user? `_ for additional help. ..." -msgstr "" - -#: ../../content/contributing/documentation/rst_cheat_sheet.rst:252 -msgid "The ``doc`` directive" -msgstr "" - -#: ../../content/contributing/documentation/rst_cheat_sheet.rst:255 -msgid "The ``doc`` directive allows referencing a documentation page wherever it is in the file tree through a relative file path." -msgstr "" - -#: ../../content/contributing/documentation/rst_cheat_sheet.rst:256 -msgid "As usual, there are two ways to use the directive:" -msgstr "" - -#: ../../content/contributing/documentation/rst_cheat_sheet.rst:258 -msgid "``:doc:`path_to_doc_page``` creates a hyperlink reference to the documentation page with the title of the page as label." -msgstr "" - -#: ../../content/contributing/documentation/rst_cheat_sheet.rst:260 -msgid "``:doc:`label ``` creates a hyperlink reference to the documentation page with the given label." -msgstr "" - -#: ../../content/contributing/documentation/rst_cheat_sheet.rst:277 -msgid "Please refer to `this documentation `_ and to `Send a pro-forma invoice `_." -msgstr "" - -#: ../../content/contributing/documentation/rst_cheat_sheet.rst:283 -msgid "The ``download`` directive" -msgstr "" - -#: ../../content/contributing/documentation/rst_cheat_sheet.rst:285 -msgid "The ``download`` directive allows referencing files (that are not necessarily :abbr:`RST (reStructuredText)` documents) within the source tree to be downloaded." -msgstr "" - -#: ../../content/contributing/documentation/rst_cheat_sheet.rst:302 -msgid "Download this `module structure template `_ to start building your module in no time." -msgstr "" - -#: ../../content/contributing/documentation/rst_cheat_sheet.rst:308 -msgid "The ``image`` directive" -msgstr "" - -#: ../../content/contributing/documentation/rst_cheat_sheet.rst:310 -msgid "The ``image`` directive allows inserting images in a document. It comes with a set of optional parameter directives that can individually be omitted if considered redundant." -msgstr "" - -#: ../../content/contributing/documentation/rst_cheat_sheet.rst:345 -msgid "Admonitions (alert blocks)" -msgstr "" - -#: ../../content/contributing/documentation/rst_cheat_sheet.rst:350 -msgid "Seealso" -msgstr "" - -#: ../../content/contributing/documentation/rst_cheat_sheet.rst:365 -msgid "`Customer invoices `_" -msgstr "" - -#: ../../content/contributing/documentation/rst_cheat_sheet.rst:366 -msgid "`Pro-forma invoices `_" -msgstr "" - -#: ../../content/contributing/documentation/rst_cheat_sheet.rst:371 -msgid "Note" -msgstr "" - -#: ../../content/contributing/documentation/rst_cheat_sheet.rst:385 -msgid "Use this admonition to grab the reader's attention about additional information." -msgstr "" - -#: ../../content/contributing/documentation/rst_cheat_sheet.rst:390 -msgid "Tip" -msgstr "" - -#: ../../content/contributing/documentation/rst_cheat_sheet.rst:404 -msgid "Use this admonition to inform the reader about a useful trick that requires an action." -msgstr "" - -#: ../../content/contributing/documentation/rst_cheat_sheet.rst:423 -msgid "Use this admonition to show an example." -msgstr "" - -#: ../../content/contributing/documentation/rst_cheat_sheet.rst:428 +#: ../../content/contributing/documentation/rst_cheat_sheet.rst:536 msgid "Exercise" msgstr "" -#: ../../content/contributing/documentation/rst_cheat_sheet.rst:442 -msgid "Use this admonition to suggest an exercise to the reader." +#: ../../content/contributing/documentation/rst_cheat_sheet.rst:542 +msgid "Use this alert block to suggest an exercise to the reader." msgstr "" -#: ../../content/contributing/documentation/rst_cheat_sheet.rst:447 +#: ../../content/contributing/documentation/rst_cheat_sheet.rst:552 msgid "Important" msgstr "" -#: ../../content/contributing/documentation/rst_cheat_sheet.rst:461 -msgid "Use this admonition to notify the reader about an important information." +#: ../../content/contributing/documentation/rst_cheat_sheet.rst:558 +msgid "Use this alert block to notify the reader about important information." msgstr "" -#: ../../content/contributing/documentation/rst_cheat_sheet.rst:466 +#: ../../content/contributing/documentation/rst_cheat_sheet.rst:568 msgid "Warning" msgstr "" -#: ../../content/contributing/documentation/rst_cheat_sheet.rst:481 -msgid "Use this admonition to require the reader to proceed with caution with what is described in the warning." +#: ../../content/contributing/documentation/rst_cheat_sheet.rst:574 +msgid "Use this alert block to require the reader to proceed with caution with what is described in the warning." msgstr "" -#: ../../content/contributing/documentation/rst_cheat_sheet.rst:487 +#: ../../content/contributing/documentation/rst_cheat_sheet.rst:586 msgid "Danger" msgstr "" -#: ../../content/contributing/documentation/rst_cheat_sheet.rst:501 -msgid "Use this admonition to bring the reader's attention to a serious threat." +#: ../../content/contributing/documentation/rst_cheat_sheet.rst:592 +msgid "Use this alert block to bring the reader's attention to a serious threat." msgstr "" -#: ../../content/contributing/documentation/rst_cheat_sheet.rst:506 +#: ../../content/contributing/documentation/rst_cheat_sheet.rst:602 msgid "Custom" msgstr "" -#: ../../content/contributing/documentation/rst_cheat_sheet.rst:520 +#: ../../content/contributing/documentation/rst_cheat_sheet.rst:607 msgid "Title" msgstr "" -#: ../../content/contributing/documentation/rst_cheat_sheet.rst:522 -msgid "Customize this admonition with a **Title** of your choice." +#: ../../content/contributing/documentation/rst_cheat_sheet.rst:609 +msgid "Customize this alert block with a **Title** of your choice." msgstr "" -#: ../../content/contributing/documentation/rst_cheat_sheet.rst:527 -msgid "Code blocks" +#: ../../content/contributing/documentation/rst_cheat_sheet.rst:620 +msgid "Tables" msgstr "" -#: ../../content/contributing/documentation/rst_cheat_sheet.rst:550 -msgid "Content tabs" +#: ../../content/contributing/documentation/rst_cheat_sheet.rst:623 +msgid "List tables" msgstr "" -#: ../../content/contributing/documentation/rst_cheat_sheet.rst:553 -msgid "The `tabs` directive may not work well in some situations. In particular:" +#: ../../content/contributing/documentation/rst_cheat_sheet.rst:625 +msgid "List tables use two-level bulleted lists to convert data into a table. The first level represents the rows and the second level represents the columns." msgstr "" -#: ../../content/contributing/documentation/rst_cheat_sheet.rst:555 -msgid "The tabs' headers cannot be translated." +#: ../../content/contributing/documentation/rst_cheat_sheet.rst:635 +msgid "Name" msgstr "" -#: ../../content/contributing/documentation/rst_cheat_sheet.rst:556 -msgid "A tab cannot contain :ref:`headings `." +#: ../../content/contributing/documentation/rst_cheat_sheet.rst:636 +msgid "Country" msgstr "" -#: ../../content/contributing/documentation/rst_cheat_sheet.rst:557 -msgid "An :ref:`admonition ` cannot contain tabs." +#: ../../content/contributing/documentation/rst_cheat_sheet.rst:637 +msgid "Favorite color" msgstr "" -#: ../../content/contributing/documentation/rst_cheat_sheet.rst:558 -msgid "A tab cannot contain :ref:`internal hyperlink targets `." +#: ../../content/contributing/documentation/rst_cheat_sheet.rst:638 +msgid "Raúl" msgstr "" -#: ../../content/contributing/documentation/rst_cheat_sheet.rst:564 -msgid "Basic tabs" +#: ../../content/contributing/documentation/rst_cheat_sheet.rst:639 +msgid "Montenegro" msgstr "" -#: ../../content/contributing/documentation/rst_cheat_sheet.rst:566 -msgid "Basic tabs are useful to split content into multiple options. The `tabs` directive is used to define a sequence of tabs. Each tab is then defined with the `tab` directive followed by a label." +#: ../../content/contributing/documentation/rst_cheat_sheet.rst:640 +#: ../../content/contributing/documentation/rst_cheat_sheet.rst:672 +msgid "Purple" msgstr "" -#: ../../content/contributing/documentation/rst_cheat_sheet.rst:593 -msgid "Odoo Online" +#: ../../content/contributing/documentation/rst_cheat_sheet.rst:641 +msgid "Mélanie" msgstr "" -#: ../../content/contributing/documentation/rst_cheat_sheet.rst:595 -msgid "Content dedicated to Odoo Online users." +#: ../../content/contributing/documentation/rst_cheat_sheet.rst:642 +msgid "France" msgstr "" -#: ../../content/contributing/documentation/rst_cheat_sheet.rst:597 -msgid "Odoo.sh" -msgstr "" - -#: ../../content/contributing/documentation/rst_cheat_sheet.rst:599 -msgid "Alternative for Odoo.sh users." -msgstr "" - -#: ../../content/contributing/documentation/rst_cheat_sheet.rst:601 -msgid "On-premise" -msgstr "" - -#: ../../content/contributing/documentation/rst_cheat_sheet.rst:603 -msgid "Third version for On-premise users." -msgstr "" - -#: ../../content/contributing/documentation/rst_cheat_sheet.rst:608 -msgid "Nested tabs" -msgstr "" - -#: ../../content/contributing/documentation/rst_cheat_sheet.rst:610 -msgid "Tabs can be nested inside one another." -msgstr "" - -#: ../../content/contributing/documentation/rst_cheat_sheet.rst:652 -msgid "Stars" -msgstr "" - -#: ../../content/contributing/documentation/rst_cheat_sheet.rst:656 -msgid "The Sun" -msgstr "" - -#: ../../content/contributing/documentation/rst_cheat_sheet.rst:658 -msgid "The closest star to us." -msgstr "" - -#: ../../content/contributing/documentation/rst_cheat_sheet.rst:660 -msgid "Proxima Centauri" +#: ../../content/contributing/documentation/rst_cheat_sheet.rst:643 +msgid "Red" msgstr "" #: ../../content/contributing/documentation/rst_cheat_sheet.rst:662 -msgid "The second closest star to us." +msgid "Grid tables" msgstr "" #: ../../content/contributing/documentation/rst_cheat_sheet.rst:664 -msgid "Polaris" +msgid "Grid tables represent the rendered table and are more visual to work with." msgstr "" -#: ../../content/contributing/documentation/rst_cheat_sheet.rst:666 -msgid "The North Star." +#: ../../content/contributing/documentation/rst_cheat_sheet.rst:670 +msgid "Shirts" msgstr "" -#: ../../content/contributing/documentation/rst_cheat_sheet.rst:668 -msgid "Moons" +#: ../../content/contributing/documentation/rst_cheat_sheet.rst:670 +msgid "T-shirts" msgstr "" #: ../../content/contributing/documentation/rst_cheat_sheet.rst:672 -msgid "The Moon" +msgid "**Available colours**" +msgstr "" + +#: ../../content/contributing/documentation/rst_cheat_sheet.rst:672 +msgid "Green" msgstr "" #: ../../content/contributing/documentation/rst_cheat_sheet.rst:674 -msgid "Orbits the Earth." +msgid "Turquoise" +msgstr "" + +#: ../../content/contributing/documentation/rst_cheat_sheet.rst:674 +msgid "Orange" msgstr "" #: ../../content/contributing/documentation/rst_cheat_sheet.rst:676 +msgid "**Sleeves length**" +msgstr "" + +#: ../../content/contributing/documentation/rst_cheat_sheet.rst:676 +msgid "Long sleeves" +msgstr "" + +#: ../../content/contributing/documentation/rst_cheat_sheet.rst:676 +msgid "Short sleeves" +msgstr "" + +#: ../../content/contributing/documentation/rst_cheat_sheet.rst:692 +msgid "Use `=` instead of `-` to define header rows." +msgstr "" + +#: ../../content/contributing/documentation/rst_cheat_sheet.rst:693 +msgid "Remove `-` and `|` separators to merge cells." +msgstr "" + +#: ../../content/contributing/documentation/rst_cheat_sheet.rst:694 +msgid "Make use of `this convenient table generator `_ to build your tables. Then, copy-paste the generated formatting into your document." +msgstr "" + +#: ../../content/contributing/documentation/rst_cheat_sheet.rst:700 +msgid "Code blocks" +msgstr "" + +#: ../../content/contributing/documentation/rst_cheat_sheet.rst:720 +msgid "Content tabs" +msgstr "" + +#: ../../content/contributing/documentation/rst_cheat_sheet.rst:723 +msgid "The `tabs` markup may not work well in some situations. In particular:" +msgstr "" + +#: ../../content/contributing/documentation/rst_cheat_sheet.rst:725 +msgid "The tabs' headers cannot be translated." +msgstr "" + +#: ../../content/contributing/documentation/rst_cheat_sheet.rst:726 +msgid "A tab cannot contain :ref:`headings `." +msgstr "" + +#: ../../content/contributing/documentation/rst_cheat_sheet.rst:727 +msgid "An :ref:`alert block ` cannot contain tabs." +msgstr "" + +#: ../../content/contributing/documentation/rst_cheat_sheet.rst:728 +msgid "A tab cannot contain :ref:`custom anchors `." +msgstr "" + +#: ../../content/contributing/documentation/rst_cheat_sheet.rst:733 +msgid "Basic tabs" +msgstr "" + +#: ../../content/contributing/documentation/rst_cheat_sheet.rst:735 +msgid "Basic tabs are useful to split the content into multiple options. The `tabs` markup is used to define sequence of tabs. Each tab is then defined with the `tab` markup followed by a label." +msgstr "" + +#: ../../content/contributing/documentation/rst_cheat_sheet.rst:743 +msgid "Odoo Online" +msgstr "" + +#: ../../content/contributing/documentation/rst_cheat_sheet.rst:745 +msgid "Content dedicated to Odoo Online users." +msgstr "" + +#: ../../content/contributing/documentation/rst_cheat_sheet.rst:747 +msgid "Odoo.sh" +msgstr "" + +#: ../../content/contributing/documentation/rst_cheat_sheet.rst:749 +msgid "Alternative for Odoo.sh users." +msgstr "" + +#: ../../content/contributing/documentation/rst_cheat_sheet.rst:751 +msgid "On-premise" +msgstr "" + +#: ../../content/contributing/documentation/rst_cheat_sheet.rst:753 +msgid "Third version for On-premise users." +msgstr "" + +#: ../../content/contributing/documentation/rst_cheat_sheet.rst:774 +msgid "Nested tabs" +msgstr "" + +#: ../../content/contributing/documentation/rst_cheat_sheet.rst:776 +msgid "Tabs can be nested inside one another." +msgstr "" + +#: ../../content/contributing/documentation/rst_cheat_sheet.rst:783 +msgid "Stars" +msgstr "" + +#: ../../content/contributing/documentation/rst_cheat_sheet.rst:787 +msgid "The Sun" +msgstr "" + +#: ../../content/contributing/documentation/rst_cheat_sheet.rst:789 +msgid "The closest star to us." +msgstr "" + +#: ../../content/contributing/documentation/rst_cheat_sheet.rst:791 +msgid "Proxima Centauri" +msgstr "" + +#: ../../content/contributing/documentation/rst_cheat_sheet.rst:793 +msgid "The second closest star to us." +msgstr "" + +#: ../../content/contributing/documentation/rst_cheat_sheet.rst:795 +msgid "Polaris" +msgstr "" + +#: ../../content/contributing/documentation/rst_cheat_sheet.rst:797 +msgid "The North Star." +msgstr "" + +#: ../../content/contributing/documentation/rst_cheat_sheet.rst:799 +msgid "Moons" +msgstr "" + +#: ../../content/contributing/documentation/rst_cheat_sheet.rst:803 +msgid "The Moon" +msgstr "" + +#: ../../content/contributing/documentation/rst_cheat_sheet.rst:805 +msgid "Orbits the Earth." +msgstr "" + +#: ../../content/contributing/documentation/rst_cheat_sheet.rst:807 msgid "Titan" msgstr "" -#: ../../content/contributing/documentation/rst_cheat_sheet.rst:678 +#: ../../content/contributing/documentation/rst_cheat_sheet.rst:809 msgid "Orbits Jupiter." msgstr "" -#: ../../content/contributing/documentation/rst_cheat_sheet.rst:683 +#: ../../content/contributing/documentation/rst_cheat_sheet.rst:846 msgid "Group tabs" msgstr "" -#: ../../content/contributing/documentation/rst_cheat_sheet.rst:685 -msgid "Group tabs are special tabs that synchronize based on a group label. The last selected group is remembered and automatically selected when the user returns on the page or visits another page with the tabs group. The `group-tab` directive is used to define group tabs." +#: ../../content/contributing/documentation/rst_cheat_sheet.rst:848 +msgid "Group tabs are special tabs that synchronize based on a group label. The last selected group is remembered and automatically selected when the user returns to the page or visits another page with the tabs group. The `group-tab` markup is used to define group tabs." msgstr "" -#: ../../content/contributing/documentation/rst_cheat_sheet.rst:738 -#: ../../content/contributing/documentation/rst_cheat_sheet.rst:740 -#: ../../content/contributing/documentation/rst_cheat_sheet.rst:752 +#: ../../content/contributing/documentation/rst_cheat_sheet.rst:857 +#: ../../content/contributing/documentation/rst_cheat_sheet.rst:859 +#: ../../content/contributing/documentation/rst_cheat_sheet.rst:871 msgid "C++" msgstr "" -#: ../../content/contributing/documentation/rst_cheat_sheet.rst:746 -#: ../../content/contributing/documentation/rst_cheat_sheet.rst:748 -#: ../../content/contributing/documentation/rst_cheat_sheet.rst:767 +#: ../../content/contributing/documentation/rst_cheat_sheet.rst:865 +#: ../../content/contributing/documentation/rst_cheat_sheet.rst:867 +#: ../../content/contributing/documentation/rst_cheat_sheet.rst:886 msgid "Java" msgstr "" -#: ../../content/contributing/documentation/rst_cheat_sheet.rst:778 +#: ../../content/contributing/documentation/rst_cheat_sheet.rst:938 msgid "Code tabs" msgstr "" -#: ../../content/contributing/documentation/rst_cheat_sheet.rst:780 -msgid "Code tabs are essentially :ref:`group tabs ` that treat the content as a :ref:`code block `. The `code-tab` directive is used to define a code tab. Just as for the `code-block` directive, the language defines the syntax highlighting of the tab. If set, the label is used instead of the language for grouping tabs." +#: ../../content/contributing/documentation/rst_cheat_sheet.rst:940 +msgid "Code tabs are essentially :ref:`group tabs ` that treat the content as a :ref:`code block `. The `code-tab` markup is used to define a code tab. Just as for the `code-block` markup, the language defines the syntax highlighting of the tab. If set, the label is used instead of the language for grouping tabs." msgstr "" -#: ../../content/contributing/documentation/rst_cheat_sheet.rst:834 +#: ../../content/contributing/documentation/rst_cheat_sheet.rst:991 msgid "Document metadata" msgstr "" -#: ../../content/contributing/documentation/rst_cheat_sheet.rst:836 -msgid "Sphinx supports document-wide metadata directives that specify a behavior for the entire page." +#: ../../content/contributing/documentation/rst_cheat_sheet.rst:993 +msgid "Sphinx supports document-wide metadata markups that specify a behavior for the entire page." msgstr "" -#: ../../content/contributing/documentation/rst_cheat_sheet.rst:837 +#: ../../content/contributing/documentation/rst_cheat_sheet.rst:994 msgid "They must be placed between colons (`:`) at the top of the source file." msgstr "" -#: ../../content/contributing/documentation/rst_cheat_sheet.rst:840 +#: ../../content/contributing/documentation/rst_cheat_sheet.rst:997 msgid "**Metadata**" msgstr "" -#: ../../content/contributing/documentation/rst_cheat_sheet.rst:840 -#: ../../content/contributing/documentation/rst_cheat_sheet.rst:919 +#: ../../content/contributing/documentation/rst_cheat_sheet.rst:997 msgid "**Purpose**" msgstr "" -#: ../../content/contributing/documentation/rst_cheat_sheet.rst:842 +#: ../../content/contributing/documentation/rst_cheat_sheet.rst:999 msgid "`show-content`" msgstr "" -#: ../../content/contributing/documentation/rst_cheat_sheet.rst:842 +#: ../../content/contributing/documentation/rst_cheat_sheet.rst:999 msgid "Make a toctree page accessible from the navigation menu." msgstr "" -#: ../../content/contributing/documentation/rst_cheat_sheet.rst:844 +#: ../../content/contributing/documentation/rst_cheat_sheet.rst:1001 msgid "`show-toc`" msgstr "" -#: ../../content/contributing/documentation/rst_cheat_sheet.rst:844 -msgid "Show the table of content on a page that has the `show-content` metadata directive." +#: ../../content/contributing/documentation/rst_cheat_sheet.rst:1001 +msgid "Show the table of content on a page that has the `show-content` metadata markup." msgstr "" -#: ../../content/contributing/documentation/rst_cheat_sheet.rst:847 +#: ../../content/contributing/documentation/rst_cheat_sheet.rst:1004 msgid "`code-column`" msgstr "" @@ -1404,204 +2380,80 @@ msgstr "" msgid "For example, see :doc:`/applications/finance/accounting/getting_started/memento`." msgstr "" -#: ../../content/contributing/documentation/rst_cheat_sheet.rst:852 +#: ../../content/contributing/documentation/rst_cheat_sheet.rst:1009 msgid "`hide-page-toc`" msgstr "" -#: ../../content/contributing/documentation/rst_cheat_sheet.rst:852 +#: ../../content/contributing/documentation/rst_cheat_sheet.rst:1009 msgid "Hide the \"On this page\" sidebar and use full page width for the content." msgstr "" -#: ../../content/contributing/documentation/rst_cheat_sheet.rst:854 +#: ../../content/contributing/documentation/rst_cheat_sheet.rst:1011 msgid "`custom-css`" msgstr "" -#: ../../content/contributing/documentation/rst_cheat_sheet.rst:854 +#: ../../content/contributing/documentation/rst_cheat_sheet.rst:1011 msgid "Link CSS files (comma-separated) to the document." msgstr "" -#: ../../content/contributing/documentation/rst_cheat_sheet.rst:856 +#: ../../content/contributing/documentation/rst_cheat_sheet.rst:1013 msgid "`custom-js`" msgstr "" -#: ../../content/contributing/documentation/rst_cheat_sheet.rst:856 +#: ../../content/contributing/documentation/rst_cheat_sheet.rst:1013 msgid "Link JS files (comma-separated) to the document." msgstr "" -#: ../../content/contributing/documentation/rst_cheat_sheet.rst:858 +#: ../../content/contributing/documentation/rst_cheat_sheet.rst:1015 msgid "`classes`" msgstr "" -#: ../../content/contributing/documentation/rst_cheat_sheet.rst:858 +#: ../../content/contributing/documentation/rst_cheat_sheet.rst:1015 msgid "Assign the specified classes to the `
` element of the document." msgstr "" -#: ../../content/contributing/documentation/rst_cheat_sheet.rst:860 +#: ../../content/contributing/documentation/rst_cheat_sheet.rst:1017 msgid "`orphan`" msgstr "" -#: ../../content/contributing/documentation/rst_cheat_sheet.rst:860 +#: ../../content/contributing/documentation/rst_cheat_sheet.rst:1017 msgid "Suppress the need to include the document in a toctree." msgstr "" -#: ../../content/contributing/documentation/rst_cheat_sheet.rst:862 +#: ../../content/contributing/documentation/rst_cheat_sheet.rst:1019 msgid "`nosearch`" msgstr "" -#: ../../content/contributing/documentation/rst_cheat_sheet.rst:862 +#: ../../content/contributing/documentation/rst_cheat_sheet.rst:1019 msgid "Exclude the document from search results." msgstr "" -#: ../../content/contributing/documentation/rst_cheat_sheet.rst:868 +#: ../../content/contributing/documentation/rst_cheat_sheet.rst:1025 msgid "Formatting tips" msgstr "" -#: ../../content/contributing/documentation/rst_cheat_sheet.rst:873 +#: ../../content/contributing/documentation/rst_cheat_sheet.rst:1030 msgid "Break the line but not the paragraph" msgstr "" -#: ../../content/contributing/documentation/rst_cheat_sheet.rst:888 -msgid "First super long line that you break in two… here is rendered as a single line." +#: ../../content/contributing/documentation/rst_cheat_sheet.rst:0 +msgid "A first long line that you break in two -> here <- is rendered as a single line." msgstr "" -#: ../../content/contributing/documentation/rst_cheat_sheet.rst:889 -msgid "Second line that follows a line break." +#: ../../content/contributing/documentation/rst_cheat_sheet.rst:0 +msgid "A second line that follows a line break." msgstr "" -#: ../../content/contributing/documentation/rst_cheat_sheet.rst:894 -msgid "Add comments" -msgstr "" - -#: ../../content/contributing/documentation/rst_cheat_sheet.rst:896 -msgid "If you made a particular choice of writing or formatting that a future writer should be able to understand and take into account, consider writing a comment. Comments are blocks of text that do not count as a part of the documentation and that are used to pass a message to writers of the source code. They consist of a line starting with two dots and a space, followed by the comment." -msgstr "" - -#: ../../content/contributing/documentation/rst_cheat_sheet.rst:901 -msgid "``.. For instance, this line will not be rendered in the documentation.``" -msgstr "" - -#: ../../content/contributing/documentation/rst_cheat_sheet.rst:906 -msgid "Use tables" -msgstr "" - -#: ../../content/contributing/documentation/rst_cheat_sheet.rst:908 -msgid "Make use of `this convenient table generator `_ to build your tables. Then, copy-paste the generated formatting into your document." -msgstr "" - -#: ../../content/contributing/documentation/rst_cheat_sheet.rst:914 -msgid "Spice up your writing with specialized directives" -msgstr "" - -#: ../../content/contributing/documentation/rst_cheat_sheet.rst:916 -msgid "Use these additional directives to fine-tune your content:" -msgstr "" - -#: ../../content/contributing/documentation/rst_cheat_sheet.rst:919 -msgid "**Directive**" -msgstr "" - -#: ../../content/contributing/documentation/rst_cheat_sheet.rst:919 -msgid "**Example**" -msgstr "" - -#: ../../content/contributing/documentation/rst_cheat_sheet.rst:921 -msgid "**RST**" -msgstr "" - -#: ../../content/contributing/documentation/rst_cheat_sheet.rst:921 -msgid "**HTML**" -msgstr "" - -#: ../../content/contributing/documentation/rst_cheat_sheet.rst:923 -msgid "``abbr``" -msgstr "" - -#: ../../content/contributing/documentation/rst_cheat_sheet.rst:923 -msgid "Self-defining abbreviations" -msgstr "" - -#: ../../content/contributing/documentation/rst_cheat_sheet.rst:923 -msgid "``:abbr:`SO (Sales Order)```" -msgstr "" - -#: ../../content/contributing/documentation/rst_cheat_sheet.rst:923 -msgid ":abbr:`SO (Sales Order)`" -msgstr "" - -#: ../../content/contributing/documentation/rst_cheat_sheet.rst:925 -msgid "``command``" -msgstr "" - -#: ../../content/contributing/documentation/rst_cheat_sheet.rst:925 -msgid "Highlight a command" -msgstr "" - -#: ../../content/contributing/documentation/rst_cheat_sheet.rst:925 -msgid "``:command:`python example.py```" -msgstr "" - -#: ../../content/contributing/documentation/rst_cheat_sheet.rst:925 -msgid ":command:`python example.py`" -msgstr "" - -#: ../../content/contributing/documentation/rst_cheat_sheet.rst:927 -msgid "``dfn``" -msgstr "" - -#: ../../content/contributing/documentation/rst_cheat_sheet.rst:927 -msgid "Define a term" -msgstr "" - -#: ../../content/contributing/documentation/rst_cheat_sheet.rst:927 -msgid "``:dfn:`a definition for a new term```" -msgstr "" - -#: ../../content/contributing/documentation/rst_cheat_sheet.rst:927 -msgid ":dfn:`a definition for a new term`" -msgstr "" - -#: ../../content/contributing/documentation/rst_cheat_sheet.rst:929 -msgid "``file``" -msgstr "" - -#: ../../content/contributing/documentation/rst_cheat_sheet.rst:929 -msgid "Indicate a file path" -msgstr "" - -#: ../../content/contributing/documentation/rst_cheat_sheet.rst:929 -msgid "``:file:`~/odoo/odoo-bin```" -msgstr "" - -#: ../../content/contributing/documentation/rst_cheat_sheet.rst:929 -msgid ":file:`~/odoo/odoo-bin`" -msgstr "" - -#: ../../content/contributing/documentation/rst_cheat_sheet.rst:931 -msgid "``menuselection``" -msgstr "" - -#: ../../content/contributing/documentation/rst_cheat_sheet.rst:931 -msgid "Guide a user through a sequence of menus" -msgstr "" - -#: ../../content/contributing/documentation/rst_cheat_sheet.rst:931 -msgid "``:menuselection:`Sales --> Configuration --> Settings```" -msgstr "" - -#: ../../content/contributing/documentation/rst_cheat_sheet.rst:931 -msgid ":menuselection:`Sales --> Configuration --> Settings`" -msgstr "" - -#: ../../content/contributing/documentation/rst_cheat_sheet.rst:937 +#: ../../content/contributing/documentation/rst_cheat_sheet.rst:1048 msgid "Escape markup symbols (Advanced)" msgstr "" -#: ../../content/contributing/documentation/rst_cheat_sheet.rst:939 +#: ../../content/contributing/documentation/rst_cheat_sheet.rst:1050 msgid "Markup symbols escaped with backslashes (``\\``) are rendered normally. For instance, ``this \\*\\*line of text\\*\\* with \\*markup\\* symbols`` is rendered as “this \\*\\*line of text\\*\\* with \\*markup\\* symbols”." msgstr "" -#: ../../content/contributing/documentation/rst_cheat_sheet.rst:943 -msgid "When it comes to backticks (`````), which are used in many case such as :ref:`hyperlink references `, using backslashes for escaping is no longer an option because the outer backticks interpret enclosed backslashes and thus prevent them from escaping inner backticks. For instance, ```\\`this formatting\\```` produces an ``[UNKNOWN NODE title_reference]`` error. Instead, `````this formatting````` should be used to produce the following result: ```this formatting```." +#: ../../content/contributing/documentation/rst_cheat_sheet.rst:1054 +msgid "When it comes to backticks (`````), which are used in many cases such as :ref:`external hyperlinks `, using backslashes for escaping is no longer an option because the outer backticks interpret enclosed backslashes and thus prevent them from escaping inner backticks. For instance, ```\\`this formatting\\```` produces an ``[UNKNOWN NODE title_reference]`` error. Instead, `````this formatting````` should be used to produce the following result: ```this formatting```." msgstr "" #: ../../content/contributing/documentation/rst_guidelines.rst:3 @@ -1661,11 +2513,11 @@ msgid "In RST, it is possible to break a line without forcing a line break on th msgstr "" #: ../../content/contributing/documentation/rst_guidelines.rst:61 -msgid "You can safely break a line around the separators (``-->``) of ``menuselection`` directives and anywhere in a hyperlink reference. For the ``doc``, ``ref`` and ``download`` directives, this is only true for the label part of the reference." +msgid "You can safely break a line around the separators (``-->``) of ``menuselection`` markups and anywhere in a hyperlink reference. For the ``doc``, ``ref`` and ``download`` markups, this is only true for the label part of the reference." msgstr "" #: ../../content/contributing/documentation/rst_guidelines.rst:66 -msgid "Example: Line breaks within directive and inline markup" +msgid "Example: Line breaks within markups" msgstr "" #: ../../content/contributing/documentation/rst_guidelines.rst:75 @@ -1677,7 +2529,7 @@ msgid "Use only spaces (never tabs)." msgstr "" #: ../../content/contributing/documentation/rst_guidelines.rst:79 -msgid "Use as many spaces at the beginning of an indented line as needed to align it with the first character of the directive in the line above. This usually implies 3 spaces but you only need 2 for bulleted lists." +msgid "Use as many spaces at the beginning of an indented line as needed to align it with the first character of the markup in the line above. This usually implies 3 spaces but you only need 2 for bulleted lists." msgstr "" #: ../../content/contributing/documentation/rst_guidelines.rst:84 @@ -1693,49 +2545,49 @@ msgid "Example: Continuation lines resume below the ``I``’s of “Invoice” ( msgstr "" #: ../../content/contributing/documentation/rst_guidelines.rst:114 -msgid "Use the menuselection directive" +msgid "Use the menuselection markup" msgstr "" #: ../../content/contributing/documentation/rst_guidelines.rst:116 -msgid "Although chaining characters ``‣`` and menu names works fine to indicate a user which menus to click, it is best to use the ``menuselection`` directive (see :ref:`contributing/specialized-directives`) for the same result. Indeed, it renders the menus chain consistently with the rest of the documentation and would automatically adapt to the new graphic chart if we were to switch to a new one. This directive is used inline as follows: ``:menuselection:`Settings --> Products --> Variants```." +msgid "Although chaining characters ``‣`` and menu names works fine to indicate a user which menus to click, it is best to use the ``menuselection`` markup (see :ref:`contributing/menuselection`) for the same result. Indeed, it renders the menus chain consistently with the rest of the documentation and would automatically adapt to the new graphic chart if we were to switch to a new one. This markup is used inline as follows: ``:menuselection:`Sales --> Settings --> Products --> Variants```." msgstr "" -#: ../../content/contributing/documentation/rst_guidelines.rst:126 +#: ../../content/contributing/documentation/rst_guidelines.rst:125 msgid "Write resilient code" msgstr "" -#: ../../content/contributing/documentation/rst_guidelines.rst:128 +#: ../../content/contributing/documentation/rst_guidelines.rst:127 msgid "Prefer the use of ``#.`` in numbered lists instead of ``1.``, ``2.``, etc. This removes the risk of breaking the numbering when adding new elements to the list and is easier to maintain." msgstr "" -#: ../../content/contributing/documentation/rst_guidelines.rst:130 +#: ../../content/contributing/documentation/rst_guidelines.rst:129 msgid "Avoid using implicit hyperlink targets and prefer internal hyperlink targets instead. Referencing the implicit target ``How to print quotations?`` is more prone to break than a reference to the explicit target ``_print_quotation`` which never appears in the rendered HTML and is thus even less likely to be modified." msgstr "" -#: ../../content/contributing/documentation/rst_guidelines.rst:138 +#: ../../content/contributing/documentation/rst_guidelines.rst:137 msgid "Prefix hyperlink targets with application names" msgstr "" -#: ../../content/contributing/documentation/rst_guidelines.rst:140 -msgid "As hyperlink targets are visible from the entire documentation when referenced with the ``ref`` directive, it is recommended to prefix the target name with that of the related application. For instance, naming a target ``_amazon/form`` instead of ``_form`` avoids unwanted behaviors and makes the purpose of the target clear." +#: ../../content/contributing/documentation/rst_guidelines.rst:139 +msgid "As hyperlink targets are visible from the entire documentation when referenced with the ``ref`` markup, it is recommended to prefix the target name with that of the related application. For instance, naming a target ``_amazon/form`` instead of ``_form`` avoids unwanted behaviors and makes the purpose of the target clear." msgstr "" -#: ../../content/contributing/documentation/rst_guidelines.rst:148 +#: ../../content/contributing/documentation/rst_guidelines.rst:147 msgid "Don’t break hyperlink targets" msgstr "" -#: ../../content/contributing/documentation/rst_guidelines.rst:150 +#: ../../content/contributing/documentation/rst_guidelines.rst:149 msgid "When refactoring (improving without adding new content) section headings or hyperlink targets, take care not to break any hyperlink reference to these targets or update them accordingly." msgstr "" -#: ../../content/contributing/documentation/rst_guidelines.rst:156 +#: ../../content/contributing/documentation/rst_guidelines.rst:155 msgid "Use single-underscore suffixes for hyperlink references" msgstr "" -#: ../../content/contributing/documentation/rst_guidelines.rst:161 +#: ../../content/contributing/documentation/rst_guidelines.rst:160 msgid "Although using a double-underscore suffix works most of the time for classic hyperlink references, it is not recommended as double-underscores normally indicate an anonymous hyperlink reference. This is a special kind of hyperlink reference that makes use of nameless hyperlink targets consisting only of two underscore." msgstr "" -#: ../../content/contributing/documentation/rst_guidelines.rst:163 +#: ../../content/contributing/documentation/rst_guidelines.rst:162 msgid "tl;dr: Double-underscore suffixes work until they don’t and are bad practice, use single-underscore suffixes instead." msgstr "" diff --git a/locale/sources/finance.pot b/locale/sources/finance.pot index a51a5a677..96aa45995 100644 --- a/locale/sources/finance.pot +++ b/locale/sources/finance.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: Odoo 15.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-04-08 13:26+0000\n" +"POT-Creation-Date: 2022-07-22 09:36+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -33,28 +33,23 @@ msgid "**Odoo Accounting** is a full featured accounting app. Accountant product msgstr "" #: ../../content/applications/finance/accounting.rst:18 -msgid "`Odoo Tutorials: Invoicing `_" -msgstr "" - -#: ../../content/applications/finance/accounting.rst:19 msgid "`Odoo Tutorials: Accounting `_" msgstr "" -#: ../../content/applications/finance/accounting.rst:20 +#: ../../content/applications/finance/accounting.rst:19 msgid ":doc:`Accounting Cheat Sheet `" msgstr "" #: ../../content/applications/finance/accounting/bank.rst:5 -msgid "Bank & Cash" +msgid "Bank and cash" msgstr "" #: ../../content/applications/finance/accounting/bank/feeds.rst:5 -msgid "Bank Feeds" +msgid "Bank feeds" msgstr "" #: ../../content/applications/finance/accounting/bank/feeds/bank_statements.rst:3 -#: ../../content/applications/finance/accounting/others/multicurrencies/how_it_works.rst:145 -msgid "Bank Statements" +msgid "Bank statements" msgstr "" #: ../../content/applications/finance/accounting/bank/feeds/bank_statements.rst:5 @@ -164,7 +159,7 @@ msgid "add doc link to new documentation about reconciliation" msgstr "" #: ../../content/applications/finance/accounting/bank/feeds/bank_synchronization.rst:3 -msgid "Bank Synchronization: Automatic Import" +msgid "Bank synchronization: Automatic import" msgstr "" #: ../../content/applications/finance/accounting/bank/feeds/bank_synchronization.rst:5 @@ -200,6 +195,10 @@ msgid "**Ponto**: Europe (:doc:`more information `)" msgstr "" #: ../../content/applications/finance/accounting/bank/feeds/bank_synchronization.rst:25 +msgid "Bank synchronization is not available for trial databases." +msgstr "" + +#: ../../content/applications/finance/accounting/bank/feeds/bank_synchronization.rst:28 #: ../../content/applications/finance/accounting/bank/feeds/ponto.rst:24 #: ../../content/applications/finance/accounting/bank/feeds/saltedge.rst:19 #: ../../content/applications/finance/accounting/bank/misc/interbank.rst:14 @@ -207,6 +206,7 @@ msgstr "" #: ../../content/applications/finance/accounting/bank/reconciliation/use_cases.rst:16 #: ../../content/applications/finance/accounting/bank/setup/foreign_currency.rst:22 #: ../../content/applications/finance/accounting/bank/setup/manage_cash_register.rst:9 +#: ../../content/applications/finance/accounting/bank/setup/outstanding_accounts.rst:20 #: ../../content/applications/finance/accounting/fiscal_localizations/localizations/argentina.rst:32 #: ../../content/applications/finance/accounting/fiscal_localizations/localizations/chile.rst:29 #: ../../content/applications/finance/accounting/fiscal_localizations/localizations/chile.rst:290 @@ -226,6 +226,7 @@ msgstr "" #: ../../content/applications/finance/accounting/others/multicurrencies/invoices_payments.rst:22 #: ../../content/applications/finance/accounting/payables/pay/check.rst:11 #: ../../content/applications/finance/accounting/payables/pay/sepa.rst:30 +#: ../../content/applications/finance/accounting/payables/supplier_bills/invoice_digitization.rst:22 #: ../../content/applications/finance/accounting/payables/supplier_bills/manage.rst:31 #: ../../content/applications/finance/accounting/receivables/customer_invoices/cash_rounding.rst:14 #: ../../content/applications/finance/accounting/receivables/customer_invoices/epc_qr_code.rst:20 @@ -234,6 +235,7 @@ msgstr "" #: ../../content/applications/finance/accounting/receivables/customer_payments/batch_sdd.rst:20 #: ../../content/applications/finance/accounting/receivables/customer_payments/check.rst:39 #: ../../content/applications/finance/accounting/receivables/customer_payments/check.rst:103 +#: ../../content/applications/finance/accounting/receivables/customer_payments/followup.rst:14 #: ../../content/applications/finance/accounting/receivables/customer_payments/online_payment.rst:15 #: ../../content/applications/finance/accounting/reporting/declarations/intrastat.rst:19 #: ../../content/applications/finance/accounting/taxation/taxes/B2B_B2C.rst:60 @@ -244,7 +246,7 @@ msgstr "" #: ../../content/applications/finance/accounting/taxation/taxes/taxcloud.rst:12 #: ../../content/applications/finance/accounting/taxation/taxes/taxes.rst:29 #: ../../content/applications/finance/accounting/taxation/taxes/vat_validation.rst:13 -#: ../../content/applications/finance/payment_acquirers.rst:118 +#: ../../content/applications/finance/payment_acquirers.rst:227 #: ../../content/applications/finance/payment_acquirers/adyen.rst:9 #: ../../content/applications/finance/payment_acquirers/alipay.rst:9 #: ../../content/applications/finance/payment_acquirers/authorize.rst:9 @@ -255,212 +257,212 @@ msgstr "" msgid "Configuration" msgstr "" -#: ../../content/applications/finance/accounting/bank/feeds/bank_synchronization.rst:28 +#: ../../content/applications/finance/accounting/bank/feeds/bank_synchronization.rst:31 msgid "On-Premise users" msgstr "" -#: ../../content/applications/finance/accounting/bank/feeds/bank_synchronization.rst:30 +#: ../../content/applications/finance/accounting/bank/feeds/bank_synchronization.rst:33 msgid "To be able to use this service, you need to have a valid Odoo Enterprise subscription. So make sure that your database is registered with your Odoo Enterprise contract. We also use a proxy between your database and the third party provider so, in case of a connection error, please check that you don't have a firewall or a proxy blocking the following address:" msgstr "" -#: ../../content/applications/finance/accounting/bank/feeds/bank_synchronization.rst:36 +#: ../../content/applications/finance/accounting/bank/feeds/bank_synchronization.rst:39 msgid "https://production.odoofin.com/" msgstr "" -#: ../../content/applications/finance/accounting/bank/feeds/bank_synchronization.rst:39 +#: ../../content/applications/finance/accounting/bank/feeds/bank_synchronization.rst:42 msgid "First Synchronization" msgstr "" -#: ../../content/applications/finance/accounting/bank/feeds/bank_synchronization.rst:41 +#: ../../content/applications/finance/accounting/bank/feeds/bank_synchronization.rst:44 msgid "You can start synchronization either by going to :menuselection:`Accounting --> Configuration --> Add a Bank Account` or via the configuration bar on the accounting dashboard." msgstr "" -#: ../../content/applications/finance/accounting/bank/feeds/bank_synchronization.rst:44 +#: ../../content/applications/finance/accounting/bank/feeds/bank_synchronization.rst:47 msgid "Now you can search for your bank institution. Select it and follow the steps to synchronize with it." msgstr "" -#: ../../content/applications/finance/accounting/bank/feeds/bank_synchronization.rst:47 +#: ../../content/applications/finance/accounting/bank/feeds/bank_synchronization.rst:50 msgid "If you have any issues during your first synchronization, please verify that your web browser doesn't block pop-ups and that your adblocker is disabled." msgstr "" -#: ../../content/applications/finance/accounting/bank/feeds/bank_synchronization.rst:50 +#: ../../content/applications/finance/accounting/bank/feeds/bank_synchronization.rst:53 msgid "During your first synchronization, you will be asked for a phone number to secure your account. The reason we ask for such information is that we don't want your data falling into the wrong hands. Therefore, if we detect suspicious activity on your account, we block all requests coming from your account, and you need to reactivate it using that phone number. The third-party provider may request more information in order to connect with your bank institution. This information is not stored on Odoo's servers." msgstr "" -#: ../../content/applications/finance/accounting/bank/feeds/bank_synchronization.rst:57 +#: ../../content/applications/finance/accounting/bank/feeds/bank_synchronization.rst:60 msgid "By default, transactions fetched from an online source are grouped inside the same statement, and one bank statement is created per month. You can change the bank statement creation periodicity in your journal settings." msgstr "" -#: ../../content/applications/finance/accounting/bank/feeds/bank_synchronization.rst:61 +#: ../../content/applications/finance/accounting/bank/feeds/bank_synchronization.rst:64 msgid "You can find all your synchronizations by going to :menuselection:`Accounting --> Configuration --> Online Synchronization`." msgstr "" -#: ../../content/applications/finance/accounting/bank/feeds/bank_synchronization.rst:65 +#: ../../content/applications/finance/accounting/bank/feeds/bank_synchronization.rst:68 msgid "Synchronize manually" msgstr "" -#: ../../content/applications/finance/accounting/bank/feeds/bank_synchronization.rst:67 +#: ../../content/applications/finance/accounting/bank/feeds/bank_synchronization.rst:70 msgid "After your first synchronization, the created journals are synchronized by default every 12 hours. If you wish, you can synchronize manually by clicking on the *Synchronize Now* button on the dashboard." msgstr "" -#: ../../content/applications/finance/accounting/bank/feeds/bank_synchronization.rst:75 +#: ../../content/applications/finance/accounting/bank/feeds/bank_synchronization.rst:78 msgid "Or you can go to :menuselection:`Accounting --> Configuration --> Online Synchronization`, select your institution and then click on the *Fetch Transactions* button." msgstr "" -#: ../../content/applications/finance/accounting/bank/feeds/bank_synchronization.rst:83 +#: ../../content/applications/finance/accounting/bank/feeds/bank_synchronization.rst:86 msgid "Some institutions do not allow transactions to be fetched automatically. For such institutions, during the automatic synchronization of the account, you receive an error message asking you to disable the automatic synchronization. This message can be found in the chatter of your online synchronizations. In this case, make sure to perform manual synchronizations." msgstr "" -#: ../../content/applications/finance/accounting/bank/feeds/bank_synchronization.rst:89 +#: ../../content/applications/finance/accounting/bank/feeds/bank_synchronization.rst:92 msgid "Issues" msgstr "" -#: ../../content/applications/finance/accounting/bank/feeds/bank_synchronization.rst:92 +#: ../../content/applications/finance/accounting/bank/feeds/bank_synchronization.rst:95 msgid "Synchronization in error" msgstr "" -#: ../../content/applications/finance/accounting/bank/feeds/bank_synchronization.rst:94 +#: ../../content/applications/finance/accounting/bank/feeds/bank_synchronization.rst:97 msgid "To report a connection error to the `Odoo support `_, go to :menuselection:`Accounting --> Configuration --> Online Synchronization`, select the connection that failed, and copy the error description and the reference." msgstr "" -#: ../../content/applications/finance/accounting/bank/feeds/bank_synchronization.rst:99 +#: ../../content/applications/finance/accounting/bank/feeds/bank_synchronization.rst:102 msgid "Synchronization disconnected" msgstr "" -#: ../../content/applications/finance/accounting/bank/feeds/bank_synchronization.rst:101 +#: ../../content/applications/finance/accounting/bank/feeds/bank_synchronization.rst:104 msgid "If your connection with the proxy is disconnected, you can reconnect with the proxy using the *Reconnect* button." msgstr "" -#: ../../content/applications/finance/accounting/bank/feeds/bank_synchronization.rst:105 +#: ../../content/applications/finance/accounting/bank/feeds/bank_synchronization.rst:108 msgid "This disconnection can be caused by the Odoo support. In this case, please contact the `support `_ directly with your client id or the reference of the error listed in the chatter." msgstr "" -#: ../../content/applications/finance/accounting/bank/feeds/bank_synchronization.rst:112 +#: ../../content/applications/finance/accounting/bank/feeds/bank_synchronization.rst:115 msgid "Migration process for users having installed Odoo before December 2020" msgstr "" -#: ../../content/applications/finance/accounting/bank/feeds/bank_synchronization.rst:114 +#: ../../content/applications/finance/accounting/bank/feeds/bank_synchronization.rst:117 msgid "If you are on-premise, please first make sure that your source is up-to-date with the latest version of Odoo." msgstr "" -#: ../../content/applications/finance/accounting/bank/feeds/bank_synchronization.rst:117 +#: ../../content/applications/finance/accounting/bank/feeds/bank_synchronization.rst:120 msgid "Users who have created a database before December 2020 need to install the new module manually to use the new functionalities." msgstr "" -#: ../../content/applications/finance/accounting/bank/feeds/bank_synchronization.rst:120 +#: ../../content/applications/finance/accounting/bank/feeds/bank_synchronization.rst:123 msgid "To do so, go to :menuselection:`Apps --> Update Apps List`, remove the default filter in the search bar and type: **account_online_synchronization**. You can then click on the *Install* button to install the new module." msgstr "" -#: ../../content/applications/finance/accounting/bank/feeds/bank_synchronization.rst:128 +#: ../../content/applications/finance/accounting/bank/feeds/bank_synchronization.rst:131 msgid "Finally, make sure all your users refresh their Odoo page by pressing CTRL+F5." msgstr "" -#: ../../content/applications/finance/accounting/bank/feeds/bank_synchronization.rst:132 +#: ../../content/applications/finance/accounting/bank/feeds/bank_synchronization.rst:135 msgid "All previous synchronizations are disconnected during the installation and won't work anymore. You can find them directly in the synchronization menu (:menuselection:`Accounting --> Configuration --> Online Synchronization`). It is not possible to resynchronize these connections; you have to make new ones." msgstr "" -#: ../../content/applications/finance/accounting/bank/feeds/bank_synchronization.rst:136 +#: ../../content/applications/finance/accounting/bank/feeds/bank_synchronization.rst:139 msgid "Please do not uninstall *account_online_sync* which is the previous module for online synchronization. The new one overrides it." msgstr "" -#: ../../content/applications/finance/accounting/bank/feeds/bank_synchronization.rst:138 +#: ../../content/applications/finance/accounting/bank/feeds/bank_synchronization.rst:141 msgid "By default *account_online_synchronization* is installed automatically with Accounting." msgstr "" -#: ../../content/applications/finance/accounting/bank/feeds/bank_synchronization.rst:141 +#: ../../content/applications/finance/accounting/bank/feeds/bank_synchronization.rst:144 #: ../../content/applications/finance/accounting/bank/feeds/ponto.rst:95 #: ../../content/applications/finance/accounting/bank/feeds/saltedge.rst:78 msgid "FAQ" msgstr "" -#: ../../content/applications/finance/accounting/bank/feeds/bank_synchronization.rst:144 +#: ../../content/applications/finance/accounting/bank/feeds/bank_synchronization.rst:147 msgid "The synchronization is not working in real-time. Is that normal?" msgstr "" -#: ../../content/applications/finance/accounting/bank/feeds/bank_synchronization.rst:146 +#: ../../content/applications/finance/accounting/bank/feeds/bank_synchronization.rst:149 msgid "The process is not intended to work in real-time as third party providers synchronize your accounts at different intervals. To force the synchronization and fetch the statements, go to your *Accounting dashboard*, and click on the *Synchronize Now* button. You can also synchronize and fetch transactions through :menuselection:`Accounting --> Configuration --> Online Synchronization`. Some providers only allow one refresh per day, so it is possible that clicking on *Synchronize Now* does not get your latest transactions if you already performed such action earlier in the day." msgstr "" -#: ../../content/applications/finance/accounting/bank/feeds/bank_synchronization.rst:153 +#: ../../content/applications/finance/accounting/bank/feeds/bank_synchronization.rst:156 msgid "A transaction can be visible on your bank account, but not be fetched if it has the status *Pending*. Only transactions with the *Posted* status will be retrieved. If it is not *Posted* yet, you will have to wait until the status changes." msgstr "" -#: ../../content/applications/finance/accounting/bank/feeds/bank_synchronization.rst:158 +#: ../../content/applications/finance/accounting/bank/feeds/bank_synchronization.rst:161 msgid "Is the Online Bank Synchronization feature included in my contract?" msgstr "" -#: ../../content/applications/finance/accounting/bank/feeds/bank_synchronization.rst:160 +#: ../../content/applications/finance/accounting/bank/feeds/bank_synchronization.rst:163 msgid "**Community Version**: No, this feature is not included in the Community Version." msgstr "" -#: ../../content/applications/finance/accounting/bank/feeds/bank_synchronization.rst:161 +#: ../../content/applications/finance/accounting/bank/feeds/bank_synchronization.rst:164 msgid "**Online Version**: Yes, even if you benefit from the One App Free contract." msgstr "" -#: ../../content/applications/finance/accounting/bank/feeds/bank_synchronization.rst:162 +#: ../../content/applications/finance/accounting/bank/feeds/bank_synchronization.rst:165 msgid "**Enterprise Version**: Yes, if you have a valid enterprise contract linked to your database." msgstr "" -#: ../../content/applications/finance/accounting/bank/feeds/bank_synchronization.rst:165 +#: ../../content/applications/finance/accounting/bank/feeds/bank_synchronization.rst:168 msgid "Some banks have a status \"Beta.\" What does this mean?" msgstr "" -#: ../../content/applications/finance/accounting/bank/feeds/bank_synchronization.rst:167 +#: ../../content/applications/finance/accounting/bank/feeds/bank_synchronization.rst:170 msgid "This means that banking institutions are not yet fully supported by our Third Party Provider. Bugs or other problems may arise. Odoo does not support technical problems that occur with banks in the Beta phase, but the user may still choose to connect. Connecting with these banks contributes to the development process since the Provider will have real data and feedback from the connection." msgstr "" -#: ../../content/applications/finance/accounting/bank/feeds/bank_synchronization.rst:173 +#: ../../content/applications/finance/accounting/bank/feeds/bank_synchronization.rst:176 msgid "Why do my transactions only synchronize when I refresh manually?" msgstr "" -#: ../../content/applications/finance/accounting/bank/feeds/bank_synchronization.rst:175 +#: ../../content/applications/finance/accounting/bank/feeds/bank_synchronization.rst:178 msgid "Some banks have additional security measures and require extra steps, such as an SMS/email authentication code or another type of MFA. Because of this, the integrator cannot pull transactions until the security code is provided." msgstr "" -#: ../../content/applications/finance/accounting/bank/feeds/bank_synchronization.rst:180 +#: ../../content/applications/finance/accounting/bank/feeds/bank_synchronization.rst:183 msgid "Not all of my past transactions are in Odoo, why?" msgstr "" -#: ../../content/applications/finance/accounting/bank/feeds/bank_synchronization.rst:182 +#: ../../content/applications/finance/accounting/bank/feeds/bank_synchronization.rst:185 msgid "For some institutions, transactions can only be fetched up to 3 months in the past." msgstr "" -#: ../../content/applications/finance/accounting/bank/feeds/bank_synchronization.rst:185 +#: ../../content/applications/finance/accounting/bank/feeds/bank_synchronization.rst:188 msgid "Why don't I see any transactions?" msgstr "" -#: ../../content/applications/finance/accounting/bank/feeds/bank_synchronization.rst:187 +#: ../../content/applications/finance/accounting/bank/feeds/bank_synchronization.rst:190 msgid "During your first synchronization, you selected the bank accounts you decided to synchronize with Odoo. If you didn't synchronize any of your accounts, you can go to :menuselection:`Accounting --> Configuration --> Online Synchronization` to click on the *Fetch Accounts* button on the connection." msgstr "" -#: ../../content/applications/finance/accounting/bank/feeds/bank_synchronization.rst:191 +#: ../../content/applications/finance/accounting/bank/feeds/bank_synchronization.rst:194 msgid "There may also be no new transactions." msgstr "" -#: ../../content/applications/finance/accounting/bank/feeds/bank_synchronization.rst:193 +#: ../../content/applications/finance/accounting/bank/feeds/bank_synchronization.rst:196 msgid "If your bank account is properly linked to a journal and posted transactions are not visible in your database, please `submit a support ticket `_." msgstr "" -#: ../../content/applications/finance/accounting/bank/feeds/bank_synchronization.rst:197 +#: ../../content/applications/finance/accounting/bank/feeds/bank_synchronization.rst:200 msgid "How can I update my bank credentials?" msgstr "" -#: ../../content/applications/finance/accounting/bank/feeds/bank_synchronization.rst:199 +#: ../../content/applications/finance/accounting/bank/feeds/bank_synchronization.rst:202 msgid "You can update your credentials by going to :menuselection:`Accounting --> Configuration --> Online Synchronization`, open the connection you want to update your credentials and click on the *Update Credentials* button." msgstr "" -#: ../../content/applications/finance/accounting/bank/feeds/bank_synchronization.rst:204 +#: ../../content/applications/finance/accounting/bank/feeds/bank_synchronization.rst:207 #: ../../content/applications/finance/accounting/bank/feeds/ponto.rst:124 #: ../../content/applications/finance/accounting/bank/feeds/saltedge.rst:111 msgid ":doc:`bank_statements`" msgstr "" -#: ../../content/applications/finance/accounting/bank/feeds/bank_synchronization.rst:205 +#: ../../content/applications/finance/accounting/bank/feeds/bank_synchronization.rst:208 #: ../../content/applications/finance/accounting/bank/feeds/saltedge.rst:110 msgid ":doc:`ponto`" msgstr "" -#: ../../content/applications/finance/accounting/bank/feeds/bank_synchronization.rst:206 +#: ../../content/applications/finance/accounting/bank/feeds/bank_synchronization.rst:209 #: ../../content/applications/finance/accounting/bank/feeds/ponto.rst:123 msgid ":doc:`saltedge`" msgstr "" @@ -799,10 +801,7 @@ msgid "The same steps will need to be repeated once you receive your second bank msgstr "" #: ../../content/applications/finance/accounting/bank/reconciliation.rst:5 -#: ../../content/applications/finance/accounting/getting_started/memento.rst:179 -#: ../../content/applications/finance/accounting/receivables/customer_payments/batch.rst:80 -#: ../../content/applications/finance/accounting/reporting/overview/main_reports.rst:144 -msgid "Bank Reconciliation" +msgid "Bank reconciliation" msgstr "" #: ../../content/applications/finance/accounting/bank/reconciliation/reconciliation_models.rst:3 @@ -878,7 +877,7 @@ msgid "Open the model you want to modify, or click on *Create* to create a new o msgstr "" #: ../../content/applications/finance/accounting/bank/reconciliation/reconciliation_models.rst:88 -#: ../../content/applications/finance/accounting/getting_started/initial_configuration/chart_of_accounts.rst:50 +#: ../../content/applications/finance/accounting/getting_started/initial_configuration/chart_of_accounts.rst:52 msgid "Type" msgstr "" @@ -1329,8 +1328,60 @@ msgstr "" msgid "The transactions will be added to the current cash payment registration." msgstr "" +#: ../../content/applications/finance/accounting/bank/setup/outstanding_accounts.rst:3 +msgid "Outstanding accounts" +msgstr "" + +#: ../../content/applications/finance/accounting/bank/setup/outstanding_accounts.rst:5 +msgid "By default, payments are registered through transitory accounts named **outstanding accounts**, before being recorded in your bank account." +msgstr "" + +#: ../../content/applications/finance/accounting/bank/setup/outstanding_accounts.rst:8 +msgid "An **outstanding payments account** is where outgoing payments are posted until they are linked with a withdrawal from your bank statement." +msgstr "" + +#: ../../content/applications/finance/accounting/bank/setup/outstanding_accounts.rst:10 +msgid "An **outstanding receipts account** is where incoming payments are posted until they are linked with a deposit from your bank statement." +msgstr "" + +#: ../../content/applications/finance/accounting/bank/setup/outstanding_accounts.rst:13 +msgid "These accounts should be of :ref:`type ` :guilabel:`Current Assets`." +msgstr "" + +#: ../../content/applications/finance/accounting/bank/setup/outstanding_accounts.rst:16 +msgid "The movement from an outstanding account to a bank account is done automatically when you reconcile the bank account with a bank statement." +msgstr "" + +#: ../../content/applications/finance/accounting/bank/setup/outstanding_accounts.rst:23 +msgid "Default accounts configuration" +msgstr "" + +#: ../../content/applications/finance/accounting/bank/setup/outstanding_accounts.rst:25 +msgid "The outstanding accounts are defined by default. If necessary, you can update them by going to :menuselection:`Accounting --> Configuration --> Settings --> Default Accounts` and update your :guilabel:`Outstanding Receipts Account` and :guilabel:`Outstanding Payments Account`." +msgstr "" + +#: ../../content/applications/finance/accounting/bank/setup/outstanding_accounts.rst:30 +msgid "Bank and cash journals configuration" +msgstr "" + +#: ../../content/applications/finance/accounting/bank/setup/outstanding_accounts.rst:32 +msgid "You can also set specific outstanding accounts for any journal with the :ref:`type ` :guilabel:`Bank` or :guilabel:`Cash`." +msgstr "" + +#: ../../content/applications/finance/accounting/bank/setup/outstanding_accounts.rst:35 +msgid "From your :guilabel:`Accounting Dashboard`, click on the menu selection ⋮ of the journal you want to configure, and click on :guilabel:`Configuration`, then open the :guilabel:`Incoming/Outgoing Payments` tab. To display the outstanding accounts column, click on the toggle button and check the :guilabel:`Outstanding Receipts/Payments accounts`, then update the account." +msgstr "" + +#: ../../content/applications/finance/accounting/bank/setup/outstanding_accounts.rst:45 +msgid "If you do not specify an outstanding payments account or an outstanding receipts account for a specific journal, Odoo uses the default outstanding accounts." +msgstr "" + +#: ../../content/applications/finance/accounting/bank/setup/outstanding_accounts.rst:47 +msgid "If your main bank account is added as an outstanding receipts account or outstanding payments account, when a payment is registered, the invoice or bill's status is directly set to :guilabel:`Paid`." +msgstr "" + #: ../../content/applications/finance/accounting/fiscal_localizations.rst:5 -msgid "Fiscal Localizations" +msgid "Fiscal localizations" msgstr "" #: ../../content/applications/finance/accounting/fiscal_localizations/localizations.rst:5 @@ -1338,7 +1389,6 @@ msgid "Localizations" msgstr "" #: ../../content/applications/finance/accounting/fiscal_localizations/localizations/argentina.rst:3 -#: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:13 msgid "Argentina" msgstr "" @@ -2011,7 +2061,6 @@ msgstr "" #: ../../content/applications/finance/accounting/fiscal_localizations/localizations/argentina.rst:515 #: ../../content/applications/finance/accounting/fiscal_localizations/localizations/chile.rst:651 #: ../../content/applications/finance/accounting/others/multicurrencies/invoices_payments.rst:64 -#: ../../content/applications/finance/accounting/payables/supplier_bills.rst:5 msgid "Vendor Bills" msgstr "" @@ -2873,7 +2922,6 @@ msgid "This record is supplied by the electronic tax documents (DTE’s) that ha msgstr "" #: ../../content/applications/finance/accounting/fiscal_localizations/localizations/colombia.rst:3 -#: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:33 msgid "Colombia" msgstr "" @@ -3805,6 +3853,352 @@ msgstr "" msgid "En caso de que se detecte alguna Orden de venta facturar en la cual se incluya IVA de Bienes Cubiertos, se deberá realizar actualización manual correspondiente al IVA convencional." msgstr "" +#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/egypt.rst:3 +msgid "Egypt" +msgstr "" + +#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/egypt.rst:8 +msgid "Installation" +msgstr "" + +#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/egypt.rst:10 +msgid ":ref:`Install ` the following modules to get all the features of the Egyptian localization:" +msgstr "" + +#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/egypt.rst:16 +#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/france.rst:182 +msgid "Name" +msgstr "" + +#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/egypt.rst:17 +msgid "Technical name" +msgstr "" + +#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/egypt.rst:18 +#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/france.rst:59 +msgid "Description" +msgstr "" + +#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/egypt.rst:19 +msgid ":guilabel:`Egypt - Accounting`" +msgstr "" + +#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/egypt.rst:20 +msgid "``l10n_eg``" +msgstr "" + +#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/egypt.rst:21 +msgid "Default :doc:`fiscal localization package <../overview/fiscal_localization_packages>`" +msgstr "" + +#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/egypt.rst:22 +msgid ":guilabel:`Egyptian E-invoice Integration`" +msgstr "" + +#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/egypt.rst:23 +msgid "``l10n_eg_edi_eta``" +msgstr "" + +#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/egypt.rst:24 +msgid ":ref:`Egyptian Tax Authority (ETA) e-invoicing integration `" +msgstr "" + +#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/egypt.rst:29 +msgid "Egyptian e-invoicing" +msgstr "" + +#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/egypt.rst:31 +msgid "Odoo is compliant with the **Egyptian Tax Authority (ETA) e-invoicing** requirements." +msgstr "" + +#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/egypt.rst:34 +msgid "Egyptian e-invoicing is available from Odoo 15.0. If needed, :doc:`upgrade ` your database." +msgstr "" + +#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/egypt.rst:38 +msgid "`Video: Egypt E-invoicing `_" +msgstr "" + +#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/egypt.rst:39 +msgid ":doc:`/administration/upgrade`" +msgstr "" + +#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/egypt.rst:44 +msgid "Register Odoo on your ETA portal" +msgstr "" + +#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/egypt.rst:46 +msgid "You must register your Odoo ERP system on your ETA portal to get your API credentials. You need these codes to :ref:`configure your Odoo Accounting app `." +msgstr "" + +#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/egypt.rst:49 +msgid "Access your company profile on the ETA portal by clicking on :guilabel:`View Taxpayer Profile`." +msgstr "" + +#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/egypt.rst:55 +msgid "Next, go to the :guilabel:`Representatives` section and then click on :guilabel:`Register ERP`. Fill out the :guilabel:`ERP Name` (e.g., ``Odoo``) and leave the other fields empty." +msgstr "" + +#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/egypt.rst:62 +msgid "Once successfully registered, the website displays your API credentials:" +msgstr "" + +#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/egypt.rst:64 +msgid "Client ID" +msgstr "" + +#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/egypt.rst:65 +msgid "Client Secret 1" +msgstr "" + +#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/egypt.rst:66 +msgid "Client Secret 2" +msgstr "" + +#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/egypt.rst:69 +msgid "ETA should give you a username and a password to access their online portal." +msgstr "" + +#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/egypt.rst:70 +msgid "Ask ETA to provide you with preproduction portal access as well." +msgstr "" + +#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/egypt.rst:71 +msgid "These codes are confidential and should be stored safely." +msgstr "" + +#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/egypt.rst:76 +#: ../../content/applications/finance/payment_acquirers/ogone.rst:9 +msgid "Configuration on Odoo" +msgstr "" + +#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/egypt.rst:78 +msgid "To connect your Odoo database to your ETA portal account, go to :menuselection:`Accounting --> Configuration --> Settings --> ETA E-Invoicing Settings`, and set the :guilabel:`ETA Client ID` and :guilabel:`ETA Secret` that you retrieved when you :ref:`registered Odoo on your ETA portal `. Set an invoicing threshold if needed." +msgstr "" + +#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/egypt.rst:88 +msgid "**Test on your preproduction portal** before starting to issue real invoices on the production ETA portal." +msgstr "" + +#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/egypt.rst:90 +msgid "**Credentials** for preproduction and production environments are different. Make sure to update them on Odoo when you move from one environment to another." +msgstr "" + +#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/egypt.rst:92 +msgid "If not done yet, fill out your company details with your company's full address, country, and Tax ID." +msgstr "" + +#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/egypt.rst:98 +msgid "ETA codes" +msgstr "" + +#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/egypt.rst:100 +msgid "E-invoicing works with a set of codes provided by the ETA. You can use the `ETA documentation `_ to code your business attributes." +msgstr "" + +#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/egypt.rst:103 +msgid "Most of these codes are handled automatically by Odoo, provided that your :ref:`branches `, :ref:`customers `, and :ref:`products ` are correctly configured." +msgstr "" + +#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/egypt.rst:107 +msgid "Company Information:" +msgstr "" + +#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/egypt.rst:109 +msgid "Company Tax ID" +msgstr "" + +#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/egypt.rst:0 +msgid "Branch ID" +msgstr "" + +#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/egypt.rst:0 +msgid "If you have only one branch, use ``0`` as the branch code." +msgstr "" + +#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/egypt.rst:112 +msgid "Activity type Code" +msgstr "" + +#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/egypt.rst:114 +msgid "Other Information:" +msgstr "" + +#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/egypt.rst:0 +msgid "Product Codes" +msgstr "" + +#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/egypt.rst:0 +msgid "Your company's products should be coded and matched with their **GS1** or **EGS** codes." +msgstr "" + +#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/egypt.rst:0 +msgid "Tax Codes" +msgstr "" + +#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/egypt.rst:0 +msgid "Most of the taxes codes are already configured on Odoo in the :guilabel:`ETA Code (Egypt)` field. We advise you to make sure these codes match your company's taxes." +msgstr "" + +#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/egypt.rst:123 +msgid "`Egyptian eInvoicing & eReceipt SDK - Code Tables `_" +msgstr "" + +#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/egypt.rst:125 +#: ../../content/applications/finance/accounting/fiscal_localizations/overview/fiscal_localization_packages.rst:42 +#: ../../content/applications/finance/accounting/reporting/declarations/tax_returns.rst:123 +msgid ":doc:`../../taxation/taxes/taxes`" +msgstr "" + +#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/egypt.rst:130 +msgid "Branches" +msgstr "" + +#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/egypt.rst:132 +msgid "Create a contact and a journal for each branch of your company and configure its ETA settings." +msgstr "" + +#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/egypt.rst:134 +msgid "To do so, go to :menuselection:`Accounting --> Configuration --> Journals`, then click on :guilabel:`Create`." +msgstr "" + +#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/egypt.rst:137 +msgid "Name the journal according to your company's branch and set the :guilabel:`Type` as :guilabel:`Sales`. Next, open the :menuselection:`Advanced Settings` tab and fill out the :guilabel:`Egyptian ETA settings` section:" +msgstr "" + +#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/egypt.rst:141 +msgid "In the :guilabel:`Branch` field, select the branch's contact or create it." +msgstr "" + +#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/egypt.rst:142 +msgid "Set the :guilabel:`ETA Activity Code`." +msgstr "" + +#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/egypt.rst:143 +msgid "Set the :guilabel:`ETA Branch ID` (use ``0`` if you have one branch only)." +msgstr "" + +#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/egypt.rst:150 +msgid "The contact selected in the :guilabel:`Branch` field must be set as a :guilabel:`Company` (**not** as an :guilabel:`Individual`), and the :guilabel:`Address` and :guilabel:`Tax ID` fields must be filled out." +msgstr "" + +#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/egypt.rst:157 +msgid "Customers" +msgstr "" + +#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/egypt.rst:159 +msgid "Make sure your customers' contact forms are correctly filled out so your e-invoices are valid:" +msgstr "" + +#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/egypt.rst:161 +msgid "contact type: :guilabel:`Individual`: or :guilabel:`Company`:" +msgstr "" + +#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/egypt.rst:162 +msgid ":guilabel:`Country`:" +msgstr "" + +#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/egypt.rst:163 +msgid ":guilabel:`Tax ID`: Tax ID or Company registry for companies. National ID for individuals." +msgstr "" + +#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/egypt.rst:166 +msgid "You can edit your customers' contact forms by going to :menuselection:`Accounting --> Customers --> Customers`." +msgstr "" + +#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/egypt.rst:172 +#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:377 +msgid "Products" +msgstr "" + +#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/egypt.rst:174 +msgid "Make sure your products are correctly configured so your e-invoices are valid:" +msgstr "" + +#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/egypt.rst:176 +msgid ":guilabel:`Product Type`: storable products, consumables, or services." +msgstr "" + +#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/egypt.rst:177 +msgid ":guilabel:`Unit of Measure`: if you also use Odoo Inventory and have enabled :doc:`Units of Measure `." +msgstr "" + +#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/egypt.rst:179 +msgid ":guilabel:`Barcode`: **GS1** or **EGS** barcode" +msgstr "" + +#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/egypt.rst:180 +msgid ":guilabel:`ETA Item code` (under the :menuselection:`Accounting` tab): if the barcode doesn't match your ETA item code." +msgstr "" + +#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/egypt.rst:184 +msgid "You can edit your products by going to :menuselection:`Accounting --> Customers --> Products`." +msgstr "" + +#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/egypt.rst:189 +msgid "USB authentication" +msgstr "" + +#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/egypt.rst:191 +msgid "Each person who needs to electronically sign invoices needs a specific USB key to authenticate and send invoices to the ETA portal through an ERP." +msgstr "" + +#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/egypt.rst:195 +msgid "You can contact the :abbr:`ETA (Egyptian Tax Authority)` or `Egypt Trust `_ to get these USB keys." +msgstr "" + +#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/egypt.rst:201 +msgid "Install Odoo as a local proxy on your computer" +msgstr "" + +#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/egypt.rst:203 +msgid "An Odoo local server works as a bridge between your computer and your Odoo database hosted online." +msgstr "" + +#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/egypt.rst:205 +msgid "Download the Odoo Community installer from the page https://www.odoo.com/page/download and start the installation on your computer." +msgstr "" + +#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/egypt.rst:208 +msgid "Select :guilabel:`Local Proxy Mode` as the type of install." +msgstr "" + +#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/egypt.rst:215 +msgid "This installation of Odoo only works as a server and does not install any Odoo apps on your computer." +msgstr "" + +#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/egypt.rst:218 +msgid "Once the installation is complete, the installer displays your **access token** for the Odoo Local Proxy. Copy the token and save it in a safe place for later use." +msgstr "" + +#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/egypt.rst:222 +msgid "`Odoo: Download Odoo `_" +msgstr "" + +#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/egypt.rst:223 +msgid ":doc:`/administration/install/install`" +msgstr "" + +#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/egypt.rst:228 +msgid "Configure the USB key" +msgstr "" + +#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/egypt.rst:230 +msgid "Once the local proxy server is installed on your computer, you can link it with your Odoo database." +msgstr "" + +#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/egypt.rst:232 +msgid "Go to :menuselection:`Accounting --> Configurations --> Thumb Drive` and click on :guilabel:`Create`." +msgstr "" + +#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/egypt.rst:234 +msgid "Input a :guilabel:`Company` name, the :guilabel:`ETA USB Pin` given to you by your USB key provider, and the :guilabel:`Access Token` provided at the end of the :ref:`local proxy installation `, then click on :guilabel:`Save`." +msgstr "" + +#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/egypt.rst:237 +msgid "Click on :guilabel:`Get certificate`." +msgstr "" + #: ../../content/applications/finance/accounting/fiscal_localizations/localizations/france.rst:3 msgid "France" msgstr "" @@ -3889,10 +4283,6 @@ msgstr "" msgid "Field name" msgstr "" -#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/france.rst:59 -msgid "Description" -msgstr "" - #: ../../content/applications/finance/accounting/fiscal_localizations/localizations/france.rst:59 #: ../../content/applications/finance/accounting/fiscal_localizations/overview/fiscal_localization_packages.rst:32 msgid "Use" @@ -4340,10 +4730,6 @@ msgstr "" msgid "The match is done with the left-most digits, starting by using all digits, then 3, then 2." msgstr "" -#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/france.rst:182 -msgid "Name" -msgstr "" - #: ../../content/applications/finance/accounting/fiscal_localizations/localizations/france.rst:182 msgid "Code" msgstr "" @@ -4841,7 +5227,7 @@ msgid "`Item 88 of Finance Law 2016 `" +msgid ":download:`Certificate `" msgstr "" #: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:245 -msgid ":download:`Certificate Key `" +msgid ":download:`Certificate Key `" msgstr "" #: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:246 @@ -6070,10 +6455,6 @@ msgstr "" msgid "In the XML, the VAT is automatically replaced by the Generic VAT for abroad transactions: ``XEXX010101000``" msgstr "" -#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:377 -msgid "Products" -msgstr "" - #: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:379 msgid "At the product level there must also configure some parameters in the following fields." msgstr "" @@ -6199,7 +6580,7 @@ msgid "If at the time of registering a payment it is of type PPD then a Payment msgstr "" #: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:527 -#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:564 +#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:572 msgid "The payment can be registered from the invoice and once it is confirmed, the invoice will be paid and with its payment associated." msgstr "" @@ -6220,733 +6601,741 @@ msgid "The **Recipient Bank Account** is the one attached to the **Accounting** msgstr "" #: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:559 +msgid "When making a payment in MXN for an invoice in USD, the payment must be created using the :guilabel:`Register Payment` button **on the invoice view** and not separately as a payment. Otherwise, the payment CFDI is not correctly generated." +msgstr "" + +#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:562 +msgid "As such, a payment in MXN cannot be used to pay multiple invoices in USD. Rather, the payment should be separated into multiple payments created using the :guilabel:`Register Payment` button on the corresponding invoices." +msgstr "" + +#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:567 msgid "Register PUE Payments" msgstr "" -#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:561 +#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:569 msgid "If at the time of registering a payment it is of the PUE type then in this case a Payment Complement (XML) will not be generated since it is not necessary." msgstr "" -#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:580 +#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:588 msgid "In this case it is not created as a payment supplement by the nature of it." msgstr "" -#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:583 +#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:591 msgid "Down Payments" msgstr "" -#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:585 +#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:593 msgid "This is a special case in which we must receive an advance payment from a client to later be applied to an invoice." msgstr "" -#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:589 +#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:597 msgid "`The official documentation for registration of down payments in Mexico `_." msgstr "" -#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:593 +#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:601 msgid "Process to create advance in Mexico" msgstr "" -#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:595 +#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:603 msgid "Issuance of electronic invoicing with the amount of the advance payment received." msgstr "" -#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:596 +#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:604 msgid "Issuance of the electronic invoice for the total value of the operation (full invoice). (CFDI Origin: 07 | Advance invoice, point 1)" msgstr "" -#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:598 +#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:606 msgid "Issuance of the electronic invoice with the *Egreso* type. (CFDI Origin: 07 | Invoice_total, point 2)" msgstr "" -#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:602 +#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:610 msgid "Steps to follow in Odoo" msgstr "" -#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:604 +#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:612 msgid "Preparation: Create the product" msgstr "" -#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:605 +#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:613 msgid "Down Payment issuance of the electronic invoice for the amount of the advance payment received" msgstr "" -#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:606 +#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:614 msgid "Issuance of the electronic invoice for the total value of the operation" msgstr "" -#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:607 +#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:615 msgid "Add a credit note from the down payment invoice" msgstr "" -#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:610 +#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:618 msgid "Preparation: Create the Product" msgstr "" -#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:612 +#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:620 msgid "The Down Payment product must be type *Service* and must use the **NSPSC Product Category**: *84111506 Servicios de facturación*." msgstr "" -#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:619 +#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:627 msgid "Add the down payment product as default to be used from the Odoo configurations." msgstr "" -#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:626 +#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:634 msgid "Issuance of the electronic invoice for the value of the advance received" msgstr "" -#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:628 +#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:636 msgid "Create the Advance Payment Invoice: From the sales order, create an advance payment invoice for the percentage of the purchase to be paid in advance (or for a fixed amount)." msgstr "" -#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:635 +#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:643 msgid "Validate invoice with the down payment product." msgstr "" -#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:645 +#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:653 msgid "Register Payment to the advance payment invoice." msgstr "" -#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:656 +#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:664 msgid "Issuance of the electronic invoice for the total value of the operation." msgstr "" -#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:658 +#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:666 msgid "From the sales order, create an invoice for the total, that is, for all the order lines without discounting the advance." msgstr "" -#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:666 +#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:674 msgid "Remove the check mark from the **Deduct down payments** field." msgstr "" -#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:668 +#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:676 msgid "Add the original CFDI of the advance payment invoice by adding ``07 |`` at the beginning + Folio Fiscal of the advance payment Invoice created in the previous step." msgstr "" -#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:671 +#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:679 msgid "Copy the Folio Fiscal of the following invoice following this example:" msgstr "" -#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:677 +#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:685 msgid "And paste it in the draft invoice created from the Sales Order without deducting the advances:" msgstr "" -#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:683 +#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:691 msgid "Validate and copy the Folio Fiscal for later (in the example the Folio Fiscal copy is: 50E4FF06-4341-4006-A7C3-A7F653CBEFAE )" msgstr "" -#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:687 +#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:695 msgid "Add credit note from invoice" msgstr "" -#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:689 +#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:697 msgid "Create a **Credit Note** from the down payment invoice (the corrective invoice must be edited prior to confirming it, see explanation below the 2 following images)" msgstr "" -#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:700 +#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:708 msgid "Before you *Confirm* the Credit Note, edit the Origin CFDI with ``07 | XXX`` instead of the prefix ``01 | XXX``" msgstr "" -#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:711 +#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:719 msgid "Now the invoice can be confirmed." msgstr "" -#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:717 +#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:725 msgid "Now the Credit Note (Advance Payment) must be applied to the total invoice, this is added at the bottom below the amount owed." msgstr "" -#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:728 +#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:736 msgid "Register a payment for the difference of the down payment and the total of the sale." msgstr "" -#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:734 +#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:742 msgid "If you go to the XML of the invoice, you should see in CFDI related the type of relationship 07 and the Folio Fiscal of the advance payment invoice." msgstr "" -#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:742 +#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:750 msgid "Discounts based on payment days" msgstr "" -#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:744 +#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:752 msgid "Cash discounts are incentives that you can offer to motivate customers to pay within a specified time period. For example, you offer a 2% discount if the customer pays you within the first 5 days of the invoice, when it is due in 30 days. This approach can greatly improve your average customer payments period." msgstr "" -#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:749 -#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:754 +#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:757 +#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:762 msgid "Create and assign the corresponding Payment Term" msgstr "" -#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:750 -#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:773 +#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:758 +#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:781 msgid "Register the Payment within the days of the discount" msgstr "" -#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:751 -#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:799 +#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:759 +#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:807 msgid "Create a credit note" msgstr "" -#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:756 +#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:764 msgid "To configure the discount for advance payment, go to :menuselection:`Accounting --> Configuration --> Payment Terms` and click on *Create*. Add a Percentage type with a corresponding value (for example, 98% of the total price for a 2% discount) and the number of days for which the offer is valid (for example 5 days). You can also change the balance due type if necessary (in this example 30 days)." msgstr "" -#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:766 +#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:774 msgid "Then when creating our Sales Order or Sales Invoice, assign the Payment Term created previously." msgstr "" -#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:775 +#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:783 msgid "Register the payment within the days in which the application of the discount was specified, in our case it is within 5 days after the creation of the Sales Invoice." msgstr "" -#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:782 +#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:790 msgid "Then go to the bottom of the invoice where the totals are located and there you will see 2 payments created, reset to draft and cancel the payment that does not correspond - the one related to the discount." msgstr "" -#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:801 +#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:809 msgid "Finally to close the cycle we must close the invoice, but as in this case we apply a discount, to close it correctly we must create a credit note specifying that the difference was given to the customer on a **Credit Note**." msgstr "" -#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:813 +#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:821 msgid "Adjust the amount to the remaining balance in the original invoice." msgstr "" -#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:819 +#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:827 msgid "Add the Credit Note to the original invoice so that it is settled." msgstr "" -#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:826 +#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:834 msgid "Cancellation of invoices" msgstr "" -#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:829 +#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:837 msgid "Before 72 Hours" msgstr "" -#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:831 +#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:839 msgid "If it is necessary to cancel an invoice validated and sent to the SAT in less than 72 hours follow the steps below." msgstr "" -#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:834 +#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:842 msgid "Request Cancellation" msgstr "" -#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:840 +#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:848 msgid "The status of the **Electronic invoicing** changes to *Cancelled*" msgstr "" -#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:841 +#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:849 msgid "Click on *RESET TO DRAFT*" msgstr "" -#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:847 +#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:855 msgid "Click on *CANCEL ENTRY*" msgstr "" -#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:854 +#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:862 msgid "After 72 Hours" msgstr "" -#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:856 +#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:864 msgid "If It is necessary to cancel an invoice validated and sent to the SAT more than 72 hours, the client must be asked to accept the cancellation, for this the following steps must be followed." msgstr "" -#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:859 +#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:867 msgid "Click on *Request EDI Cancellation* to inform the SAT that you want to cancel the invoice, in this case the client has to enter the SAT webpage and approve it. (The status of the **Electronic invoicing** field in Odoo changes to *To Cancel*)" msgstr "" -#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:862 +#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:870 msgid "When the client (Receiver / Customer) approves the Cancellation in their SAT portal it is now possible to Change the invoice to Draft and then click on *Cancel entry*." msgstr "" -#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:864 +#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:872 msgid "Odoo synchronizes with the SAT to update the status of the **Electronic invoicing** with a scheduled action, Invoices canceled in the SAT will be canceled in Odoo." msgstr "" -#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:871 +#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:879 msgid "After clicking on **Request EDI cancellation**, the status of the **Electronic invoicing** field will be *To Cancel* but the status of the SAT will be the same to *Valid*, it will remain active until the end customer / Recipient approves the cancellation in the SAT." msgstr "" -#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:879 +#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:887 msgid "Once canceled in the SAT, Odoo will synchronize the status of the SAT through scheduled actions that are executed every day to synchronize the statuses of the SAT, Electronic invoicing and Odoo (this scheduled action can be executed manually by entering with developer mode)." msgstr "" -#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:883 +#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:891 msgid "If the invoice is canceled in the SAT, in Odoo it is also canceled, which allows you to switch the invoice to draft and finally cancel the invoice (*cancel entry*)." msgstr "" -#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:891 +#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:899 msgid "Cancel Paid Invoices" msgstr "" -#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:893 +#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:901 msgid "If the invoice has already been paid, a credit note must be created from the invoice so that the originating CFDI is recognized and later cancel the original invoice." msgstr "" -#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:905 +#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:913 msgid "Cancel Invoices from the previous period" msgstr "" -#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:908 +#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:916 msgid "Problem" msgstr "" -#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:910 +#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:918 msgid "If the invoice is from the previous month and the period is closed, the income has already been declared in Financial Reports and to the government. In Odoo, when canceling an invoice, the journal entry is eliminated as if the income already reported had not existed, this represents a fiscal problem because the income was already declared in the previous month." msgstr "" -#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:915 +#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:923 msgid "The problem resides when the fiscal period has been closed, in the current period you have to make the reverse entry and save the cancellation information." msgstr "" -#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:918 +#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:926 msgid "Invoice to be canceled" msgstr "" -#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:924 +#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:932 msgid "This is how the Balance Sheet looks like:" msgstr "" -#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:930 +#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:938 msgid "If the invoice is canceled, the journal entry and the Balance Sheet looks like this after canceling:" msgstr "" -#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:937 +#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:945 msgid "Solution" msgstr "" -#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:939 +#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:947 msgid "Close the fiscal period every month (Best Practice Mexican Localization)" msgstr "" -#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:940 +#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:948 msgid "Cancel invoice in SAT" msgstr "" -#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:941 +#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:949 msgid "Create a Manual Reversion entry (Journal Entry)" msgstr "" -#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:942 +#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:950 msgid "Reconcile the open invoice with the reversal entry (Journal Entry)" msgstr "" -#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:943 +#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:951 msgid "Change Electronic invoicing status to Cancelled with server action" msgstr "" -#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:946 +#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:954 msgid "Close accounting period each month (Best Practice Mexican Localization)" msgstr "" -#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:948 +#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:956 msgid "If the accounting period is closed due to the blocking dates, Odoo will not allow to modify or add accounting entries of a date corresponding to that accounting period." msgstr "" -#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:956 +#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:964 msgid "Cancel invoice in the SAT" msgstr "" -#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:958 +#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:966 msgid "If the accounting period is closed, and the invoice was canceled in the SAT, the status in Odoo will be published while the **Electronic invoicing** status will be *Sent* and the SAT status is *Cancelled*." msgstr "" -#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:967 +#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:975 msgid "Create Manual Reversal Journal Entry" msgstr "" -#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:969 +#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:977 msgid "The solution is to create the reversal journal entry manually dated in the current fiscal period and reconcile the open invoice with the reversion created manually." msgstr "" -#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:972 +#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:980 msgid "It must be clearly indicated in the reference that it is a cancellation (you can use a cancellation account for invoices from previous periods such as **Other Income**)." msgstr "" -#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:980 +#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:988 msgid "Reconcile the open invoice with the reversal entry" msgstr "" -#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:990 +#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:998 msgid "In the Balance Sheet and Trial balance they are now with the correct balances." msgstr "" -#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:1005 +#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:1013 msgid "Change status of Electronic invoicing to Cancelled with server action" msgstr "" -#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:1007 +#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:1015 msgid "A server action can be created that modifies the status of the invoice to *Cancelled* once it is reconciled with the reversal entry (You should check this with support or with your Assigned Functional Consultant prior to performing this action)." msgstr "" -#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:1020 +#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:1028 msgid "Electronic Accounting" msgstr "" -#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:1022 +#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:1030 msgid "Accounting for Mexico in Odoo is composed of 3 reports:" msgstr "" -#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:1024 -#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:1038 +#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:1032 +#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:1046 msgid "Electronic Chart of Accounts (Called and displayed as COA)." msgstr "" -#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:1025 +#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:1033 msgid "Electronic Trial Balance." msgstr "" -#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:1026 +#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:1034 msgid "DIOT report." msgstr "" -#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:1028 +#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:1036 msgid "1. and 2. are considered electronic accounting, and DIOT is a report only available in the context of accounting." msgstr "" -#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:1031 +#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:1039 msgid "You can find all of those reports in :menuselection:`Accounting --> Reporting --> Mexico`" msgstr "" -#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:1040 +#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:1048 msgid "Electronic invoicing has never been so easy, just go to :menuselection:`Accounting -> Reports -> Mexico -> COA` and click the button **Export for SAT (XML)**." msgstr "" -#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:1048 +#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:1056 msgid "How to add new accounts ?" msgstr "" -#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:1050 +#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:1058 msgid "If you add an account with the NNN.YY.ZZ encoding convention where NNN.YY is a SAT encoding group, your account will be set up automatically." msgstr "" -#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:1053 +#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:1061 msgid "Example to add an Account for a new Bank account go to :menuselection:`Accounting --> Settings --> Chart of Account` and then create a new account in the «Create» button and try to create an account with the number 102.01.99 once you change to establish the name you will see an automatically configured label, the configured labels are the ones chosen to be used in the COA in XML." msgstr "" -#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:1064 +#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:1072 msgid "What is the meaning of the tags?" msgstr "" -#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:1066 +#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:1074 msgid "To know all the possible labels, you can read `Annex 24 `_ on the SAT website in the section called **Código agrupador de cuentas del SAT**." msgstr "" -#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:1071 +#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:1079 msgid "When you install the l10n_mx module and your chart of accounts depends on it (this happens automatically when you install the configuration of Mexico as a country in your database), it will have the most common labels by default. If the tag you need is not created, you can create it." msgstr "" -#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:1077 +#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:1085 msgid "Trial Balance" msgstr "" -#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:1079 +#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:1087 msgid "Exactly like the COA but with the credit and debit of the initial balance, once you have correctly configured your COA, you can go to :menuselection:`Reports --> Trial Balance` this is automatically generated and can be exported to XML using the button on the top **Export for SAT (XML)** with the previous selection of the period you want to export." msgstr "" -#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:1088 +#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:1096 msgid "All normal analysis and listed functions are available here as well as any normal Odoo Report." msgstr "" -#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:1091 +#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:1099 msgid "DIOT Report (Requires Accounting App)" msgstr "" -#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:1094 +#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:1102 msgid "What is DIOT and the importance of presenting it SAT" msgstr "" -#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:1096 +#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:1104 msgid "When it comes to procedures with the SAT Administration Service, we know that we should not neglect what we present." msgstr "" -#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:1099 +#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:1107 msgid "The DIOT is the Informative Declaration of Operations with Third Parties (DIOT), which is an additional obligation with VAT, where we must give the status of our operations to third parties, or what is considered the same, with our suppliers." msgstr "" -#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:1103 +#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:1111 msgid "This applies to both individuals and Personas Morales, so if we have VAT to present to the SAT and also deal with suppliers it is necessary to send the DIOT." msgstr "" -#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:1107 +#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:1115 msgid "When to file the DIOT and in what format ?" msgstr "" -#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:1109 +#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:1117 msgid "It is easy to present the DIOT, since, like all formats, you can obtain it on the SAT page, it is the electronic form A-29 that you can find on the SAT website." msgstr "" -#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:1112 +#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:1120 msgid "Every month if you have operations with third parties, it is necessary to present the DIOT, as we do with VAT, so if in January we have deals with suppliers, by February we must present the information relevant to said data." msgstr "" -#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:1117 +#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:1125 msgid "Where is DIOT presented?" msgstr "" -#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:1119 +#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:1127 msgid "You can present DIOT in different ways, it is up to you which one you will choose and which one will be more comfortable for you since you will present it every month or every time you have dealings with suppliers." msgstr "" -#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:1123 +#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:1131 msgid "The A-29 form is electronic so you can present it on the SAT page, but this after having made up to 500 registrations." msgstr "" -#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:1126 +#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:1134 msgid "Once these 500 records have been entered in the SAT, you must submit them to the Local Taxpayer Services Administration (ALSC) with correspondence to your tax address, these records can be submitted on a digital storage medium such as a CD or USB, which a Once validated, they will return you, so do not doubt that you will still have these discs and of course, your CD or USB." msgstr "" -#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:1132 +#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:1140 msgid "One more thing to know: batch loading?" msgstr "" -#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:1134 +#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:1142 msgid "When reviewing the official SAT documents in DIOT, you will find the Batch load, and of course the first thing we think is what is that ?, and according to the SAT site it is:" msgstr "" -#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:1137 +#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:1145 msgid "The \"batch load\" is the conversion of databases from records of transactions with suppliers made by taxpayers in text files (.txt). These files have the necessary structure for their application and import into the Informative Declaration of Operations with third parties system, avoiding direct capture and consequently, optimizing the time invested in their integration for the presentation in time and form to the SAT." msgstr "" -#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:1143 +#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:1151 msgid "You can use it to present the DIOT, since it is allowed, which will facilitate this operation, so that it does not exist to avoid being in line with the SAT in regards to the Informative Declaration of Operations with Third Parties." msgstr "" -#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:1148 +#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:1156 msgid "`official information `_" msgstr "" -#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:1152 +#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:1160 msgid "How to generate this report in Odoo?" msgstr "" -#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:1154 +#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:1162 msgid "Go to :menuselection:`Accounting --> Reports --> Mexico --> Transactions with third partied (DIOT)`." msgstr "" -#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:1161 +#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:1169 msgid "A report view is displayed, select the last month to report the immediately preceding month or leave the current month if it suits you." msgstr "" -#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:1168 +#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:1176 msgid "Click on *Export (XLSX)* or *Print (TXT)*" msgstr "" -#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:1174 +#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:1182 msgid "Save the downloaded file in a safe place, go to the SAT website and follow the necessary steps to declare it." msgstr "" -#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:1178 +#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:1186 msgid "Important considerations about your supplier and invoice data for DIOT" msgstr "" -#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:1180 +#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:1188 msgid "All suppliers must have the fields configured in the accounting tab called \"DIOT Information\", the L10N MX Nationality field is completed by simply selecting the appropriate country in the address, not You need to do nothing else there, but the l10n MX type of operation must be configured in all your providers." msgstr "" -#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:1189 +#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:1197 msgid "There are 3 VAT options for this report, 16%, 0% and exempt, one invoice line in Odoo is considered exempt if there is no tax on it, the other 2 taxes are already configured correctly." msgstr "" -#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:1191 +#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:1199 msgid "Remember that to pay an invoice that represents a prepayment, you must first request the invoice and then pay it and properly reconcile the payment following the standard Odoo procedure." msgstr "" -#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:1193 +#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:1201 msgid "You do not need to fill in all your partner data to try to generate the supplier invoice, you can correct this information when you generate the report." msgstr "" -#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:1195 +#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:1203 msgid "Remember that this report only shows vendor invoices that were actually paid." msgstr "" -#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:1197 +#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:1205 msgid "If some of these considerations are not taken into account, a message like this will appear when you generate the DIOT in TXT with all the partners you need to verify this particular report, this is the reason why we recommend to use this report not only for exporting your legal information. obligation, but generate it before the end of the month and use it as your auditory process to see that all your partners are configured correctly." msgstr "" -#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:1208 +#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:1216 msgid "Closing Fiscal Period in Odoo" msgstr "" -#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:1210 +#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:1218 msgid "Before proceeding to the close of the fiscal year, there are some steps that you should normally take to ensure that your accounting is correct, updated and accurate:" msgstr "" -#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:1213 +#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:1221 msgid "Make sure that you have fully reconciled your bank account (s) through the end of the year and confirm that the closing book balances match the balances on your bank statements." msgstr "" -#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:1215 +#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:1223 msgid "Verify that all customer invoices have been entered and approved." msgstr "" -#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:1216 +#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:1224 msgid "Confirm that you have entered and approved all vendor bills." msgstr "" -#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:1217 +#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:1225 msgid "Validate all expenses, ensuring their accuracy." msgstr "" -#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:1218 +#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:1226 msgid "Check that all payments received have been entered and recorded exactly." msgstr "" -#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:1221 +#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:1229 #: ../../content/applications/finance/accounting/taxation/fiscal_year/close_fiscal_year.rst:23 msgid "Year-end checklist" msgstr "" -#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:1223 +#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:1231 msgid "Run a **Tax Report**, and verify that your tax information is correct." msgstr "" -#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:1224 +#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:1232 msgid "Reconcile all accounts on your **Balance Sheet**" msgstr "" -#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:1226 +#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:1234 msgid "Compare your bank balances in Odoo against the current bank balances on your statements. Use the report **Bank Reconciliation** to help you with this." msgstr "" -#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:1228 +#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:1236 msgid "Reconcile all cash and bank account transactions by running your **Old Accounts Receivable** and **Old Accounts Payable** reports" msgstr "" -#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:1230 +#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:1238 msgid "Audit your accounts, making sure you fully understand the transactions that affect them and the nature of the transactions, making sure to include loans and fixed assets." msgstr "" -#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:1233 +#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:1241 msgid "Run the optional function **Payments Matching**, under the *More* drop-down on the Journal options from the Accounting dashboard, validating any Vendor Bill and Customer Invoices with its payments. This step is optional, however it can assist the year-end process if all pending payments and invoices are reconciled, and it can lead to finding errors or mistakes in the system." msgstr "" -#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:1238 +#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:1246 msgid "Your accountant will probably like to check your items in the balance sheet and do some Journal Entries for:" msgstr "" -#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:1241 +#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:1249 msgid "Manual year-end adjustments, using the **Journal Audit** report (For example, the **Current Earnings for the Year** and **Retained Earnings reports**)." msgstr "" -#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:1243 +#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:1251 #: ../../content/applications/finance/accounting/taxation/fiscal_year/close_fiscal_year.rst:54 msgid "**Work in Progress**." msgstr "" -#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:1244 +#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:1252 msgid "**Depreciation Journals**." msgstr "" -#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:1245 +#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:1253 #: ../../content/applications/finance/accounting/taxation/fiscal_year/close_fiscal_year.rst:58 msgid "**Loans**." msgstr "" -#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:1246 +#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:1254 msgid "**Tax Adjustments**." msgstr "" -#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:1248 +#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:1256 msgid "If your accountant is on the year-end audit, they will want to have copies of the balance sheet items (such as loans, bank accounts, prepayments, sales tax reports, etc ...) to compare against. your balances in Odoo." msgstr "" -#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:1252 +#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:1260 msgid "During this process, it is a good practice setting the **Closing Date for Non-Advisers** to the last day of the preceding financial year, which is set under the accounting settings. In this way, the accountant can trust that no one else is changing the previous year's transactions while auditing the books." msgstr "" -#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:1262 +#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:1270 msgid "Accounting Closing Process" msgstr "" -#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:1264 +#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:1272 msgid "In Odoo there is no need to make a specific year-end entry to close the reporting income accounts . The result of the exercise is automatically calculated in the account type (Current Year Earnings) and the difference between Income - Expenses will be accumulated to calculate it." msgstr "" -#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:1268 +#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:1276 msgid "The reports are created in real-time, which means that the **Income Report** corresponds directly to the closing date of the year that you specify in Odoo. In addition, at any time that you generate the **Income Report**, the start date will correspond to the start date of the **Fiscal Year** and the account balances will all be 0." msgstr "" -#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:1273 +#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:1281 msgid "As of December 31, the Balance Sheet shows the earnings of the Current Year that do not have been recognized (Account type Total Current Year Unallocated Earnings in MX account 305.01.01 ['current year earnings' type])" msgstr "" -#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:1281 +#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:1289 msgid "The accountant should create a Journal Entry to recognize the result of the year in Accumulated Earnings from previous years on the account \"previous years results\" account (304.01.01 in Mexico) - that is an equity account." msgstr "" -#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:1285 +#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:1293 msgid "After posting the Journal Entry, click on *Mark as Closing Entry for the Fiscal Year*. This step is important because it is linked to the Trial Balance report. If this Journal Entry is not marked as a Closing Entry, the Trial Balance won't be correct." msgstr "" -#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:1289 +#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:1297 msgid "The simplified accounting entry would look like this:" msgstr "" -#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:1295 +#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:1303 msgid "Once the accountant has created the journal entry to locate the **Current Earnings for the Year**, they must set the **Closing Date** to the last day of the fiscal year. Making sure that before doing this, whether or not the current gain of the year in the **Balance Sheet** is properly reporting a balance 0." msgstr "" -#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:1305 +#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:1313 msgid "Extra Recommended features" msgstr "" -#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:1308 +#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:1316 msgid "Contacts App (Free)" msgstr "" -#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:1310 +#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:1318 msgid "If you want to properly manage your customers, suppliers and addresses, this module, even if it is not a technical need, it is highly recommended to install it." msgstr "" -#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:1314 +#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:1322 msgid "Multi-currency (Requires Accounting application)" msgstr "" -#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:1316 +#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:1324 msgid "In Mexico, almost all companies send and receive payments in different currencies. If you want to do this you can enable the use of multi-currency. You should also enable synchronization with the **Mexican Bank Service**, as this would allow you to automatically have the exchange rate from the SAT without having to manually create this information every day in Odoo." msgstr "" -#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:1321 +#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:1329 msgid "Go to settings and enable the multi-currency feature." msgstr "" -#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:1328 +#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:1336 msgid "Enabling Explicit errors on the CFDI using the XSD local validator (CFDI 3.3)" msgstr "" -#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:1330 +#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:1338 msgid "Frequently you want receive explicit errors from the fields incorrectly set on the xml, those errors are better informed to the user if the check is enable, to enable the Check with xsd feature follow the next steps (with the :ref:`developer mode ` enabled)." msgstr "" -#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:1335 +#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:1343 msgid "Go to :menuselection:`Settings --> Technical --> Actions --> Server Actions`" msgstr "" -#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:1336 +#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:1344 msgid "Look for the Action called \"Download XSD files to CFDI\"" msgstr "" -#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:1337 +#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:1345 msgid "Click on button \"Create Contextual Action\"" msgstr "" -#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:1338 +#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:1346 msgid "Go to the company form :menuselection:`Settings --> Users&Companies --> Companies`" msgstr "" -#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:1339 +#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:1347 msgid "Open any company you have." msgstr "" -#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:1340 +#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:1348 msgid "Click on \"Action\" and then on \"Download XSD file to CFDI\"." msgstr "" -#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:1346 +#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:1354 msgid "Now you can make an invoice with any error (for example a product without code which is pretty common) and an explicit error will be shown instead a generic one with no explanation." msgstr "" -#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:1351 +#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:1359 msgid "If you see an error like this:" msgstr "" @@ -6958,109 +7347,109 @@ msgstr "" msgid "``attribute decl. 'TipoRelacion', attribute 'type': The QName value '{http://www.sat.gob.mx/sitio_internet/cfd/catalogos}c_TipoRelacion' does not resolve to a(n) simple type definition., line 36``" msgstr "" -#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:1358 +#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:1366 msgid "This can be caused by a database backup restored in another server, or when the XSD files are not correctly downloaded. Follow the same steps as above but:" msgstr "" -#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:1362 +#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:1370 msgid "Go to the company in which the error occurs." msgstr "" -#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:1363 +#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:1371 msgid "Click on *Action* and then on *Download XSD file to CFDI*." msgstr "" -#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:1366 +#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:1374 msgid "Common problems and errors" msgstr "" -#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:1368 +#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:1376 msgid "**Error messages** (Only applicable on CFDI 3.3):" msgstr "" -#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:1370 +#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:1378 msgid "``9:0:ERROR:SCHEMASV:SCHEMAV_CVC_MINLENGTH_VALID: Element '{http://www.sat.gob.mx/cfd/3}Concepto', attribute 'NoIdentificacion': [facet 'minLength'] The value '' has a length of '0'; this underruns the allowed minimum length of '1'.``" msgstr "" -#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:1375 +#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:1383 msgid "``9:0:ERROR:SCHEMASV:SCHEMAV_CVC_PATTERN_VALID: Element '{http://www.sat.gob.mx/cfd/3}Concepto', attribute 'NoIdentificacion': [facet 'pattern'] The value '' is not accepted by the pattern '[^|]{1,100}'.``" msgstr "" -#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:1379 +#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:1387 msgid "**Solution**: You forgot to set the proper \"Reference\" field in the product, please go to the product form and set your internal reference properly." msgstr "" -#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:1383 -#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:1424 -#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:1455 -#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:1476 +#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:1391 +#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:1432 +#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:1463 #: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:1484 +#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:1492 msgid "**Error messages**:" msgstr "" -#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:1385 +#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:1393 msgid "``6:0:ERROR:SCHEMASV:SCHEMAV_CVC_COMPLEX_TYPE_4: Element '{http://www.sat.gob.mx/cfd/3}RegimenFiscal': The attribute 'Regimen' is required but missing.``" msgstr "" -#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:1388 +#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:1396 msgid "``5:0:ERROR:SCHEMASV:SCHEMAV_CVC_COMPLEX_TYPE_4: Element '{http://www.sat.gob.mx/cfd/3}Emisor': The attribute 'RegimenFiscal' is required but missing.``" msgstr "" -#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:1391 +#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:1399 msgid "**Solution**: You forgot to set the proper \"Fiscal Position\" on the partner of the company. Go to customers, remove the customer filter and look for the partner called as your company and set the proper fiscal position which is the kind of business your company does related to SAT list of possible values, another option can be that you forgot to follow the considerations about fiscal positions." msgstr "" -#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:1398 +#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:1406 msgid "You need to go to Fiscal Position settings and set the proper code (it is the first 3 numbers of the name), for example, for the test, you need to set 601, it will look like the picture." msgstr "" -#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:1406 +#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:1414 msgid "For testing purposes this value must be set to ``601 - General de Ley Personas Morales`` which is the one required for the VAT demo." msgstr "" -#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:1409 -#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:1441 +#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:1417 +#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:1449 msgid "**Error message**:" msgstr "" -#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:1411 +#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:1419 msgid "``2:0:ERROR:SCHEMASV:SCHEMAV_CVC_ENUMERATION_VALID: Element '{http://www.sat.gob.mx/cfd/3}Comprobante', attribute 'FormaPago': [facet 'enumeration'] The value '' is not an element of the set {'01', '02', '03', '04', '05', '06', '08', '12', '13', '14', '15', '17', '23', '24', '25', '26', '27', '28', '29', '30', '99'}``" msgstr "" -#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:1417 +#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:1425 msgid "**Solution**: The payment method is required on your invoice." msgstr "" -#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:1426 +#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:1434 msgid "``2:0:ERROR:SCHEMASV:SCHEMAV_CVC_ENUMERATION_VALID: Element '{http://www.sat.gob.mx/cfd/3}Comprobante', attribute 'LugarExpedicion': [facet 'enumeration'] The value '' is not an element of the set {'00``" msgstr "" -#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:1429 -#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:1443 +#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:1437 +#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:1451 msgid "``2:0:ERROR:SCHEMASV:SCHEMAV_CVC_DATATYPE_VALID_1_2_1: Element '{http://www.sat.gob.mx/cfd/3}Comprobante', attribute 'LugarExpedicion': '' is not a valid value of the atomic type '{http://www.sat.gob.mx/sitio_internet/cfd/catalogos}c_CodigoPostal'.``" msgstr "" -#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:1432 +#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:1440 msgid "``5:0:ERROR:SCHEMASV:SCHEMAV_CVC_COMPLEX_TYPE_4: Element '{http://www.sat.gob.mx/cfd/3}Emisor': The attribute 'Rfc' is required but missing.``" msgstr "" -#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:1435 +#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:1443 msgid "**Solution**: You must configure your company address correctly, this is a mandatory group of fields, you can go to your company configuration in :menuselection:`Settings --> Users & Companies --> Companies` and fill complete all the mandatory fields for your address by following the steps in this section: :ref:`mx-legal-info`." msgstr "" -#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:1448 +#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:1456 msgid "**Solution**: The postal code of your company address is not valid for Mexico, please correct it." msgstr "" -#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:1457 +#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:1465 msgid "``18:0:ERROR:SCHEMASV:SCHEMAV_CVC_COMPLEX_TYPE_4: Element '{http://www.sat.gob.mx/cfd/3}Traslado': The attribute 'TipoFactor' is required but missing.``" msgstr "" -#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:1460 +#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:1468 msgid "``34:0:ERROR:SCHEMASV:SCHEMAV_CVC_COMPLEX_TYPE_4: Element '{http://www.sat.gob.mx/cfd/3}Traslado': The attribute 'TipoFactor' is required but missing.\", '')``" msgstr "" -#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:1464 +#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:1472 msgid "**Solution**: Set the Mexican name for the 0% and 16% tax in your system and use it on the invoice. Your tax, which represents 16% VAT and 0%, must have the **Factor Type** field set to *Tasa*." msgstr "" @@ -7072,7 +7461,7 @@ msgstr "" msgid "``The XXXX attribute must be registered if the key of cce11: ComercioExterior: TipoOperacion registered is '1' or '2'.``" msgstr "" -#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:1482 +#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:1490 msgid "**Solution**: It is necessary to specify the Incoterm." msgstr "" @@ -7084,44 +7473,43 @@ msgstr "" msgid "``The attribute cce11: Foreign Trade: Goods: Goods: Customs Unit must have the value specified in the catalog catCFDI: c_FraccionArancelaria column 'UMT' when the attribute cce11: Foreign Trade: Goods: Me``" msgstr "" -#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:1491 +#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:1499 msgid "**Solution**: The Tariff Fraction must have the code of the unit of measure 01, corresponding to Kilograms." msgstr "" -#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:1495 +#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:1503 msgid "Glossary" msgstr "" -#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:1497 +#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:1505 msgid ":abbr:`CFDI (Comprobante Fiscal Digital por Internet)`: Online Digital Tax Receipt" msgstr "" -#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:1498 +#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:1506 msgid ":abbr:`CSD (Certificado de Sello Digital)`: Digital Seal Certificate" msgstr "" -#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:1499 +#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:1507 msgid ":abbr:`PAC (Proveedores Autorizados de Certificación)`: Authorized Certification Provider" msgstr "" -#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:1500 +#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:1508 msgid "Stamp: Digital signature of the electronic invoice" msgstr "" -#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:1501 +#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:1509 msgid "Addenda: Complement of information that can be attached to an Internet Digital Tax Receipt (CFDI) normally required by certain companies in Mexico such as Walmart, Tiendas Sorianas, etc." msgstr "" -#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:1503 +#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:1511 msgid ":abbr:`UUID (Universally Unique Identifier)`: It is the acronym in English of the Universally Unique Identifier. The UUID is the equivalent of Folio Fiscal, it is composed of 32 hexadecimal digits, shown in 5 groups separated by hyphens." msgstr "" -#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:1506 +#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:1514 msgid "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." msgstr "" #: ../../content/applications/finance/accounting/fiscal_localizations/localizations/netherlands.rst:2 -#: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:96 msgid "Netherlands" msgstr "" @@ -7150,7 +7538,6 @@ msgid "Intrastat Report (ICP)" msgstr "" #: ../../content/applications/finance/accounting/fiscal_localizations/localizations/peru.rst:3 -#: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:105 msgid "Peru" msgstr "" @@ -8028,7 +8415,7 @@ msgid "Don't forget to update your fiscal positions. If you have a version 11.1 msgstr "" #: ../../content/applications/finance/accounting/fiscal_localizations/overview/fiscal_localization_packages.rst:3 -msgid "Fiscal Localization Packages" +msgid "Fiscal localization packages" msgstr "" #: ../../content/applications/finance/accounting/fiscal_localizations/overview/fiscal_localization_packages.rst:5 @@ -8074,11 +8461,6 @@ msgstr "" msgid ":doc:`../../getting_started/initial_configuration/chart_of_accounts`" msgstr "" -#: ../../content/applications/finance/accounting/fiscal_localizations/overview/fiscal_localization_packages.rst:42 -#: ../../content/applications/finance/accounting/reporting/declarations/tax_returns.rst:123 -msgid ":doc:`../../taxation/taxes/taxes`" -msgstr "" - #: ../../content/applications/finance/accounting/fiscal_localizations/overview/fiscal_localization_packages.rst:44 msgid "update list of linked docs, and link with the future one about country-specific statements." msgstr "" @@ -8092,379 +8474,295 @@ msgid "Odoo Accounting can be used in many countries out of the box by installin msgstr "" #: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:10 -msgid "Fiscal Localization Packages available" +msgid "Fiscal localization packages available" msgstr "" #: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:12 msgid "Algeria - Accounting" msgstr "" -#: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:15 -msgid "Argentinian Accounting" +#: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:13 +msgid "Argentina - Accounting" msgstr "" -#: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:16 -msgid "Argentinian Accounting Reports" -msgstr "" - -#: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:17 -msgid "Argentinian Electronic Invoicing" -msgstr "" - -#: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:19 +#: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:14 msgid "Australian - Accounting" msgstr "" -#: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:20 +#: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:15 msgid "Austria - Accounting" msgstr "" -#: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:21 +#: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:16 msgid "Belgium - Accounting" msgstr "" -#: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:22 +#: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:17 msgid "Bolivia - Accounting" msgstr "" -#: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:23 +#: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:18 msgid "Brazilian - Accounting" msgstr "" -#: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:24 +#: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:19 msgid "Canada - Accounting" msgstr "" -#: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:25 +#: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:20 msgid "Chile - Accounting" msgstr "" -#: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:26 -msgid "China" -msgstr "" - -#: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:28 +#: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:21 msgid "China - Accounting" msgstr "" -#: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:29 -msgid "China - City Data" +#: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:22 +msgid "Colombia - Accounting" msgstr "" -#: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:30 -msgid "China - Small Business CoA" -msgstr "" - -#: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:31 -msgid "China - Standard CoA" -msgstr "" - -#: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:35 -msgid "Colombian - Accounting" -msgstr "" - -#: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:36 -msgid "Colombian - Point of Sale" -msgstr "" - -#: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:38 +#: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:23 msgid "Costa Rica - Accounting" msgstr "" -#: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:39 +#: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:24 msgid "Croatia - Accounting (RRIF 2012)" msgstr "" -#: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:40 -msgid "Denmark" +#: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:25 +msgid "Czech - Accounting" msgstr "" -#: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:42 +#: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:26 msgid "Denmark - Accounting" msgstr "" -#: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:43 -msgid "Denmark - Accounting Reports" -msgstr "" - -#: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:45 +#: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:27 msgid "Dominican Republic - Accounting" msgstr "" -#: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:46 -msgid "Ecuador - Accounting" +#: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:28 +msgid "Ecuadorian - Accounting" msgstr "" -#: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:47 +#: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:29 +msgid "Egypt - Accounting" +msgstr "" + +#: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:30 msgid "Ethiopia - Accounting" msgstr "" -#: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:48 -msgid "EU Mini One Stop Shop (MOSS)" -msgstr "" - -#: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:49 +#: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:31 msgid "Finnish Localization" msgstr "" -#: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:50 +#: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:32 msgid "France - Accounting" msgstr "" -#: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:51 +#: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:33 msgid "Generic - Accounting" msgstr "" -#: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:54 -msgid "Germany - Accounting" -msgstr "" - -#: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:55 +#: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:36 msgid "Germany SKR03 - Accounting" msgstr "" -#: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:56 +#: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:37 msgid "Germany SKR04 - Accounting" msgstr "" -#: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:58 +#: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:39 msgid "Greece - Accounting" msgstr "" -#: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:59 +#: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:40 msgid "Guatemala - Accounting" msgstr "" -#: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:60 +#: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:41 msgid "Honduras - Accounting" msgstr "" -#: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:61 +#: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:42 msgid "Hong Kong - Accounting" msgstr "" -#: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:62 +#: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:43 msgid "Hungarian - Accounting" msgstr "" -#: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:63 -msgid "India" -msgstr "" - -#: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:65 +#: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:44 msgid "Indian - Accounting" msgstr "" -#: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:66 -msgid "Indian - Point of Sale" -msgstr "" - -#: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:68 +#: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:45 msgid "Indonesian - Accounting" msgstr "" -#: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:69 +#: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:46 msgid "Ireland - Accounting" msgstr "" -#: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:70 +#: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:47 msgid "Israel - Accounting" msgstr "" -#: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:73 +#: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:48 msgid "Italy - Accounting" msgstr "" -#: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:74 -msgid "Italy - E-invoicing" -msgstr "" - -#: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:76 +#: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:49 msgid "Japan - Accounting" msgstr "" -#: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:77 -msgid "LATAM" +#: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:50 +msgid "Kenya - Accounting" msgstr "" -#: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:79 -msgid "LATAM Localization Base" -msgstr "" - -#: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:80 -msgid "LATAM Document" -msgstr "" - -#: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:82 -msgid "Lithuania" -msgstr "" - -#: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:84 +#: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:51 msgid "Lithuania - Accounting" msgstr "" -#: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:85 -msgid "LT - Accounting Reports" -msgstr "" - -#: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:87 +#: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:52 msgid "Luxembourg - Accounting" msgstr "" -#: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:88 +#: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:53 msgid "Maroc - Accounting" msgstr "" -#: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:89 +#: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:54 msgid "Mexico - Accounting" msgstr "" -#: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:90 -msgid "Mongolia" -msgstr "" - -#: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:92 +#: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:55 msgid "Mongolia - Accounting" msgstr "" -#: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:93 -msgid "Mongolia - Accounting Reports" -msgstr "" - -#: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:95 -msgid "Multi Language Chart of Accounts" -msgstr "" - -#: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:98 +#: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:56 msgid "Netherlands - Accounting" msgstr "" -#: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:99 -msgid "Netherlands - Intrastat Declaration" -msgstr "" - -#: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:101 +#: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:57 msgid "New Zealand - Accounting" msgstr "" -#: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:102 +#: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:58 msgid "Norway - Accounting" msgstr "" -#: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:103 +#: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:59 msgid "OHADA - Accounting" msgstr "" -#: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:104 +#: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:60 +msgid "Pakistan - Accounting" +msgstr "" + +#: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:61 msgid "Panama - Accounting" msgstr "" -#: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:107 -msgid "Peruvian Accounting" +#: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:62 +msgid "Peru - Accounting" msgstr "" -#: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:108 -msgid "Peruvian Accounting Reports" -msgstr "" - -#: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:109 -msgid "Peruvian Electronic Invoicing" -msgstr "" - -#: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:111 +#: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:63 msgid "Poland - Accounting" msgstr "" -#: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:112 +#: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:64 msgid "Portugal - Accounting" msgstr "" -#: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:113 +#: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:65 msgid "Romania - Accounting" msgstr "" -#: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:114 +#: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:66 msgid "Saudi Arabia - Accounting" msgstr "" -#: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:115 +#: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:67 msgid "Singapore - Accounting" msgstr "" -#: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:116 +#: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:68 +msgid "Slovak - Accounting" +msgstr "" + +#: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:69 msgid "Slovenian - Accounting" msgstr "" -#: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:117 +#: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:70 msgid "South Africa - Accounting" msgstr "" -#: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:118 +#: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:71 msgid "Spain - Accounting (PGCE 2008)" msgstr "" -#: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:119 -msgid "Sweden" +#: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:72 +msgid "Sweden - Accounting" msgstr "" -#: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:121 -msgid "Sweden - Structured Communication OCR" -msgstr "" - -#: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:122 -msgid "Swedish - Accounting" -msgstr "" - -#: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:124 +#: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:73 msgid "Switzerland - Accounting" msgstr "" -#: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:125 +#: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:74 +msgid "Taiwan - Accounting" +msgstr "" + +#: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:75 msgid "Thailand - Accounting" msgstr "" -#: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:126 +#: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:76 msgid "Turkey - Accounting" msgstr "" -#: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:127 +#: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:77 msgid "U.A.E. - Accounting" msgstr "" -#: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:128 +#: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:78 msgid "UK - Accounting" msgstr "" -#: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:129 +#: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:79 msgid "Ukraine - Accounting" msgstr "" -#: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:130 +#: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:80 msgid "United States - Accounting" msgstr "" -#: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:131 -msgid "Uruguay - Chart of Accounts" +#: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:81 +msgid "Uruguay - Accounting" msgstr "" -#: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:132 +#: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:82 msgid "Venezuela - Accounting" msgstr "" -#: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:133 +#: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:83 msgid "Vietnam - Accounting" msgstr "" -#: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:136 +#: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:86 msgid ":doc:`fiscal_localization_packages`" msgstr "" #: ../../content/applications/finance/accounting/getting_started.rst:5 -msgid "Getting Started" +msgid "Getting started" msgstr "" #: ../../content/applications/finance/accounting/getting_started/initial_configuration.rst:5 -msgid "Initial Configuration" +msgid "Initial configuration" msgstr "" #: ../../content/applications/finance/accounting/getting_started/initial_configuration/chart_of_accounts.rst:3 @@ -8486,30 +8784,30 @@ msgid "Balance Sheet accounts" msgstr "" #: ../../content/applications/finance/accounting/getting_started/initial_configuration/chart_of_accounts.rst:13 -#: ../../content/applications/finance/accounting/getting_started/initial_configuration/chart_of_accounts.rst:65 +#: ../../content/applications/finance/accounting/getting_started/initial_configuration/chart_of_accounts.rst:67 msgid "Assets" msgstr "" #: ../../content/applications/finance/accounting/getting_started/initial_configuration/chart_of_accounts.rst:14 -#: ../../content/applications/finance/accounting/getting_started/initial_configuration/chart_of_accounts.rst:77 +#: ../../content/applications/finance/accounting/getting_started/initial_configuration/chart_of_accounts.rst:79 msgid "Liabilities" msgstr "" #: ../../content/applications/finance/accounting/getting_started/initial_configuration/chart_of_accounts.rst:15 -#: ../../content/applications/finance/accounting/getting_started/initial_configuration/chart_of_accounts.rst:85 -#: ../../content/applications/finance/accounting/getting_started/initial_configuration/chart_of_accounts.rst:85 +#: ../../content/applications/finance/accounting/getting_started/initial_configuration/chart_of_accounts.rst:87 +#: ../../content/applications/finance/accounting/getting_started/initial_configuration/chart_of_accounts.rst:87 msgid "Equity" msgstr "" #: ../../content/applications/finance/accounting/getting_started/initial_configuration/chart_of_accounts.rst:19 -#: ../../content/applications/finance/accounting/getting_started/initial_configuration/chart_of_accounts.rst:89 -#: ../../content/applications/finance/accounting/getting_started/initial_configuration/chart_of_accounts.rst:89 +#: ../../content/applications/finance/accounting/getting_started/initial_configuration/chart_of_accounts.rst:91 +#: ../../content/applications/finance/accounting/getting_started/initial_configuration/chart_of_accounts.rst:91 msgid "Income" msgstr "" #: ../../content/applications/finance/accounting/getting_started/initial_configuration/chart_of_accounts.rst:20 -#: ../../content/applications/finance/accounting/getting_started/initial_configuration/chart_of_accounts.rst:93 -#: ../../content/applications/finance/accounting/getting_started/initial_configuration/chart_of_accounts.rst:93 +#: ../../content/applications/finance/accounting/getting_started/initial_configuration/chart_of_accounts.rst:95 +#: ../../content/applications/finance/accounting/getting_started/initial_configuration/chart_of_accounts.rst:95 msgid "Expense" msgstr "" @@ -8541,212 +8839,211 @@ msgstr "" msgid "Each account is identified by its **Code** and **Name**, which also indicates the account's purpose." msgstr "" -#: ../../content/applications/finance/accounting/getting_started/initial_configuration/chart_of_accounts.rst:52 +#: ../../content/applications/finance/accounting/getting_started/initial_configuration/chart_of_accounts.rst:54 msgid "Configuring correctly the **Account Type** is critical as it serves multiple purposes:" msgstr "" -#: ../../content/applications/finance/accounting/getting_started/initial_configuration/chart_of_accounts.rst:54 +#: ../../content/applications/finance/accounting/getting_started/initial_configuration/chart_of_accounts.rst:56 msgid "Information on the account's purpose and behavior" msgstr "" -#: ../../content/applications/finance/accounting/getting_started/initial_configuration/chart_of_accounts.rst:55 +#: ../../content/applications/finance/accounting/getting_started/initial_configuration/chart_of_accounts.rst:57 msgid "Generate country-specific legal and financial reports" msgstr "" -#: ../../content/applications/finance/accounting/getting_started/initial_configuration/chart_of_accounts.rst:56 +#: ../../content/applications/finance/accounting/getting_started/initial_configuration/chart_of_accounts.rst:58 msgid "Set the rules to close a fiscal year" msgstr "" -#: ../../content/applications/finance/accounting/getting_started/initial_configuration/chart_of_accounts.rst:57 +#: ../../content/applications/finance/accounting/getting_started/initial_configuration/chart_of_accounts.rst:59 msgid "Generate opening entries" msgstr "" -#: ../../content/applications/finance/accounting/getting_started/initial_configuration/chart_of_accounts.rst:59 +#: ../../content/applications/finance/accounting/getting_started/initial_configuration/chart_of_accounts.rst:61 msgid "To configure an account type, open the **Type** field's drop-down selector and select the right type among the following list:" msgstr "" -#: ../../content/applications/finance/accounting/getting_started/initial_configuration/chart_of_accounts.rst:63 +#: ../../content/applications/finance/accounting/getting_started/initial_configuration/chart_of_accounts.rst:65 msgid "Report" msgstr "" -#: ../../content/applications/finance/accounting/getting_started/initial_configuration/chart_of_accounts.rst:63 +#: ../../content/applications/finance/accounting/getting_started/initial_configuration/chart_of_accounts.rst:65 msgid "Category" msgstr "" -#: ../../content/applications/finance/accounting/getting_started/initial_configuration/chart_of_accounts.rst:63 +#: ../../content/applications/finance/accounting/getting_started/initial_configuration/chart_of_accounts.rst:65 msgid "Account Types" msgstr "" -#: ../../content/applications/finance/accounting/getting_started/initial_configuration/chart_of_accounts.rst:65 +#: ../../content/applications/finance/accounting/getting_started/initial_configuration/chart_of_accounts.rst:67 msgid "Receivable" msgstr "" -#: ../../content/applications/finance/accounting/getting_started/initial_configuration/chart_of_accounts.rst:67 +#: ../../content/applications/finance/accounting/getting_started/initial_configuration/chart_of_accounts.rst:69 msgid "Bank and Cash" msgstr "" -#: ../../content/applications/finance/accounting/getting_started/initial_configuration/chart_of_accounts.rst:69 +#: ../../content/applications/finance/accounting/getting_started/initial_configuration/chart_of_accounts.rst:71 msgid "Current Assets" msgstr "" -#: ../../content/applications/finance/accounting/getting_started/initial_configuration/chart_of_accounts.rst:71 +#: ../../content/applications/finance/accounting/getting_started/initial_configuration/chart_of_accounts.rst:73 msgid "Non-current Assets" msgstr "" -#: ../../content/applications/finance/accounting/getting_started/initial_configuration/chart_of_accounts.rst:73 +#: ../../content/applications/finance/accounting/getting_started/initial_configuration/chart_of_accounts.rst:75 msgid "Prepayments" msgstr "" -#: ../../content/applications/finance/accounting/getting_started/initial_configuration/chart_of_accounts.rst:75 +#: ../../content/applications/finance/accounting/getting_started/initial_configuration/chart_of_accounts.rst:77 msgid "Fixed Assets" msgstr "" -#: ../../content/applications/finance/accounting/getting_started/initial_configuration/chart_of_accounts.rst:77 +#: ../../content/applications/finance/accounting/getting_started/initial_configuration/chart_of_accounts.rst:79 msgid "Payable" msgstr "" -#: ../../content/applications/finance/accounting/getting_started/initial_configuration/chart_of_accounts.rst:79 +#: ../../content/applications/finance/accounting/getting_started/initial_configuration/chart_of_accounts.rst:81 msgid "Credit Card" msgstr "" -#: ../../content/applications/finance/accounting/getting_started/initial_configuration/chart_of_accounts.rst:81 +#: ../../content/applications/finance/accounting/getting_started/initial_configuration/chart_of_accounts.rst:83 msgid "Current Liabilities" msgstr "" -#: ../../content/applications/finance/accounting/getting_started/initial_configuration/chart_of_accounts.rst:83 +#: ../../content/applications/finance/accounting/getting_started/initial_configuration/chart_of_accounts.rst:85 msgid "Non-current Liabilities" msgstr "" -#: ../../content/applications/finance/accounting/getting_started/initial_configuration/chart_of_accounts.rst:87 +#: ../../content/applications/finance/accounting/getting_started/initial_configuration/chart_of_accounts.rst:89 msgid "Current Year Earnings" msgstr "" -#: ../../content/applications/finance/accounting/getting_started/initial_configuration/chart_of_accounts.rst:91 +#: ../../content/applications/finance/accounting/getting_started/initial_configuration/chart_of_accounts.rst:93 msgid "Other Income" msgstr "" -#: ../../content/applications/finance/accounting/getting_started/initial_configuration/chart_of_accounts.rst:95 +#: ../../content/applications/finance/accounting/getting_started/initial_configuration/chart_of_accounts.rst:97 msgid "Depreciation" msgstr "" -#: ../../content/applications/finance/accounting/getting_started/initial_configuration/chart_of_accounts.rst:97 +#: ../../content/applications/finance/accounting/getting_started/initial_configuration/chart_of_accounts.rst:99 msgid "Cost of Revenue" msgstr "" -#: ../../content/applications/finance/accounting/getting_started/initial_configuration/chart_of_accounts.rst:99 -#: ../../content/applications/finance/accounting/getting_started/initial_configuration/chart_of_accounts.rst:99 +#: ../../content/applications/finance/accounting/getting_started/initial_configuration/chart_of_accounts.rst:101 +#: ../../content/applications/finance/accounting/getting_started/initial_configuration/chart_of_accounts.rst:101 msgid "Other" msgstr "" -#: ../../content/applications/finance/accounting/getting_started/initial_configuration/chart_of_accounts.rst:99 +#: ../../content/applications/finance/accounting/getting_started/initial_configuration/chart_of_accounts.rst:101 msgid "Off-Balance Sheet" msgstr "" -#: ../../content/applications/finance/accounting/getting_started/initial_configuration/chart_of_accounts.rst:103 +#: ../../content/applications/finance/accounting/getting_started/initial_configuration/chart_of_accounts.rst:105 msgid "Assets, Deferred Expenses, and Deferred Revenues Automation" msgstr "" -#: ../../content/applications/finance/accounting/getting_started/initial_configuration/chart_of_accounts.rst:105 +#: ../../content/applications/finance/accounting/getting_started/initial_configuration/chart_of_accounts.rst:107 msgid "Some Account Types display a new field **to automate** the creation of :ref:`Assets ` entries, :ref:`Deferred Expenses ` entries, and :ref:`Deferred Revenues ` entries." msgstr "" -#: ../../content/applications/finance/accounting/getting_started/initial_configuration/chart_of_accounts.rst:109 +#: ../../content/applications/finance/accounting/getting_started/initial_configuration/chart_of_accounts.rst:111 msgid "You have three choices for the **Automation** field:" msgstr "" -#: ../../content/applications/finance/accounting/getting_started/initial_configuration/chart_of_accounts.rst:111 +#: ../../content/applications/finance/accounting/getting_started/initial_configuration/chart_of_accounts.rst:113 #: ../../content/applications/finance/accounting/payables/supplier_bills/assets.rst:240 #: ../../content/applications/finance/accounting/payables/supplier_bills/deferred_expenses.rst:177 #: ../../content/applications/finance/accounting/receivables/customer_invoices/deferred_revenues.rst:177 msgid "**No:** this is the default value. Nothing happens." msgstr "" -#: ../../content/applications/finance/accounting/getting_started/initial_configuration/chart_of_accounts.rst:112 +#: ../../content/applications/finance/accounting/getting_started/initial_configuration/chart_of_accounts.rst:114 msgid "**Create in draft:** whenever a transaction is posted on the account, a draft entry is created, but not validated. You must first fill out the corresponding form." msgstr "" -#: ../../content/applications/finance/accounting/getting_started/initial_configuration/chart_of_accounts.rst:114 +#: ../../content/applications/finance/accounting/getting_started/initial_configuration/chart_of_accounts.rst:116 msgid "**Create and validate:** you must also select a Model. Whenever a transaction is posted on the account, an entry is created and immediately validated." msgstr "" -#: ../../content/applications/finance/accounting/getting_started/initial_configuration/chart_of_accounts.rst:118 +#: ../../content/applications/finance/accounting/getting_started/initial_configuration/chart_of_accounts.rst:120 msgid "Please refer to the related documentation for more information." msgstr "" -#: ../../content/applications/finance/accounting/getting_started/initial_configuration/chart_of_accounts.rst:121 -#: ../../content/applications/finance/accounting/taxation/taxes/default_taxes.rst:3 +#: ../../content/applications/finance/accounting/getting_started/initial_configuration/chart_of_accounts.rst:123 msgid "Default Taxes" msgstr "" -#: ../../content/applications/finance/accounting/getting_started/initial_configuration/chart_of_accounts.rst:123 +#: ../../content/applications/finance/accounting/getting_started/initial_configuration/chart_of_accounts.rst:125 msgid "Select a **default tax** that will be applied when this account is chosen for a product sale or purchase." msgstr "" -#: ../../content/applications/finance/accounting/getting_started/initial_configuration/chart_of_accounts.rst:127 +#: ../../content/applications/finance/accounting/getting_started/initial_configuration/chart_of_accounts.rst:129 msgid "Tags" msgstr "" -#: ../../content/applications/finance/accounting/getting_started/initial_configuration/chart_of_accounts.rst:129 +#: ../../content/applications/finance/accounting/getting_started/initial_configuration/chart_of_accounts.rst:131 msgid "Some accounting reports require **tags** to be set on the relevant accounts. By default, you can choose among the tags that are used by the *Cash Flow Statement*." msgstr "" -#: ../../content/applications/finance/accounting/getting_started/initial_configuration/chart_of_accounts.rst:133 +#: ../../content/applications/finance/accounting/getting_started/initial_configuration/chart_of_accounts.rst:135 msgid "Account Groups" msgstr "" -#: ../../content/applications/finance/accounting/getting_started/initial_configuration/chart_of_accounts.rst:135 +#: ../../content/applications/finance/accounting/getting_started/initial_configuration/chart_of_accounts.rst:137 msgid "**Account Groups** are useful to list multiple accounts as *sub-accounts* of a bigger account and thus consolidate reports such as the **Trial Balance**." msgstr "" -#: ../../content/applications/finance/accounting/getting_started/initial_configuration/chart_of_accounts.rst:138 +#: ../../content/applications/finance/accounting/getting_started/initial_configuration/chart_of_accounts.rst:140 msgid "To create a new Account Group, open the account you want to configure as sub-account, click on the *Group* drop-down selector, select *Create and Edit...*, fill out the form, and save. Next, set all the sub-accounts with the right Account Group." msgstr "" -#: ../../content/applications/finance/accounting/getting_started/initial_configuration/chart_of_accounts.rst:142 +#: ../../content/applications/finance/accounting/getting_started/initial_configuration/chart_of_accounts.rst:144 msgid "To display your **Trial Balance** report with your Account Groups, go to :menuselection:`Accounting --> Reporting --> Trial Balance`, then open the *Options* menu and select **Hierarchy and Subtotals**." msgstr "" -#: ../../content/applications/finance/accounting/getting_started/initial_configuration/chart_of_accounts.rst:151 +#: ../../content/applications/finance/accounting/getting_started/initial_configuration/chart_of_accounts.rst:153 msgid "Allow Reconciliation" msgstr "" -#: ../../content/applications/finance/accounting/getting_started/initial_configuration/chart_of_accounts.rst:153 +#: ../../content/applications/finance/accounting/getting_started/initial_configuration/chart_of_accounts.rst:155 msgid "Some accounts, such as accounts made to record the transactions of a payment method, can be used for the reconciliation of journal entries." msgstr "" -#: ../../content/applications/finance/accounting/getting_started/initial_configuration/chart_of_accounts.rst:156 +#: ../../content/applications/finance/accounting/getting_started/initial_configuration/chart_of_accounts.rst:158 msgid "For example, an invoice paid with a credit card can be *marked as paid* if reconciled with the payment. Therefore, the account used to record credit card payments needs to be configured as *allowing reconciliation*." msgstr "" -#: ../../content/applications/finance/accounting/getting_started/initial_configuration/chart_of_accounts.rst:160 +#: ../../content/applications/finance/accounting/getting_started/initial_configuration/chart_of_accounts.rst:162 msgid "To do so, check the **Allow Reconciliation** box and save." msgstr "" -#: ../../content/applications/finance/accounting/getting_started/initial_configuration/chart_of_accounts.rst:163 +#: ../../content/applications/finance/accounting/getting_started/initial_configuration/chart_of_accounts.rst:165 msgid "Deprecated" msgstr "" -#: ../../content/applications/finance/accounting/getting_started/initial_configuration/chart_of_accounts.rst:165 +#: ../../content/applications/finance/accounting/getting_started/initial_configuration/chart_of_accounts.rst:167 msgid "It is not possible to delete an account once a transaction has been recorded on it. You can make them unusable by using the **Deprecated** feature." msgstr "" -#: ../../content/applications/finance/accounting/getting_started/initial_configuration/chart_of_accounts.rst:168 +#: ../../content/applications/finance/accounting/getting_started/initial_configuration/chart_of_accounts.rst:170 msgid "To do so, check the **Deprecated** box and save." msgstr "" -#: ../../content/applications/finance/accounting/getting_started/initial_configuration/chart_of_accounts.rst:171 +#: ../../content/applications/finance/accounting/getting_started/initial_configuration/chart_of_accounts.rst:173 msgid ":doc:`../../payables/supplier_bills/assets`" msgstr "" -#: ../../content/applications/finance/accounting/getting_started/initial_configuration/chart_of_accounts.rst:172 +#: ../../content/applications/finance/accounting/getting_started/initial_configuration/chart_of_accounts.rst:174 msgid ":doc:`../../payables/supplier_bills/deferred_expenses`" msgstr "" -#: ../../content/applications/finance/accounting/getting_started/initial_configuration/chart_of_accounts.rst:173 +#: ../../content/applications/finance/accounting/getting_started/initial_configuration/chart_of_accounts.rst:175 msgid ":doc:`../../receivables/customer_invoices/deferred_revenues`" msgstr "" -#: ../../content/applications/finance/accounting/getting_started/initial_configuration/chart_of_accounts.rst:174 +#: ../../content/applications/finance/accounting/getting_started/initial_configuration/chart_of_accounts.rst:176 #: ../../content/applications/finance/accounting/getting_started/initial_configuration/setup.rst:193 #: ../../content/applications/finance/accounting/reporting/declarations/tax_returns.rst:125 #: ../../content/applications/finance/accounting/taxation/taxes/default_taxes.rst:40 @@ -9337,6 +9634,12 @@ msgstr "" msgid "Total To Pay" msgstr "" +#: ../../content/applications/finance/accounting/getting_started/memento.rst:179 +#: ../../content/applications/finance/accounting/receivables/customer_payments/batch.rst:80 +#: ../../content/applications/finance/accounting/reporting/overview/main_reports.rst:144 +msgid "Bank Reconciliation" +msgstr "" + #: ../../content/applications/finance/accounting/getting_started/memento.rst:181 msgid "Bank reconciliation is the matching of bank statement lines (provided by your bank) with transactions recorded internally (payments to suppliers or from customers). For each line in a bank statement, it can be:" msgstr "" @@ -9995,111 +10298,111 @@ msgstr "" msgid "The following modules needs to be installed to track cost. Enter the app module and install the following apps:" msgstr "" -#: ../../content/applications/finance/accounting/others/analytic/purchases_expenses.rst:28 +#: ../../content/applications/finance/accounting/others/analytic/purchases_expenses.rst:29 msgid "Please note that the applications provided by these apps only allows us to **track** the costs. We won't be able to automatically re invoice those costs to our customers. To track and **re invoice costs** you should install the Sales management app as well." msgstr "" -#: ../../content/applications/finance/accounting/others/analytic/purchases_expenses.rst:37 +#: ../../content/applications/finance/accounting/others/analytic/purchases_expenses.rst:38 msgid "Enable Analytical accounting" msgstr "" -#: ../../content/applications/finance/accounting/others/analytic/purchases_expenses.rst:39 +#: ../../content/applications/finance/accounting/others/analytic/purchases_expenses.rst:40 msgid "Next step is to activate the analytical accounting. In the accounting app, select :menuselection:`Configuration --> Settings` and thick the Analytic accounting box." msgstr "" -#: ../../content/applications/finance/accounting/others/analytic/purchases_expenses.rst:46 +#: ../../content/applications/finance/accounting/others/analytic/purchases_expenses.rst:47 msgid "Moreover, scroll down and tick the **Analytic accounting for purchases** box." msgstr "" -#: ../../content/applications/finance/accounting/others/analytic/purchases_expenses.rst:52 +#: ../../content/applications/finance/accounting/others/analytic/purchases_expenses.rst:53 msgid "Don't forget to save your changes." msgstr "" -#: ../../content/applications/finance/accounting/others/analytic/purchases_expenses.rst:55 +#: ../../content/applications/finance/accounting/others/analytic/purchases_expenses.rst:56 msgid "Create an Analytical account." msgstr "" -#: ../../content/applications/finance/accounting/others/analytic/purchases_expenses.rst:57 +#: ../../content/applications/finance/accounting/others/analytic/purchases_expenses.rst:58 msgid "First of all you should create an Analytical account on which you can point all your expenses. Enter the accounting app, select :menuselection:`Configuration --> Analytic Accounts`. Create a new one. In this case we will call it \"consulting pack\" for our customer Smith&Co." msgstr "" -#: ../../content/applications/finance/accounting/others/analytic/purchases_expenses.rst:65 +#: ../../content/applications/finance/accounting/others/analytic/purchases_expenses.rst:66 msgid "We will point all our costs to this account to keep track of them." msgstr "" -#: ../../content/applications/finance/accounting/others/analytic/purchases_expenses.rst:68 +#: ../../content/applications/finance/accounting/others/analytic/purchases_expenses.rst:69 msgid "Record an expense" msgstr "" -#: ../../content/applications/finance/accounting/others/analytic/purchases_expenses.rst:70 +#: ../../content/applications/finance/accounting/others/analytic/purchases_expenses.rst:71 msgid "We start by booking an expense. Our IT technician had to take a train to go see our customer. He paid for his ticket himself." msgstr "" -#: ../../content/applications/finance/accounting/others/analytic/purchases_expenses.rst:75 +#: ../../content/applications/finance/accounting/others/analytic/purchases_expenses.rst:76 msgid "Create an expense product" msgstr "" -#: ../../content/applications/finance/accounting/others/analytic/purchases_expenses.rst:77 +#: ../../content/applications/finance/accounting/others/analytic/purchases_expenses.rst:78 msgid "We first need to create an expense product. Enter the **Expense** module, Click on :menuselection:`Configuration --> Expense Products`. Create a new product called Train ticket and set the cost price to 15.50 euros. Make sure the **Can be expensed** box is ticked." msgstr "" -#: ../../content/applications/finance/accounting/others/analytic/purchases_expenses.rst:86 +#: ../../content/applications/finance/accounting/others/analytic/purchases_expenses.rst:87 msgid "Book the expense" msgstr "" -#: ../../content/applications/finance/accounting/others/analytic/purchases_expenses.rst:88 +#: ../../content/applications/finance/accounting/others/analytic/purchases_expenses.rst:89 msgid "Enter the Expense module, click on :menuselection:`My expenses --> Create`. Select the Train ticket product and link it to the analytical account discussed above." msgstr "" -#: ../../content/applications/finance/accounting/others/analytic/purchases_expenses.rst:95 +#: ../../content/applications/finance/accounting/others/analytic/purchases_expenses.rst:96 msgid "Submit to manager and wait for the manager to approve and post the journal entries." msgstr "" -#: ../../content/applications/finance/accounting/others/analytic/purchases_expenses.rst:99 +#: ../../content/applications/finance/accounting/others/analytic/purchases_expenses.rst:100 msgid "Create a Purchase Order linked to the analytical account" msgstr "" -#: ../../content/applications/finance/accounting/others/analytic/purchases_expenses.rst:102 +#: ../../content/applications/finance/accounting/others/analytic/purchases_expenses.rst:103 msgid "Purchase Product" msgstr "" -#: ../../content/applications/finance/accounting/others/analytic/purchases_expenses.rst:104 +#: ../../content/applications/finance/accounting/others/analytic/purchases_expenses.rst:105 msgid "We also need to buy a software for our customers. In the purchase app create a purchase order for the software product. Within the line we can link the product's cost with the analytical account. Specify the order line and select the correct analytical account. Confirm the sale." msgstr "" -#: ../../content/applications/finance/accounting/others/analytic/purchases_expenses.rst:113 +#: ../../content/applications/finance/accounting/others/analytic/purchases_expenses.rst:114 msgid "Accept the delivery and enter the invoice. Once the invoice is entered the cost price (**Vendor Price** field) will be booked in the analytical account." msgstr "" -#: ../../content/applications/finance/accounting/others/analytic/purchases_expenses.rst:117 +#: ../../content/applications/finance/accounting/others/analytic/purchases_expenses.rst:118 msgid "Subcontracting" msgstr "" -#: ../../content/applications/finance/accounting/others/analytic/purchases_expenses.rst:119 +#: ../../content/applications/finance/accounting/others/analytic/purchases_expenses.rst:120 msgid "The purchase module can be used in the same way as seen previously to handle subcontracting. if we purchase a service from another company we can re invoice this cost by linking the purchase order line to the correct analytical account. We simply need to create the correct vendors product." msgstr "" -#: ../../content/applications/finance/accounting/others/analytic/purchases_expenses.rst:126 +#: ../../content/applications/finance/accounting/others/analytic/purchases_expenses.rst:127 msgid "You can also track cost with timesheets, see: :doc:`timesheets`" msgstr "" -#: ../../content/applications/finance/accounting/others/analytic/purchases_expenses.rst:129 +#: ../../content/applications/finance/accounting/others/analytic/purchases_expenses.rst:130 msgid "Track costs in accounting" msgstr "" -#: ../../content/applications/finance/accounting/others/analytic/purchases_expenses.rst:131 +#: ../../content/applications/finance/accounting/others/analytic/purchases_expenses.rst:132 msgid "Now that everything is booked and points to the analytical account. Simply open it to check the costs related to that account." msgstr "" -#: ../../content/applications/finance/accounting/others/analytic/purchases_expenses.rst:134 +#: ../../content/applications/finance/accounting/others/analytic/purchases_expenses.rst:135 msgid "Enter the accounting module, click on :menuselection:`Advisers --> Analytic Accounts --> Open Charts`." msgstr "" -#: ../../content/applications/finance/accounting/others/analytic/purchases_expenses.rst:137 +#: ../../content/applications/finance/accounting/others/analytic/purchases_expenses.rst:138 msgid "Select \"consulting pack - Smith\" and click on the cost and revenue button to have an overview of all cost linked to the account." msgstr "" -#: ../../content/applications/finance/accounting/others/analytic/purchases_expenses.rst:144 +#: ../../content/applications/finance/accounting/others/analytic/purchases_expenses.rst:145 msgid "If you would like to have the revenue as well you should invoice the Consulting Pack in the Invoice menu and link the invoice line to this same analytical account." msgstr "" @@ -11077,10 +11380,10 @@ msgstr "" msgid "The Exchange difference journal can be changed in your accounting settings." msgstr "" -#: ../../content/applications/finance/accounting/others/multicurrencies/full_reconcile_warning.rst:2 -#: ../../content/applications/finance/accounting/others/multicurrencies/full_reconcile_warning.rst:2 -#: ../../content/applications/finance/accounting/others/multicurrencies/full_reconcile_warning.rst:2 -#: ../../content/applications/finance/accounting/others/multicurrencies/full_reconcile_warning.rst:2 +#: ../../content/applications/finance/accounting/others/multicurrencies/exchange/full_reconcile_warning.rst:2 +#: ../../content/applications/finance/accounting/others/multicurrencies/exchange/full_reconcile_warning.rst:2 +#: ../../content/applications/finance/accounting/others/multicurrencies/exchange/full_reconcile_warning.rst:2 +#: ../../content/applications/finance/accounting/others/multicurrencies/exchange/full_reconcile_warning.rst:2 msgid "In order for an exchange difference entry to be created automatically, the corresponding invoices and payments need to be fully reconciled. This means the invoices are fully paid and the payments are fully spent on invoices. If you partially pay 3 invoices from 2 payments, and the last invoice still has an amount due, there will be no exchange difference entry for any of them until that final amount is paid." msgstr "" @@ -11218,6 +11521,10 @@ msgstr "" msgid "In the accounting application, go to :menuselection:`Sales --> Payments`. Register the payment and set the currency." msgstr "" +#: ../../content/applications/finance/accounting/others/multicurrencies/how_it_works.rst:145 +msgid "Bank Statements" +msgstr "" + #: ../../content/applications/finance/accounting/others/multicurrencies/how_it_works.rst:147 #: ../../content/applications/finance/accounting/others/multicurrencies/invoices_payments.rst:94 msgid "When creating or importing bank statements, the amount is in the company currency. But there are now two complementary fields, the amount that was actually paid and the currency in which it was paid." @@ -11301,7 +11608,7 @@ msgid ":doc:`how_it_works`" msgstr "" #: ../../content/applications/finance/accounting/payables.rst:5 -msgid "Account Payables" +msgid "Account payables" msgstr "" #: ../../content/applications/finance/accounting/payables/misc/forecast.rst:3 @@ -11369,11 +11676,11 @@ msgid "From this screen, you can also switch to the pivot table or the graph vie msgstr "" #: ../../content/applications/finance/accounting/payables/pay.rst:5 -msgid "Vendor Payments" +msgid "Vendor payments" msgstr "" #: ../../content/applications/finance/accounting/payables/pay/check.rst:3 -msgid "Pay by Checks" +msgid "Pay by checks" msgstr "" #: ../../content/applications/finance/accounting/payables/pay/check.rst:5 @@ -11747,8 +12054,12 @@ msgstr "" msgid ":doc:`check`" msgstr "" +#: ../../content/applications/finance/accounting/payables/supplier_bills.rst:5 +msgid "Vendor bills" +msgstr "" + #: ../../content/applications/finance/accounting/payables/supplier_bills/assets.rst:3 -msgid "Non-current Assets and Fixed Assets" +msgid "Non-current assets and fixed assets" msgstr "" #: ../../content/applications/finance/accounting/payables/supplier_bills/assets.rst:5 @@ -12024,7 +12335,7 @@ msgid "You can, for example, select this account as the default **Expense Accoun msgstr "" #: ../../content/applications/finance/accounting/payables/supplier_bills/deferred_expenses.rst:3 -msgid "Deferred Expenses and Prepayments" +msgid "Deferred expenses and prepayments" msgstr "" #: ../../content/applications/finance/accounting/payables/supplier_bills/deferred_expenses.rst:5 @@ -12164,8 +12475,106 @@ msgstr "" msgid "You can, for example, select this account as the default **Expense Account** of a product to fully automate its purchase. (see: `Choose a different Expense Account for specific products`_)." msgstr "" +#: ../../content/applications/finance/accounting/payables/supplier_bills/invoice_digitization.rst:3 +#: ../../content/applications/finance/accounting/receivables/customer_invoices/overview.rst:152 +msgid "Invoice digitization with optical character recognition (OCR)" +msgstr "" + +#: ../../content/applications/finance/accounting/payables/supplier_bills/invoice_digitization.rst:5 +msgid "**Invoice digitization** is the process of automatically encoding traditional paper invoices into vendor bills and customer invoices forms in your accounting." +msgstr "" + +#: ../../content/applications/finance/accounting/payables/supplier_bills/invoice_digitization.rst:8 +msgid "Odoo uses :abbr:`OCR (optical character recognition)` and artificial intelligence technologies to recognize the content of the documents. Vendor bills and customer invoices forms are automatically created and populated based on the scanned invoices." +msgstr "" + +#: ../../content/applications/finance/accounting/payables/supplier_bills/invoice_digitization.rst:13 +msgid "`Test Odoo's invoice digitization `_" +msgstr "" + +#: ../../content/applications/finance/accounting/payables/supplier_bills/invoice_digitization.rst:14 +msgid ":doc:`/applications/general/in_app_purchase`." +msgstr "" + +#: ../../content/applications/finance/accounting/payables/supplier_bills/invoice_digitization.rst:15 +msgid "`Odoo Tutorials: Invoice Digitization with OCR `_." +msgstr "" + +#: ../../content/applications/finance/accounting/payables/supplier_bills/invoice_digitization.rst:19 +msgid "The more documents you scan, the better the system identifies the correct data." +msgstr "" + +#: ../../content/applications/finance/accounting/payables/supplier_bills/invoice_digitization.rst:24 +msgid "In :menuselection:`Accounting --> Configuration --> Settings --> Digitalization`, check the box :guilabel:`Document Digitalization` and choose whether :guilabel:`Vendor Bills` and :guilabel:`Customer Invoices` should be processed automatically or manually." +msgstr "" + +#: ../../content/applications/finance/accounting/payables/supplier_bills/invoice_digitization.rst:28 +msgid "The :guilabel:`Single Invoice Line Per Tax` option can also be selected. It enables to get only one line created per tax in the new bill, regardless of the number of lines from the invoice." +msgstr "" + +#: ../../content/applications/finance/accounting/payables/supplier_bills/invoice_digitization.rst:32 +msgid "Invoice upload" +msgstr "" + +#: ../../content/applications/finance/accounting/payables/supplier_bills/invoice_digitization.rst:35 +msgid "Upload invoices manually" +msgstr "" + +#: ../../content/applications/finance/accounting/payables/supplier_bills/invoice_digitization.rst:37 +msgid "From the :guilabel:`Accounting Dashboard`, click on the :guilabel:`Upload` button of your vendor bills journal. Alternatively, go to :menuselection:`Accounting --> Customers --> Invoices` or :menuselection:`Accounting --> Vendors --> Bills` and select :guilabel:`Upload`." +msgstr "" + +#: ../../content/applications/finance/accounting/payables/supplier_bills/invoice_digitization.rst:43 +msgid "Upload invoices using an email alias" +msgstr "" + +#: ../../content/applications/finance/accounting/payables/supplier_bills/invoice_digitization.rst:45 +msgid "You can configure your connected scanner to send scanned documents to an email alias. Emails sent to these aliases are converted into new draft customer invoices or vendor bills." +msgstr "" + +#: ../../content/applications/finance/accounting/payables/supplier_bills/invoice_digitization.rst:48 +msgid "You can modify the email alias of a journal by going to :menuselection:`Accounting --> Configuration --> Journals`, opening the appropriate journal, opening the :guilabel:`Advanced Settings` tab, and modifying the :guilabel:`Email Alias` field." +msgstr "" + +#: ../../content/applications/finance/accounting/payables/supplier_bills/invoice_digitization.rst:52 +msgid "If you use the :doc:`Documents <../../../documents>` app, you can send your scanned invoices to the :guilabel:`Finance` workspace (e.g., `inbox-financial@example.odoo.com`)." +msgstr "" + +#: ../../content/applications/finance/accounting/payables/supplier_bills/invoice_digitization.rst:56 +msgid "Invoice digitization" +msgstr "" + +#: ../../content/applications/finance/accounting/payables/supplier_bills/invoice_digitization.rst:58 +msgid "According to your settings, the document is either processed automatically, or you need to click on :guilabel:`Send for digitalization` to do it manually." +msgstr "" + +#: ../../content/applications/finance/accounting/payables/supplier_bills/invoice_digitization.rst:61 +msgid "Once the data is extracted from the PDF, you can correct it if necessary by clicking on the respective tags (available in Edit mode) and selecting the proper information instead." +msgstr "" + +#: ../../content/applications/finance/accounting/payables/supplier_bills/invoice_digitization.rst:65 +#: ../../content/applications/finance/accounting/receivables/customer_invoices/snailmail.rst:36 +msgid "Pricing" +msgstr "" + +#: ../../content/applications/finance/accounting/payables/supplier_bills/invoice_digitization.rst:68 +msgid "The **invoice digitization** is an In-App Purchase (IAP) service that requires prepaid credits to work. Digitizing one document consumes one credit." +msgstr "" + +#: ../../content/applications/finance/accounting/payables/supplier_bills/invoice_digitization.rst:71 +msgid "To buy credits, go to :menuselection:`Accounting --> Configuration --> Settings --> Digitization` and click on :guilabel:`Buy credits`, or go to :menuselection:`Settings --> Odoo IAP` and click on :guilabel:`View My Services`." +msgstr "" + +#: ../../content/applications/finance/accounting/payables/supplier_bills/invoice_digitization.rst:74 +msgid "If you are on Odoo Online (SaaS) and have the Enterprise version, you benefit from free trial credits to test the feature." +msgstr "" + +#: ../../content/applications/finance/accounting/payables/supplier_bills/invoice_digitization.rst:78 +msgid "`Our Privacy Policy `_." +msgstr "" + #: ../../content/applications/finance/accounting/payables/supplier_bills/manage.rst:3 -msgid "Manage vendor Bills" +msgid "Manage vendor bills" msgstr "" #: ../../content/applications/finance/accounting/payables/supplier_bills/manage.rst:5 @@ -12376,70 +12785,8 @@ msgstr "" msgid "When creating a vendor bill and selecting the appropriate purchase order, you may continue to select additional purchase orders. Odoo will add the additional line items from the purchase orders you select. If you have not deleted the previous line items from the first purchase order, the bill will be linked to all the appropriate purchase orders." msgstr "" -#: ../../content/applications/finance/accounting/payables/supplier_bills/ocr.rst:3 -msgid "Digitize Vendor Bills with Optical Character Recognition (OCR)" -msgstr "" - -#: ../../content/applications/finance/accounting/payables/supplier_bills/ocr.rst:5 -msgid "Encoding bills manually can be a time-consuming task. Having a solution that allows you to digitize them and automatically import the data into your database reduces errors and saves you time." -msgstr "" - -#: ../../content/applications/finance/accounting/payables/supplier_bills/ocr.rst:9 -msgid "`Try it out `_! Upload one of your Bills or try one of our samples." -msgstr "" - -#: ../../content/applications/finance/accounting/payables/supplier_bills/ocr.rst:12 -msgid "Set up the feature" -msgstr "" - -#: ../../content/applications/finance/accounting/payables/supplier_bills/ocr.rst:14 -msgid "Go to :menuselection:`Accounting --> Settings --> Bill Digitalization`, and choose whether the bills should be processed automatically (with OCR) or manually (on demand)." -msgstr "" - -#: ../../content/applications/finance/accounting/payables/supplier_bills/ocr.rst:22 -msgid "Start digitizing your bills" -msgstr "" - -#: ../../content/applications/finance/accounting/payables/supplier_bills/ocr.rst:24 -msgid "Scan your bills and then go to :menuselection:`Accounting --> Vendors --> Bills` and upload your document. Based on your configuration, it either processes the documents automatically, or you need to click on *Send for Digitalization* to do it manually." -msgstr "" - -#: ../../content/applications/finance/accounting/payables/supplier_bills/ocr.rst:29 -msgid "You can also create a vendor bill through the *Documents* app or by using an email alias on your journals." -msgstr "" - -#: ../../content/applications/finance/accounting/payables/supplier_bills/ocr.rst:32 -msgid "Once the data is extracted from the PDF, you can correct it if necessary by clicking on the respective tag (available in *Edit* mode), and selecting the right information instead." -msgstr "" - -#: ../../content/applications/finance/accounting/payables/supplier_bills/ocr.rst:41 -msgid "The more bills you scan, the better the system gets at identifying the correct data." -msgstr "" - -#: ../../content/applications/finance/accounting/payables/supplier_bills/ocr.rst:44 -#: ../../content/applications/finance/accounting/receivables/customer_invoices/snailmail.rst:34 -msgid "Pricing" -msgstr "" - -#: ../../content/applications/finance/accounting/payables/supplier_bills/ocr.rst:47 -msgid "The *Bill Digitalization* is an *In-App Purchase (IAP)* service which requires prepaid credits to work. Digitizing one document consumes one credit." -msgstr "" - -#: ../../content/applications/finance/accounting/payables/supplier_bills/ocr.rst:50 -msgid "To buy credits, go to :menuselection:`Accounting --> Configuration --> Settings --> Bill Digitalization` and click on *Buy credits*, or go to :menuselection:`Settings --> Odoo IAP` and click on *View My Services*." -msgstr "" - -#: ../../content/applications/finance/accounting/payables/supplier_bills/ocr.rst:53 -#: ../../content/applications/finance/accounting/receivables/customer_invoices/snailmail.rst:43 -msgid "If you are on Odoo Online (SAAS) and have the Enterprise version, you benefit from free trial credits to test the feature." -msgstr "" - -#: ../../content/applications/finance/accounting/payables/supplier_bills/ocr.rst:56 -msgid "Our `Privacy Policy `_." -msgstr "" - #: ../../content/applications/finance/accounting/payables/supplier_bills/purchase_receipts.rst:3 -msgid "Purchase Receipts" +msgid "Purchase receipts" msgstr "" #: ../../content/applications/finance/accounting/payables/supplier_bills/purchase_receipts.rst:5 @@ -12487,12 +12834,11 @@ msgid ":doc:`/applications/finance/expenses`" msgstr "" #: ../../content/applications/finance/accounting/receivables.rst:5 -msgid "Account Receivables" +msgid "Account receivables" msgstr "" #: ../../content/applications/finance/accounting/receivables/customer_invoices.rst:5 -#: ../../content/applications/finance/accounting/receivables/customer_payments/batch_sdd.rst:99 -msgid "Customer Invoices" +msgid "Customer invoices" msgstr "" #: ../../content/applications/finance/accounting/receivables/customer_invoices/cash_discounts.rst:3 @@ -12544,7 +12890,7 @@ msgid ":doc:`../../receivables/customer_invoices/payment_terms`" msgstr "" #: ../../content/applications/finance/accounting/receivables/customer_invoices/cash_rounding.rst:3 -msgid "Cash Rounding" +msgid "Cash rounding" msgstr "" #: ../../content/applications/finance/accounting/receivables/customer_invoices/cash_rounding.rst:5 @@ -12588,7 +12934,7 @@ msgid "When editing a draft invoice, open the *Other Info* tab, go to the *Accou msgstr "" #: ../../content/applications/finance/accounting/receivables/customer_invoices/credit_notes.rst:3 -msgid "Credit Notes and Refunds" +msgid "Credit notes and refunds" msgstr "" #: ../../content/applications/finance/accounting/receivables/customer_invoices/credit_notes.rst:4 @@ -12707,7 +13053,7 @@ msgid "And here is the credit note’s journal entry generated to reverse the or msgstr "" #: ../../content/applications/finance/accounting/receivables/customer_invoices/deferred_revenues.rst:3 -msgid "Deferred Revenues" +msgid "Deferred revenues" msgstr "" #: ../../content/applications/finance/accounting/receivables/customer_invoices/deferred_revenues.rst:5 @@ -13130,8 +13476,20 @@ msgstr "" msgid "It is useful for people who use a numbering from another software and who want to continue the current year without starting over from the beginning." msgstr "" +#: ../../content/applications/finance/accounting/receivables/customer_invoices/overview.rst:154 +msgid "**Invoice digitization** is the process of automatically encoding traditional paper invoices into invoices forms in your accounting." +msgstr "" + +#: ../../content/applications/finance/accounting/receivables/customer_invoices/overview.rst:157 +msgid "Odoo uses OCR and artificial intelligence technologies to recognize the content of the documents. Vendor bills and customer invoices forms are automatically created and populated based on scanned invoices." +msgstr "" + +#: ../../content/applications/finance/accounting/receivables/customer_invoices/overview.rst:162 +msgid ":doc:`/applications/finance/accounting/payables/supplier_bills/invoice_digitization`" +msgstr "" + #: ../../content/applications/finance/accounting/receivables/customer_invoices/payment_terms.rst:3 -msgid "Payment Terms and Installment Plans" +msgid "Payment terms and installment plans" msgstr "" #: ../../content/applications/finance/accounting/receivables/customer_invoices/payment_terms.rst:5 @@ -13330,56 +13688,60 @@ msgstr "" msgid "`Odoo Tutorials: Terms and Conditions (T&C) and Payment Terms `_" msgstr "" -#: ../../content/applications/finance/accounting/receivables/customer_invoices/snailmail.rst:3 -msgid "Send your Invoices by Post (Snailmail)" +#: ../../content/applications/finance/accounting/receivables/customer_invoices/snailmail.rst:5 +msgid "Send your invoices by post (Snailmail)" msgstr "" -#: ../../content/applications/finance/accounting/receivables/customer_invoices/snailmail.rst:5 +#: ../../content/applications/finance/accounting/receivables/customer_invoices/snailmail.rst:7 msgid "Direct mail is a great way to capture individuals’ attention at a time where inboxes are always full. Odoo allows you to send invoices and follow-up reports by post, worldwide, directly from your database." msgstr "" -#: ../../content/applications/finance/accounting/receivables/customer_invoices/snailmail.rst:10 +#: ../../content/applications/finance/accounting/receivables/customer_invoices/snailmail.rst:12 msgid "Set up Snailmail" msgstr "" -#: ../../content/applications/finance/accounting/receivables/customer_invoices/snailmail.rst:12 +#: ../../content/applications/finance/accounting/receivables/customer_invoices/snailmail.rst:14 msgid "Go to :menuselection:`Accounting --> Settings --> Snailmail` and activate the feature." msgstr "" -#: ../../content/applications/finance/accounting/receivables/customer_invoices/snailmail.rst:14 +#: ../../content/applications/finance/accounting/receivables/customer_invoices/snailmail.rst:16 msgid "If you would like this option to be a default feature, enable *Send by Post* under *Default Sending Options*." msgstr "" -#: ../../content/applications/finance/accounting/receivables/customer_invoices/snailmail.rst:21 +#: ../../content/applications/finance/accounting/receivables/customer_invoices/snailmail.rst:23 msgid "Send your invoices by post" msgstr "" -#: ../../content/applications/finance/accounting/receivables/customer_invoices/snailmail.rst:23 +#: ../../content/applications/finance/accounting/receivables/customer_invoices/snailmail.rst:25 msgid "Open your Invoice, click on the *Send & Print* button and select *Send by Post*." msgstr "" -#: ../../content/applications/finance/accounting/receivables/customer_invoices/snailmail.rst:30 +#: ../../content/applications/finance/accounting/receivables/customer_invoices/snailmail.rst:32 msgid "Make sure to have your customer’s address set correctly, and that it includes a country, before sending the letter." msgstr "" -#: ../../content/applications/finance/accounting/receivables/customer_invoices/snailmail.rst:37 +#: ../../content/applications/finance/accounting/receivables/customer_invoices/snailmail.rst:39 msgid "*Snailmail* is an *In-App Purchase (IAP)* service which requires prepaid stamps (=credits) to work. Sending one document consumes one stamp." msgstr "" -#: ../../content/applications/finance/accounting/receivables/customer_invoices/snailmail.rst:40 +#: ../../content/applications/finance/accounting/receivables/customer_invoices/snailmail.rst:42 msgid "To buy stamps, go to :menuselection:`Accounting --> Configuration --> Settings --> Snailmail` and click on *Buy credits*, or go to :menuselection:`Settings --> Odoo IAP` and click on *View my Services*." msgstr "" #: ../../content/applications/finance/accounting/receivables/customer_invoices/snailmail.rst:45 +msgid "If you are on Odoo Online (SAAS) and have the Enterprise version, you benefit from free trial credits to test the feature." +msgstr "" + +#: ../../content/applications/finance/accounting/receivables/customer_invoices/snailmail.rst:47 msgid "Click `here `_ to know about our *Privacy Policy*." msgstr "" #: ../../content/applications/finance/accounting/receivables/customer_payments.rst:5 -msgid "Customer Payments" +msgid "Customer payments" msgstr "" #: ../../content/applications/finance/accounting/receivables/customer_payments/batch.rst:3 -msgid "Batch Payments: Batch Deposits (checks, cash etc.)" +msgid "Batch payments: Batch deposits (checks, cash etc.)" msgstr "" #: ../../content/applications/finance/accounting/receivables/customer_payments/batch.rst:5 @@ -13467,7 +13829,7 @@ msgid ":doc:`batch_sdd`" msgstr "" #: ../../content/applications/finance/accounting/receivables/customer_payments/batch_sdd.rst:3 -msgid "Batch Payments: SEPA Direct Debit (SDD)" +msgid "Batch payments: SEPA Direct Debit (SDD)" msgstr "" #: ../../content/applications/finance/accounting/receivables/customer_payments/batch_sdd.rst:5 @@ -13562,6 +13924,10 @@ msgstr "" msgid "Get paid with SDD Batch Payments" msgstr "" +#: ../../content/applications/finance/accounting/receivables/customer_payments/batch_sdd.rst:99 +msgid "Customer Invoices" +msgstr "" + #: ../../content/applications/finance/accounting/receivables/customer_payments/batch_sdd.rst:101 msgid "You can register SDD payments for invoices issued to customers who have an active SDD mandate." msgstr "" @@ -13759,63 +14125,99 @@ msgid "If you use this approach to manage received checks, you can use the repor msgstr "" #: ../../content/applications/finance/accounting/receivables/customer_payments/followup.rst:3 -msgid "Follow-up on invoices and get paid faster" +msgid "Follow-up on invoices" msgstr "" #: ../../content/applications/finance/accounting/receivables/customer_payments/followup.rst:5 -msgid "It is essential for your business to collect payments when they are overdue. Odoo will help you identify payments that are late and will allow you to send the appropriate reminders." +msgid "A follow-up message can be sent to customers when a payment is overdue. Odoo helps you identify late payments and allows you to schedule and send the appropriate reminders, using **follow-up actions** that trigger automatically one or more actions according to the number of overdue days. You can send your follow-ups via different means such as email, post, or SMS." msgstr "" -#: ../../content/applications/finance/accounting/receivables/customer_payments/followup.rst:10 -msgid "Manage your follow-ups" +#: ../../content/applications/finance/accounting/receivables/customer_payments/followup.rst:11 +msgid "`Odoo Tutorials: Payment Follow-up `_" msgstr "" -#: ../../content/applications/finance/accounting/receivables/customer_payments/followup.rst:13 -msgid "We recommend that you reconcile your bank statements before launching your follow-up process. It will avoid you the trouble of sending a statement to a customer that has already paid you." +#: ../../content/applications/finance/accounting/receivables/customer_payments/followup.rst:16 +msgid "To configure a :guilabel:`Follow-Up Action`, go to :menuselection:`Accounting --> Configuration --> Follow-up Levels`. Several follow-up actions are available by default, and you can customize them any way you want or create new ones to trigger the following actions:" msgstr "" -#: ../../content/applications/finance/accounting/receivables/customer_payments/followup.rst:17 -msgid "The overdue invoices you need to follow-up on are available by default in :menuselection:`Accounting --> Sales --> Follow-up Reports`. There, you can easily send a reminder by email or print it as a letter. Then, you can click on the *Done* button to view the next follow-up that needs your attention." +#: ../../content/applications/finance/accounting/receivables/customer_payments/followup.rst:20 +msgid "Send an Email" +msgstr "" + +#: ../../content/applications/finance/accounting/receivables/customer_payments/followup.rst:21 +msgid ":ref:`Send an SMS Message `" +msgstr "" + +#: ../../content/applications/finance/accounting/receivables/customer_payments/followup.rst:22 +msgid "Print a Letter" msgstr "" #: ../../content/applications/finance/accounting/receivables/customer_payments/followup.rst:23 -msgid "Otherwise, if now is not the time for a reminder, click on *Remind me later*. You will get the next report according to the *Next Reminder Date* set on the statement." +msgid ":ref:`Send a Letter `" msgstr "" -#: ../../content/applications/finance/accounting/receivables/customer_payments/followup.rst:28 -msgid "To avoid sending too many reminders in a short period of time, change the number of days calculated between each report by going to :menuselection:`Accounting --> Configuration --> Settings --> Payment Follow-up`." +#: ../../content/applications/finance/accounting/receivables/customer_payments/followup.rst:24 +msgid "Manual Action (creates a task)" +msgstr "" + +#: ../../content/applications/finance/accounting/receivables/customer_payments/followup.rst:26 +msgid "It is also possible to automatically send a reminder by enabling the :guilabel:`Auto Execute` option, within a specific :guilabel:`Follow-Up Action`." +msgstr "" + +#: ../../content/applications/finance/accounting/receivables/customer_payments/followup.rst:30 +msgid "To send a reminder before the actual due date is reached, set a negative number of due days." msgstr "" #: ../../content/applications/finance/accounting/receivables/customer_payments/followup.rst:33 -msgid "You can also set a trust level for your customers by marking them as bad, normal or good debtors on the follow-up reports." +msgid "Follow-up reports" msgstr "" -#: ../../content/applications/finance/accounting/receivables/customer_payments/followup.rst:40 -msgid "Send reminders in batch" +#: ../../content/applications/finance/accounting/receivables/customer_payments/followup.rst:35 +msgid "The overdue invoices you need to follow up on are available in :menuselection:`Accounting --> Customers --> Follow-up Reports`. From there, you can identify all the customers that have late unpaid invoices." msgstr "" -#: ../../content/applications/finance/accounting/receivables/customer_payments/followup.rst:42 -msgid "To get your follow-up process easier, you can send reminder emails in batch from your follow-up reports page. Select all the reports you would like to process, click on *Action* and then on *Process Follow-ups*. A pdf document containing all of the follow-up letters for you to print will also be automatically generated." +#: ../../content/applications/finance/accounting/receivables/customer_payments/followup.rst:39 +msgid "When you open a customer, you see all their unpaid invoices (overdue or not). The due dates of the late invoices appear in red. Select the invoices that are not late yet in the :guilabel:`Excluded` column to exclude them from the reminder you send." msgstr "" -#: ../../content/applications/finance/accounting/receivables/customer_payments/followup.rst:52 -msgid "Plan a follow-up process" +#: ../../content/applications/finance/accounting/receivables/customer_payments/followup.rst:43 +msgid "It is up to you to decide how to remind your customer. You can select :guilabel:`Print Letter`, :guilabel:`Send By Email`, :guilabel:`Send By Post`, :guilabel:`Send By SMS`. Then, click on :guilabel:`Done` to view the next follow-up that needs your attention." msgstr "" -#: ../../content/applications/finance/accounting/receivables/customer_payments/followup.rst:54 -msgid "To plan a follow-up process, go to :menuselection:`Accounting --> Configuration --> Settings` and activate the *Follow-up Levels* feature under the *Customer Payments* section. Then, click on the new *Follow-up Levels* button that has appeared on your settings page." +#: ../../content/applications/finance/accounting/receivables/customer_payments/followup.rst:48 +msgid "The contact information available on the invoice or on the contact form is used to send the reminder." msgstr "" -#: ../../content/applications/finance/accounting/receivables/customer_payments/followup.rst:59 -msgid "A follow-up plan with several actions is available by default in Odoo, but you can customize it any way you want. Depending on a specific number of overdue days, plan to send an email, a letter or to undertake a manual action. You can also edit the template used for the statement according to the stage of the process." +#: ../../content/applications/finance/accounting/receivables/customer_payments/followup.rst:50 +msgid "When the reminder is sent, it is documented in the chatter of the invoice." msgstr "" -#: ../../content/applications/finance/accounting/receivables/customer_payments/followup.rst:69 -msgid "If you would like to get a reminder before the actual due date, set a negative number of due days." +#: ../../content/applications/finance/accounting/receivables/customer_payments/followup.rst:51 +msgid "If it is not the right time for a reminder, you can specify the :guilabel:`Next Reminder Date` and click on :guilabel:`Remind me later`. You will get the next report according to the next reminder date set on the statement." +msgstr "" + +#: ../../content/applications/finance/accounting/receivables/customer_payments/followup.rst:56 +msgid "Reconcile your bank statements right before launching your follow-up process to avoid sending a reminder to a customer that has already paid you." +msgstr "" + +#: ../../content/applications/finance/accounting/receivables/customer_payments/followup.rst:60 +msgid "Debtor's trust level" +msgstr "" + +#: ../../content/applications/finance/accounting/receivables/customer_payments/followup.rst:62 +msgid "To know whether a customer usually pays late or not, you can set a trust level by marking them as :guilabel:`Good Debtor`, :guilabel:`Normal Debtor`, or :guilabel:`Bad Debtor` on their follow-up report. To do so, click on the bullet next to the customer's name and select a trust level." +msgstr "" + +#: ../../content/applications/finance/accounting/receivables/customer_payments/followup.rst:71 +msgid "Send reminders in batches" +msgstr "" + +#: ../../content/applications/finance/accounting/receivables/customer_payments/followup.rst:73 +msgid "You can send reminder emails in batches from the :guilabel:`Follow-up Reports` page. To do so, select all the reports you would like to process, click on the :guilabel:`Action` gear icon, and select :guilabel:`Process follow-ups`." msgstr "" #: ../../content/applications/finance/accounting/receivables/customer_payments/online_payment.rst:3 -msgid "Invoice Online Payment" +msgid "Invoice online payment" msgstr "" #: ../../content/applications/finance/accounting/receivables/customer_payments/online_payment.rst:5 @@ -13987,7 +14389,7 @@ msgid "If you created your Odoo database prior to **January 13, 2022**, please : msgstr "" #: ../../content/applications/finance/accounting/reporting/declarations/tax_returns.rst:3 -msgid "Tax Return (VAT Declaration)" +msgid "Tax return (VAT declaration)" msgstr "" #: ../../content/applications/finance/accounting/reporting/declarations/tax_returns.rst:5 @@ -14380,7 +14782,7 @@ msgid "Taxation" msgstr "" #: ../../content/applications/finance/accounting/taxation/fiscal_year.rst:5 -msgid "Fiscal Year" +msgid "Fiscal year" msgstr "" #: ../../content/applications/finance/accounting/taxation/fiscal_year/close_fiscal_year.rst:3 @@ -14655,6 +15057,74 @@ msgstr "" msgid "Note that this is error prone: if you set a fiscal position with tax included in prices but use a pricelist that is not included, you might have wrong prices calculated for you. That's why we usually recommend companies to only work with one price reference." msgstr "" +#: ../../content/applications/finance/accounting/taxation/taxes/avatax.rst:3 +msgid "Avatax integration" +msgstr "" + +#: ../../content/applications/finance/accounting/taxation/taxes/avatax.rst:5 +msgid "Avatax is a tax calculation provider that can be integrated in Odoo." +msgstr "" + +#: ../../content/applications/finance/accounting/taxation/taxes/avatax.rst:10 +msgid "Credential configuration" +msgstr "" + +#: ../../content/applications/finance/accounting/taxation/taxes/avatax.rst:12 +msgid "To integrate Avatax with Odoo, go to :menuselection:`Accounting --> Configuration --> Settings --> Taxes` and add your Avatax credentials in the :guilabel:`Avatax` section." +msgstr "" + +#: ../../content/applications/finance/accounting/taxation/taxes/avatax.rst:16 +msgid "If you do not yet have credentials, click on :guilabel:`How to Get Credentials`." +msgstr "" + +#: ../../content/applications/finance/accounting/taxation/taxes/avatax.rst:25 +msgid "Tax mapping" +msgstr "" + +#: ../../content/applications/finance/accounting/taxation/taxes/avatax.rst:27 +msgid "The Avatax integration is available on Sale Orders and Invoices with the included Avatax fiscal position." +msgstr "" + +#: ../../content/applications/finance/accounting/taxation/taxes/avatax.rst:30 +msgid "Before using the integration, specify an :guilabel:`Avatax Category` on the product categories." +msgstr "" + +#: ../../content/applications/finance/accounting/taxation/taxes/avatax.rst:36 +msgid "Avatax Categories may be overridden or set on individual products as well." +msgstr "" + +#: ../../content/applications/finance/accounting/taxation/taxes/avatax.rst:45 +msgid "Address validation" +msgstr "" + +#: ../../content/applications/finance/accounting/taxation/taxes/avatax.rst:47 +msgid "Manually validate customer addresses by clicking the :guilabel:`Validate address` link in the customer form view." +msgstr "" + +#: ../../content/applications/finance/accounting/taxation/taxes/avatax.rst:54 +msgid "If preferred, choose to keep the newly validated address or the original address in the wizard that pops up." +msgstr "" + +#: ../../content/applications/finance/accounting/taxation/taxes/avatax.rst:64 +msgid "Tax calculation" +msgstr "" + +#: ../../content/applications/finance/accounting/taxation/taxes/avatax.rst:66 +msgid "Automatically calculate taxes on Odoo quotations and invoices with Avatax by confirming the documents. Alternatively, calculate the taxes manually by clicking the :guilabel:`Compute taxes using Avatax` button while these documents are in draft mode." +msgstr "" + +#: ../../content/applications/finance/accounting/taxation/taxes/avatax.rst:70 +msgid "Use the :guilabel:`Avalara Code` field that's available on customers, quotations, and invoices to cross-reference data in Odoo and Avatax." +msgstr "" + +#: ../../content/applications/finance/accounting/taxation/taxes/avatax.rst:74 +#: ../../content/applications/finance/accounting/taxation/taxes/default_taxes.rst:39 +#: ../../content/applications/finance/accounting/taxation/taxes/eu_distance_selling.rst:68 +#: ../../content/applications/finance/accounting/taxation/taxes/taxcloud.rst:139 +#: ../../content/applications/finance/accounting/taxation/taxes/taxes.rst:279 +msgid ":doc:`fiscal_positions`" +msgstr "" + #: ../../content/applications/finance/accounting/taxation/taxes/cash_basis_taxes.rst:3 msgid "Manage cash basis taxes" msgstr "" @@ -14739,6 +15209,10 @@ msgstr "" msgid "The last two journal items are neutral but they are needed to insure correct tax reports in Odoo with accurate base tax amounts. We advise to use a default revenue account. The balance of this account will then always be at zero." msgstr "" +#: ../../content/applications/finance/accounting/taxation/taxes/default_taxes.rst:3 +msgid "Default taxes" +msgstr "" + #: ../../content/applications/finance/accounting/taxation/taxes/default_taxes.rst:5 msgid "**Default Taxes** define which :doc:`taxes ` are automatically selected when there is no other indication about which tax to use. For example, Odoo prefills the **Taxes** field with the Default Taxes when you create a new product or add a new line on an invoice." msgstr "" @@ -14766,15 +15240,8 @@ msgstr "" msgid ":doc:`taxes`" msgstr "" -#: ../../content/applications/finance/accounting/taxation/taxes/default_taxes.rst:39 -#: ../../content/applications/finance/accounting/taxation/taxes/eu_distance_selling.rst:68 -#: ../../content/applications/finance/accounting/taxation/taxes/taxcloud.rst:139 -#: ../../content/applications/finance/accounting/taxation/taxes/taxes.rst:279 -msgid ":doc:`fiscal_positions`" -msgstr "" - #: ../../content/applications/finance/accounting/taxation/taxes/eu_distance_selling.rst:3 -msgid "EU intra-community Distance Selling" +msgid "EU intra-community distance selling" msgstr "" #: ../../content/applications/finance/accounting/taxation/taxes/eu_distance_selling.rst:5 @@ -14834,7 +15301,7 @@ msgid "To do so, go to :menuselection:`Accounting/Invoicing --> Settings --> Tax msgstr "" #: ../../content/applications/finance/accounting/taxation/taxes/fiscal_positions.rst:3 -msgid "Fiscal Positions (tax and account mapping)" +msgid "Fiscal positions (tax and account mapping)" msgstr "" #: ../../content/applications/finance/accounting/taxation/taxes/fiscal_positions.rst:5 @@ -15942,97 +16409,103 @@ msgstr "" msgid "Online payment acquirers" msgstr "" -#: ../../content/applications/finance/payment_acquirers.rst:56 +#: ../../content/applications/finance/payment_acquirers.rst:61 msgid "Payment flow" msgstr "" -#: ../../content/applications/finance/payment_acquirers.rst:56 -msgid "Save cards" +#: ../../content/applications/finance/payment_acquirers.rst:62 +msgid ":ref:`Save cards for later `" msgstr "" -#: ../../content/applications/finance/payment_acquirers.rst:56 -msgid "Capture amount manually" +#: ../../content/applications/finance/payment_acquirers.rst:63 +msgid ":ref:`Manual capture `" msgstr "" -#: ../../content/applications/finance/payment_acquirers.rst:56 -msgid "Refund from Odoo" +#: ../../content/applications/finance/payment_acquirers.rst:64 +msgid ":ref:`Refunds `" msgstr "" -#: ../../content/applications/finance/payment_acquirers.rst:59 +#: ../../content/applications/finance/payment_acquirers.rst:65 msgid ":doc:`Adyen `" msgstr "" -#: ../../content/applications/finance/payment_acquirers.rst:59 -#: ../../content/applications/finance/payment_acquirers.rst:65 +#: ../../content/applications/finance/payment_acquirers.rst:66 +#: ../../content/applications/finance/payment_acquirers.rst:76 msgid "Payment from Odoo" msgstr "" -#: ../../content/applications/finance/payment_acquirers.rst:59 -#: ../../content/applications/finance/payment_acquirers.rst:59 -#: ../../content/applications/finance/payment_acquirers.rst:65 -#: ../../content/applications/finance/payment_acquirers.rst:65 -#: ../../content/applications/finance/payment_acquirers.rst:74 -#: ../../content/applications/finance/payment_acquirers.rst:89 +#: ../../content/applications/finance/payment_acquirers.rst:67 +#: ../../content/applications/finance/payment_acquirers.rst:77 +#: ../../content/applications/finance/payment_acquirers.rst:92 +#: ../../content/applications/finance/payment_acquirers.rst:117 msgid "|V|" msgstr "" -#: ../../content/applications/finance/payment_acquirers.rst:62 +#: ../../content/applications/finance/payment_acquirers.rst:69 +msgid "Full and partial" +msgstr "" + +#: ../../content/applications/finance/payment_acquirers.rst:70 msgid ":doc:`Alipay `" msgstr "" -#: ../../content/applications/finance/payment_acquirers.rst:62 -#: ../../content/applications/finance/payment_acquirers.rst:68 #: ../../content/applications/finance/payment_acquirers.rst:71 -#: ../../content/applications/finance/payment_acquirers.rst:74 -#: ../../content/applications/finance/payment_acquirers.rst:77 -#: ../../content/applications/finance/payment_acquirers.rst:80 -#: ../../content/applications/finance/payment_acquirers.rst:83 +#: ../../content/applications/finance/payment_acquirers.rst:81 #: ../../content/applications/finance/payment_acquirers.rst:86 -#: ../../content/applications/finance/payment_acquirers.rst:89 -msgid "Redirection to the acquirer website" +#: ../../content/applications/finance/payment_acquirers.rst:91 +#: ../../content/applications/finance/payment_acquirers.rst:96 +#: ../../content/applications/finance/payment_acquirers.rst:101 +#: ../../content/applications/finance/payment_acquirers.rst:106 +#: ../../content/applications/finance/payment_acquirers.rst:111 +#: ../../content/applications/finance/payment_acquirers.rst:116 +msgid "Payment from the acquirer website" msgstr "" -#: ../../content/applications/finance/payment_acquirers.rst:65 +#: ../../content/applications/finance/payment_acquirers.rst:75 msgid ":doc:`Authorize.Net `" msgstr "" -#: ../../content/applications/finance/payment_acquirers.rst:68 -msgid ":doc:`Buckaroo `" -msgstr "" - -#: ../../content/applications/finance/payment_acquirers.rst:71 -msgid ":doc:`Mollie `" -msgstr "" - -#: ../../content/applications/finance/payment_acquirers.rst:74 -msgid ":doc:`Ogone `" -msgstr "" - -#: ../../content/applications/finance/payment_acquirers.rst:77 -msgid ":doc:`PayPal `" +#: ../../content/applications/finance/payment_acquirers.rst:78 +msgid "Full only" msgstr "" #: ../../content/applications/finance/payment_acquirers.rst:80 +msgid ":doc:`Buckaroo `" +msgstr "" + +#: ../../content/applications/finance/payment_acquirers.rst:85 +msgid ":doc:`Mollie `" +msgstr "" + +#: ../../content/applications/finance/payment_acquirers.rst:90 +msgid ":doc:`Ogone `" +msgstr "" + +#: ../../content/applications/finance/payment_acquirers.rst:95 +msgid ":doc:`PayPal `" +msgstr "" + +#: ../../content/applications/finance/payment_acquirers.rst:100 msgid "PayU Latam" msgstr "" -#: ../../content/applications/finance/payment_acquirers.rst:83 +#: ../../content/applications/finance/payment_acquirers.rst:105 msgid "PayUMoney" msgstr "" -#: ../../content/applications/finance/payment_acquirers.rst:86 +#: ../../content/applications/finance/payment_acquirers.rst:110 msgid ":doc:`SIPS `" msgstr "" -#: ../../content/applications/finance/payment_acquirers.rst:89 +#: ../../content/applications/finance/payment_acquirers.rst:115 msgid ":doc:`Stripe `" msgstr "" -#: ../../content/applications/finance/payment_acquirers.rst:96 +#: ../../content/applications/finance/payment_acquirers.rst:124 msgid "Some of these online payment providers can also be added as :doc:`bank accounts <../finance/accounting/bank/setup/bank_accounts>`, but this is **not** the same process as adding them as payment acquirers. Payment acquirers allow customers to pay online, and bank accounts are added and configured on your Accounting app to do a bank reconciliation, which is an accounting control process." msgstr "" -#: ../../content/applications/finance/payment_acquirers.rst:105 +#: ../../content/applications/finance/payment_acquirers.rst:133 msgid "Bank payments" msgstr "" @@ -16052,67 +16525,36 @@ msgstr "" msgid "Your customers can sign a SEPA Direct Debit mandate online and get their bank account charged directly. :doc:`Click here <../finance/accounting/receivables/customer_payments/batch_sdd>` for more information about this payment method." msgstr "" -#: ../../content/applications/finance/payment_acquirers.rst:121 -msgid "Each acquirer has its specific configuration flow, depending on :ref:`which feature is available `." +#: ../../content/applications/finance/payment_acquirers.rst:146 +msgid "Additional features" msgstr "" -#: ../../content/applications/finance/payment_acquirers.rst:127 -msgid "Add a new payment acquirer" +#: ../../content/applications/finance/payment_acquirers.rst:148 +msgid "Some payment acquirers support additional features for the payment flow. Refer to the :ref:`table above ` to check if your payment acquirer supports these features." msgstr "" -#: ../../content/applications/finance/payment_acquirers.rst:129 -msgid "To add a new payment acquirer and make it available to your customers, go to :menuselection:`Accounting --> Configuration --> Payment Acquirers`, look for your payment acquirer, install the related module, and activate it. To do so, open the payment acquirer and change its state from *Disabled* to *Enabled*." +#: ../../content/applications/finance/payment_acquirers.rst:155 +msgid "Save cards for later" msgstr "" -#: ../../content/applications/finance/payment_acquirers.rst:139 -msgid "We recommend using the *Test Mode* on a duplicated database or a test database. The Test Mode is meant to be used with your test/sandbox credentials, but Odoo generates Sales Orders and Invoices as usual. It isn't always possible to cancel an invoice, and this could create some issues with your invoices numbering if you were to test your payment acquirers on your main database." +#: ../../content/applications/finance/payment_acquirers.rst:157 +msgid "If your payment acquirer supports this feature, customers can choose to save their card details as a **payment token** in Odoo. When they do, they will not have to enter their card details again when making a subsequent payment. This is particularly useful for the eCommerce conversion rate and for subscriptions that use recurring payments." msgstr "" -#: ../../content/applications/finance/payment_acquirers.rst:147 -#: ../../content/applications/finance/payment_acquirers/adyen.rst:15 -#: ../../content/applications/finance/payment_acquirers/alipay.rst:15 -#: ../../content/applications/finance/payment_acquirers/authorize.rst:15 -#: ../../content/applications/finance/payment_acquirers/buckaroo.rst:15 -#: ../../content/applications/finance/payment_acquirers/mollie.rst:14 -#: ../../content/applications/finance/payment_acquirers/ogone.rst:15 -#: ../../content/applications/finance/payment_acquirers/paypal.rst:17 -#: ../../content/applications/finance/payment_acquirers/sips.rst:15 -msgid "Credentials tab" +#: ../../content/applications/finance/payment_acquirers.rst:162 +msgid "Enable this feature by navigating to the :guilabel:`Configuration` tab from your payment acquirer and by ticking the :guilabel:`Allow Saving Payment Methods` checkbox." msgstr "" -#: ../../content/applications/finance/payment_acquirers.rst:149 -msgid "If not done yet, go to the online payment provider website, create an account, and make sure to have the credentials required for third-party use. Odoo requires these credentials to communicate with the payment acquirer." +#: ../../content/applications/finance/payment_acquirers.rst:166 +msgid "You remain fully PCI-compliant when you enable this feature because Odoo does not store the card details directly. Instead, it creates a payment token that only holds a reference to the card details stored on the payment acquirer's server." msgstr "" -#: ../../content/applications/finance/payment_acquirers.rst:153 -msgid "The form in this section is specific to the payment acquirer you are configuring. Please refer to the related documentation for more information." +#: ../../content/applications/finance/payment_acquirers.rst:173 +msgid "Manual capture" msgstr "" -#: ../../content/applications/finance/payment_acquirers.rst:159 -#: ../../content/applications/finance/payment_acquirers/authorize.rst:35 -#: ../../content/applications/finance/payment_acquirers/paypal.rst:42 -msgid "Configuration tab" -msgstr "" - -#: ../../content/applications/finance/payment_acquirers.rst:161 -msgid "You can change the payment acquirer's front-end appearance by modifying its name under the **Displayed as** field and which credit card icons to display under the **Supported Payment Icons** field." -msgstr "" - -#: ../../content/applications/finance/payment_acquirers.rst:168 -msgid "Save and reuse credit cards" -msgstr "" - -#: ../../content/applications/finance/payment_acquirers.rst:170 -msgid "With the **Save Cards** feature, Odoo can store **Payment Tokens** in your database, which can be used for subsequent payments, without having to reenter the payment details. This is particularly useful for the eCommerce conversion rate and subscriptions' recurring payments." -msgstr "" - -#: ../../content/applications/finance/payment_acquirers.rst:177 -#: ../../content/applications/finance/payment_acquirers/authorize.rst:38 -msgid "Place a hold on a card" -msgstr "" - -#: ../../content/applications/finance/payment_acquirers.rst:179 -msgid "If you wish to manually capture an amount instead of having an immediate capture, you can enable the manual capture. Capturing payments manually has many advantages:" +#: ../../content/applications/finance/payment_acquirers.rst:175 +msgid "If your payment acquirer supports this feature, you can authorize and capture payments in two steps instead of one. When you authorize a payment, the funds are reserved on the customer's payment method but they are not immediately charged. The charge is only made when you manually capture the payment later on. You can also void the authorization to release the reserved funds; this is equivalent to a regular cancellation. Capturing payments manually can prove itself useful in many situations:" msgstr "" #: ../../content/applications/finance/payment_acquirers.rst:182 @@ -16124,106 +16566,180 @@ msgid "Review and verify that orders are legitimate before the payment is comple msgstr "" #: ../../content/applications/finance/payment_acquirers.rst:185 -msgid "Avoid potentially high credit card fees in the event of overselling or cancelled orders." +msgid "Avoid potentially high processing fees for cancelled payments: payment acquirers will not charge you for voiding an authorization." msgstr "" #: ../../content/applications/finance/payment_acquirers.rst:187 -msgid "The **Capture Amount Manually** field is under the **Configuration** tab. If enabled, the funds are reserved for a few days on the customer's card, but not charged yet. Please refer to your acquirer's documentation for the exact reservation duration." +msgid "Hold a security deposit to return later, minus any deductions (e.g., after a damage)." msgstr "" -#: ../../content/applications/finance/payment_acquirers.rst:195 -msgid "To capture the payment, you must then go to the related sales order or invoice and manually *capture* the funds before its automatic cancellation, or *void the transaction* to unlock the funds from the customer's card." +#: ../../content/applications/finance/payment_acquirers.rst:189 +msgid "Enable this feature by navigating to the :guilabel:`Configuration` tab from your payment acquirer and by ticking the :guilabel:`Capture Amount Manually` checkbox." +msgstr "" + +#: ../../content/applications/finance/payment_acquirers.rst:192 +msgid "To capture the payment after it was authorized, go to the related sales order or invoice and click on the :guilabel:`CAPTURE TRANSACTION` button. To release the funds, click on the :guilabel:`VOID TRANSACTION` button." +msgstr "" + +#: ../../content/applications/finance/payment_acquirers.rst:197 +msgid "Some payment acquirers support capturing only part of the authorized amount. The remaining amount can then be either captured or voided. These acquirers have the value **Full and partial** in the :ref:`table above `. The acquirers that only support capturing or voiding the full amount have the value **Full only**." +msgstr "" + +#: ../../content/applications/finance/payment_acquirers.rst:201 +msgid "The funds are likely not reserved forever. After a certain time, they may be automatically released back to the customer's payment method. Refer to your payment acquirer's documentation for the exact reservation duration." msgstr "" #: ../../content/applications/finance/payment_acquirers.rst:204 -msgid "Odoo may not yet support the manual capture for all acquirers, but some acquirers allow managing the capture from their interfaces." +msgid "Odoo does not support this feature for all payment acquirers but some allow the manual capture from their website interface." msgstr "" #: ../../content/applications/finance/payment_acquirers.rst:210 -msgid "Countries" +msgid "Refunds" msgstr "" #: ../../content/applications/finance/payment_acquirers.rst:212 -msgid "Restrict the use of the payment acquirer to a selection of countries. Leave this field blank to make the payment acquirer available to all countries." +msgid "If your payment acquirer supports this feature, you can refund payments directly from Odoo. It does not need to be enabled first. To refund a customer payment, navigate to it and click on the :guilabel:`REFUND` button." msgstr "" -#: ../../content/applications/finance/payment_acquirers.rst:218 -msgid "Payment journal" +#: ../../content/applications/finance/payment_acquirers.rst:217 +msgid "Some payment acquirers support refunding only part of the amount. The remaining amount can then optionally be refunded too. These acquirers have the value **Full and partial** in the :ref:`table above `. The acquirers that only support refunding the full amount have the value **Full only**." msgstr "" -#: ../../content/applications/finance/payment_acquirers.rst:220 -msgid "The **Payment journal** selected for your payment acquirer must be a *Bank* journal." +#: ../../content/applications/finance/payment_acquirers.rst:221 +msgid "Odoo does not support this feature for all payment acquirers but some allow to refund payments from their website interface." msgstr "" -#: ../../content/applications/finance/payment_acquirers.rst:225 -msgid "Accounting perspective" +#: ../../content/applications/finance/payment_acquirers.rst:230 +msgid "Each acquirer has its specific configuration flow, depending on :ref:`which feature is available `." msgstr "" -#: ../../content/applications/finance/payment_acquirers.rst:227 -msgid "The **Bank Payments** that go directly to one of your bank accounts follow their usual reconciliation workflows. However, payments recorded with **Online Payment Providers** require you to consider how you want to record your payments' journal entries. We recommend you to ask your accountant for advice." -msgstr "" - -#: ../../content/applications/finance/payment_acquirers.rst:232 -msgid "You need to select a *Payment Journal* on your acquirer configuration to record the payments, on a **Outstanding Account**. The Journal's **type** must be *Bank Journal*." -msgstr "" - -#: ../../content/applications/finance/payment_acquirers.rst:235 -msgid "You can use a single journal for many payment methods. And for each payment method, you can either:" -msgstr "" - -#: ../../content/applications/finance/payment_acquirers.rst:237 -msgid "Define an **Accounting Account** to separate these payments from another payment method." +#: ../../content/applications/finance/payment_acquirers.rst:236 +msgid "Add a new payment acquirer" msgstr "" #: ../../content/applications/finance/payment_acquirers.rst:238 -msgid "Leave blank to fallback on the default account, which you can see or change in the settings." -msgstr "" - -#: ../../content/applications/finance/payment_acquirers.rst:244 -msgid "You can have the same bank account for the whole company, or for some journals only, or a single payment method... What best suit your needs." +msgid "To add a new payment acquirer and make it available to your customers, go to :menuselection:`Accounting --> Configuration --> Payment Acquirers`, look for your payment acquirer, install the related module, and activate it. To do so, open the payment acquirer and change its state from *Disabled* to *Enabled*." msgstr "" #: ../../content/applications/finance/payment_acquirers.rst:248 -msgid ":doc:`payment_acquirers/wire_transfer`" -msgstr "" - -#: ../../content/applications/finance/payment_acquirers.rst:249 -msgid ":doc:`payment_acquirers/adyen`" -msgstr "" - -#: ../../content/applications/finance/payment_acquirers.rst:250 -msgid ":doc:`payment_acquirers/alipay`" -msgstr "" - -#: ../../content/applications/finance/payment_acquirers.rst:251 -msgid ":doc:`payment_acquirers/authorize`" -msgstr "" - -#: ../../content/applications/finance/payment_acquirers.rst:252 -msgid ":doc:`payment_acquirers/buckaroo`" -msgstr "" - -#: ../../content/applications/finance/payment_acquirers.rst:253 -msgid ":doc:`payment_acquirers/mollie`" -msgstr "" - -#: ../../content/applications/finance/payment_acquirers.rst:254 -msgid ":doc:`payment_acquirers/ogone`" -msgstr "" - -#: ../../content/applications/finance/payment_acquirers.rst:255 -msgid ":doc:`payment_acquirers/paypal`" +msgid "We recommend using the *Test Mode* on a duplicated database or a test database. The Test Mode is meant to be used with your test/sandbox credentials, but Odoo generates Sales Orders and Invoices as usual. It isn't always possible to cancel an invoice, and this could create some issues with your invoices numbering if you were to test your payment acquirers on your main database." msgstr "" #: ../../content/applications/finance/payment_acquirers.rst:256 -msgid ":doc:`payment_acquirers/sips`" -msgstr "" - -#: ../../content/applications/finance/payment_acquirers.rst:257 -msgid ":doc:`payment_acquirers/stripe`" +#: ../../content/applications/finance/payment_acquirers/adyen.rst:15 +#: ../../content/applications/finance/payment_acquirers/alipay.rst:15 +#: ../../content/applications/finance/payment_acquirers/authorize.rst:15 +#: ../../content/applications/finance/payment_acquirers/buckaroo.rst:15 +#: ../../content/applications/finance/payment_acquirers/mollie.rst:14 +#: ../../content/applications/finance/payment_acquirers/ogone.rst:15 +#: ../../content/applications/finance/payment_acquirers/paypal.rst:17 +#: ../../content/applications/finance/payment_acquirers/sips.rst:15 +msgid "Credentials tab" msgstr "" #: ../../content/applications/finance/payment_acquirers.rst:258 +msgid "If not done yet, go to the online payment provider website, create an account, and make sure to have the credentials required for third-party use. Odoo requires these credentials to communicate with the payment acquirer." +msgstr "" + +#: ../../content/applications/finance/payment_acquirers.rst:262 +msgid "The form in this section is specific to the payment acquirer you are configuring. Please refer to the related documentation for more information." +msgstr "" + +#: ../../content/applications/finance/payment_acquirers.rst:268 +#: ../../content/applications/finance/payment_acquirers/authorize.rst:40 +#: ../../content/applications/finance/payment_acquirers/paypal.rst:42 +msgid "Configuration tab" +msgstr "" + +#: ../../content/applications/finance/payment_acquirers.rst:270 +msgid "You can change the payment acquirer's front-end appearance by modifying its name under the **Displayed as** field and which credit card icons to display under the **Supported Payment Icons** field." +msgstr "" + +#: ../../content/applications/finance/payment_acquirers.rst:277 +msgid "Countries" +msgstr "" + +#: ../../content/applications/finance/payment_acquirers.rst:279 +msgid "Restrict the use of the payment acquirer to a selection of countries. Leave this field blank to make the payment acquirer available to all countries." +msgstr "" + +#: ../../content/applications/finance/payment_acquirers.rst:285 +msgid "Payment journal" +msgstr "" + +#: ../../content/applications/finance/payment_acquirers.rst:287 +msgid "The **Payment journal** selected for your payment acquirer must be a *Bank* journal." +msgstr "" + +#: ../../content/applications/finance/payment_acquirers.rst:292 +msgid "Accounting perspective" +msgstr "" + +#: ../../content/applications/finance/payment_acquirers.rst:294 +msgid "The **Bank Payments** that go directly to one of your bank accounts follow their usual reconciliation workflows. However, payments recorded with **Online Payment Providers** require you to consider how you want to record your payments' journal entries. We recommend you to ask your accountant for advice." +msgstr "" + +#: ../../content/applications/finance/payment_acquirers.rst:299 +msgid "You need to select a *Payment Journal* on your acquirer configuration to record the payments, on a **Outstanding Account**. The Journal's **type** must be *Bank Journal*." +msgstr "" + +#: ../../content/applications/finance/payment_acquirers.rst:302 +msgid "You can use a single journal for many payment methods. And for each payment method, you can either:" +msgstr "" + +#: ../../content/applications/finance/payment_acquirers.rst:304 +msgid "Define an **Accounting Account** to separate these payments from another payment method." +msgstr "" + +#: ../../content/applications/finance/payment_acquirers.rst:305 +msgid "Leave blank to fallback on the default account, which you can see or change in the settings." +msgstr "" + +#: ../../content/applications/finance/payment_acquirers.rst:311 +msgid "You can have the same bank account for the whole company, or for some journals only, or a single payment method... What best suit your needs." +msgstr "" + +#: ../../content/applications/finance/payment_acquirers.rst:315 +msgid ":doc:`payment_acquirers/wire_transfer`" +msgstr "" + +#: ../../content/applications/finance/payment_acquirers.rst:316 +msgid ":doc:`payment_acquirers/adyen`" +msgstr "" + +#: ../../content/applications/finance/payment_acquirers.rst:317 +msgid ":doc:`payment_acquirers/alipay`" +msgstr "" + +#: ../../content/applications/finance/payment_acquirers.rst:318 +msgid ":doc:`payment_acquirers/authorize`" +msgstr "" + +#: ../../content/applications/finance/payment_acquirers.rst:319 +msgid ":doc:`payment_acquirers/buckaroo`" +msgstr "" + +#: ../../content/applications/finance/payment_acquirers.rst:320 +msgid ":doc:`payment_acquirers/mollie`" +msgstr "" + +#: ../../content/applications/finance/payment_acquirers.rst:321 +msgid ":doc:`payment_acquirers/ogone`" +msgstr "" + +#: ../../content/applications/finance/payment_acquirers.rst:322 +msgid ":doc:`payment_acquirers/paypal`" +msgstr "" + +#: ../../content/applications/finance/payment_acquirers.rst:323 +msgid ":doc:`payment_acquirers/sips`" +msgstr "" + +#: ../../content/applications/finance/payment_acquirers.rst:324 +msgid ":doc:`payment_acquirers/stripe`" +msgstr "" + +#: ../../content/applications/finance/payment_acquirers.rst:325 msgid ":doc:`../websites/ecommerce/shopper_experience/payment_acquirer`" msgstr "" @@ -16232,7 +16748,7 @@ msgid "Adyen" msgstr "" #: ../../content/applications/finance/payment_acquirers/adyen.rst:5 -msgid "`Adyen `_ is a Dutch-based company that offers several online payment possibilities." +msgid "`Adyen `_ is a Dutch company that offers several online payment possibilities." msgstr "" #: ../../content/applications/finance/payment_acquirers/adyen.rst:12 @@ -16280,64 +16796,64 @@ msgid "You can copy your credentials from your Adyen account, and paste them in msgstr "" #: ../../content/applications/finance/payment_acquirers/adyen.rst:30 -msgid "If you are trying Adyen as a test, with a *test account*, change the **State** to *Test Mode*. We recommend doing this on a test Odoo database, rather than on your main database." -msgstr "" - -#: ../../content/applications/finance/payment_acquirers/adyen.rst:36 -msgid "API Key and Client Key" +msgid "If you are trying Adyen as a test, with an Adyen *test account*, head to :menuselection:`Accounting --> Configuration --> Payment Acquirers`. There, click on :guilabel:`Adyen`, enable :guilabel:`Test Mode` and enter your credentials in the :guilabel:`Credentials` tab." msgstr "" #: ../../content/applications/finance/payment_acquirers/adyen.rst:38 -msgid "In order to retrieve the API Key and the Client Key, log into your Adyen account, go to :menuselection:`Developers --> API Credentials`. - If you already have an API user, open it. - If you don't have an API user yet, click on **Create new credential**. Go to :menuselection:`Authentication` and get or generate your **API Key** and **Client Key**. Be careful to copy your API key as you'll not be allowed to get it later without generating a new one." +msgid "API Key and Client Key" msgstr "" -#: ../../content/applications/finance/payment_acquirers/adyen.rst:45 -msgid "This is also the place where you'll :ref:`allow payments to be made from your website `." +#: ../../content/applications/finance/payment_acquirers/adyen.rst:40 +msgid "In order to retrieve the API Key and the Client Key, log into your Adyen account, go to :menuselection:`Developers --> API Credentials`. - If you already have an API user, open it. - If you don't have an API user yet, click on **Create new credential**. Go to :menuselection:`Server settings --> Authentification` and copy or generate your **API Key**. Be careful to copy your API key as you'll not be allowed to get it later without generating a new one." msgstr "" -#: ../../content/applications/finance/payment_acquirers/adyen.rst:51 +#: ../../content/applications/finance/payment_acquirers/adyen.rst:48 +msgid "Now, head to :menuselection:`Client settings --> Authentification` and cody or generate your **Client Key**. This is also the place where you can :ref:`allow payments to be made from your website `." +msgstr "" + +#: ../../content/applications/finance/payment_acquirers/adyen.rst:55 msgid "HMAC key" msgstr "" -#: ../../content/applications/finance/payment_acquirers/adyen.rst:53 +#: ../../content/applications/finance/payment_acquirers/adyen.rst:57 msgid "In order to retrieve the HMAC Key, you'll need to configure a `Standard Notification` webhook. For this, log into your Adyen account then go to :menuselection:`Developers --> Webhooks --> Add webhook --> Add Standard notification`." msgstr "" -#: ../../content/applications/finance/payment_acquirers/adyen.rst:61 -msgid "There, in :menuselection:`Transport --> URL`, enter your server address followed by `/payment/adyen/notification`." +#: ../../content/applications/finance/payment_acquirers/adyen.rst:65 +msgid "There, in :menuselection:`General --> Server configuration --> URL`, enter your server address followed by `/payment/adyen/notification`." msgstr "" -#: ../../content/applications/finance/payment_acquirers/adyen.rst:68 -msgid "Then continue in :menuselection:`Additional Settings --> HMAC Key --> Generate new HMAC key`. Be careful to copy it as you'll not be allowed to get it later without generating a new one." +#: ../../content/applications/finance/payment_acquirers/adyen.rst:72 +msgid "Then enter :menuselection:`Security --> HMAC Key --> Generate`. Be careful to copy the key as you will not be allowed to do it later without generating a new one." msgstr "" -#: ../../content/applications/finance/payment_acquirers/adyen.rst:71 +#: ../../content/applications/finance/payment_acquirers/adyen.rst:79 msgid "You have to save the webhook to finalize its creation." msgstr "" -#: ../../content/applications/finance/payment_acquirers/adyen.rst:76 +#: ../../content/applications/finance/payment_acquirers/adyen.rst:84 msgid "URLs" msgstr "" -#: ../../content/applications/finance/payment_acquirers/adyen.rst:78 -msgid "To retrieve the URLs, log into your Adyen account, go to :menuselection:`Developers --> API URLs`. Pick one of the URLs listed next to **Recurring** as your **Recurring API URL** and one of the URLs listed next to **Checkout API** as your **Checkout API URL**." +#: ../../content/applications/finance/payment_acquirers/adyen.rst:86 +msgid "To retrieve the URLs, log into your Adyen account, go to :menuselection:`Developers --> API URLs`. Select one of the URLs listed next to :guilabel:`Classic Recurring API` as your :guilabel:`Recurring API URL` and one listed next to :guilabel:`Checkout API` as your :guilabel:`Checkout API URL`." msgstr "" -#: ../../content/applications/finance/payment_acquirers/adyen.rst:87 +#: ../../content/applications/finance/payment_acquirers/adyen.rst:96 msgid "Adyen Account" msgstr "" -#: ../../content/applications/finance/payment_acquirers/adyen.rst:92 +#: ../../content/applications/finance/payment_acquirers/adyen.rst:101 msgid "Allow payments from a specific origin" msgstr "" -#: ../../content/applications/finance/payment_acquirers/adyen.rst:94 -msgid "To allow payment originated from your website, follow the steps in :ref:`adyen/api_and_client_keys` to navigate to your API user and go to :menuselection:`Allowed Origins`, then add the URLs from where payments will be made (the URLs of the servers hosting your Odoo instances)." +#: ../../content/applications/finance/payment_acquirers/adyen.rst:103 +msgid "To allow payment originated from your website, follow the steps in :ref:`adyen/api_and_client_keys` to navigate to your API user and go to :menuselection:`Add allowed origins`, then add the URLs from where payments will be made (the URLs of the servers hosting your Odoo instances)." msgstr "" -#: ../../content/applications/finance/payment_acquirers/adyen.rst:103 +#: ../../content/applications/finance/payment_acquirers/adyen.rst:112 #: ../../content/applications/finance/payment_acquirers/alipay.rst:36 -#: ../../content/applications/finance/payment_acquirers/authorize.rst:47 +#: ../../content/applications/finance/payment_acquirers/authorize.rst:53 #: ../../content/applications/finance/payment_acquirers/buckaroo.rst:47 #: ../../content/applications/finance/payment_acquirers/mollie.rst:31 #: ../../content/applications/finance/payment_acquirers/ogone.rst:88 @@ -16421,14 +16937,22 @@ msgid "To retrieve them, log into your Authorize.Net account, go to :menuselecti msgstr "" #: ../../content/applications/finance/payment_acquirers/authorize.rst:31 -msgid "If you are trying Authorize.Net as a test, with a *sandbox account*, change the **State** to *Test Mode*. We recommend doing this on a test Odoo database, rather than on your main database." +msgid "If you are trying Authorize.Net as a test, with a *sandbox account*, change the :guilabel:`State` to :guilabel:`Test Mode`. We recommend doing this on a test Odoo database, rather than on your main database." msgstr "" -#: ../../content/applications/finance/payment_acquirers/authorize.rst:40 -msgid "With Authorize.net, you can enable the :ref:`manual capture `. If enabled, the funds are reserved for 30 days on the customer's card, but not charged yet." +#: ../../content/applications/finance/payment_acquirers/authorize.rst:35 +msgid "If you set :guilabel:`Test Mode` on Odoo and use an authorize.net account instead of a sandbox.authorize.net account, it results in the following error: *The merchant login ID or password is invalid or the account is inactive*." msgstr "" -#: ../../content/applications/finance/payment_acquirers/authorize.rst:44 +#: ../../content/applications/finance/payment_acquirers/authorize.rst:43 +msgid "Place a hold on a card" +msgstr "" + +#: ../../content/applications/finance/payment_acquirers/authorize.rst:45 +msgid "With Authorize.net, you can enable the :ref:`manual capture `. If enabled, the funds are reserved for 30 days on the customer's card, but not charged yet." +msgstr "" + +#: ../../content/applications/finance/payment_acquirers/authorize.rst:50 msgid "After **30 days**, the transaction is **voided automatically** by Authorize.net." msgstr "" @@ -16512,10 +17036,6 @@ msgstr "" msgid "`Ogone `_, also known as **Ingenico Payment Services** is a France-based company that provides the technology involved in secure electronic transactions." msgstr "" -#: ../../content/applications/finance/payment_acquirers/ogone.rst:9 -msgid "Configuration on Odoo" -msgstr "" - #: ../../content/applications/finance/payment_acquirers/ogone.rst:17 msgid "Odoo needs your **API Credentials** to connect with your Ogone account, which comprise:" msgstr "" diff --git a/locale/sources/general.pot b/locale/sources/general.pot index 8358dfe68..91f60d2c1 100644 --- a/locale/sources/general.pot +++ b/locale/sources/general.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: Odoo 15.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-04-08 13:26+0000\n" +"POT-Creation-Date: 2022-07-22 09:36+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -395,71 +395,111 @@ msgid "Synchronize Google Calendar with Odoo" msgstr "" #: ../../content/applications/general/calendars/google/google_calendar_credentials.rst:5 -msgid "Odoo is perfectly integrated with Google Calendar so that you can see & manage your meetings from both platforms (updates go through both directions)." +msgid "Synchronize Google Calendar with Odoo to see and manage meetings from both platforms (updates go in both directions). This integration helps organize your schedule so you never miss a meeting." msgstr "" -#: ../../content/applications/general/calendars/google/google_calendar_credentials.rst:10 +#: ../../content/applications/general/calendars/google/google_calendar_credentials.rst:9 msgid "Setup in Google" msgstr "" -#: ../../content/applications/general/calendars/google/google_calendar_credentials.rst:11 -msgid "Go to `Google APIs platform `__ to generate Google Calendar API credentials. Log in with your Google account." +#: ../../content/applications/general/calendars/google/google_calendar_credentials.rst:12 +msgid "Enable Google Calendar API" msgstr "" #: ../../content/applications/general/calendars/google/google_calendar_credentials.rst:14 -msgid "Go to the API & Services page." +msgid "Begin by creating a new Google API project and enabling the Google Calendar API. Then, go to the `Google API Console `_ and log into your Google account." msgstr "" -#: ../../content/applications/general/calendars/google/google_calendar_credentials.rst:19 -msgid "Search for *Google Calendar API* and select it." +#: ../../content/applications/general/calendars/google/google_calendar_credentials.rst:18 +msgid "If this is your first time visiting this page, Google will prompt you to enter a country and agree to the Terms of Service. Select a country from the drop-down list and agree to the :abbr:`ToS (Terms of Service)`." msgstr "" -#: ../../content/applications/general/calendars/google/google_calendar_credentials.rst:27 -msgid "Enable the API." +#: ../../content/applications/general/calendars/google/google_calendar_credentials.rst:22 +msgid "Next, click :guilabel:`Select a project` and select or create an API project to store credentials." msgstr "" -#: ../../content/applications/general/calendars/google/google_calendar_credentials.rst:32 -msgid "Select or create an API project to store the credentials if not yet done before. Give it an explicit name (e.g. Odoo Sync)." +#: ../../content/applications/general/calendars/google/google_calendar_credentials.rst:29 +msgid "Give the API Project a clear name like \"Odoo Sync\" so you can easily find it." msgstr "" -#: ../../content/applications/general/calendars/google/google_calendar_credentials.rst:35 -msgid "Create credentials." +#: ../../content/applications/general/calendars/google/google_calendar_credentials.rst:31 +msgid "Then, open the API Project and click :guilabel:`Enable APIs and Services`." msgstr "" -#: ../../content/applications/general/calendars/google/google_calendar_credentials.rst:40 -msgid "Select *Web browser (Javascript)* as calling source and *User data* as kind of data." +#: ../../content/applications/general/calendars/google/google_calendar_credentials.rst:37 +msgid "After that, search for *Google Calendar API* using the search bar and select :guilabel:`Google Calendar API` from the search results. Click :guilabel:`Enable`." msgstr "" -#: ../../content/applications/general/calendars/google/google_calendar_credentials.rst:46 -msgid "Then you can create a Client ID. Enter the name of the application (e.g. Odoo Calendar) and the allowed pages on which you will be redirected. The *Authorized JavaScript origin* is your Odoo's instance URL. The *Authorized redirect URI* is your Odoo's instance URL followed by '/google_account/authentication'." +#: ../../content/applications/general/calendars/google/google_calendar_credentials.rst:45 +msgid "Create credentials" msgstr "" -#: ../../content/applications/general/calendars/google/google_calendar_credentials.rst:55 -msgid "Go through the Consent Screen step by entering a product name (e.g. Odoo Calendar). Feel free to check the customizations options but this is not mandatory. The Consent Screen will only show up when you enter the Client ID in Odoo for the first time." +#: ../../content/applications/general/calendars/google/google_calendar_credentials.rst:47 +msgid "Now that you have created your API project and enabled the Google Calendar API, you need to create credentials. Begin by clicking :guilabel:`Create Credentials`. Google will then guide you through four steps to create your API credentials." msgstr "" -#: ../../content/applications/general/calendars/google/google_calendar_credentials.rst:60 -msgid "Finally you are provided with your **Client ID**. Go to *Credentials* to get the **Client Secret** as well. Both of them are required in Odoo." +#: ../../content/applications/general/calendars/google/google_calendar_credentials.rst:51 +msgid "In the first step, :guilabel:`Credential Type`, select the :guilabel:`Google Calendar API` and :guilabel:`User Data` options. Then, click :guilabel:`Next`." msgstr "" -#: ../../content/applications/general/calendars/google/google_calendar_credentials.rst:67 -msgid "Setup in Odoo" +#: ../../content/applications/general/calendars/google/google_calendar_credentials.rst:58 +msgid "In the second step, :guilabel:`OAuth Consent Screen`, type *Odoo* in the :guilabel:`App name` field, select your email address for the :guilabel:`User support email` field, and type your email address for the :guilabel:`Developer contact information` section. Then, click :guilabel:`Save and Continue`." msgstr "" -#: ../../content/applications/general/calendars/google/google_calendar_credentials.rst:69 -msgid "Install the **Google Calendar** App from the *Apps* menu or by checking the option in :menuselection:`Settings --> General Settings`." +#: ../../content/applications/general/calendars/google/google_calendar_credentials.rst:63 +msgid "Skip the third step, :guilabel:`Scopes`, by clicking :guilabel:`Save and Continue`." msgstr "" -#: ../../content/applications/general/calendars/google/google_calendar_credentials.rst:75 -msgid "Go to :menuselection:`Settings --> General Settings` and enter your **Client ID** and **Client Secret** in Google Calendar option." +#: ../../content/applications/general/calendars/google/google_calendar_credentials.rst:65 +msgid "In the last step, :guilabel:`OAuth Client ID`, select :guilabel:`Website application` for the :guilabel:`Application Type` field and type *My Odoo Database* for the :guilabel:`Name`." msgstr "" -#: ../../content/applications/general/calendars/google/google_calendar_credentials.rst:81 -msgid "The setup is now ready. Open your Odoo Calendar and sync with Google. The first time you do it you are redirected to Google to authorize the connection. Once back in Odoo, click the sync button again. You can click it whenever you want to synchronize your calendar." +#: ../../content/applications/general/calendars/google/google_calendar_credentials.rst:68 +msgid "Under the :guilabel:`Authorized JavaScript Origins` section, click :guilabel:`+ Add URI` and type your company's Odoo URL address." +msgstr "" + +#: ../../content/applications/general/calendars/google/google_calendar_credentials.rst:71 +msgid "Under the :guilabel:`Authorized redirect URIs` section, click :guilabel:`+ Add URI` and type your company's Odoo URL address followed by */google_account/authentication*. Finally, click :guilabel:`Create` and :guilabel:`Done`." +msgstr "" + +#: ../../content/applications/general/calendars/google/google_calendar_credentials.rst:79 +msgid "After successfully creating a new API project, enabling the Google Calendar API, and generating the Google Calendar API credentials, you should now have a Client ID and Client Secret." +msgstr "" + +#: ../../content/applications/general/calendars/google/google_calendar_credentials.rst:83 +msgid "Client ID & Client Secret" +msgstr "" + +#: ../../content/applications/general/calendars/google/google_calendar_credentials.rst:85 +msgid "The **Client ID** and the **Client Secret** are both needed to connect Google Calendar to Odoo. Find the Client ID and the Client Secret by opening the Google Cloud Platform navigation menu and going to :menuselection:`API & Services --> Credentials --> OAuth 2.0 Client IDs`." msgstr "" #: ../../content/applications/general/calendars/google/google_calendar_credentials.rst:89 -msgid "As of now you no longer have excuses to miss a meeting!" +msgid "Next, locate the credentials you just created for the Google Calendar API. Then, click on :guilabel:`Edit OAuth Client` (the pencil icon). The page will redirect to the edit page, where you can view the Client ID and the Client Secret." +msgstr "" + +#: ../../content/applications/general/calendars/google/google_calendar_credentials.rst:98 +msgid "Setup in Odoo" +msgstr "" + +#: ../../content/applications/general/calendars/google/google_calendar_credentials.rst:100 +msgid "Once the Client ID and the Client Secret are located, open the Odoo database and go to :menuselection:`Settings --> General Settings --> Integrations --> Google Calendar`. Check the box next to :guilabel:`Google Calendar`." +msgstr "" + +#: ../../content/applications/general/calendars/google/google_calendar_credentials.rst:108 +msgid "Next, copy and paste the Client ID and the Client Secret from the Google Calender API Credentials page into their respective fields below the :guilabel:`Google Calendar` checkbox. Then, click :guilabel:`Save`." +msgstr "" + +#: ../../content/applications/general/calendars/google/google_calendar_credentials.rst:112 +msgid "Finally, open the Calendar module in Odoo and click on the :guilabel:`Google` sync button to sync Google Calendar with Odoo." +msgstr "" + +#: ../../content/applications/general/calendars/google/google_calendar_credentials.rst:120 +msgid "The first time you sync your Google Calendar with Odoo, the page will redirect to your Google Account. Click :guilabel:`OK` and :guilabel:`Allow` to authorize Odoo to access Google Calendar." +msgstr "" + +#: ../../content/applications/general/calendars/google/google_calendar_credentials.rst:127 +msgid "Now, Odoo Calendar is successfully synced with Google Calendar!" msgstr "" #: ../../content/applications/general/calendars/outlook/outlook_calendar.rst:3 @@ -2157,7 +2197,7 @@ msgid "Offering my own services" msgstr "" #: ../../content/applications/general/in_app_purchase.rst:68 -msgid "I am more than welcome to offer my own IAP services through Odoo Apps! It is the perfect opportunity to get recurring revenue for an ongoing service use rather than — and possibly instead of — a sole initial purchase. Please, find more information at: :doc:`In-App Purchase `." +msgid "I am more than welcome to offer my own IAP services through Odoo Apps! It is the perfect opportunity to get recurring revenue for an ongoing service use rather than — and possibly instead of — a sole initial purchase. Please, find more information at: :doc:`In-App Purchase `." msgstr "" #: ../../content/applications/general/users.rst:7 diff --git a/locale/sources/inventory_and_mrp.pot b/locale/sources/inventory_and_mrp.pot index fc4e55118..45c6f3843 100644 --- a/locale/sources/inventory_and_mrp.pot +++ b/locale/sources/inventory_and_mrp.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: Odoo 15.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-04-08 13:26+0000\n" +"POT-Creation-Date: 2022-07-22 09:36+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -1532,204 +1532,204 @@ msgid "**Sales Security Lead Time**: the purpose is to be ready shipping that ma msgstr "" #: ../../content/applications/inventory_and_mrp/inventory/management/planning/scheduled_dates.rst:41 -msgid "**Purchase Security Lead Time**: Margin of error for vendor lead times. When the system generates Purchase Orders for procuring products, they will be scheduled that many days earlier to cope with unexpected vendor delays." +msgid "**Purchase Security Lead Time**: margin of error for vendor lead times. When the system generates Purchase Orders for procuring products, they will be scheduled that many days earlier to cope with unexpected vendor delays." msgstr "" -#: ../../content/applications/inventory_and_mrp/inventory/management/planning/scheduled_dates.rst:48 +#: ../../content/applications/inventory_and_mrp/inventory/management/planning/scheduled_dates.rst:46 msgid "**Purchase Delivery Lead Time**: this is the expected time between a PO being confirmed and the receipt of the ordered products. The **Receipt scheduled date - Vendor delivery date** is the default *PO Order By* date." msgstr "" -#: ../../content/applications/inventory_and_mrp/inventory/management/planning/scheduled_dates.rst:53 +#: ../../content/applications/inventory_and_mrp/inventory/management/planning/scheduled_dates.rst:51 msgid "**Days to Purchase**: number of days the purchasing department takes to validate a PO. If another RFQ to the same vendor is already opened, Odoo adds the line to the RFQ instead of creating a new one. Then, the specific date is set on the line." msgstr "" -#: ../../content/applications/inventory_and_mrp/inventory/management/planning/scheduled_dates.rst:58 +#: ../../content/applications/inventory_and_mrp/inventory/management/planning/scheduled_dates.rst:56 msgid "**Manufacturing Lead Time**: this is the expected time it takes to manufacture a product. This lead time is independent of the quantity to produce and does not take the routing time into account." msgstr "" -#: ../../content/applications/inventory_and_mrp/inventory/management/planning/scheduled_dates.rst:63 +#: ../../content/applications/inventory_and_mrp/inventory/management/planning/scheduled_dates.rst:61 msgid "**Manufacturing Security Lead Time**: additional time to mitigate the risk of a manufacturing delay. In case of a *Replenish to Order*, the **Delivery Order scheduled date - Manufacturing Lead Time - Manufacturing Security Lead Time** is the default *Manufacturing Order* planned date." msgstr "" -#: ../../content/applications/inventory_and_mrp/inventory/management/planning/scheduled_dates.rst:70 +#: ../../content/applications/inventory_and_mrp/inventory/management/planning/scheduled_dates.rst:68 msgid "Sales - Lead Times" msgstr "" -#: ../../content/applications/inventory_and_mrp/inventory/management/planning/scheduled_dates.rst:72 +#: ../../content/applications/inventory_and_mrp/inventory/management/planning/scheduled_dates.rst:70 msgid "In the *Sales* app, there is an option called *Delivery Date*. It allows seeing an additional field on the sales orders, *Expected Date*. This one is automatically computed based on the different lead times previously configured." msgstr "" -#: ../../content/applications/inventory_and_mrp/inventory/management/planning/scheduled_dates.rst:81 +#: ../../content/applications/inventory_and_mrp/inventory/management/planning/scheduled_dates.rst:79 msgid "If the set up *Delivery Date* is earlier than the the *Expected Date*, a warning message is displayed." msgstr "" -#: ../../content/applications/inventory_and_mrp/inventory/management/planning/scheduled_dates.rst:89 +#: ../../content/applications/inventory_and_mrp/inventory/management/planning/scheduled_dates.rst:87 msgid "But, for all of this properly working, it is still necessary to configure all the lead times that could occur." msgstr "" -#: ../../content/applications/inventory_and_mrp/inventory/management/planning/scheduled_dates.rst:93 +#: ../../content/applications/inventory_and_mrp/inventory/management/planning/scheduled_dates.rst:91 msgid "Customer Lead Time" msgstr "" -#: ../../content/applications/inventory_and_mrp/inventory/management/planning/scheduled_dates.rst:95 +#: ../../content/applications/inventory_and_mrp/inventory/management/planning/scheduled_dates.rst:93 msgid "The *Customer Lead Time* is the time needed for your product to go from your warehouse to the customer place. It can be configured on any product by going to :menuselection:`Sales --> Products --> Products`. There, open your product form, go in the inventory tab, and add your *Customer Lead Time*." msgstr "" -#: ../../content/applications/inventory_and_mrp/inventory/management/planning/scheduled_dates.rst:105 +#: ../../content/applications/inventory_and_mrp/inventory/management/planning/scheduled_dates.rst:103 msgid "For example, product B is ordered on the 2nd of April but the *Customer Lead Time* is two days. In that case, the expected delivery date is the 4th of April." msgstr "" -#: ../../content/applications/inventory_and_mrp/inventory/management/planning/scheduled_dates.rst:110 -#: ../../content/applications/inventory_and_mrp/inventory/management/planning/scheduled_dates.rst:182 -#: ../../content/applications/inventory_and_mrp/inventory/management/planning/scheduled_dates.rst:219 +#: ../../content/applications/inventory_and_mrp/inventory/management/planning/scheduled_dates.rst:108 +#: ../../content/applications/inventory_and_mrp/inventory/management/planning/scheduled_dates.rst:180 +#: ../../content/applications/inventory_and_mrp/inventory/management/planning/scheduled_dates.rst:217 msgid "Security Lead Time" msgstr "" -#: ../../content/applications/inventory_and_mrp/inventory/management/planning/scheduled_dates.rst:112 +#: ../../content/applications/inventory_and_mrp/inventory/management/planning/scheduled_dates.rst:110 msgid "In sales, *Security Lead Time* corresponds to backup days to ensure you are able to deliver the products in time. The purpose is to be ready shipping earlier in order to arrive on time." msgstr "" -#: ../../content/applications/inventory_and_mrp/inventory/management/planning/scheduled_dates.rst:116 +#: ../../content/applications/inventory_and_mrp/inventory/management/planning/scheduled_dates.rst:114 msgid "The number of security days is subtracted from the calculation to compute a scheduled date earlier than the one promised to the customer." msgstr "" -#: ../../content/applications/inventory_and_mrp/inventory/management/planning/scheduled_dates.rst:119 +#: ../../content/applications/inventory_and_mrp/inventory/management/planning/scheduled_dates.rst:117 msgid "To set this up, go to :menuselection:`Inventory --> Configuration --> Settings` and enable the feature *Security Lead Time for Sales*." msgstr "" -#: ../../content/applications/inventory_and_mrp/inventory/management/planning/scheduled_dates.rst:126 +#: ../../content/applications/inventory_and_mrp/inventory/management/planning/scheduled_dates.rst:124 msgid "For example, product B is scheduled to be delivered on the 6th of April but the *Security Lead Time* is one day. In that case, the scheduled date for the delivery order is the 5th of April." msgstr "" -#: ../../content/applications/inventory_and_mrp/inventory/management/planning/scheduled_dates.rst:131 +#: ../../content/applications/inventory_and_mrp/inventory/management/planning/scheduled_dates.rst:129 msgid "Deliver several products" msgstr "" -#: ../../content/applications/inventory_and_mrp/inventory/management/planning/scheduled_dates.rst:133 +#: ../../content/applications/inventory_and_mrp/inventory/management/planning/scheduled_dates.rst:131 msgid "In many cases, customers order several products at the same time. Those can have different lead times but still need to be delivered, at once or separately. Fortunately, Odoo can help you handle these cases easily." msgstr "" -#: ../../content/applications/inventory_and_mrp/inventory/management/planning/scheduled_dates.rst:137 +#: ../../content/applications/inventory_and_mrp/inventory/management/planning/scheduled_dates.rst:135 msgid "From the *Other Info* tab of your *Sale Order*, you can choose between *When all products are ready* and *As soon as possible*. The first one is to deliver products at once, while the second is to deliver them separately." msgstr "" -#: ../../content/applications/inventory_and_mrp/inventory/management/planning/scheduled_dates.rst:142 +#: ../../content/applications/inventory_and_mrp/inventory/management/planning/scheduled_dates.rst:140 msgid "For example, products A and B are ordered at the same time. A has 8 lead days and B has 5. With the first option, the *Expected Date* is calculated based on the product with the most lead days, here A. If the order is confirmed on the 2nd of April, then the *Expected Date* is on the 10th of April." msgstr "" -#: ../../content/applications/inventory_and_mrp/inventory/management/planning/scheduled_dates.rst:148 +#: ../../content/applications/inventory_and_mrp/inventory/management/planning/scheduled_dates.rst:146 msgid "With the second option, the *Expected Date* is calculated based on the product with the least customer lead days. In this example, B is the product with the least lead days. So, the *Expected Date* is on the 7th of April." msgstr "" -#: ../../content/applications/inventory_and_mrp/inventory/management/planning/scheduled_dates.rst:154 +#: ../../content/applications/inventory_and_mrp/inventory/management/planning/scheduled_dates.rst:152 msgid "Purchase - Lead Times" msgstr "" -#: ../../content/applications/inventory_and_mrp/inventory/management/planning/scheduled_dates.rst:157 +#: ../../content/applications/inventory_and_mrp/inventory/management/planning/scheduled_dates.rst:155 msgid "Supplier Lead Time" msgstr "" -#: ../../content/applications/inventory_and_mrp/inventory/management/planning/scheduled_dates.rst:159 +#: ../../content/applications/inventory_and_mrp/inventory/management/planning/scheduled_dates.rst:157 msgid "The *Supplier Lead Time* is the time needed for a product you purchased to be delivered. To configure it, open a product from :menuselection:`Purchase --> Products --> Products` and add a vendor under the *Purchase* tab." msgstr "" -#: ../../content/applications/inventory_and_mrp/inventory/management/planning/scheduled_dates.rst:168 +#: ../../content/applications/inventory_and_mrp/inventory/management/planning/scheduled_dates.rst:166 msgid "By clicking on *Add a line*, a new window is displayed. You can specify the *Delivery Lead Time* there. If done so, the delivery day for every purchase of that product is now equal to *Date of the Purchase Order + Delivery Lead Time*." msgstr "" -#: ../../content/applications/inventory_and_mrp/inventory/management/planning/scheduled_dates.rst:178 +#: ../../content/applications/inventory_and_mrp/inventory/management/planning/scheduled_dates.rst:176 msgid "It is possible to add different vendors and, thus, different lead times depending on the vendor." msgstr "" -#: ../../content/applications/inventory_and_mrp/inventory/management/planning/scheduled_dates.rst:184 +#: ../../content/applications/inventory_and_mrp/inventory/management/planning/scheduled_dates.rst:182 msgid "The *Security Lead Time* for purchase follows the same logic as the one for *Sales*, except that you are the customer. Then, it is the margin of error for your supplier to deliver your order." msgstr "" -#: ../../content/applications/inventory_and_mrp/inventory/management/planning/scheduled_dates.rst:188 +#: ../../content/applications/inventory_and_mrp/inventory/management/planning/scheduled_dates.rst:186 msgid "To set up *Security Lead Time* for purchase, go to :menuselection:`Inventory --> Configuration --> Settings` and enable the feature." msgstr "" -#: ../../content/applications/inventory_and_mrp/inventory/management/planning/scheduled_dates.rst:196 +#: ../../content/applications/inventory_and_mrp/inventory/management/planning/scheduled_dates.rst:194 msgid "Doing so, every time the system generates purchase orders, those are scheduled that many days earlier to cope with unexpected vendor delays." msgstr "" -#: ../../content/applications/inventory_and_mrp/inventory/management/planning/scheduled_dates.rst:200 +#: ../../content/applications/inventory_and_mrp/inventory/management/planning/scheduled_dates.rst:198 msgid "Manufacturing - Lead Times" msgstr "" -#: ../../content/applications/inventory_and_mrp/inventory/management/planning/scheduled_dates.rst:203 +#: ../../content/applications/inventory_and_mrp/inventory/management/planning/scheduled_dates.rst:201 msgid "Manufacturing Lead Time" msgstr "" -#: ../../content/applications/inventory_and_mrp/inventory/management/planning/scheduled_dates.rst:205 +#: ../../content/applications/inventory_and_mrp/inventory/management/planning/scheduled_dates.rst:203 msgid "The *Manufacturing Lead Time* is the time needed to manufacture the product. To specify it, open the *Inventory* tab of your product form and add the number of days the manufacturing takes." msgstr "" -#: ../../content/applications/inventory_and_mrp/inventory/management/planning/scheduled_dates.rst:213 +#: ../../content/applications/inventory_and_mrp/inventory/management/planning/scheduled_dates.rst:211 msgid "When working with *Manufacturing Lead Times*, the *Deadline Start* of the *MO* is **Commitment Date - Manufacturing Lead Time**. For example, the MO’s deadline start date for an order having a commitment date on the 10th of July is June 27th." msgstr "" -#: ../../content/applications/inventory_and_mrp/inventory/management/planning/scheduled_dates.rst:221 +#: ../../content/applications/inventory_and_mrp/inventory/management/planning/scheduled_dates.rst:219 msgid "The *Security Lead Time* for manufacturing allows generating manufacturing orders earlier to cope with the risk of manufacturing delays." msgstr "" -#: ../../content/applications/inventory_and_mrp/inventory/management/planning/scheduled_dates.rst:225 +#: ../../content/applications/inventory_and_mrp/inventory/management/planning/scheduled_dates.rst:223 msgid "To enable it, go to :menuselection:`Manufacturing --> Configuration --> Settings` and tick *Security Lead Time*." msgstr "" -#: ../../content/applications/inventory_and_mrp/inventory/management/planning/scheduled_dates.rst:232 +#: ../../content/applications/inventory_and_mrp/inventory/management/planning/scheduled_dates.rst:230 msgid "For example, a customer orders B with a delivery date scheduled on the 20th of June. The *Manufacturing Lead Time* is 14 days and the *Security Lead Time* is 3 days, so the manufacturing of B needs to start at the latest on the 3rd of June, which is the MO’s planned date." msgstr "" -#: ../../content/applications/inventory_and_mrp/inventory/management/planning/scheduled_dates.rst:238 +#: ../../content/applications/inventory_and_mrp/inventory/management/planning/scheduled_dates.rst:236 msgid "Global Example" msgstr "" -#: ../../content/applications/inventory_and_mrp/inventory/management/planning/scheduled_dates.rst:240 +#: ../../content/applications/inventory_and_mrp/inventory/management/planning/scheduled_dates.rst:238 msgid "Here is a configuration:" msgstr "" -#: ../../content/applications/inventory_and_mrp/inventory/management/planning/scheduled_dates.rst:242 +#: ../../content/applications/inventory_and_mrp/inventory/management/planning/scheduled_dates.rst:240 msgid "1 day of security lead time for Sales" msgstr "" -#: ../../content/applications/inventory_and_mrp/inventory/management/planning/scheduled_dates.rst:243 +#: ../../content/applications/inventory_and_mrp/inventory/management/planning/scheduled_dates.rst:241 msgid "2 days of security lead time for Manufacturing" msgstr "" -#: ../../content/applications/inventory_and_mrp/inventory/management/planning/scheduled_dates.rst:244 +#: ../../content/applications/inventory_and_mrp/inventory/management/planning/scheduled_dates.rst:242 msgid "3 days of manufacturing lead time" msgstr "" -#: ../../content/applications/inventory_and_mrp/inventory/management/planning/scheduled_dates.rst:245 +#: ../../content/applications/inventory_and_mrp/inventory/management/planning/scheduled_dates.rst:243 msgid "1 day of security lead time for Purchase" msgstr "" -#: ../../content/applications/inventory_and_mrp/inventory/management/planning/scheduled_dates.rst:246 +#: ../../content/applications/inventory_and_mrp/inventory/management/planning/scheduled_dates.rst:244 msgid "4 days of supplier lead time" msgstr "" -#: ../../content/applications/inventory_and_mrp/inventory/management/planning/scheduled_dates.rst:248 +#: ../../content/applications/inventory_and_mrp/inventory/management/planning/scheduled_dates.rst:246 msgid "Let’s say that a customer orders B on the 1st of September and the delivery date is planned to be within 20 days (September 20th). In such a scenario, here is when all the various steps are triggered." msgstr "" -#: ../../content/applications/inventory_and_mrp/inventory/management/planning/scheduled_dates.rst:252 +#: ../../content/applications/inventory_and_mrp/inventory/management/planning/scheduled_dates.rst:250 msgid "**September 1st**: the sales order is created" msgstr "" -#: ../../content/applications/inventory_and_mrp/inventory/management/planning/scheduled_dates.rst:253 +#: ../../content/applications/inventory_and_mrp/inventory/management/planning/scheduled_dates.rst:251 msgid "**September 10th**: the deadline to order components from the supplier because of the manufacturing process (4 days of supplier lead time)" msgstr "" -#: ../../content/applications/inventory_and_mrp/inventory/management/planning/scheduled_dates.rst:256 +#: ../../content/applications/inventory_and_mrp/inventory/management/planning/scheduled_dates.rst:254 msgid "**September 13th**: the reception of the product from the supplier (1 day of security lead time for Purchase)" msgstr "" -#: ../../content/applications/inventory_and_mrp/inventory/management/planning/scheduled_dates.rst:258 +#: ../../content/applications/inventory_and_mrp/inventory/management/planning/scheduled_dates.rst:256 msgid "**September 14th**: the deadline start date for the manufacturing (19th - 3 days of manufacturing lead time - 2 days of security lead time for Manufacturing)" msgstr "" -#: ../../content/applications/inventory_and_mrp/inventory/management/planning/scheduled_dates.rst:261 +#: ../../content/applications/inventory_and_mrp/inventory/management/planning/scheduled_dates.rst:259 msgid "**September 19th**: the expected date on the delivery order form (1 day of security lead time for sales)" msgstr "" diff --git a/locale/sources/legal.pot b/locale/sources/legal.pot index 53674afcb..aa2cf32f6 100644 --- a/locale/sources/legal.pot +++ b/locale/sources/legal.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: Odoo 15.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-03-18 14:56+0000\n" +"POT-Creation-Date: 2022-07-22 09:36+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -34,108 +34,80 @@ msgstr "" msgid "Terms and Conditions" msgstr "" -#: ../../content/legal.rst:128 -msgid "**English**" +#: ../../content/legal.rst:29 +msgid "English" msgstr "" -#: ../../content/legal.rst:128 +#: ../../content/legal.rst:30 msgid "Français" msgstr "" -#: ../../content/legal.rst:128 +#: ../../content/legal.rst:31 msgid "Nederlands" msgstr "" -#: ../../content/legal.rst:128 +#: ../../content/legal.rst:32 msgid "Deutsch" msgstr "" -#: ../../content/legal.rst:128 +#: ../../content/legal.rst:33 msgid "Español" msgstr "" -#: ../../content/legal.rst:130 -msgid "Odoo Enterprise Agreement [#ltoe1]_" +#: ../../content/legal.rst:34 +msgid "Odoo Enterprise Agreement [#]_" msgstr "" -#: ../../content/legal.rst:130 -msgid "|view_enterprise_en| |download_enterprise_en|" -msgstr "" - -#: ../../content/legal.rst:130 -msgid "|view_enterprise_fr| |download_enterprise_fr|" -msgstr "" - -#: ../../content/legal.rst:130 -#: ../../content/legal.rst:130 -#: ../../content/legal.rst:132 -#: ../../content/legal.rst:132 -#: ../../content/legal.rst:132 +#: ../../content/legal.rst:47 +#: ../../content/legal.rst:48 +#: ../../content/legal.rst:68 +#: ../../content/legal.rst:69 +#: ../../content/legal.rst:70 msgid "|missing_txt| |missing_pdf|" msgstr "" -#: ../../content/legal.rst:130 -msgid "|view_enterprise_es| |download_enterprise_es|" -msgstr "" - -#: ../../content/legal.rst:132 +#: ../../content/legal.rst:55 #: ../../content/legal/terms/partnership.rst:5 msgid "Odoo Partnership Agreement" msgstr "" -#: ../../content/legal.rst:132 -msgid "|view_partnership_en| |download_partnership_en|" -msgstr "" - -#: ../../content/legal.rst:132 -msgid "|view_partnership_fr| |download_partnership_fr|" -msgstr "" - -#: ../../content/legal.rst:134 +#: ../../content/legal.rst:71 msgid "Terms of Sale" msgstr "" -#: ../../content/legal.rst:134 -msgid "|view_terms_of_sale_en| |download_terms_of_sale_en|" +#: ../../content/legal.rst:88 +msgid "Applies to self-hosting, Odoo.SH and Odoo Cloud." msgstr "" -#: ../../content/legal.rst:134 -msgid "|view_terms_of_sale_fr| |download_terms_of_sale_fr|" +#: ../../content/legal.rst:99 +msgid "`Archive of older agreements `_" msgstr "" -#: ../../content/legal.rst:136 -msgid "Archive of older agreements: `Archive `_" -msgstr "" - -#: ../../content/legal.rst:138 -msgid "Applies to self-hosting, Odoo.SH and Odoo Cloud" -msgstr "" - -#: ../../content/legal.rst:142 +#: ../../content/legal.rst:102 msgid "Other legal references" msgstr "" -#: ../../content/legal.rst:144 +#: ../../content/legal.rst:104 msgid "`Odoo Cloud Service Level Agreement (SLA) `_" msgstr "" -#: ../../content/legal.rst:145 +#: ../../content/legal.rst:105 msgid "`Odoo Cloud Acceptable Use Policy `_" msgstr "" -#: ../../content/legal.rst:146 +#: ../../content/legal.rst:106 msgid "`Odoo SA's Privacy Policy `_" msgstr "" -#: ../../content/legal.rst:147 +#: ../../content/legal.rst:107 msgid "`Odoo SA's GDPR Compliance Guide `_" msgstr "" -#: ../../content/legal.rst:148 +#: ../../content/legal.rst:108 msgid ":ref:`cla`" msgstr "" -#: ../../content/legal.rst:149 +#: ../../content/legal.rst:109 msgid ":ref:`germany/gobd`" msgstr "" diff --git a/locale/sources/productivity.pot b/locale/sources/productivity.pot index 51a1ab0ca..8daf95e31 100644 --- a/locale/sources/productivity.pot +++ b/locale/sources/productivity.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: Odoo 15.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-03-18 14:56+0000\n" +"POT-Creation-Date: 2022-07-22 09:36+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -24,6 +24,86 @@ msgstr "" msgid "Discuss" msgstr "" +#: ../../content/applications/productivity/discuss/advanced.rst:5 +msgid "Advanced" +msgstr "" + +#: ../../content/applications/productivity/discuss/advanced/ice_servers.rst:3 +msgid "Configure ICE servers with Twilio" +msgstr "" + +#: ../../content/applications/productivity/discuss/advanced/ice_servers.rst:5 +msgid "Odoo Discuss uses WebRTC API and peer-to-peer connections for voice and video calls. If one of the call attendees is behind a symmetric NAT, you need to configure an ICE server to establish a connection to the call attendee. To set up an ICE server, first, create a Twilio account for video calls, and then, connect that Twilio account to Odoo." +msgstr "" + +#: ../../content/applications/productivity/discuss/advanced/ice_servers.rst:11 +msgid "Create a Twilio account" +msgstr "" + +#: ../../content/applications/productivity/discuss/advanced/ice_servers.rst:13 +msgid "First, go to `Twilio `_ and click :guilabel:`Sign up` to create a new Twilio account. Next, enter your name and email address, create a password, and accept Twilio's terms of service. Then, click :guilabel:`Start your free trial`. Verify your email address with Twilio, as per their instructions." +msgstr "" + +#: ../../content/applications/productivity/discuss/advanced/ice_servers.rst:18 +msgid "Next, enter your phone number into Twilio. Then, Twilio will send you an SMS text message containing a verification code. Enter the verification code into Twilio to verify your phone number." +msgstr "" + +#: ../../content/applications/productivity/discuss/advanced/ice_servers.rst:22 +msgid "After that, Twilio redirects to a welcome page. Use the following list to answer Twilio's questions:" +msgstr "" + +#: ../../content/applications/productivity/discuss/advanced/ice_servers.rst:25 +msgid "For :guilabel:`Which Twilio product are you here to use?`, select :guilabel:`Video`." +msgstr "" + +#: ../../content/applications/productivity/discuss/advanced/ice_servers.rst:26 +msgid "For :guilabel:`What do you plan to build with Twilio?`, select :guilabel:`Other`." +msgstr "" + +#: ../../content/applications/productivity/discuss/advanced/ice_servers.rst:27 +msgid "For :guilabel:`How do you want to build with Twilio?`, select :guilabel:`With no code at all`." +msgstr "" + +#: ../../content/applications/productivity/discuss/advanced/ice_servers.rst:28 +msgid "For :guilabel:`What is your goal today?`, select :guilabel:`3rd party integrations`." +msgstr "" + +#: ../../content/applications/productivity/discuss/advanced/ice_servers.rst:34 +msgid "If necessary, change the billing country. Finally, click :guilabel:`Get Started with Twilio`." +msgstr "" + +#: ../../content/applications/productivity/discuss/advanced/ice_servers.rst:37 +msgid "Locate the Twilio Account SID and Auth Token" +msgstr "" + +#: ../../content/applications/productivity/discuss/advanced/ice_servers.rst:39 +msgid "To locate the Account SID and Auth Token, go to the Twilio account dashboard. Then, click :guilabel:`Develop` on the sidebar. In the :guilabel:`Account Info` section, locate the :guilabel:`Account SID` and the :guilabel:`Auth Token`. Both of these are needed to connect Twilio to Odoo." +msgstr "" + +#: ../../content/applications/productivity/discuss/advanced/ice_servers.rst:49 +msgid "Connect Twilio to Odoo" +msgstr "" + +#: ../../content/applications/productivity/discuss/advanced/ice_servers.rst:51 +msgid "Open the Odoo database and go to :menuselection:`Settings --> General Settings --> Discuss`. Check the box next to :guilabel:`Use Twilio ICE servers` and enter the Twilio account's :guilabel:`Account SID` and :guilabel:`Auth Token`. Finally, click :guilabel:`Save` to apply these changes." +msgstr "" + +#: ../../content/applications/productivity/discuss/advanced/ice_servers.rst:61 +msgid "Define a list of custom ICE servers" +msgstr "" + +#: ../../content/applications/productivity/discuss/advanced/ice_servers.rst:63 +msgid "This step is not required for the Twilio configuration. However, if Twilio is not configured or is not working at any given moment, Odoo will fall back on the custom ICE servers list. The user must define the list of custom ICE servers." +msgstr "" + +#: ../../content/applications/productivity/discuss/advanced/ice_servers.rst:67 +msgid "In :menuselection:`Settings --> General Settings --> Discuss`, click the :guilabel:`ICE Servers` button under :guilabel:`Custom ICE server list`." +msgstr "" + +#: ../../content/applications/productivity/discuss/advanced/ice_servers.rst:74 +msgid "Odoo will redirect to the :guilabel:`ICE servers` page. Here you can define your own list of ICE servers." +msgstr "" + #: ../../content/applications/productivity/discuss/overview.rst:5 msgid "Overview" msgstr "" @@ -1029,12 +1109,12 @@ msgid "Only a limited amount of *Company Insights* (*Lead Enrichment*) requests msgstr "" #: ../../content/applications/productivity/mail_plugins/gmail.rst:83 -#: ../../content/applications/productivity/mail_plugins/outlook.rst:78 +#: ../../content/applications/productivity/mail_plugins/outlook.rst:93 msgid "Enter your Odoo database URL and click on *Login*." msgstr "" #: ../../content/applications/productivity/mail_plugins/gmail.rst:89 -#: ../../content/applications/productivity/mail_plugins/outlook.rst:90 +#: ../../content/applications/productivity/mail_plugins/outlook.rst:105 msgid "If you aren't logged into your database, enter your credentials." msgstr "" @@ -1086,31 +1166,47 @@ msgstr "" msgid "Open any email in your Outlook mailbox, click on the *More actions* button, and select *Odoo for Outlook*." msgstr "" +#: ../../content/applications/productivity/mail_plugins/outlook.rst:79 +msgid "If, after a short while, the panel is still empty, it is possible that your browser cookie settings prevented it from loading. Note that these settings also change if you are in \"Incognito\" mode on your browser." +msgstr "" + #: ../../content/applications/productivity/mail_plugins/outlook.rst:84 +msgid "To fix this issue, configure your browser to always allow cookies on Odoo's plugin page." +msgstr "" + +#: ../../content/applications/productivity/mail_plugins/outlook.rst:86 +msgid "For Google Chrome, you can do so by following the guide at: `https://support.google.com/chrome/answer/95647 `_ and adding `download.odoo.com` to the list of `Sites that can always use cookies`." +msgstr "" + +#: ../../content/applications/productivity/mail_plugins/outlook.rst:90 +msgid "Once done, the Outlook panel needs to be opened again." +msgstr "" + +#: ../../content/applications/productivity/mail_plugins/outlook.rst:99 msgid "Click on *Allow* to open the pop-up window." msgstr "" -#: ../../content/applications/productivity/mail_plugins/outlook.rst:92 +#: ../../content/applications/productivity/mail_plugins/outlook.rst:107 msgid "Click on *Allow* to let the Outlook Plugin connect to your database." msgstr "" -#: ../../content/applications/productivity/mail_plugins/outlook.rst:101 +#: ../../content/applications/productivity/mail_plugins/outlook.rst:116 msgid "Add a shortcut to the plugin" msgstr "" -#: ../../content/applications/productivity/mail_plugins/outlook.rst:103 +#: ../../content/applications/productivity/mail_plugins/outlook.rst:118 msgid "By default, the Outlook Plugin can be opened from the *More actions* menu. However, to save time, it's possible to add it next to the other default actions." msgstr "" -#: ../../content/applications/productivity/mail_plugins/outlook.rst:106 +#: ../../content/applications/productivity/mail_plugins/outlook.rst:121 msgid "In your Outlook mailbox, click on *Settings*, then on *View all Outlook settings*." msgstr "" -#: ../../content/applications/productivity/mail_plugins/outlook.rst:112 +#: ../../content/applications/productivity/mail_plugins/outlook.rst:127 msgid "Select *Customize actions* under *Mail*, click on *Odoo for Outlook*, and then *Save*." msgstr "" -#: ../../content/applications/productivity/mail_plugins/outlook.rst:118 +#: ../../content/applications/productivity/mail_plugins/outlook.rst:133 msgid "Open any email; the shortcut should be displayed." msgstr "" diff --git a/locale/sources/sales.pot b/locale/sources/sales.pot index 5dc70e76a..eeac65383 100644 --- a/locale/sources/sales.pot +++ b/locale/sources/sales.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: Odoo 15.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-04-08 13:26+0000\n" +"POT-Creation-Date: 2022-07-22 09:36+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -50,7 +50,6 @@ msgid "You can activate this mode from the CRM Settings. It applies to all your msgstr "" #: ../../content/applications/sales/crm/acquire_leads/convert.rst:14 -#: ../../content/applications/sales/crm/acquire_leads/generate_from_website.rst:41 #: ../../content/applications/sales/crm/acquire_leads/lead_mining.rst:8 #: ../../content/applications/sales/crm/optimize/gamification.rst:11 #: ../../content/applications/sales/crm/optimize/partner_autocomplete.rst:9 @@ -59,8 +58,9 @@ msgstr "" #: ../../content/applications/sales/crm/track_leads/prospect_visits.rst:12 #: ../../content/applications/sales/point_of_sale/advanced_pricing_features/loyalty.rst:9 #: ../../content/applications/sales/point_of_sale/overview/getting_started.rst:14 +#: ../../content/applications/sales/point_of_sale/payment/adyen.rst:9 #: ../../content/applications/sales/point_of_sale/payment/ingenico.rst:12 -#: ../../content/applications/sales/point_of_sale/payment/six.rst:15 +#: ../../content/applications/sales/point_of_sale/payment/six.rst:16 #: ../../content/applications/sales/point_of_sale/payment/vantiv.rst:13 #: ../../content/applications/sales/point_of_sale/payment/worldline.rst:12 #: ../../content/applications/sales/point_of_sale/restaurant/restaurant.rst:14 @@ -125,81 +125,104 @@ msgstr "" msgid "It is also possible to merge more than 2 opportunities or leads." msgstr "" -#: ../../content/applications/sales/crm/acquire_leads/generate_from_email.rst:3 -msgid "Generate leads/opportunities from emails" +#: ../../content/applications/sales/crm/acquire_leads/generate_leads.rst:3 +msgid "Generate leads/opportunities" msgstr "" -#: ../../content/applications/sales/crm/acquire_leads/generate_from_email.rst:5 -msgid "Automating the lead/opportunity generation will considerably improve your efficiency. By default, any email sent to *sales@database\\_domain.ext* will create an opportunity in the pipeline of the default sales channel." +#: ../../content/applications/sales/crm/acquire_leads/generate_leads.rst:5 +msgid "Two key ways to generate new leads or opportunities for your business are through email aliases and website contact forms. Odoo automatically creates leads in your CRM whenever someone sends a message to a Sales Team email alias or fills out a contact form on your website." msgstr "" -#: ../../content/applications/sales/crm/acquire_leads/generate_from_email.rst:11 +#: ../../content/applications/sales/crm/acquire_leads/generate_leads.rst:10 msgid "Configure email aliases" msgstr "" -#: ../../content/applications/sales/crm/acquire_leads/generate_from_email.rst:13 -msgid "Each sales teams can have its own email alias, to generate leads/opportunities automatically assigned to it. It is useful if you manage several sales teams with specific business processes. You will find the configuration of sales teams under :menuselection:`Configuration --> Sales Teams`." +#: ../../content/applications/sales/crm/acquire_leads/generate_leads.rst:12 +msgid "Each Sales Team can use its own unique email alias to generate leads/opportunities. Any email sent to a Sales Team's email alias will automatically create a lead (if leads are activated in your CRM settings) or an opportunity in the pipeline for that particular team. Configure custom email aliases on the configuration page for each Sales Team by navigating to :menuselection:`CRM --> Configuration --> Sales Teams`." msgstr "" -#: ../../content/applications/sales/crm/acquire_leads/generate_from_website.rst:3 -msgid "Generate leads/opportunities from your website contact page" +#: ../../content/applications/sales/crm/acquire_leads/generate_leads.rst:23 +msgid "Use Contact Forms on your website" msgstr "" -#: ../../content/applications/sales/crm/acquire_leads/generate_from_website.rst:5 -msgid "Automating the lead/opportunity generation will considerably improve your efficiency. Any visitor using the contact form on your website will create a lead/opportunity in the pipeline." +#: ../../content/applications/sales/crm/acquire_leads/generate_leads.rst:25 +msgid "By default, your website's *Contact Us* page displays Odoo's ready-to-use Contact Form. Whenever someone submits this form, a lead or an opportunity is generated in your database." msgstr "" -#: ../../content/applications/sales/crm/acquire_leads/generate_from_website.rst:10 -msgid "Use the contact us on your website" +#: ../../content/applications/sales/crm/acquire_leads/generate_leads.rst:32 +msgid "The Contact Form can be activated or deactivated at any time by going to :menuselection:`Website --> Go to Website --> Customize --> Contact Form`." msgstr "" -#: ../../content/applications/sales/crm/acquire_leads/generate_from_website.rst:12 -msgid "You should first go to your website app." +#: ../../content/applications/sales/crm/acquire_leads/generate_leads.rst:39 +msgid "When the Form is deactivated, the *Contact Us* page simply displays a button to email your company directly. Any email sent this way will generate a lead/opportunity." msgstr "" -#: ../../content/applications/sales/crm/acquire_leads/generate_from_website.rst:14 -msgid "|image0|\\ |image1|" +#: ../../content/applications/sales/crm/acquire_leads/generate_leads.rst:46 +msgid "Choose which Sales Team or salesperson is automatically assigned to the leads/opportunities created from the Contact Form by going to :menuselection:`Website --> Configuration --> Settings --> Communication`." msgstr "" -#: ../../content/applications/sales/crm/acquire_leads/generate_from_website.rst:16 -msgid "With the CRM app installed, you benefit from a ready-to-use contact form on your Odoo website that will generate leads/opportunities automatically." +#: ../../content/applications/sales/crm/acquire_leads/generate_leads.rst:55 +msgid "Customize Contact Forms" msgstr "" -#: ../../content/applications/sales/crm/acquire_leads/generate_from_website.rst:23 -msgid "To change to a specific sales channel, go to :menuselection:`Website --> Configuration --> Settings` under *Communication* you will find the Contact Form info and where to change the *Sales Channel* or *Salesperson*." +#: ../../content/applications/sales/crm/acquire_leads/generate_leads.rst:57 +msgid "Contact Forms can be customized for the specific information your team needs, using the free *Form Builder* module." msgstr "" -#: ../../content/applications/sales/crm/acquire_leads/generate_from_website.rst:32 -#: ../../content/applications/sales/crm/acquire_leads/generate_from_website.rst:50 -msgid "Create a custom contact form" +#: ../../content/applications/sales/crm/acquire_leads/generate_leads.rst:60 +msgid "The *Form Builder* module is installed automatically when a Form element is added to a web page via the Website Builder. It can also be installed manually from the :guilabel:`Apps` page." msgstr "" -#: ../../content/applications/sales/crm/acquire_leads/generate_from_website.rst:34 -msgid "You may want to know more from your visitor when they use the contact form to you will need to build a custom contact form on your website. These contact forms can generate multiple types of records in the system (emails, leads/opportunities, project tasks, helpdesk tickets, etc.)" +#: ../../content/applications/sales/crm/acquire_leads/generate_leads.rst:68 +msgid "Forms can be created from scratch to serve a wide variety of purposes. However, Odoo's default *Contact Us* page is designed to fit most users' needs. Start with the default form and modify from there." msgstr "" -#: ../../content/applications/sales/crm/acquire_leads/generate_from_website.rst:43 -msgid "You will need to install the free *Form Builder* module, only available in Odoo Enterprise." +#: ../../content/applications/sales/crm/acquire_leads/generate_leads.rst:73 +msgid "Edit Contact Form fields" msgstr "" -#: ../../content/applications/sales/crm/acquire_leads/generate_from_website.rst:52 -msgid "First, go to the page where you want to put your contact form. In edit mode, drag the form builder onto the page, and you will be able to add all the fields you wish." +#: ../../content/applications/sales/crm/acquire_leads/generate_leads.rst:75 +msgid "In Edit mode on your website, click on any field to start editing it. The following information can be edited for each field on the Contact Form:" msgstr "" -#: ../../content/applications/sales/crm/acquire_leads/generate_from_website.rst:59 -msgid "By default, any new contact form will send an email. You can switch to lead/opportunity generation in *Change Form Parameters*." +#: ../../content/applications/sales/crm/acquire_leads/generate_leads.rst:78 +msgid ":guilabel:`Type`: Choose a custom field option or an existing field. Examples include phone, file upload, language, etc." msgstr "" -#: ../../content/applications/sales/crm/acquire_leads/generate_from_website.rst:63 -msgid "If the same visitor uses the contact form twice, the second entry will be added to the first lead/opportunity in the chatter." +#: ../../content/applications/sales/crm/acquire_leads/generate_leads.rst:80 +msgid ":guilabel:`Input Type`: Determine the type of entry customers should input. Available options are text,email, telephone, and URL." msgstr "" -#: ../../content/applications/sales/crm/acquire_leads/generate_from_website.rst:67 -msgid "Generate leads instead of opportunities" +#: ../../content/applications/sales/crm/acquire_leads/generate_leads.rst:82 +msgid ":guilabel:`Input Placeholder`: Type in an example to guide users how to input information where formatting is important, such as a phone number or email address." msgstr "" -#: ../../content/applications/sales/crm/acquire_leads/generate_from_website.rst:69 -msgid "When using a contact form, you should use a qualification step before assigning the form to the right sales people. To do so, activate *Leads* in CRM settings and refer to :doc:`convert`." +#: ../../content/applications/sales/crm/acquire_leads/generate_leads.rst:84 +msgid ":guilabel:`Label Name`: Type in the display name to show users what information is needed from them." +msgstr "" + +#: ../../content/applications/sales/crm/acquire_leads/generate_leads.rst:86 +msgid ":guilabel:`Label Position`: Choose the way the label is aligned with the rest of the form. The label can be hidden, above the field, to the far left of the field, or right adjusted and closer to the field." +msgstr "" + +#: ../../content/applications/sales/crm/acquire_leads/generate_leads.rst:89 +msgid ":guilabel:`Required`: Toggle this option for information that you absolutely need entered." +msgstr "" + +#: ../../content/applications/sales/crm/acquire_leads/generate_leads.rst:90 +msgid ":guilabel:`Hidden`: Toggle this option to hide the field without deleting it." +msgstr "" + +#: ../../content/applications/sales/crm/acquire_leads/generate_leads.rst:91 +msgid ":guilabel:`Shown on Mobile`: Toggle this option to show the field to users on mobile devices." +msgstr "" + +#: ../../content/applications/sales/crm/acquire_leads/generate_leads.rst:97 +msgid "By default, when a Form is submitted, it sends you an email with the customer's inputted information. To have it automatically generate a lead/opportunity instead, edit the Form and select :guilabel:`Create an Opportunity` as the Action." +msgstr "" + +#: ../../content/applications/sales/crm/acquire_leads/generate_leads.rst:102 +msgid "If leads are activated in your CRM settings, selecting :guilabel:`Create an Opportunity` generates a lead instead. To learn more about activating leads in the CRM settings, head over to :doc:`convert`." msgstr "" #: ../../content/applications/sales/crm/acquire_leads/lead_mining.rst:3 @@ -227,7 +250,7 @@ msgid "From there, click on the **Generate Leads** button, a window where you wi msgstr "" #: ../../content/applications/sales/crm/acquire_leads/lead_mining.rst:34 -msgid "When choosing to target Companied and their contacts you can choose the contacts you are getting based on Role or Seniority. When getting contact information make sure to be aware of the latest EU regulation, get more information about General Data Protection Regulation on `Odoo GDPR `__," +msgid "When choosing to target Companies and their contacts you can choose the contacts you are getting based on Role or Seniority. When getting contact information make sure to be aware of the latest EU regulation, get more information about General Data Protection Regulation on `Odoo GDPR `__," msgstr "" #: ../../content/applications/sales/crm/acquire_leads/lead_mining.rst:39 @@ -248,7 +271,7 @@ msgid "Pricing" msgstr "" #: ../../content/applications/sales/crm/acquire_leads/lead_mining.rst:51 -msgid "This is an In-App Purchase feature, each generated lead will cost you one credit. If you choose to get contact information each contact will also cost us one additional credit. Here is the pricing for this `feature `__, To buy credits you can either go to :menuselection:`CRM --> Configuration --> Settings --> Buy Credits`; or go to :menuselection:`Settings --> In-App Purchases --> View my Services`." +msgid "This is an In-App Purchase feature, each generated lead will cost you one credit. If you choose to get contact information each contact will also cost you one additional credit. Here is the pricing for this `feature `__, To buy credits you can either go to :menuselection:`CRM --> Configuration --> Settings --> Buy Credits`; or go to :menuselection:`Settings --> Contacts --> Odoo IAP --> View my Services`." msgstr "" #: ../../content/applications/sales/crm/acquire_leads/lead_mining.rst:65 @@ -628,51 +651,59 @@ msgid ":doc:`../performance/win_loss`" msgstr "" #: ../../content/applications/sales/crm/pipeline/multi_sales_team.rst:3 -msgid "Manage multiple sales teams" +msgid "Multiple sales teams" msgstr "" #: ../../content/applications/sales/crm/pipeline/multi_sales_team.rst:5 -msgid "In Odoo, you can manage several sales teams, departments or channels with specific sales processes. To do so, we use the concept of *Sales Channel*." +msgid "Odoo lets you manage several sales teams, departments, or channels, each with their own unique sales processes, using *Sales Teams*." msgstr "" #: ../../content/applications/sales/crm/pipeline/multi_sales_team.rst:10 -msgid "Create a new sales channel" +msgid "Create a new Sales Team" msgstr "" #: ../../content/applications/sales/crm/pipeline/multi_sales_team.rst:12 -msgid "To create a new *Sales Channel*, go to :menuselection:`Configuration --> Sales Channels`." +msgid "To create a new Sales Team, go to :menuselection:`CRM --> Configuration --> Sales Teams` then click **Create**." msgstr "" -#: ../../content/applications/sales/crm/pipeline/multi_sales_team.rst:14 -msgid "There you can set an email alias to it. Every message sent to that email address will create a lead/opportunity." +#: ../../content/applications/sales/crm/pipeline/multi_sales_team.rst:15 +msgid "On the creation page, set an *Email Alias* to automatically generate a lead/opportunity for this Sales Team every time a message is sent to that unique email address. You can also choose whether to accept emails from *Everyone*, *Authenticated Partners*, or *Followers Only*." msgstr "" -#: ../../content/applications/sales/crm/pipeline/multi_sales_team.rst:21 -msgid "Add members to your sales channel" -msgstr "" - -#: ../../content/applications/sales/crm/pipeline/multi_sales_team.rst:23 -msgid "You can add members to any channel; that way those members will see the pipeline structure of the sales channel when opening it. Any lead/opportunity assigned to them will link to the sales channel. Therefore, you can only be a member of one channel." +#: ../../content/applications/sales/crm/pipeline/multi_sales_team.rst:19 +msgid "Set a *Domain* to assign leads/opportunities to this Sales Team based on specific filters, such as country, language, or campaign. Set an *Invoicing Target* if this team has specific monthly revenue goals." msgstr "" #: ../../content/applications/sales/crm/pipeline/multi_sales_team.rst:28 -msgid "This will ease the process review of the team manager." +msgid "Add members to a Sales Team" msgstr "" -#: ../../content/applications/sales/crm/pipeline/multi_sales_team.rst:33 -msgid "If you now filter on this specific channel in your pipeline, you will find all of its opportunities." +#: ../../content/applications/sales/crm/pipeline/multi_sales_team.rst:30 +msgid "To add team members, click **Add** under the Assignment tab when editing the Sales Team's configuration page. Select a salesperson from the dropdown menu or create new salesperson. Set a maximum number of leads that can be assigned to this salesperson in a 30-day period to ensure that they do not overwork." msgstr "" -#: ../../content/applications/sales/crm/pipeline/multi_sales_team.rst:40 -msgid "Sales channel dashboard" +#: ../../content/applications/sales/crm/pipeline/multi_sales_team.rst:39 +msgid "One person can be added as a team member or Team Leader to multiple Sales Teams, allowing them to access all of the pipelines that they need to." msgstr "" #: ../../content/applications/sales/crm/pipeline/multi_sales_team.rst:42 -msgid "To see the operations and results of any sales channel at a glance, the sales manager also has access to the *Sales Channel Dashboard* under *Reporting*." +msgid "Sales Team dashboard" msgstr "" -#: ../../content/applications/sales/crm/pipeline/multi_sales_team.rst:46 -msgid "It is shared with the whole ecosystem so every revenue stream is included in it: Sales, eCommerce, PoS, etc." +#: ../../content/applications/sales/crm/pipeline/multi_sales_team.rst:44 +msgid "To view the Sales Team dashboard, go to :menuselection:`CRM --> Configuration --> Sales Teams`. Any teams you are a part of will appear as dashboard tiles." +msgstr "" + +#: ../../content/applications/sales/crm/pipeline/multi_sales_team.rst:47 +msgid "Each tile gives an overview of the Sales Team's open opportunities, quotations, sales orders, and expected revenue, as well as a bar graph of new opportunities per week and an invoicing progress bar." +msgstr "" + +#: ../../content/applications/sales/crm/pipeline/multi_sales_team.rst:55 +msgid "Click on the three dots in the corner of a tile to open a navigational menu that lets you quickly view documents or reports, create new quotations or opportunities, pick a color for this team, or access its configuration page." +msgstr "" + +#: ../../content/applications/sales/crm/pipeline/multi_sales_team.rst:63 +msgid "Click on the **Pipeline** button to go directly to that team's CRM pipeline." msgstr "" #: ../../content/applications/sales/crm/track_leads.rst:5 @@ -684,67 +715,63 @@ msgid "Assign leads based on scoring" msgstr "" #: ../../content/applications/sales/crm/track_leads/lead_scoring.rst:5 -msgid "With *Leads Scoring* you can automatically rank your leads based on selected criteria." +msgid "*Lead Scoring* lets you rank and prioritize leads based on selected criteria. A higher score indicates that a lead is more likely to bring value to your company." msgstr "" #: ../../content/applications/sales/crm/track_leads/lead_scoring.rst:8 -msgid "For example you could score customers from your country higher or the ones that visited specific pages on your website." +msgid "For example, if customers from Canada tend to be more likely to purchase your products, you can assign them a higher score than customers from other countries." msgstr "" #: ../../content/applications/sales/crm/track_leads/lead_scoring.rst:14 -msgid "To use scoring, install the free module *Lead Scoring* under your *Apps* page (only available in Odoo Enterprise)." +msgid "To use scoring, go to :menuselection:`Apps`, remove the :guilabel:`Apps` filter, search for :guilabel:`Lead Scoring` and then install the module." msgstr "" -#: ../../content/applications/sales/crm/track_leads/lead_scoring.rst:21 +#: ../../content/applications/sales/crm/track_leads/lead_scoring.rst:22 msgid "Create scoring rules" msgstr "" -#: ../../content/applications/sales/crm/track_leads/lead_scoring.rst:23 -msgid "You now have a new tab in your *CRM* app called *Leads Management* where you can manage your scoring rules." +#: ../../content/applications/sales/crm/track_leads/lead_scoring.rst:24 +msgid "To manage scoring rules, go to :menuselection:`CRM --> Leads --> Scoring Rules`." msgstr "" #: ../../content/applications/sales/crm/track_leads/lead_scoring.rst:26 -msgid "Here's an example for a Canadian lead, you can modify for whatever criteria you wish to score your leads on. You can add as many criteria as you wish." +msgid "Customize your rules to fit the needs of your business, and add as many criteria as you want." msgstr "" -#: ../../content/applications/sales/crm/track_leads/lead_scoring.rst:33 -msgid "Every hour every lead without a score will be automatically scanned and assigned their right score according to your scoring rules." +#: ../../content/applications/sales/crm/track_leads/lead_scoring.rst:32 +msgid "Every hour, Odoo automatically assigns scores to new leads according to your configured rules." msgstr "" -#: ../../content/applications/sales/crm/track_leads/lead_scoring.rst:40 +#: ../../content/applications/sales/crm/track_leads/lead_scoring.rst:39 msgid "Assign leads" msgstr "" -#: ../../content/applications/sales/crm/track_leads/lead_scoring.rst:42 -msgid "Once the scores computed, leads can be assigned to specific teams using the same domain mechanism. To do so go to :menuselection:`CRM --> Leads Management --> Team Assignation` and apply a specific domain on each team. This domain can include scores." +#: ../../content/applications/sales/crm/track_leads/lead_scoring.rst:41 +msgid "Odoo can also assign leads to specific teams based on configured rules. To configure assignment rules, go to the individual Sales Team's configuration page via :menuselection:`CRM --> Leads --> Team Assignment` or :menuselection:`CRM --> Configuration --> Sales Teams`, and apply a specific Domain to each team. The Domain can include lead scores." msgstr "" -#: ../../content/applications/sales/crm/track_leads/lead_scoring.rst:49 -msgid "Further on, you can assign to a specific vendor in the team with an even more refined domain." +#: ../../content/applications/sales/crm/track_leads/lead_scoring.rst:50 +msgid "Assign leads to specific salespeople using further refined Domains at :menuselection:`CRM --> Leads --> Leads Assignment`." msgstr "" -#: ../../content/applications/sales/crm/track_leads/lead_scoring.rst:52 -msgid "To do so go to :menuselection:`CRM --> Leads Management --> Leads Assignation`." +#: ../../content/applications/sales/crm/track_leads/lead_scoring.rst:57 +msgid "Odoo automatically assigns new leads to teams/salespeople once per day." msgstr "" -#: ../../content/applications/sales/crm/track_leads/lead_scoring.rst:58 -msgid "The team & leads assignation will assign the unassigned leads once a day." +#: ../../content/applications/sales/crm/track_leads/lead_scoring.rst:60 +msgid "Evaluate and use the unassigned leads" msgstr "" #: ../../content/applications/sales/crm/track_leads/lead_scoring.rst:62 -msgid "Evaluate & use the unassigned leads" +msgid "Not all leads will fall into your set Domains and get assigned automatically by Odoo." msgstr "" #: ../../content/applications/sales/crm/track_leads/lead_scoring.rst:64 -msgid "Once your scoring rules are in place you will most likely still have some unassigned leads. Some of them could still lead to an opportunity so it is useful to do something with them." +msgid "To view your unassigned leads, go to :menuselection:`CRM --> Leads --> Leads` and select the Unassigned filter." msgstr "" -#: ../../content/applications/sales/crm/track_leads/lead_scoring.rst:68 -msgid "In your leads page you can place a filter to find your unassigned leads." -msgstr "" - -#: ../../content/applications/sales/crm/track_leads/lead_scoring.rst:73 -msgid "Why not using :menuselection:`Email Marketing` or :menuselection:`Marketing Automation` apps to send a mass email to them? You can also easily find such unassigned leads from there." +#: ../../content/applications/sales/crm/track_leads/lead_scoring.rst:72 +msgid "You can also find unassigned leads and create re-engagement campaigns using the :guilabel:`Email Marketing` or :guilabel:`Marketing Automation` apps." msgstr "" #: ../../content/applications/sales/crm/track_leads/prospect_visits.rst:3 @@ -1266,26 +1293,26 @@ msgid "Click on :menuselection:`Connection is not secure --> Certificate is not msgstr "" #: ../../content/applications/sales/point_of_sale/overview/epos_ssc.rst:71 -msgid "Go to the *Details* tab and click on **Copy to file**. Select X.509 in base 64 and save it." +msgid "Go to the :guilabel:`Details` tab and click on :guilabel:`Export` Select X.509 in base 64 and save it." msgstr "" -#: ../../content/applications/sales/point_of_sale/overview/epos_ssc.rst:75 +#: ../../content/applications/sales/point_of_sale/overview/epos_ssc.rst:74 msgid "Import the Self-signed certificate to Windows (Using Chrome)" msgstr "" -#: ../../content/applications/sales/point_of_sale/overview/epos_ssc.rst:77 +#: ../../content/applications/sales/point_of_sale/overview/epos_ssc.rst:76 msgid "In your Chrome browser, go to :menuselection:`Settings --> Privacy and security --> Security --> Manage certificates`" msgstr "" -#: ../../content/applications/sales/point_of_sale/overview/epos_ssc.rst:80 -msgid "Go to the *Trusted Root Certification Authorities* tab and click on **Import** and select your previous file. Accept all warnings and restart your browser." +#: ../../content/applications/sales/point_of_sale/overview/epos_ssc.rst:79 +msgid "Go to the :guilabel:`Authorities` tab and click on :guilabel:`Import` and select your previous file. Accept all warnings and restart your browser." msgstr "" -#: ../../content/applications/sales/point_of_sale/overview/epos_ssc.rst:84 +#: ../../content/applications/sales/point_of_sale/overview/epos_ssc.rst:83 msgid "Import the Self-signed certificate to your Android device" msgstr "" -#: ../../content/applications/sales/point_of_sale/overview/epos_ssc.rst:86 +#: ../../content/applications/sales/point_of_sale/overview/epos_ssc.rst:85 msgid "On your Android device, open the settings and search for *certificate*. Then, click on **Certificate AC** (Install from device storage), and select the certificate." msgstr "" @@ -1306,7 +1333,7 @@ msgid "Make products available in the PoS" msgstr "" #: ../../content/applications/sales/point_of_sale/overview/getting_started.rst:19 -msgid "To make products available for sale, go to :menuselection:`Point of Sale --> Products --> Products` and open a product. In the *Sales* tab, enable *Available in Point of Sale*." +msgid "To make products available for sale, go to :menuselection:`Point of Sale --> Products --> Products` and open a product. In the *Point of Sale* tab, enable *Available in Point of Sale*." msgstr "" #: ../../content/applications/sales/point_of_sale/overview/getting_started.rst:28 @@ -1473,8 +1500,104 @@ msgstr "" msgid "Payment Terminals" msgstr "" +#: ../../content/applications/sales/point_of_sale/payment/adyen.rst:3 +msgid "Adyen" +msgstr "" + +#: ../../content/applications/sales/point_of_sale/payment/adyen.rst:5 +msgid "Connecting an **Adyen payment terminal** allows you to offer a fluid payment flow to your customers and ease the work of your cashiers." +msgstr "" + +#: ../../content/applications/sales/point_of_sale/payment/adyen.rst:11 +msgid "Start by creating your Adyen account on `Adyen's website `_. Then, board your terminal following the steps described on your terminal's screen." +msgstr "" + +#: ../../content/applications/sales/point_of_sale/payment/adyen.rst:15 +msgid "`Adyen Docs - Payment terminal quickstart guides `_." +msgstr "" + +#: ../../content/applications/sales/point_of_sale/payment/adyen.rst:19 +#: ../../content/applications/sales/point_of_sale/payment/ingenico.rst:36 +#: ../../content/applications/sales/point_of_sale/payment/worldline.rst:65 +msgid "Configure the payment method" +msgstr "" + +#: ../../content/applications/sales/point_of_sale/payment/adyen.rst:21 +msgid "First, go to :menuselection:`Point of Sale --> Configuration --> Settings --> Payment Terminals`, and enable :guilabel:`Adyen`. Then, go to :menuselection:`Configuration --> Payment Methods` and create a new payment method. Select :guilabel:`Adyen` in the :guilabel:`Use a Payment Terminal` field." +msgstr "" + +#: ../../content/applications/sales/point_of_sale/payment/adyen.rst:27 +msgid "The selected journal **must** be a bank journal for the :guilabel:`Use a payment terminal` field to appear." +msgstr "" + +#: ../../content/applications/sales/point_of_sale/payment/adyen.rst:30 +msgid "Finally, fill the mandatory fields with an :guilabel:`Adyen API key`, and an :guilabel:`Adyen Terminal Identifier`." +msgstr "" + +#: ../../content/applications/sales/point_of_sale/payment/adyen.rst:34 +msgid "Generate an Adyen API key" +msgstr "" + +#: ../../content/applications/sales/point_of_sale/payment/adyen.rst:36 +msgid "The **Adyen API key** is a key used to authenticate your requests. To generate an API key, go to your **Adyen account**." +msgstr "" + +#: ../../content/applications/sales/point_of_sale/payment/adyen.rst:39 +msgid "Then, go to :menuselection:`Developers --> API credentials`. Create a new credential or click on an existing one." +msgstr "" + +#: ../../content/applications/sales/point_of_sale/payment/adyen.rst:42 +msgid "Click on :guilabel:`Generate an API key` and copy-paste that key onto the Odoo mandatory field." +msgstr "" + +#: ../../content/applications/sales/point_of_sale/payment/adyen.rst:45 +msgid "`Adyen Docs - API credentials `_." +msgstr "" + +#: ../../content/applications/sales/point_of_sale/payment/adyen.rst:49 +msgid "Locate the Adyen terminal identifier" +msgstr "" + +#: ../../content/applications/sales/point_of_sale/payment/adyen.rst:51 +msgid "The **Adyen Terminal Identifier** is your terminal's serial number, which is used to identify the hardware." +msgstr "" + +#: ../../content/applications/sales/point_of_sale/payment/adyen.rst:54 +msgid "To find this number, go to your **Adyen account**. Then, go to :menuselection:`Point of Sale --> Terminals`, select the terminal to link, and copy-paste its serial number onto the Odoo mandatory field." +msgstr "" + +#: ../../content/applications/sales/point_of_sale/payment/adyen.rst:59 +msgid "Add a new payment method" +msgstr "" + +#: ../../content/applications/sales/point_of_sale/payment/adyen.rst:61 +msgid "To add a new **payment method** to a point of sale, go to :menuselection:`Point of Sale --> Configuration --> Point of Sale`. Then, select the POS and go to :menuselection:`Payments --> Payment Methods`, and add your new method for Adyen." +msgstr "" + +#: ../../content/applications/sales/point_of_sale/payment/adyen.rst:66 +#: ../../content/applications/sales/point_of_sale/payment/ingenico.rst:53 +#: ../../content/applications/sales/point_of_sale/payment/worldline.rst:88 +msgid "Pay with a payment terminal" +msgstr "" + +#: ../../content/applications/sales/point_of_sale/payment/adyen.rst:68 +msgid "When processing a payment, select :guilabel:`Adyen` as the payment method. Check the amount and click on :guilabel:`Send`. Once the payment is successful, the status changes to :guilabel:`Payment Successful`." +msgstr "" + +#: ../../content/applications/sales/point_of_sale/payment/adyen.rst:0 +msgid "In case of connexion issues between Odoo and the payment terminal, force the payment by clicking on :guilabel:`Force Done`, which allows you to validate the order." +msgstr "" + +#: ../../content/applications/sales/point_of_sale/payment/adyen.rst:0 +msgid "This option is only available after receiving an error message informing you that the connection failed." +msgstr "" + +#: ../../content/applications/sales/point_of_sale/payment/adyen.rst:77 +msgid "To cancel the payment request, click on :guilabel:`cancel`." +msgstr "" + #: ../../content/applications/sales/point_of_sale/payment/ingenico.rst:3 -msgid "Connect an Ingenico Payment Terminal to your PoS" +msgid "Ingenico" msgstr "" #: ../../content/applications/sales/point_of_sale/payment/ingenico.rst:5 @@ -1507,11 +1630,6 @@ msgstr "" msgid "Now, click on connection change and TCP/IP. Type the IP of your *IoT Box* (you can find it on the form view of your IoT Box). Then, enter 9000 as port. The terminal will restart. Once it is done, go on your *IoT Box* form in Odoo and verify that the terminal has been found." msgstr "" -#: ../../content/applications/sales/point_of_sale/payment/ingenico.rst:36 -#: ../../content/applications/sales/point_of_sale/payment/worldline.rst:65 -msgid "Configure the payment method" -msgstr "" - #: ../../content/applications/sales/point_of_sale/payment/ingenico.rst:38 msgid "First, go in the general settings of the POS app, and activate the Ingenico setting." msgstr "" @@ -1520,11 +1638,6 @@ msgstr "" msgid "Go back in :menuselection:`Point of Sale --> Configuration --> Point of Sale`, go in the payments section and access your payment methods. Create a new payment method for Ingenico, select the payment terminal option Ingenico, and select your payment terminal device." msgstr "" -#: ../../content/applications/sales/point_of_sale/payment/ingenico.rst:53 -#: ../../content/applications/sales/point_of_sale/payment/worldline.rst:88 -msgid "Pay with a payment terminal" -msgstr "" - #: ../../content/applications/sales/point_of_sale/payment/ingenico.rst:55 msgid "In your *PoS interface*, when processing a payment, select a *Payment Method* using a payment terminal. Check that the amount in the tendered column is the one that has to be sent to the payment terminal and click on *Send*. When the payment is successful, the status will change to *Payment Successful*." msgstr "" @@ -1546,7 +1659,7 @@ msgid "Once your payment is processed, on the payment record, you’ll find the msgstr "" #: ../../content/applications/sales/point_of_sale/payment/six.rst:3 -msgid "Connect a SIX Payment Terminal to your PoS" +msgid "SIX" msgstr "" #: ../../content/applications/sales/point_of_sale/payment/six.rst:5 @@ -1554,45 +1667,45 @@ msgid "Connecting a SIX payment terminal allows you to offer a fluid payment flo msgstr "" #: ../../content/applications/sales/point_of_sale/payment/six.rst:9 +msgid "Starting in July 2022, it will **not** be possible anymore to connect and use a Six payment terminal in PoS." +msgstr "" + +#: ../../content/applications/sales/point_of_sale/payment/six.rst:11 msgid "Even though Worldline has recently acquired SIX Payment Services and both companies use Yomani payment terminals, the firmware they run is different. Terminals received from Worldline are therefore not compatible with this integration." msgstr "" -#: ../../content/applications/sales/point_of_sale/payment/six.rst:18 +#: ../../content/applications/sales/point_of_sale/payment/six.rst:19 #: ../../content/applications/sales/point_of_sale/payment/vantiv.rst:16 msgid "Configure the Payment Method" msgstr "" -#: ../../content/applications/sales/point_of_sale/payment/six.rst:20 -msgid "First, make sure that the POS Six module is installed. For this, go to *Apps*, remove the \"Apps\" filter and search for \"POS Six\"." +#: ../../content/applications/sales/point_of_sale/payment/six.rst:21 +msgid "First, make sure that the :guilabel:`POS Six` module is installed. For this, go to :guilabel:`Apps`, remove the :guilabel:`Apps` filter, and search for *POS Six*." msgstr "" -#: ../../content/applications/sales/point_of_sale/payment/six.rst:26 -msgid "Back in :menuselection:`Point of Sale --> Configuration --> Payment Methods`, create a new payment method for SIX, select the appropriate journal, select *SIX* in the **Use a Payment Terminal** field, then enter your payment terminal IP address." +#: ../../content/applications/sales/point_of_sale/payment/six.rst:28 +msgid "Back in :menuselection:`Point of Sale --> Configuration --> Payment Methods`, click :guilabel:`Create` to create a new payment method for SIX, select the payment terminal option :guilabel:`SIX`, and enter the payment terminal IP address." msgstr "" -#: ../../content/applications/sales/point_of_sale/payment/six.rst:31 -msgid "The journal's type must be *bank* to select a payment terminal." -msgstr "" - -#: ../../content/applications/sales/point_of_sale/payment/six.rst:34 +#: ../../content/applications/sales/point_of_sale/payment/six.rst:37 #: ../../content/applications/sales/point_of_sale/payment/vantiv.rst:40 msgid "Pay with a Payment Terminal" msgstr "" -#: ../../content/applications/sales/point_of_sale/payment/six.rst:36 -msgid "In your PoS interface, at the moment of the payment, select a payment method using a payment terminal. Verify that the amount in the tendered column is the one that has to be sent to the payment terminal and click on *Send*. If you want to cancel the payment request, click on cancel." +#: ../../content/applications/sales/point_of_sale/payment/six.rst:39 +msgid "In the :abbr:`PoS (Point of Sale)` interface, at the moment of the payment, select a payment method using a payment terminal. Verify that the amount in the tendered column is the one that has to be sent to the payment terminal and click on :guilabel:`Send`. To cancel the payment request, click on :guilabel:`Cancel`." msgstr "" -#: ../../content/applications/sales/point_of_sale/payment/six.rst:44 -msgid "When the payment is done, the status will change to *Payment Successful*. You can always reverse the last transaction by clicking on *Reverse*." +#: ../../content/applications/sales/point_of_sale/payment/six.rst:48 +msgid "When the payment is done, the status will change to :guilabel:`Payment Successful`. If needed, reverse the last transaction by clicking on :guilabel:`Reverse`." msgstr "" -#: ../../content/applications/sales/point_of_sale/payment/six.rst:51 -msgid "If there is any issue with the payment terminal, you can still force the payment using the *Force Done*. This will allow you to validate the order in Odoo even if the connection between the terminal and Odoo encounters issues." +#: ../../content/applications/sales/point_of_sale/payment/six.rst:55 +msgid "If there is any issue with the payment terminal, you can still force the payment using the :guilabel:`Force Done` button. This will allow you to validate the order in Odoo even if there are connection issues between the payment terminal and Odoo." msgstr "" #: ../../content/applications/sales/point_of_sale/payment/vantiv.rst:3 -msgid "Connect a Vantiv Payment Terminal to your PoS" +msgid "Vantiv" msgstr "" #: ../../content/applications/sales/point_of_sale/payment/vantiv.rst:5 @@ -1620,7 +1733,7 @@ msgid "In your PoS interface, at the moment of the payment, select your Vantiv p msgstr "" #: ../../content/applications/sales/point_of_sale/payment/worldline.rst:3 -msgid "Connect a Worldline Payment Terminal to the PoS" +msgid "Worldline" msgstr "" #: ../../content/applications/sales/point_of_sale/payment/worldline.rst:9 @@ -2043,62 +2156,6 @@ msgstr "" msgid "From your PoS interface, scan any barcode with your barcode scanner. The product will be added, you can scan the same product to add it multiple times or change the quantity manually on the screen." msgstr "" -#: ../../content/applications/sales/point_of_sale/shop/cash_control.rst:3 -msgid "Set-up Cash Control in Point of Sale" -msgstr "" - -#: ../../content/applications/sales/point_of_sale/shop/cash_control.rst:5 -msgid "Cash control allows you to check the amount of the cashbox at the opening and closing. You can thus make sure no error has been made and that no cash is missing." -msgstr "" - -#: ../../content/applications/sales/point_of_sale/shop/cash_control.rst:10 -msgid "Activate Cash Control" -msgstr "" - -#: ../../content/applications/sales/point_of_sale/shop/cash_control.rst:12 -msgid "To activate the *Cash Control* feature, go to :menuselection:`Point of Sales --> Configuration --> Point of sale` and select your PoS interface." -msgstr "" - -#: ../../content/applications/sales/point_of_sale/shop/cash_control.rst:16 -msgid "Under the payments category, you will find the cash control setting." -msgstr "" - -#: ../../content/applications/sales/point_of_sale/shop/cash_control.rst:21 -msgid "In this example, you can see I want to have 275$ in various denomination at the opening and closing." -msgstr "" - -#: ../../content/applications/sales/point_of_sale/shop/cash_control.rst:24 -msgid "When clicking on **Opening/Closing Values** you will be able to create those values." -msgstr "" - -#: ../../content/applications/sales/point_of_sale/shop/cash_control.rst:31 -msgid "Start a session" -msgstr "" - -#: ../../content/applications/sales/point_of_sale/shop/cash_control.rst:33 -msgid "You now have a new button added when you open a session, *Set opening Balance*" -msgstr "" - -#: ../../content/applications/sales/point_of_sale/shop/cash_control.rst:42 -msgid "By default it will use the values you added before, but you can always modify it." -msgstr "" - -#: ../../content/applications/sales/point_of_sale/shop/cash_control.rst:46 -msgid "Close a session" -msgstr "" - -#: ../../content/applications/sales/point_of_sale/shop/cash_control.rst:48 -msgid "When you want to close your session, you now have a *Set Closing Balance* button as well." -msgstr "" - -#: ../../content/applications/sales/point_of_sale/shop/cash_control.rst:51 -msgid "You can then see the theoretical balance, the real closing balance (what you have just counted) and the difference between the two." -msgstr "" - -#: ../../content/applications/sales/point_of_sale/shop/cash_control.rst:57 -msgid "If you use the *Take Money Out* option to take out your transactions for this session, you now have a zero-sum difference and the same closing balance as your opening balance. You cashbox is ready for the next session." -msgstr "" - #: ../../content/applications/sales/point_of_sale/shop/cash_rounding.rst:3 msgid "Cash Rounding" msgstr "" @@ -2299,6 +2356,106 @@ msgstr "" msgid "When you use it, you can then reprint your last receipt." msgstr "" +#: ../../content/applications/sales/point_of_sale/shop/sales_order.rst:3 +msgid "Sales orders in PoS" +msgstr "" + +#: ../../content/applications/sales/point_of_sale/shop/sales_order.rst:5 +msgid "When working in retail, you might need to order products directly from your Point of sale. Fortunately, Odoo Point of Sale is fully integrated with Odoo Sales, meaning that you can create a sales order and pay for it directly from your point of sale." +msgstr "" + +#: ../../content/applications/sales/point_of_sale/shop/sales_order.rst:10 +msgid "Select a sales order" +msgstr "" + +#: ../../content/applications/sales/point_of_sale/shop/sales_order.rst:12 +msgid "From the **Point of Sale** application, open a new session. Then, click on :guilabel:`Quotations/Orders` to get the complete list of quotations and sales orders created on the sales application." +msgstr "" + +#: ../../content/applications/sales/point_of_sale/shop/sales_order.rst:21 +msgid "To ease finding the right sales order, you can filter that list on the **customer** or on the **order reference**. You can also set the customer before clicking on :guilabel:`Quotations/Orders` to reduce the list to one particular customer." +msgstr "" + +#: ../../content/applications/sales/point_of_sale/shop/sales_order.rst:26 +msgid "Apply a down payment or settle the order" +msgstr "" + +#: ../../content/applications/sales/point_of_sale/shop/sales_order.rst:28 +msgid "From the list of sales order, select one to make a payment." +msgstr "" + +#: ../../content/applications/sales/point_of_sale/shop/sales_order.rst:34 +msgid "You can either:" +msgstr "" + +#: ../../content/applications/sales/point_of_sale/shop/sales_order.rst:36 +msgid "Settle the order **partially**: after clicking on :guilabel:`Apply a down payment`, enter the percentage of down payment you want the customer to pay. Then, click on :guilabel:`ok` and proceed with the order." +msgstr "" + +#: ../../content/applications/sales/point_of_sale/shop/sales_order.rst:39 +msgid "Settle the order **completely**: click on :guilabel:`Settle the order` to pay for the total of the sales order." +msgstr "" + +#: ../../content/applications/sales/point_of_sale/shop/sales_order.rst:43 +msgid "Once you settle a sales order, the applied down payment is automatically deducted from the total amount." +msgstr "" + +#: ../../content/applications/sales/point_of_sale/shop/sales_order.rst:47 +msgid ":doc:`/applications/sales/sales/invoicing/down_payment`" +msgstr "" + +#: ../../content/applications/sales/point_of_sale/shop/serial_numbers.rst:3 +msgid "Serial numbers and lots" +msgstr "" + +#: ../../content/applications/sales/point_of_sale/shop/serial_numbers.rst:5 +msgid "Working with **serial numbers** and **lots** allows tracking your products' movements. When products are tracked, the system identifies their location based on their last movement." +msgstr "" + +#: ../../content/applications/sales/point_of_sale/shop/serial_numbers.rst:8 +msgid "To enable traceability, go to :menuselection:`Point of Sale --> Products --> Products`. Then, select a product and check the :guilabel:`Tracking By Unique Serial Number` or the :guilabel:`Tracking By Lots` box in the :guilabel:`Inventory` tab." +msgstr "" + +#: ../../content/applications/sales/point_of_sale/shop/serial_numbers.rst:17 +msgid "Serial numbers and lots importation" +msgstr "" + +#: ../../content/applications/sales/point_of_sale/shop/serial_numbers.rst:19 +msgid "You can import serial numbers in Point of Sale. To do so, select a **sales order** or a **quotation** containing tracked products. Then, agree to load the **Lots or Serial Numbers** linked to the :abbr:`SO (sales order)`." +msgstr "" + +#: ../../content/applications/sales/point_of_sale/shop/serial_numbers.rst:28 +msgid "The imported tracking numbers appear below the tracked products. You can modify them by clicking on the list-view button next to the products." +msgstr "" + +#: ../../content/applications/sales/point_of_sale/shop/serial_numbers.rst:37 +msgid ":doc:`../shop/sales_order`" +msgstr "" + +#: ../../content/applications/sales/point_of_sale/shop/serial_numbers.rst:40 +msgid "Serial numbers and lots creation" +msgstr "" + +#: ../../content/applications/sales/point_of_sale/shop/serial_numbers.rst:42 +msgid "If a tracked product is available in your POS, adding the product to the cart opens a pop-up window where you can type or scan the product's serial or lot numbers. To add more than one of the same tracked products, click on **enter** to validate and start a new line." +msgstr "" + +#: ../../content/applications/sales/point_of_sale/shop/serial_numbers.rst:52 +msgid "Changing a tracked product's quantity using the numpad turns the list-view button red. Click on it to add the missing lot and serial numbers." +msgstr "" + +#: ../../content/applications/sales/point_of_sale/shop/serial_numbers.rst:54 +msgid ":guilabel:`Lot & Serial Number(s)` are :guilabel:`required` on tracked products but not mandatory. Meaning that not attributing some or any does **not** prevent from completing the sale." +msgstr "" + +#: ../../content/applications/sales/point_of_sale/shop/serial_numbers.rst:59 +msgid ":doc:`/applications/inventory_and_mrp/inventory/management/lots_serial_numbers/serial_numbers`" +msgstr "" + +#: ../../content/applications/sales/point_of_sale/shop/serial_numbers.rst:60 +msgid ":doc:`/applications/inventory_and_mrp/inventory/management/lots_serial_numbers/lots`" +msgstr "" + #: ../../content/applications/sales/rental.rst:3 msgid "Rental" msgstr "" @@ -2682,12 +2839,14 @@ msgid "Amazon.nl" msgstr "" #: ../../content/applications/sales/sales/amazon_connector/features.rst:88 -#: ../../content/applications/sales/sales/amazon_connector/manage.rst:105 +#: ../../content/applications/sales/sales/amazon_connector/manage.rst:114 +#: ../../content/applications/sales/sales/amazon_connector/update.rst:59 msgid ":doc:`setup`" msgstr "" #: ../../content/applications/sales/sales/amazon_connector/features.rst:89 -#: ../../content/applications/sales/sales/amazon_connector/setup.rst:160 +#: ../../content/applications/sales/sales/amazon_connector/setup.rst:119 +#: ../../content/applications/sales/sales/amazon_connector/update.rst:60 msgid ":doc:`manage`" msgstr "" @@ -2732,59 +2891,72 @@ msgid "Amazon requires to provide a tracking reference with each delivery. You'l msgstr "" #: ../../content/applications/sales/sales/amazon_connector/manage.rst:45 -msgid ":doc:`../../../inventory_and_mrp/inventory/shipping/setup/third_party_shipper`" +msgid "If your chosen carrier isn't one supported by Odoo, you can still create a carrier bearing its name (e.g. create a carrier named `Colissimo`). This name is case insensitive, but be careful about typos, as Amazon won't recognize them." msgstr "" #: ../../content/applications/sales/sales/amazon_connector/manage.rst:48 -msgid "Follow deliveries in FBA" +msgid "Create a delivery carrier named `Self Delivery` to inform Amazon that you make your own deliveries. You still have to enter a tracking reference." msgstr "" #: ../../content/applications/sales/sales/amazon_connector/manage.rst:50 -msgid "When a **FBA** (Fulfilled by Amazon) order is synchronized in Odoo, a stock move is recorded for each sales order item so that it is saved in your system. Inventory managers can find such moves in :menuselection:`Inventory --> Reporting --> Product Moves`. They pick up products in a specific inventory location called **Amazon**. This location represents your stock in Amazon's warehouses and allows you to manage the stock of your products under the FBA program." +msgid "Keep in mind that the customer is notified by email about the delivery, and the carrier and tracking reference are displayed in the email to the customer." +msgstr "" + +#: ../../content/applications/sales/sales/amazon_connector/manage.rst:54 +msgid ":doc:`../../../inventory_and_mrp/inventory/shipping/setup/third_party_shipper`" msgstr "" #: ../../content/applications/sales/sales/amazon_connector/manage.rst:57 +msgid "Follow deliveries in FBA" +msgstr "" + +#: ../../content/applications/sales/sales/amazon_connector/manage.rst:59 +msgid "When a **FBA** (Fulfilled by Amazon) order is synchronized in Odoo, a stock move is recorded for each sales order item so that it is saved in your system. Inventory managers can find such moves in :menuselection:`Inventory --> Reporting --> Product Moves`. They pick up products in a specific inventory location called **Amazon**. This location represents your stock in Amazon's warehouses and allows you to manage the stock of your products under the FBA program." +msgstr "" + +#: ../../content/applications/sales/sales/amazon_connector/manage.rst:66 msgid "To follow your Amazon (FBA) stock in Odoo, you can make an inventory adjustment after replenishing it. You can also trigger an automated replenishment from reordering rules on the Amazon location." msgstr "" -#: ../../content/applications/sales/sales/amazon_connector/manage.rst:62 +#: ../../content/applications/sales/sales/amazon_connector/manage.rst:71 msgid "The Amazon location is configurable by Amazon account managed in Odoo. All accounts of the same company use the same location by default. It is however possible to follow the stock by marketplace. First, remove the marketplace for which you want to follow the stock separately from the list of synchronized marketplaces. Then, create another registration for this account and remove all marketplaces, except the one to isolate from the others. Finally, assign another stock location to the second registration of your account." msgstr "" -#: ../../content/applications/sales/sales/amazon_connector/manage.rst:70 +#: ../../content/applications/sales/sales/amazon_connector/manage.rst:79 msgid "Issue invoices and register payments" msgstr "" -#: ../../content/applications/sales/sales/amazon_connector/manage.rst:72 +#: ../../content/applications/sales/sales/amazon_connector/manage.rst:81 msgid "You can issue invoices for Amazon orders in Odoo. Click **Create Invoice** in the sales order to do so. You can also do it in batch from the list view of orders. Then, confirm and send the invoices to your customers." msgstr "" -#: ../../content/applications/sales/sales/amazon_connector/manage.rst:77 +#: ../../content/applications/sales/sales/amazon_connector/manage.rst:86 msgid "To display only Amazon-related orders on the list view, you can filter orders based on the sales team." msgstr "" -#: ../../content/applications/sales/sales/amazon_connector/manage.rst:80 +#: ../../content/applications/sales/sales/amazon_connector/manage.rst:89 msgid "As the customer has paid Amazon as an intermediary, you should register invoice payments in a payment journal dedicated to Amazon (e.g. Amazon Payments, with a dedicated intermediary account). You can do the same with the vendor bill received from Amazon and dedicated to commissions. When you receive the balance on your bank account at the end of the month and record your bank statements in Odoo, you simply credit the Amazon intermediary account by the amount received." msgstr "" -#: ../../content/applications/sales/sales/amazon_connector/manage.rst:87 +#: ../../content/applications/sales/sales/amazon_connector/manage.rst:96 msgid "Follow your Amazon sales in sales reporting" msgstr "" -#: ../../content/applications/sales/sales/amazon_connector/manage.rst:89 +#: ../../content/applications/sales/sales/amazon_connector/manage.rst:98 msgid "As a sales team is set on your account under the tab **Order Follow-up**, this helps you give quick glances at the figures in just a few clicks in Sales reporting. By default, your account's sales team is shared between all of your company's accounts." msgstr "" -#: ../../content/applications/sales/sales/amazon_connector/manage.rst:93 +#: ../../content/applications/sales/sales/amazon_connector/manage.rst:102 msgid "If you wish, you can change the sales team on your account for another to perform a separate reporting for the sales of this account." msgstr "" -#: ../../content/applications/sales/sales/amazon_connector/manage.rst:97 +#: ../../content/applications/sales/sales/amazon_connector/manage.rst:106 msgid "It is also possible to perform reporting on a per-marketplace basis in a similar fashion. First, remove the marketplace you wish to track separately from the list of synchronized marketplaces. Then, create another registration for this account and remove all marketplaces, except the one to isolate from the others. Finally, assign another sales team to one of the two registrations of your account." msgstr "" -#: ../../content/applications/sales/sales/amazon_connector/manage.rst:104 -#: ../../content/applications/sales/sales/amazon_connector/setup.rst:159 +#: ../../content/applications/sales/sales/amazon_connector/manage.rst:113 +#: ../../content/applications/sales/sales/amazon_connector/setup.rst:118 +#: ../../content/applications/sales/sales/amazon_connector/update.rst:58 msgid ":doc:`features`" msgstr "" @@ -2793,154 +2965,161 @@ msgid "Configure Amazon Connector in Odoo" msgstr "" #: ../../content/applications/sales/sales/amazon_connector/setup.rst:6 -msgid "Generate an Authorization Token in Seller Central" -msgstr "" - -#: ../../content/applications/sales/sales/amazon_connector/setup.rst:10 -msgid "The Amazon Connector uses an Authorization Token that allows Odoo to fetch data from your Amazon Seller Central account. This token can be obtained directly through Seller Central in a few clicks and needs to be set up in your Odoo database configuration." -msgstr "" - -#: ../../content/applications/sales/sales/amazon_connector/setup.rst:14 -msgid "Connect to your Seller Central account for the marketplace you initially signed up (e.g. if you created your account on Amazon Germany, go to `Amazon Seller Central for Germany `_) with an administrator account." -msgstr "" - -#: ../../content/applications/sales/sales/amazon_connector/setup.rst:19 -msgid "You might need to use the *main* (or first) administrator account and not one added subsequently." -msgstr "" - -#: ../../content/applications/sales/sales/amazon_connector/setup.rst:22 -msgid "In the main menu, select :menuselection:`Apps & Services --> Manage Your Apps`; in the page that displays, click on the ``Authorize new developper`` button:" -msgstr "" - -#: ../../content/applications/sales/sales/amazon_connector/setup.rst:28 -msgid "Fill in the form depending on your Marketplace:" -msgstr "" - -#: ../../content/applications/sales/sales/amazon_connector/setup.rst:33 -msgid "If your seller account is registered in the **North America** region, use these values:" -msgstr "" - -#: ../../content/applications/sales/sales/amazon_connector/setup.rst:35 -#: ../../content/applications/sales/sales/amazon_connector/setup.rst:40 -msgid "Developer's Name: ``Odoo S.A.``" -msgstr "" - -#: ../../content/applications/sales/sales/amazon_connector/setup.rst:36 -msgid "Developer ID: ``586127723692``" -msgstr "" - -#: ../../content/applications/sales/sales/amazon_connector/setup.rst:38 -msgid "For the **Europe** region, use these values:" -msgstr "" - -#: ../../content/applications/sales/sales/amazon_connector/setup.rst:41 -msgid "Developer ID: ``579095187166``" -msgstr "" - -#: ../../content/applications/sales/sales/amazon_connector/setup.rst:43 -msgid "Amazon will then inform you that by submitting the form, you are giving access to your Seller Central Information to Odoo S.A." -msgstr "" - -#: ../../content/applications/sales/sales/amazon_connector/setup.rst:47 -msgid "Odoo S.A. is unable to access your Amazon account's information without the Authorization Token which is stored in your Odoo database - we do not store these tokens on our platform directly and are therefore unable to access your account's information outside of the Amazon Connector normal flows." -msgstr "" - -#: ../../content/applications/sales/sales/amazon_connector/setup.rst:53 msgid "Register your Amazon account in Odoo" msgstr "" -#: ../../content/applications/sales/sales/amazon_connector/setup.rst:57 -msgid "To register your seller account in Odoo, navigate to :menuselection:`Sales --> Configuration --> Settings --> Connectors --> Amazon Sync --> Amazon Accounts` and click on **CREATE**." +#: ../../content/applications/sales/sales/amazon_connector/setup.rst:10 +msgid "To register your seller account in Odoo, navigate to :menuselection:`Sales --> Configuration --> Settings --> Connectors --> Amazon Sync --> Amazon Accounts` and click on :guilabel:`CREATE`." msgstr "" -#: ../../content/applications/sales/sales/amazon_connector/setup.rst:60 -msgid "The **Seller ID** can be found in Seller Central under the link **Your Merchant Token** on the **Seller Account Information** page. The **Authorization Token** is the one you generated in the :ref:`previous step `." +#: ../../content/applications/sales/sales/amazon_connector/setup.rst:13 +msgid "Choose a meaningful name for your account (e.g. `Europe`), and select your :guilabel:`Sign-up Marketplace`. This is the original sign-up marketplace of your seller account (e.g. if you created your account on Amazon Germany, your sign-up marketplace will be `amazon.de`)" msgstr "" -#: ../../content/applications/sales/sales/amazon_connector/setup.rst:64 -msgid "Upon saving, your credentials are checked. In case of issues, an error will be displayed - the information cannot be saved until your credentials are recognized by Amazon." +#: ../../content/applications/sales/sales/amazon_connector/setup.rst:17 +msgid "Upon saving, a button to :guilabel:`link with Amazon` appears. Click on it to be redirected to the Amazon login page, or directly to the consent page if you are already logged in. There, confirm that you want Amazon to give Odoo access to your account and related data." msgstr "" -#: ../../content/applications/sales/sales/amazon_connector/setup.rst:67 -msgid "Once the account is registered, the marketplaces available to this account are synchronized and listed under the **Marketplaces** tab. If you wish, you can remove some items from the list of synchronized marketplaces to disable their synchronization." +#: ../../content/applications/sales/sales/amazon_connector/setup.rst:21 +msgid "Amazon redirects you to Odoo, with your account registered." msgstr "" -#: ../../content/applications/sales/sales/amazon_connector/setup.rst:72 +#: ../../content/applications/sales/sales/amazon_connector/setup.rst:23 +msgid "Once the account is registered, the marketplaces available to this account are synchronized and listed under the :guilabel:`Marketplaces` tab. If you wish, you can remove some items from the list of synchronized marketplaces to disable their synchronization." +msgstr "" + +#: ../../content/applications/sales/sales/amazon_connector/setup.rst:28 msgid "Match database products in Amazon" msgstr "" -#: ../../content/applications/sales/sales/amazon_connector/setup.rst:74 +#: ../../content/applications/sales/sales/amazon_connector/setup.rst:30 msgid "When an Amazon order is synchronized, up to three sales order items are created in Odoo for each product sold on Amazon: one for the marketplace product, one for the shipping charges (if any) and one for the gift wrapping charges (if any)." msgstr "" -#: ../../content/applications/sales/sales/amazon_connector/setup.rst:80 +#: ../../content/applications/sales/sales/amazon_connector/setup.rst:36 msgid "The selection of a database product for a sales order item is done by matching its **internal reference** with the **SKU** for marketplace items, the **shipping code** for delivery charges, and the **gift wrapping** code for gift wrapping charges." msgstr "" -#: ../../content/applications/sales/sales/amazon_connector/setup.rst:84 +#: ../../content/applications/sales/sales/amazon_connector/setup.rst:40 msgid "For marketplace products, pairings are saved as **Amazon Offers** which are listed under the **Offers** stat button on the account form. Offers are automatically created when the pairing is established and are used for subsequent orders to lookup SKUs. If no offer with a matching SKU is found, :ref:`the internal reference is used instead `." msgstr "" -#: ../../content/applications/sales/sales/amazon_connector/setup.rst:90 +#: ../../content/applications/sales/sales/amazon_connector/setup.rst:46 msgid "It is possible to force the pairing of a marketplace item with a specific product by changing either the product or the SKU of an offer. The offer can be manually created if it was not automatically done yet. This is useful if you do not use the internal reference as the SKU or if you sell the product under different conditions." msgstr "" -#: ../../content/applications/sales/sales/amazon_connector/setup.rst:95 +#: ../../content/applications/sales/sales/amazon_connector/setup.rst:51 msgid "If no database product with a matching internal reference is found for a given SKU or gift wrapping code, a default database product **Amazon Sale** is used. The same is done with the default product **Amazon Shipping** and the shipping code." msgstr "" -#: ../../content/applications/sales/sales/amazon_connector/setup.rst:100 +#: ../../content/applications/sales/sales/amazon_connector/setup.rst:56 msgid "To modify the default products, activate the :ref:`developer mode ` and navigate to :menuselection:`Sales --> Configuration --> Settings --> Connectors --> Amazon Sync --> Default Products`." msgstr "" -#: ../../content/applications/sales/sales/amazon_connector/setup.rst:105 +#: ../../content/applications/sales/sales/amazon_connector/setup.rst:61 msgid "Configure taxes of products" msgstr "" -#: ../../content/applications/sales/sales/amazon_connector/setup.rst:107 +#: ../../content/applications/sales/sales/amazon_connector/setup.rst:63 msgid "To allow for tax reporting of Amazon sales with Odoo, the taxes applied to the sales order items are those set on the product or determined by the fiscal position. Make sure to have set the correct taxes on your products in Odoo or to have it done by a fiscal position, to avoid discrepancies in the subtotals between Seller Central and Odoo." msgstr "" -#: ../../content/applications/sales/sales/amazon_connector/setup.rst:113 +#: ../../content/applications/sales/sales/amazon_connector/setup.rst:69 msgid "As Amazon does not necessarily apply the same taxes as those configured in Odoo, it may happen that order totals differ by a few cents from that on Seller Central. Those differences can be resolved with a write-off when reconciling the payments in Odoo." msgstr "" -#: ../../content/applications/sales/sales/amazon_connector/setup.rst:120 +#: ../../content/applications/sales/sales/amazon_connector/setup.rst:76 msgid "Add an unsupported marketplace" msgstr "" -#: ../../content/applications/sales/sales/amazon_connector/setup.rst:122 -msgid "Some Amazon Marketplaces, such as Amazon Brazil, are not officially supported by Odoo but might be compatible with your seller account. These marketplaces can be added manually should you wish to use them. See :ref:`here ` for the exhaustive list of natively supported marketplaces." +#: ../../content/applications/sales/sales/amazon_connector/setup.rst:78 +msgid "Some Amazon Marketplaces, such as Amazon Brazil, are not created by default as they are not officially supported by Odoo but might be compatible with your seller account. These marketplaces can be added manually should you wish to use them. See :ref:`here ` for the exhaustive list of natively supported marketplaces." msgstr "" -#: ../../content/applications/sales/sales/amazon_connector/setup.rst:128 -msgid "To find out if a marketplace is eventually compatible, check the `Amazon Documentation `_. The marketplace must belong to the same region as that of your seller account." +#: ../../content/applications/sales/sales/amazon_connector/setup.rst:84 +msgid "To find out if a marketplace is eventually compatible, check the `Amazon Documentation `_. The marketplace must belong to the same region as that of your seller account." msgstr "" -#: ../../content/applications/sales/sales/amazon_connector/setup.rst:132 -msgid "To add a new marketplace, you must first activate the :ref:`developer mode `." +#: ../../content/applications/sales/sales/amazon_connector/setup.rst:88 +msgid "To add a new marketplace, activate the :ref:`developer mode `." msgstr "" -#: ../../content/applications/sales/sales/amazon_connector/setup.rst:134 +#: ../../content/applications/sales/sales/amazon_connector/setup.rst:90 msgid "Once that is done, go to :menuselection:`Sales --> Configuration --> Settings --> Connectors --> Amazon Sync --> Amazon Marketplaces`." msgstr "" -#: ../../content/applications/sales/sales/amazon_connector/setup.rst:137 -msgid "From there, you can create a new marketplace record. You will need the Marketplace ID and Endpoint for your marketplace as described in the `Amazon Documentation `_." +#: ../../content/applications/sales/sales/amazon_connector/setup.rst:93 +msgid "From there, create a new marketplace record. Enter the Marketplace ID and select the Amazon Region for your marketplace as described in the `Amazon Documentation for marketplace IDs `_, and the Seller Central URL as described in the `Amazon Documentation for seller central URLs `_." msgstr "" -#: ../../content/applications/sales/sales/amazon_connector/setup.rst:141 -msgid "Set the name of the record to ``Amazon.`` to easily retrieve it (for instance: ``Amazon.se``). The **Code**, **Domain** and **API Identifier** fields should respectively hold the *Country Code*, *Amazon MWS Endpoint* and *MarketplaceId* values from the Amazon Documentation." +#: ../../content/applications/sales/sales/amazon_connector/setup.rst:99 +msgid "Set the name of the record to ``Amazon.`` to easily retrieve it (e.g.: ``Amazon.se``). The :guilabel:`API Identifier`, the :guilabel:`Region` and the :guilabel:`Seller Central URL` fields should respectively hold the *MarketplaceId*, the selected Amazon region and the *Seller Central URL* values from the Amazon Documentation." msgstr "" -#: ../../content/applications/sales/sales/amazon_connector/setup.rst:145 -msgid "Once the marketplace is saved, you should then update the Amazon Account configuration by going to :menuselection:`Sales --> Configuration --> Settings --> Connectors --> Amazon Sync --> Amazon Accounts`, open the account on which you wish to use the new marketplace, go to the **Marketplaces** tab and click on **Update available marketplaces** (an animation should confirm the success of the operation). Newly added marketplaces are automatically added to the list of synchronized marketplaces. If the new marketplace is not added to the list, it means that it is either incompatible or unavailable for your seller account." +#: ../../content/applications/sales/sales/amazon_connector/setup.rst:104 +msgid "Once the marketplace is saved, update the Amazon Account configuration by going to :menuselection:`Sales --> Configuration --> Settings --> Connectors --> Amazon Sync --> Amazon Accounts`. Open the account on which you wish to use the new marketplace, go to the :guilabel:`Marketplaces` tab and click on :guilabel:`Update available marketplaces` (an animation should confirm the success of the operation). Newly added marketplaces are automatically added to the list of synchronized marketplaces. If the new marketplace is not added to the list, it means that it is either incompatible or unavailable for your seller account." msgstr "" -#: ../../content/applications/sales/sales/amazon_connector/setup.rst:154 +#: ../../content/applications/sales/sales/amazon_connector/setup.rst:113 msgid "As manually added marketplaces are not officially supported by Odoo, there is no guarantee that adding one as described above will work, nor can this be considered as a bug when contacting Odoo Support." msgstr "" +#: ../../content/applications/sales/sales/amazon_connector/update.rst:3 +msgid "Install the Amazon Selling Partner API Update" +msgstr "" + +#: ../../content/applications/sales/sales/amazon_connector/update.rst:5 +msgid "Starting July 2022, due to a change in Amazon's API, the Amazon Connector needs to be updated to continue to exchange information with Amazon. This also makes it easier for you to set up the Connector." +msgstr "" + +#: ../../content/applications/sales/sales/amazon_connector/update.rst:10 +msgid "If your Odoo database is created after the update was released, the update module is installed automatically. To check if this module is already installed, go to :guilabel:`Apps`, remove the ``Apps`` filter and search for ``Amazon``. If the module :guilabel:`Amazon/Selling Partner API Patch` is present and marked as installed, your Odoo database is already up-to-date and you can proceed with the :doc:`setup ` step of the Amazon Connector." +msgstr "" + +#: ../../content/applications/sales/sales/amazon_connector/update.rst:17 +msgid "Update Odoo to the latest release" +msgstr "" + +#: ../../content/applications/sales/sales/amazon_connector/update.rst:19 +msgid "The new authentication mechanism is made available through a new Odoo module; to be able to install it, you must make sure that your Odoo source code is up-to-date." +msgstr "" + +#: ../../content/applications/sales/sales/amazon_connector/update.rst:22 +msgid "If you use Odoo on Odoo.com or Odoo.sh platform, your code is already up-to-date and you can proceed to the next step." +msgstr "" + +#: ../../content/applications/sales/sales/amazon_connector/update.rst:25 +msgid "If you use Odoo with an on-premise setup or through a partner, then you must update your installation as detailed in :doc:`this documentation page ` or by contacting your integrating partner." +msgstr "" + +#: ../../content/applications/sales/sales/amazon_connector/update.rst:31 +msgid "Update the list of available modules" +msgstr "" + +#: ../../content/applications/sales/sales/amazon_connector/update.rst:33 +msgid "New modules must be *discovered* by your Odoo instance to be available in the **Apps** menu." +msgstr "" + +#: ../../content/applications/sales/sales/amazon_connector/update.rst:36 +msgid "To do so, activate the :ref:`developer mode `, and go to :menuselection:`Apps --> Update Apps List`. A wizard will ask for confirmation." +msgstr "" + +#: ../../content/applications/sales/sales/amazon_connector/update.rst:40 +msgid "Install the Amazon/Selling Partner API Patch" +msgstr "" + +#: ../../content/applications/sales/sales/amazon_connector/update.rst:43 +msgid "You should never install new modules in your production database without first testing them in a duplicate or staging environment. For Odoo.com customers, a duplicate database can be created from the database management page. For Odoo.sh users, you should use a staging or duplicate database. For on-premise users, you should use a staging environment---contact your integrating partner for more information regarding how to test a new module in your particular setup." +msgstr "" + +#: ../../content/applications/sales/sales/amazon_connector/update.rst:49 +msgid "The module should now be available in your :guilabel:`Apps` menu. Remove the ``Apps`` filter and search for ``Amazon``; the module :guilabel:`Amazon/Selling Partner API Patch` should be available for installation. If you cannot find the module after having updated the list of available modules, it means your Odoo source code is not up-to-date; refer to step one of this page." +msgstr "" + +#: ../../content/applications/sales/sales/amazon_connector/update.rst:54 +msgid "Once the module is installed, link your Amazon account by following the instructions on the :doc:`setup ` page." +msgstr "" + #: ../../content/applications/sales/sales/ebay_connector.rst:5 msgid "eBay Connector" msgstr "" @@ -3582,7 +3761,7 @@ msgid "How to adapt your prices to your customers and apply discounts" msgstr "" #: ../../content/applications/sales/sales/products_prices/prices/pricing.rst:5 -msgid "Odoo has a powerful pricelist feature to support a pricing strategy tailored to your business. A pricelist is a list of prices or price rules that Odoo searches to determine the suggested price. You can set several critarias to use a specific price: periods, min. sold quantity (meet a minimum order quantity and get a price break), etc." +msgid "Odoo has a powerful pricelist feature to support a pricing strategy tailored to your business. A pricelist is a list of prices or price rules that Odoo searches to determine the suggested price. You can set several criteria to use a specific price: periods, min. sold quantity (meet a minimum order quantity and get a price break), etc." msgstr "" #: ../../content/applications/sales/sales/products_prices/prices/pricing.rst:9 @@ -4407,51 +4586,47 @@ msgid "You can create a new template or edit an existing one. Once named, you wi msgstr "" #: ../../content/applications/sales/sales/send_quotations/quote_template.rst:42 -msgid "On each template, you can also specify discounts if the option is activated in the **Sales** settings." -msgstr "" - -#: ../../content/applications/sales/sales/send_quotations/quote_template.rst:46 msgid "Design your template" msgstr "" -#: ../../content/applications/sales/sales/send_quotations/quote_template.rst:48 +#: ../../content/applications/sales/sales/send_quotations/quote_template.rst:44 msgid "You will have the possibility to design your template and edit the customer interface in order to manage what clients will see before accepting and paying the quotation. For example, you will be able to describe your company, your services and your products. To do so, you can click on **Edit** and you will be brought to the quotation builder." msgstr "" -#: ../../content/applications/sales/sales/send_quotations/quote_template.rst:58 +#: ../../content/applications/sales/sales/send_quotations/quote_template.rst:54 msgid "You can easily edit the content of your template by dragging & dropping different building blocks to organize your quotation. For example, you can add a content block to describe your products." msgstr "" -#: ../../content/applications/sales/sales/send_quotations/quote_template.rst:67 +#: ../../content/applications/sales/sales/send_quotations/quote_template.rst:63 msgid "Use a quotation template" msgstr "" -#: ../../content/applications/sales/sales/send_quotations/quote_template.rst:69 +#: ../../content/applications/sales/sales/send_quotations/quote_template.rst:65 msgid "When creating a quotation, you can choose a specific template." msgstr "" -#: ../../content/applications/sales/sales/send_quotations/quote_template.rst:77 +#: ../../content/applications/sales/sales/send_quotations/quote_template.rst:73 msgid "You can select any template of your choice and suggest it as the default template in the **Sales** settings." msgstr "" -#: ../../content/applications/sales/sales/send_quotations/quote_template.rst:81 +#: ../../content/applications/sales/sales/send_quotations/quote_template.rst:77 msgid "Confirm the quotation" msgstr "" -#: ../../content/applications/sales/sales/send_quotations/quote_template.rst:83 +#: ../../content/applications/sales/sales/send_quotations/quote_template.rst:79 msgid "Templates facilitate the confirmation process by allowing customers to sign electronically or to pay online. You can activate these two options directly in the quotation template itself." msgstr "" -#: ../../content/applications/sales/sales/send_quotations/quote_template.rst:92 +#: ../../content/applications/sales/sales/send_quotations/quote_template.rst:88 msgid "Every quotation will now have this setting. Of course you can always change it and make it specific for each quotation." msgstr "" -#: ../../content/applications/sales/sales/send_quotations/quote_template.rst:96 +#: ../../content/applications/sales/sales/send_quotations/quote_template.rst:92 #: ../../content/applications/sales/sales/send_quotations/terms_and_conditions.rst:116 msgid ":doc:`get_signature_to_validate`" msgstr "" -#: ../../content/applications/sales/sales/send_quotations/quote_template.rst:97 +#: ../../content/applications/sales/sales/send_quotations/quote_template.rst:93 #: ../../content/applications/sales/sales/send_quotations/terms_and_conditions.rst:117 msgid ":doc:`get_paid_to_validate`" msgstr "" diff --git a/locale/sources/services.pot b/locale/sources/services.pot index e4e9be882..eafb0f725 100644 --- a/locale/sources/services.pot +++ b/locale/sources/services.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: Odoo 15.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-03-18 14:56+0000\n" +"POT-Creation-Date: 2022-07-22 09:36+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -669,6 +669,7 @@ msgid ":doc:`reinvoice_from_project`" msgstr "" #: ../../content/applications/services/helpdesk/timesheet_and_invoice/invoice_time.rst:112 +#: ../../content/applications/services/helpdesk/timesheet_and_invoice/reinvoice_from_project.rst:102 msgid ":doc:`/applications/inventory_and_mrp/inventory/management/products/uom`" msgstr "" @@ -677,31 +678,87 @@ msgid "Invoice Time Spent on Tickets (Postpaid Support Services)" msgstr "" #: ../../content/applications/services/helpdesk/timesheet_and_invoice/reinvoice_from_project.rst:5 -msgid "Directly pull the billable time you have tracked on your helpdesk tickets into sales orders and invoices through a project task. It gives you more control over what you charge your client, and it is more efficient." +msgid "The :guilabel:`Timesheet on Ticket` integration provides more control and transparency over how clients are charged, and what they're specifically billed for." msgstr "" -#: ../../content/applications/services/helpdesk/timesheet_and_invoice/reinvoice_from_project.rst:10 -msgid "Configuration" +#: ../../content/applications/services/helpdesk/timesheet_and_invoice/reinvoice_from_project.rst:8 +msgid "In Odoo, the Helpdesk agent can use the ticket to record timesheets. Once a ticket is solved, the client can be billed for the time spent on the ticket. Odoo will pull from the ticket's timesheet to accurately bill the client." msgstr "" #: ../../content/applications/services/helpdesk/timesheet_and_invoice/reinvoice_from_project.rst:13 -msgid "Go to :menuselection:`Helpdesk --> Configuration --> Helpdesk team --> Edit` and enable the options *Timesheet on Ticket* and *Time Reinvoicing*." +msgid "Configuration" msgstr "" #: ../../content/applications/services/helpdesk/timesheet_and_invoice/reinvoice_from_project.rst:15 -msgid "Under *Timesheet on Ticket*, choose the *Project* to which tickets (and timesheets) will be linked by default. Open its *External link* to enable the feature *Bill from tasks*." +msgid "To turn on the :guilabel:`Timesheet on Ticket` feature, go to :menuselection:`Helpdesk --> Configuration --> Helpdesk Teams`, select a Helpdesk team, and then, click :guilabel:`Edit`. Next, enable the options :guilabel:`Timesheet on Ticket` and :guilabel:`Time Reinvoicing`. Then, click :guilabel:`Save` to apply these changes to the Helpdesk team settings." msgstr "" -#: ../../content/applications/services/helpdesk/timesheet_and_invoice/reinvoice_from_project.rst:22 -msgid "Create a sales order and an invoice" +#: ../../content/applications/services/helpdesk/timesheet_and_invoice/reinvoice_from_project.rst:20 +msgid "Once the :guilabel:`Timesheet on Ticket` feature is enabled, a :guilabel:`Project` drop-down option will appear below :guilabel:`Timesheet on Ticket`. The :guilabel:`Project` drop-down option will automatically be set to a Project that Odoo created for the Helpdesk team. The tickets' timesheets will be stored in the selected Project." msgstr "" -#: ../../content/applications/services/helpdesk/timesheet_and_invoice/reinvoice_from_project.rst:24 -msgid "Now, once you have recorded the time you spent on the helpdesk ticket, under the *Timesheets* tab, access the task clicking on its name." +#: ../../content/applications/services/helpdesk/timesheet_and_invoice/reinvoice_from_project.rst:26 +msgid "Create a sales order" msgstr "" -#: ../../content/applications/services/helpdesk/timesheet_and_invoice/reinvoice_from_project.rst:31 -msgid "*Create Sales Order* and proceed to create the invoice." +#: ../../content/applications/services/helpdesk/timesheet_and_invoice/reinvoice_from_project.rst:28 +msgid "After a ticket comes into the pipeline, go to :menuselection:`Sales --> Create`. Then, add the customer from the ticket to the :guilabel:`Customer` field in the new quotation. In the :guilabel:`Order Lines` tab, create or select a product to charge the customer for the time spent on their Helpdesk ticket." +msgstr "" + +#: ../../content/applications/services/helpdesk/timesheet_and_invoice/reinvoice_from_project.rst:33 +msgid "If creating a new product from the sales order form, first give the product a name by typing it in the :guilabel:`Product` column. Then, click :guilabel:`Create and edit`." +msgstr "" + +#: ../../content/applications/services/helpdesk/timesheet_and_invoice/reinvoice_from_project.rst:36 +msgid "First, in the :guilabel:`General Information` tab, set the :guilabel:`Product Type` to :guilabel:`Service` and the :guilabel:`Sales Price` to the Helpdesk agent's service rate. Then, in the :guilabel:`Sales` tab, set the :guilabel:`Service Invoicing Policy` to :guilabel:`Timesheets on tasks`. Finally, click :guilabel:`Save` to create the new product and add it to the quotation." +msgstr "" + +#: ../../content/applications/services/helpdesk/timesheet_and_invoice/reinvoice_from_project.rst:41 +msgid "Once the product is added, click :guilabel:`Confirm` to turn the quotation into a sales order." +msgstr "" + +#: ../../content/applications/services/helpdesk/timesheet_and_invoice/reinvoice_from_project.rst:48 +msgid "Record a timesheet" +msgstr "" + +#: ../../content/applications/services/helpdesk/timesheet_and_invoice/reinvoice_from_project.rst:50 +msgid "To record a timesheet, jump back to the Helpdesk ticket by going to the Helpdesk dashboard and clicking :guilabel:`Tickets` on the team's card (or by going to the Projects dashboard and clicking :guilabel:`Tickets` on the project card). Then, click :guilabel:`Edit` and use the :guilabel:`Timesheets` tab to record the time spent on the ticket." +msgstr "" + +#: ../../content/applications/services/helpdesk/timesheet_and_invoice/reinvoice_from_project.rst:60 +msgid "The ticket's timesheets can be recorded before or after the sales order is made, the order doesn't matter." +msgstr "" + +#: ../../content/applications/services/helpdesk/timesheet_and_invoice/reinvoice_from_project.rst:64 +msgid "Link the Helpdesk ticket to the SO" +msgstr "" + +#: ../../content/applications/services/helpdesk/timesheet_and_invoice/reinvoice_from_project.rst:66 +msgid "Once a timesheet is recorded, the :guilabel:`Sales Order Item` field will appear on the ticket form. To link the :abbr:`SO (Sales Order)` to the ticket, start on the ticket form and click :guilabel:`Edit`. Next, select the :abbr:`SO (Sales Order)` that was created earlier from the drop-down menu. Odoo will automatically filter the sales orders to only show sales orders that are connected to the ticket's customer. Lastly, click :guilabel:`Save` to connect the ticket and the :abbr:`SO (Sales Order)`." +msgstr "" + +#: ../../content/applications/services/helpdesk/timesheet_and_invoice/reinvoice_from_project.rst:78 +msgid "Modify billing rates" +msgstr "" + +#: ../../content/applications/services/helpdesk/timesheet_and_invoice/reinvoice_from_project.rst:80 +msgid "If a timesheet entry is recorded, but the agent does not want to bill the client for that time, go to the :guilabel:`Timesheets` tab and toggle on the visibility of the :guilabel:`Sales Order Item` column. When filling out the information for the timesheet entry, make sure to leave the non-billable timesheet entry's :guilabel:`Sales Order Item` field blank." +msgstr "" + +#: ../../content/applications/services/helpdesk/timesheet_and_invoice/reinvoice_from_project.rst:85 +msgid "If the agent wants to charge a different rate for a timesheet entry, first, add a new product to the connected :abbr:`SO (Sales Order)` priced at the new rate. Then, select the new product in the timesheet entry's :guilabel:`Sales Order Item` field." +msgstr "" + +#: ../../content/applications/services/helpdesk/timesheet_and_invoice/reinvoice_from_project.rst:90 +msgid "Create the invoice" +msgstr "" + +#: ../../content/applications/services/helpdesk/timesheet_and_invoice/reinvoice_from_project.rst:92 +msgid "When the Helpdesk ticket is completed and the client is ready to be billed for time, begin by clicking the :guilabel:`Sales Order` smart button on the ticket form to navigate to the :abbr:`SO (Sales Order)`. The :guilabel:`Delivered` column should match the number of hours recorded on the ticket's timesheet. After checking and filling out the relevant information, click :guilabel:`Create Invoice` to bill the client for the time spent on the ticket. Odoo will automatically generate an invoice to send to the client and the Helpdesk ticket can officially be closed." +msgstr "" + +#: ../../content/applications/services/helpdesk/timesheet_and_invoice/reinvoice_from_project.rst:101 +msgid ":doc:`invoice_time`" msgstr "" #: ../../content/applications/services/project.rst:8 diff --git a/locale/sources/sphinx.pot b/locale/sources/sphinx.pot index 020c1775a..d23151db2 100644 --- a/locale/sources/sphinx.pot +++ b/locale/sources/sphinx.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: Odoo 15.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-04-08 13:26+0000\n" +"POT-Creation-Date: 2022-07-22 09:36+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -28,7 +28,7 @@ msgstr "" msgid "Ask the Odoo Community" msgstr "" -#: ../../extensions/odoo_theme/layout_templates/header.html:11 +#: ../../extensions/odoo_theme/layout_templates/header.html:10 msgid "Try Odoo for FREE" msgstr "" @@ -131,10 +131,14 @@ msgid "You want to contribute to Odoo but don't know where to start? The tutoria msgstr "" #: ../../extensions/odoo_theme/layout_templates/homepage.html:102 -msgid "Write documentation" +msgid "Coding guidelines" msgstr "" #: ../../extensions/odoo_theme/layout_templates/homepage.html:107 +msgid "Documentation" +msgstr "" + +#: ../../extensions/odoo_theme/layout_templates/homepage.html:112 msgid "Content guidelines" msgstr "" diff --git a/locale/sources/websites.pot b/locale/sources/websites.pot index 2574921ea..25acc55d7 100644 --- a/locale/sources/websites.pot +++ b/locale/sources/websites.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: Odoo 15.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-03-18 14:56+0000\n" +"POT-Creation-Date: 2022-07-22 09:36+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -34,11 +34,15 @@ msgid "Odoo offers a :ref:`free custom domain name ` msgstr "" #: ../../content/applications/websites/ecommerce.rst:19 +msgid ":doc:`Website Documentation `" +msgstr "" + +#: ../../content/applications/websites/ecommerce.rst:20 #: ../../content/applications/websites/website.rst:20 msgid "`Odoo Tutorials: Website `_" msgstr "" -#: ../../content/applications/websites/ecommerce.rst:20 +#: ../../content/applications/websites/ecommerce.rst:21 #: ../../content/applications/websites/website.rst:21 msgid "`Odoo Tutorials: eCommerce `_" msgstr "" @@ -296,59 +300,67 @@ msgid "Maximize my revenue" msgstr "" #: ../../content/applications/websites/ecommerce/maximizing_revenue/cross_selling.rst:3 -msgid "How to sell accessories and optional products (cross-selling)" +msgid "Cross-selling: Accessory and Optional Products" msgstr "" #: ../../content/applications/websites/ecommerce/maximizing_revenue/cross_selling.rst:5 -msgid "You sell computers. Why not stimulating your customers to buy a top-notch screen or an extra-warranty? That's the goal of cross-selling functionalities:" +msgid "Any sales process is an opportunity to maximize revenues. For example, with an extended warranty or some accessories." msgstr "" #: ../../content/applications/websites/ecommerce/maximizing_revenue/cross_selling.rst:8 -msgid "Accessory products on checkout page," -msgstr "" - -#: ../../content/applications/websites/ecommerce/maximizing_revenue/cross_selling.rst:9 -msgid "Optional products on a new *Add to Cart* screen (not installed by default)." +msgid "To do so, you can use **Cross-selling**, a sales technique consisting in selling a customer something in addition to the product or service they were originally shopping for. It is a great way to maximize the value of each one of your customers." msgstr "" #: ../../content/applications/websites/ecommerce/maximizing_revenue/cross_selling.rst:12 -msgid "Accessory products when checking out" +msgid "It can be done via two different features:" msgstr "" #: ../../content/applications/websites/ecommerce/maximizing_revenue/cross_selling.rst:14 -msgid "Accessories (e.g. for computers: mouse, keyboard) show up when the customer reviews the cart before paying." +msgid ":ref:`Accessory products ` on the checkout page." +msgstr "" + +#: ../../content/applications/websites/ecommerce/maximizing_revenue/cross_selling.rst:15 +msgid ":ref:`Optional products ` on a new :guilabel:`Add to Cart` screen." msgstr "" #: ../../content/applications/websites/ecommerce/maximizing_revenue/cross_selling.rst:20 -msgid "Select accessories in the *Sales* tab of the product detail page." +msgid "Accessory Products" msgstr "" -#: ../../content/applications/websites/ecommerce/maximizing_revenue/cross_selling.rst:26 -msgid "There is an algorithm to figure out the best accessories to display in case several items are added to cart. If any item is the accessory of several products added to cart, it is most likely that it will be atop the list of suggested accessories." +#: ../../content/applications/websites/ecommerce/maximizing_revenue/cross_selling.rst:22 +msgid "**Accessory Products** are products that are displayed when customers review their cart before paying. As an example, you could suggest a mouse or a keyboard when someone buys a computer." msgstr "" -#: ../../content/applications/websites/ecommerce/maximizing_revenue/cross_selling.rst:31 -msgid "Optional products when adding to cart" +#: ../../content/applications/websites/ecommerce/maximizing_revenue/cross_selling.rst:25 +msgid "To add *Accessory Products*, go to :menuselection:`Website --> Products --> Products` and, under the :guilabel:`Sales Tab`, add your products to the :guilabel:`Accessory Products` field." msgstr "" -#: ../../content/applications/websites/ecommerce/maximizing_revenue/cross_selling.rst:33 -msgid "Optional products are directly related to the item added to cart (e.g. for computers: warranty, OS software, extra components). Whenever the main product is added to cart, such a new screen pops up as an extra step." +#: ../../content/applications/websites/ecommerce/maximizing_revenue/cross_selling.rst:32 +msgid "Now, go to your website and add the product to your cart. On the payment step, you can see your accessory products suggested to the customer." msgstr "" #: ../../content/applications/websites/ecommerce/maximizing_revenue/cross_selling.rst:40 -msgid "To publish optional products:" +msgid "`Odoo Tutorials: Alternative, Accessory, and Optional Products `_." msgstr "" -#: ../../content/applications/websites/ecommerce/maximizing_revenue/cross_selling.rst:42 -msgid "Install *eCommerce Optional Products* addon in *Apps* menu. Remove the default filter to search on addons as well, otherwise only main apps show up." +#: ../../content/applications/websites/ecommerce/maximizing_revenue/cross_selling.rst:46 +msgid "Optional Products" msgstr "" #: ../../content/applications/websites/ecommerce/maximizing_revenue/cross_selling.rst:48 -msgid "Select optional items from the *Sales* tab of the product detail form." +msgid "**Optional products** are products directly related to an item. Each time the product is added to a cart, a pop-up appears, suggesting other products to buy." msgstr "" -#: ../../content/applications/websites/ecommerce/maximizing_revenue/cross_selling.rst:54 -msgid "The quantity of optional items added to cart is the same than the main item." +#: ../../content/applications/websites/ecommerce/maximizing_revenue/cross_selling.rst:51 +msgid "To enable optional products, go to :menuselection:`Website --> Configuration --> Settings` and tick :guilabel:`Optional Products`. Then, go to :menuselection:`Website --> Products --> Products` and open the item you want to add an optional product to. In the :guilabel:`Sales tab` of that product, add as many optional products as you want." +msgstr "" + +#: ../../content/applications/websites/ecommerce/maximizing_revenue/cross_selling.rst:60 +msgid "From now, when a customer adds this product to their cart, a pop-up appears and suggests also adding the optional product(s)." +msgstr "" + +#: ../../content/applications/websites/ecommerce/maximizing_revenue/cross_selling.rst:68 +msgid ":doc:`upselling`" msgstr "" #: ../../content/applications/websites/ecommerce/maximizing_revenue/pricing.rst:3 @@ -517,10 +529,6 @@ msgstr "" msgid "Turn on *Alternative Products* from the *Customize* menu of the product web page." msgstr "" -#: ../../content/applications/websites/ecommerce/publish.rst:5 -msgid "Launch my website" -msgstr "" - #: ../../content/applications/websites/ecommerce/shopper_experience.rst:5 msgid "Get paid" msgstr "" @@ -594,7 +602,7 @@ msgid ":doc:`../../../finance/payment_acquirers`" msgstr "" #: ../../content/applications/websites/ecommerce/shopper_experience/payment_acquirer.rst:62 -msgid ":ref:`Payment Acquirers: Place a hold on a card `" +msgid ":ref:`Payment Acquirers: Place a hold on a card `" msgstr "" #: ../../content/applications/websites/ecommerce/shopper_experience/portal.rst:3 @@ -884,55 +892,71 @@ msgstr "" msgid "How to track your website traffic from your Odoo Dashboard" msgstr "" -#: ../../content/applications/websites/website/optimize/google_analytics_dashboard.rst:5 +#: ../../content/applications/websites/website/optimize/google_analytics_dashboard.rst:6 +msgid "It is not possible anymore for new Google Analytics accounts to integrate their **Google Analytics Dashboard** inside their **Odoo Dashboard**. Google deprecated **Universal Analytics** which won't be supported anymore in `July 2023 `_. They are replacing it with **Analytics 4**. New accounts are already using it." +msgstr "" + +#: ../../content/applications/websites/website/optimize/google_analytics_dashboard.rst:12 +msgid "**Analytics 4** `doesn't allow `_ its dashboard to be integrated in external websites." +msgstr "" + +#: ../../content/applications/websites/website/optimize/google_analytics_dashboard.rst:15 +msgid "You now have to check your Analytics data directly in the Google Platform as it won't be possible in Odoo anymore." +msgstr "" + +#: ../../content/applications/websites/website/optimize/google_analytics_dashboard.rst:18 +msgid "Accounts created before `October 2020 `_ should still be using **Universal Analytics** and be able to integrate their dashboard on external website until the official end of support `around mid 2023 `_." +msgstr "" + +#: ../../content/applications/websites/website/optimize/google_analytics_dashboard.rst:23 msgid "You can follow your traffic statistics straight from your Odoo Website Dashboard thanks to Google Analytics." msgstr "" -#: ../../content/applications/websites/website/optimize/google_analytics_dashboard.rst:8 +#: ../../content/applications/websites/website/optimize/google_analytics_dashboard.rst:26 msgid "A preliminary step is creating a Google Analytics account and entering the tracking ID in your Website's settings (see :doc:`google_analytics`)." msgstr "" -#: ../../content/applications/websites/website/optimize/google_analytics_dashboard.rst:11 +#: ../../content/applications/websites/website/optimize/google_analytics_dashboard.rst:29 msgid "Go to `Google APIs platform `__ to generate Analytics API credentials. Log in with your Google account." msgstr "" -#: ../../content/applications/websites/website/optimize/google_analytics_dashboard.rst:14 +#: ../../content/applications/websites/website/optimize/google_analytics_dashboard.rst:32 msgid "Select Analytics API." msgstr "" -#: ../../content/applications/websites/website/optimize/google_analytics_dashboard.rst:19 +#: ../../content/applications/websites/website/optimize/google_analytics_dashboard.rst:37 msgid "Create a new project and give it a name (e.g. Odoo). This project is needed to store your API credentials." msgstr "" -#: ../../content/applications/websites/website/optimize/google_analytics_dashboard.rst:25 +#: ../../content/applications/websites/website/optimize/google_analytics_dashboard.rst:43 msgid "Enable the API." msgstr "" -#: ../../content/applications/websites/website/optimize/google_analytics_dashboard.rst:30 +#: ../../content/applications/websites/website/optimize/google_analytics_dashboard.rst:48 msgid "Create credentials to use in Odoo." msgstr "" -#: ../../content/applications/websites/website/optimize/google_analytics_dashboard.rst:35 +#: ../../content/applications/websites/website/optimize/google_analytics_dashboard.rst:53 msgid "Select *Web browser (Javascript)* as calling source and *User data* as kind of data." msgstr "" -#: ../../content/applications/websites/website/optimize/google_analytics_dashboard.rst:41 +#: ../../content/applications/websites/website/optimize/google_analytics_dashboard.rst:59 msgid "Then you can create a Client ID. Enter the name of the application (e.g. Odoo) and the allowed pages on which you will be redirected. The *Authorized JavaScript origin* is your Odoo's instance URL. The *Authorized redirect URI* is your Odoo's instance URL followed by '/google_account/authentication'." msgstr "" -#: ../../content/applications/websites/website/optimize/google_analytics_dashboard.rst:51 +#: ../../content/applications/websites/website/optimize/google_analytics_dashboard.rst:69 msgid "Go through the Consent Screen step by entering a product name (e.g. Google Analytics in Odoo). Feel free to check the customizations options but this is not mandatory. The Consent Screen will only show up when you enter the Client ID in Odoo for the first time." msgstr "" -#: ../../content/applications/websites/website/optimize/google_analytics_dashboard.rst:56 +#: ../../content/applications/websites/website/optimize/google_analytics_dashboard.rst:74 msgid "Finally you are provided with your Client ID. Copy and paste it in Odoo." msgstr "" -#: ../../content/applications/websites/website/optimize/google_analytics_dashboard.rst:61 +#: ../../content/applications/websites/website/optimize/google_analytics_dashboard.rst:79 msgid "Open your Website Dashboard in Odoo and link your Analytics account to past your Client ID." msgstr "" -#: ../../content/applications/websites/website/optimize/google_analytics_dashboard.rst:67 +#: ../../content/applications/websites/website/optimize/google_analytics_dashboard.rst:85 msgid "As a last step, authorize Odoo to access Google API." msgstr "" @@ -1641,86 +1665,78 @@ msgid "Scalability" msgstr "" #: ../../content/applications/websites/website/optimize/seo.rst:561 -msgid "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 `_" +msgid "In addition to being fast, Odoo is also more scalable than traditional CMS and eCommerce (Drupal, Wordpress, Magento, Prestashop)." msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:568 -msgid "Todo" -msgstr "" - -#: ../../content/applications/websites/website/optimize/seo.rst:568 -msgid "fix above link" -msgstr "" - -#: ../../content/applications/websites/website/optimize/seo.rst:570 +#: ../../content/applications/websites/website/optimize/seo.rst:564 msgid "Here is the slide that summarizes the scalability of Odoo Website & eCommerce." msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:576 +#: ../../content/applications/websites/website/optimize/seo.rst:570 msgid "Search Engines Files" msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:579 +#: ../../content/applications/websites/website/optimize/seo.rst:573 msgid "Sitemap" msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:581 +#: ../../content/applications/websites/website/optimize/seo.rst:575 msgid "The sitemap points out pages to index to search engine robots. Odoo generates a ``/sitemap.xml`` file automatically for you. For performance reasons, this file is cached and updated every 12 hours." msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:585 +#: ../../content/applications/websites/website/optimize/seo.rst:579 msgid "By default, all URLs will be in a single ``/sitemap.xml`` file, but if you have a lot of pages, Odoo will automatically create a Sitemap Index file, respecting the `sitemaps.org protocol `__ grouping sitemap URL's in 45000 chunks per file." msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:591 +#: ../../content/applications/websites/website/optimize/seo.rst:585 msgid "Every sitemap entry has 4 attributes that are computed automatically:" msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:593 +#: ../../content/applications/websites/website/optimize/seo.rst:587 msgid "```` : the URL of a page" msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:595 +#: ../../content/applications/websites/website/optimize/seo.rst:589 msgid "```` : last modification date of the resource, computed automatically based on related object. For a page related to a product, this could be the last modification date of the product or the page." msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:600 +#: ../../content/applications/websites/website/optimize/seo.rst:594 msgid "```` : modules may implement their own priority algorithm based on their content (example: a forum might assign a priority based on the number of votes on a specific post). The priority of a static page is defined by it's priority field, which is normalized (16 is the default)." msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:607 +#: ../../content/applications/websites/website/optimize/seo.rst:601 msgid "Structured Data Markup" msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:609 +#: ../../content/applications/websites/website/optimize/seo.rst:603 msgid "Structured Data Markup is used to generate Rich Snippets in search engine results. It is a way for website owners to send structured data to search engine robots; helping them understand your content and create well-presented search results." msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:614 +#: ../../content/applications/websites/website/optimize/seo.rst:608 msgid "Google supports a number of rich snippets for content types, including: Reviews, People, Products, Businesses, Events and Organizations." msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:617 +#: ../../content/applications/websites/website/optimize/seo.rst:611 msgid "Odoo implements micro data as defined in the `schema.org `__ specification for events, eCommerce products, forum posts and contact addresses. This allows your product pages to be displayed in Google using extra information like the price and rating of a product:" msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:627 +#: ../../content/applications/websites/website/optimize/seo.rst:621 msgid "robots.txt" msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:629 +#: ../../content/applications/websites/website/optimize/seo.rst:623 msgid "When indexing your website, search engines take a first look at the general indexing rules of the a``/robots.txt`` file (allowed robots, sitemap path, etc.). Odoo automatically creates it. Its content is:" msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:633 +#: ../../content/applications/websites/website/optimize/seo.rst:627 msgid "User-agent: \\* Sitemap: https://www.odoo.com/sitemap.xml" msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:636 +#: ../../content/applications/websites/website/optimize/seo.rst:630 msgid "It means that all robots are allowed to index your website and there is no other indexing rule than specified in the sitemap to be found at following address." msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:640 +#: ../../content/applications/websites/website/optimize/seo.rst:634 msgid "You can customize the file *robots* in :ref:`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." msgstr "" @@ -1904,191 +1920,207 @@ msgstr "" msgid ":doc:`/administration/maintain/domain_names`" msgstr "" -#: ../../content/applications/websites/website/publish/multi_website.rst:130 +#: ../../content/applications/websites/website/publish/multi_website.rst:129 +msgid "If you setup an extra website and specify the domain name you will have to do three things to get this feature to work:" +msgstr "" + +#: ../../content/applications/websites/website/publish/multi_website.rst:132 +msgid "Setup an A-record in the DNS configuration of your hosting provider so that \"www.mywebsite2.ext\" is redirected to the IP of your Odoo instance." +msgstr "" + +#: ../../content/applications/websites/website/publish/multi_website.rst:134 +msgid "Create an extra Nginx ``server`` block in which you set the ``server_name`` that you've set in the :guilabel:`Website domain` field." +msgstr "" + +#: ../../content/applications/websites/website/publish/multi_website.rst:136 +msgid "Reload and restart your Nginx instance to use the new ``server`` block." +msgstr "" + +#: ../../content/applications/websites/website/publish/multi_website.rst:139 msgid "Customize the visitor experience" msgstr "" -#: ../../content/applications/websites/website/publish/multi_website.rst:133 +#: ../../content/applications/websites/website/publish/multi_website.rst:142 msgid "The customer experience can be customized very profoundly thanks to the menu \\*Customize\\*. All the visual options available there are specific to each website. Go through the different pages to adapt them to this new audience. Focus on workflows, and automatic pages (eCommerce checkout, blogs, events, etc.) as the number of available options is higher there." msgstr "" -#: ../../content/applications/websites/website/publish/multi_website.rst:143 +#: ../../content/applications/websites/website/publish/multi_website.rst:152 msgid "Publish specific content per website" msgstr "" -#: ../../content/applications/websites/website/publish/multi_website.rst:146 +#: ../../content/applications/websites/website/publish/multi_website.rst:155 msgid "Like static pages, any content created from the front-end (product, blog post, etc.) is always only published in the current website. You can change that from the edit form view in the backend and leave the *Website* field blank. This will publish it in all the websites." msgstr "" -#: ../../content/applications/websites/website/publish/multi_website.rst:154 +#: ../../content/applications/websites/website/publish/multi_website.rst:163 msgid "Here are all the objects that you can link to *either one or all the websites*:" msgstr "" -#: ../../content/applications/websites/website/publish/multi_website.rst:157 +#: ../../content/applications/websites/website/publish/multi_website.rst:166 msgid "Products" msgstr "" -#: ../../content/applications/websites/website/publish/multi_website.rst:159 +#: ../../content/applications/websites/website/publish/multi_website.rst:168 msgid "Product Categories for eCommerce" msgstr "" -#: ../../content/applications/websites/website/publish/multi_website.rst:161 +#: ../../content/applications/websites/website/publish/multi_website.rst:170 msgid "Blogs" msgstr "" -#: ../../content/applications/websites/website/publish/multi_website.rst:163 +#: ../../content/applications/websites/website/publish/multi_website.rst:172 msgid "Slide Channels" msgstr "" -#: ../../content/applications/websites/website/publish/multi_website.rst:165 +#: ../../content/applications/websites/website/publish/multi_website.rst:174 msgid "Forums" msgstr "" -#: ../../content/applications/websites/website/publish/multi_website.rst:167 +#: ../../content/applications/websites/website/publish/multi_website.rst:176 msgid "Events" msgstr "" -#: ../../content/applications/websites/website/publish/multi_website.rst:169 +#: ../../content/applications/websites/website/publish/multi_website.rst:178 msgid "Job Positions" msgstr "" -#: ../../content/applications/websites/website/publish/multi_website.rst:172 +#: ../../content/applications/websites/website/publish/multi_website.rst:181 msgid "When you create the record from the backend and publish it, typically a product or an event, it is made available in all websites." msgstr "" -#: ../../content/applications/websites/website/publish/multi_website.rst:176 +#: ../../content/applications/websites/website/publish/multi_website.rst:185 msgid "Publish a page in all websites" msgstr "" -#: ../../content/applications/websites/website/publish/multi_website.rst:178 +#: ../../content/applications/websites/website/publish/multi_website.rst:187 msgid "A new static page is created and only made available in the current website. You can duplicate it to other websites from :menuselection:`Website --> Configuration --> Pages`. To do so, leave the *Website* field empty." msgstr "" -#: ../../content/applications/websites/website/publish/multi_website.rst:182 +#: ../../content/applications/websites/website/publish/multi_website.rst:191 msgid "If you want to duplicate it in just one other website, duplicate the page and set the new website." msgstr "" -#: ../../content/applications/websites/website/publish/multi_website.rst:188 +#: ../../content/applications/websites/website/publish/multi_website.rst:197 msgid "When you edit the page again, the change only affects the current website. A new page is duplicated and tied up to the website. The original page still being linked to all websites." msgstr "" -#: ../../content/applications/websites/website/publish/multi_website.rst:193 +#: ../../content/applications/websites/website/publish/multi_website.rst:202 msgid "By grouping pages by URL in the page manager, you quickly find the original page behind each edited page." msgstr "" -#: ../../content/applications/websites/website/publish/multi_website.rst:200 +#: ../../content/applications/websites/website/publish/multi_website.rst:209 msgid "Multi-companies" msgstr "" -#: ../../content/applications/websites/website/publish/multi_website.rst:202 +#: ../../content/applications/websites/website/publish/multi_website.rst:211 msgid "Each website can be linked to a specific company of your system, in a multi-companies environment." msgstr "" -#: ../../content/applications/websites/website/publish/multi_website.rst:208 +#: ../../content/applications/websites/website/publish/multi_website.rst:217 msgid "With such a configuration, only company-related data appear on the website (products, jobs, events, etc.)." msgstr "" -#: ../../content/applications/websites/website/publish/multi_website.rst:211 +#: ../../content/applications/websites/website/publish/multi_website.rst:220 msgid "Website editors can only view and edit the pages of the records they have access to, typically the ones belonging to their current company (and to their subsidiaries, or child companies in Odoo language). And so is it for visitors." msgstr "" -#: ../../content/applications/websites/website/publish/multi_website.rst:217 +#: ../../content/applications/websites/website/publish/multi_website.rst:226 msgid "If websites are multi-companies, you don’t change company when switching websites. To change the company and see the related content, use the company selector in the menu." msgstr "" -#: ../../content/applications/websites/website/publish/multi_website.rst:223 +#: ../../content/applications/websites/website/publish/multi_website.rst:232 msgid "Configure your eCommerce website" msgstr "" -#: ../../content/applications/websites/website/publish/multi_website.rst:225 +#: ../../content/applications/websites/website/publish/multi_website.rst:234 msgid "eCommerce is a crucial feature in the multi-websites environment. We made it so that the entire flow can be customized to fit the very audience of each website." msgstr "" -#: ../../content/applications/websites/website/publish/multi_website.rst:230 +#: ../../content/applications/websites/website/publish/multi_website.rst:239 msgid "Products only available on one website" msgstr "" -#: ../../content/applications/websites/website/publish/multi_website.rst:232 +#: ../../content/applications/websites/website/publish/multi_website.rst:241 msgid "We already saw earlier how to publish a specific record in only one website. You will find the \\*Website\\* field in the eCommerce tab of the product edit form. Empty means available in all websites." msgstr "" -#: ../../content/applications/websites/website/publish/multi_website.rst:240 +#: ../../content/applications/websites/website/publish/multi_website.rst:249 msgid "Products available on *some* websites" msgstr "" -#: ../../content/applications/websites/website/publish/multi_website.rst:242 +#: ../../content/applications/websites/website/publish/multi_website.rst:251 msgid "To make a product available on some websites, but not all of them, you should duplicate the product for each website." msgstr "" -#: ../../content/applications/websites/website/publish/multi_website.rst:245 +#: ../../content/applications/websites/website/publish/multi_website.rst:254 msgid "If you need a unique reference to manage in your inventory, you should install *Manufacturing\\ and create *Kits* BoMs (bills of materials). Each kit will link each published “virtual” product to the main reference managed in your inventory. That way, any item sold from your website will be converted into the storable item in the delivery order." msgstr "" -#: ../../content/applications/websites/website/publish/multi_website.rst:252 +#: ../../content/applications/websites/website/publish/multi_website.rst:261 msgid "Pricelists" msgstr "" -#: ../../content/applications/websites/website/publish/multi_website.rst:254 +#: ../../content/applications/websites/website/publish/multi_website.rst:263 msgid "To manage specific prices by websites, you can activate *Multiple Sales Prices per Product* in Website settings." msgstr "" -#: ../../content/applications/websites/website/publish/multi_website.rst:257 +#: ../../content/applications/websites/website/publish/multi_website.rst:266 msgid "Then, go to :menuselection:`Website --> Products --> Pricelists` to create additional pricelists. See :doc:`../../ecommerce/maximizing_revenue/pricing`." msgstr "" -#: ../../content/applications/websites/website/publish/multi_website.rst:260 +#: ../../content/applications/websites/website/publish/multi_website.rst:269 msgid "If you need help. Select a website to make a pricelist only available on this website." msgstr "" -#: ../../content/applications/websites/website/publish/multi_website.rst:266 +#: ../../content/applications/websites/website/publish/multi_website.rst:275 msgid "Leaving the field empty means that you make it work in all websites if *Selectable* is selected. Otherwise, it makes it only available for backend operations of Sales and Point of Sale applications." msgstr "" -#: ../../content/applications/websites/website/publish/multi_website.rst:271 +#: ../../content/applications/websites/website/publish/multi_website.rst:280 msgid "Payment Acquirers and Delivery Methods" msgstr "" -#: ../../content/applications/websites/website/publish/multi_website.rst:273 +#: ../../content/applications/websites/website/publish/multi_website.rst:282 msgid "By default, published payment acquirers and delivery methods are deployed in all websites. You could already use specific payment acquirers per country using Geo IP by defining countries in their configuration. Now you can also do it per website by filling in the *Website* field." msgstr "" -#: ../../content/applications/websites/website/publish/multi_website.rst:279 +#: ../../content/applications/websites/website/publish/multi_website.rst:288 msgid "Customer accounts" msgstr "" -#: ../../content/applications/websites/website/publish/multi_website.rst:281 +#: ../../content/applications/websites/website/publish/multi_website.rst:290 msgid "There is a setting to choose how to manage customer accounts in Website settings. You can either allow customers to use one account through all the websites or compel them to create one account for each website. This last option is convenient if your websites shouldn’t be related to each other in the visitor mind." msgstr "" -#: ../../content/applications/websites/website/publish/multi_website.rst:291 +#: ../../content/applications/websites/website/publish/multi_website.rst:300 msgid "Technical hints for customization" msgstr "" -#: ../../content/applications/websites/website/publish/multi_website.rst:293 +#: ../../content/applications/websites/website/publish/multi_website.rst:302 msgid "If you want to publish custom objects on the website, here are a few tips to make it work with multi websites:" msgstr "" -#: ../../content/applications/websites/website/publish/multi_website.rst:297 +#: ../../content/applications/websites/website/publish/multi_website.rst:306 msgid "Sitemap: don’t forget the domain in the route to only publish" msgstr "" -#: ../../content/applications/websites/website/publish/multi_website.rst:297 +#: ../../content/applications/websites/website/publish/multi_website.rst:306 msgid "available records in each website’s sitemap." msgstr "" -#: ../../content/applications/websites/website/publish/multi_website.rst:301 +#: ../../content/applications/websites/website/publish/multi_website.rst:310 msgid "Access: you should call the method" msgstr "" -#: ../../content/applications/websites/website/publish/multi_website.rst:300 +#: ../../content/applications/websites/website/publish/multi_website.rst:309 msgid "*can_access_from_current_website* in the controller to make sure the visitor can see a record in the current website." msgstr "" -#: ../../content/applications/websites/website/publish/multi_website.rst:305 +#: ../../content/applications/websites/website/publish/multi_website.rst:314 msgid "Search: when a list of records is displayed, don’t forget to specify" msgstr "" -#: ../../content/applications/websites/website/publish/multi_website.rst:304 +#: ../../content/applications/websites/website/publish/multi_website.rst:313 msgid "the domain to only display records available for the current website." msgstr "" @@ -2125,7 +2157,7 @@ msgid "If you can't/don't want to locate the geoip database in ``/usr/share/GeoI msgstr "" #: ../../content/applications/websites/website/publish/on-premise_geo-ip-installation.rst:36 -msgid ":doc:`CLI documentation `." +msgid ":doc:`CLI documentation `." msgstr "" #: ../../content/applications/websites/website/publish/on-premise_geo-ip-installation.rst:39