diff --git a/locale/de/LC_MESSAGES/administration.po b/locale/de/LC_MESSAGES/administration.po index 61dc28ffa..0199d094d 100644 --- a/locale/de/LC_MESSAGES/administration.po +++ b/locale/de/LC_MESSAGES/administration.po @@ -8,6 +8,7 @@ # Leon Grill , 2022 # philku79 , 2022 # Thorsten Vocks , 2022 +# Johannes Croe , 2022 # Martin Trigaux, 2022 # #, fuzzy @@ -15,7 +16,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: 2022-03-18 14:59+0000\n" "Last-Translator: Martin Trigaux, 2022\n" "Language-Team: German (https://www.transifex.com/odoo/teams/41243/de/)\n" @@ -231,9 +232,9 @@ msgid "" 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 "" @@ -1238,7 +1239,7 @@ msgid "" msgstr "" #: ../../content/administration/install/install.rst:90 -#: ../../content/administration/install/install.rst:252 +#: ../../content/administration/install/install.rst:254 msgid "Windows" msgstr "" @@ -1275,7 +1276,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 "" @@ -1291,9 +1292,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 "Vorbereiten" @@ -1307,9 +1308,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 " @@ -1453,194 +1454,202 @@ msgid "" "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 "Archiv" -#: ../../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 +#: ../../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." +"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)" -msgstr "" - -#: ../../content/administration/install/install.rst:292 -#: ../../content/administration/install/install.rst:458 -#: ../../content/administration/install/install.rst:629 +#: ../../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 " +"**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." +"installation. See :ref:`setup/install/editions` to get access to the " +"Enterprise repository." +msgstr "" + +#: ../../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 "Abhängigkeiten" -#: ../../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 " @@ -1649,149 +1658,147 @@ msgid "" "**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 " @@ -1799,86 +1806,100 @@ msgid "" "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." @@ -1932,11 +1953,23 @@ msgid "" "``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" @@ -1944,7 +1977,7 @@ msgid "" "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. " @@ -1954,7 +1987,7 @@ msgid "" "``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 " @@ -1962,37 +1995,37 @@ msgid "" " 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 " @@ -2000,25 +2033,25 @@ msgid "" "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 " @@ -2026,15 +2059,15 @@ msgid "" "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 " @@ -2043,88 +2076,88 @@ msgid "" ":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 --> " @@ -2132,29 +2165,29 @@ msgid "" "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 " @@ -2162,7 +2195,7 @@ msgid "" ":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 " @@ -2170,81 +2203,81 @@ msgid "" "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 " @@ -2252,33 +2285,33 @@ msgid "" " 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. " @@ -2286,7 +2319,7 @@ msgid "" "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 " @@ -2294,11 +2327,11 @@ msgid "" "`_ 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, " @@ -2306,7 +2339,7 @@ msgid "" "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 " @@ -2314,135 +2347,135 @@ msgid "" "`_." 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 " @@ -2450,7 +2483,7 @@ msgid "" "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 " @@ -2459,7 +2492,7 @@ msgid "" "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 "" @@ -2587,6 +2620,312 @@ msgid "" "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 "Neues Projekt erstellen" + +#: ../../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 "" @@ -2603,30 +2942,24 @@ 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" @@ -2634,46 +2967,56 @@ msgid "" " 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 +#: ../../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: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 "From on-premises to Odoo.sh" msgstr "" -#: ../../content/administration/maintain/hosting_changes.rst:26 -#: ../../content/administration/maintain/hosting_changes.rst:43 +#: ../../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:27 +#: ../../content/administration/maintain/hosting_changes.rst:30 msgid "...and voilà!" msgstr "" -#: ../../content/administration/maintain/hosting_changes.rst:30 +#: ../../content/administration/maintain/hosting_changes.rst:33 msgid "From Odoo Online to on-premises" msgstr "" -#: ../../content/administration/maintain/hosting_changes.rst:32 -#: ../../content/administration/maintain/hosting_changes.rst:40 +#: ../../content/administration/maintain/hosting_changes.rst:35 +#: ../../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:33 +#: ../../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" @@ -2681,8 +3024,8 @@ msgid "" "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 +#: ../../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" @@ -2690,16 +3033,16 @@ msgid "" "`_)" msgstr "" -#: ../../content/administration/maintain/hosting_changes.rst:35 -#: ../../content/administration/maintain/hosting_changes.rst:60 +#: ../../content/administration/maintain/hosting_changes.rst:38 +#: ../../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:38 +#: ../../content/administration/maintain/hosting_changes.rst:41 msgid "From Odoo Online to Odoo.sh" msgstr "" -#: ../../content/administration/maintain/hosting_changes.rst:41 +#: ../../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 " @@ -2707,28 +3050,99 @@ msgid "" "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)." +"`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 "Europa" + +#: ../../content/administration/maintain/hosting_changes.rst:61 +msgid "Asia" +msgstr "Asien" + +#: ../../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 "Fertig!" + +#: ../../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 " "`." @@ -3031,6 +3445,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 "Aktualisieren" @@ -3148,7 +3563,7 @@ msgid "" 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 "Löschen" @@ -3494,21 +3909,21 @@ 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 `_." @@ -3770,6 +4185,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 "Übersicht" @@ -3930,7 +4346,7 @@ msgstr "" #: ../../content/administration/odoo_sh/advanced/containers.rst:169 msgid "" "More options are available and detailed in the :doc:`CLI documentation " -"`." +"`." msgstr "" #: ../../content/administration/odoo_sh/advanced/containers.rst:172 @@ -4314,7 +4730,7 @@ msgstr "" 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 @@ -4760,7 +5176,15 @@ msgid "" "gettingstarted-builds>`." 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 @@ -4768,17 +5192,17 @@ msgstr "" msgid "Settings" msgstr "Einstellungen" -#: ../../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 " @@ -4791,48 +5215,48 @@ msgid "" "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 " @@ -4840,31 +5264,31 @@ msgid "" "`." 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" @@ -4872,75 +5296,75 @@ msgid "" "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 " @@ -4952,11 +5376,11 @@ msgid "" " 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 " @@ -4964,18 +5388,18 @@ msgid "" "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 " @@ -4986,23 +5410,23 @@ msgid "" "`." 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 " @@ -5010,178 +5434,178 @@ msgid "" "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 "Zusammenführen" -#: ../../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 "Einrichtung" -#: ../../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 "Verbindung" -#: ../../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 "" @@ -5820,9 +6244,9 @@ msgstr "" #: ../../content/administration/odoo_sh/getting_started/first_module.rst:97 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." +":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 @@ -6314,69 +6738,69 @@ 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 " @@ -6386,62 +6810,62 @@ msgid "" "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 " @@ -6456,7 +6880,7 @@ msgid "" "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 " @@ -6464,7 +6888,7 @@ msgid "" "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." @@ -6473,11 +6897,11 @@ msgid "" " 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 " @@ -6488,20 +6912,20 @@ msgid "" " 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 " @@ -6510,13 +6934,13 @@ msgid "" "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 " @@ -6524,7 +6948,7 @@ msgid "" "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." @@ -6886,7 +7310,6 @@ msgid "|assistance-contact|" msgstr "" #: ../../content/administration/upgrade.rst:32 -#: ../../content/administration/upgrade/odoo_sh.rst:66 msgid ":ref:`upgrade/sla`" msgstr "" @@ -7656,122 +8079,195 @@ msgid "" "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 +#: ../../content/administration/upgrade/odoo_sh.rst:13 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*." +"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." +"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 +#: ../../content/administration/upgrade/odoo_sh.rst:24 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." +"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 ":doc:`../../administration/upgrade`" +msgstr "" + +#: ../../content/administration/upgrade/odoo_sh.rst:30 +msgid ":doc:`Upgrade FAQ <../upgrade/faq>`" +msgstr "" + +#: ../../content/administration/upgrade/odoo_sh.rst:31 +msgid ":doc:`Introduction to Odoo.sh <../odoo_sh/overview/introduction>`" +msgstr "" + +#: ../../content/administration/upgrade/odoo_sh.rst:36 +msgid "Upgrade your custom modules" +msgstr "" + +#: ../../content/administration/upgrade/odoo_sh.rst:38 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." -msgstr "" - -#: ../../content/administration/upgrade/odoo_sh.rst:32 -msgid "" -"Test the upgraded database and make sure everything runs as it's supposed " -"to." -msgstr "" - -#: ../../content/administration/upgrade/odoo_sh.rst:35 -#: ../../content/administration/upgrade/on_premise.rst:41 -msgid "Upgrade your production database" -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:" -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." +"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." +"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." -msgstr "" - -#: ../../content/administration/upgrade/odoo_sh.rst:58 -#: ../../content/administration/upgrade/on_premise.rst:53 +#: ../../content/administration/upgrade/odoo_sh.rst:62 msgid "" -"Your custom modules also need to be upgraded to keep them compatible with " -"the new version." +"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:60 +#: ../../content/administration/upgrade/odoo_sh.rst:66 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')" +"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: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 @@ -7839,6 +8335,10 @@ msgid "" "`_." 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" @@ -7846,12 +8346,26 @@ msgid "" "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" diff --git a/locale/de/LC_MESSAGES/finance.po b/locale/de/LC_MESSAGES/finance.po index 7d691e6a4..6db4424ea 100644 --- a/locale/de/LC_MESSAGES/finance.po +++ b/locale/de/LC_MESSAGES/finance.po @@ -6,20 +6,19 @@ # Translators: # Andreas Jonderko , 2022 # Thorsten Vocks , 2022 +# Leon Grill , 2022 # e2f , 2022 # EugenBrodskiSAMSAIT , 2022 # Jan Meyer, 2022 +# Chris Egal , 2022 # Udo Hennig , 2022 -# f91684c3ff9ec3e650d5c8461e534581_686eae3 <449b96d9f63071f94d89e129677b83de_366193>, 2022 # Robert Förster , 2022 # Tina Rittmüller , 2022 # Rudolf Schnapka , 2022 +# philku79 , 2022 # Philipp Hug , 2022 # Cécile Collart , 2022 -# Chris Egal , 2022 -# philku79 , 2022 # Felix Schubert , 2022 -# Leon Grill , 2022 # Wolfgang Taferner, 2022 # Martin Trigaux, 2022 # Friederike Fasterling-Nesselbosch, 2022 @@ -29,7 +28,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: 2021-11-02 08:47+0000\n" "Last-Translator: Friederike Fasterling-Nesselbosch, 2022\n" "Language-Team: German (https://www.transifex.com/odoo/teams/41243/de/)\n" @@ -70,33 +69,25 @@ msgstr "" #: ../../content/applications/finance/accounting.rst:18 msgid "" -"`Odoo Tutorials: Invoicing `_" -msgstr "" -"`Odoo Tutorials: Rechnungsstellung " -"`_" - -#: ../../content/applications/finance/accounting.rst:19 -msgid "" "`Odoo Tutorials: Accounting `_" msgstr "" "`Odoo Tutorials: Buchhaltung `_" -#: ../../content/applications/finance/accounting.rst:20 +#: ../../content/applications/finance/accounting.rst:19 msgid ":doc:`Accounting Cheat Sheet `" msgstr "doc:`Spickzettel für die Buchführung `" #: ../../content/applications/finance/accounting/bank.rst:5 -msgid "Bank & Cash" -msgstr "Bank & Kasse" +msgid "Bank and cash" +msgstr "" #: ../../content/applications/finance/accounting/bank/feeds.rst:5 -msgid "Bank Feeds" -msgstr "Bank Datenübertragung" +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" -msgstr "Bankauszüge" +msgid "Bank statements" +msgstr "Bankauszug" #: ../../content/applications/finance/accounting/bank/feeds/bank_statements.rst:5 msgid "" @@ -258,8 +249,8 @@ msgid "add doc link to new documentation about reconciliation" msgstr "link zur neuen Dokumentation für die Abstimmung hinzufügen" #: ../../content/applications/finance/accounting/bank/feeds/bank_synchronization.rst:3 -msgid "Bank Synchronization: Automatic Import" -msgstr "Bank Synchronisierung: Automatischer Import" +msgid "Bank synchronization: Automatic import" +msgstr "" #: ../../content/applications/finance/accounting/bank/feeds/bank_synchronization.rst:5 msgid "" @@ -306,6 +297,10 @@ msgid "**Ponto**: Europe (:doc:`more information `)" msgstr "**Ponto**: Europa (:doc:`Weitere Informationen`)" #: ../../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 @@ -313,6 +308,7 @@ msgstr "**Ponto**: Europa (:doc:`Weitere Informationen`)" #: ../../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 @@ -332,6 +328,7 @@ msgstr "**Ponto**: Europa (:doc:`Weitere Informationen`)" #: ../../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 @@ -340,6 +337,7 @@ msgstr "**Ponto**: Europa (:doc:`Weitere Informationen`)" #: ../../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 @@ -350,7 +348,7 @@ msgstr "**Ponto**: Europa (:doc:`Weitere Informationen`)" #: ../../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 @@ -361,11 +359,11 @@ msgstr "**Ponto**: Europa (:doc:`Weitere Informationen`)" msgid "Configuration" msgstr "Konfiguration" -#: ../../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 "On-Premise-Benutzer" -#: ../../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 " @@ -380,15 +378,15 @@ msgstr "" "Verbindungsfehlers stellen Sie bitte sicher, dass Sie keine Firewall oder " "einen Proxy haben, der die folgende Adresse blockiert:" -#: ../../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 "https://production.odoofin.com/" -#: ../../content/applications/finance/accounting/bank/feeds/bank_synchronization.rst:39 +#: ../../content/applications/finance/accounting/bank/feeds/bank_synchronization.rst:42 msgid "First Synchronization" msgstr "Erste Synchronisierung" -#: ../../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 " @@ -398,7 +396,7 @@ msgstr "" "Konfiguration --> Bankkonto hinzufügen` oder über die Konfigurationsleiste " "auf dem Buchhaltung Dashboard starten." -#: ../../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." @@ -406,7 +404,7 @@ msgstr "" "Jetzt können Sie nach Ihrem Bankinstitut suchen. Wählen Sie es aus und " "folgen Sie den Schritten zur Synchronisierung mit ihm." -#: ../../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." @@ -415,7 +413,7 @@ msgstr "" " sich bitte, dass Ihr Webbrowser keine Pop-ups blockiert und dass Ihr " "Adblocker deaktiviert ist." -#: ../../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" @@ -435,7 +433,7 @@ msgstr "" "herzustellen. Diese Informationen werden nicht auf den Servern von Odoo " "gespeichert." -#: ../../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 " @@ -446,7 +444,7 @@ msgstr "" "Monat erstellt. Sie können die Periodizität der Kontoauszugserstellung in " "Ihren Journaleinstellungen ändern." -#: ../../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`." @@ -454,11 +452,11 @@ msgstr "" "Sie können alle Ihre Synchronisierungen unter :menuselection:`Finanzen --> " "Konfiguration --> Online Synchronization` finden." -#: ../../content/applications/finance/accounting/bank/feeds/bank_synchronization.rst:65 +#: ../../content/applications/finance/accounting/bank/feeds/bank_synchronization.rst:68 msgid "Synchronize manually" msgstr "Manuell synchronisieren" -#: ../../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 " @@ -469,7 +467,7 @@ msgstr "" "manuell synchronisieren, indem Sie auf die Schaltfläche *Jetzt " "synchronisieren* auf dem Dashboard klicken." -#: ../../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 " @@ -479,7 +477,7 @@ msgstr "" "Synchronization`, wählen Ihre Bank aus und klicken dann auf die Schaltfläche" " *Transaktionen abrufen*." -#: ../../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" @@ -495,15 +493,15 @@ msgstr "" "finden Sie im Chat Ihrer Online-Synchronisationen. Führen Sie in diesem Fall" " unbedingt manuelle Synchronisationen durch." -#: ../../content/applications/finance/accounting/bank/feeds/bank_synchronization.rst:89 +#: ../../content/applications/finance/accounting/bank/feeds/bank_synchronization.rst:92 msgid "Issues" msgstr "Probleme" -#: ../../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 "Fehlerhafte Synchronisierung" -#: ../../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 --> " @@ -516,11 +514,11 @@ msgstr "" "wählen Sie die fehlgeschlagene Verbindung aus und kopieren Sie die " "Fehlerbeschreibung und die Referenz." -#: ../../content/applications/finance/accounting/bank/feeds/bank_synchronization.rst:99 +#: ../../content/applications/finance/accounting/bank/feeds/bank_synchronization.rst:102 msgid "Synchronization disconnected" msgstr "Synchronisation unterbrochen" -#: ../../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." @@ -529,7 +527,7 @@ msgstr "" "Verbindung mit dem Proxy über die Schaltfläche *Wiederverbinden* " "wiederherstellen." -#: ../../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" @@ -540,12 +538,12 @@ msgstr "" "`_ mit Ihrer Kundennummer oder der Referenz des " "Fehlers, der im Chat aufgeführt ist." -#: ../../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 "" "Migrationsprozess für Benutzer, die Odoo vor Dezember 2020 installiert haben" -#: ../../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." @@ -553,7 +551,7 @@ msgstr "" "Wenn Sie On-Premise arbeiten, vergewissern Sie sich bitte zunächst, dass " "Ihre Quelle mit der neuesten Version von Odoo aktualisiert ist." -#: ../../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." @@ -561,7 +559,7 @@ msgstr "" "Nutzer, die vor Dezember 2020 eine Datenbank erstellt haben, müssen das neue" " Modul manuell installieren, um die neuen Funktionen nutzen zu können." -#: ../../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: " @@ -573,7 +571,7 @@ msgstr "" "**account_online_synchronization**. Sie können dann auf die Schaltfläche " "*Installieren* klicken, um das neue Modul zu installieren." -#: ../../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." @@ -581,7 +579,7 @@ msgstr "" "Zum Schluss stellen Sie sicher, dass alle Ihre Benutzer ihre Odoo-Fenster " "durch Drücken von STRG+F5 aktualisieren." -#: ../../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 " @@ -595,7 +593,7 @@ msgstr "" "Synchronization`). Es ist nicht möglich, diese Verbindungen erneut zu " "synchronisieren; Sie müssen neue Verbindungen konfigurieren." -#: ../../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." @@ -603,7 +601,7 @@ msgstr "" "Bitte deinstallieren Sie nicht *account_online_sync*, das bisherige Modul " "für die Online-Synchronisation. Das neue Modul überschreibt es." -#: ../../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." @@ -611,17 +609,17 @@ msgstr "" "Standardmäßig wird *account_online_synchronization* automatisch mit Finanzen" " installiert." -#: ../../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 "FAQ" -#: ../../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 "Die Synchronisierung funktioniert nicht in Echtzeit. Ist das normal?" -#: ../../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 " @@ -643,7 +641,7 @@ msgstr "" "synchronisieren* nicht Ihre neuesten Transaktionen abruft, wenn Sie diese " "Aktion bereits früher am Tag durchgeführt haben." -#: ../../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" @@ -655,12 +653,12 @@ msgstr "" "Transaktionen mit dem Status *Gebucht* abgerufen. Wenn sie noch nicht " "*Gebucht* ist, müssen Sie warten, bis sich der Status ändert." -#: ../../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 "" "Ist die Funktion Online-Bank-Synchronisation in meinem Vertrag enthalten?" -#: ../../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." @@ -668,14 +666,14 @@ msgstr "" "**Community Version**: Nein, diese Funktion ist in der Community-Version " "nicht enthalten." -#: ../../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 "" "**Online-Version**: Ja, auch wenn Sie den One App Free-Vertrag in Anspruch " "nehmen." -#: ../../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." @@ -683,11 +681,11 @@ msgstr "" "**Enterprise Version**: Ja, wenn Sie einen gültigen Unternehmensvertrag mit " "Ihrer Datenbank verknüpft haben." -#: ../../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 "Einige Banken haben den Status \"Beta\" Was bedeutet das?" -#: ../../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 " @@ -704,13 +702,13 @@ msgstr "" "Entwicklungsprozess bei, da der Provider über echte Daten und Rückmeldungen " "aus der Verbindung verfügt." -#: ../../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 "" "Warum werden meine Transaktionen nur synchronisiert, wenn ich sie manuell " "aktualisiere?" -#: ../../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," @@ -722,12 +720,12 @@ msgstr "" "andere Art von MFA. Aus diesem Grund kann der Integrator keine Transaktionen" " durchführen, bis der Sicherheitscode bereitgestellt wird." -#: ../../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 "" "Warum sind nicht alle meine vergangenen Transaktionen in Odoo enthalten?" -#: ../../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." @@ -735,11 +733,11 @@ msgstr "" "Bei einigen Instituten können Transaktionen nur bis zu 3 Monate in der " "Vergangenheit abgefragt werden." -#: ../../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 "Warum sehe ich keine Transaktionen?" -#: ../../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 " @@ -753,11 +751,11 @@ msgstr "" "Konfiguration --> Online-Synchronisation` auf die Schaltfläche *Konten " "abrufen* auf der Verbindung klicken." -#: ../../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 "Es darf auch keine neuen Transaktionen geben." -#: ../../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 " @@ -767,11 +765,11 @@ msgstr "" "gebuchte Transaktionen in Ihrer Datenbank nicht sichtbar sind, senden Sie " "bitte ein Support-Ticket `_." -#: ../../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 "Wie kann ich meine Zugangsdaten aktualisieren?" -#: ../../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 " @@ -782,18 +780,18 @@ msgstr "" "gehen, die Verbindung öffnen, die Sie aktualisieren möchten, und auf die " "Schaltfläche *Zugangsdaten aktualisieren* klicken." -#: ../../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 ":doc:`bank_statements`" -#: ../../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 ":doc:`ponto`" -#: ../../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 ":doc:`saltedge`" @@ -1452,11 +1450,8 @@ msgstr "" "denselben Vermerk angeben." #: ../../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" -msgstr "Kontenabgleich" +msgid "Bank reconciliation" +msgstr "Ausgleich Bankkonto" #: ../../content/applications/finance/accounting/bank/reconciliation/reconciliation_models.rst:3 msgid "Reconciliation Models" @@ -1600,7 +1595,7 @@ msgstr "" " dann das Formular aus." #: ../../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 "Typ" @@ -2413,16 +2408,94 @@ msgstr "" "Die Transaktionen werden der aktuellen Erfassung für Barzahlungen " "hinzugefügt." +#: ../../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" -msgstr "Steuerliche Lokalisierungen" +msgid "Fiscal localizations" +msgstr "" #: ../../content/applications/finance/accounting/fiscal_localizations/localizations.rst:5 msgid "Localizations" msgstr "Lokalisierungen" #: ../../content/applications/finance/accounting/fiscal_localizations/localizations/argentina.rst:3 -#: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:13 msgid "Argentina" msgstr "Argentinien" @@ -3547,7 +3620,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 "Lieferantenrechnungen" @@ -5110,7 +5182,6 @@ msgstr "" "geliefert, die beim SII eingegangen sind." #: ../../content/applications/finance/accounting/fiscal_localizations/localizations/colombia.rst:3 -#: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:33 msgid "Colombia" msgstr "Kolumbien" @@ -6636,6 +6707,450 @@ msgstr "" "incluya IVA de Bienes Cubiertos, se deberá realizar actualización manual " "correspondiente al IVA convencional." +#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/egypt.rst:3 +msgid "Egypt" +msgstr "Ägypten" + +#: ../../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 "Name" + +#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/egypt.rst:17 +msgid "Technical name" +msgstr "Technische Bezeichnung" + +#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/egypt.rst:18 +#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/france.rst:59 +msgid "Description" +msgstr "Beschreibung" + +#: ../../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 "Client ID" + +#: ../../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 "Weitere Informationen:" + +#: ../../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 "Kunden" + +#: ../../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 "Produkte" + +#: ../../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 "Frankreich" @@ -6747,10 +7262,6 @@ msgstr "" msgid "Field name" msgstr "" -#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/france.rst:59 -msgid "Description" -msgstr "Beschreibung" - #: ../../content/applications/finance/accounting/fiscal_localizations/localizations/france.rst:59 #: ../../content/applications/finance/accounting/fiscal_localizations/overview/fiscal_localization_packages.rst:32 msgid "Use" @@ -7235,10 +7746,6 @@ msgid "" "then 3, then 2." msgstr "" -#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/france.rst:182 -msgid "Name" -msgstr "Name" - #: ../../content/applications/finance/accounting/fiscal_localizations/localizations/france.rst:182 msgid "Code" msgstr "Code" @@ -8005,7 +8512,7 @@ msgstr "" "" #: ../../content/applications/finance/accounting/fiscal_localizations/localizations/germany.rst:3 -#: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:52 +#: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:34 msgid "Germany" msgstr "Deutschland" @@ -8054,7 +8561,7 @@ msgstr "" #: ../../content/applications/finance/accounting/fiscal_localizations/localizations/germany.rst:23 #: ../../content/applications/finance/accounting/fiscal_localizations/localizations/spain.rst:27 -#: ../../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 #: ../../content/applications/finance/accounting/reporting/overview/main_reports.rst:29 msgid "Balance Sheet" msgstr "Bilanz" @@ -8062,7 +8569,7 @@ msgstr "Bilanz" #: ../../content/applications/finance/accounting/fiscal_localizations/localizations/germany.rst:24 #: ../../content/applications/finance/accounting/fiscal_localizations/localizations/netherlands.rst:19 #: ../../content/applications/finance/accounting/getting_started/initial_configuration/chart_of_accounts.rst:17 -#: ../../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 msgid "Profit & Loss" msgstr "Erfolgsrechnung" @@ -9086,7 +9593,6 @@ msgstr "" "Entwurf zurücksetzen, sie bearbeiten und eine neue Seriennummer zuweisen." #: ../../content/applications/finance/accounting/fiscal_localizations/localizations/italy.rst:3 -#: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:71 msgid "Italy" msgstr "Italien" @@ -10020,11 +10526,11 @@ msgid "" msgstr "" #: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:244 -msgid ":download:`Certificate `" +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 @@ -10240,10 +10746,6 @@ msgid "" "transactions: ``XEXX010101000``" msgstr "" -#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:377 -msgid "Products" -msgstr "Produkte" - #: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:379 msgid "" "At the product level there must also configure some parameters in the " @@ -10437,7 +10939,7 @@ msgid "" 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." @@ -10470,200 +10972,215 @@ msgid "" 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 "Anzahlungen" -#: ../../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 " @@ -10672,22 +11189,22 @@ msgid "" "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 "Gutschrift zu erstellen." -#: ../../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" @@ -10697,27 +11214,27 @@ msgid "" " 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 " @@ -10725,56 +11242,56 @@ msgid "" "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" @@ -10782,21 +11299,21 @@ msgid "" "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" @@ -10804,7 +11321,7 @@ msgid "" " 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 " @@ -10812,33 +11329,33 @@ msgid "" "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." @@ -10847,108 +11364,108 @@ msgid "" "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 " @@ -10956,57 +11473,57 @@ msgid "" "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 " @@ -11016,11 +11533,11 @@ msgid "" "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 " "`_" @@ -11028,7 +11545,7 @@ msgid "" "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" @@ -11036,11 +11553,11 @@ msgid "" "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 "Vorläufige Bilanz" -#: ../../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 " @@ -11049,27 +11566,27 @@ msgid "" "(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 " @@ -11077,25 +11594,25 @@ msgid "" "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 " @@ -11103,24 +11620,24 @@ msgid "" "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 " @@ -11130,18 +11647,18 @@ msgid "" "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 " @@ -11151,7 +11668,7 @@ msgid "" "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 " @@ -11159,43 +11676,43 @@ msgid "" "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 " @@ -11204,34 +11721,34 @@ msgid "" "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" @@ -11241,74 +11758,74 @@ msgid "" "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 " @@ -11317,45 +11834,45 @@ msgid "" " 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" @@ -11364,11 +11881,11 @@ msgid "" "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 " @@ -11376,7 +11893,7 @@ msgid "" "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 " @@ -11385,21 +11902,21 @@ msgid "" "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 " @@ -11407,11 +11924,11 @@ msgid "" "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 " @@ -11420,26 +11937,26 @@ msgid "" "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." @@ -11448,17 +11965,17 @@ msgid "" " 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 " @@ -11466,41 +11983,41 @@ msgid "" " :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 "" @@ -11515,30 +12032,30 @@ msgid "" "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': " @@ -11546,7 +12063,7 @@ msgid "" "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': " @@ -11554,36 +12071,36 @@ msgid "" "'[^|]{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" @@ -11593,25 +12110,25 @@ msgid "" "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 " @@ -11620,19 +12137,19 @@ msgid "" "'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': '' " @@ -11640,14 +12157,14 @@ msgid "" "'{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 " @@ -11656,27 +12173,27 @@ msgid "" " 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" @@ -11693,7 +12210,7 @@ msgid "" "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 "" @@ -11708,44 +12225,44 @@ msgid "" "'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 " @@ -11753,7 +12270,7 @@ msgid "" " 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 " @@ -11762,7 +12279,6 @@ msgid "" 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 "Niederlande" @@ -11798,7 +12314,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 "Peru" @@ -12972,7 +13487,7 @@ msgid "" 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 @@ -13034,11 +13549,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-" @@ -13057,379 +13567,295 @@ msgid "" 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 "Algerien -Buchhaltung" -#: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:15 -msgid "Argentinian Accounting" -msgstr "Argentinische Buchhaltung" +#: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:13 +msgid "Argentina - Accounting" +msgstr "Argentinien - Finanzbuchhaltung" -#: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:16 -msgid "Argentinian Accounting Reports" -msgstr "Argentinische Buchhaltungsberichte" - -#: ../../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 "Australien - Finanzbuchhaltung" -#: ../../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 "Österreich - Finanzbuchhaltung" -#: ../../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 "Belgische Buchführung" -#: ../../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 "Bolivien - Finanzbuchhaltung" -#: ../../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 "Brasilianische Buchführung" -#: ../../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 "Buchhaltung - Kanada" -#: ../../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 "Chile - Finanzbuchhaltung" -#: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:26 -msgid "China" -msgstr "China" - -#: ../../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 "China - Buchhaltung" -#: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:29 -msgid "China - City Data" -msgstr "China - Stadtdaten" +#: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:22 +msgid "Colombia - Accounting" +msgstr "Kolumbien - Buchhaltung" -#: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:30 -msgid "China - Small Business CoA" -msgstr "China - Kleinunternehmen Kontenplan" - -#: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:31 -msgid "China - Standard CoA" -msgstr "China - Standard CoA" - -#: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:35 -msgid "Colombian - Accounting" -msgstr "Kolumbien - Buchführung" - -#: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:36 -msgid "Colombian - Point of Sale" -msgstr "Kolumbien - Kassensystem" - -#: ../../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 "Costa-Rica - Kontenführung" -#: ../../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 "Kroatien - Buchführung (RRIF 2012)" -#: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:40 -msgid "Denmark" -msgstr "Dänemark" +#: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:25 +msgid "Czech - Accounting" +msgstr "Tschechien - Buchhaltung" -#: ../../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 "Dänemark - Buchhaltung" -#: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:43 -msgid "Denmark - Accounting Reports" -msgstr "Dänemark - Buchführung" - -#: ../../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 "Dominikanische Republik Buchführung" -#: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:46 -msgid "Ecuador - Accounting" -msgstr "Ecuador Buchführung" +#: ../../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 "Ägypten - Buchhaltung" + +#: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:30 msgid "Ethiopia - Accounting" msgstr "Äthiopien - Buchführung" -#: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:48 -msgid "EU Mini One Stop Shop (MOSS)" -msgstr "EU Mini One Stop Shop (MOSS)" - -#: ../../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 "Finnische Lokalisierung" -#: ../../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 "Französische Buchführung" -#: ../../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 "Allgemeine Buchführung" -#: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:54 -msgid "Germany - Accounting" -msgstr "Deutsche - Buchführung" - -#: ../../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 "Deutscher SKR03 - Kontenrahmenplan" -#: ../../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 "Deutsche SKR04 - Buchhaltung" -#: ../../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 "Griechische Buchführung" -#: ../../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 "Guatemala Buchführung" -#: ../../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 "Honduras Buchführung" -#: ../../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 "Hong Kong - Buchführung" -#: ../../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 "Ungarn - Finanzbuchhaltung" -#: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:63 -msgid "India" -msgstr "Indien" - -#: ../../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 "Indien - Buchhaltung" -#: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:66 -msgid "Indian - Point of Sale" -msgstr "Indisch - Point of Sale" - -#: ../../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 "Indonesien - Buchhaltung" -#: ../../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 "Irland - Buchhaltung" -#: ../../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 "Israel - Buchhaltung" -#: ../../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 "Italienische Buchführung" -#: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:74 -msgid "Italy - E-invoicing" -msgstr "Italien - E-Invoicing" - -#: ../../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 "Japan - Buchhaltung" -#: ../../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 "LATAM Lokalisierungsbasis" - -#: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:80 -msgid "LATAM Document" -msgstr "LATAM Dokument" - -#: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:82 -msgid "Lithuania" -msgstr "Litauen" - -#: ../../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 "Litauen - Buchhaltung" -#: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:85 -msgid "LT - Accounting Reports" -msgstr "LT - Buchhaltungsberichte" - -#: ../../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 "Luxemburg - Kontoführung" -#: ../../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 "Marokko Buchführung" -#: ../../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 "Mexiko - Kontenführung" -#: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:90 -msgid "Mongolia" -msgstr "Mongolei" - -#: ../../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 "Mongolia - Accounting" -#: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:93 -msgid "Mongolia - Accounting Reports" -msgstr "Mongolia - Accounting Reports" - -#: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:95 -msgid "Multi Language Chart of Accounts" -msgstr "Mehrsprachige Kontenpläne" - -#: ../../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 "Holländische Buchführung" -#: ../../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 "Neuseeland - Buchhaltung" -#: ../../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 "Norwegische Buchhaltung" -#: ../../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 "OHADA Buchführung" -#: ../../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 "Pakistan - Buchhaltung" + +#: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:61 msgid "Panama - Accounting" msgstr "Panama - Buchhaltung" -#: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:107 -msgid "Peruvian Accounting" -msgstr "" +#: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:62 +msgid "Peru - Accounting" +msgstr "Peru Buchhaltung" -#: ../../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 "Polen - Buchführung" -#: ../../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 "Portugal - Buchhaltung" -#: ../../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 "Rumänien - Kontenführung" -#: ../../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 "Saudi-Arabien - Buchführung" -#: ../../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 "Singapur - Buchhaltung" -#: ../../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 "Slowakei - Buchhaltung" + +#: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:69 msgid "Slovenian - Accounting" msgstr "Slowenien - Buchführung" -#: ../../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 "South Africa - Accounting" -#: ../../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 "Spanien - Buchführung (PGCE 2008)" -#: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:119 -msgid "Sweden" -msgstr "Schweden" - -#: ../../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" +#: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:72 +msgid "Sweden - Accounting" msgstr "Schweden - Buchhaltung" -#: ../../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 "Schweizer Buchführung" -#: ../../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 "Thailändische Buchführung" -#: ../../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 "Türkei - Kontenführung" -#: ../../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 "Buchhaltung - Vereinigte Arabische Emirate" -#: ../../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 "Vereinigtes Königreich Buchführung" -#: ../../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 "Ukraine - Accounting" -#: ../../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 "USA - Kontenführung" -#: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:131 -msgid "Uruguay - Chart of Accounts" -msgstr "Urugay - Kontenführung" +#: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:81 +msgid "Uruguay - Accounting" +msgstr "Uruguay - Buchhaltung" -#: ../../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 "Venezuelanische Buchführung" -#: ../../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 "Vietnamesische Buchführung" -#: ../../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 @@ -13455,30 +13881,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 "Vermögenswerte" #: ../../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 "Verbindlichkeiten" #: ../../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 "EIGENKAPITAL" #: ../../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 "Erlöse" #: ../../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 "betrieblicher Aufwand" @@ -13525,7 +13951,7 @@ msgstr "" "Jedes Konto wird durch seinen **Code** und **Name** identifiziert, der auch " "den Zweck des Kontos angibt." -#: ../../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:" @@ -13533,110 +13959,110 @@ msgstr "" "Die korrekte Konfiguration des **Kontotyps** ist von entscheidender " "Bedeutung, da sie mehreren Zwecken dient:" -#: ../../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 "Informationen über den Zweck und das Verhalten des Kontos" -#: ../../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 "Erstellung von länderspezifischen Rechts- und Finanzberichten" -#: ../../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 "Festlegen der Regeln für den Abschluss eines Geschäftsjahres" -#: ../../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 "Eröffnungsbuchungen anlegen" -#: ../../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 "Bericht" -#: ../../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 "Kategorie" -#: ../../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 "Kontoarten" -#: ../../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 "Debitoren" -#: ../../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 "Liquide Mittel" -#: ../../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 "UMLAUFVERMÖGEN" -#: ../../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 "Anlagevermögen" -#: ../../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 "Vorauszahlungen" -#: ../../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 "Sachanlagen" -#: ../../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 "Kreditoren" -#: ../../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 "Kreditkarte" -#: ../../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 "KURZFRISTIGES FREMDKAPITAL" -#: ../../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 "Langfristige Verbindlichkeiten" -#: ../../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 "Jahresüberschuss/Jahresfehlbetrag" -#: ../../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 "Sonstige betriebliche Erträge" -#: ../../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 "Abschreibungen" -#: ../../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 "Herstellungskosten" -#: ../../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 "Andere" -#: ../../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 "Ausserbilanz" -#: ../../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 " @@ -13644,69 +14070,68 @@ msgid "" "` 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 "Standard Steuern" -#: ../../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 "Tags" -#: ../../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 "Kontogruppen" -#: ../../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 " @@ -13714,61 +14139,61 @@ msgid "" "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 "Erlaube Abstimmung" -#: ../../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 "Nicht mehr verwenden" -#: ../../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 @@ -14536,6 +14961,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 "Kontenabgleich" + #: ../../content/applications/finance/accounting/getting_started/memento.rst:181 msgid "" "Bank reconciliation is the matching of bank statement lines (provided by " @@ -15442,7 +15873,7 @@ msgid "" "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 " @@ -15450,32 +15881,32 @@ msgid "" " 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 " @@ -15483,25 +15914,25 @@ msgid "" "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 " @@ -15509,32 +15940,32 @@ msgid "" " 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 " @@ -15542,18 +15973,18 @@ msgid "" "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 "Unterauftragsvergabe" -#: ../../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 " @@ -15561,33 +15992,33 @@ msgid "" "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 " @@ -16824,10 +17255,10 @@ 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 " @@ -17016,6 +17447,10 @@ msgid "" "Register the payment and set the currency." msgstr "" +#: ../../content/applications/finance/accounting/others/multicurrencies/how_it_works.rst:145 +msgid "Bank Statements" +msgstr "Bankauszüge" + #: ../../content/applications/finance/accounting/others/multicurrencies/how_it_works.rst:147 #: ../../content/applications/finance/accounting/others/multicurrencies/invoices_payments.rst:94 msgid "" @@ -17132,7 +17567,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 @@ -17232,11 +17667,11 @@ msgid "" msgstr "" #: ../../content/applications/finance/accounting/payables/pay.rst:5 -msgid "Vendor Payments" -msgstr "Zahlungen des Lieferant" +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 @@ -17772,8 +18207,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 @@ -18167,7 +18606,7 @@ msgid "" 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 @@ -18383,8 +18822,156 @@ msgid "" "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 "Preisgestaltung" + +#: ../../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 @@ -18704,98 +19291,9 @@ msgid "" " 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 "Preisgestaltung" - -#: ../../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" -msgstr "Einkaufsbelege" +msgid "Purchase receipts" +msgstr "" #: ../../content/applications/finance/accounting/payables/supplier_bills/purchase_receipts.rst:5 msgid "" @@ -18860,13 +19358,12 @@ 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" -msgstr "Kundenrechnungen" +msgid "Customer invoices" +msgstr "" #: ../../content/applications/finance/accounting/receivables/customer_invoices/cash_discounts.rst:3 msgid "Offer cash discounts" @@ -18945,8 +19442,8 @@ msgid ":doc:`../../receivables/customer_invoices/payment_terms`" msgstr "" #: ../../content/applications/finance/accounting/receivables/customer_invoices/cash_rounding.rst:3 -msgid "Cash Rounding" -msgstr "Bargeld-Runden" +msgid "Cash rounding" +msgstr "Bargeld runden" #: ../../content/applications/finance/accounting/receivables/customer_invoices/cash_rounding.rst:5 msgid "" @@ -19005,7 +19502,7 @@ msgid "" 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 @@ -19161,8 +19658,8 @@ msgid "" msgstr "" #: ../../content/applications/finance/accounting/receivables/customer_invoices/deferred_revenues.rst:3 -msgid "Deferred Revenues" -msgstr "Passive Rechnungsabgrenzung" +msgid "Deferred revenues" +msgstr "" #: ../../content/applications/finance/accounting/receivables/customer_invoices/deferred_revenues.rst:5 msgid "" @@ -19748,8 +20245,26 @@ msgid "" "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 @@ -19999,56 +20514,56 @@ msgid "" "`_" 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 " @@ -20057,16 +20572,22 @@ 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" -msgstr "Kundeneinzahlungen" +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 @@ -20198,7 +20719,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 @@ -20341,6 +20862,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 "Kundenrechnungen" + #: ../../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 " @@ -20612,99 +21137,145 @@ msgid "" 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." +"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" -msgstr "" - -#: ../../content/applications/finance/accounting/receivables/customer_payments/followup.rst:13 +#: ../../content/applications/finance/accounting/receivables/customer_payments/followup.rst:11 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." +"`Odoo Tutorials: Payment Follow-up " +"`_" msgstr "" -#: ../../content/applications/finance/accounting/receivables/customer_payments/followup.rst:17 +#: ../../content/applications/finance/accounting/receivables/customer_payments/followup.rst:16 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." +"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:20 +msgid "Send an Email" +msgstr "E-Mail senden" + +#: ../../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 "Einen Brief drucken" + #: ../../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 +#: ../../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 "" -"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`." +"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 "Follow-up reports" +msgstr "Mahnberichte" + +#: ../../content/applications/finance/accounting/receivables/customer_payments/followup.rst:35 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." +"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:40 -msgid "Send reminders in batch" -msgstr "" - -#: ../../content/applications/finance/accounting/receivables/customer_payments/followup.rst:42 +#: ../../content/applications/finance/accounting/receivables/customer_payments/followup.rst:39 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." +"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" -msgstr "" - -#: ../../content/applications/finance/accounting/receivables/customer_payments/followup.rst:54 +#: ../../content/applications/finance/accounting/receivables/customer_payments/followup.rst:43 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." +"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:59 +#: ../../content/applications/finance/accounting/receivables/customer_payments/followup.rst:48 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." +"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:69 +#: ../../content/applications/finance/accounting/receivables/customer_payments/followup.rst:50 msgid "" -"If you would like to get a reminder before the actual due date, set a " -"negative number of due days." +"When the reminder is sent, it is documented in the chatter of the invoice." +msgstr "" + +#: ../../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" -msgstr "Rechnung Online-Zahlung" +msgid "Invoice online payment" +msgstr "" #: ../../content/applications/finance/accounting/receivables/customer_payments/online_payment.rst:5 msgid "" @@ -20967,7 +21538,7 @@ msgid "" 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 @@ -21509,8 +22080,8 @@ msgid "Taxation" msgstr "" #: ../../content/applications/finance/accounting/taxation/fiscal_year.rst:5 -msgid "Fiscal Year" -msgstr "Geschäftsjahr" +msgid "Fiscal year" +msgstr "" #: ../../content/applications/finance/accounting/taxation/fiscal_year/close_fiscal_year.rst:3 msgid "Do a year end in Odoo (close a fiscal year)" @@ -21924,6 +22495,94 @@ msgid "" "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 "" @@ -22034,6 +22693,10 @@ msgid "" "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 " @@ -22080,15 +22743,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 @@ -22184,7 +22840,7 @@ msgid "" 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 @@ -24117,93 +24773,99 @@ msgstr "" msgid "Online payment acquirers" msgstr "" -#: ../../content/applications/finance/payment_acquirers.rst:56 +#: ../../content/applications/finance/payment_acquirers.rst:61 msgid "Payment flow" msgstr "Zahlungsfluss" -#: ../../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 "Zahlung aus Odoo" -#: ../../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" -msgstr "Weiterleitung zur Website des Anbieters" +#: ../../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 "PayU Latam" -#: ../../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 " @@ -24213,7 +24875,7 @@ msgid "" "accounting control process." msgstr "" -#: ../../content/applications/finance/payment_acquirers.rst:105 +#: ../../content/applications/finance/payment_acquirers.rst:133 msgid "Bank payments" msgstr "" @@ -24240,95 +24902,58 @@ msgid "" "information about this payment method." msgstr "" -#: ../../content/applications/finance/payment_acquirers.rst:121 +#: ../../content/applications/finance/payment_acquirers.rst:146 +msgid "Additional features" +msgstr "" + +#: ../../content/applications/finance/payment_acquirers.rst:148 msgid "" -"Each acquirer has its specific configuration flow, depending on :ref:`which " -"feature is available `." +"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:127 -msgid "Add a new payment acquirer" +#: ../../content/applications/finance/payment_acquirers.rst:155 +msgid "Save cards for later" msgstr "" -#: ../../content/applications/finance/payment_acquirers.rst:129 +#: ../../content/applications/finance/payment_acquirers.rst:157 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*." +"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:139 +#: ../../content/applications/finance/payment_acquirers.rst:162 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." +"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: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" -msgstr "" - -#: ../../content/applications/finance/payment_acquirers.rst:149 +#: ../../content/applications/finance/payment_acquirers.rst:166 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." +"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 +#: ../../content/applications/finance/payment_acquirers.rst:173 +msgid "Manual capture" +msgstr "" + +#: ../../content/applications/finance/payment_acquirers.rst:175 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: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:" +"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 @@ -24345,56 +24970,170 @@ msgstr "" #: ../../content/applications/finance/payment_acquirers.rst:185 msgid "" -"Avoid potentially high credit card fees in the event of overselling or " -"cancelled orders." +"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." +"Hold a security deposit to return later, minus any deductions (e.g., after a" +" damage)." msgstr "" -#: ../../content/applications/finance/payment_acquirers.rst:195 +#: ../../content/applications/finance/payment_acquirers.rst:189 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." +"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." +"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 "Refunds" +msgstr "Rückerstattungen" + +#: ../../content/applications/finance/payment_acquirers.rst:212 +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: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: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:230 +msgid "" +"Each acquirer has its specific configuration flow, depending on :ref:`which " +"feature is available `." +msgstr "" + +#: ../../content/applications/finance/payment_acquirers.rst:236 +msgid "Add a new payment acquirer" +msgstr "" + +#: ../../content/applications/finance/payment_acquirers.rst:238 +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 "" +"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 +#: ../../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 "Länder" -#: ../../content/applications/finance/payment_acquirers.rst:212 +#: ../../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:218 +#: ../../content/applications/finance/payment_acquirers.rst:285 msgid "Payment journal" msgstr "" -#: ../../content/applications/finance/payment_acquirers.rst:220 +#: ../../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:225 +#: ../../content/applications/finance/payment_acquirers.rst:292 msgid "Accounting perspective" msgstr "" -#: ../../content/applications/finance/payment_acquirers.rst:227 +#: ../../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 " @@ -24403,78 +25142,78 @@ msgid "" "advice." msgstr "" -#: ../../content/applications/finance/payment_acquirers.rst:232 +#: ../../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:235 +#: ../../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:237 +#: ../../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:238 +#: ../../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:244 +#: ../../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:248 +#: ../../content/applications/finance/payment_acquirers.rst:315 msgid ":doc:`payment_acquirers/wire_transfer`" msgstr "" -#: ../../content/applications/finance/payment_acquirers.rst:249 +#: ../../content/applications/finance/payment_acquirers.rst:316 msgid ":doc:`payment_acquirers/adyen`" msgstr "" -#: ../../content/applications/finance/payment_acquirers.rst:250 +#: ../../content/applications/finance/payment_acquirers.rst:317 msgid ":doc:`payment_acquirers/alipay`" msgstr "" -#: ../../content/applications/finance/payment_acquirers.rst:251 +#: ../../content/applications/finance/payment_acquirers.rst:318 msgid ":doc:`payment_acquirers/authorize`" msgstr "" -#: ../../content/applications/finance/payment_acquirers.rst:252 +#: ../../content/applications/finance/payment_acquirers.rst:319 msgid ":doc:`payment_acquirers/buckaroo`" msgstr "" -#: ../../content/applications/finance/payment_acquirers.rst:253 +#: ../../content/applications/finance/payment_acquirers.rst:320 msgid ":doc:`payment_acquirers/mollie`" msgstr "" -#: ../../content/applications/finance/payment_acquirers.rst:254 +#: ../../content/applications/finance/payment_acquirers.rst:321 msgid ":doc:`payment_acquirers/ogone`" msgstr "" -#: ../../content/applications/finance/payment_acquirers.rst:255 +#: ../../content/applications/finance/payment_acquirers.rst:322 msgid ":doc:`payment_acquirers/paypal`" msgstr "" -#: ../../content/applications/finance/payment_acquirers.rst:256 +#: ../../content/applications/finance/payment_acquirers.rst:323 msgid ":doc:`payment_acquirers/sips`" msgstr "" -#: ../../content/applications/finance/payment_acquirers.rst:257 +#: ../../content/applications/finance/payment_acquirers.rst:324 msgid ":doc:`payment_acquirers/stripe`" msgstr "" -#: ../../content/applications/finance/payment_acquirers.rst:258 +#: ../../content/applications/finance/payment_acquirers.rst:325 msgid ":doc:`../websites/ecommerce/shopper_experience/payment_acquirer`" msgstr "" @@ -24484,8 +25223,8 @@ msgstr "Adyen" #: ../../content/applications/finance/payment_acquirers/adyen.rst:5 msgid "" -"`Adyen `_ is a Dutch-based company that offers " -"several online payment possibilities." +"`Adyen `_ is a Dutch company that offers several " +"online payment possibilities." msgstr "" #: ../../content/applications/finance/payment_acquirers/adyen.rst:12 @@ -24547,37 +25286,39 @@ 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" +"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 "API Key and Client Key" +msgstr "" + +#: ../../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:`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." +"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:45 +#: ../../content/applications/finance/payment_acquirers/adyen.rst:48 msgid "" -"This is also the place where you'll :ref:`allow payments to be made from " -"your website `." +"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:51 +#: ../../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 " @@ -24585,54 +25326,55 @@ msgid "" "notification`." msgstr "" -#: ../../content/applications/finance/payment_acquirers/adyen.rst:61 +#: ../../content/applications/finance/payment_acquirers/adyen.rst:65 msgid "" -"There, in :menuselection:`Transport --> URL`, enter your server address " -"followed by `/payment/adyen/notification`." +"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 +#: ../../content/applications/finance/payment_acquirers/adyen.rst:72 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." +"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 +#: ../../content/applications/finance/payment_acquirers/adyen.rst:86 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**." +":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 "Adyen Konto" -#: ../../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 +#: ../../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:`Allowed Origins`, then add the URLs from where payments will" -" be made (the URLs of the servers hosting your Odoo instances)." +":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 @@ -24745,18 +25487,30 @@ 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." +"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 +#: ../../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: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." +"`. 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:44 +#: ../../content/applications/finance/payment_acquirers/authorize.rst:50 msgid "" "After **30 days**, the transaction is **voided automatically** by " "Authorize.net." @@ -24876,10 +25630,6 @@ msgid "" "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, " diff --git a/locale/de/LC_MESSAGES/productivity.po b/locale/de/LC_MESSAGES/productivity.po index d9e058644..291c55954 100644 --- a/locale/de/LC_MESSAGES/productivity.po +++ b/locale/de/LC_MESSAGES/productivity.po @@ -14,7 +14,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: 2021-11-02 08:49+0000\n" "Last-Translator: Martin Trigaux, 2022\n" "Language-Team: German (https://www.transifex.com/odoo/teams/41243/de/)\n" @@ -32,6 +32,128 @@ msgstr "Produktivität" msgid "Discuss" msgstr "Diskussion" +#: ../../content/applications/productivity/discuss/advanced.rst:5 +msgid "Advanced" +msgstr "Fortgeschritten" + +#: ../../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 "Übersicht" @@ -1406,12 +1528,12 @@ msgid "" 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 "" @@ -1471,38 +1593,64 @@ msgid "" "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/de/LC_MESSAGES/sales.po b/locale/de/LC_MESSAGES/sales.po index 6a92bc0fa..d364fdaf3 100644 --- a/locale/de/LC_MESSAGES/sales.po +++ b/locale/de/LC_MESSAGES/sales.po @@ -8,15 +8,16 @@ # Jan Meyer, 2022 # Leon Grill , 2022 # Martin Trigaux, 2022 +# Kevin Harrings , 2022 # #, fuzzy 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: 2021-11-02 08:49+0000\n" -"Last-Translator: Martin Trigaux, 2022\n" +"Last-Translator: Kevin Harrings , 2022\n" "Language-Team: German (https://www.transifex.com/odoo/teams/41243/de/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -68,7 +69,6 @@ msgid "" 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 @@ -77,8 +77,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 @@ -164,113 +165,160 @@ 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 +#: ../../content/applications/sales/crm/acquire_leads/generate_leads.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." +"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 +#: ../../content/applications/sales/crm/acquire_leads/generate_leads.rst:12 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`." +"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 +#: ../../content/applications/sales/crm/acquire_leads/generate_leads.rst:25 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." +"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" -msgstr "" - -#: ../../content/applications/sales/crm/acquire_leads/generate_from_website.rst:12 -msgid "You should first go to your website app." -msgstr "" - -#: ../../content/applications/sales/crm/acquire_leads/generate_from_website.rst:14 -msgid "|image0|\\ |image1|" -msgstr "" - -#: ../../content/applications/sales/crm/acquire_leads/generate_from_website.rst:16 +#: ../../content/applications/sales/crm/acquire_leads/generate_leads.rst:32 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." +"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:23 +#: ../../content/applications/sales/crm/acquire_leads/generate_leads.rst:39 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*." +"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:32 -#: ../../content/applications/sales/crm/acquire_leads/generate_from_website.rst:50 -msgid "Create a custom contact form" -msgstr "" - -#: ../../content/applications/sales/crm/acquire_leads/generate_from_website.rst:34 +#: ../../content/applications/sales/crm/acquire_leads/generate_leads.rst:46 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.)" +"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:43 +#: ../../content/applications/sales/crm/acquire_leads/generate_leads.rst:55 +msgid "Customize Contact Forms" +msgstr "" + +#: ../../content/applications/sales/crm/acquire_leads/generate_leads.rst:57 msgid "" -"You will need to install the free *Form Builder* module, only available in " -"Odoo Enterprise." +"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:52 +#: ../../content/applications/sales/crm/acquire_leads/generate_leads.rst:60 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." +"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:59 +#: ../../content/applications/sales/crm/acquire_leads/generate_leads.rst:68 msgid "" -"By default, any new contact form will send an email. You can switch to " -"lead/opportunity generation in *Change Form Parameters*." +"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:63 +#: ../../content/applications/sales/crm/acquire_leads/generate_leads.rst:73 +msgid "Edit Contact Form fields" +msgstr "" + +#: ../../content/applications/sales/crm/acquire_leads/generate_leads.rst:75 msgid "" -"If the same visitor uses the contact form twice, the second entry will be " -"added to the first lead/opportunity in the chatter." +"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:67 -msgid "Generate leads instead of opportunities" -msgstr "" - -#: ../../content/applications/sales/crm/acquire_leads/generate_from_website.rst:69 +#: ../../content/applications/sales/crm/acquire_leads/generate_leads.rst:78 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`." +":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_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_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_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 @@ -313,7 +361,7 @@ msgstr "" #: ../../content/applications/sales/crm/acquire_leads/lead_mining.rst:34 msgid "" -"When choosing to target Companied and their contacts you can choose the " +"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 " @@ -348,11 +396,11 @@ msgstr "Preisgestaltung" 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 " +" 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 --> In-App Purchases --> View my" -" Services`." +"Credits`; or go to :menuselection:`Settings --> Contacts --> Odoo IAP --> " +"View my Services`." msgstr "" #: ../../content/applications/sales/crm/acquire_leads/lead_mining.rst:65 @@ -864,68 +912,87 @@ 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*." +"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`." +"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 +#: ../../content/applications/sales/crm/pipeline/multi_sales_team.rst:15 msgid "" -"There you can set an email alias to it. Every message sent to that email " -"address will create a lead/opportunity." +"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 +#: ../../content/applications/sales/crm/pipeline/multi_sales_team.rst:19 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." +"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 +#: ../../content/applications/sales/crm/pipeline/multi_sales_team.rst:30 msgid "" -"If you now filter on this specific channel in your pipeline, you will find " -"all of its opportunities." +"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 +#: ../../content/applications/sales/crm/pipeline/multi_sales_team.rst:44 msgid "" -"It is shared with the whole ecosystem so every revenue stream is included in" -" it: Sales, eCommerce, PoS, etc." +"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 @@ -938,94 +1005,90 @@ 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." +"*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." +"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)." +"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 +#: ../../content/applications/sales/crm/track_leads/lead_scoring.rst:24 msgid "" -"You now have a new tab in your *CRM* app called *Leads Management* where you" -" can manage your scoring rules." +"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." +"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 +#: ../../content/applications/sales/crm/track_leads/lead_scoring.rst:32 msgid "" -"Every hour every lead without a score will be automatically scanned and " -"assigned their right score according to your scoring rules." +"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 +#: ../../content/applications/sales/crm/track_leads/lead_scoring.rst:41 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." +"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 +#: ../../content/applications/sales/crm/track_leads/lead_scoring.rst:50 msgid "" -"Further on, you can assign to a specific vendor in the team with an even " -"more refined domain." +"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 +#: ../../content/applications/sales/crm/track_leads/lead_scoring.rst:57 msgid "" -"To do so go to :menuselection:`CRM --> Leads Management --> Leads " -"Assignation`." +"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." +"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 +#: ../../content/applications/sales/crm/track_leads/lead_scoring.rst:72 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." +"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 @@ -1716,32 +1779,31 @@ 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." +"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 +#: ../../content/applications/sales/point_of_sale/overview/epos_ssc.rst:79 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." +"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 " @@ -1773,8 +1835,8 @@ 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*." +" 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 @@ -1992,10 +2054,147 @@ msgstr "" msgid "Payment Terminals" msgstr "Zahlungsterminals" -#: ../../content/applications/sales/point_of_sale/payment/ingenico.rst:3 -msgid "Connect an Ingenico Payment Terminal to your PoS" +#: ../../content/applications/sales/point_of_sale/payment/adyen.rst:3 +msgid "Adyen" +msgstr "Adyen" + +#: ../../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 "Fügen Sie eine neue Zahlungsmethode hinzu" + +#: ../../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 "Ingenico" +msgstr "Ingenico" + #: ../../content/applications/sales/point_of_sale/payment/ingenico.rst:5 #: ../../content/applications/sales/point_of_sale/payment/worldline.rst:5 msgid "" @@ -2040,11 +2239,6 @@ msgid "" "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 " @@ -2059,11 +2253,6 @@ msgid "" "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 " @@ -2099,8 +2288,8 @@ msgid "" msgstr "" #: ../../content/applications/sales/point_of_sale/payment/six.rst:3 -msgid "Connect a SIX Payment Terminal to your PoS" -msgstr "" +msgid "SIX" +msgstr "SIX" #: ../../content/applications/sales/point_of_sale/payment/six.rst:5 msgid "" @@ -2110,64 +2299,69 @@ 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 +#: ../../content/applications/sales/point_of_sale/payment/six.rst:21 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\"." +"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 +#: ../../content/applications/sales/point_of_sale/payment/six.rst:28 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." +"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 +#: ../../content/applications/sales/point_of_sale/payment/six.rst:39 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." +"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 +#: ../../content/applications/sales/point_of_sale/payment/six.rst:48 msgid "" -"When the payment is done, the status will change to *Payment Successful*. " -"You can always reverse the last transaction by clicking on *Reverse*." +"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 +#: ../../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 *Force Done*. This will allow you to validate the order in" -" Odoo even if the connection between the terminal and Odoo encounters " -"issues." +"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 @@ -2210,8 +2404,8 @@ msgid "" msgstr "" #: ../../content/applications/sales/point_of_sale/payment/worldline.rst:3 -msgid "Connect a Worldline Payment Terminal to the PoS" -msgstr "" +msgid "Worldline" +msgstr "Worldline" #: ../../content/applications/sales/point_of_sale/payment/worldline.rst:9 msgid "Please note that Worldline is currently only available in Belgium." @@ -2766,82 +2960,6 @@ msgid "" "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 "Bargeld-Runden" @@ -3102,6 +3220,147 @@ 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 "Vermietung" @@ -3559,12 +3818,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 "" @@ -3641,15 +3902,36 @@ msgstr "" #: ../../content/applications/sales/sales/amazon_connector/manage.rst:45 msgid "" -":doc:`../../../inventory_and_mrp/inventory/shipping/setup/third_party_shipper`" +"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 "" +"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 " @@ -3659,14 +3941,14 @@ msgid "" "under the FBA program." msgstr "" -#: ../../content/applications/sales/sales/amazon_connector/manage.rst:57 +#: ../../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" @@ -3678,24 +3960,24 @@ msgid "" " 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 " @@ -3706,11 +3988,11 @@ msgid "" "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 " @@ -3718,13 +4000,13 @@ msgid "" " 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 " @@ -3734,8 +4016,9 @@ msgid "" "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 "" @@ -3744,118 +4027,49 @@ msgid "Configure Amazon Connector in Odoo" msgstr "" #: ../../content/applications/sales/sales/amazon_connector/setup.rst:6 -msgid "Generate an Authorization Token in Seller Central" +msgid "Register your Amazon account in Odoo" 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." +"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:14 +#: ../../content/applications/sales/sales/amazon_connector/setup.rst:13 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." +"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:19 +#: ../../content/applications/sales/sales/amazon_connector/setup.rst:17 msgid "" -"You might need to use the *main* (or first) administrator account and not " -"one added subsequently." +"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:22 +#: ../../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:23 msgid "" -"In the main menu, select :menuselection:`Apps & Services --> Manage Your " -"Apps`; in the page that displays, click on the ``Authorize new developper`` " -"button:" +"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 "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**." -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 " -"`." -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." -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." -msgstr "" - -#: ../../content/applications/sales/sales/amazon_connector/setup.rst:72 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 " @@ -3863,7 +4077,7 @@ msgid "" " 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, " @@ -3871,7 +4085,7 @@ msgid "" "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 " @@ -3880,7 +4094,7 @@ msgid "" ":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" @@ -3889,7 +4103,7 @@ msgid "" " 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** " @@ -3897,18 +4111,18 @@ msgid "" "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 " @@ -3917,7 +4131,7 @@ msgid "" " 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 " @@ -3925,76 +4139,173 @@ msgid "" "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 +#: ../../content/applications/sales/sales/amazon_connector/setup.rst:78 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." +"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 +#: ../../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." +"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 +#: ../../content/applications/sales/sales/amazon_connector/setup.rst:88 msgid "" -"To add a new marketplace, you must first activate the :ref:`developer mode " -"`." +"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 +#: ../../content/applications/sales/sales/amazon_connector/setup.rst:93 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 " -"`_." +"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 +#: ../../content/applications/sales/sales/amazon_connector/setup.rst:99 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." +"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 +#: ../../content/applications/sales/sales/amazon_connector/setup.rst:104 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." +"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 "eBay-Konnektor" @@ -4915,7 +5226,7 @@ msgstr "" 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 " +"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 "" @@ -6088,16 +6399,10 @@ msgid "" 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 " @@ -6106,50 +6411,50 @@ msgid "" "**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/de/LC_MESSAGES/sphinx.po b/locale/de/LC_MESSAGES/sphinx.po index 3d2733d2c..0189f9559 100644 --- a/locale/de/LC_MESSAGES/sphinx.po +++ b/locale/de/LC_MESSAGES/sphinx.po @@ -12,7 +12,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: 2022-03-18 15:03+0000\n" "Last-Translator: Martin Trigaux, 2022\n" "Language-Team: German (https://www.transifex.com/odoo/teams/41243/de/)\n" @@ -34,7 +34,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 "" @@ -144,10 +144,14 @@ msgid "" 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 "Dokumentation" + +#: ../../extensions/odoo_theme/layout_templates/homepage.html:112 msgid "Content guidelines" msgstr "" diff --git a/locale/de/LC_MESSAGES/websites.po b/locale/de/LC_MESSAGES/websites.po index 7c8f736df..158235802 100644 --- a/locale/de/LC_MESSAGES/websites.po +++ b/locale/de/LC_MESSAGES/websites.po @@ -16,7 +16,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: 2022-03-18 15:03+0000\n" "Last-Translator: Martin Trigaux, 2022\n" "Language-Team: German (https://www.transifex.com/odoo/teams/41243/de/)\n" @@ -50,11 +50,15 @@ msgid "" 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 `_" @@ -369,76 +373,97 @@ 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:" +"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)." +"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." +":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." -msgstr "" +msgid "Accessory Products" +msgstr "Zubehör" -#: ../../content/applications/websites/ecommerce/maximizing_revenue/cross_selling.rst:26 +#: ../../content/applications/websites/ecommerce/maximizing_revenue/cross_selling.rst:22 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." +"**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" -msgstr "" - -#: ../../content/applications/websites/ecommerce/maximizing_revenue/cross_selling.rst:33 +#: ../../content/applications/websites/ecommerce/maximizing_revenue/cross_selling.rst:25 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." +"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: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." -msgstr "" +#: ../../content/applications/websites/ecommerce/maximizing_revenue/cross_selling.rst:46 +msgid "Optional Products" +msgstr "Optionale Produkte" #: ../../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 +#: ../../content/applications/websites/ecommerce/maximizing_revenue/cross_selling.rst:51 msgid "" -"The quantity of optional items added to cart is the same than the main item." +"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 @@ -656,10 +681,6 @@ msgid "" "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 "" @@ -762,7 +783,7 @@ msgstr "" #: ../../content/applications/websites/ecommerce/shopper_experience/payment_acquirer.rst:62 msgid "" ":ref:`Payment Acquirers: Place a hold on a card " -"`" +"`" msgstr "" #: ../../content/applications/websites/ecommerce/shopper_experience/portal.rst:3 @@ -1132,49 +1153,81 @@ 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" @@ -1183,7 +1236,7 @@ msgid "" "'/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 " @@ -1191,18 +1244,18 @@ msgid "" "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 "" @@ -2195,44 +2248,31 @@ 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 " -"`_" +"and eCommerce (Drupal, Wordpress, Magento, Prestashop)." msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:568 -msgid "Todo" -msgstr "Zu erledigen" - -#: ../../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, " @@ -2241,22 +2281,22 @@ msgid "" "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" @@ -2264,11 +2304,11 @@ msgid "" "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 " @@ -2276,13 +2316,13 @@ msgid "" "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 " @@ -2290,29 +2330,29 @@ msgid "" "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 " @@ -2569,11 +2609,34 @@ 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 " @@ -2582,11 +2645,11 @@ msgid "" "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 " @@ -2594,93 +2657,93 @@ msgid "" "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 "Produkte" -#: ../../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 "Blogs" -#: ../../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 "Forenverzeichnis" -#: ../../content/applications/websites/website/publish/multi_website.rst:167 +#: ../../content/applications/websites/website/publish/multi_website.rst:176 msgid "Events" msgstr "Veranstaltungen" -#: ../../content/applications/websites/website/publish/multi_website.rst:169 +#: ../../content/applications/websites/website/publish/multi_website.rst:178 msgid "Job Positions" msgstr "Offene Stellen" -#: ../../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 "Multi-Unternehmen" -#: ../../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 " @@ -2688,46 +2751,46 @@ msgid "" "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 " @@ -2736,41 +2799,41 @@ msgid "" "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 "Preislisten" -#: ../../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 " @@ -2778,11 +2841,11 @@ msgid "" "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 " @@ -2791,39 +2854,39 @@ msgid "" "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 "" @@ -2870,7 +2933,7 @@ msgid "" 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 diff --git a/locale/es/LC_MESSAGES/administration.po b/locale/es/LC_MESSAGES/administration.po index abab87f1e..f3d73f480 100644 --- a/locale/es/LC_MESSAGES/administration.po +++ b/locale/es/LC_MESSAGES/administration.po @@ -10,20 +10,22 @@ # Jesse Garza , 2022 # Pablo Rojas , 2022 # Lucia Pacheco , 2022 -# Martin Trigaux, 2022 # marcescu, 2022 # Marian Cuadra, 2022 # Patricia Gutiérrez Capetillo , 2022 # Braulio D. López Vázquez , 2022 +# Raquel Iciarte , 2022 +# Diego de cos , 2022 +# Martin Trigaux, 2022 # #, fuzzy 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: 2022-03-18 14:59+0000\n" -"Last-Translator: Braulio D. López Vázquez , 2022\n" +"Last-Translator: Martin Trigaux, 2022\n" "Language-Team: Spanish (https://www.transifex.com/odoo/teams/41243/es/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -311,9 +313,9 @@ msgstr "" "gerencia de la base de datos. También vea security_." #: ../../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 "PostgreSQL" @@ -1661,7 +1663,7 @@ msgstr "" "partner para descargar los paquetes de Enterprise)." #: ../../content/administration/install/install.rst:90 -#: ../../content/administration/install/install.rst:252 +#: ../../content/administration/install/install.rst:254 msgid "Windows" msgstr "Windows" @@ -1703,7 +1705,7 @@ msgid "Odoo will automatically be started at the end of the installation." msgstr "Odoo se ejecutará automáticamente al finalizar la instalación." #: ../../content/administration/install/install.rst:105 -#: ../../content/administration/install/install.rst:418 +#: ../../content/administration/install/install.rst:433 msgid "Linux" msgstr "Linux" @@ -1721,9 +1723,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 "Preparar" @@ -1741,9 +1743,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 " @@ -1934,15 +1936,15 @@ msgstr "" "hace que sea más fácil mantener (y ejecutar) varias versiones de Odoo al " "mismo tiempo." -#: ../../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 "Extraer los recursos" -#: ../../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**." @@ -1950,104 +1952,102 @@ msgstr "" "Hay dos maneras de obtener el código fuente de Odoo: desde un **archivo** " "zip o **git**." -#: ../../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 "Archivar" -#: ../../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 "Edición community:" -#: ../../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 "`Página oficial de descarga `_" -#: ../../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 "`Repositorio GitHub `_" -#: ../../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 "`Servidor Nightly `_" -#: ../../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 "Edición Enterprise:" -#: ../../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 "`Repositorio GitHub `_" -#: ../../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 "Git" -#: ../../content/administration/install/install.rst:276 -#: ../../content/administration/install/install.rst:442 -#: ../../content/administration/install/install.rst:613 +#: ../../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." +"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 "" -"Esto necesita que tenga git_ instalado en su equipo y también necesita tener" -" conocimiento básico de comandos git." -#: ../../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)" -msgstr "" -"Edición Enterprise: (vea :ref:`setup/install/editions` para obtener acceso)" - -#: ../../content/administration/install/install.rst:292 -#: ../../content/administration/install/install.rst:458 -#: ../../content/administration/install/install.rst:629 +#: ../../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 " +"**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." +"installation. See :ref:`setup/install/editions` to get access to the " +"Enterprise repository." +msgstr "" + +#: ../../content/administration/install/install.rst:296 +#: ../../content/administration/install/install.rst:475 +#: ../../content/administration/install/install.rst:659 +msgid "Clone with HTTPS" msgstr "" -"**El repositorio git de Enterprise no contiene el código fuente de Odoo " -"completo**, solo es una colección de complementos. El servidor principal " -"está en la versión de Comunidad. Cuando ejecutamos la versión Enterprise " -"quiere decir que estamos ejecutando el servidor de la versión Community con " -"la opción de addons-path configurada en el folder que contiene la versión " -"Enterprise. Debe clonar tanto el repositorio de Community como de Enterprise" -" para que la instalación de Odoo Enterprise funcione." #: ../../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 "Python" -#: ../../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 " @@ -2057,7 +2057,7 @@ msgstr "" "descargas de Python `_ para " "descargar e instalar la versión más reciente de Python 3 en su equipo." -#: ../../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." @@ -2066,9 +2066,9 @@ msgstr "" "clic en **Personalización de la instalación** y asegúrese de que **pip** " "esté revisado." -#: ../../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." @@ -2076,13 +2076,13 @@ msgstr "" "Si Python 3 ya está instalado, asegúrese de que sea la versión 3.7 o más, ya" " que las versiones previas no son compatibles con Odoo." -#: ../../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 "También verifique que pip_ esté instalado para esta versión." -#: ../../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 " @@ -2092,9 +2092,9 @@ msgstr "" "e instale PostgreSQL `_ " "(versión compatible: 10.0 y más avanzados)." -#: ../../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:" @@ -2102,7 +2102,7 @@ msgstr "" "Por defecto, el único usuario es `postgres` pero Odoo no permite conectarse " "como `postgres`, así que necesita crear un nuevo usuario de PostgreSQL:" -#: ../../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`." @@ -2110,31 +2110,31 @@ msgstr "" "Agregue el directorio de `papelera` de PostgreSQL (por defecto: " "`C:\\\\Program Files\\\\PostgreSQL\\\\\\\\bin`) a su `RUTA`." -#: ../../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 "Cree un usuario postgres con una contraseña usando la guía pgAdmin:" -#: ../../content/administration/install/install.rst:337 +#: ../../content/administration/install/install.rst:350 msgid "Open **pgAdmin**." msgstr "Abrir **pgAdmin**." -#: ../../content/administration/install/install.rst:338 +#: ../../content/administration/install/install.rst:351 msgid "Double-click the server to create a connection." msgstr "Haga doble clic en el servidor para crear una conexión." -#: ../../content/administration/install/install.rst:339 +#: ../../content/administration/install/install.rst:352 msgid "Select :menuselection:`Object --> Create --> Login/Group Role`." msgstr "" "Seleccione :menuselection:`Objeto --> Crear --> Rol de Inicio se " "sesión/Grupo`." -#: ../../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 "" "Ingrese el nombre de usuario en el campo de **Nombre de la función** (por " "ejemplo, `odoo`)" -#: ../../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**." @@ -2142,7 +2142,7 @@ msgstr "" "Abra la pestaña de **Definición** ingrese la contraseña (por ejemplo, " "``odoo``), después haga clic en **Guardar**." -#: ../../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`." @@ -2150,13 +2150,13 @@ msgstr "" "Abra la pestaña de **Privilegios** y cambie **¿Puede iniciar sesión?** a " "`Sí` y **¿Crear una base de datos?** a `Sí`." -#: ../../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 "Dependencias" -#: ../../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 " @@ -2170,9 +2170,9 @@ msgstr "" "studio-2019>`_. Cuando se lo pida, seleccione **herramientas de creación " "C++** en la pestaña de **Carga de trabajo** e instálelo." -#: ../../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." @@ -2180,9 +2180,9 @@ msgstr "" "Las dependencias de Odoo están enlistadas en el archivo `requirements.txt` " "que se encuentra en la raíz del directorio de Odoo community." -#: ../../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 " @@ -2192,7 +2192,7 @@ msgstr "" "instancias de Odoo o con su sistema. Puede usar vitualenv_ para crear " "entornos Python aislados." -#: ../../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 " @@ -2202,9 +2202,9 @@ msgstr "" "ejecute **pip** en el campo de requisitos en una terminal **con privilegios " "de administrador**:" -#: ../../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:" @@ -2212,17 +2212,17 @@ msgstr "" "Para idiomas que funcionan con una interfaz de izquierda a derecha (como las" " interfaces de árabe y hebreo) se necesita el paquete `rtlcss`:" -#: ../../content/administration/install/install.rst:375 +#: ../../content/administration/install/install.rst:388 msgid "Download and install `nodejs `_." msgstr "Descargue e instale `nodejs `_." -#: ../../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 "Instale `rtlcss`:" -#: ../../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: " @@ -2232,15 +2232,15 @@ msgstr "" "donde se encuentra `rtlcss.cmd` (típicamente: " "`C:\\\\Users\\\\\\\\AppData\\\\Roaming\\\\npm\\\\`)." -#: ../../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 "Ejecutar Odoo" -#: ../../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" @@ -2250,9 +2250,9 @@ msgstr "" "ejecutando `odoo-bin`, la interfaz de la línea de comando del servidor. Se " "encuentra en la raíz del directorio de Odoo Community." -#: ../../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 " @@ -2262,9 +2262,9 @@ msgstr "" " de comando ` o un :ref:`archivo de configuración " "`." -#: ../../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 " @@ -2275,31 +2275,31 @@ msgstr "" "antes que otras rutas en `addons-path` para que los complementos se carguen " "correctamente." -#: ../../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 "Estas son las configuraciones necesarias más comunes:" -#: ../../content/administration/install/install.rst:400 +#: ../../content/administration/install/install.rst:413 msgid "PostgreSQL user and password." msgstr "Usuario y contraseña de PostgreSQL" -#: ../../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 "" "Rutas de complementos personalizadas más allá de lo predeterminado para " "cargar los módulos." -#: ../../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 "Una forma típica de ejecutar el servidor sería:" -#: ../../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 " @@ -2310,17 +2310,13 @@ msgstr "" " de PostgreSQL y `mydb` es la base de datos automática que sirve en " "`localhost:8069`. " -#: ../../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 "" -":doc:`La lista completa de argumentos para la papelera de " -"odoo`." -#: ../../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." @@ -2329,7 +2325,7 @@ msgstr "" "gestor de paquetes para descargar e instalar Python 3 en su equipo si no lo " "ha hecho todavía." -#: ../../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)." @@ -2338,12 +2334,12 @@ msgstr "" "paquetes para descargar e instalar PostgreSQL (versión compatible: 10.0 y " "más avanzadas)." -#: ../../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 "En Debian/Ubuntu, se puede lograr ejecutando lo siguiente:" -#: ../../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." @@ -2351,7 +2347,7 @@ msgstr "" "Ya que su usuario de PostgreSQL tiene el mismo nombre que su inicio de " "sesión de Unix, podrá conectarse a la base de datos sin una contraseña." -#: ../../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 " @@ -2363,7 +2359,7 @@ msgstr "" "de Odoo. Están disponibles en los paquetes `-dev` o `-devel` para Python, " "PostgreSQL, libxml2, libxslt1, libevent, libsasl2 y libldap2." -#: ../../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:" @@ -2371,8 +2367,8 @@ msgstr "" "En Debian/Ubuntu, este comando debería de instalar todas las bibliotecas " "necesarias:" -#: ../../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:" @@ -2380,12 +2376,12 @@ msgstr "" "Vaya a la ruta de su instalación de Odoo Community (`CommunityPath`) y " "ejecute **pip** en el archivo de solicitudes:" -#: ../../content/administration/install/install.rst:548 +#: ../../content/administration/install/install.rst:574 msgid "Download and install **nodejs** and **npm** with your package manager." msgstr "Descargue e instale **nodejs** y **npm** con su gestor de paquetería." -#: ../../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" @@ -2396,8 +2392,8 @@ msgstr "" " conecta con un socket UNIX en el puerto `5432` con el usuario actual y sin " "contraseña." -#: ../../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`." @@ -2405,11 +2401,11 @@ msgstr "" "Donde `CommunityPath` es la ruta de la instalación de Odoo Community y " "`mydb` es la base de datos que funciona en `localhost:8069`." -#: ../../content/administration/install/install.rst:589 +#: ../../content/administration/install/install.rst:617 msgid "Mac OS" msgstr "Mac OS" -#: ../../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 " @@ -2419,7 +2415,7 @@ msgstr "" "gestor de paquetes preferido (homebrew_, macports_) para descargar e " "instalar Python 3 en su equipo si no lo ha hecho todavía. " -#: ../../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 " @@ -2429,17 +2425,24 @@ msgstr "" "`postgres.app `_ para descargar e instalar " "PostgreSQL (versión compatible: 10.0 y más avanzadas)." -#: ../../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 "" "Las dependencias que no sean Python necesitan instalarse con un gestor de " "paquetes:" -#: ../../content/administration/install/install.rst:695 +#: ../../content/administration/install/install.rst:739 msgid "Download and install the **Command Line Tools**:" msgstr "Descargue e instale las **Herramientas de líneas de comando**:" -#: ../../content/administration/install/install.rst:701 +#: ../../content/administration/install/install.rst:745 msgid "" "Download and install the package manager of your choice (homebrew_, " "macports_)." @@ -2447,11 +2450,11 @@ msgstr "" "Descargue e instale el gestor de paquetes que usted haya elegido (homebrew_," " macports_)." -#: ../../content/administration/install/install.rst:702 +#: ../../content/administration/install/install.rst:746 msgid "Install non-python dependencies." msgstr "Instale dependencias que no sean python." -#: ../../content/administration/install/install.rst:712 +#: ../../content/administration/install/install.rst:756 msgid "" "Download and install **nodejs** with your preferred package manager " "(homebrew_, macports_)." @@ -2459,12 +2462,19 @@ msgstr "" "Descargue e instale **nodejs** con su gestor de paquete preferido " "(homebrew_, macports_)." -#: ../../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 "Docker" -#: ../../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." @@ -2538,11 +2548,23 @@ msgstr "" "Después, los visitantes pueden acceder a su sitio web con una dirección como" " ``www.example.com`` en lugar de la predeterminada, ``example.odoo.com``." +#: ../../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 "Sobre los nombres de dominio" -#: ../../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" @@ -2554,7 +2576,7 @@ msgstr "" "visitantes. Le recomendamos que sean *simples, cortas y fáciles de " "escribir*." -#: ../../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. " @@ -2571,7 +2593,7 @@ msgstr "" "su sitio web principal o a páginas específicas (ejemplo, " "``experience.odoo.com`` indica una página específica)." -#: ../../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 " @@ -2584,11 +2606,11 @@ msgstr "" "puede tardar 72 horas en propagarse por todo el mundo y en todos los " "servidores." -#: ../../content/administration/maintain/domain_names.rst:46 +#: ../../content/administration/maintain/domain_names.rst:51 msgid "Register a free domain name with Odoo" msgstr "Registre un nombre de dominio gratis con Odoo" -#: ../../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." @@ -2596,13 +2618,13 @@ msgstr "" "Puede registrar un nombre de dominio para su base de datos de Odoo en línea " "directamente desde su sitio web de Odoo o su gestor de base de datos." -#: ../../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 "" "¡Su nombre de dominio es **gratis por un año** si lo registra con Odoo!" -#: ../../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." @@ -2610,17 +2632,17 @@ msgstr "" "El nombre de dominio se registra con `Gandi `_,el " "registrador de nombre de dominio." -#: ../../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 "" "Usted es el dueño del nombre de dominio y puede usarlo para otros fines." -#: ../../content/administration/maintain/domain_names.rst:56 +#: ../../content/administration/maintain/domain_names.rst:61 msgid "Odoo manages payment and technical support for you." msgstr "Odoo gestiona el pago y servicio de asistencia." -#: ../../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 " @@ -2633,7 +2655,7 @@ msgstr "" ":guilabel:`ajustes` a un lado de su base de datos, después en " ":guilabel:`Nombres de dominio`." -#: ../../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." @@ -2641,7 +2663,7 @@ msgstr "" "Busque el nombre de dominio de su elección para revisar si está disponible, " "después seleccione el que quiere registrar para su sitio web." -#: ../../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." @@ -2649,7 +2671,7 @@ msgstr "" "Después, llene el formulario con su información para convertirse en el dueño" " del nombre del dominio." -#: ../../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 `." @@ -2658,7 +2680,7 @@ msgstr "" "todavía debe :ref:`mapear su nombre de dominio con su base de datos `." -#: ../../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 " @@ -2670,15 +2692,15 @@ msgstr "" "Odoo revisa su petisción y su sitio web para evitar abuso. Puede que este " "proceso tarde hasta 3 días." -#: ../../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 "Esto todavía no está disponible para bases de datos de Odoo.sh." -#: ../../content/administration/maintain/domain_names.rst:87 +#: ../../content/administration/maintain/domain_names.rst:92 msgid "Manage your domain name registered with Odoo" msgstr "Gestione su nombre de dominio registrado con Odoo" -#: ../../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 " @@ -2693,7 +2715,7 @@ msgstr "" ":guilabel:`nombres de dominio` y después en :guilabel:`Contactos` o en " ":guilabel:`DNS`." -#: ../../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." @@ -2701,18 +2723,18 @@ msgstr "" "`Cree un ticket de soporte `_ si necesita más " "asistencia para gestionar su nombre de dominio." -#: ../../content/administration/maintain/domain_names.rst:105 +#: ../../content/administration/maintain/domain_names.rst:110 msgid "Configure your existing domain name" msgstr "Configure su nombre de dominio existente" -#: ../../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 "" "Si ya es dueño de un nombre de dominio, puede usarlo para indicar su sitio " "web." -#: ../../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 " @@ -2722,7 +2744,7 @@ msgstr "" " `, le recomendamos que realice las siguientes acciones en " "este orden:" -#: ../../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." @@ -2730,14 +2752,14 @@ msgstr "" ":ref:`Agregue un registro CNAME ` en la zona DNS de su " "nombre de dominio." -#: ../../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 "" ":ref:`Mapee su nombre de dominio con su base de datos de Odoo `." -#: ../../content/administration/maintain/domain_names.rst:114 +#: ../../content/administration/maintain/domain_names.rst:119 msgid "" ":ref:`Map your domain name with your Odoo website `." @@ -2745,11 +2767,11 @@ msgstr "" ":ref:`Mapee su nombre de dominio con su sitio web de Odoo `." -#: ../../content/administration/maintain/domain_names.rst:119 +#: ../../content/administration/maintain/domain_names.rst:124 msgid "Add a CNAME record" msgstr "Añadir un registro CNAME" -#: ../../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." @@ -2758,7 +2780,7 @@ msgstr "" "de IP de otro sitio web en lugar de redireccionar directamente a una " "dirección IP." -#: ../../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." @@ -2766,13 +2788,13 @@ msgstr "" "Necesita un registro de CNAME que lo lleve a su base de datos de Odoo. Los " "requisitos están detallados en su gestor de bases de datos." -#: ../../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 "Odoo en línea" -#: ../../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``)" @@ -2780,15 +2802,15 @@ msgstr "" "La dirección objetivo es la dirección actual de su base de datos, como se " "definió al crearla (por ejemplo, ``example.odoo.com``)." -#: ../../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 "Odoo.sh" -#: ../../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`." @@ -2796,7 +2818,7 @@ msgstr "" "La dirección principal de su proyecto está definido en " ":menuselection:`Ajustes --> Nombre de proyecto`." -#: ../../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 --> " @@ -2809,12 +2831,12 @@ msgstr "" "configurar mi dominio?`. Un mensaje indica qué dirección debería ser el " "objetivo de su registro CNAME." -#: ../../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 "Abra el tablero del gestor de nombre de dominio." -#: ../../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." @@ -2822,12 +2844,12 @@ msgstr "" "Abra la página de gestión de **zona DNS** para el nombre de dominio que " "quiere configurar" -#: ../../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 "" "Cree un **registro CNAME** que lleve a la dirección de su base de datos." -#: ../../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, " @@ -2837,7 +2859,7 @@ msgstr "" "(``www.example.com``). Puede usar cualquier nombre de dominio de su elección" " con cualquier subdominio (``anything.example.com``)." -#: ../../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 " @@ -2850,7 +2872,7 @@ msgstr "" "``www.ejemplo.com`` pero también con el :ref:`dominio desnudo ` ``ejemplo.com``." -#: ../../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 " @@ -2862,26 +2884,26 @@ msgstr "" "la siguiente regla y la agrega a su zona DNS: ``www EN CNAME " "example.odoo.com.``" -#: ../../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 "" "También crea una redirección desde ``ejemplo.com`` a ``wwww.ejemplo.com``." -#: ../../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 "" "Sus registros nuevos de DNS se propagan a todos los servidores de DNS." -#: ../../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 "Aquí hay algunos lineamientos para crear un CNAME registro:" -#: ../../content/administration/maintain/domain_names.rst:168 +#: ../../content/administration/maintain/domain_names.rst:173 msgid "`GoDaddy `_" msgstr "`GoDaddy `_" -#: ../../content/administration/maintain/domain_names.rst:169 +#: ../../content/administration/maintain/domain_names.rst:174 msgid "" "`Namecheap " "`_" -#: ../../content/administration/maintain/domain_names.rst:170 +#: ../../content/administration/maintain/domain_names.rst:175 msgid "" "`OVH " "`_" -#: ../../content/administration/maintain/domain_names.rst:171 +#: ../../content/administration/maintain/domain_names.rst:176 msgid "" "`CloudFlare `_" @@ -2909,18 +2931,18 @@ msgstr "" "`CloudFlare `_" -#: ../../content/administration/maintain/domain_names.rst:172 +#: ../../content/administration/maintain/domain_names.rst:177 msgid "" "`Google Domains `_" msgstr "" "`Google Domains " "`_" -#: ../../content/administration/maintain/domain_names.rst:177 +#: ../../content/administration/maintain/domain_names.rst:182 msgid "Naked domain" msgstr "Dominio desnudo" -#: ../../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``)." @@ -2929,7 +2951,7 @@ msgstr "" "inicio de la dirección (por ejemplo, ``odoo.com`` en lugar de " "``www.odoo.com``)." -#: ../../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." @@ -2938,7 +2960,7 @@ msgstr "" " web, ya que algunos visitantes no escribirán el nombre de dominio completo " "para ir a su sitio web." -#: ../../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``)." @@ -2946,7 +2968,7 @@ msgstr "" "Cree una **redirección** desde el dominio desnudo (``ejemplo.com``) al " "nombre de su dominio (``www.ejemplo.com``)." -#: ../../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." @@ -2954,11 +2976,11 @@ msgstr "" "Dependiendo en el registrador de su nombre de dominio, esta redirección " "puede que ya esté preconfigurada." -#: ../../content/administration/maintain/domain_names.rst:195 +#: ../../content/administration/maintain/domain_names.rst:200 msgid "Map your domain name with your Odoo database" msgstr "Mapee su nombre de dominio con su base de datos de Odoo." -#: ../../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 " @@ -2970,7 +2992,7 @@ msgstr "" ":guilabel:`Nombres de dominio`, y después en :guilabel:`Usar su propio " "dominio` al final de la columna derecha." -#: ../../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. " @@ -2981,7 +3003,7 @@ msgstr "" "está configurado correctamente. Una vez que lo haya hecho, haga clic en " ":guilabel:`Confirmo, está listo`." -#: ../../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" @@ -2991,7 +3013,7 @@ msgstr "" " personalizados`, ingrese el nombre de dominio que quiere agregar a esta " "base de datos, después haga clic en :guilabel:`Agregar dominio`." -#: ../../content/administration/maintain/domain_names.rst:223 +#: ../../content/administration/maintain/domain_names.rst:228 msgid "" ":ref:`Odoo.sh branches: settings tab `" @@ -2999,7 +3021,7 @@ msgstr "" ":ref:`Odoo.sh ramas: pestaña de ajustes `" -#: ../../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." @@ -3008,7 +3030,7 @@ msgstr "" "su dominio **antes** de mapear el nombre de su dominio a la base de datos de" " Odoo." -#: ../../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. " @@ -3020,7 +3042,7 @@ msgstr "" "certificado*. Los navegadores web normalmente muestran esto como una " "advertencia como *\"Su conexión no es privada\"*." -#: ../../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 " @@ -3033,11 +3055,11 @@ msgstr "" "`_ en el que incluya las capturas de pantalla de " "sus registros de CNAME." -#: ../../content/administration/maintain/domain_names.rst:240 +#: ../../content/administration/maintain/domain_names.rst:245 msgid "SSL encryption (HTTPS protocol)" msgstr "Cifrado SSL (protocolo HTTPS)" -#: ../../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, " @@ -3049,7 +3071,7 @@ msgstr "" "conexión segura que aparece como un protocolo ``https://`` al inicio de su " "dirección web, en lugar de un protocolo ``http://`` que no es seguro." -#: ../../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 " @@ -3061,11 +3083,11 @@ msgstr "" " `Vamos a codificar el certificado de autoridad y protocolo ACME " "`_." -#: ../../content/administration/maintain/domain_names.rst:251 +#: ../../content/administration/maintain/domain_names.rst:256 msgid "The certificate generation may take up to 24h." msgstr "Es posible que tome 24 horas generar el certificado." -#: ../../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." @@ -3074,7 +3096,7 @@ msgstr "" "después del momento en el que agrega el nombre de su dominio a los ajustes " "de la base de datos." -#: ../../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." @@ -3082,11 +3104,11 @@ msgstr "" "Si ya usó otro servicio, puede seguir usándolo o simplemente cambiarse a " "Odoo." -#: ../../content/administration/maintain/domain_names.rst:259 +#: ../../content/administration/maintain/domain_names.rst:264 msgid "Web base URL of a database" msgstr "URL web base de la base de datos" -#: ../../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 `." @@ -3095,7 +3117,7 @@ msgstr "" "propio nombre de dominio a su sitio web ` " "directamente." -#: ../../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, " @@ -3105,7 +3127,7 @@ msgstr "" " web principal y todos los enlaces que se enviaron a sus clientes (por " "ejemplo, cotizaciones, enlaces al portal, entre otros)." -#: ../../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* " @@ -3116,7 +3138,7 @@ msgstr "" "(cualquier usuario en el grupo *Ajustes*) desde la pantalla de inicio de " "sesión." -#: ../../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 " @@ -3127,7 +3149,7 @@ msgstr "" "su base de datos. Lea más abajo cómo evitar estas actualizaciones " "automáticas." -#: ../../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 " @@ -3137,7 +3159,7 @@ msgstr "" "desarrollo `, después vaya a :menuselection:`Ajustes --> " "Técnico --> Parámetros del sistema`." -#: ../../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 " @@ -3147,7 +3169,7 @@ msgstr "" "después ingrese la dirección completa de su sitio web como valor, por " "ejemplo, ``https://www.ejemplo.com``." -#: ../../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 (``/``)." @@ -3155,7 +3177,7 @@ msgstr "" "El URL debe incluir el protocolo ``https://`` (o ``http://``) y no debe " "terminar con la barra diagonal (``/``)." -#: ../../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:" @@ -3164,19 +3186,19 @@ msgstr "" "administrador inicie sesión en la base de datos, puede crear el parámetro " "del sistema:" -#: ../../content/administration/maintain/domain_names.rst:288 +#: ../../content/administration/maintain/domain_names.rst:293 msgid "key: ``web.base.url.freeze``" msgstr "clave: ``web.base.url.freeze``" -#: ../../content/administration/maintain/domain_names.rst:289 +#: ../../content/administration/maintain/domain_names.rst:294 msgid "value: ``True``" msgstr "valor: ``True``" -#: ../../content/administration/maintain/domain_names.rst:294 +#: ../../content/administration/maintain/domain_names.rst:299 msgid "Map your domain name with your website" msgstr "Mapee el nombre del dominio con el sitio web" -#: ../../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:" @@ -3184,7 +3206,7 @@ msgstr "" "Mapear el nombre de su dominio a su sitio web no es lo mismo que mapearlo " "con su base de datos:" -#: ../../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." @@ -3192,7 +3214,7 @@ msgstr "" "Define el nombre del dominio como el principal para su sitio web, lo que le " "ayuda a los buscadores a indexar su sitio web apropiadamente." -#: ../../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." @@ -3200,7 +3222,7 @@ msgstr "" "Define su nombre de domino como la URL base para su base de datos, " "incluyendo los enlaces del portal que enviaron sus clientes." -#: ../../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." @@ -3208,7 +3230,7 @@ msgstr "" "Si tiene varios sitios web, mapea el nombre de su dominio al sitio web " "apropiado." -#: ../../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." @@ -3217,7 +3239,7 @@ msgstr "" "Información del sitio web`. Si tiene varios sitios web, seleccione el que " "quiere configurar." -#: ../../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`." @@ -3226,7 +3248,7 @@ msgstr "" "web (por ejemplo, ``https://www.ejemplo.com``) y haga clic en " ":guilabel:`Guardar`." -#: ../../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 " @@ -3236,7 +3258,7 @@ msgstr "" "indexe tanto su nombre de dominio personalizado ``www.ejemplo.com`` como la " "dirección original de su base de datos de Odoo ``ejemplo.odoo.com``." -#: ../../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 " @@ -3248,7 +3270,7 @@ msgstr "" "`Consola de búsqueda de Google `_ para arreglar esto." -#: ../../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 " @@ -3262,7 +3284,7 @@ msgstr "" " URL usar como la :ref:`URL base ` según la " "empresa que se está usando." -#: ../../content/administration/maintain/domain_names.rst:329 +#: ../../content/administration/maintain/domain_names.rst:334 msgid ":doc:`/applications/general/email_communication/email_servers`" msgstr ":doc:`/applications/general/email_communication/email_servers`" @@ -3421,6 +3443,312 @@ msgstr "" "su base de datos con su suscripción a Odoo Enterprise introduciendo el " "código que recibió por correo electrónico en la entrada del formulario" +#: ../../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 "Configuración en Google" + +#: ../../content/administration/maintain/google_oauth.rst:18 +msgid "Create a new project" +msgstr "Crear un nuevo proyecto" + +#: ../../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 "Configuración en Odoo" + +#: ../../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 "Cambiar la solución de alojamiento" @@ -3440,11 +3768,6 @@ msgid "From on-premises to Odoo Online" msgstr "De alojamiento local a Odoo en línea" #: ../../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 "Odoo en línea no es compatible con **aplicaciones no estándar**." - -#: ../../content/administration/maintain/hosting_changes.rst:16 msgid "" "Create a :ref:`duplicate ` of your database: in this " "duplicate, uninstall all the **non-standard apps**." @@ -3452,7 +3775,7 @@ msgstr "" "Cree un :ref:`duplicado ` de su base de datos. Desinstale" " todas las **aplicaciones no estándar** de este duplicado." -#: ../../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." @@ -3460,8 +3783,7 @@ msgstr "" "Obtenga un \"dump con archivos almacenados\" de su base de datos a través " "del gestor de base de datos." -#: ../../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.**" @@ -3469,7 +3791,7 @@ msgstr "" "**Si tiene restricciones de tiempo, contáctenos lo más pronto posible para " "programar la transferencia.**" -#: ../../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" @@ -3482,8 +3804,8 @@ msgstr "" "su número de suscripción y el URL que desea usar en su base de datos (por " "ejemplo: mi-empresa.odoo.com)." -#: ../../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." @@ -3491,17 +3813,27 @@ msgstr "" "Nos aseguraremos de que su base de datos sea compatible y la subiremos a " "nuestra nube. Lo contactaremos en caso de tener problemas técnicos." -#: ../../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 "¡Listo!" -#: ../../content/administration/maintain/hosting_changes.rst:24 +#: ../../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 "Odoo en línea no es compatible con **aplicaciones no estándar**." + +#: ../../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 "From on-premises to Odoo.sh" msgstr "De alojamiento local a Odoo.sh" -#: ../../content/administration/maintain/hosting_changes.rst:26 -#: ../../content/administration/maintain/hosting_changes.rst:43 +#: ../../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 " "`." @@ -3509,16 +3841,16 @@ msgstr "" "Siga la :ref:`sección \"Importar su base de datos\" de la documentación de " "Odoo.sh `." -#: ../../content/administration/maintain/hosting_changes.rst:27 +#: ../../content/administration/maintain/hosting_changes.rst:30 msgid "...and voilà!" msgstr "Y... ¡voilà!" -#: ../../content/administration/maintain/hosting_changes.rst:30 +#: ../../content/administration/maintain/hosting_changes.rst:33 msgid "From Odoo Online to on-premises" msgstr "De Odoo en línea a alojamiento local" -#: ../../content/administration/maintain/hosting_changes.rst:32 -#: ../../content/administration/maintain/hosting_changes.rst:40 +#: ../../content/administration/maintain/hosting_changes.rst:35 +#: ../../content/administration/maintain/hosting_changes.rst:43 msgid "" "Log into `your Odoo Online user portal " "`_ and look for the version " @@ -3528,7 +3860,7 @@ msgstr "" "`_ y busqué el número de " "versión de su base de datos." -#: ../../content/administration/maintain/hosting_changes.rst:33 +#: ../../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" @@ -3541,8 +3873,8 @@ msgstr "" "datos ejecuta Odoo 12.3, la cual no es una versión reciente, debe " "actualizarla a Odoo 13.0 o 14.0.*)" -#: ../../content/administration/maintain/hosting_changes.rst:34 -#: ../../content/administration/maintain/hosting_changes.rst:42 +#: ../../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" @@ -3555,16 +3887,16 @@ msgstr "" "su archivo de respaldo es muy grande, contacte a `nuestro equipo de soporte " "`_)" -#: ../../content/administration/maintain/hosting_changes.rst:35 -#: ../../content/administration/maintain/hosting_changes.rst:60 +#: ../../content/administration/maintain/hosting_changes.rst:38 +#: ../../content/administration/maintain/hosting_changes.rst:87 msgid "Restore it from the database manager on your local server." msgstr "Restáurela desde el gestor de base de datos en su servidor local." -#: ../../content/administration/maintain/hosting_changes.rst:38 +#: ../../content/administration/maintain/hosting_changes.rst:41 msgid "From Odoo Online to Odoo.sh" msgstr "De Odoo en línea a Odoo.sh" -#: ../../content/administration/maintain/hosting_changes.rst:41 +#: ../../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 " @@ -3577,33 +3909,99 @@ msgstr "" " ejecuta Odoo 12.3, la cual no es una versión reciente, primero debe " "actualizarla a Odoo 13.0 o 14.0.*)." -#: ../../content/administration/maintain/hosting_changes.rst:46 +#: ../../content/administration/maintain/hosting_changes.rst:49 msgid "From Odoo.sh to Odoo Online" msgstr "De Odoo.sh a Odoo en línea" -#: ../../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 "" -"Desinstale todas las **aplicaciones no estándar**: primero pruébelo en una " -"compilación de prueba y después hágalo en su compilación de producción." #: ../../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)." +"`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 "" -"`Cree un ticket de soporte `_ e incluya su número" -" de suscripción y el URL que desea usar en su base de datos (por ejemplo: " -"mi.empresa.odoo.com)." #: ../../content/administration/maintain/hosting_changes.rst:57 +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 "Europa" + +#: ../../content/administration/maintain/hosting_changes.rst:61 +msgid "Asia" +msgstr "Asia" + +#: ../../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 "¡Todo listo!" + +#: ../../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 "De Odoo.sh a alojamiento local" -#: ../../content/administration/maintain/hosting_changes.rst:59 +#: ../../content/administration/maintain/hosting_changes.rst:86 msgid "" "Grab a :ref:`backup of your Odoo.sh production database " "`." @@ -3995,6 +4393,7 @@ msgid ":ref:`online/users`" msgstr ":ref:`online/users`" #: ../../content/administration/maintain/online.rst:36 +#: ../../content/administration/odoo_sh/getting_started/branches.rst:285 #: ../../content/administration/upgrade.rst:10 msgid "Upgrade" msgstr "Actualizar" @@ -4144,7 +4543,7 @@ msgstr "" "en la barra de búsqueda." #: ../../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 "Eliminar" @@ -4517,23 +4916,23 @@ msgstr "N/A Nunca hubo para esta plataforma" msgid "🏁 Future version, not released yet" msgstr "🏁 Versión futura, aún no disponible" -#: ../../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 "Uso una versión más antigua de Odoo/OpenERP/TinyERP" -#: ../../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 "" "OpenERP 7.0, 6.1, 6.0 y 5.0 ya no reciben soporte, en ninguna plataforma." -#: ../../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 "" "TinyERP 4.0, 3.0, 2.0 y 1.0 ya no reciben soporte, en ninguna plataforma." -#: ../../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 `_." @@ -4898,6 +5297,7 @@ msgstr "Contenedores" #: ../../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 "Información general" @@ -5109,10 +5509,8 @@ msgstr "" #: ../../content/administration/odoo_sh/advanced/containers.rst:169 msgid "" "More options are available and detailed in the :doc:`CLI documentation " -"`." +"`." msgstr "" -"Hay más opciones disponibles que se describen en la :doc:`documentación de " -"Interfaz de línea de comandos `." #: ../../content/administration/odoo_sh/advanced/containers.rst:172 msgid "" @@ -5621,11 +6019,8 @@ msgstr "" 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 "" -"Este método es equivalente a realizar una actualización de un módulo a " -"través del menú de Aplicaciones, o a través del interruptor :code:`-u` " -"switch de :doc:`la línea de comando `." #: ../../content/administration/odoo_sh/getting_started/branches.rst:47 msgid "" @@ -6241,7 +6636,15 @@ msgstr "" "El botón de descarga de dump de Odoo.sh en la :ref:`Vista de compilaciones " "`." -#: ../../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 @@ -6249,7 +6652,7 @@ msgstr "" msgid "Settings" msgstr "Ajustes" -#: ../../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." @@ -6257,11 +6660,11 @@ msgstr "" "Aquí puede encontrar un par de ajustes que solo aplican a la rama " "seleccionada." -#: ../../content/administration/odoo_sh/getting_started/branches.rst:291 +#: ../../content/administration/odoo_sh/getting_started/branches.rst:302 msgid "**Behaviour upon new commit**" msgstr "**Comportamiento después de una nueva confirmación**" -#: ../../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 " @@ -6285,18 +6688,18 @@ msgstr "" "Una rama que se regresa de un estado de prueba a uno de desarrollo se " "establecerá como 'No hacer nada' de forma automática." -#: ../../content/administration/odoo_sh/getting_started/branches.rst:301 +#: ../../content/administration/odoo_sh/getting_started/branches.rst:312 msgid "**Modules installation**" msgstr "**Instalación de módulos**" -#: ../../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 "" "Elija los módulos que se instalarán de forma automática en sus compilaciones" " de desarrollo." -#: ../../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 ` " @@ -6306,7 +6709,7 @@ msgstr "" "la opción predeterminada. Se excluyen los :ref:`submódulos `." -#: ../../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. " @@ -6317,7 +6720,7 @@ msgstr "" "Odoo. El conjunto de prueba se deshabilita al ejecutar la instalación " "completa." -#: ../../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" @@ -6327,7 +6730,7 @@ msgstr "" "el campo debajo de esta opción. Se deben colocar los nombres técnicos de los" " módulos separados por comas." -#: ../../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 " @@ -6338,11 +6741,11 @@ msgstr "" "desarrollo. Las compilaciones de prueba duplican la compilación de " "producción y la compilación de producción solo instala la base." -#: ../../content/administration/odoo_sh/getting_started/branches.rst:320 +#: ../../content/administration/odoo_sh/getting_started/branches.rst:331 msgid "**Test suite**" msgstr "**Conjunto de prueba**" -#: ../../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 " @@ -6354,11 +6757,11 @@ msgstr "" "Cuando se habilita el conjunto de prueba, puede restringirlo al especificar " ":ref:`etiquetas de prueba `." -#: ../../content/administration/odoo_sh/getting_started/branches.rst:326 +#: ../../content/administration/odoo_sh/getting_started/branches.rst:337 msgid "**Odoo Version**" msgstr "**Versión de Odoo**" -#: ../../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 " @@ -6368,7 +6771,7 @@ msgstr "" " si desea probar un código actualizado o desarrollar funciones mientras su " "base de datos está en el proceso de actualización a una nueva versión." -#: ../../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." @@ -6376,7 +6779,7 @@ msgstr "" "Además, para cada versión tiene dos opciones en cuanto a la actualización de" " código." -#: ../../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." @@ -6386,7 +6789,7 @@ msgstr "" "y rendimiento de forma automática. Las fuentes de su servidor de Odoo se " "actualizarán semanalmente. Esta es la opción 'Más reciente'." -#: ../../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" @@ -6399,11 +6802,11 @@ msgstr "" "de expiración y si no toma ninguna medida, se establecerá automáticamente a " "la última revisión." -#: ../../content/administration/odoo_sh/getting_started/branches.rst:340 +#: ../../content/administration/odoo_sh/getting_started/branches.rst:351 msgid "**Custom domains**" msgstr "**Dominios personalizados**" -#: ../../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. " @@ -6413,15 +6816,15 @@ msgstr "" " posible agregar otros dominios *.odoo.com* o sus propios dominios " "personalizados. Para hacer esto último, debe:" -#: ../../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 "Ser propietario o comprar el nombre de dominio." -#: ../../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 "Agregar el nombre de dominio en esta lista." -#: ../../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." @@ -6430,7 +6833,7 @@ msgstr "" "dominio con un registro ``CNAME`` establecido como el nombre de dominio de " "su base de datos de producción." -#: ../../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*:" @@ -6438,7 +6841,7 @@ msgstr "" "Por ejemplo, para asociar *www.miempresa.com* con su base de datos " "*miempresa.odoo.com*:" -#: ../../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," @@ -6446,7 +6849,7 @@ msgstr "" "En Odoo.sh, agregue *www.mycompany.com* en los dominios personalizados de " "los ajustes de su proyecto." -#: ../../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 " @@ -6456,19 +6859,19 @@ msgstr "" "*ovh.com*), configure *www.miempresa.com* con un registro ``CNAME`` con el " "valor de *miempresa.odoo.com*." -#: ../../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 "No se aceptan los dominios simples (por ejemplo, *miempresa.com*):" -#: ../../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 "Solo se pueden configurar al usar registros ``A``." -#: ../../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 "Los registros ``A`` solo aceptan direcciones IP como valor." -#: ../../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." @@ -6477,7 +6880,7 @@ msgstr "" "actualización, un fallo de hardware o si cambia el alojamiento de su base de" " datos a otro país o continente." -#: ../../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." @@ -6485,7 +6888,7 @@ msgstr "" "Por lo tanto, los dominios simples podrían dejar de funcionar repentinamente" " debido a este cambio de dirección IP." -#: ../../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 " @@ -6506,11 +6909,11 @@ msgstr "" "tienen la función de configurar esta redirección. Se le conoce normalmente " "con el nombre de redirección web." -#: ../../content/administration/odoo_sh/getting_started/branches.rst:372 +#: ../../content/administration/odoo_sh/getting_started/branches.rst:383 msgid "**HTTPS/SSL**" msgstr "**HTTPS/SSL**" -#: ../../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 " @@ -6522,7 +6925,7 @@ msgstr "" "`_ en una hora y su dominio será accesible a" " través de HTTPS." -#: ../../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 " @@ -6532,11 +6935,11 @@ msgstr "" "la plataforma de Odoo.sh, consideraremos agregar esta función si hay la " "suficiente demanda." -#: ../../content/administration/odoo_sh/getting_started/branches.rst:382 +#: ../../content/administration/odoo_sh/getting_started/branches.rst:393 msgid "**SPF and DKIM compliance**" msgstr "**Cumplimiento de SPF y DKIM**" -#: ../../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 " @@ -6554,7 +6957,7 @@ msgstr "" "documentación sobre :ref:`SPF ` y " ":ref:`DKIM `." -#: ../../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." @@ -6563,11 +6966,11 @@ msgstr "" "puede llevar a la entrega de sus correos electrónicos como spam en la " "bandeja de entrada de sus contactos." -#: ../../content/administration/odoo_sh/getting_started/branches.rst:397 +#: ../../content/administration/odoo_sh/getting_started/branches.rst:408 msgid "Shell commands" msgstr "Comandos de shell" -#: ../../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." @@ -6575,7 +6978,7 @@ msgstr "" "En la esquina superior derecha de la vista se encuentran disponibles " "distintos comandos de shell." -#: ../../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 " @@ -6588,19 +6991,19 @@ msgstr "" "invitará al usuario a definir marcadores de posición eventuales como " "````, ````, ..." -#: ../../content/administration/odoo_sh/getting_started/branches.rst:409 +#: ../../content/administration/odoo_sh/getting_started/branches.rst:420 msgid "Clone" msgstr "Clonar" -#: ../../content/administration/odoo_sh/getting_started/branches.rst:410 +#: ../../content/administration/odoo_sh/getting_started/branches.rst:421 msgid "Download the Git repository." msgstr "Descarga el repositorio de Git." -#: ../../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 "Esto clona el repositorio *odoo/odoo*." -#: ../../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." @@ -6608,7 +7011,7 @@ msgstr "" ":code:`--recurse-submodules`: descarga los submódulos de su repositorio. " "También se descargan los submódulos incluidos en los submódulos." -#: ../../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*." @@ -6616,7 +7019,7 @@ msgstr "" ":code:`--branch`: comprueba una rama específica del repositorio, en este " "caso *master*." -#: ../../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." @@ -6624,15 +7027,15 @@ msgstr "" "El botón de *Ejecutar* no está disponible para este comando, ya que está " "pensado para usarse en sus máquinas." -#: ../../content/administration/odoo_sh/getting_started/branches.rst:424 +#: ../../content/administration/odoo_sh/getting_started/branches.rst:435 msgid "Fork" msgstr "Bifurcar" -#: ../../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 "Crea una nueva rama según la rama actual." -#: ../../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." @@ -6640,39 +7043,39 @@ msgstr "" "Esto crea una nueva rama llamada *feature-1* según la rama *master*, y la " "revisa." -#: ../../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 "Sube la nueva rama *feature-1* en su repositorio remoto." -#: ../../content/administration/odoo_sh/getting_started/branches.rst:440 +#: ../../content/administration/odoo_sh/getting_started/branches.rst:451 msgid "Merge" msgstr "Fusionar" -#: ../../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 "Fusiona la rama actual con otra rama." -#: ../../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 "Esto fusiona la rama *staging-1* con la rama actual." -#: ../../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 "" "Sube los cambios que agregó en la rama *master* a su repositorio remoto." -#: ../../content/administration/odoo_sh/getting_started/branches.rst:456 +#: ../../content/administration/odoo_sh/getting_started/branches.rst:467 msgid "SSH" msgstr "SSH" -#: ../../content/administration/odoo_sh/getting_started/branches.rst:458 +#: ../../content/administration/odoo_sh/getting_started/branches.rst:469 msgid "Setup" msgstr "Configuración" -#: ../../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:" @@ -6680,7 +7083,7 @@ msgstr "" "Para poder utilizar SSH, debe configurar la clave pública de su perfil SSH " "(si aún no lo ha hecho). Para ello, siga estos pasos:" -#: ../../content/administration/odoo_sh/getting_started/branches.rst:462 +#: ../../content/administration/odoo_sh/getting_started/branches.rst:473 msgid "" "`Generate a new SSH key `_" -#: ../../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 " "`_ (solo siga el paso 1 de esta página)." -#: ../../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 "" "Pegue el contenido copiado en las claves SSH de su perfil y haga clic en " "\"Agregar\"." -#: ../../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 "La clave debe aparecer a continuación." -#: ../../content/administration/odoo_sh/getting_started/branches.rst:478 +#: ../../content/administration/odoo_sh/getting_started/branches.rst:489 msgid "Connection" msgstr "Conexión" -#: ../../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 "" "Para conectar sus compilaciones que usan SSH, utilice el siguiente comando " "en una terminal:" -#: ../../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." @@ -6729,7 +7132,7 @@ msgstr "" "Encontrará un atajo para este comando en la pestaña de SSH en la esquina " "superior derecha." -#: ../../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" @@ -6739,7 +7142,7 @@ msgstr "" "settings-collaborators>` en el proyecto, se le concederá acceso SSH a la " "compilación." -#: ../../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." @@ -6748,18 +7151,18 @@ msgstr "" "conexiones inactivas se desconectarán en cualquier momento para liberar " "recursos." -#: ../../content/administration/odoo_sh/getting_started/branches.rst:500 +#: ../../content/administration/odoo_sh/getting_started/branches.rst:511 msgid "Submodule" msgstr "Submódulo" -#: ../../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 "" "Agregue una rama de otro repositorio a su rama actual como un *submódulo*." -#: ../../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." @@ -6767,7 +7170,7 @@ msgstr "" "Los *Submódulos* le permiten usar módulos de otros repositorios en su " "proyecto." -#: ../../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." @@ -6776,7 +7179,7 @@ msgstr "" "capítulo :ref:`Submódulos ` de esta " "documentación." -#: ../../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." @@ -6784,19 +7187,19 @@ msgstr "" "Agrega la rama *master* del repositorio ** como un submódulo en la ruta" " ** en su rama actual." -#: ../../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 "Confirma todos sus cambios actuales." -#: ../../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 "Elimina una rama de su repositorio." -#: ../../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 "Elimina la rama en su repositorio remoto." -#: ../../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 "Elimina la rama en su copia local del repositorio." @@ -7627,13 +8030,10 @@ msgstr "" #: ../../content/administration/odoo_sh/getting_started/first_module.rst:97 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." +":download:`download this module structure template " +"` in which you replace every occurrences of " +"*my_module* to the name of your choice." msgstr "" -"Si no desea instalar Odoo en su computadora, puede :download:`descargar esta" -" plantilla de estructura de módulo ` en la cual se " -"reemplaza cada ocurrencia de *my_module* con el nombre de su preferencia." #: ../../content/administration/odoo_sh/getting_started/first_module.rst:101 msgid "The below structure will be generated:" @@ -8166,69 +8566,69 @@ msgstr "Editar el código fuente" 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 " @@ -8238,62 +8638,62 @@ msgid "" "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 "Confirmar y enviar cambios" -#: ../../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 " @@ -8308,7 +8708,7 @@ msgid "" "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 " @@ -8316,7 +8716,7 @@ msgid "" "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." @@ -8325,11 +8725,11 @@ msgid "" " 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 " @@ -8340,20 +8740,20 @@ msgid "" " 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 " @@ -8362,13 +8762,13 @@ msgid "" "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 " @@ -8376,7 +8776,7 @@ msgid "" "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." @@ -8738,7 +9138,6 @@ msgid "|assistance-contact|" msgstr "" #: ../../content/administration/upgrade.rst:32 -#: ../../content/administration/upgrade/odoo_sh.rst:66 msgid ":ref:`upgrade/sla`" msgstr "" @@ -9508,122 +9907,195 @@ msgid "" "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 +#: ../../content/administration/upgrade/odoo_sh.rst:13 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*." +"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." +"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 +#: ../../content/administration/upgrade/odoo_sh.rst:24 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." +"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 ":doc:`../../administration/upgrade`" +msgstr "" + +#: ../../content/administration/upgrade/odoo_sh.rst:30 +msgid ":doc:`Upgrade FAQ <../upgrade/faq>`" +msgstr "" + +#: ../../content/administration/upgrade/odoo_sh.rst:31 +msgid ":doc:`Introduction to Odoo.sh <../odoo_sh/overview/introduction>`" +msgstr "" + +#: ../../content/administration/upgrade/odoo_sh.rst:36 +msgid "Upgrade your custom modules" +msgstr "" + +#: ../../content/administration/upgrade/odoo_sh.rst:38 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." -msgstr "" - -#: ../../content/administration/upgrade/odoo_sh.rst:32 -msgid "" -"Test the upgraded database and make sure everything runs as it's supposed " -"to." -msgstr "" - -#: ../../content/administration/upgrade/odoo_sh.rst:35 -#: ../../content/administration/upgrade/on_premise.rst:41 -msgid "Upgrade your production database" -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:" -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." +"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." +"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." -msgstr "" - -#: ../../content/administration/upgrade/odoo_sh.rst:58 -#: ../../content/administration/upgrade/on_premise.rst:53 +#: ../../content/administration/upgrade/odoo_sh.rst:62 msgid "" -"Your custom modules also need to be upgraded to keep them compatible with " -"the new version." +"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:60 +#: ../../content/administration/upgrade/odoo_sh.rst:66 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')" +"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: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 @@ -9691,6 +10163,10 @@ msgid "" "`_." 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" @@ -9698,12 +10174,26 @@ msgid "" "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" diff --git a/locale/es/LC_MESSAGES/finance.po b/locale/es/LC_MESSAGES/finance.po index e09a4f3fb..eb4aabac6 100644 --- a/locale/es/LC_MESSAGES/finance.po +++ b/locale/es/LC_MESSAGES/finance.po @@ -4,13 +4,12 @@ # FIRST AUTHOR , YEAR. # # Translators: -# Rafnix Guzman , 2021 -# Alejandro Santana , 2021 # Antonio Trueba, 2021 +# Rafnix Guzman , 2021 +# Nicolás Broggi , 2021 # Cinthya Yepez , 2021 # Cristóbal Martí Oliver , 2021 # José Vicente , 2021 -# Nicolás Broggi , 2021 # Rick Hunter , 2021 # Paulina Rodriguez , 2021 # Susanna Pujol, 2021 @@ -43,19 +42,19 @@ # Daniela Cervantes , 2022 # jabelchi, 2022 # Noemi Nahomy , 2022 -# Martin Trigaux, 2022 # Patricia Gutiérrez Capetillo , 2022 -# Braulio D. López Vázquez , 2022 # Lucia Pacheco , 2022 +# Braulio D. López Vázquez , 2022 +# Martin Trigaux, 2022 # #, fuzzy 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: 2021-11-02 08:47+0000\n" -"Last-Translator: Lucia Pacheco , 2022\n" +"Last-Translator: Martin Trigaux, 2022\n" "Language-Team: Spanish (https://www.transifex.com/odoo/teams/41243/es/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -94,34 +93,27 @@ msgstr "" #: ../../content/applications/finance/accounting.rst:18 msgid "" -"`Odoo Tutorials: Invoicing `_" -msgstr "" -"`Tutoriales de Odoo: Facturación`_" - -#: ../../content/applications/finance/accounting.rst:19 -msgid "" "`Odoo Tutorials: Accounting `_" msgstr "" "`Tutoriales de Odoo: Contabilidad " "`_" -#: ../../content/applications/finance/accounting.rst:20 +#: ../../content/applications/finance/accounting.rst:19 msgid ":doc:`Accounting Cheat Sheet `" msgstr "" ":doc:`Hoja de respuestas de Contabilidad " "`" #: ../../content/applications/finance/accounting/bank.rst:5 -msgid "Bank & Cash" -msgstr "Banco y efectivo" +msgid "Bank and cash" +msgstr "" #: ../../content/applications/finance/accounting/bank/feeds.rst:5 -msgid "Bank Feeds" -msgstr "Conexiones Bancarias" +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 "Extractos bancarios" #: ../../content/applications/finance/accounting/bank/feeds/bank_statements.rst:5 @@ -290,8 +282,8 @@ msgstr "" "reconciliación" #: ../../content/applications/finance/accounting/bank/feeds/bank_synchronization.rst:3 -msgid "Bank Synchronization: Automatic Import" -msgstr "Sincronización bancaria: importación automática" +msgid "Bank synchronization: Automatic import" +msgstr "" #: ../../content/applications/finance/accounting/bank/feeds/bank_synchronization.rst:5 msgid "" @@ -337,6 +329,10 @@ msgid "**Ponto**: Europe (:doc:`more information `)" msgstr "**Ponto**: Europa (:doc: `más información `)" #: ../../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 @@ -344,6 +340,7 @@ msgstr "**Ponto**: Europa (:doc: `más información `)" #: ../../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 @@ -363,6 +360,7 @@ msgstr "**Ponto**: Europa (:doc: `más información `)" #: ../../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 @@ -371,6 +369,7 @@ msgstr "**Ponto**: Europa (:doc: `más información `)" #: ../../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 @@ -381,7 +380,7 @@ msgstr "**Ponto**: Europa (:doc: `más información `)" #: ../../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 @@ -392,11 +391,11 @@ msgstr "**Ponto**: Europa (:doc: `más información `)" msgid "Configuration" msgstr "Configuración" -#: ../../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 "Usuarios locales" -#: ../../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 " @@ -411,15 +410,15 @@ msgstr "" "que verificar que no tenga un firewall o un proxy que bloquee esta " "dirección:" -#: ../../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 "https://production.odoofin.com/" -#: ../../content/applications/finance/accounting/bank/feeds/bank_synchronization.rst:39 +#: ../../content/applications/finance/accounting/bank/feeds/bank_synchronization.rst:42 msgid "First Synchronization" msgstr "Primera sincronización" -#: ../../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 " @@ -429,7 +428,7 @@ msgstr "" "Configuración --> Agregar una cuenta bancaria` o mediante la barra de " "configuración en el panel de contabilidad." -#: ../../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." @@ -437,7 +436,7 @@ msgstr "" "Ahora puede buscar su institución bancaria. Selecciónela y siga los pasos " "para sincronizarla." -#: ../../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." @@ -446,7 +445,7 @@ msgstr "" "navegador web no bloquee las ventanas emergentes y que su bloqueador de " "anuncios esté desactivado." -#: ../../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" @@ -465,7 +464,7 @@ msgstr "" "para conectarse con su institución bancaria. Esta información no se almacena" " en los servidores de Odoo." -#: ../../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 " @@ -476,7 +475,7 @@ msgstr "" " Puede cambiar la periodicidad de creación de extractos bancarios en la " "configuración de su diario." -#: ../../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`." @@ -484,11 +483,11 @@ msgstr "" "Puede encontrar todas sus sincronizaciones en :menuselection: `Contabilidad " "--> Configuración --> Sincronización en línea`." -#: ../../content/applications/finance/accounting/bank/feeds/bank_synchronization.rst:65 +#: ../../content/applications/finance/accounting/bank/feeds/bank_synchronization.rst:68 msgid "Synchronize manually" msgstr "Sincronizar manualmente" -#: ../../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 " @@ -498,7 +497,7 @@ msgstr "" "forma predeterminada cada 12 horas. Si lo desea, puede sincronizar " "manualmente haciendo clic en el botón *Sincronizar ahora* en el tablero." -#: ../../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 " @@ -508,7 +507,7 @@ msgstr "" "Sincronización en línea`, seleccione su institución y luego haga clic en el " "botón *Obtener transacciones*." -#: ../../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" @@ -524,15 +523,15 @@ msgstr "" "encontrar en el chatter de sus sincronizaciones en línea. En este caso, " "asegúrese de realizar sincronizaciones manuales." -#: ../../content/applications/finance/accounting/bank/feeds/bank_synchronization.rst:89 +#: ../../content/applications/finance/accounting/bank/feeds/bank_synchronization.rst:92 msgid "Issues" msgstr "Problemas" -#: ../../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 "Error de sincronización" -#: ../../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 --> " @@ -544,11 +543,11 @@ msgstr "" "Configuración --> Sincronización en línea`, seleccione la conexión que " "falló, y copie la descripción del error y la referencia." -#: ../../content/applications/finance/accounting/bank/feeds/bank_synchronization.rst:99 +#: ../../content/applications/finance/accounting/bank/feeds/bank_synchronization.rst:102 msgid "Synchronization disconnected" msgstr "Desconexión de la sincronización" -#: ../../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." @@ -556,7 +555,7 @@ msgstr "" "Si se desconecta su conexión con el proxy, puede volver a conectarse al " "proxy utilizando el botón *Volver a conectar*." -#: ../../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" @@ -567,13 +566,13 @@ msgstr "" "identificación de cliente o la referencia del error que aparece en el " "chatter." -#: ../../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 "" "Proceso de migración para usuarios que hayan instalado Odoo antes de " "diciembre de 2020" -#: ../../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." @@ -581,7 +580,7 @@ msgstr "" "Si está en las instalaciones, primero asegúrese de que su fuente esté " "actualizada con la última versión de Odoo." -#: ../../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." @@ -590,7 +589,7 @@ msgstr "" "deben instalar el nuevo módulo manualmente para utilizar las nuevas " "funciones." -#: ../../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: " @@ -602,7 +601,7 @@ msgstr "" "escriba: **account_online_synchronization**. Luego puede hacer clic en el " "botón *Instalar* para instalar el nuevo módulo." -#: ../../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." @@ -610,7 +609,7 @@ msgstr "" "Finalmente, asegúrese de que todos sus usuarios actualicen su página de Odoo" " presionando CTRL+F5." -#: ../../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 " @@ -624,7 +623,7 @@ msgstr "" "Sincronización en línea`). No es posible volver a sincronizar estas " "conexiones, tiene que hacer nuevas." -#: ../../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." @@ -632,7 +631,7 @@ msgstr "" "No desinstale *account_online_sync*, que es el módulo anterior para la " "sincronización en línea. El nuevo módulo lo anula." -#: ../../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." @@ -640,17 +639,17 @@ msgstr "" "De forma predeterminada, *account_online_synchronization* se instala " "automáticamente con Contabilidad." -#: ../../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 "Preguntas frecuentes" -#: ../../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 "La sincronización no está funcionando en tiempo real, ¿es normal?" -#: ../../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 " @@ -671,7 +670,7 @@ msgstr "" "que al hacer clic en *Sincronizar ahora* no obtenga sus últimas " "transacciones si ya realizó dicha acción al principio del día." -#: ../../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" @@ -683,13 +682,13 @@ msgstr "" "transacciones con el estado *Publicado*. Si aún no está *Publicado*, tendrá " "que esperar hasta que cambie el estado." -#: ../../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 "" "¿La función de sincronización bancaria en línea está incluida en mi " "contrato?" -#: ../../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." @@ -697,13 +696,13 @@ msgstr "" "**Versión Community**: No, esta función no está incluida en la versión " "Community." -#: ../../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 "" "**Versión en línea**: Sí, incluso si se beneficia del contrato One App Free." -#: ../../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." @@ -711,11 +710,11 @@ msgstr "" "** Versión Enterprise**: Sí, si tiene un contrato Enterprise válido " "vinculado a su base de datos." -#: ../../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 "Algunos bancos tienen un estado \"Beta\", ¿qué significa?" -#: ../../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 " @@ -731,13 +730,13 @@ msgstr "" " con estos bancos contribuye al proceso de desarrollo, ya que el proveedor " "tendrá datos reales y comentarios de la conexión." -#: ../../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 "" "¿Por qué mis transacciones solo se sincronizan cuando las actualizo " "manualmente?" -#: ../../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," @@ -749,11 +748,11 @@ msgstr "" "otro tipo de MFA. Debido a esto, el integrador no puede extraer " "transacciones hasta que se proporcione el código de seguridad." -#: ../../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 "No todas mis transacciones pasadas están en Odoo, ¿por qué?" -#: ../../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." @@ -761,11 +760,11 @@ msgstr "" "Para algunas instituciones solo se pueden recuperar las transacciones de los" " 3 meses anteriores." -#: ../../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 "¿Por qué no veo ninguna transacción?" -#: ../../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 " @@ -778,11 +777,11 @@ msgstr "" " ir a :menuselection: `Contabilidad --> Configuración --> Sincronización en " "línea` para hacer clic en el botón *Obtener cuentas* en la conexión." -#: ../../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 "Es posible que tampoco haya nuevas transacciones." -#: ../../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 " @@ -792,11 +791,11 @@ msgstr "" "transacciones registradas no son visibles en su base de datos, por favor, " "`envíe un ticket al servicio de soporte `_." -#: ../../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 "¿Cómo puedo actualizar mis credenciales bancarias?" -#: ../../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 " @@ -807,18 +806,18 @@ msgstr "" " actualizar sus credenciales y haga clic en el botón *Actualizar " "credenciales*." -#: ../../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 ":doc:`bank_statements`" -#: ../../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 ":doc:`ponto`" -#: ../../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 ":doc:`saltedge`" @@ -1454,10 +1453,7 @@ msgstr "" "automáticamente." #: ../../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 "Conciliación bancaria" #: ../../content/applications/finance/accounting/bank/reconciliation/reconciliation_models.rst:3 @@ -1596,7 +1592,7 @@ msgstr "" "nuevo y rellene el formulario." #: ../../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 "Tipo" @@ -2399,16 +2395,94 @@ msgid "" msgstr "" "Las transacciones se agregarán al registro actual de pago en efectivo." +#: ../../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" -msgstr "Localizaciones fiscales" +msgid "Fiscal localizations" +msgstr "" #: ../../content/applications/finance/accounting/fiscal_localizations/localizations.rst:5 msgid "Localizations" msgstr "Localizaciones" #: ../../content/applications/finance/accounting/fiscal_localizations/localizations/argentina.rst:3 -#: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:13 msgid "Argentina" msgstr "Argentina" @@ -3515,7 +3589,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 "Facturas de proveedores" @@ -5066,7 +5139,6 @@ msgstr "" "que han sido recibidos por el SII." #: ../../content/applications/finance/accounting/fiscal_localizations/localizations/colombia.rst:3 -#: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:33 msgid "Colombia" msgstr "Colombia" @@ -6612,6 +6684,450 @@ msgstr "" "incluya IVA de bienes cubiertos, se deberá realizar la actualización manual " "correspondiente al IVA convencional." +#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/egypt.rst:3 +msgid "Egypt" +msgstr "Egipto" + +#: ../../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 "Nombre" + +#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/egypt.rst:17 +msgid "Technical name" +msgstr "Nombre técnico" + +#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/egypt.rst:18 +#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/france.rst:59 +msgid "Description" +msgstr "Descripción" + +#: ../../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 "ID de cliente" + +#: ../../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 "Otra Información:" + +#: ../../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 ":doc:`../../taxation/taxes/taxes`" + +#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/egypt.rst:130 +msgid "Branches" +msgstr "Ramas" + +#: ../../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 "Clientes" + +#: ../../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 "Productos" + +#: ../../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 "Francia" @@ -6755,10 +7271,6 @@ msgstr "#" msgid "Field name" msgstr "Nombre del campo" -#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/france.rst:59 -msgid "Description" -msgstr "Descripción" - #: ../../content/applications/finance/accounting/fiscal_localizations/localizations/france.rst:59 #: ../../content/applications/finance/accounting/fiscal_localizations/overview/fiscal_localization_packages.rst:32 msgid "Use" @@ -7283,10 +7795,6 @@ msgstr "" "El emparejamiento se realiza con los dígitos que están hasta la izquierda, " "primero se usan todos los dígitos, después 3 y al final 2." -#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/france.rst:182 -msgid "Name" -msgstr "Nombre" - #: ../../content/applications/finance/accounting/fiscal_localizations/localizations/france.rst:182 msgid "Code" msgstr "Código" @@ -8138,7 +8646,7 @@ msgstr "" "`_" #: ../../content/applications/finance/accounting/fiscal_localizations/localizations/germany.rst:3 -#: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:52 +#: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:34 msgid "Germany" msgstr "Alemania" @@ -8186,7 +8694,7 @@ msgstr "" #: ../../content/applications/finance/accounting/fiscal_localizations/localizations/germany.rst:23 #: ../../content/applications/finance/accounting/fiscal_localizations/localizations/spain.rst:27 -#: ../../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 #: ../../content/applications/finance/accounting/reporting/overview/main_reports.rst:29 msgid "Balance Sheet" msgstr "Hoja de balance" @@ -8194,7 +8702,7 @@ msgstr "Hoja de balance" #: ../../content/applications/finance/accounting/fiscal_localizations/localizations/germany.rst:24 #: ../../content/applications/finance/accounting/fiscal_localizations/localizations/netherlands.rst:19 #: ../../content/applications/finance/accounting/getting_started/initial_configuration/chart_of_accounts.rst:17 -#: ../../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 msgid "Profit & Loss" msgstr "Ganancias y pérdidas" @@ -9187,7 +9695,6 @@ msgstr "" "borrador, editarla y volver a asignarle un nuevo número de serie." #: ../../content/applications/finance/accounting/fiscal_localizations/localizations/italy.rst:3 -#: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:71 msgid "Italy" msgstr "Italia" @@ -10257,12 +10764,12 @@ msgstr "" "electrónica, puede utilizar los siguientes certificados de prueba SAT:" #: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:244 -msgid ":download:`Certificate `" -msgstr ":download:`Certificado `" +msgid ":download:`Certificate `" +msgstr "" #: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:245 -msgid ":download:`Certificate Key `" -msgstr ":download:`Clave de certificado `" +msgid ":download:`Certificate Key `" +msgstr "" #: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:246 msgid "**Password:** ``12345678a``" @@ -10534,10 +11041,6 @@ msgstr "" "En el XML, el NIF se reemplaza de forma automática por el NIF genérico para " "transacciones en el extranjero: ``XEXX010101000``" -#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:377 -msgid "Products" -msgstr "Productos" - #: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:379 msgid "" "At the product level there must also configure some parameters in the " @@ -10805,7 +11308,7 @@ msgstr "" "complemento de pago (XML) con sus detalles." #: ../../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." @@ -10849,10 +11352,25 @@ msgstr "" "que se pueda crear el complemento de pago sellado." #: ../../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 "Registrar pagos PUE" -#: ../../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 " @@ -10861,18 +11379,18 @@ msgstr "" "Si al momento de registrar un pago es del tipo PUE entonces en este caso no " "se generará un complemento de pago (XML) ya que no es necesario." -#: ../../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 "" "En este caso, no se crea como complemento de pago debido a la naturaleza del" " mismo." -#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:583 +#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:591 msgid "Down Payments" msgstr "Anticipos" -#: ../../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." @@ -10880,7 +11398,7 @@ msgstr "" "Este es un caso especial en el que debemos recibir un anticipo de un cliente" " que luego se aplicará a una factura." -#: ../../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 " "`_." @@ -10888,17 +11406,17 @@ msgstr "" "`La documentación oficial para el registro de anticipos en México " "`_." -#: ../../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 "Proceso para crear avance en México" -#: ../../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 "Emisión de factura electrónica con el importe del anticipo recibido." -#: ../../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)" @@ -10906,7 +11424,7 @@ msgstr "" "Emisión de la factura electrónica por el valor total de la operación " "(factura completa). (Origen CFDI: 07 | Factura anticipada, punto 1)" -#: ../../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)" @@ -10914,15 +11432,15 @@ msgstr "" "Emisión de la factura electrónica con el tipo *Egreso*. (Origen CFDI: 07 | " "Invoice_total, punto 2)" -#: ../../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 "Pasos a seguir en Odoo" -#: ../../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 "Preparación: crear el producto" -#: ../../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" @@ -10930,20 +11448,20 @@ msgstr "" "Emisión del anticipo de la factura electrónica por el importe del anticipo " "recibido" -#: ../../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 "Emisión de la factura electrónica por el valor total de la operación" -#: ../../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 "Agregar una nota de crédito de la factura de anticipo" -#: ../../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 "Preparación: crear el producto" -#: ../../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*." @@ -10951,7 +11469,7 @@ msgstr "" "El producto de Anticipo debe ser del tipo *Servicio* y debe utilizar la " "**Categoría de producto NSPSC**: *84111506 Servicios de facturación*." -#: ../../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." @@ -10959,12 +11477,12 @@ msgstr "" "Agregue el producto de anticipo como predeterminado para usar desde las " "configuraciones de Odoo." -#: ../../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 "Emisión de la factura electrónica por el valor del anticipo recibido" -#: ../../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" @@ -10974,20 +11492,20 @@ msgstr "" " anticipada para el porcentaje de la compra que se pagará por adelantado (o " "por una cantidad fija)." -#: ../../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 "Valide la factura con el producto de anticipo." -#: ../../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 "Registre el pago de la factura anticipada." -#: ../../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 "Emisión de la factura electrónica por el valor total de la operación." -#: ../../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." @@ -10995,12 +11513,12 @@ msgstr "" "A partir de la orden de venta, cree una factura para el total, es decir, " "para todas las líneas de la orden sin descontar el anticipo." -#: ../../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 "" "Deseleccione la casilla de verificación del campo **Deducir anticipos**." -#: ../../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 " @@ -11010,13 +11528,13 @@ msgstr "" "inicio + Folio fiscal de la factura de anticipo que se creó en el paso " "anterior." -#: ../../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 "" "Copie el Folio fiscal de la siguiente factura, como se muestra en este " "ejemplo:" -#: ../../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:" @@ -11024,7 +11542,7 @@ msgstr "" "Y péguelo en el borrador de factura que se creó a partir de la orden de " "venta sin descontar los anticipos:" -#: ../../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 )" @@ -11032,11 +11550,11 @@ msgstr "" "Valide y copie el Folio fiscal para más adelante (en el ejemplo, la copia " "del Folio fiscal es: 50E4FF06-4341-4006-A7C3-A7F653CBEFAE)" -#: ../../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 "Agregar una nota de crédito de la factura" -#: ../../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 " @@ -11046,7 +11564,7 @@ msgstr "" "correctiva debe editarse antes de confirmarla, vea la explicación debajo de " "las 2 imágenes a continuación)" -#: ../../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``" @@ -11054,11 +11572,11 @@ msgstr "" "Antes de *confirmar* la nota de crédito, edite el CFDI de Origen con ``07 |" " XXX`` en lugar del prefijo ``01 | XXX``" -#: ../../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 "Ahora se puede confirmar la factura." -#: ../../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." @@ -11066,14 +11584,14 @@ msgstr "" "Ahora la nota de crédito (pago anticipado) debe aplicarse al total de la " "factura, esto se agrega en la parte inferior debajo del importe adeudado." -#: ../../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 "" "Registre un pago por la diferencia del anticipo y el total de la venta." -#: ../../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." @@ -11081,11 +11599,11 @@ msgstr "" "Si va al XML de la factura, debería ver en el CFDI relacionado el tipo de " "relación 07 y el Folio fiscal de la factura anticipada." -#: ../../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 "Descuentos basados en días de pago" -#: ../../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 " @@ -11099,22 +11617,22 @@ msgstr "" "días de la factura, cuando vence en 30 días. Este enfoque puede mejorar en " "gran medida el periodo de pago promedio de sus clientes." -#: ../../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 "Crear y asignar el término de pago correspondiente." -#: ../../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 "Registrar el pago dentro de los días del descuento." -#: ../../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 "Crear una nota de crédito." -#: ../../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" @@ -11131,7 +11649,7 @@ msgstr "" "puede cambiar el tipo de balance adeudado si es necesario (en este ejemplo, " "30 días)." -#: ../../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." @@ -11139,7 +11657,7 @@ msgstr "" "Luego, al crear la orden de venta o factura de venta, asigne el término de " "pago creado previamente." -#: ../../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 " @@ -11149,7 +11667,7 @@ msgstr "" "del descuento, en nuestro caso es dentro de los 5 días posteriores a la " "creación de la factura de venta." -#: ../../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 " @@ -11159,7 +11677,7 @@ msgstr "" " y allí verá 2 pagos creados, restablezca a borrador y cancele el pago que " "no corresponde, el relacionado con el descuento." -#: ../../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 " @@ -11171,23 +11689,23 @@ msgstr "" "una nota de crédito que especifica que la diferencia se le dio al cliente en" " una **nota de crédito**." -#: ../../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 "Ajuste el importe al balance restante en la factura original." -#: ../../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 "Agregue la nota de crédito a la factura original para que se liquide." -#: ../../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 "Cancelación de facturas" -#: ../../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 "Antes de las 72 horas" -#: ../../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." @@ -11195,27 +11713,27 @@ msgstr "" "Si es necesario cancelar una factura que se validó y envió al SAT en menos " "de 72 horas siga los pasos a continuación." -#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:834 +#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:842 msgid "Request Cancellation" msgstr "Solicitar una cancelación" -#: ../../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 "El estado de la **Facturación electrónica** cambia a *Cancelado*" -#: ../../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 "Haga clic en *RESTABLECER A BORRADOR*" -#: ../../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 "Haga clic en *CANCELAR ASIENTO*" -#: ../../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 "Después de 72 horas" -#: ../../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" @@ -11225,7 +11743,7 @@ msgstr "" "de 72 horas, se debe solicitar al cliente que acepte la cancelación, para " "ello se deben seguir los siguientes pasos." -#: ../../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" @@ -11237,7 +11755,7 @@ msgstr "" "debe ingresar a la página web del SAT y aprobarla. (El estado del campo " "**Facturación electrónica** en Odoo cambia a *Por cancelar*)" -#: ../../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 " @@ -11247,7 +11765,7 @@ msgstr "" "portal del SAT es posible cambiar la factura a borrador y hacer clic en " "*Cancelar asiento*." -#: ../../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 " @@ -11257,7 +11775,7 @@ msgstr "" "electrónica** con una acción programada, las facturas canceladas en el SAT " "se cancelarán en Odoo." -#: ../../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" @@ -11269,7 +11787,7 @@ msgstr "" "cancelar*, pero el estado del SAT será *Válido*, permanecerá activo hasta " "que el cliente final/el destinatario apruebe la cancelación en el SAT." -#: ../../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 " @@ -11281,7 +11799,7 @@ msgstr "" "estados del SAT, Facturación electrónica y Odoo (esta acción programada se " "puede ejecutar manualmente al ingresar con el modo de desarrollador)." -#: ../../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 " @@ -11291,11 +11809,11 @@ msgstr "" "permite cambiar la factura a borrador y, por último, cancelar la factura " "(*cancelar asiento*)." -#: ../../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 "Cancelar facturas pagadas" -#: ../../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 " @@ -11305,15 +11823,15 @@ msgstr "" "factura para que se reconozca el CFDI de origen y luego se cancele la " "factura original." -#: ../../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 "Cancelar facturas del periodo anterior" -#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:908 +#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:916 msgid "Problem" msgstr "Problema" -#: ../../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." @@ -11327,7 +11845,7 @@ msgstr "" "ya reportados no hubieran existido, esto representa un problema fiscal " "porque los ingresos ya se declararon en el mes anterior." -#: ../../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 " @@ -11337,15 +11855,15 @@ msgstr "" "actual debe realizar el asiento de reversión y guardar la información de " "cancelación." -#: ../../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 "Factura por cancelar" -#: ../../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 "Así es como se ve el balance general:" -#: ../../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:" @@ -11353,44 +11871,44 @@ msgstr "" "Si se cancela la factura, el asiento de diario y el balance general se ven " "así después de cancelar:" -#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:937 +#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:945 msgid "Solution" msgstr "Solución" -#: ../../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 "" "Cierre el periodo fiscal todos los meses (mejores prácticas de localización " "en México)." -#: ../../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 "Cancele la factura en el SAT." -#: ../../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 "Cree un asiento de reversión manual (asiento de diario)." -#: ../../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 "" "Concilie la factura abierta con el asiento de reversión (asiento de diario)." -#: ../../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 "" "Cambie el estado de facturación electrónica a Cancelado con acción del " "servidor." -#: ../../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 "" "Cierre del periodo contable cada mes (Mejores prácticas de localización " "mexicana)" -#: ../../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 " @@ -11400,11 +11918,11 @@ msgstr "" "permitirá modificar o agregar asientos contables de una fecha " "correspondiente a ese periodo contable." -#: ../../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 "Cancelar factura en el SAT" -#: ../../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** " @@ -11414,11 +11932,11 @@ msgstr "" " publicará el estado en Odoo mientras que el estado de **Facturación " "electrónica** será *Enviado* y el estado del SAT es *Cancelado*." -#: ../../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 "Crear un asiento de reversión manualmente" -#: ../../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 " @@ -11428,7 +11946,7 @@ msgstr "" "registrada manualmente en el periodo fiscal actual y conciliar la factura " "abierta con la reversión creada manualmente." -#: ../../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 " @@ -11438,11 +11956,11 @@ msgstr "" "(puede utilizar una cuenta de cancelación para facturas de periodos " "anteriores como **Otros ingresos**)." -#: ../../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 "Conciliar la factura abierta con el asiento de reversión" -#: ../../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." @@ -11450,13 +11968,13 @@ msgstr "" "En el balance general y balance de comprobación ahora se encuentran los " "balances correctos." -#: ../../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 "" "Cambiar el estado de la facturación electrónica a Cancelado con acción del " "servidor" -#: ../../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 " @@ -11468,28 +11986,28 @@ msgstr "" "verificar con el soporte o con su consultor funcional asignado antes de " "realizar esta acción)." -#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:1020 +#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:1028 msgid "Electronic Accounting" msgstr "Contabilidad electrónica" -#: ../../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 "La contabilidad de México en Odoo se compone de 3 reportes:" -#: ../../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 "Plan de cuentas electrónico (se llama y aparece como COA)." -#: ../../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 "Balance electrónico de comprobación." -#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:1026 +#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:1034 msgid "DIOT report." msgstr "Reporte DIOT" -#: ../../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." @@ -11497,7 +12015,7 @@ msgstr "" "1. y 2. se consideran contabilidad electrónica, y DIOT es un reporte que " "solo está disponible en el contexto de la contabilidad." -#: ../../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`" @@ -11505,7 +12023,7 @@ msgstr "" "Puede encontrar todos esos reportes en :menuselection:`Contabilidad --> " "Reportes --> México`" -#: ../../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" @@ -11515,11 +12033,11 @@ msgstr "" ":menuselection:`Contabilidad --> Reportes --> México --> COA` y haga clic en" " el botón **Exportar para SAT (XML)**." -#: ../../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 "¿Cómo agregar cuentas nuevas?" -#: ../../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." @@ -11528,7 +12046,7 @@ msgstr "" "NNN.YY es un grupo de codificación SAT, su cuenta se configurará " "automáticamente." -#: ../../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 " @@ -11544,11 +12062,11 @@ msgstr "" "etiqueta configurada automáticamente, las etiquetas configuradas son las " "elegidas para ser utilizadas en el Plan de cuentas en XML." -#: ../../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 "¿Qué significan las etiquetas?" -#: ../../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 " "`_" @@ -11560,7 +12078,7 @@ msgstr "" " en el sitio web del SAT, en la sección denominada **Código agrupador de " "cuentas del SAT**." -#: ../../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" @@ -11572,11 +12090,11 @@ msgstr "" "su base de datos), tendrá las etiquetas más comunes de forma predeterminada." " Si no se crea la etiqueta que necesita, puede crearla usted mismo." -#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:1077 +#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:1085 msgid "Trial Balance" msgstr "Balance de comprobación" -#: ../../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 " @@ -11591,7 +12109,7 @@ msgstr "" "**Exportar para SAT (XML)** en la parte superior con la selección previa del" " periodo que desea exportar." -#: ../../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." @@ -11599,15 +12117,15 @@ msgstr "" "Todos los análisis normales y las funciones enumeradas están disponibles " "aquí, así como cualquier reporte normal de Odoo." -#: ../../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 "Reporte DIOT (requiere la aplicación de Contabilidad)" -#: ../../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 "¿Qué es la DIOT y la importancia de su presentación al SAT?" -#: ../../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." @@ -11615,7 +12133,7 @@ msgstr "" "Cuando se trata de trámites con el Servicio de Administración del SAT, " "sabemos que no debemos descuidar lo que presentamos." -#: ../../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 " @@ -11627,7 +12145,7 @@ msgstr "" "nuestras operaciones a terceros, o lo que se considere lo mismo, con " "nuestros proveedores." -#: ../../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 " @@ -11637,11 +12155,11 @@ msgstr "" "tenemos IVA para presentar al SAT y también tratamos con proveedores es " "necesario enviar la DIOT." -#: ../../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 "¿Cuándo presentar la DIOT y en qué formato?" -#: ../../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" @@ -11651,7 +12169,7 @@ msgstr "" "obtener en la página del SAT. Es el formulario electrónico A-29 que se puede" " encontrar en el sitio web del SAT." -#: ../../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 " @@ -11663,11 +12181,11 @@ msgstr "" "proveedores, para febrero debemos presentar la información relevante de " "dichos datos." -#: ../../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 "¿Dónde se presenta la DIOT?" -#: ../../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" @@ -11677,7 +12195,7 @@ msgstr "" " cuál le resultará más cómoda, ya que la presentará todos los meses o cada " "vez que tenga tratos con proveedores." -#: ../../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." @@ -11685,7 +12203,7 @@ msgstr "" "El formulario A-29 es electrónico, por lo que puede presentarlo en la página" " del SAT, pero esto después de haber realizado hasta 500 registros." -#: ../../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 " @@ -11701,11 +12219,11 @@ msgstr "" "validados, serán devueltos, así que no dude que aún tendrá estos discos y " "por supuesto, su CD o USB." -#: ../../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 "Una cosa más que debe saber: ¿carga por lotes?" -#: ../../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 " @@ -11715,7 +12233,7 @@ msgstr "" " lotes y, por supuesto, lo primero que pensamos es ¿qué es eso?, y según el " "sitio del SAT es:" -#: ../../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 " @@ -11732,7 +12250,7 @@ msgstr "" "consecuencia, optimizando el tiempo invertido en su integración para la " "presentación en tiempo y forma al SAT." -#: ../../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 " @@ -11744,7 +12262,7 @@ msgstr "" " el SAT en lo que respecta a la Declaración Informativa de Operaciones con " "Terceros." -#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:1148 +#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:1156 msgid "" "`official information " "`_" @@ -11752,11 +12270,11 @@ msgstr "" "`Información oficial " "`_" -#: ../../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 "¿Cómo generar este reporte en Odoo?" -#: ../../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)`." @@ -11764,7 +12282,7 @@ msgstr "" "Vaya a :menuselection:`Contabilidad --> Reportes --> México --> " "Transacciones con terceros (DIOT)`." -#: ../../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." @@ -11772,11 +12290,11 @@ msgstr "" "Se muestra una vista de reporte, seleccione el último mes para reportar el " "mes inmediatamente anterior o deje el mes actual si le conviene." -#: ../../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 "Haga clic en *Exportar (XLSX)* o *Imprimir (TXT)*" -#: ../../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." @@ -11784,13 +12302,13 @@ msgstr "" "Guarde el archivo descargado en un lugar seguro, acceda al sitio web del SAT" " y siga los pasos necesarios para declararlo." -#: ../../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 "" "Consideraciones importantes sobre sus datos de proveedor y facturación para " "DIOT" -#: ../../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 " @@ -11804,7 +12322,7 @@ msgstr "" "dirección, no necesita hacer nada más allí, sino que el tipo de operación " "l10n MX se debe configurar en todos sus proveedores." -#: ../../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 " @@ -11814,7 +12332,7 @@ msgstr "" "factura en Odoo se considera exenta si no hay impuesto sobre ella, los otros" " 2 impuestos ya están configurados correctamente." -#: ../../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 " @@ -11824,7 +12342,7 @@ msgstr "" "solicitar la factura y luego pagarla y conciliar el pago de forma adecuada, " "siguiendo el procedimiento estándar de Odoo." -#: ../../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 " @@ -11834,7 +12352,7 @@ msgstr "" " factura del proveedor, puede corregir esta información cuando genere el " "reporte." -#: ../../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." @@ -11842,7 +12360,7 @@ msgstr "" "Recuerde que este reporte solo muestra las facturas de proveedores que " "realmente se pagaron." -#: ../../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" @@ -11858,11 +12376,11 @@ msgstr "" "legal. Genérelo antes de fin de mes y úselo como su proceso de auditoria " "para ver que todos sus partners están configurados correctamente." -#: ../../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 "Cierre del periodo fiscal en Odoo" -#: ../../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" @@ -11872,7 +12390,7 @@ msgstr "" "normalmente debe tomar para asegurarse de que su contabilidad sea correcta, " "precisa y esté actualizada:" -#: ../../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 " @@ -11882,44 +12400,44 @@ msgstr "" "final del año y confirme que los balances del libro de cierre coincidan con " "los balances en sus estados de cuenta bancarios." -#: ../../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 "" "Verifique que se hayan ingresado y aprobado todas las facturas de los " "clientes." -#: ../../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 "" "Confirme que ha ingresado y aprobado todas las facturas de proveedores." -#: ../../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 "Valide todos los gastos, asegurando su exactitud." -#: ../../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 "" "Verifique que todos los pagos recibidos se hayan ingresado y registrado con " "exactitud." -#: ../../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 "Lista de fin de año" -#: ../../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 "" "Ejecute un **Reporte fiscal** y verifique que su información fiscal sea " "correcta." -#: ../../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 "Concilie todas las cuentas en su **Balance general**" -#: ../../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." @@ -11928,7 +12446,7 @@ msgstr "" "en sus estados de cuenta. Utilice el reporte **Conciliación bancaria** para " "ayudarle." -#: ../../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" @@ -11937,7 +12455,7 @@ msgstr "" " sus reportes **Cuentas por cobrar antiguas** y **Cuentas por pagar " "antiguas**" -#: ../../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" @@ -11947,7 +12465,7 @@ msgstr "" "transacciones que las afectan y la naturaleza de las transacciones, y de " "incluir préstamos y activos fijos." -#: ../../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 " @@ -11962,7 +12480,7 @@ msgstr "" "si se concilian todos los pagos y facturas pendientes, y puede llevar a " "encontrar errores propios o del sistema." -#: ../../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:" @@ -11970,7 +12488,7 @@ msgstr "" "A su contador probablemente le gustará verificar sus apuntes en el balance " "general y realizar algunas entradas en el diario para:" -#: ../../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 " @@ -11980,25 +12498,25 @@ msgstr "" "diario** (por ejemplo, los reportes **Ingresos actuales del año** e " "**Ingresos retenidos**)." -#: ../../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 "**Trabajo en progreso**." -#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:1244 +#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:1252 msgid "**Depreciation Journals**." msgstr "**Diarios de depreciación**." -#: ../../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 "**Préstamos**." -#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:1246 +#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:1254 msgid "**Tax Adjustments**." msgstr "**Ajustes de impuestos**." -#: ../../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" @@ -12009,7 +12527,7 @@ msgstr "" "anticipados, reportes de impuestos sobre las ventas, etc.) para compararlos " "con sus balances en Odoo." -#: ../../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" @@ -12023,11 +12541,11 @@ msgstr "" "confiar en que nadie más está cambiando las transacciones del año anterior " "mientras audita los libros." -#: ../../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 "Proceso de cierre contable" -#: ../../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 " @@ -12039,7 +12557,7 @@ msgstr "" "calcula automáticamente en el tipo de cuenta (Ganancias del año actual) y se" " acumulará la diferencia entre Ingresos - Gastos para calcularlo." -#: ../../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 " @@ -12053,7 +12571,7 @@ msgstr "" " ingresos**, la fecha de inicio corresponderá a la fecha de inicio del **año" " fiscal** y los balances de las cuentas serán todos 0." -#: ../../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 " @@ -12064,7 +12582,7 @@ msgstr "" " año actual en la Cuenta de México 305.01.01 [tipo 'ganancias del año " "actual'])" -#: ../../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 " @@ -12075,7 +12593,7 @@ msgstr "" " de años anteriores\" (304.01.01 en México), la cual es una cuenta de " "capital." -#: ../../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 " @@ -12087,11 +12605,11 @@ msgstr "" "reporte de balance de comprobación. Si este asiento contable no se marca " "como asiento de cierre, el balance de comprobación no será correcto. " -#: ../../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 "El asiento contable simplificado se vería así:" -#: ../../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 " @@ -12105,15 +12623,15 @@ msgstr "" "ganancia actual del año reporte correctamente un balance de 0, sin importar " "la ganancia actual del año en el **Balance general**." -#: ../../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 "Funciones adicionales recomendadas" -#: ../../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 "Aplicación de Contactos (gratis)" -#: ../../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 " @@ -12123,11 +12641,11 @@ msgstr "" "direcciones, es muy recomendable instalar este módulo, incluso si no es una " "necesidad técnica." -#: ../../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 "Multidivisa (requiere la aplicación de Contabilidad)" -#: ../../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." @@ -12142,11 +12660,11 @@ msgstr "" " de cambio del SAT sin tener que crear manualmente esta información todos " "los días en Odoo." -#: ../../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 "Vaya a los ajustes y habilite la función multidivisa." -#: ../../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)" @@ -12154,7 +12672,7 @@ msgstr "" "Habilitar errores explícitos en el CFDI utilizando el validador local XSD " "(CFDI 3.3)" -#: ../../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 " @@ -12166,22 +12684,22 @@ msgstr "" "la verificación. Para habilitarla con la función xsd, siga los siguientes " "pasos (con el :ref:`modo de desarrollador ` habilitado)." -#: ../../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 "" "Vaya a :menuselection:`Ajustes --> Técnico --> Acciones --> Acciones del " "servidor`" -#: ../../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 "Busque la acción que se llama \"Descargar archivos XSD a CFDI\"" -#: ../../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 "Haga clic en el botón \"Crear acción contextual\"" -#: ../../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`" @@ -12189,15 +12707,15 @@ msgstr "" "Vaya al formulario de la empresa en :menuselection:`Ajustes --> Usuarios y " "empresas --> Empresas`" -#: ../../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 "Abra cualquier empresa que tenga." -#: ../../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 "Haga clic en \"Acción\" y luego en \"Descargar archivo XSD a CFDI\"." -#: ../../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 " @@ -12207,7 +12725,7 @@ msgstr "" "sin código, lo cual es bastante común) y se mostrará un error explícito en " "lugar de uno genérico sin explicación." -#: ../../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 "Si ve un error como este:" @@ -12225,7 +12743,7 @@ msgstr "" "'{http://www.sat.gob.mx/sitio_internet/cfd/catalogos}c_TipoRelacion' no se " "resuelve en una definición de tipo simple., Línea 36``" -#: ../../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 " @@ -12235,23 +12753,23 @@ msgstr "" "otro servidor, o cuando los archivos XSD no se descargaron correctamente. " "Siga los mismos pasos mencionados anteriormente pero:" -#: ../../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 "Vaya a la empresa en donde ocurre el error. " -#: ../../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 "Haga clic en *Acción* y luego en *Descargar archivo XSD a CFDI*." -#: ../../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 "Problemas y errores comunes" -#: ../../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 "**Mensajes de error** (Solo aplica en CFDI 3.3):" -#: ../../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': " @@ -12263,7 +12781,7 @@ msgstr "" " 'minLength'] El valor '' tiene una longitud de '0'; esto no cumple con la " "longitud mínima permitida de '1'.``" -#: ../../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': " @@ -12274,7 +12792,7 @@ msgstr "" "'{http://www.sat.gob.mx/cfd/3}Concepto', atributo 'NoIdentificacion': [facet" " 'pattern'] El valor '' no es compatible con el patrón '[^|]{1,100}'.``" -#: ../../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 " @@ -12284,15 +12802,15 @@ msgstr "" "producto, vaya al formulario del producto y establezca su referencia interna" " correctamente." -#: ../../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 "**Mensajes de error**:" -#: ../../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 " @@ -12302,7 +12820,7 @@ msgstr "" "'{http://www.sat.gob.mx/cfd/3}RegimenFiscal': El atributo 'Régimen' es " "obligatorio y no está.``" -#: ../../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 " @@ -12312,7 +12830,7 @@ msgstr "" "'{http://www.sat.gob.mx/cfd/3}Emisor': El atributo 'RegimenFiscal' es " "obligatorio y no está.``" -#: ../../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" @@ -12328,7 +12846,7 @@ msgstr "" "relación con la lista de posibles valores del SAT, otra opción puede ser que" " olvidó seguir las consideraciones sobre posiciones fiscales." -#: ../../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" @@ -12338,7 +12856,7 @@ msgstr "" "(son los primeros 3 números del nombre), por ejemplo, para la prueba, debe " "configurar 601, se verá como en la imagen." -#: ../../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." @@ -12347,12 +12865,12 @@ msgstr "" " General de Ley Personas Morales``, que es el requerido para la demostración" " de IVA." -#: ../../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 "**Mensaje de error**:" -#: ../../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 " @@ -12366,11 +12884,11 @@ msgstr "" " '04', '05', '06', '08', '12', '13', '14', '15' , '17', '23', '24', '25', " "'26', '27', '28', '29', '30', '99'}``" -#: ../../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 "**Solución**: el método de pago es obligatorio en su factura." -#: ../../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': " @@ -12380,8 +12898,8 @@ msgstr "" "'{http://www.sat.gob.mx/cfd/3}Comprobante', atributo 'LugarExpedicion': " "[faceta 'enumeration'] El valor '' no es un elemento del conjunto {'00``" -#: ../../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': '' " @@ -12393,7 +12911,7 @@ msgstr "" "no es un valor válido de tipo atómico " "'{http://www.sat.gob.mx/sitio_internet/cfd/catalogos}c_CodigoPostal'.``" -#: ../../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 " @@ -12403,7 +12921,7 @@ msgstr "" "'{http://www.sat.gob.mx/cfd/3}Emisor': El atributo 'RFC' es obligatorio y no" " está.``" -#: ../../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 " @@ -12417,7 +12935,7 @@ msgstr "" "llenar todos los campos obligatorios para su dirección siguiendo los pasos " "de esta sección: :ref:`mx-legal-info`." -#: ../../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." @@ -12425,7 +12943,7 @@ msgstr "" "**Solución**: El código postal de la dirección de su empresa no es válido " "para México, corríjalo." -#: ../../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 " @@ -12435,7 +12953,7 @@ msgstr "" "'{http://www.sat.gob.mx/cfd/3}Traslado': El atributo 'TipoFactor' es " "obligatorio y no está.``" -#: ../../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 " @@ -12445,7 +12963,7 @@ msgstr "" "'{http://www.sat.gob.mx/cfd/3}Traslado': El atributo 'TipoFactor' es " "obligatorio y no está.\", '')``" -#: ../../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" @@ -12468,7 +12986,7 @@ msgstr "" "``Se debe registrar el atributo XXXX si la clave de cce11: ComercioExterior:" " TipoOperacion registrada es '1' o '2'.``" -#: ../../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 "**Solución**: Es necesario especificar el Incoterm." @@ -12487,7 +13005,7 @@ msgstr "" "c_FraccionArancelaria columna 'UMT' cuando el atributo cce11: Comercio " "Exterior: Bienes: Yo``" -#: ../../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." @@ -12495,11 +13013,11 @@ msgstr "" "**Solución**: La Fracción arancelaria debe tener el código de la unidad de " "medida 01, correspondiente a Kilogramos." -#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:1495 +#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:1503 msgid "Glossary" msgstr "Glosario" -#: ../../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" @@ -12507,12 +13025,12 @@ msgstr "" ":abbr:`CFDI (Comprobante Fiscal Digital por Internet)`: Comprobante Fiscal " "Digital por Internet" -#: ../../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 "" ":abbr:`CSD (Certificado de Sello Digital)`: Certificado de Sello Digital" -#: ../../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" @@ -12520,11 +13038,11 @@ msgstr "" ":abbr:`PAC (Proveedores Autorizados de Certificación)`: Proveedor " "Autorizados de Certificación" -#: ../../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 "Sello: Firma digital de la factura electrónica" -#: ../../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 " @@ -12534,7 +13052,7 @@ msgstr "" "Fiscal Digital por Internet (CFDI) normalmente requerido por ciertas " "empresas en México como Walmart, Tiendas Sorianas, etc." -#: ../../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 " @@ -12546,7 +13064,7 @@ msgstr "" "compone de 32 dígitos hexadecimales, que se muestran en 5 grupos separados " "por guiones." -#: ../../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 " @@ -12559,7 +13077,6 @@ msgstr "" "electrónicamente a sus clientes, debe estar en esta base de datos." #: ../../content/applications/finance/accounting/fiscal_localizations/localizations/netherlands.rst:2 -#: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:96 msgid "Netherlands" msgstr "Países Bajos" @@ -12602,7 +13119,6 @@ msgid "Intrastat Report (ICP)" msgstr "Reporte Intrastat (ICP)" #: ../../content/applications/finance/accounting/fiscal_localizations/localizations/peru.rst:3 -#: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:105 msgid "Peru" msgstr "Perú" @@ -14118,8 +14634,8 @@ msgstr "" "actualizar sus posiciones fiscales en conformidad." #: ../../content/applications/finance/accounting/fiscal_localizations/overview/fiscal_localization_packages.rst:3 -msgid "Fiscal Localization Packages" -msgstr "Paquetes de localización fiscal" +msgid "Fiscal localization packages" +msgstr "" #: ../../content/applications/finance/accounting/fiscal_localizations/overview/fiscal_localization_packages.rst:5 msgid "" @@ -14200,11 +14716,6 @@ msgstr ":doc:`localizations_list`" msgid ":doc:`../../getting_started/initial_configuration/chart_of_accounts`" msgstr ":doc:`../../getting_started/initial_configuration/chart_of_accounts`" -#: ../../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 ":doc:`../../taxation/taxes/taxes`" - #: ../../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-" @@ -14229,380 +14740,296 @@ msgstr "" "disponibles en Odoo." #: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:10 -msgid "Fiscal Localization Packages available" -msgstr "Paquetes de localización fiscal disponibles" +msgid "Fiscal localization packages available" +msgstr "" #: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:12 msgid "Algeria - Accounting" msgstr "Argelia - Contabilidad" -#: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:15 -msgid "Argentinian Accounting" -msgstr "Argentina - Contabilidad " +#: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:13 +msgid "Argentina - Accounting" +msgstr "Argentina - Contabilidad" -#: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:16 -msgid "Argentinian Accounting Reports" -msgstr "Argentina - Reportes contables" - -#: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:17 -msgid "Argentinian Electronic Invoicing" -msgstr "Argentina - Facturación electrónica" - -#: ../../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 "Australia - Contabilidad" -#: ../../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 "Austria - Contabilidad" -#: ../../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 "Bélgica - Contabilidad" -#: ../../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 "Bolivia - Contabilidad" -#: ../../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 "Brasil - Contabilidad" -#: ../../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 "Canadá - Contabilidad" -#: ../../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 "Chile - Contabilidad" -#: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:26 -msgid "China" -msgstr "China" - -#: ../../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 "China - Contabilidad" -#: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:29 -msgid "China - City Data" -msgstr "China - Datos por ciudad" - -#: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:30 -msgid "China - Small Business CoA" -msgstr "China - Plan de cuentas para pequeños negocios" - -#: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:31 -msgid "China - Standard CoA" -msgstr "China - Plan de cuentas estándar" - -#: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:35 -msgid "Colombian - Accounting" +#: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:22 +msgid "Colombia - Accounting" msgstr "Colombia - Contabilidad" -#: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:36 -msgid "Colombian - Point of Sale" -msgstr "Colombia - Punto de venta" - -#: ../../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 "Costa Rica - Contabilidad" -#: ../../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 "Croacia - Contabilidad (RRIF 2012)" -#: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:40 -msgid "Denmark" -msgstr "Dinamarca" +#: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:25 +msgid "Czech - Accounting" +msgstr "República Checa - Contabilidad " -#: ../../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 "Dinamarca - Contabilidad" -#: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:43 -msgid "Denmark - Accounting Reports" -msgstr "Dinamarca - Reportes contables" - -#: ../../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 "República Dominicana - Contabilidad" -#: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:46 -msgid "Ecuador - Accounting" -msgstr "Ecuador - Contabilidad" +#: ../../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 "Egipto - Contabilidad" + +#: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:30 msgid "Ethiopia - Accounting" msgstr "Etiopía - Contabilidad" -#: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:48 -msgid "EU Mini One Stop Shop (MOSS)" -msgstr "EU Mini One Stop Shop (MOSS)" - -#: ../../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 "Localización finlandesa" -#: ../../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 "Francia - Contabilidad" -#: ../../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 "Genérico - Contabilidad" -#: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:54 -msgid "Germany - Accounting" -msgstr "Alemania - Contabilidad" - -#: ../../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 "Alemania SKR03 - Contabilidad" -#: ../../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 "Alemania SKR04 - Contabilidad" -#: ../../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 "Grecia - Contabilidad" -#: ../../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 "Guatemala - Contabilidad" -#: ../../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 "Honduras - Contabilidad" -#: ../../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 "Hong Kong - Contabilidad" -#: ../../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 "Hungria - Contabilidad" -#: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:63 -msgid "India" -msgstr "India" - -#: ../../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 "India - Contabilidad" -#: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:66 -msgid "Indian - Point of Sale" -msgstr "India - Punto de venta" - -#: ../../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 "Indonesia - Contabilidad" -#: ../../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 "Irlanda - Contabilidad" -#: ../../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 "Israel - Contabilidad" -#: ../../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 "Italia - Contabilidad" -#: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:74 -msgid "Italy - E-invoicing" -msgstr "Italia - Facturación electrónica" - -#: ../../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 "Japón - Contabilidad" -#: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:77 -msgid "LATAM" -msgstr "Latinoamérica" +#: ../../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 "Latinoamérica - Localización base" - -#: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:80 -msgid "LATAM Document" -msgstr "Latinoamérica - Documento" - -#: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:82 -msgid "Lithuania" -msgstr "Lituania" - -#: ../../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 "Lituania - Contabilidad" -#: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:85 -msgid "LT - Accounting Reports" -msgstr "LT - Reportes contables" - -#: ../../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 "Luxemburgo - Contabilidad" -#: ../../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 "Marruecos - Contabilidad" -#: ../../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 "México - Contabilidad" -#: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:90 -msgid "Mongolia" -msgstr "Mongolia" - -#: ../../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 "Mongolia - Contabilidad" -#: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:93 -msgid "Mongolia - Accounting Reports" -msgstr "Mongolia - Reportes contables" - -#: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:95 -msgid "Multi Language Chart of Accounts" -msgstr "Plan de cuentas plurilingüe" - -#: ../../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 "Países Bajos - Contabilidad" -#: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:99 -msgid "Netherlands - Intrastat Declaration" -msgstr "Países bajos - Declaración Intrastat" - -#: ../../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 "Nueva Zelanda - Contabilidad" -#: ../../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 "Noruega - Contabilidad" -#: ../../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 "OHADA - Contabilidad" -#: ../../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 "Pakistán - Contabilidad" + +#: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:61 msgid "Panama - Accounting" msgstr "Panamá - Contabilidad" -#: ../../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 "Perú - Contabilidad" -#: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:108 -msgid "Peruvian Accounting Reports" -msgstr "Perú - Reportes contables" - -#: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:109 -msgid "Peruvian Electronic Invoicing" -msgstr "Perú - Facturación electrónica" - -#: ../../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 "Polonia - Contabilidad" -#: ../../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 "Portugal - Contabilidad" -#: ../../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 "Rumania - Contabilidad" -#: ../../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 "Arabia Saudita - Contabilidad" -#: ../../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 "Singapur - Contabilidad" -#: ../../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 "Eslovenia - Contabilidad" + +#: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:69 msgid "Slovenian - Accounting" msgstr "Eslovenia - Contabilidad" -#: ../../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 "Sudáfrica - Contabilidad" -#: ../../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 "España - Contabilidad (PGCE 2008)" -#: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:119 -msgid "Sweden" -msgstr "Suecia" - -#: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:121 -msgid "Sweden - Structured Communication OCR" -msgstr "Suecia - Comunicación estructurada OCR" - -#: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:122 -msgid "Swedish - Accounting" +#: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:72 +msgid "Sweden - Accounting" msgstr "Suecia - Contabilidad" -#: ../../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 "Suiza - Contabilidad" -#: ../../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 "Tailandia - Contabilidad" -#: ../../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 "Turquía - Contabilidad" -#: ../../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 "Emiratos Árabes Unidos - Contabilidad" -#: ../../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 "Reino Unido - Contabilidad" -#: ../../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 "Ucrania - Contabilidad" -#: ../../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 "Estados Unidos - Contabilidad" -#: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:131 -msgid "Uruguay - Chart of Accounts" -msgstr "Uruguay - Plan de cuentas" +#: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:81 +msgid "Uruguay - Accounting" +msgstr "Uruguay - Contabilidad" -#: ../../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 "Venezuela - Contabilidad" -#: ../../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 "Vietnam - Contabilidad" -#: ../../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 ":doc:`fiscal_localization_packages`" #: ../../content/applications/finance/accounting/getting_started.rst:5 -msgid "Getting Started" -msgstr "Primeros pasos" +msgid "Getting started" +msgstr "Empezando" #: ../../content/applications/finance/accounting/getting_started/initial_configuration.rst:5 -msgid "Initial Configuration" -msgstr "Configuración inicial" +msgid "Initial configuration" +msgstr "" #: ../../content/applications/finance/accounting/getting_started/initial_configuration/chart_of_accounts.rst:3 #: ../../content/applications/finance/accounting/getting_started/initial_configuration/setup.rst:100 @@ -14631,30 +15058,30 @@ msgid "Balance Sheet accounts" msgstr "Cuentas del balance general" #: ../../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 "Activos" #: ../../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 "Pasivos" #: ../../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 "Capital" #: ../../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 "Ingreso" #: ../../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 "Gasto" @@ -14712,7 +15139,7 @@ msgstr "" "Cada cuenta se identifica con su **código** y **nombre**, el cual también " "indica el propósito de la cuenta." -#: ../../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:" @@ -14720,23 +15147,23 @@ msgstr "" "Es muy importante configurar correctamente el **tipo de cuenta** porque " "tiene diversos propósitos:" -#: ../../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 "Información del propósito y comportamiento de la cuenta" -#: ../../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 "Generar reportes legales y financieros específicos del país" -#: ../../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 "Establecer las reglas para cerrar el año fiscal" -#: ../../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 "Generar asientos de apertura" -#: ../../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:" @@ -14744,88 +15171,88 @@ msgstr "" "Para configurar un tipo de cuenta, abra el selector desplegable **Tipo** y " "escoja el tipo correcto de la siguiente lista:" -#: ../../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 "Reporte" -#: ../../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 "Categoría" -#: ../../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 "Tipos de cuentas" -#: ../../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 "Cuentas por cobrar" -#: ../../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 "Banco y efectivo" -#: ../../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 "Activos circulantes" -#: ../../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 "Activos no circulantes" -#: ../../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 "Prepagos" -#: ../../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 "Activos fijos" -#: ../../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 "Cuentas por pagar" -#: ../../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 "Tarjeta de crédito" -#: ../../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 "Pasivos circulantes" -#: ../../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 "Pasivos no circulantes" -#: ../../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 "Ganancias del año actual" -#: ../../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 "Otros ingresos" -#: ../../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 "Depreciación" -#: ../../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 "Costo de los ingresos" -#: ../../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 "Otro" -#: ../../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 "Hoja fuera de balance" -#: ../../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 "Automatización de activos, gastos diferidos e ingresos diferidos" -#: ../../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 " @@ -14837,18 +15264,18 @@ msgstr "" "diferidos ` y :ref:`asientos de ingresos " "diferidos `." -#: ../../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 "El campo de **Automatización** tiene 3 opciones:" -#: ../../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 "**No:** es el valor por defecto. No pasa nada." -#: ../../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 " @@ -14858,7 +15285,7 @@ msgstr "" " un borrador de asiento, pero no se valida. Debe completar el formulario " "correspondiente." -#: ../../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 " @@ -14867,16 +15294,15 @@ msgstr "" "**Crear y validar:** también debe crear un modelo. Cuando se publica una " "transacción en la cuenta, se crea un asiento y se valida de inmediato." -#: ../../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 "Consulte la documentación relacionada para más información." -#: ../../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 "Impuestos predeterminados" -#: ../../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." @@ -14884,11 +15310,11 @@ msgstr "" "Seleccione un **impuesto predeterminado** que se aplicará cuando esta cuenta" " se use para la venta o compra de un producto." -#: ../../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 "Etiquetas" -#: ../../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 " @@ -14898,11 +15324,11 @@ msgstr "" " cuentas relevantes. De forma predeterminada, puede escoger entre las " "etiquetas que utiliza el *Estado de cuenta de flujos de efectivo*." -#: ../../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 "Grupos de cuentas" -#: ../../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 " @@ -14912,7 +15338,7 @@ msgstr "" "*subcuentas* de una cuenta más grande y reportes consolidados tales como el " "**Balance de comprobación**." -#: ../../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 " @@ -14924,7 +15350,7 @@ msgstr "" "*Crear y editar...*, complete el formulario y guarde. A continuación, " "establezca el grupo de cuentas correcto en todas las subcuentas. " -#: ../../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 " @@ -14935,11 +15361,11 @@ msgstr "" "comprobación`, abra el menú *Opciones* y seleccione **Jerarquía y " "subtotales**." -#: ../../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 "Permitir conciliación" -#: ../../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." @@ -14947,7 +15373,7 @@ msgstr "" "Algunas cuentas, como las que registran transacciones de un método de pago, " "se pueden usar para conciliar los asientos contables. " -#: ../../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 " @@ -14958,16 +15384,16 @@ msgstr "" "usada para registrar pagos con tarjeta de crédito debe configurarse como " "*permitir conciliación*´." -#: ../../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 "" "Para hacerlo, seleccione la casilla **permitir conciliación** y guarde." -#: ../../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 "Obsoleta" -#: ../../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." @@ -14976,23 +15402,23 @@ msgstr "" "transacción en ella. Puede hacerla inutilizable al usar la función " "**Obsoleta**." -#: ../../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 "Para hacerlo, seleccione la casilla **Obsoleta** y guarde." -#: ../../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 ":doc:`../../payables/supplier_bills/assets`" -#: ../../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 ":doc:`../../payables/supplier_bills/deferred_expenses`" -#: ../../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 ":doc:`../../receivables/customer_invoices/deferred_revenues`" -#: ../../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 @@ -15977,6 +16403,12 @@ msgstr "50" msgid "Total To Pay" msgstr "Total por pagar" +#: ../../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 "Conciliación bancaria" + #: ../../content/applications/finance/accounting/getting_started/memento.rst:181 msgid "" "Bank reconciliation is the matching of bank statement lines (provided by " @@ -17157,7 +17589,7 @@ msgstr "" "costos. Ingrese al módulo de Aplicaciones e instale las siguientes " "aplicaciones:" -#: ../../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 " @@ -17170,11 +17602,11 @@ msgstr "" "rastrear y **volver a facturar costos** se debe instalar también la " "aplicación de Ventas." -#: ../../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 "Habilitar contabilidad analítica" -#: ../../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 " @@ -17184,7 +17616,7 @@ msgstr "" "Contabilidad, seleccione :menuselection:`Configuración --> Ajustes` y " "selecciona la casilla Contabilidad analítica. " -#: ../../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." @@ -17192,15 +17624,15 @@ msgstr "" "Además, desplácese hacia abajo y seleccione la casilla **Contabilidad " "analítica para compras**." -#: ../../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 "No olvide guardar sus cambios." -#: ../../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 "Crear una cuenta analítica" -#: ../../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 " @@ -17213,16 +17645,16 @@ msgstr "" "este caso la llamaremos \"Paquete de consultoría\" para nuestro cliente " "Smith&Co." -#: ../../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 "" "Señalaremos todos nuestros costos en esta cuenta para llevar su seguimiento." -#: ../../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 "Registrar un gasto" -#: ../../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." @@ -17230,11 +17662,11 @@ msgstr "" "Empezaremos registrando un gasto. Nuestro técnico de TI tuvo que tomar un " "tren para ir a ver a nuestro cliente. Él mismo pagó su boleto." -#: ../../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 "Crear un producto de gasto" -#: ../../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 " @@ -17247,11 +17679,11 @@ msgstr "" "15.50 euros. Asegúrese de que la casilla **Puede ser un gasto** se encuentre" " seleccionada." -#: ../../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 "Registrar el gasto" -#: ../../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 " @@ -17261,7 +17693,7 @@ msgstr "" "Crear`. Seleccione el producto \"Boleto de tren\" y vincúlelo a la cuenta " "analítica que discutimos anteriormente." -#: ../../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." @@ -17269,15 +17701,15 @@ msgstr "" "Envíelo al administrador y espere a que el administrador apruebe y publique " "los asientos de diario." -#: ../../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 "Crear una orden de compra vinculada a la cuenta analítica" -#: ../../content/applications/finance/accounting/others/analytic/purchases_expenses.rst:102 +#: ../../content/applications/finance/accounting/others/analytic/purchases_expenses.rst:103 msgid "Purchase Product" msgstr "Producto de compra" -#: ../../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 " @@ -17290,7 +17722,7 @@ msgstr "" "Especifique la línea de orden y seleccione la cuenta analítica correcta. " "Confirme la venta." -#: ../../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 " @@ -17300,11 +17732,11 @@ msgstr "" "precio de costo (campo **Precio del proveedor**) se registrará en la cuenta " "analítica." -#: ../../content/applications/finance/accounting/others/analytic/purchases_expenses.rst:117 +#: ../../content/applications/finance/accounting/others/analytic/purchases_expenses.rst:118 msgid "Subcontracting" msgstr "Subcontratación" -#: ../../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 " @@ -17317,17 +17749,17 @@ msgstr "" " analítica correcta. Simplemente necesitamos crear el producto del proveedor" " correcto." -#: ../../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 "" "También puede llevar el seguimiento de los costos con las hojas de horas, " "consulte: :doc:`timesheets`" -#: ../../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 "Rastree costos en la contabilidad" -#: ../../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." @@ -17335,7 +17767,7 @@ msgstr "" "Ahora que todo se registró y señaló en la cuenta analítica. Simplemente " "ábrala para revisar los costos relacionados con esa cuenta." -#: ../../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`." @@ -17343,7 +17775,7 @@ msgstr "" "Ingrese al módulo de Contabilidad, haga clic en :menuselection:`Asesores -->" " Cuentas analíticas --> Abrir planes`." -#: ../../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." @@ -17352,7 +17784,7 @@ msgstr "" "costo e ingreso para obtener la información general de todos los costos " "vinculados a la cuenta." -#: ../../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 " @@ -18872,10 +19304,10 @@ msgstr "" "Se puede modificar el diario de diferencias de cambio en sus ajustes de " "contabilidad." -#: ../../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 " @@ -19118,6 +19550,10 @@ msgstr "" "En la aplicación de Contabilidad, vaya a :menuselection:`Ventas --> Pagos`. " "Registre el pago y establezca la divisa." +#: ../../content/applications/finance/accounting/others/multicurrencies/how_it_works.rst:145 +msgid "Bank Statements" +msgstr "Extractos bancarios" + #: ../../content/applications/finance/accounting/others/multicurrencies/how_it_works.rst:147 #: ../../content/applications/finance/accounting/others/multicurrencies/invoices_payments.rst:94 msgid "" @@ -19268,8 +19704,8 @@ msgid ":doc:`how_it_works`" msgstr ":doc:`how_it_works`" #: ../../content/applications/finance/accounting/payables.rst:5 -msgid "Account Payables" -msgstr "Cuentas por pagar" +msgid "Account payables" +msgstr "" #: ../../content/applications/finance/accounting/payables/misc/forecast.rst:3 msgid "Forecast future bills to pay" @@ -19407,12 +19843,12 @@ msgstr "" "límite\"." #: ../../content/applications/finance/accounting/payables/pay.rst:5 -msgid "Vendor Payments" -msgstr "Pagos de proveedor" +msgid "Vendor payments" +msgstr "" #: ../../content/applications/finance/accounting/payables/pay/check.rst:3 -msgid "Pay by Checks" -msgstr "Pagar con cheques" +msgid "Pay by checks" +msgstr "" #: ../../content/applications/finance/accounting/payables/pay/check.rst:5 msgid "" @@ -20135,9 +20571,13 @@ msgstr "" msgid ":doc:`check`" msgstr ":doc:`check`" +#: ../../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" -msgstr "Activos no corrientes y activos fijos" +msgid "Non-current assets and fixed assets" +msgstr "" #: ../../content/applications/finance/accounting/payables/supplier_bills/assets.rst:5 msgid "" @@ -20658,8 +21098,8 @@ msgstr "" ":ref:`product-assets-account`)." #: ../../content/applications/finance/accounting/payables/supplier_bills/deferred_expenses.rst:3 -msgid "Deferred Expenses and Prepayments" -msgstr "Gastos diferidos y pagos anticipados" +msgid "Deferred expenses and prepayments" +msgstr "" #: ../../content/applications/finance/accounting/payables/supplier_bills/deferred_expenses.rst:5 msgid "" @@ -20952,9 +21392,157 @@ msgstr "" "predeterminada de un producto para automatizar totalmente su compra. (ver: " "`Elija una cuenta de gastos diferente para productos específicos`_)." +#: ../../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 "Precio" + +#: ../../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" -msgstr "Gestionar facturas de proveedores" +msgid "Manage vendor bills" +msgstr "" #: ../../content/applications/finance/accounting/payables/supplier_bills/manage.rst:5 msgid "" @@ -21396,130 +21984,9 @@ msgstr "" " no ha eliminado las líneas de pedido anteriores de la primera orden de " "compra, la factura se vinculará a todas las órdenes de compra apropiadas." -#: ../../content/applications/finance/accounting/payables/supplier_bills/ocr.rst:3 -msgid "Digitize Vendor Bills with Optical Character Recognition (OCR)" -msgstr "" -"Digitalize facturas de proveedor con Reconocimiento Óptico de Caracteres " -"(OCR) " - -#: ../../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 "" -"Codificar las facturas de forma manual puede ser una tarea laboriosa. Contar" -" con una solución que le permita digitalizarlas e importar automáticamente " -"los datos a su base de datos reduce los errores y ahorra tiempo." - -#: ../../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 "" -"Pruébelo aquí `_. Suba una de " -"sus facturas o inténtelo con una de nuestras muestras." - -#: ../../content/applications/finance/accounting/payables/supplier_bills/ocr.rst:12 -msgid "Set up the feature" -msgstr "Activar esta función" - -#: ../../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 "" -"Vaya a :menuselection:`Contabilidad --> Ajustes --> Digitalización de " -"facturas`, y elija si las facturas deben ser procesadas de manera automática" -" (con OCR) o manual (bajo demanda)." - -#: ../../content/applications/finance/accounting/payables/supplier_bills/ocr.rst:22 -msgid "Start digitizing your bills" -msgstr "Empiece a digitalizar sus facturas" - -#: ../../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 "" -"Escaneé sus facturas, vaya a :menuselection:`Contabilidad --> Proveedores " -"--> Facturas` y suba su documento. Dependiendo de su configuración, se van a" -" tramitar los documentos de forma automática o va a necesitar hacer clic en " -"*enviar para digitalizar* para hacerlo de forma manual." - -#: ../../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 "" -"También puede crear una factura de proveedor mediante la aplicación de " -"*Documentos* o mediante el uso de un alias de correo electrónico en sus " -"diarios." - -#: ../../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 "" -"Una vez que se hayan extraído los datos del PDF, si lo necesita, también los" -" puede corregir haciendo clic en la etiqueta correspondiente (disponible en " -"modo de *edición*) y seleccionando la información correcta." - -#: ../../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 "" -"Entre más facturas escaneé, mejor se vuelve el sistema en identificar los " -"datos correctos." - -#: ../../content/applications/finance/accounting/payables/supplier_bills/ocr.rst:44 -#: ../../content/applications/finance/accounting/receivables/customer_invoices/snailmail.rst:34 -msgid "Pricing" -msgstr "Precio" - -#: ../../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 "" -"La *digitalización de facturas** es un servicio de *compras dentro de la " -"aplicación (IAP, por sus siglas en inglés)* que requiere de créditos " -"prepagados para funcionar. Digitalizar un documento consume un crédito." - -#: ../../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 "" -"Para comprar créditos, vaya a :menuselection:`Contabilidad --> Configuración" -" --> Ajustes --> Digitalización de facturas` y haga clic en *Comprar " -"créditos*, o vaya a :menuselection:`Ajustes --> Odoo IAP` y haga clic en " -"*ver mis servicios*." - -#: ../../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 "" -"Sí está en Odoo en línea (SaaS) y tiene la versión Enterprise, tiene el " -"beneficio de créditos de muestra gratis para probar la función." - -#: ../../content/applications/finance/accounting/payables/supplier_bills/ocr.rst:56 -msgid "Our `Privacy Policy `_." -msgstr "" -"Nuestra `Política de privacidad `_." - #: ../../content/applications/finance/accounting/payables/supplier_bills/purchase_receipts.rst:3 -msgid "Purchase Receipts" -msgstr "Recibos de compra" +msgid "Purchase receipts" +msgstr "" #: ../../content/applications/finance/accounting/payables/supplier_bills/purchase_receipts.rst:5 msgid "" @@ -21605,13 +22072,12 @@ msgid ":doc:`/applications/finance/expenses`" msgstr ":doc:`/applications/finance/expenses`" #: ../../content/applications/finance/accounting/receivables.rst:5 -msgid "Account Receivables" -msgstr "Cuentas por Cobrar" +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" -msgstr "Facturas de cliente" +msgid "Customer invoices" +msgstr "" #: ../../content/applications/finance/accounting/receivables/customer_invoices/cash_discounts.rst:3 msgid "Offer cash discounts" @@ -21719,7 +22185,7 @@ msgid ":doc:`../../receivables/customer_invoices/payment_terms`" msgstr ":doc:`../../receivables/customer_invoices/payment_terms`" #: ../../content/applications/finance/accounting/receivables/customer_invoices/cash_rounding.rst:3 -msgid "Cash Rounding" +msgid "Cash rounding" msgstr "Redondeo de efectivo" #: ../../content/applications/finance/accounting/receivables/customer_invoices/cash_rounding.rst:5 @@ -21799,8 +22265,8 @@ msgstr "" "redondeo\" apropiado. " #: ../../content/applications/finance/accounting/receivables/customer_invoices/credit_notes.rst:3 -msgid "Credit Notes and Refunds" -msgstr "Notas de abono y reembolsos" +msgid "Credit notes and refunds" +msgstr "" #: ../../content/applications/finance/accounting/receivables/customer_invoices/credit_notes.rst:4 msgid "" @@ -21997,8 +22463,8 @@ msgstr "" " original anterior:" #: ../../content/applications/finance/accounting/receivables/customer_invoices/deferred_revenues.rst:3 -msgid "Deferred Revenues" -msgstr "Ingresos diferidos" +msgid "Deferred revenues" +msgstr "" #: ../../content/applications/finance/accounting/receivables/customer_invoices/deferred_revenues.rst:5 msgid "" @@ -22764,9 +23230,27 @@ msgstr "" "software y que quieren continuar con la numeración del año en curso sin " "volver a empezar desde cero." +#: ../../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" -msgstr "Plazos de pago y planes de cuotas" +msgid "Payment terms and installment plans" +msgstr "" #: ../../content/applications/finance/accounting/receivables/customer_invoices/payment_terms.rst:5 msgid "" @@ -23078,11 +23562,11 @@ msgstr "" "`Tutoriales de Odoo: Términos y condiciones (T&C) y términos de pago " "`_" -#: ../../content/applications/finance/accounting/receivables/customer_invoices/snailmail.rst:3 -msgid "Send your Invoices by Post (Snailmail)" -msgstr "Enviar facturas por correo postal (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: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 " @@ -23093,11 +23577,11 @@ msgstr "" "permite enviar facturas e informes de seguimiento por correo postal, a todo " "el mundo, directamente desde su base de datos." -#: ../../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 "Configurar el correo postal" -#: ../../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." @@ -23105,7 +23589,7 @@ msgstr "" "Vaya a :menuselection:`Contabilidad --> Configuración --> Correo postal` y " "active la función." -#: ../../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*." @@ -23113,11 +23597,11 @@ msgstr "" "Si desea que esta opción sea una función predeterminada, active *Enviar por " "correo* en *Opciones de envío predeterminadas*." -#: ../../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 "Envíe sus facturas por correo" -#: ../../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*." @@ -23125,7 +23609,7 @@ msgstr "" "Abra su factura, haga clic en el botón *Enviar e imprimir* y seleccione " "*Enviar por correo postal*." -#: ../../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." @@ -23133,7 +23617,7 @@ msgstr "" "Asegúrese de tener la dirección correcta de su cliente, incluyendo el país, " "antes de enviar la carta." -#: ../../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." @@ -23142,7 +23626,7 @@ msgstr "" " que necesita sellos prepagados (=créditos) para funcionar. El envío de un " "documento consume un crédito." -#: ../../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 " @@ -23155,6 +23639,14 @@ 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 "" +"Sí está en Odoo en línea (SaaS) y tiene la versión Enterprise, tiene el " +"beneficio de créditos de muestra gratis para probar la función." + +#: ../../content/applications/finance/accounting/receivables/customer_invoices/snailmail.rst:47 +msgid "" "Click `here `_ to know about our " "*Privacy Policy*." msgstr "" @@ -23162,12 +23654,12 @@ msgstr "" "acerca de nuestra *Política de privacidad*." #: ../../content/applications/finance/accounting/receivables/customer_payments.rst:5 -msgid "Customer Payments" -msgstr "Pagos de cliente" +msgid "Customer payments" +msgstr "" #: ../../content/applications/finance/accounting/receivables/customer_payments/batch.rst:3 -msgid "Batch Payments: Batch Deposits (checks, cash etc.)" -msgstr "Remesas de pagos: remesas de ingresos (cheques, efectivo, etc)" +msgid "Batch payments: Batch deposits (checks, cash etc.)" +msgstr "" #: ../../content/applications/finance/accounting/receivables/customer_payments/batch.rst:5 msgid "" @@ -23346,8 +23838,8 @@ msgid ":doc:`batch_sdd`" msgstr ":doc:`batch_sdd`" #: ../../content/applications/finance/accounting/receivables/customer_payments/batch_sdd.rst:3 -msgid "Batch Payments: SEPA Direct Debit (SDD)" -msgstr "Remesas de cobros: Cargo directo SEPA (SDD)" +msgid "Batch payments: SEPA Direct Debit (SDD)" +msgstr "" #: ../../content/applications/finance/accounting/receivables/customer_payments/batch_sdd.rst:5 msgid "" @@ -23544,6 +24036,10 @@ msgstr "" msgid "Get paid with SDD Batch Payments" msgstr "Cobrar con remesas SEPA" +#: ../../content/applications/finance/accounting/receivables/customer_payments/batch_sdd.rst:99 +msgid "Customer Invoices" +msgstr "Facturas de cliente" + #: ../../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 " @@ -23896,138 +24392,145 @@ msgstr "" "relacionada)." #: ../../content/applications/finance/accounting/receivables/customer_payments/followup.rst:3 -msgid "Follow-up on invoices and get paid faster" -msgstr "Hacer seguimiento de facturas y cobrar más rápidamente" +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." +"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 "" -"Es esencial que su empresa cobre los pagos cuando están atrasados. Odoo lo " -"ayudará a identificar los pagos atrasados y le permitirá enviar los " -"recordatorios correspondientes." -#: ../../content/applications/finance/accounting/receivables/customer_payments/followup.rst:10 -msgid "Manage your follow-ups" -msgstr "Gestionar seguimientos de pago" - -#: ../../content/applications/finance/accounting/receivables/customer_payments/followup.rst:13 +#: ../../content/applications/finance/accounting/receivables/customer_payments/followup.rst:11 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." +"`Odoo Tutorials: Payment Follow-up " +"`_" msgstr "" -"Recomandamos conciliar sus extractos bancarios antes de lanzar su proceso de" -" seguimiento de cobros. Esto le evitará el problema de enviar una " -"reclamación a un cliente que ya le ha pagado." -#: ../../content/applications/finance/accounting/receivables/customer_payments/followup.rst:17 +#: ../../content/applications/finance/accounting/receivables/customer_payments/followup.rst:16 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." +"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 "" -"Las facturas vencidas de las que necesita hacer un seguimiento están " -"disponibles de forma predeterminada en: menuselection: `Contabilidad -> " -"Ventas -> Informes de seguimiento`. Allí, puede enviar fácilmente un " -"recordatorio por correo electrónico o imprimirlo como una carta. Luego, " -"puede hacer clic en el botón * Listo * para ver el siguiente seguimiento que" -" necesita su atención." + +#: ../../content/applications/finance/accounting/receivables/customer_payments/followup.rst:20 +msgid "Send an Email" +msgstr "Enviar un correo" + +#: ../../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 "Imprimir una carta" #: ../../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 "" -"De lo contrario, si ahora no es el momento para un recordatorio, haga clic " -"en * Recordármelo más tarde *. Obtendrá el siguiente informe de acuerdo con " -"la * Fecha del siguiente recordatorio * establecida en el estado de cuenta." -#: ../../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 "" -"Para evitar enviar demasiados recordatorios en un corto período de tiempo, " -"cambie el número de días calculados entre cada informe yendo a: " -"menuselection: `Contabilidad -> Configuración -> Configuración -> " -"Seguimiento de pagos`." #: ../../content/applications/finance/accounting/receivables/customer_payments/followup.rst:33 +msgid "Follow-up reports" +msgstr "Informes de seguimiento" + +#: ../../content/applications/finance/accounting/receivables/customer_payments/followup.rst:35 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." +"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 "" -"También puede establecer un nivel de confianza para sus clientes marcándolos" -" como deudores malos, normales o buenos en los informes de seguimiento." -#: ../../content/applications/finance/accounting/receivables/customer_payments/followup.rst:40 -msgid "Send reminders in batch" -msgstr "Enviar recordatorios por lotes" - -#: ../../content/applications/finance/accounting/receivables/customer_payments/followup.rst:42 +#: ../../content/applications/finance/accounting/receivables/customer_payments/followup.rst:39 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." +"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 "" -"Para facilitar su proceso de seguimiento, puede enviar correos electrónicos " -"de recordatorio por lotes desde su página de informes de seguimiento. " -"Seleccione todos los informes que desea procesar, haga clic en *Acción* y " -"luego en *Procesar seguimientos*. También se generará automáticamente un " -"documento pdf que contenga todas las cartas de seguimiento para que imprima." -#: ../../content/applications/finance/accounting/receivables/customer_payments/followup.rst:52 -msgid "Plan a follow-up process" -msgstr "Planifique un proceso de seguimiento" - -#: ../../content/applications/finance/accounting/receivables/customer_payments/followup.rst:54 +#: ../../content/applications/finance/accounting/receivables/customer_payments/followup.rst:43 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." +"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 "" -"Para planificar un proceso de seguimiento, vaya a: menuselection: " -"`Contabilidad -> Configuración -> Configuración` y active la función * " -"Niveles de seguimiento * en la sección * Pagos del cliente *. Luego, haga " -"clic en el nuevo botón * Niveles de seguimiento * que ha aparecido en su " -"página de configuración." -#: ../../content/applications/finance/accounting/receivables/customer_payments/followup.rst:59 +#: ../../content/applications/finance/accounting/receivables/customer_payments/followup.rst:48 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." +"The contact information available on the invoice or on the contact form is " +"used to send the reminder." msgstr "" -"Un plan de seguimiento con varias acciones está disponible de forma " -"predeterminada en Odoo, pero puede personalizarlo de la forma que desee. " -"Dependiendo de un número específico de días vencidos, planee enviar un " -"correo electrónico, una carta o emprender una acción manual. También puede " -"editar la plantilla utilizada para la declaración de acuerdo con la etapa " -"del proceso." -#: ../../content/applications/finance/accounting/receivables/customer_payments/followup.rst:69 +#: ../../content/applications/finance/accounting/receivables/customer_payments/followup.rst:50 msgid "" -"If you would like to get a reminder before the actual due date, set a " -"negative number of due days." +"When the reminder is sent, it is documented in the chatter of the invoice." +msgstr "" + +#: ../../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 "" -"Si desea recibir un recordatorio antes de la fecha de vencimiento real, " -"establezca un número negativo de días de vencimiento." #: ../../content/applications/finance/accounting/receivables/customer_payments/online_payment.rst:3 -msgid "Invoice Online Payment" -msgstr "Pago de factura en línea" +msgid "Invoice online payment" +msgstr "" #: ../../content/applications/finance/accounting/receivables/customer_payments/online_payment.rst:5 msgid "" @@ -24385,8 +24888,8 @@ msgstr "" " el módulo ``account_intrastat_expiry`` para archivar los códigos antiguos." #: ../../content/applications/finance/accounting/reporting/declarations/tax_returns.rst:3 -msgid "Tax Return (VAT Declaration)" -msgstr "Declaración de impuestos (declaración de impuestos)" +msgid "Tax return (VAT declaration)" +msgstr "" #: ../../content/applications/finance/accounting/reporting/declarations/tax_returns.rst:5 msgid "" @@ -25098,8 +25601,8 @@ msgid "Taxation" msgstr "Impuestos" #: ../../content/applications/finance/accounting/taxation/fiscal_year.rst:5 -msgid "Fiscal Year" -msgstr "Año fiscal" +msgid "Fiscal year" +msgstr "" #: ../../content/applications/finance/accounting/taxation/fiscal_year/close_fiscal_year.rst:3 msgid "Do a year end in Odoo (close a fiscal year)" @@ -25674,6 +26177,94 @@ msgstr "" "incluida, podría incurrir en mala calculación de precios. Es por esto que " "recomendamos compañías que solamente trabajan con una referencia de precios." +#: ../../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 ":doc:`fiscal_positions`" + #: ../../content/applications/finance/accounting/taxation/taxes/cash_basis_taxes.rst:3 msgid "Manage cash basis taxes" msgstr "Gestionar impuestos basados en flujo de caja" @@ -25815,6 +26406,10 @@ msgstr "" " las bases. Recomendamos usar una cuenta de ingresos por defecto. El saldo " "de esta cuenta tenderá a cero. " +#: ../../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 " @@ -25880,16 +26475,9 @@ msgstr "" msgid ":doc:`taxes`" msgstr ":doc:`taxes`" -#: ../../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 ":doc:`fiscal_positions`" - #: ../../content/applications/finance/accounting/taxation/taxes/eu_distance_selling.rst:3 -msgid "EU intra-community Distance Selling" -msgstr "Venta a distancia intracomunitaria de la UE" +msgid "EU intra-community distance selling" +msgstr "" #: ../../content/applications/finance/accounting/taxation/taxes/eu_distance_selling.rst:5 msgid "" @@ -26024,8 +26612,8 @@ msgstr "" "botón *Actualizar mapeo de impuestos*." #: ../../content/applications/finance/accounting/taxation/taxes/fiscal_positions.rst:3 -msgid "Fiscal Positions (tax and account mapping)" -msgstr "Posiciones fiscales (mapeo de impuestos y cuentas)" +msgid "Fiscal positions (tax and account mapping)" +msgstr "" #: ../../content/applications/finance/accounting/taxation/taxes/fiscal_positions.rst:5 msgid "" @@ -28038,93 +28626,99 @@ msgstr "" msgid "Online payment acquirers" msgstr "" -#: ../../content/applications/finance/payment_acquirers.rst:56 +#: ../../content/applications/finance/payment_acquirers.rst:61 msgid "Payment flow" msgstr "Flujo de pago" -#: ../../content/applications/finance/payment_acquirers.rst:56 -msgid "Save cards" -msgstr "Guardar tarjetas" +#: ../../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" -msgstr "Capturar importe de forma manual" +#: ../../content/applications/finance/payment_acquirers.rst:63 +msgid ":ref:`Manual capture `" +msgstr "" -#: ../../content/applications/finance/payment_acquirers.rst:56 -msgid "Refund from Odoo" -msgstr "Reembolso desde 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 ":doc:`Adyen `" -#: ../../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 "Pago desde Odoo" -#: ../../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 "|V|" -#: ../../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 ":doc:`Alipay `" -#: ../../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" -msgstr "Redirección al sitio web del método de pago" +#: ../../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 ":doc:`Authorize.net `" -#: ../../content/applications/finance/payment_acquirers.rst:68 +#: ../../content/applications/finance/payment_acquirers.rst:78 +msgid "Full only" +msgstr "" + +#: ../../content/applications/finance/payment_acquirers.rst:80 msgid ":doc:`Buckaroo `" msgstr ":doc:`Buckaroo `" -#: ../../content/applications/finance/payment_acquirers.rst:71 +#: ../../content/applications/finance/payment_acquirers.rst:85 msgid ":doc:`Mollie `" msgstr ":doc:`Mollie `" -#: ../../content/applications/finance/payment_acquirers.rst:74 +#: ../../content/applications/finance/payment_acquirers.rst:90 msgid ":doc:`Ogone `" msgstr ":doc:`Ogone `" -#: ../../content/applications/finance/payment_acquirers.rst:77 +#: ../../content/applications/finance/payment_acquirers.rst:95 msgid ":doc:`PayPal `" msgstr ":doc:`PayPal `" -#: ../../content/applications/finance/payment_acquirers.rst:80 +#: ../../content/applications/finance/payment_acquirers.rst:100 msgid "PayU Latam" msgstr "PayU Latam" -#: ../../content/applications/finance/payment_acquirers.rst:83 +#: ../../content/applications/finance/payment_acquirers.rst:105 msgid "PayUMoney" msgstr "PayUMoney" -#: ../../content/applications/finance/payment_acquirers.rst:86 +#: ../../content/applications/finance/payment_acquirers.rst:110 msgid ":doc:`SIPS `" msgstr ":doc:`SIPS `" -#: ../../content/applications/finance/payment_acquirers.rst:89 +#: ../../content/applications/finance/payment_acquirers.rst:115 msgid ":doc:`Stripe `" msgstr ":doc:`Stripe `" -#: ../../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 " @@ -28141,7 +28735,7 @@ msgstr "" "realizar una conciliación bancaria, lo cual es un proceso de control " "contable." -#: ../../content/applications/finance/payment_acquirers.rst:105 +#: ../../content/applications/finance/payment_acquirers.rst:133 msgid "Bank payments" msgstr "Pagos bancarios" @@ -28175,125 +28769,59 @@ msgstr "" "clic aquí <../finance/accounting/receivables/customer_payments/batch_sdd>` " "para obtener más información sobre este método de pago." -#: ../../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" -msgstr "Agregar un nuevo método de pago" - -#: ../../content/applications/finance/payment_acquirers.rst:129 +#: ../../content/applications/finance/payment_acquirers.rst:148 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*." +"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 "" -"Para agregar un nuevo método de pago y ponerlo a disposición de sus " -"clientes, vaya a :menuselection:`Contabilidad --> Configuración --> Métodos " -"de pago`, busque su método de pago, instale el módulo correspondiente y " -"actívelo. Para hacerlo, abra el método de pago y cambie su estado de " -"*Deshabilitado* a *Habilitado*." -#: ../../content/applications/finance/payment_acquirers.rst:139 +#: ../../content/applications/finance/payment_acquirers.rst:155 +msgid "Save cards for later" +msgstr "" + +#: ../../content/applications/finance/payment_acquirers.rst:157 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." +"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 "" -"Recomendamos utilizar el *Modo de prueba* en una base de datos duplicada o " -"de prueba. El Modo de prueba se debe usar con sus credenciales de prueba o " -"de sandbox, pero Odoo genera órdenes de venta y facturas con normalidad. No " -"siempre es posible cancelar una factura, y probar métodos de pago en su base" -" de datos principal podría generar problemas con la numeración de sus " -"facturas." -#: ../../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" -msgstr "Pestaña de credenciales" - -#: ../../content/applications/finance/payment_acquirers.rst:149 +#: ../../content/applications/finance/payment_acquirers.rst:162 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." +"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 "" -"Si no lo ha hecho aún, vaya al sitio web de su proveedor de pago, cree una " -"cuenta y asegúrese de tener las credenciales necesarias para uso de " -"terceros. Odoo requiere estas credenciales para comunicarse con el método de" -" pago." -#: ../../content/applications/finance/payment_acquirers.rst:153 +#: ../../content/applications/finance/payment_acquirers.rst:166 msgid "" -"The form in this section is specific to the payment acquirer you are " -"configuring. Please refer to the related documentation for more information." +"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 "" -"El formulario en esta sección es específico del método de pago que se está " -"configurando. Consulte la documentación relacionada para obtener más " -"información." -#: ../../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 "Pestaña de configuración" +#: ../../content/applications/finance/payment_acquirers.rst:173 +msgid "Manual capture" +msgstr "" -#: ../../content/applications/finance/payment_acquirers.rst:161 +#: ../../content/applications/finance/payment_acquirers.rst:175 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." +"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 "" -"Puede modificar la aparencia del método de pago en el frontend al modificar " -"su nombre en el campo **Se muestra como** y seleccionar qué icono de tarjeta" -" de crédito mostrar en el campo de **Iconos de pagos compatibles**." - -#: ../../content/applications/finance/payment_acquirers.rst:168 -msgid "Save and reuse credit cards" -msgstr "Guardar y volver a utilizar tarjetas de crédito" - -#: ../../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 "" -"Con la función de **Guardar tarjetas**, Odoo puede almacenar **tokens de " -"pago** en su base de datos, los cuales se pueden utilizar para pagos " -"subsecuentes sin tener que volver a introducir los detalles de pago. Esto es" -" particularmente útil para la tasa de conversión de Comercio electrónico y " -"para los pagos recurrentes de suscripciones." - -#: ../../content/applications/finance/payment_acquirers.rst:177 -#: ../../content/applications/finance/payment_acquirers/authorize.rst:38 -msgid "Place a hold on a card" -msgstr "Hacer una retención de tarjeta de crédito" - -#: ../../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:" -msgstr "" -"Si desea capturar un importe de forma manual en lugar de que sea una captura" -" inmediata, puede habilitar la captura manual. Capturar los pagos de forma " -"manual representa muchas ventas:" #: ../../content/applications/finance/payment_acquirers.rst:182 msgid "" @@ -28313,47 +28841,171 @@ msgstr "" #: ../../content/applications/finance/payment_acquirers.rst:185 msgid "" -"Avoid potentially high credit card fees in the event of overselling or " -"cancelled orders." +"Avoid potentially high processing fees for cancelled payments: payment " +"acquirers will not charge you for voiding an authorization." msgstr "" -"Evitar cuotas de tarjeta de crédito potencialmente altas en el caso de " -"vender de más o cancelar órdenes." #: ../../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." +"Hold a security deposit to return later, minus any deductions (e.g., after a" +" damage)." msgstr "" -"El campo de **Capturar importe de forma manual** está en la pestaña de " -"**Configuración**. Si se habilita, los fondos en la tarjeta del cliente se " -"reservan por algunos días, pero no se cobran aún. Consulte la documentación " -"de su método de pago para obtener la duración exacta." -#: ../../content/applications/finance/payment_acquirers.rst:195 +#: ../../content/applications/finance/payment_acquirers.rst:189 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." +"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 "" -"Para capturar el pago, debe ir a la orden de venta relacionada y *capturar*" -" los fondos de forma manual antes de su cancelación automática, o *anular la" -" transacción* para desbloquear los fondos de la tarjeta del cliente." #: ../../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." +"Odoo does not support this feature for all payment acquirers but some allow " +"the manual capture from their website interface." msgstr "" -"Odoo tal vez no sea compatible con la captura manual de todos los métodos de" -" pago, pero algunos métodos permiten gestionar la captura en sus interfaces." #: ../../content/applications/finance/payment_acquirers.rst:210 +msgid "Refunds" +msgstr "Reembolsos" + +#: ../../content/applications/finance/payment_acquirers.rst:212 +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: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: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:230 +msgid "" +"Each acquirer has its specific configuration flow, depending on :ref:`which " +"feature is available `." +msgstr "" + +#: ../../content/applications/finance/payment_acquirers.rst:236 +msgid "Add a new payment acquirer" +msgstr "Agregar un nuevo método de pago" + +#: ../../content/applications/finance/payment_acquirers.rst:238 +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 "" +"Para agregar un nuevo método de pago y ponerlo a disposición de sus " +"clientes, vaya a :menuselection:`Contabilidad --> Configuración --> Métodos " +"de pago`, busque su método de pago, instale el módulo correspondiente y " +"actívelo. Para hacerlo, abra el método de pago y cambie su estado de " +"*Deshabilitado* a *Habilitado*." + +#: ../../content/applications/finance/payment_acquirers.rst:248 +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 "" +"Recomendamos utilizar el *Modo de prueba* en una base de datos duplicada o " +"de prueba. El Modo de prueba se debe usar con sus credenciales de prueba o " +"de sandbox, pero Odoo genera órdenes de venta y facturas con normalidad. No " +"siempre es posible cancelar una factura, y probar métodos de pago en su base" +" de datos principal podría generar problemas con la numeración de sus " +"facturas." + +#: ../../content/applications/finance/payment_acquirers.rst:256 +#: ../../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 "Pestaña de credenciales" + +#: ../../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 "" +"Si no lo ha hecho aún, vaya al sitio web de su proveedor de pago, cree una " +"cuenta y asegúrese de tener las credenciales necesarias para uso de " +"terceros. Odoo requiere estas credenciales para comunicarse con el método de" +" pago." + +#: ../../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 "" +"El formulario en esta sección es específico del método de pago que se está " +"configurando. Consulte la documentación relacionada para obtener más " +"información." + +#: ../../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 "Pestaña de configuración" + +#: ../../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 "" +"Puede modificar la aparencia del método de pago en el frontend al modificar " +"su nombre en el campo **Se muestra como** y seleccionar qué icono de tarjeta" +" de crédito mostrar en el campo de **Iconos de pagos compatibles**." + +#: ../../content/applications/finance/payment_acquirers.rst:277 msgid "Countries" msgstr "Países" -#: ../../content/applications/finance/payment_acquirers.rst:212 +#: ../../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." @@ -28362,11 +29014,11 @@ msgstr "" "en blanco para hacer que el método de pago esté disponible para todos los " "países." -#: ../../content/applications/finance/payment_acquirers.rst:218 +#: ../../content/applications/finance/payment_acquirers.rst:285 msgid "Payment journal" msgstr "Diario de pagos" -#: ../../content/applications/finance/payment_acquirers.rst:220 +#: ../../content/applications/finance/payment_acquirers.rst:287 msgid "" "The **Payment journal** selected for your payment acquirer must be a *Bank* " "journal." @@ -28374,11 +29026,11 @@ msgstr "" "El **Diario de pagos** seleccionado para su método de pago debe ser un " "diario *bancario*." -#: ../../content/applications/finance/payment_acquirers.rst:225 +#: ../../content/applications/finance/payment_acquirers.rst:292 msgid "Accounting perspective" msgstr "Perspectiva contable" -#: ../../content/applications/finance/payment_acquirers.rst:227 +#: ../../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 " @@ -28392,7 +29044,7 @@ msgstr "" "registrar los asientos de diario de sus pagos. Le recomendamos consultarlo " "con su contador." -#: ../../content/applications/finance/payment_acquirers.rst:232 +#: ../../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** " @@ -28402,7 +29054,7 @@ msgstr "" "pago para registrar los pagos en una **Cuenta pendiente**. El **tipo** del " "diario debe ser *Diario bancario*." -#: ../../content/applications/finance/payment_acquirers.rst:235 +#: ../../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:" @@ -28410,7 +29062,7 @@ msgstr "" "Puede usar un único diario para muchos métodos de pago. Y para cada método " "de pago puede:" -#: ../../content/applications/finance/payment_acquirers.rst:237 +#: ../../content/applications/finance/payment_acquirers.rst:304 msgid "" "Define an **Accounting Account** to separate these payments from another " "payment method." @@ -28418,7 +29070,7 @@ msgstr "" "Definir una **Cuenta de contabilidad** para separar estos pagos de otro " "método de pago." -#: ../../content/applications/finance/payment_acquirers.rst:238 +#: ../../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." @@ -28426,7 +29078,7 @@ msgstr "" "Dejar en blanco para utilizar la cuenta predeterminada, la cual puede ver o " "modificar en los ajustes." -#: ../../content/applications/finance/payment_acquirers.rst:244 +#: ../../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." @@ -28435,47 +29087,47 @@ msgstr "" "algunos diarios, o para un solo método de pago. Lo que mejor satisfaga sus " "necesidades." -#: ../../content/applications/finance/payment_acquirers.rst:248 +#: ../../content/applications/finance/payment_acquirers.rst:315 msgid ":doc:`payment_acquirers/wire_transfer`" msgstr ":doc:`payment_acquirers/wire_transfer`" -#: ../../content/applications/finance/payment_acquirers.rst:249 +#: ../../content/applications/finance/payment_acquirers.rst:316 msgid ":doc:`payment_acquirers/adyen`" msgstr ":doc:`payment_acquirers/adyen`" -#: ../../content/applications/finance/payment_acquirers.rst:250 +#: ../../content/applications/finance/payment_acquirers.rst:317 msgid ":doc:`payment_acquirers/alipay`" msgstr ":doc:`payment_acquirers/alipay`" -#: ../../content/applications/finance/payment_acquirers.rst:251 +#: ../../content/applications/finance/payment_acquirers.rst:318 msgid ":doc:`payment_acquirers/authorize`" msgstr ":doc:`payment_acquirers/authorize`" -#: ../../content/applications/finance/payment_acquirers.rst:252 +#: ../../content/applications/finance/payment_acquirers.rst:319 msgid ":doc:`payment_acquirers/buckaroo`" msgstr ":doc:`payment_acquirers/buckaroo`" -#: ../../content/applications/finance/payment_acquirers.rst:253 +#: ../../content/applications/finance/payment_acquirers.rst:320 msgid ":doc:`payment_acquirers/mollie`" msgstr ":doc:`payment_acquirers/mollie`" -#: ../../content/applications/finance/payment_acquirers.rst:254 +#: ../../content/applications/finance/payment_acquirers.rst:321 msgid ":doc:`payment_acquirers/ogone`" msgstr ":doc:`payment_acquirers/ogone`" -#: ../../content/applications/finance/payment_acquirers.rst:255 +#: ../../content/applications/finance/payment_acquirers.rst:322 msgid ":doc:`payment_acquirers/paypal`" msgstr ":doc:`payment_acquirers/paypal`" -#: ../../content/applications/finance/payment_acquirers.rst:256 +#: ../../content/applications/finance/payment_acquirers.rst:323 msgid ":doc:`payment_acquirers/sips`" msgstr ":doc:`payment_acquirers/sips`" -#: ../../content/applications/finance/payment_acquirers.rst:257 +#: ../../content/applications/finance/payment_acquirers.rst:324 msgid ":doc:`payment_acquirers/stripe`" msgstr ":doc:`payment_acquirers/stripe`" -#: ../../content/applications/finance/payment_acquirers.rst:258 +#: ../../content/applications/finance/payment_acquirers.rst:325 msgid ":doc:`../websites/ecommerce/shopper_experience/payment_acquirer`" msgstr ":doc:`../websites/ecommerce/shopper_experience/payment_acquirer`" @@ -28485,11 +29137,9 @@ msgstr "Adyen" #: ../../content/applications/finance/payment_acquirers/adyen.rst:5 msgid "" -"`Adyen `_ is a Dutch-based company that offers " -"several online payment possibilities." +"`Adyen `_ is a Dutch company that offers several " +"online payment possibilities." msgstr "" -"`Adyen `_ es una empresa holandesa que ofrece varias" -" posibilidades de pago en línea." #: ../../content/applications/finance/payment_acquirers/adyen.rst:12 #: ../../content/applications/finance/payment_acquirers/alipay.rst:12 @@ -28566,48 +29216,39 @@ 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." +"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 "" -"Si está probando Adyen, en una *cuenta de prueba*, cambie el **Estado** a " -"*Modo de prueba*. Le recomendamos hacer esto en una base de datos de prueba " -"en lugar de su base de datos de Odoo principal." -#: ../../content/applications/finance/payment_acquirers/adyen.rst:36 +#: ../../content/applications/finance/payment_acquirers/adyen.rst:38 msgid "API Key and Client Key" msgstr "Clave API y clave de cliente" -#: ../../content/applications/finance/payment_acquirers/adyen.rst:38 +#: ../../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:`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." +"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 "" -"Para obtener la clave API y la clave de cliente, inicie sesión en su cuenta " -"de Adyen, vaya a :menuselection:`Desarrolladores --> Credenciales API`. - Si" -" ya tiene un usuario API, ábralo. Si aún no tiene un usuario API, haga clic " -"en **Crear nuevas credenciales**. Vaya a :menuselection:`Autenticación` y " -"obtenga o genere su **clave API** y **clave de cliente**. No olvide copiar " -"su clave API porque no podrá obtenerla más tarde sin generar una nueva." -#: ../../content/applications/finance/payment_acquirers/adyen.rst:45 +#: ../../content/applications/finance/payment_acquirers/adyen.rst:48 msgid "" -"This is also the place where you'll :ref:`allow payments to be made from " -"your website `." +"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 "" -"Aquí también es donde :ref:`permitirá que se realicen pagos en su sitio web " -"`." -#: ../../content/applications/finance/payment_acquirers/adyen.rst:51 +#: ../../content/applications/finance/payment_acquirers/adyen.rst:55 msgid "HMAC key" msgstr "Clave HMAC" -#: ../../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 " @@ -28619,68 +29260,55 @@ msgstr "" "Adyen y vaya a :menuselection:`Desarrolladores --> Webhooks --> Agregar " "webhook --> Agregar notificación estándar`." -#: ../../content/applications/finance/payment_acquirers/adyen.rst:61 +#: ../../content/applications/finance/payment_acquirers/adyen.rst:65 msgid "" -"There, in :menuselection:`Transport --> URL`, enter your server address " -"followed by `/payment/adyen/notification`." +"There, in :menuselection:`General --> Server configuration --> URL`, enter " +"your server address followed by `/payment/adyen/notification`." msgstr "" -"Ahí, en :menuselection:`Transporte --> URL`, introduzca la dirección de su " -"servidor seguido de `/payment/adyen/notification`." -#: ../../content/applications/finance/payment_acquirers/adyen.rst:68 +#: ../../content/applications/finance/payment_acquirers/adyen.rst:72 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." +"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 "" -"Luego, continúe en :menuselection:`Ajustes adicionales --> Clave HMAC --> " -"Generar nueva clave HMAC`. No olvide copiarla porque no podrá obtenerla más " -"tarde sin generar una nueva." -#: ../../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 "Debe guardar el webhook para finalizar su creación." -#: ../../content/applications/finance/payment_acquirers/adyen.rst:76 +#: ../../content/applications/finance/payment_acquirers/adyen.rst:84 msgid "URLs" msgstr "URL" -#: ../../content/applications/finance/payment_acquirers/adyen.rst:78 +#: ../../content/applications/finance/payment_acquirers/adyen.rst:86 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**." +":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 "" -"Para obtener los URL, inicie sesión en su cuenta de Adyen, vaya a " -":menuselection:`Desarrolladores --> URL API`. Elija uno de los URL de la " -"lista a lado de **Recurrentes** como su **URL API recurrente** y uno de los " -"URL en la lista a lado de **API de pago** como su **URL API de pago**." -#: ../../content/applications/finance/payment_acquirers/adyen.rst:87 +#: ../../content/applications/finance/payment_acquirers/adyen.rst:96 msgid "Adyen Account" msgstr "Cuenta de Adyen" -#: ../../content/applications/finance/payment_acquirers/adyen.rst:92 +#: ../../content/applications/finance/payment_acquirers/adyen.rst:101 msgid "Allow payments from a specific origin" msgstr "Permitir pagos de un origen específico" -#: ../../content/applications/finance/payment_acquirers/adyen.rst:94 +#: ../../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:`Allowed Origins`, then add the URLs from where payments will" -" be made (the URLs of the servers hosting your Odoo instances)." +":menuselection:`Add allowed origins`, then add the URLs from where payments " +"will be made (the URLs of the servers hosting your Odoo instances)." msgstr "" -"Para permitir pagos que se originaron en su sitio web, siga los pasos que se" -" indican en :ref:`adyen/api_and_client_keys` para ir a su usuario API y vaya" -" a :menuselection:`Orígenes permitidos`, luego agregue los URL donde se " -"realizarán los pagos (los URL de los servidores que alojan sus instancias de" -" Odoo)." -#: ../../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 @@ -28822,24 +29450,30 @@ 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." +"the :guilabel:`State` to :guilabel:`Test Mode`. We recommend doing this on a" +" test Odoo database, rather than on your main database." msgstr "" -"Si está probando Authorize.Net, en una *cuenta sandbox*, cambie el " -"**Estado** a *Modo de prueba*. Le recomendamos hacer esto en una base de " -"datos de prueba en lugar de su base de datos de Odoo principal." -#: ../../content/applications/finance/payment_acquirers/authorize.rst:40 +#: ../../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:43 +msgid "Place a hold on a card" +msgstr "Hacer una retención de tarjeta de crédito" + +#: ../../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." +"`. If enabled, the funds are " +"reserved for 30 days on the customer's card, but not charged yet." msgstr "" -"Con Authorize.net, puede habilitar la :ref:`captura manual " -"`. Si se encuentra habilitada, los fondos " -"se reservan por 30 dpias en la tarjeta del cliente, pero no se cobran aún." -#: ../../content/applications/finance/payment_acquirers/authorize.rst:44 +#: ../../content/applications/finance/payment_acquirers/authorize.rst:50 msgid "" "After **30 days**, the transaction is **voided automatically** by " "Authorize.net." @@ -28995,10 +29629,6 @@ msgstr "" "pago Ingenico** es una empresa con sede en Francia que proporciona la " "tecnología involucrada en transacciones electrónicas seguras." -#: ../../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, " diff --git a/locale/es/LC_MESSAGES/general.po b/locale/es/LC_MESSAGES/general.po index cdd296c98..6eed9b82e 100644 --- a/locale/es/LC_MESSAGES/general.po +++ b/locale/es/LC_MESSAGES/general.po @@ -9,7 +9,6 @@ # Lina Maria Avendaño Carvajal , 2021 # Jose Ramon Garcia , 2021 # Nicole Kist , 2021 -# Alejandro Kutulas , 2021 # Cris Martin , 2021 # David Arnold , 2021 # Fairuoz Hussein Naranjo , 2021 @@ -25,17 +24,17 @@ # Martin Trigaux, 2022 # marcescu, 2022 # Patricia Gutiérrez Capetillo , 2022 -# Lucia Pacheco , 2022 # Braulio D. López Vázquez , 2022 +# Lucia Pacheco , 2022 # #, fuzzy 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: 2021-11-02 08:47+0000\n" -"Last-Translator: Braulio D. López Vázquez , 2022\n" +"Last-Translator: Lucia Pacheco , 2022\n" "Language-Team: Spanish (https://www.transifex.com/odoo/teams/41243/es/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -717,130 +716,173 @@ msgstr "Sincronice su calendario de Google con Odoo" #: ../../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)." +"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 "" -"Odoo está perfectamente integrado con el calendario de Google así que puedes" -" ver y administrar tus reuniones con ambas plataformas (las actualizaciones " -"se realizan en ambos lados)." -#: ../../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 "Configuración en Google" -#: ../../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 "" -"Vaya a la Plataforma de API de Google " -"`__ para generar las credenciales " -"para la API de Google Calendar. Acceda con su cuenta de Google." #: ../../content/applications/general/calendars/google/google_calendar_credentials.rst:14 -msgid "Go to the API & Services page." -msgstr "Vaya a la página API y servicios." - -#: ../../content/applications/general/calendars/google/google_calendar_credentials.rst:19 -msgid "Search for *Google Calendar API* and select it." -msgstr "Busque por *Calendario API Google* y selecciónelo." - -#: ../../content/applications/general/calendars/google/google_calendar_credentials.rst:27 -msgid "Enable the API." -msgstr "Activa el API" - -#: ../../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)." +"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 "" -"Seleccione o cree un proyecto API para almacenar las credenciales si es que " -"no lo hizo previamente. Nómbrelo con un título específico (Ej. Odoo Sync)." -#: ../../content/applications/general/calendars/google/google_calendar_credentials.rst:35 -msgid "Create credentials." -msgstr "Cree Credenciales." - -#: ../../content/applications/general/calendars/google/google_calendar_credentials.rst:40 +#: ../../content/applications/general/calendars/google/google_calendar_credentials.rst:18 msgid "" -"Select *Web browser (Javascript)* as calling source and *User data* as kind " -"of data." +"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 "" -"Seleccione *Navegador web (Javascript)* como fuente de llamada y *Datos de " -"usuario* como tipo de datos." -#: ../../content/applications/general/calendars/google/google_calendar_credentials.rst:46 +#: ../../content/applications/general/calendars/google/google_calendar_credentials.rst:22 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'." +"Next, click :guilabel:`Select a project` and select or create an API project" +" to store credentials." msgstr "" -"Después cree un ID del cliente. Ingrese el nombre de la aplicación (p. ej. " -"Calendario de Odoo) y las páginas permitidas a las que se podrá redirigir. " -"El *JavaScript autorizado de origen* es su instancia de URL de Odoo. La *URL" -" de redirección autorizada* es el URL de instancia de Odoo seguido de " -"'/google_account/authentication'." -#: ../../content/applications/general/calendars/google/google_calendar_credentials.rst:55 +#: ../../content/applications/general/calendars/google/google_calendar_credentials.rst:29 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." +"Give the API Project a clear name like \"Odoo Sync\" so you can easily find " +"it." msgstr "" -"Revise el paso de la pantalla de consentimiento al introducir el nombre de " -"un producto (por ejemplo, Calendario de Odoo). Puede revisar las opciones de" -" personalización, pero no es obligatorio. La pantalla de consentimiento solo" -" aparecerá cuando introduzca la identificación en Odoo por primera vez." -#: ../../content/applications/general/calendars/google/google_calendar_credentials.rst:60 +#: ../../content/applications/general/calendars/google/google_calendar_credentials.rst:31 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." +"Then, open the API Project and click :guilabel:`Enable APIs and Services`." msgstr "" -"Finalmente se le da un **ID de cliente**. Vaya a *Credenciales* para obtener" -" el **Secreto del cliente** también. Odoo requiere ambos." -#: ../../content/applications/general/calendars/google/google_calendar_credentials.rst:67 +#: ../../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:45 +msgid "Create credentials" +msgstr "" + +#: ../../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: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: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:63 +msgid "" +"Skip the third step, :guilabel:`Scopes`, by clicking :guilabel:`Save and " +"Continue`." +msgstr "" + +#: ../../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: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 "" +"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 "Configuración en Odoo" -#: ../../content/applications/general/calendars/google/google_calendar_credentials.rst:69 +#: ../../content/applications/general/calendars/google/google_calendar_credentials.rst:100 msgid "" -"Install the **Google Calendar** App from the *Apps* menu or by checking the " -"option in :menuselection:`Settings --> General Settings`." +"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 "" -"Instale la aplicación de **Calendario de Google** desde el menú de " -"*Aplicaciones* al elegir la opción en :menuselection:`Ajustes --> Ajustes " -"generales`." -#: ../../content/applications/general/calendars/google/google_calendar_credentials.rst:75 +#: ../../content/applications/general/calendars/google/google_calendar_credentials.rst:108 msgid "" -"Go to :menuselection:`Settings --> General Settings` and enter your **Client" -" ID** and **Client Secret** in Google Calendar option." +"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 "" -"Vaya a :menuselection:`Ajustes --> Ajustes generales` e ingrese su **ID de " -"cliente** y su **secreto de cliente** en la opción de calendario de Odoo." -#: ../../content/applications/general/calendars/google/google_calendar_credentials.rst:81 +#: ../../content/applications/general/calendars/google/google_calendar_credentials.rst:112 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." +"Finally, open the Calendar module in Odoo and click on the " +":guilabel:`Google` sync button to sync Google Calendar with Odoo." msgstr "" -"La configuración ya está lista. Abra su calendario de Odoo y sincronícelo " -"con Google. La primera vez que lo haga se le redirigirá a Google para " -"autorizar la conexión. Una vez que regrese a Odoo, haga clic en el botón de " -"sincronizar de nuevo. Puede hacer esto siempre que quiera sincronizar su " -"calendario." -#: ../../content/applications/general/calendars/google/google_calendar_credentials.rst:89 -msgid "As of now you no longer have excuses to miss a meeting!" -msgstr "¡A partir de ahora ya no tienes excusas para perderte una reunión!" +#: ../../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 msgid "Synchronization with Outlook's Calendar" @@ -4213,12 +4255,8 @@ 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 `." +"find more information at: :doc:`In-App Purchase `." msgstr "" -"¡Es bienvenido a ofrecer sus propios servicios IAP a través de Odoo! Es la " -"oportunidad perfecta para obtener ingresos recurrentes mediante un servicio " -"continuo en lugar de una única compra inicial. Puede obtener más información" -" en: :doc:`Compras dentro de la aplicación `." #: ../../content/applications/general/users.rst:7 msgid "Users & Companies" @@ -5372,6 +5410,8 @@ msgid "" "If you see a *Missing Parameter* message in the **Odoo softphone**, refresh " "your Odoo window and try again." msgstr "" +"Si ve un mensaje de *Parámetro faltante* en el **Softphone de Odoo**, " +"actualice su ventana de Odoo e inténtelo de nuevo." #: ../../content/applications/general/voip/axivox.rst:80 msgid "" @@ -5380,10 +5420,14 @@ msgid "" "the international country code. E.g., +16506913277 (where +1 is the " "international prefix for the United States)." msgstr "" +"Si ve un mensaje de *Número incorrecto* en el softphone de Odoo, asegúrese " +"de usar el formato internacional, comenzando con el signo más (+) seguido " +"por el código internacional del país. Por ejemplo, +16506913277 (donde +1 es" +" el prefijo internacional para los Estados Unidos)." #: ../../content/applications/general/voip/onsip.rst:3 msgid "Use VoIP services in Odoo with OnSIP" -msgstr "" +msgstr "Utilice los servicios de VoIP en Odoo con OnSIP" #: ../../content/applications/general/voip/onsip.rst:8 msgid "" @@ -5391,6 +5435,10 @@ msgid "" " case, the installation and setup of an Asterisk server is not necessary as " "the whole infrastructure is hosted and managed by OnSIP." msgstr "" +"Se puede configurar el servicio de VoIP de Odoo para que funcione con OnSIP " +"(www.onsip.com). En ese caso, no es necesario instalar y configurar un " +"servidor Asterisk, ya que toda la infraestructura está alojada y gestionada " +"por OnSIP." #: ../../content/applications/general/voip/onsip.rst:10 msgid "" @@ -5399,6 +5447,10 @@ msgid "" "covered by the service. After opening an OnSIP account, follow the " "configuration procedure below." msgstr "" +"Para utilizar este servicio, deberá abrir una cuenta en OnSIP. Antes de " +"hacerlo, asegúrese de que su zona y las zonas a las que desea llamar estén " +"cubiertas por el servicio. Después de abrir una cuenta OnSIP, siga el " +"procedimiento de configuración que se indica a continuación." #: ../../content/applications/general/voip/onsip.rst:15 msgid "Go to Apps and install the module **VoIP OnSIP**." @@ -5409,6 +5461,8 @@ msgid "" "Go to Settings/General Settings. In the section Integrations/Asterisk " "(VoIP), fill in the 3 fields:" msgstr "" +"Vaya a Ajustes/Configuración general. En la sección Integraciones/Asterisk " +"(VoIP), complete los 3 campos:" #: ../../content/applications/general/voip/onsip.rst:22 msgid "" @@ -5416,10 +5470,13 @@ msgid "" "www.onsip.com. If you don't know it, log in to https://admin.onsip.com/ and " "you will see it in the top right corner of the screen." msgstr "" +"**Dominio OnSIP** es el dominio que eligió al crear una cuenta en " +"www.onsip.com. Si no lo conoce, inicie sesión en https://admin.onsip.com/ y " +"lo verá en la esquina superior derecha de la pantalla." #: ../../content/applications/general/voip/onsip.rst:23 msgid "**WebSocket** should contain wss://edge.sip.onsip.com" -msgstr "" +msgstr "**WebSocket** debe contener wss://edge.sip.onsip.com" #: ../../content/applications/general/voip/onsip.rst:24 msgid "**Mode** should be Production" @@ -5430,22 +5487,28 @@ msgid "" "Go to **Settings/Users**. In the form view of each VoIP user, in the " "Preferences tab, fill in the section **PBX Configuration**:" msgstr "" +"Vaya a **Ajustes/Usuarios**. Dentro de la vista de formulario de cada " +"usuario de VoIP, en la pestaña Preferencias, complete la sección " +"**Configuración de la PBX**:" #: ../../content/applications/general/voip/onsip.rst:31 msgid "**SIP Login / Browser's Extension**: the OnSIP 'Username'" msgstr "" +"**Inicio de sesión SIP / Extensión del navegador**: el 'nombre de usuario' " +"de OnSIP" #: ../../content/applications/general/voip/onsip.rst:32 msgid "**OnSIP authorization User**: the OnSIP 'Auth Username'" msgstr "" +"**Autorización OnSIP Usuario**: el 'Usuario de autenticación' de OnSIP" #: ../../content/applications/general/voip/onsip.rst:33 msgid "**SIP Password**: the OnSIP 'SIP Password'" -msgstr "" +msgstr "**Contraseña SIP**: la 'Contraseña SIP' de OnSIP" #: ../../content/applications/general/voip/onsip.rst:34 msgid "**Handset Extension**: the OnSIP 'Extension'" -msgstr "" +msgstr "**Extensión de manos libres**: la 'Extensión' de OnSIP" #: ../../content/applications/general/voip/onsip.rst:36 msgid "" @@ -5453,6 +5516,9 @@ msgid "" "https://admin.onsip.com/users, then select the user you want to configure " "and refer to the fields as pictured below." msgstr "" +"Puede encontrar toda esta información en https://admin.onsip.com/users, a " +"continuación, seleccione el usuario que desee configurar y consulte los " +"campos como se muestra en la siguiente imagen." #: ../../content/applications/general/voip/onsip.rst:41 msgid "" @@ -5460,12 +5526,17 @@ msgid "" "corner of Odoo (make sure you are logged in as a user properly configured in" " Odoo and in OnSIP)." msgstr "" +"Ahora puede hacer llamadas a través del icono de teléfono en la esquina " +"superior derecha de Odoo (asegúrese de estar conectado como un usuario " +"correctamente configurado en Odoo y en OnSIP)." #: ../../content/applications/general/voip/onsip.rst:45 msgid "" "If you see a *Missing Parameters* message in the Odoo softphone, make sure " "to refresh your Odoo window and try again." msgstr "" +"Si ve un mensaje de *Parámetros faltantes* en el softphone de Odoo, " +"actualice su ventana de Odoo e inténtelo de nuevo." #: ../../content/applications/general/voip/onsip.rst:52 msgid "" @@ -5474,16 +5545,23 @@ msgid "" "the international country code. E.g.: +16506913277 (where +1 is the " "international prefix for the United States)." msgstr "" +"Si ve un mensaje de *Número incorrecto* en el softphone de Odoo, asegúrese " +"de usar el formato internacional, comenzando con el signo más (+) seguido " +"por el código internacional del país. Por ejemplo, +16506913277 (donde +1 es" +" el prefijo internacional para los Estados Unidos)." #: ../../content/applications/general/voip/onsip.rst:57 msgid "" "You can now also receive phone calls. Your number is the one provided by " "OnSIP. Odoo will ring and display a notification." msgstr "" +"Ahora también puede recibir llamadas telefónicas. Su número es el que le fue" +" proporcionado por OnSIP. Odoo emitirá un sonido y mostrará una " +"notificación." #: ../../content/applications/general/voip/onsip.rst:63 msgid "OnSIP on Your Cell Phone" -msgstr "" +msgstr "OnSIP en su celular" #: ../../content/applications/general/voip/onsip.rst:65 msgid "" @@ -5492,6 +5570,11 @@ msgid "" " VoIP. This is useful for on-the-go calls, but also to make sure to hear " "incoming calls, or simply for convenience. Any SIP softphone will work." msgstr "" +"Puede utilizar una aplicación de softphone en su celular al igual que Odoo " +"VoIP para hacer y recibir llamadas telefónicas cuando no esté frente a su " +"computadora. Esto es útil para las llamadas sobre la marcha y para " +"asegurarse de escuchar las llamadas entrantes, o simplemente por comodidad. " +"Funciona con cualquier softphone SIP." #: ../../content/applications/general/voip/onsip.rst:67 msgid "" @@ -5500,26 +5583,30 @@ msgid "" " When creating an account, select OnSIP in the list of carriers. You will " "then have to configure it as follows:" msgstr "" +"Se ha probado con éxito OnSIP en Android e iOS con `Grandstream Wave " +"`_. Al " +"crear una cuenta, seleccione OnSIP en la lista de operadores. Tendrá que " +"configurarlo de la siguiente manera:" #: ../../content/applications/general/voip/onsip.rst:69 msgid "**Account name**: OnSIP" -msgstr "" +msgstr "**Nombre de la cuenta**: OnSIP" #: ../../content/applications/general/voip/onsip.rst:70 msgid "**SIP Server**: the OnSIP 'Domain'" -msgstr "" +msgstr "**Servidor SIP**: el 'dominio' de OnSIP" #: ../../content/applications/general/voip/onsip.rst:71 msgid "**SIP User ID**: the OnSIP 'Username'" -msgstr "" +msgstr "**Identificación de usuario SIP**: el 'nombre de usuario' de OnSIP" #: ../../content/applications/general/voip/onsip.rst:72 msgid "**SIP Authentication ID**: the OnSIP 'Auth Username'" -msgstr "" +msgstr "**Identificación SIP**: el 'Usuario de autenticación' de OnSIP" #: ../../content/applications/general/voip/onsip.rst:73 msgid "**Password**: the OnSIP 'SIP Password'" -msgstr "" +msgstr "**Contraseña**: la 'contraseña SIP' de OnSIP" #: ../../content/applications/general/voip/onsip.rst:75 msgid "" @@ -5531,9 +5618,20 @@ msgid "" "Assistant `_." msgstr "" +"Además de iniciar llamadas desde Grandstream Wave en su celular, también " +"podrá iniciar llamadas haciendo clic en los números de teléfono en el " +"navegador de su PC. Esto hará que Grandstream Wave emita un sonido y dirija " +"la llamada a través de su celular a la otra parte. Este método es útil para " +"evitar perder tiempo marcando números de teléfono. Para ello, necesitará la " +"extensión de Chrome `OnSIP Call Assistant " +"`_." #: ../../content/applications/general/voip/onsip.rst:79 msgid "" "The downside of using a softphone on your cell phone is that your calls will" " not be logged in Odoo as the softphone acts as an independent separate app." msgstr "" +"La desventaja de usar un softphone en su celular es que sus llamadas no se " +"registrarán en Odoo ya que el softphone actúa como una aplicación " +"independiente." diff --git a/locale/es/LC_MESSAGES/inventory_and_mrp.po b/locale/es/LC_MESSAGES/inventory_and_mrp.po index f025f9d23..a14bbe387 100644 --- a/locale/es/LC_MESSAGES/inventory_and_mrp.po +++ b/locale/es/LC_MESSAGES/inventory_and_mrp.po @@ -29,7 +29,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: 2021-11-02 08:48+0000\n" "Last-Translator: Patricia Gutiérrez Capetillo , 2022\n" "Language-Team: Spanish (https://www.transifex.com/odoo/teams/41243/es/)\n" @@ -3072,16 +3072,12 @@ 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" +"**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 "" -"**Tiempo de espera de seguridad para compra**: Margen de error para tiempos " -"de espera de proveedores. Cuando el sistema genera órdenes de compra para " -"adquirir productos, se planeará con ese número de días de antelación para " -"poder asumir retrasos inesperados del proveedor." -#: ../../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 " @@ -3092,7 +3088,7 @@ msgstr "" "ordenados. La **fecha programada de recepción - fecha de entrega del " "proveedor** es la fecha automática de *ordenar para*." -#: ../../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 " @@ -3105,7 +3101,7 @@ msgstr "" "de cotización al crear una nueva. Después, la fecha específica se configura " "en la línea." -#: ../../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 " @@ -3115,7 +3111,7 @@ msgstr "" " tome fabricar un producto. Este plazo de espera e independiente de la " "cantidad que hay que producir y no toma el tiempo rutinario en cuenta." -#: ../../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 " @@ -3128,11 +3124,11 @@ msgstr "" "fabricación - plazo de seguridad para la fabricación** es la fecha " "programada automáticamente." -#: ../../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 "Ventas - plazos de espera" -#: ../../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" @@ -3144,7 +3140,7 @@ msgstr "" " fecha se calcula automáticamente de acuerdo a los diferentes tiempos de " "espera antes configurados." -#: ../../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." @@ -3152,7 +3148,7 @@ msgstr "" "Si la *Fecha de entrega* es antes que la *Fecha esperada*, se mostraré un " "mensaje de advertencia." -#: ../../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." @@ -3160,11 +3156,11 @@ msgstr "" "Pero, para que todo esto funcione adecuadamente, todavía es necesario " "configurar todos los tiempos de espera que podrían suceder." -#: ../../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 "Plazo de entrega del cliente" -#: ../../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 " @@ -3177,7 +3173,7 @@ msgstr "" " --> Productos`. Aquí deberá abrir su formulario de producto, vaya a la " "pestaña de inventario y agregue el *plazo de espera del cliente*." -#: ../../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 " @@ -3187,13 +3183,13 @@ msgstr "" " del cliente* es de dos días. En este caso, la fecha de entrega esperada es " "el 4 de abril." -#: ../../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 "Plazo de seguridad" -#: ../../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 " @@ -3203,7 +3199,7 @@ msgstr "" "asegurarse de que podrá entregar los productos a tiempo. El propósito es " "preparar la entrega antes para que llegue a tiempo." -#: ../../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." @@ -3211,7 +3207,7 @@ msgstr "" "El número de días de seguridad se resta para calcular una fecha programada " "antes de la prometida al cliente." -#: ../../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*." @@ -3219,7 +3215,7 @@ msgstr "" "Para configurar esto, vaya a :menuselection:`Inventario --> Configuración " "--> Ajustes` y active la función *Plazo de seguridad para ventas*." -#: ../../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 " @@ -3229,11 +3225,11 @@ msgstr "" "*plazo de seguridad* es un día. En ese caso, la entrega programada para la " "orden de entrega es el 5 de abril." -#: ../../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 "Entregar varios productos" -#: ../../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 " @@ -3244,7 +3240,7 @@ msgstr "" "entregar, ya sea al mismo tiempo o por separado. Afortunadamente, Odoo le " "puede ayudar a llevar estos casos fácilmente." -#: ../../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 " @@ -3255,7 +3251,7 @@ msgstr "" "primero es para entregar los productos al mismo tiempo, mientras que el " "segundo es para entregarlos por separado." -#: ../../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 " @@ -3269,7 +3265,7 @@ msgstr "" " caso es A. Si la orden se confirma el 2 de abril, entonces la *fecha " "esperada* es el 10 de abril." -#: ../../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" @@ -3279,15 +3275,15 @@ msgstr "" " con el menor plazo de espera del cliente. Por lo tanto, la *fecha esperada*" " es el 7 de abril." -#: ../../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 "Compra - plazos de espera" -#: ../../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 "Plazos de espera del proveedor" -#: ../../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 " @@ -3298,7 +3294,7 @@ msgstr "" " del producto :menuselection:`Compra --> Productos --> Productos` y agregue " "el proveedor en la pestaña de *Compra*." -#: ../../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 " @@ -3310,7 +3306,7 @@ msgstr "" "compra de ese producto ahora será igual a la *fecha de la orden de compra + " "plazo de espera de la entrega*." -#: ../../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." @@ -3318,7 +3314,7 @@ msgstr "" "Es posible agregar diferentes proveedores y, por lo tanto, diferentes plazos" " de entrega dependiendo del proveedor." -#: ../../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 " @@ -3328,7 +3324,7 @@ msgstr "" "plazo de *Ventas*, excepto que en este caso usted es el cliente. Después, es" " el margen de error de su proveedor para entregar su orden." -#: ../../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." @@ -3337,7 +3333,7 @@ msgstr "" ":menuselection:`Inventario --> Configuración --> Ajustes` y active la " "función." -#: ../../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." @@ -3346,15 +3342,15 @@ msgstr "" "programarán esos días antes para lidiar con retrasos inesperados del " "proveedor." -#: ../../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 "Fabricación - Plazos de entrega" -#: ../../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 "Plazo de entrega de fabricación" -#: ../../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 " @@ -3365,7 +3361,7 @@ msgstr "" " el formulario de su producto y agregue el número de días que toma la " "fabricación." -#: ../../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" @@ -3377,7 +3373,7 @@ msgstr "" "fabricación**. Por ejemplo, la fecha límite de inicio para una orden que " "tiene una fecha de compromiso el 10 de julio es el 27 de junio." -#: ../../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." @@ -3386,7 +3382,7 @@ msgstr "" "fabricación más temprano para lidiar con el riesgo de retrasos en la " "fabricación." -#: ../../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*." @@ -3394,7 +3390,7 @@ msgstr "" "Para activarlo vaya a :menuselection:`Fabricación --> Configuración --> " "Ajustes` y marque el *plazo de seguridad*." -#: ../../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 " @@ -3406,35 +3402,35 @@ msgstr "" "*plazo de seguridad* es de 3 días, así que la fabricación de B debe empezar " "al menos el 3 de junio, que es la fecha planeada de la orden de fabricación." -#: ../../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 "Ejemplo mundial" -#: ../../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 "Esta es la configuración:" -#: ../../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 "1 día de plazo de seguridad para Ventas" -#: ../../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 "2 días de plazo de seguridad para Fabricación" -#: ../../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 "3 días de plazo de espera para Fabricación" -#: ../../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 "1 día de plazo de seguridad para Compra" -#: ../../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 "4 días de plazo de espera para el proveedor" -#: ../../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, " @@ -3444,11 +3440,11 @@ msgstr "" "está planeada para que sea dentro de 20 días (el 20 de septiembre). En este " "caso, aquí es cuando se activan todas las siguientes etapas." -#: ../../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 "**1 de septiembre**: se crean las órdenes de venta" -#: ../../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)" @@ -3457,7 +3453,7 @@ msgstr "" "proveedor debido al proceso de fabricación (4 días de espera para el " "proveedor)." -#: ../../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)" @@ -3465,7 +3461,7 @@ msgstr "" "**13 de septiembre**: le recepción del formulario del producto del proveedor" " (1 día de plazo de espera para compra)" -#: ../../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 " @@ -3475,7 +3471,7 @@ msgstr "" " días de plazo de espera de fabricación - 2 días de plazo de seguridad para " "Fabricación)" -#: ../../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)" diff --git a/locale/es/LC_MESSAGES/productivity.po b/locale/es/LC_MESSAGES/productivity.po index 2452e58d3..79d456107 100644 --- a/locale/es/LC_MESSAGES/productivity.po +++ b/locale/es/LC_MESSAGES/productivity.po @@ -5,7 +5,6 @@ # # Translators: # AleEscandon , 2021 -# Martin Trigaux, 2021 # Nicolás Broggi , 2021 # José Cabrera Lozano , 2021 # Jesús Alan Ramos Rodríguez , 2021 @@ -15,15 +14,16 @@ # Braulio D. López Vázquez , 2022 # Patricia Gutiérrez Capetillo , 2022 # Lucia Pacheco , 2022 +# Martin Trigaux, 2022 # #, fuzzy 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: 2021-11-02 08:49+0000\n" -"Last-Translator: Lucia Pacheco , 2022\n" +"Last-Translator: Martin Trigaux, 2022\n" "Language-Team: Spanish (https://www.transifex.com/odoo/teams/41243/es/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -39,6 +39,128 @@ msgstr "Productividad" msgid "Discuss" msgstr "Conversaciones" +#: ../../content/applications/productivity/discuss/advanced.rst:5 +msgid "Advanced" +msgstr "Avanzado" + +#: ../../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 "Información general" @@ -1831,14 +1953,14 @@ msgstr "" " :ref:`créditos prepagados `." #: ../../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 "" "Introduzca el URL de su base de datos de Odoo y haga clic en *Iniciar " "sesión*." #: ../../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 "" "Si no ha iniciado sesión en su base de datos, introduzca sus credenciales." @@ -1913,21 +2035,47 @@ msgstr "" "Abra cualquier correo electrónico en su bandeja de entrada de Outlook, haga " "clic en el botón de *Más acciones* y seleccione *Odoo para Outlook*." +#: ../../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 "Haga clic en *Permitir* para abrir la ventana emergente." -#: ../../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 "" "Haga clic en *Permitir* para que el plugin de Outlook se conecte con su base" " de datos." -#: ../../content/applications/productivity/mail_plugins/outlook.rst:101 +#: ../../content/applications/productivity/mail_plugins/outlook.rst:116 msgid "Add a shortcut to the plugin" msgstr "Agregar un atajo al plugin" -#: ../../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 " @@ -1937,7 +2085,7 @@ msgstr "" "de *Más acciones*. Sin embargo, para ahorrar tiempo, es posible agregarlo al" " lado de las demás acciones predeterminadas." -#: ../../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*." @@ -1945,7 +2093,7 @@ msgstr "" "En su bandeja de entrada de Outlook, haga clic en *Ajustes* luego en *Ver " "todos los ajustes de Outlook*." -#: ../../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*." @@ -1953,7 +2101,7 @@ msgstr "" "Seleccione *Personalizar acciones* en *Correo*, haga clic en *Odoo para " "Outlook* y luego en *Guardar*." -#: ../../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 "Abra cualquier correo, el atajo debe aparecer." @@ -2596,6 +2744,14 @@ msgid "" "Odoo’s reports also use Bootstrap’s grid layout, which is the containers, " "rows, and columns to align content, and support Odoo's website themes." msgstr "" +"Odoo usa tecnología HTML y CSS para crear reportes. HTML es un lenguaje de " +"marcado que usa etiquetas, también conocidas como elementos. Es el elemento " +"principal de cualquier página web ya que brinda una estructura básica. CSS " +"interactúa con los elementos HTML, juntos añaden estilo a la página y de " +"esta manera se establece la manera en la que se muestra el HTML al usuario. " +"Los reportes de Odoo también usan el diseño de tabla de Bootstrap, el cual " +"consiste en contenedores, filas y columnas que acomodan el contenido, y son " +"compatibles con los temas del sitio web de Odoo." #: ../../content/applications/productivity/studio/how_to/reports.rst:11 msgid "" @@ -2603,6 +2759,9 @@ msgid "" "the report to include header and footer (company logo, name, address, phone," " email address, etc.)." msgstr "" +"Al momento de crear un nuevo reporte, escoja su propósito y si le gustaría " +"incluir un encabezado y pie de página (logo de su empresa, nombre, " +"dirección, teléfono, dirección de correo electrónico, etc)." #: ../../content/applications/productivity/studio/how_to/reports.rst:17 msgid "" @@ -2612,6 +2771,12 @@ msgid "" "<../concepts/understanding_general>` related object). *Text*, *Title Block*," " *Image*, and *Text in Cell* are static elements." msgstr "" +"En la pestaña **Agregar** puede encontrar los campos listos para arrastrar y" +" soltar en la vista. Los elementos *Campos*, *Tablas de datos*, *Subtotal y " +"total* y *Libretas de direcciones* son dinámicos (esto significa que " +"necesitan un objeto con relación :doc:`one2many o many2many " +"<../concepts/understanding_general>`). Los elementos *Texto*, *Bloque de " +"título*, *Imagen* y * Texto en celda* son estáticos." #: ../../content/applications/productivity/studio/how_to/reports.rst:26 msgid "" @@ -2620,12 +2785,19 @@ msgid "" "properties, allowing you to individually edit them. Fields with related " "objects have their directives shown on *Field Expression*." msgstr "" +"Una vez que se agrega un elemento a la vista, selecciónelo para ver sus " +"**Opciones**. La primera sección muestra la jerarquía de los objetos " +"seleccionados y sus propiedades, permitiendo que los pueda editar de manera " +"individual. Los campos con objetos relacionados tienen sus directivas " +"mostradas en *Expresión de campo*." #: ../../content/applications/productivity/studio/how_to/reports.rst:34 msgid "" "Under **Visible if**, define the rule(s) to set visibility conditions to " "fields." msgstr "" +"Defina las reglas para configurar las condiciones de visibilidad de los " +"campos en **Visible si**." #: ../../content/applications/productivity/studio/how_to/reports.rst:36 msgid "" @@ -2633,6 +2805,10 @@ msgid "" "rule to only display the ones that are *set* in the product form, avoiding " "having a plain icon when they are not set." msgstr "" +"Ejemplo: si decide mostrar una imagen de producto, podría establecer una " +"regla de visibilidad para que solo se muestren las que están *configuradas* " +"en el formulario del producto, evitando que se muestre un icono cuando no " +"están configuradas de esta manera." #: ../../content/applications/productivity/studio/how_to/reports.rst:40 msgid "" @@ -2642,6 +2818,11 @@ msgid "" "of the report to specifics groups, meaning that users belonging to other " "groups do not see the same final document." msgstr "" +"**Visible para** se utiliza para establecer qué :doc:`grupos " +"` pueden tener acceso a elementos específicos " +"del reporte. **Limitar visibilidad a grupos**, en *Reporte*, establece la " +"visibilidad del reporte a grupos específicos, lo que significa que los " +"usuarios que pertenecen a otros grupos no ven el mismo documento final." #: ../../content/applications/productivity/studio/how_to/reports.rst:46 msgid "" @@ -2649,6 +2830,9 @@ msgid "" "the report should be added to the *Print* menu list on its respective " "document form." msgstr "" +"En la pestaña **Reporte** puede nombrar su reporte, elegir el formato de " +"papel y si se debe agregar el reporte a la lista del menú *Imprimir* en su " +"respectivo formulario de documento." #: ../../content/applications/productivity/studio/how_to/reports.rst:53 msgid "" @@ -2656,12 +2840,17 @@ msgid "" "such as *Class* under *Options*, and *Reload from attachment* under " "*Report*, become visible." msgstr "" +"Si activa el :ref:`modo de desarrollador`, los campos adicionales como " +"*Clase* en *Opciones*, y *Volver a cargar desde el archivo adjunto* en " +"*Reporte*, se hacen visibles." #: ../../content/applications/productivity/studio/how_to/reports.rst:56 msgid "" "*Class*: add custom CSS classes to the selected element (e.g. Bootstrap " "classes such as *text-danger*)." msgstr "" +"*Clase*: añade clases personalizadas de CSS al elemento seleccionado (por " +"ejemplo, clases de Bootstrap como *text-danger*)." #: ../../content/applications/productivity/studio/how_to/reports.rst:59 msgid "" @@ -2673,12 +2862,23 @@ msgid "" " This is typically useful for reports linked to documents that should not " "change, such as Invoices." msgstr "" +"*Volver a cargar desde el archivo adjunto*: guarda el reporte como un " +"archivo adjunto del documento cuando se imprime. Cuando se vuelve a imprimir" +" el reporte, se vuelve a descargar ese archivo adjunto en lugar de solo " +"reimprimirlo. Esto significa que si el registro subyacente (por ejemplo, la " +"factura) es diferente en comparación con la primera impresión, el reporte no" +" refleja los cambios porque se hicieron después de la creación del archivo " +"adjunto. Esta opción suele ser útil para los reportes vinculados a " +"documentos que no deben cambiar, como las facturas." #: ../../content/applications/productivity/studio/how_to/reports.rst:67 msgid "" "Actions in Odoo Studio can be undone until you *Close* the toolbox. Once you" " have closed Studio, changes can not be undone anymore." msgstr "" +"Se pueden cancelar las acciones en Odoo Studio hasta que se *cierra* la caja" +" de herramientas. Una vez que haya cerrado Studio, ya no se pueden deshacer " +"los cambios." #: ../../content/applications/productivity/studio/use_cases.rst:5 msgid "Use Cases" @@ -2693,6 +2893,8 @@ msgid "" "**Case scenario 1: when a Belgian lead is created, a 3-stars priority should" " be automatically applied.**" msgstr "" +"**Caso 1: si se crea un lead de Bélgica, automáticamente se le aplica una " +"prioridad de 3 estrellas.**" #: ../../content/applications/productivity/studio/use_cases/automated_actions.rst:8 msgid "Under *Automations*, click on *Create* and set the following rules:" @@ -2706,30 +2908,32 @@ msgstr "*Modelo*: Lead/Oportunidad" #: ../../content/applications/productivity/studio/use_cases/automated_actions.rst:11 msgid "*Active*: On" -msgstr "" +msgstr "*Activo*: Encendido" #: ../../content/applications/productivity/studio/use_cases/automated_actions.rst:12 msgid "*Trigger*: On Creation & Update" -msgstr "" +msgstr "*Activación*: Al crear y actualizar" #: ../../content/applications/productivity/studio/use_cases/automated_actions.rst:13 msgid "*Apply on*: Country > Country Name = Belgium" -msgstr "" +msgstr "*Aplicar en*: País > Nombre del país = Bélgica" #: ../../content/applications/productivity/studio/use_cases/automated_actions.rst:14 #: ../../content/applications/productivity/studio/use_cases/filters_status_bar.rst:53 msgid "*Action To Do*: Update the Record" -msgstr "" +msgstr "*Acción a realizar*: Actualizar el registro" #: ../../content/applications/productivity/studio/use_cases/automated_actions.rst:15 msgid "*Data to Write*: Lead/Opportunity > Value > 3" -msgstr "" +msgstr "*Datos para escribir*: Lead/Oportunidad > Valor > 3" #: ../../content/applications/productivity/studio/use_cases/automated_actions.rst:22 msgid "" "Check :doc:`this doc ` in order to have another " "automated action example." msgstr "" +"Consulte :doc:`este documento ` para obtener otro " +"ejemplo de una acción automatizada." #: ../../content/applications/productivity/studio/use_cases/automated_actions.rst:25 msgid ":doc:`../concepts/understanding_automated_actions`" @@ -2744,13 +2948,16 @@ msgstr ":doc:`../concepts/understanding_general`" #: ../../content/applications/productivity/studio/use_cases/filters_status_bar.rst:3 msgid "Advanced Use Cases: Filters and Status Bar" -msgstr "" +msgstr "Casos de uso avanzados: Filtros y barra de estado" #: ../../content/applications/productivity/studio/use_cases/filters_status_bar.rst:5 msgid "" "**Case scenario 1: on Sales, set a filter on Belgian customers and define it" " as the default one (the user should still be able to unset the filter).**" msgstr "" +"**Caso 1: en la aplicación de Ventas, establezca un filtro para los clientes" +" belgas y defínalo como el predeterminado (el usuario debe ser capaz de " +"desactivar el filtro).**" #: ../../content/applications/productivity/studio/use_cases/filters_status_bar.rst:8 msgid "" @@ -2758,12 +2965,18 @@ msgid "" "customers by country. Now, under *Favorites*, *Save Current Search* enabling" " *Use by default* and *Save*." msgstr "" +"En la página de su cliente, haga clic en *Filtros* > *Añadir filtro " +"personalizado* para agrupar a los clientes por país. Después, haga clic en " +"*Favoritos*, *Guardar búsqueda actual* y active *Usar de forma " +"predeterminada* y *Guardar*." #: ../../content/applications/productivity/studio/use_cases/filters_status_bar.rst:15 msgid "" "On *Filter Rules* in Studio mode, select the respective filter and enable " "*Default Filter*." msgstr "" +"En el modo Studio, vaya a *Reglas de filtro*, seleccione el filtro " +"respectivo y active el *Filtro predeterminado*." #: ../../content/applications/productivity/studio/use_cases/filters_status_bar.rst:21 msgid "" @@ -2771,6 +2984,10 @@ msgid "" "cycle. Set the values: ‘Prototype’, ‘In use’ and ‘Deprecated’. By default, " "the Kanban view must be grouped by status.**" msgstr "" +"**Caso 2: añadir una barra de estado en el formulario del producto para " +"gestionar su ciclo de vida. Establezca los valores: 'Prototipo', 'En uso' y " +"'Obsoleto'. De manera predeterminada, la vista de Kanban debe agruparse por " +"estado.**" #: ../../content/applications/productivity/studio/use_cases/filters_status_bar.rst:26 msgid "" @@ -2778,12 +2995,19 @@ msgid "" "Status bars are *selection* fields that give you the ability to follow a " "specific flow. They are useful to show you the progress that has been made." msgstr "" +"En el formulario de su producto, *añada una barra de estado del flujo* y " +"asigne un nombre a sus valores. Las barras de estado son campos de " +"*selección* que le permiten seguir un flujo específico. Resultan útiles para" +" mostrar el progreso que se ha realizado." #: ../../content/applications/productivity/studio/use_cases/filters_status_bar.rst:28 msgid "" "On the *Views* menu, access *Kanban* and, under its *View* options, set the " "*Default Group by* as *Pipeline status bar*." msgstr "" +"Acceda a Kanban desde el menú \"Vistas\"; en las opciones de \"Vista\", " +"establezca el \"Grupo predeterminado por\" como \"Barra de estado del " +"flujo\"." #: ../../content/applications/productivity/studio/use_cases/filters_status_bar.rst:34 msgid "" @@ -2791,44 +3015,55 @@ msgid "" "you move products throughout stages (also through the product’s form), " "stages are shown in the Kanban view." msgstr "" +"A continuación, abra el formulario de su producto y establezca el estado " +"correcto para ese producto. A medida que mueva los productos a través de las" +" etapas (también a través del formulario del producto), se mostrarán las " +"etapas en vista Kanban." #: ../../content/applications/productivity/studio/use_cases/filters_status_bar.rst:38 msgid "" "To make modifications in the pipeline status bar, for example, remember to " "go back to *Form View*." msgstr "" +"Si, por ejemplo, desea realizar modificaciones en la barra de estado del " +"flujo, recuerde regresar a la *Vista de formulario*." #: ../../content/applications/productivity/studio/use_cases/filters_status_bar.rst:44 msgid "" "**Case scenario 2.a: when a product goes from ‘In use’ to ‘Deprecate’, set " "its cost to 0€.**" msgstr "" +"**Caso 2.a: cuando un producto pasa de \"En uso\" a \"Obsoleto\", su costo " +"se establece a 0€.**" #: ../../content/applications/productivity/studio/use_cases/filters_status_bar.rst:46 msgid "" "Create an :doc:`automated action " "<../concepts/understanding_automated_actions>` with the selected values:" msgstr "" +"Cree una :doc:`acción automatizada " +"<../concepts/understanding_automated_actions>` con los valores " +"seleccionados:" #: ../../content/applications/productivity/studio/use_cases/filters_status_bar.rst:49 msgid "*Model*: Product Template" -msgstr "" +msgstr "*Modelo*: Plantilla de producto" #: ../../content/applications/productivity/studio/use_cases/filters_status_bar.rst:50 msgid "*Trigger*: On Update" -msgstr "" +msgstr "*Activador*: Al actualizar" #: ../../content/applications/productivity/studio/use_cases/filters_status_bar.rst:51 msgid "*First Domain*: Pipeline status bar = In use" -msgstr "" +msgstr "*Primer dominio*: Barra de estado del flujo = En uso" #: ../../content/applications/productivity/studio/use_cases/filters_status_bar.rst:52 msgid "*Second Domain*: Pipeline status bar = Deprecated" -msgstr "" +msgstr "*Segundo dominio*: Barra de estado del flujo = Obsoleto" #: ../../content/applications/productivity/studio/use_cases/filters_status_bar.rst:54 msgid "*Data to Write*: Cost (Product Template) > Value > 0" -msgstr "" +msgstr "* Datos a escribir*: Costo (Plantilla de producto) > Valor > 0" #: ../../content/applications/productivity/studio/use_cases/models_fields.rst:3 msgid "Advanced Use Cases: Creating Models and Adding Fields" @@ -2839,21 +3074,29 @@ msgid "" "**Case scenario 1: on the leads’ form, if the chosen country is France, show" " a field 'Pay by check?'**" msgstr "" +"**Caso 1: si elige Francia como país de destino en el formulario de leads, " +"muestre un campo llamado '¿Pagar con cheque?'**" #: ../../content/applications/productivity/studio/use_cases/models_fields.rst:8 msgid "" "On your leads’ form, add a *Related Field* to *Country > Country Name*." msgstr "" +"En el formulario de sus leads, añada un *Campo relacionado* a *País > Nombre" +" del país*." #: ../../content/applications/productivity/studio/use_cases/models_fields.rst:10 msgid "" "Now, add a *Checkbox* field and define its invisibility options as *Country*" " (carefully select the one just created) *> is not = > France.*" msgstr "" +"Ahora, añada una *Casilla de verificación* y defina sus opciones de " +"invisibilidad como *País* (seleccione cuidadosamente el que acaba de crear) " +"*> no es = > Francia.*" #: ../../content/applications/productivity/studio/use_cases/models_fields.rst:11 msgid "You can now hide the related field created (*Country*) if you wish." msgstr "" +"Ahora puede ocultar el campo relacionado creado (*País*) si así lo desea." #: ../../content/applications/productivity/studio/use_cases/models_fields.rst:19 msgid "" @@ -2861,22 +3104,30 @@ msgid "" ":menuselection:`Contacts --> Configuration --> Countries`, select France " "(for example), and on the URL check its *ID*." msgstr "" +"Otro método es utilizar el ID del país. Para ello, vaya a " +":menuselection:`Contactos --> Configuración --> Países`, seleccione Francia " +"(por ejemplo), y en la URL marque su *ID*." #: ../../content/applications/productivity/studio/use_cases/models_fields.rst:21 msgid "" "The related field invisibility path should now be *Country* (carefully " "select the one just created) *> is not = > 75*." msgstr "" +"La ruta de invisibilidad del campo relacionado debe ser *País* (seleccione " +"cuidadosamente el que acaba de crear) *> no es = > 75*." #: ../../content/applications/productivity/studio/use_cases/models_fields.rst:22 msgid "Again, hide the related field with the country’s ID if you prefer." msgstr "" +"Si lo prefiere, puede ocultar el campo relacionado con el ID del país." #: ../../content/applications/productivity/studio/use_cases/models_fields.rst:28 msgid "" "**Case scenario 2: create a model called 'Properties' and add fields called:" " company, value, name, address, active, image.**" msgstr "" +"**Caso 2: cree un modelo llamado \"Propiedades\" y añada campos llamados: " +"empresa, valor, nombre, dirección, activo, imagen.**" #: ../../content/applications/productivity/studio/use_cases/models_fields.rst:31 msgid "" @@ -2884,6 +3135,10 @@ msgid "" "Menu* and start a *New Menu* (model). Set your menu name and *Confirm*. Now," " on its form, drag & drop the necessary fields." msgstr "" +"Cree un nuevo módulo desde el tablero (opcional). Después, haga clic en " +"*Editar menú* e inicie un *Nuevo menú* (modelo). Establezca el nombre de su " +"menú y *Confirme*. A continuación, arrastre y suelte los campos necesarios " +"en su formulario." #: ../../content/applications/productivity/studio/use_cases/models_fields.rst:39 msgid "" @@ -2891,54 +3146,75 @@ msgid "" " which each property must be linked. And, on 'Regions', you would like to " "see the properties for each region.**" msgstr "" +"**Caso 2.a: ahora le gustaría tener un modelo llamado 'Regiones' el cual " +"debe estar vinculado a cada propiedad. Además, le gustaría ver las " +"propiedades de cada región en este modelo.**" #: ../../content/applications/productivity/studio/use_cases/models_fields.rst:43 msgid "" "Go to *Edit Menu > New Menu* and create your menu, calling it *Regions*. Add" " the necessary fields on its form by dragging & dropping them." msgstr "" +"Vaya a *Editar menú > Nuevo menú*, cree su menú y nómbrelo *Regiones*. Use " +"la función de arrastrar y soltar para añadir los campos necesarios en su " +"formulario." #: ../../content/applications/productivity/studio/use_cases/models_fields.rst:45 msgid "" "Now, in the form view of *Properties*, add a *Many2one* field with a " "relation to your model *Region*." msgstr "" +"A continuación, en la vista de formulario de *Propiedades*, añada un campo " +"*Many2one* relacionado a su modelo *Región*." #: ../../content/applications/productivity/studio/use_cases/models_fields.rst:48 msgid "" "The *Existing Fields* are the ones that are on the current model but not yet" " in the view." msgstr "" +"Los *campos existentes* son los que están en el modelo actual pero aún no " +"están en la vista." #: ../../content/applications/productivity/studio/use_cases/models_fields.rst:60 msgid "" "Now, go to the model *Regions*, select the form view, and add a status " "button selecting *Regions (Properties)* as your relational field." msgstr "" +"Ahora, vaya al modelo de *Regiones*, seleccione la vista de formulario, y " +"añada un botón de estado seleccionando *Regiones (Propiedades)* como su " +"campo relacional." #: ../../content/applications/productivity/studio/use_cases/models_fields.rst:62 msgid "" "*Status buttons* are computed fields, meaning that they count the numbers of" " records on the related model, and allow you to access them." msgstr "" +"Los *botones de estado* son campos calculados, es decir, cuentan el número " +"de registros en el modelo relacionado y permiten que pueda acceder a ellos." #: ../../content/applications/productivity/studio/use_cases/models_fields.rst:69 msgid "" "When searching for relations, click on *Search more* and filter it by " "*Custom*. This way you avoid creating duplicates." msgstr "" +"Cuando busque relaciones, haga clic en *Buscar más* y filtre por " +"*Personalización*. De esta manera evitará crear duplicados." #: ../../content/applications/productivity/studio/use_cases/models_fields.rst:76 msgid "" "**Case scenario 2.b: in the model 'Properties', show all the tags as " "checkboxes instead of tags.**" msgstr "" +"**Escenario 2.b: en el modelo 'Propiedades', muestre todas las etiquetas " +"como casillas de verificación en lugar de etiquetas.**" #: ../../content/applications/productivity/studio/use_cases/models_fields.rst:78 msgid "" "Once the field *Tags* is added to the form, select it and, under its " "*Properties > Widgets*, choose *Checkboxes*." msgstr "" +"Una vez que haya añadido el campo *Etiquetas* al formulario, selecciónelo y," +" en *Propiedades > Widgets*, elija *Casillas de verificación*." #: ../../content/applications/productivity/studio/use_cases/models_fields.rst:85 msgid "" @@ -2946,6 +3222,10 @@ msgid "" "values:'Tags' & 'List' & 'Checkboxes'. According to the value of the field, " "show tags as many2many_tags, many2many_radio, or many2many(_list).**" msgstr "" +"**Caso 3: en el formulario de los leads, añada un campo de selección con los" +" valores:'Etiquetas', 'Lista' y 'Casillas'. Dependiendo del valor del campo," +" muestre las etiquetas como many2many_tags, many2many_radio, o " +"many2many(_list).**" #: ../../content/applications/productivity/studio/use_cases/models_fields.rst:89 msgid "" @@ -2953,6 +3233,10 @@ msgid "" " *Properties*, define its *Widget* as *Many2many*. Do the same process " "another 2 times for *Checkboxes* and *Tags*." msgstr "" +"En la vista de formulario, añada un campo de *Etiquetas* y relaciónelo con " +"*Etiqueta de partners*. En *Propiedades*, defina su *Widget* como " +"*Many2many*. Repita el mismo proceso otras dos veces para las *Casillas de " +"verificación* y las *Etiquetas*." #: ../../content/applications/productivity/studio/use_cases/models_fields.rst:96 msgid "Now, add a *Selection* field and the necessary values." @@ -2965,6 +3249,11 @@ msgid "" "invisibility rule for the *Partner Tags* is set as: *Select Tag type > is " "not = > Tags.*" msgstr "" +"Continúe seleccionando sus campos de *Etiquetas*, uno por uno, para " +"establecer sus opciones de *Invisibilidad* a partir de su *Widget*. En el " +"siguiente ejemplo, la regla de invisibilidad para las *Etiquetas del " +"partner* se establece como: *Seleccionar tipo de etiqueta > no es = > " +"Etiquetas.*" #: ../../content/applications/productivity/studio/use_cases/models_fields.rst:105 msgid "" @@ -2973,6 +3262,10 @@ msgid "" " manager can see it, and the field should be set as mandatory if the untaxed" " amount is higher than 500€.**" msgstr "" +"**Caso 4: en el formulario de una cotización, añada un campo de selección " +"llamado 'Validación del gerente' con los valores: 'Aceptado' y 'Rechazado'. " +"Este campo solo lo podrá ver un gerente de ventas, y deberá ser obligatorio " +"si el importe sin impuestos es superior a 500€.**" #: ../../content/applications/productivity/studio/use_cases/models_fields.rst:109 msgid "" @@ -2980,14 +3273,20 @@ msgid "" "and *Refused*. Set its *Required* condition as *Untaxed Amount > 500* and " "the *Limit visibility to groups* as *Sales / Administrator* or managers." msgstr "" +"En su formulario de cotización, añada un campo de *Selección* con los " +"valores *Aceptado* y *Rechazado*. Establezca su condición *Requerida* como " +"*Importe sin impuestos > 500* y la *Visibilidad limitada a grupos* como " +"*Ventas/Administrador* o gerentes." #: ../../content/applications/productivity/studio/use_cases/models_fields.rst:117 msgid "**Case scenario 5: change the tooltip of a field for all views.**" msgstr "" +"**Caso 5: cambiar las herramientas de un campo para todas las vistas.**" #: ../../content/applications/productivity/studio/use_cases/models_fields.rst:119 msgid "Activate the :ref:`developer mode ` and open Studio." msgstr "" +"Active el :ref:`modo de desarrollador ` y abra Studio." #: ../../content/applications/productivity/studio/use_cases/models_fields.rst:122 msgid "" @@ -2996,6 +3295,11 @@ msgid "" "explanatory message shown when the user hovers the field. The message here " "written is displayed on all views forms where the field is added." msgstr "" +"Seleccione el campo necesario y, en *Propiedades*, haga clic en *Más* para " +"escribir su mensaje explicativo en el *Campo de información*. Esta " +"descripción es el mensaje que se mostrará cuando el usuario pase el cursor " +"sobre el campo. El mensaje escrito aquí se mostrará en todos los formularios" +" de vista en los cuales se añada el campo." #: ../../content/applications/productivity/studio/use_cases/models_fields.rst:129 msgid "" @@ -3003,28 +3307,37 @@ msgid "" "like to change/apply a tooltip for a specific field, use the *Help Tooltip* " "option under *Properties*." msgstr "" +"El mensaje en el *campo de información* solo puede aplicarse a los campos " +"*nuevos*. Si desea cambiar/aplicar un mensaje de información para un campo " +"específico, utilice la opción *Información de ayuda* en *Propiedades*." #: ../../content/applications/productivity/studio/use_cases/views.rst:3 msgid "Advanced Use Cases: Views" -msgstr "" +msgstr "Casos de uso avanzados: Vistas" #: ../../content/applications/productivity/studio/use_cases/views.rst:5 msgid "" "**Case scenario 1: in Sales, show orders in a Kanban View instead of a List " "View.**" msgstr "" +"**Caso 1: mostrar las órdenes en vista de Kanban en vez de vista de lista en" +" la aplicación de Ventas.**" #: ../../content/applications/productivity/studio/use_cases/views.rst:7 msgid "" "From the Sales page, access Studio and, under *Views*, set the *Kanban* " "option as the default one." msgstr "" +"Desde la página de Ventas, acceda a Studio y, en *Vistas*, establezca la " +"opción *Kanban* como la predeterminada." #: ../../content/applications/productivity/studio/use_cases/views.rst:14 msgid "" "**Case scenario 2: allow for the list of leads to be edited inline without " "having to switch to the form view.**" msgstr "" +"**Caso 2: permitir que la lista de leads se edite en línea sin tener que " +"cambiar a la vista de formulario.**" #: ../../content/applications/productivity/studio/use_cases/views.rst:19 msgid "" @@ -3032,9 +3345,16 @@ msgid "" " top* or *New record at the bottom*. This way, besides defining the order in" " which new records are displayed in the view, you are able to edit them." msgstr "" +"En la *vista de lista*, vaya a *Vista* > *Editable*, y elija entre *Nuevo " +"registro en la parte superior* o *Nuevo registro en la parte inferior*. De " +"este modo, además de definir el orden en que se muestran los nuevos " +"registros en la vista, podrá editarlos." #: ../../content/applications/productivity/studio/use_cases/views.rst:21 msgid "" "If the field is left blank, no editing is possible and records are shown " "based on your column preferences on the lead's page (front-end)." msgstr "" +"Si se deja el campo en blanco, no será posible editarlo y los registros se " +"mostrarán según sus preferencias de columna en la página del lead " +"(frontend)." diff --git a/locale/es/LC_MESSAGES/sales.po b/locale/es/LC_MESSAGES/sales.po index f33313b24..d2dfda232 100644 --- a/locale/es/LC_MESSAGES/sales.po +++ b/locale/es/LC_MESSAGES/sales.po @@ -9,27 +9,27 @@ # David Arnold , 2021 # Nicole Kist , 2021 # Alejandro Kutulas , 2021 -# Martin Trigaux, 2021 +# Vivian Montana , 2021 # Jesús Alan Ramos Rodríguez , 2021 # Lina Maria Avendaño Carvajal , 2021 # Pablo Rojas , 2021 # AleEscandon , 2021 -# Vivian Montana , 2021 -# Jon Perez , 2021 # José Cabrera Lozano , 2021 # Marian Cuadra, 2022 # Patricia Gutiérrez Capetillo , 2022 -# Braulio D. López Vázquez , 2022 # Lucia Pacheco , 2022 +# Martin Trigaux, 2022 +# Jon Perez , 2022 +# Braulio D. López Vázquez , 2022 # #, fuzzy 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: 2021-11-02 08:49+0000\n" -"Last-Translator: Lucia Pacheco , 2022\n" +"Last-Translator: Braulio D. López Vázquez , 2022\n" "Language-Team: Spanish (https://www.transifex.com/odoo/teams/41243/es/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -92,7 +92,6 @@ msgstr "" "canales en especiales desde la configuración de formulario." #: ../../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 @@ -101,8 +100,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 @@ -209,150 +209,161 @@ msgstr "" msgid "It is also possible to merge more than 2 opportunities or leads." msgstr "También es posible fusionar más de 2 oportunidades o leads." -#: ../../content/applications/sales/crm/acquire_leads/generate_from_email.rst:3 -msgid "Generate leads/opportunities from emails" -msgstr "Genera leads/oportunidades desde correos electrónicos" - -#: ../../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:3 +msgid "Generate leads/opportunities" msgstr "" -"Al automatizar la creación de leads/oportunidades mejorará su eficiencia. " -"Por defecto, cualquier correo que se mande a *ventas@database\\_domain.ext* " -"creará una oportunidad en el flujo del canal de ventas predeterminado." -#: ../../content/applications/sales/crm/acquire_leads/generate_from_email.rst:11 +#: ../../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_leads.rst:10 msgid "Configure email aliases" msgstr "Configurar seudónimos de correo" -#: ../../content/applications/sales/crm/acquire_leads/generate_from_email.rst:13 +#: ../../content/applications/sales/crm/acquire_leads/generate_leads.rst:12 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`." +"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 "" -"Cada equipo de ventas tiene su propio alias para generar leads/oportunidades" -" que automáticamente se le asignan. Esto es útil si maneja varios equipos de" -" ventas con procesos empresariales específicos. Encontrará la configuración " -"de los equipos de ventas en :menuselection:`Configuración --> Equipos de " -"venta`." -#: ../../content/applications/sales/crm/acquire_leads/generate_from_website.rst:3 -msgid "Generate leads/opportunities from your website contact page" -msgstr "Genere leads u oportunidades desde la página web de contacto" +#: ../../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 +#: ../../content/applications/sales/crm/acquire_leads/generate_leads.rst:25 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." +"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 "" -"Al automatizar la generación de leads y oportunidades mejorará su eficiencia" -" considerablemente. Cualquier visitante que use el formulario de contacto de" -" su sitio web, creará un lead/oportunidad en el flujo." -#: ../../content/applications/sales/crm/acquire_leads/generate_from_website.rst:10 -msgid "Use the contact us on your website" -msgstr "Use el \"contáctanos\" en su página web" - -#: ../../content/applications/sales/crm/acquire_leads/generate_from_website.rst:12 -msgid "You should first go to your website app." -msgstr "Primero debe ir a la página web de su aplicación" - -#: ../../content/applications/sales/crm/acquire_leads/generate_from_website.rst:14 -msgid "|image0|\\ |image1|" -msgstr "|image0|\\ |image1|" - -#: ../../content/applications/sales/crm/acquire_leads/generate_from_website.rst:16 +#: ../../content/applications/sales/crm/acquire_leads/generate_leads.rst:32 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." +"The Contact Form can be activated or deactivated at any time by going to " +":menuselection:`Website --> Go to Website --> Customize --> Contact Form`." msgstr "" -"Con la aplicación de CRM instalada, se beneficia de un formulario de " -"contacto listo pera usar desde su sitio web de Odoo que generará " -"leads/oportunidades automáticamente." -#: ../../content/applications/sales/crm/acquire_leads/generate_from_website.rst:23 +#: ../../content/applications/sales/crm/acquire_leads/generate_leads.rst:39 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*." +"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 "" -"Para cambiar el canal de ventas específico vaya a :menuselection:`Sitio web " -"--> Configuración --> Ajustes` en *Comunicación* encontrará la información " -"de formulario de contacto y dónde cambiar el *Canal de ventas* o *vendedor*." -#: ../../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" -msgstr "Cree un formulario de contacto personalizado" - -#: ../../content/applications/sales/crm/acquire_leads/generate_from_website.rst:34 +#: ../../content/applications/sales/crm/acquire_leads/generate_leads.rst:46 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.)" +"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 "" -"Es probable que quiera saber más sobre su visitante cuando use el formulario" -" de contacto, por lo que tendrá que construir un formulario de contacto " -"personalizado desde su sitio web. Estos formularios de contacto pueden " -"generar diferentes tipos de registro en el sistema (correos electrónicos, " -"leads/oportunidades, tareas del proyecto, tickets del servicio de " -"asistencia, etcétera) ." -#: ../../content/applications/sales/crm/acquire_leads/generate_from_website.rst:43 +#: ../../content/applications/sales/crm/acquire_leads/generate_leads.rst:55 +msgid "Customize Contact Forms" +msgstr "" + +#: ../../content/applications/sales/crm/acquire_leads/generate_leads.rst:57 msgid "" -"You will need to install the free *Form Builder* module, only available in " -"Odoo Enterprise." +"Contact Forms can be customized for the specific information your team " +"needs, using the free *Form Builder* module." msgstr "" -"Necesitará el módulo gratuito *Creador de formularios*, solo disponible en " -"Odoo Enterprise." -#: ../../content/applications/sales/crm/acquire_leads/generate_from_website.rst:52 +#: ../../content/applications/sales/crm/acquire_leads/generate_leads.rst:60 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." +"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 "" -"Primero, vaya a la página en donde quiera poner su formulario de contacto. " -"En el modo de edición arrastre el creador de formulario a la página y podrá " -"agregar todos los campos que desee." -#: ../../content/applications/sales/crm/acquire_leads/generate_from_website.rst:59 +#: ../../content/applications/sales/crm/acquire_leads/generate_leads.rst:68 msgid "" -"By default, any new contact form will send an email. You can switch to " -"lead/opportunity generation in *Change Form Parameters*." +"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 "" -"Por defecto, todo formulario de contacto nuevo enviará un correo " -"electrónico. Puede cambiarlo para que se genere un lead/oportunidad en " -"*cambiar los parámetros del formulario*." -#: ../../content/applications/sales/crm/acquire_leads/generate_from_website.rst:63 +#: ../../content/applications/sales/crm/acquire_leads/generate_leads.rst:73 +msgid "Edit Contact Form fields" +msgstr "" + +#: ../../content/applications/sales/crm/acquire_leads/generate_leads.rst:75 msgid "" -"If the same visitor uses the contact form twice, the second entry will be " -"added to the first lead/opportunity in the chatter." +"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 "" -"Si el mismo visitante usa el formulario de contacto dos veces, la segunda " -"entrada se agregará al primer lead/oportunidad en el chatter." -#: ../../content/applications/sales/crm/acquire_leads/generate_from_website.rst:67 -msgid "Generate leads instead of opportunities" -msgstr "Genere leads en lugar de oportunidades" - -#: ../../content/applications/sales/crm/acquire_leads/generate_from_website.rst:69 +#: ../../content/applications/sales/crm/acquire_leads/generate_leads.rst:78 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`." +":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_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_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_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 "" -"Al usar un formulario de contacto debe usar una etapa de calificación antes " -"de asignarle el formulario al vendedor correcto. Para hacerlo, active " -"*Leads* en los ajustes de CRM y refiérase a :doc:`convertir`." #: ../../content/applications/sales/crm/acquire_leads/lead_mining.rst:3 msgid "Lead mining" @@ -407,18 +418,12 @@ msgstr "" #: ../../content/applications/sales/crm/acquire_leads/lead_mining.rst:34 msgid "" -"When choosing to target Companied and their contacts you can choose the " +"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 "" -"Cuando elija enfocarse en una empresa y sus contactos, puede elegir los " -"contactos que va a recibir de acuerdo con su función o antigüedad. Al " -"recibir información de contacto asegúrese de las últimas regulaciones de la " -"UE, para más información sobre la Regulación general sobre la protección de " -"datos en `Reglamento General de Protección de Datos de Odoo " -"`__," #: ../../content/applications/sales/crm/acquire_leads/lead_mining.rst:39 msgid "" @@ -454,19 +459,12 @@ msgstr "Precios" 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 " +" 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 --> In-App Purchases --> View my" -" Services`." +"Credits`; or go to :menuselection:`Settings --> Contacts --> Odoo IAP --> " +"View my Services`." msgstr "" -"Esta es una función que debe comprar dentro de la aplicación y cada lead " -"generado le costará un crédito. Si elige obtener la información de contacto " -"cada contacto también le costará un crédito adicional. Aquí puede ver el " -"costo de esta `función `__. " -"Para comprar créditos puede ir a :menuselection:`CRM --> Configuración --> " -"Ajustes --> Comprar créditos` o puede ir a :menuselection:`Ajustes --> " -"Compras dentro de la aplicación --> Ver mis servicios`." #: ../../content/applications/sales/crm/acquire_leads/lead_mining.rst:65 msgid "" @@ -1125,89 +1123,88 @@ msgid ":doc:`../performance/win_loss`" msgstr ":doc:`../performance/win_loss`" #: ../../content/applications/sales/crm/pipeline/multi_sales_team.rst:3 -msgid "Manage multiple sales teams" -msgstr "Gestione varios equipos de ventas" +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*." +"Odoo lets you manage several sales teams, departments, or channels, each " +"with their own unique sales processes, using *Sales Teams*." msgstr "" -"En Odoo puede gestionar varios equipos de ventas, departamentos o canales " -"con procesos de venta específicos. Para hacerlo, usamos el concepto de " -"*Canal de ventas*." #: ../../content/applications/sales/crm/pipeline/multi_sales_team.rst:10 -msgid "Create a new sales channel" -msgstr "Crear un nuevo canal de ventas" +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`." +"To create a new Sales Team, go to :menuselection:`CRM --> Configuration --> " +"Sales Teams` then click **Create**." msgstr "" -"Para crear un nuevo *Canal de ventas* vaya a :menuselection:`Configuración " -"--> Canales de ventas`." -#: ../../content/applications/sales/crm/pipeline/multi_sales_team.rst:14 +#: ../../content/applications/sales/crm/pipeline/multi_sales_team.rst:15 msgid "" -"There you can set an email alias to it. Every message sent to that email " -"address will create a lead/opportunity." +"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 "" -"Desde ahí puede configurar un alias de correo electrónico. Cada mensaje que " -"se envíe a la dirección de correo creará un lead/oportunidad" -#: ../../content/applications/sales/crm/pipeline/multi_sales_team.rst:21 -msgid "Add members to your sales channel" -msgstr "Añada miembros a su canal de ventas" - -#: ../../content/applications/sales/crm/pipeline/multi_sales_team.rst:23 +#: ../../content/applications/sales/crm/pipeline/multi_sales_team.rst:19 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." +"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 "" -"Puede agregar miembros a cualquier canal para que vean la estructura del " -"flujo del canal de ventas antes de abrirlo. Cualquier lead/oportunidad que " -"se les asigne se vinculará al canal de ventas, por lo tanto, solo puede ser " -"miembro de un canal." #: ../../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 "" -"Así el gerente de equipo podrá realizar de manera más sencilla la revisión " -"del proceso." -#: ../../content/applications/sales/crm/pipeline/multi_sales_team.rst:33 +#: ../../content/applications/sales/crm/pipeline/multi_sales_team.rst:30 msgid "" -"If you now filter on this specific channel in your pipeline, you will find " -"all of its opportunities." +"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 "" -"Si ahora aplica filtros en el flujo de este canal en específico, podrá " -"encontrar todas las oportunidades." -#: ../../content/applications/sales/crm/pipeline/multi_sales_team.rst:40 -msgid "Sales channel dashboard" -msgstr "Tablero del Canal de ventas" +#: ../../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 "" -"Para ver las operaciones y los resultados de cualquier canal del ventas " -"fácilmente, el gerente también tiene acceso al *Tablero del canal de ventas*" -" si va a *Reportes*. " -#: ../../content/applications/sales/crm/pipeline/multi_sales_team.rst:46 +#: ../../content/applications/sales/crm/pipeline/multi_sales_team.rst:44 msgid "" -"It is shared with the whole ecosystem so every revenue stream is included in" -" it: Sales, eCommerce, PoS, etc." +"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 "" -"Se comparte con todo el entorno así que cada flujo de ganancias se incluye: " -"el de ventas, comercio electrónico, punto de venta, etcétera." #: ../../content/applications/sales/crm/track_leads.rst:5 msgid "Assign and track leads" @@ -1219,129 +1216,91 @@ msgstr "Asignar oportunidades basadas en puntuación" #: ../../content/applications/sales/crm/track_leads/lead_scoring.rst:5 msgid "" -"With *Leads Scoring* you can automatically rank your leads based on selected" -" criteria." +"*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 "" -"Con el *Puntaje de leads* puede clasificar sus leads automáticamente según " -"los criterios seleccionados." #: ../../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." +"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 "" -"Por ejemplo, puede puntuar a los clientes de su país mejor que a los que " -"visitaron páginas específicas de su sitio web." #: ../../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)." +"To use scoring, go to :menuselection:`Apps`, remove the :guilabel:`Apps` " +"filter, search for :guilabel:`Lead Scoring` and then install the module." msgstr "" -"Para usar el puntaje, instale el módulo gratis de *Puntaje de leads* que se " -"encuentra en la página de *Aplicaciones* (solo disponible en Odoo " -"Enterprise)." -#: ../../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 "Crear reglas de puntaje" -#: ../../content/applications/sales/crm/track_leads/lead_scoring.rst:23 +#: ../../content/applications/sales/crm/track_leads/lead_scoring.rst:24 msgid "" -"You now have a new tab in your *CRM* app called *Leads Management* where you" -" can manage your scoring rules." +"To manage scoring rules, go to :menuselection:`CRM --> Leads --> Scoring " +"Rules`." msgstr "" -"Ahora tiene una nueva pestaña en su app de *CRM* llamada *Gestión de leads* " -"donde puede gestionar sus reglas de puntaje." #: ../../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." +"Customize your rules to fit the needs of your business, and add as many " +"criteria as you want." msgstr "" -"Este es un ejemplo de un lead canadiense, puede modificarlo con cualquier " -"criterio que desee usar para puntuar sus leads. Puede agregar tantos " -"criterios como desee." -#: ../../content/applications/sales/crm/track_leads/lead_scoring.rst:33 +#: ../../content/applications/sales/crm/track_leads/lead_scoring.rst:32 msgid "" -"Every hour every lead without a score will be automatically scanned and " -"assigned their right score according to your scoring rules." +"Every hour, Odoo automatically assigns scores to new leads according to your" +" configured rules." msgstr "" -"Cada hora, cada oportunidad sin puntaje se escaneará automáticamente y se le" -" asignará su puntaje correcto de acuerdo con sus reglas de puntuación." -#: ../../content/applications/sales/crm/track_leads/lead_scoring.rst:40 +#: ../../content/applications/sales/crm/track_leads/lead_scoring.rst:39 msgid "Assign leads" msgstr "Asignar leads" -#: ../../content/applications/sales/crm/track_leads/lead_scoring.rst:42 +#: ../../content/applications/sales/crm/track_leads/lead_scoring.rst:41 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." +"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 "" -"Una vez que se calcule el puntaje, los leads se pueden asignar a equipos " -"específicos que usan el mismo mecanismo de dominio. Para lograrlo vaya a " -":menuselection:`CRM --> Gestión de leads --> Asignación de equipos` y " -"aplique un dominio específico en cada equipo. Este dominio puede incluir " -"puntajes." -#: ../../content/applications/sales/crm/track_leads/lead_scoring.rst:49 +#: ../../content/applications/sales/crm/track_leads/lead_scoring.rst:50 msgid "" -"Further on, you can assign to a specific vendor in the team with an even " -"more refined domain." +"Assign leads to specific salespeople using further refined Domains at " +":menuselection:`CRM --> Leads --> Leads Assignment`." msgstr "" -"Además, puede asignar a un vendedor específico con un dominio aún más " -"definido." -#: ../../content/applications/sales/crm/track_leads/lead_scoring.rst:52 +#: ../../content/applications/sales/crm/track_leads/lead_scoring.rst:57 msgid "" -"To do so go to :menuselection:`CRM --> Leads Management --> Leads " -"Assignation`." +"Odoo automatically assigns new leads to teams/salespeople once per day." msgstr "" -"Para lograrlo vaya a :menuselection:`CRM --> Gestión de leads --> Asignación" -" de leads`." -#: ../../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 "" -"El equipo y la asignación de leads asignarán las leads que no están " -"asignadas una vez al día." #: ../../content/applications/sales/crm/track_leads/lead_scoring.rst:62 -msgid "Evaluate & use the unassigned leads" -msgstr "Evaluar & usar los leads no asignados" +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." +"To view your unassigned leads, go to :menuselection:`CRM --> Leads --> " +"Leads` and select the Unassigned filter." msgstr "" -"Una vez que sus reglas de puntaje estén asignadas lo más seguro es que tenga" -" leads sin asignar. Algunos de estos leads todavía pueden convertirse en una" -" oportunidad, así que siempre es útil hacer algo con ellos." -#: ../../content/applications/sales/crm/track_leads/lead_scoring.rst:68 +#: ../../content/applications/sales/crm/track_leads/lead_scoring.rst:72 msgid "" -"In your leads page you can place a filter to find your unassigned leads." +"You can also find unassigned leads and create re-engagement campaigns using " +"the :guilabel:`Email Marketing` or :guilabel:`Marketing Automation` apps." msgstr "" -"En su página de iniciativas puede poner un filtro para encontrar sus " -"clientes potenciales no asignados." - -#: ../../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." -msgstr "" -"¿Por qué no usa las aplicaciones de :menuselection:`Marketing por correo " -"electrónico` o :menuselection:`Automatización de marketing` para enviarles " -"correos masivos? También puede encontrar fácilmente leads sin asignar desde " -"aquí." #: ../../content/applications/sales/crm/track_leads/prospect_visits.rst:3 msgid "Track your prospects visits" @@ -2227,17 +2186,15 @@ 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." +"Go to the :guilabel:`Details` tab and click on :guilabel:`Export` Select " +"X.509 in base 64 and save it." msgstr "" -"Vaya a la pestaña de *Detalles* y haga clic en **Copiar al archivo**. " -"Seleccione X.509 con base 64 y guárdelos." -#: ../../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 "Importe el certificado autofirmado a Windows (usando Chrome)" -#: ../../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`" @@ -2245,21 +2202,17 @@ msgstr "" "En su navegador Chrome, vaya a :menuselection:`Ajustes --> Privacidad y " "seguridad --> Seguridad --> Gestionar certificados`" -#: ../../content/applications/sales/point_of_sale/overview/epos_ssc.rst:80 +#: ../../content/applications/sales/point_of_sale/overview/epos_ssc.rst:79 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." +"Go to the :guilabel:`Authorities` tab and click on :guilabel:`Import` and " +"select your previous file. Accept all warnings and restart your browser." msgstr "" -"Vaya a la pestaña de *Entidades de certificación raíz de confianza* y haga " -"clic en **Importar** y seleccione su archivo previo. Acepte todas las " -"advertencias y vuelva a iniciar su navegador." -#: ../../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 "Importe el certificado autofirmado a su dispositivo Android" -#: ../../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 " @@ -2301,11 +2254,9 @@ msgstr "Ponga productos disponibles en el PdV" #: ../../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*." +" Products --> Products` and open a product. In the *Point of Sale* tab, " +"enable *Available in Point of Sale*." msgstr "" -"Para hacer productos disponibles para la venta, vaya a :menuselection:`Punto" -" de venta --> Productos --> Productos`" #: ../../content/applications/sales/point_of_sale/overview/getting_started.rst:28 msgid "You can also define if the product has to be weighted or not." @@ -2577,9 +2528,146 @@ msgstr "" msgid "Payment Terminals" msgstr "Terminales de pago" +#: ../../content/applications/sales/point_of_sale/payment/adyen.rst:3 +msgid "Adyen" +msgstr "Adyen" + +#: ../../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 "Configure el método de pago" + +#: ../../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 "Añadir un nuevo método de pago" + +#: ../../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 "Pagar con una terminal de pago" + +#: ../../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" -msgstr "Conecte una terminal de pago Ingenico a su PdV" +msgid "Ingenico" +msgstr "Ingenico" #: ../../content/applications/sales/point_of_sale/payment/ingenico.rst:5 #: ../../content/applications/sales/point_of_sale/payment/worldline.rst:5 @@ -2639,11 +2727,6 @@ msgstr "" "termine, vaya al formulario de su *caja IoT* en Odoo y verifique que la " "terminal se encontró." -#: ../../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 "Configure el método de pago" - #: ../../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 " @@ -2664,11 +2747,6 @@ msgstr "" "nuevo método de pago para Ingenico, seleccione la opción de terminal de pago" " Ingenico y seleccione su dispositivo de terminal de pago" -#: ../../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 "Pagar con una terminal de pago" - #: ../../content/applications/sales/point_of_sale/payment/ingenico.rst:55 msgid "" "In your *PoS interface*, when processing a payment, select a *Payment " @@ -2717,8 +2795,8 @@ msgstr "" "el ID de la transacción en el registro del pago." #: ../../content/applications/sales/point_of_sale/payment/six.rst:3 -msgid "Connect a SIX Payment Terminal to your PoS" -msgstr "Conecte una terminal de pago SIX a su PdV" +msgid "SIX" +msgstr "SIX" #: ../../content/applications/sales/point_of_sale/payment/six.rst:5 msgid "" @@ -2730,6 +2808,12 @@ 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 " @@ -2740,77 +2824,58 @@ msgstr "" " por esto que las terminales recibidas desde Worldline no son compatibles " "con esta integración." -#: ../../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 "Configure el método de pago" -#: ../../content/applications/sales/point_of_sale/payment/six.rst:20 +#: ../../content/applications/sales/point_of_sale/payment/six.rst:21 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\"." +"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 "" -"Primero, asegúrese que el módulo de PdV de SIX está instalado. Para esto, " -"vaya a *Aplicaciones*, quite el filtro de \"Aplicaciones\" y busque \"PdV " -"Six\"." -#: ../../content/applications/sales/point_of_sale/payment/six.rst:26 +#: ../../content/applications/sales/point_of_sale/payment/six.rst:28 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." +"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 "" -"En :menuselection:`Punto de venta --> Configuración --> Métodos de pago`, " -"cree un nuevo método de pago para SIX, seleccione el diario adecuado, " -"seleccione *SIX* en el campo **Use una terminal de pago**, después ingrese " -"la dirección IP de su terminal de pago." -#: ../../content/applications/sales/point_of_sale/payment/six.rst:31 -msgid "The journal's type must be *bank* to select a payment terminal." -msgstr "" -"El tipo de diario debe ser *banco* para que pueda seleccionar una terminal " -"de pago." - -#: ../../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 "Pague con una terminal de pago" -#: ../../content/applications/sales/point_of_sale/payment/six.rst:36 +#: ../../content/applications/sales/point_of_sale/payment/six.rst:39 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." +"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 "" -"Al procesar un pago en la interfaz de PdV seleccione un método de pago con " -"una terminal. Revise la cantidad en la columna emitida sea la misma que " -"tiene que enviarse a la terminal de pago y haga clic en *Enviar*. Si quiere " -"cancelar la solicitud de pago, haga clic en cancelar." -#: ../../content/applications/sales/point_of_sale/payment/six.rst:44 +#: ../../content/applications/sales/point_of_sale/payment/six.rst:48 msgid "" -"When the payment is done, the status will change to *Payment Successful*. " -"You can always reverse the last transaction by clicking on *Reverse*." +"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 "" -"Cuando el pago se realice, el estado cambiará a *Pago exitoso*. Siempre " -"puede revertir la última transacción si hace clic en *Revertir*." -#: ../../content/applications/sales/point_of_sale/payment/six.rst:51 +#: ../../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 *Force Done*. This will allow you to validate the order in" -" Odoo even if the connection between the terminal and Odoo encounters " -"issues." +"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 "" -"Si hay un problema con la terminal de pago, puede forzar el pago si usa " -"*Forzar listo*. Esto le permitirá validar la orden en Odoo incluso si la " -"conexión entre la terminal y Odoo tiene problemas." #: ../../content/applications/sales/point_of_sale/payment/vantiv.rst:3 -msgid "Connect a Vantiv Payment Terminal to your PoS" -msgstr "Conecte una terminal de pago Vantiv a su PdV" +msgid "Vantiv" +msgstr "" #: ../../content/applications/sales/point_of_sale/payment/vantiv.rst:5 msgid "" @@ -2867,8 +2932,8 @@ msgstr "" "Vantiv y... eso es todo." #: ../../content/applications/sales/point_of_sale/payment/worldline.rst:3 -msgid "Connect a Worldline Payment Terminal to the PoS" -msgstr "Conecte una terminal de pago Worldline a su PdV" +msgid "Worldline" +msgstr "Worldline" #: ../../content/applications/sales/point_of_sale/payment/worldline.rst:9 msgid "Please note that Worldline is currently only available in Belgium." @@ -3568,103 +3633,6 @@ msgstr "" "producto se agregará, puede escanear el mismo producto para agregarlo varias" " veces o cambiar la cantidad manualmente en la pantalla." -#: ../../content/applications/sales/point_of_sale/shop/cash_control.rst:3 -msgid "Set-up Cash Control in Point of Sale" -msgstr "Configurar control de efectivo en Punto de venta" - -#: ../../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 "" -"El control de efectivo le permite verificar el importe de la caja de " -"efectivo en la apertura y el cierre. Así puede asegurarse de que no se ha " -"cometido ningún error y no falta efectivo." - -#: ../../content/applications/sales/point_of_sale/shop/cash_control.rst:10 -msgid "Activate Cash Control" -msgstr "Activar el control de efectivo" - -#: ../../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 "" -"Para activar la función de *Control de efectivo*, vaya a :menuselection: " -"`Punto de venta -> Configuración -> Punto de venta` y seleccione su interfaz" -" de PdV." - -#: ../../content/applications/sales/point_of_sale/shop/cash_control.rst:16 -msgid "Under the payments category, you will find the cash control setting." -msgstr "En la categoría de pagos encontrará el ajuste de control de efectivo." - -#: ../../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 "" -"En este ejemplo, puede ver que quiero tener $275 en varias denominaciones en" -" la apertura y el cierre." - -#: ../../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 "" -"Podrá crear esos valores al hacer clic en **Valores de apertura y cierre**." - -#: ../../content/applications/sales/point_of_sale/shop/cash_control.rst:31 -msgid "Start a session" -msgstr "Iniciar una sesion" - -#: ../../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 "" -"Ahora tiene un nuevo botón cuando abre una sesión: *Establecer balance de " -"apertura*" - -#: ../../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 "" -"De forma predeterminada, utilizará los valores que agregó anteriormente, " -"pero siempre puede modificarlo." - -#: ../../content/applications/sales/point_of_sale/shop/cash_control.rst:46 -msgid "Close a session" -msgstr "Cerrar una sesión" - -#: ../../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 "" -"Para cerrar su sesión también tiene un botón de *Establecer balance de " -"cierre*." - -#: ../../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 "" -"Posteriormente, puede ver el balance teórico, el balance de cierre real (lo " -"que acaba de contar) y la diferencia entre ambos." - -#: ../../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 "" -"Si usa la opción de *Sacar dinero* para realizar sus transacciones para esta" -" sesión, ahora tiene una diferencia de suma cero y el mismo balance de " -"cierre que su saldo de apertura. Su caja de efectivo está lista para la " -"próxima sesión." - #: ../../content/applications/sales/point_of_sale/shop/cash_rounding.rst:3 msgid "Cash Rounding" msgstr "Redondeo de efectivo" @@ -3997,6 +3965,147 @@ msgstr "" msgid "When you use it, you can then reprint your last receipt." msgstr "Cuando lo use, podrá volver a imprimir su último recibo." +#: ../../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 "Puede:" + +#: ../../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 "Alquiler" @@ -4551,12 +4660,14 @@ msgid "Amazon.nl" msgstr "Amazon.nl" #: ../../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 ":doc:`setup`" #: ../../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 ":doc:`manage`" @@ -4664,15 +4775,36 @@ msgstr "" #: ../../content/applications/sales/sales/amazon_connector/manage.rst:45 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 "" +"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 "" +"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 "" ":doc:`../../../inventory_and_mrp/inventory/shipping/setup/third_party_shipper`" -#: ../../content/applications/sales/sales/amazon_connector/manage.rst:48 +#: ../../content/applications/sales/sales/amazon_connector/manage.rst:57 msgid "Follow deliveries in FBA" msgstr "Seguimiento de entregas en FBA" -#: ../../content/applications/sales/sales/amazon_connector/manage.rst:50 +#: ../../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 " @@ -4691,7 +4823,7 @@ msgstr "" " existencias en los almacenes de Amazon y le permite gestionar las " "existencias de sus productos en el programa FBA." -#: ../../content/applications/sales/sales/amazon_connector/manage.rst:57 +#: ../../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 " @@ -4702,7 +4834,7 @@ msgstr "" "reabastecimiento automatizado desde las reglas de reordenamiento en la " "ubicación de Amazon." -#: ../../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" @@ -4722,11 +4854,11 @@ msgstr "" "mercados, excepto el que desea aislar de los demás. Por último, asigne otra " "ubicación de existencias al segundo registro de su cuenta." -#: ../../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 "Emitir facturas y registrar pagos" -#: ../../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 " @@ -4737,7 +4869,7 @@ msgstr "" "por lotes en la vista de lista de las órdenes. Posteriormente, confirme y " "envíe las facturas a sus clientes." -#: ../../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." @@ -4745,7 +4877,7 @@ msgstr "" "Para mostrar solo órdenes relacionadas con Amazon en la vista de lista, " "puede filtrar las órdenes según los equipos de ventas." -#: ../../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 " @@ -4763,11 +4895,11 @@ msgstr "" "registre sus estados de cuenta bancarios en Odoo, simplemente acredite la " "cuenta intermediaria de Amazon por el importe recibido." -#: ../../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 "Seguir sus ventas de Amazon en los reportes de ventas" -#: ../../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 " @@ -4779,7 +4911,7 @@ msgstr "" " unos clics con los reportes de Ventas. De forma predeterminada, su equipo " "de ventas de la cuenta se comparte entre todas las cuentas de su empresa." -#: ../../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." @@ -4787,7 +4919,7 @@ msgstr "" "Si así lo desea, puede cambiar el equipo de venta de su cuenta por otro para" " realizar un reporte separado de las ventas de esta cuenta." -#: ../../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 " @@ -4802,8 +4934,9 @@ msgstr "" "y elimine todos los mercados, excepto el aislado de los demás. Por último, " "asigne otro equipo de ventas a uno de los dos registros de su cuenta." -#: ../../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 ":doc:`features`" @@ -4812,154 +4945,49 @@ msgid "Configure Amazon Connector in Odoo" msgstr "Configurar el conector de Amazon con Odoo" #: ../../content/applications/sales/sales/amazon_connector/setup.rst:6 -msgid "Generate an Authorization Token in Seller Central" -msgstr "Generar un token de autorización en la central de vendedor" - -#: ../../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 "" -"El conector de Amazon utiliza un token de autorización que permite a Odoo " -"obtener los datos de su cuenta de la Central de vendedor de Amazon. Puede " -"obtener este token directamente en su Central de vendedor en tan solo unos " -"clics y se necesita configurar en su base de datos de Odoo." - -#: ../../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 "" -"Conecte su cuenta de Central de vendedor para el mercado para el que se " -"registró inicialmente (por ejemplo, si creó su cuenta en Amazon Alemania, " -"ingrese a la `Central de vendedor de Amazon para Alemania " -"`_) con una cuenta de administrador.." - -#: ../../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 "" -"Tal vez necesite usar la cuenta de administrador *principal* (o la primera) " -"y no una que se agregó después." - -#: ../../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 "" -"En el menú principal, seleccione :menuselection:`Aplicaciones y servicios " -"--> Gestionar sus aplicaciones`. En la ventana que aparece, haga clic en el " -"botón ``Autorizar nuevo desarrollador``:" - -#: ../../content/applications/sales/sales/amazon_connector/setup.rst:28 -msgid "Fill in the form depending on your Marketplace:" -msgstr "Complete el formulario según su mercado:" - -#: ../../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 "" -"Si su cuenta de vendedor se registró en la región de **Norteamérica**, " -"utilice estos valores:" - -#: ../../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 "Nombre de desarrollador: ``Odoo S.A.``" - -#: ../../content/applications/sales/sales/amazon_connector/setup.rst:36 -msgid "Developer ID: ``586127723692``" -msgstr "ID de desarrollador: ``586127723692``" - -#: ../../content/applications/sales/sales/amazon_connector/setup.rst:38 -msgid "For the **Europe** region, use these values:" -msgstr "Para la región de **Europa**, utilice estos valores:" - -#: ../../content/applications/sales/sales/amazon_connector/setup.rst:41 -msgid "Developer ID: ``579095187166``" -msgstr "ID de desarrollador: ``579095187166``" - -#: ../../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 "" -"Amazon le informará que, al enviar el formulario, está dando a Odoo S.A " -"acceso a su información de la Central de vendedor." - -#: ../../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 "" -"Odoo S.A. no puede acceder a la información de su cuenta de Amazon sin el " -"token de autorización que se almacena en su base de datos de Odoo. No " -"almacenamos estos tokens en nuestra plataforma directamente y, por lo tanto," -" no podemos acceder a la información de su cuenta fuera de los flujos " -"normales del conector de Amazon." - -#: ../../content/applications/sales/sales/amazon_connector/setup.rst:53 msgid "Register your Amazon account in Odoo" msgstr "Registrar su cuenta de Amazon en Odoo" -#: ../../content/applications/sales/sales/amazon_connector/setup.rst:57 +#: ../../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 **CREATE**." +"Accounts` and click on :guilabel:`CREATE`." msgstr "" -"Para registrar su cuenta de vendedor en Odoo, vaya a :menuselection:`Ventas " -"--> Configuración --> Ajustes --> Conectores --> Sincronización de Amazon " -"--> Cuentas de Amazon` y haga clic en **CREAR**." -#: ../../content/applications/sales/sales/amazon_connector/setup.rst:60 +#: ../../content/applications/sales/sales/amazon_connector/setup.rst:13 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 " -"`." +"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 "" -"Puede encontrar el **ID de vendedor** en la Central de vendedor en el enlace" -" **Su token de comerciante** en la página de **Información de cuenta de " -"vendedor**. El **token de autorización** es el que generó en el :ref:`paso " -"anterior `." -#: ../../content/applications/sales/sales/amazon_connector/setup.rst:64 +#: ../../content/applications/sales/sales/amazon_connector/setup.rst:17 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." +"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 "" -"Al guardar, se comprueban sus credenciales. En caso de tener algún problema," -" se mostrará un error: la información no se puede guardar hasta que Amazon " -"reconozca sus credenciales." -#: ../../content/applications/sales/sales/amazon_connector/setup.rst:67 +#: ../../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:23 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." +"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 "" -"Una vez que se registre la cuenta, los mercados disponibles para esta cuenta" -" se sincronizan y aparecen en la pestaña de **Mercados**. Si lo desea, puede" -" eliminar algunos elementos de la lista de mercados sincronizados para " -"deshabilitar su sincronización." -#: ../../content/applications/sales/sales/amazon_connector/setup.rst:72 +#: ../../content/applications/sales/sales/amazon_connector/setup.rst:28 msgid "Match database products in Amazon" msgstr "Coincidir productos de la base de datos con Odoo" -#: ../../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 " @@ -4971,7 +4999,7 @@ msgstr "" "el producto de mercado, uno para los costos de envío (si los hay) y uno para" " los costos de envoltura de regalo (si los hay)." -#: ../../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, " @@ -4983,7 +5011,7 @@ msgstr "" " de los artículos del mercado, el **código de envío** para los costos de " "envío y el código de **envoltura de regalo** para los costos de envoltura." -#: ../../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 " @@ -4998,7 +5026,7 @@ msgstr "" " subsecuentes. Si no se encuentra ninguna oferta que coincida con un SKU, " ":ref:`se utiliza la referencia interna en su lugar `." -#: ../../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" @@ -5012,7 +5040,7 @@ msgstr "" "automática. Esto es útil si no utiliza la referencia interna como el SKU o " "si vende el producto bajo condiciones distintas." -#: ../../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** " @@ -5025,7 +5053,7 @@ msgstr "" " pasa con el producto **Envío de Amazon** predeterminado y el código de " "envío." -#: ../../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 " @@ -5036,11 +5064,11 @@ msgstr "" "Configuración --> Ajustes --> Conectores --> Sincronización de Amazon --> " "Productos predeterminados`." -#: ../../content/applications/sales/sales/amazon_connector/setup.rst:105 +#: ../../content/applications/sales/sales/amazon_connector/setup.rst:61 msgid "Configure taxes of products" msgstr "Configurar los impuestos de los productos" -#: ../../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 " @@ -5055,7 +5083,7 @@ msgstr "" "productos en Odoo o haberlo hecho con una posición fiscal para evitar " "discrepancias en los subtotales entre la Centra de vendedor y Odoo." -#: ../../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 " @@ -5067,46 +5095,34 @@ msgstr "" "Central de vendedor por algunos centavos. Esas diferencias se pueden " "resolver con una cancelación al conciliar los pagos en Odoo." -#: ../../content/applications/sales/sales/amazon_connector/setup.rst:120 +#: ../../content/applications/sales/sales/amazon_connector/setup.rst:76 msgid "Add an unsupported marketplace" msgstr "Agregar un mercado no compatible" -#: ../../content/applications/sales/sales/amazon_connector/setup.rst:122 +#: ../../content/applications/sales/sales/amazon_connector/setup.rst:78 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." +"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 "" -"Algunos mercados de Amazon, como Amazon Brasil, no son compatibles con Odoo " -"pero sí pueden ser compatibles con su cuenta de vendedor. Puede agregar " -"estos mercados de forma manual si desea usarlos. Consulte :ref:`este " -"documento` para ver la lista completa de " -"mercados compatibles de forma nativa." -#: ../../content/applications/sales/sales/amazon_connector/setup.rst:128 +#: ../../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." +"Documentation `_. The marketplace must belong to the " +"same region as that of your seller account." msgstr "" -"Para descubrir si un mercado es compatible, revise la `documentación de " -"Amazon " -"`_." -" El mercado debe pertenecer a la misma región que su cuenta de vendedor." -#: ../../content/applications/sales/sales/amazon_connector/setup.rst:132 +#: ../../content/applications/sales/sales/amazon_connector/setup.rst:88 msgid "" -"To add a new marketplace, you must first activate the :ref:`developer mode " -"`." +"To add a new marketplace, activate the :ref:`developer mode `." msgstr "" -"Para activar un nuevo mercado, primero debe activar el :ref:`modo de " -"desarrollador `." -#: ../../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`." @@ -5114,54 +5130,39 @@ msgstr "" "Una vez hecho esto, vaya a :menuselection:`Ventas --> Configuración --> " "Ajustes --> Conectores --> Sincronización de Amazon --> Mercados de Amazon`." -#: ../../content/applications/sales/sales/amazon_connector/setup.rst:137 +#: ../../content/applications/sales/sales/amazon_connector/setup.rst:93 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 " -"`_." +"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 "" -"Ahí puede crear un nuevo registro de mercado. Necesitará el ID del mercado y" -" el Punto final de comunicación de su mercado, como se describe en la " -"`documentación de Amazon " -"`_." -#: ../../content/applications/sales/sales/amazon_connector/setup.rst:141 +#: ../../content/applications/sales/sales/amazon_connector/setup.rst:99 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." +"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 "" -"Establezca el nombre del registro como ``Amazon.`` para recuperarlo " -"con facilidad (for ejemplo: ``Amazon.se``). Los campos **Código**, " -"**Dominio** e **Identificador API** deben contener respectivamente los " -"valores de *código de país*, *punto final de comunicación de Amazon MWS* y " -"*ID de mercado* de la documentación de Amazon." -#: ../../content/applications/sales/sales/amazon_connector/setup.rst:145 +#: ../../content/applications/sales/sales/amazon_connector/setup.rst:104 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." +"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 "" -"Una vez que guarde el mercado, debe actualizar la configuración de la cuenta" -" de Amazon en :menuselection:`Ventas --> Configuración --> Ajustes --> " -"Conectores --> Sincronización de Amazon --> Cuentas de Amazon`, abra la " -"cuenta en la que desea utilizar el nuevo mercado, vaya a la pestaña de " -"**Mercados** y haga clic en **Actualizar mercados disponibles** (una " -"animación debe confirmar que la operación tuvo éxito). Los mercados " -"agregados recientemente se agregan a la lista de mercados sincronizados. Si " -"el nuevo mercado no se agrega a la lista, significa que no es compatible o " -"que no está disponible para su cuenta de vendedor." -#: ../../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 " @@ -5172,6 +5173,107 @@ msgstr "" "anteriormente funcionará, tampoco se puede considerar como un bug al " "contactar al soporte de Odoo." +#: ../../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 "Actualizar Odoo a la versión más reciente" + +#: ../../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 "" +"Si utiliza Odoo en Odoo.com o en una plataforma de Odoo.sh, su código ya " +"está actualizado y puede pasar al siguiente paso." + +#: ../../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 "" +"Si utiliza Odoo en una configuración local o a través de un partner, debe " +"actualizar su instalación como se indica en :doc:`esta página de " +"documentación ` o al contactar a su partner" +" de integración." + +#: ../../content/applications/sales/sales/amazon_connector/update.rst:31 +msgid "Update the list of available modules" +msgstr "Actualizar la lista de módulos disponibles" + +#: ../../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 "Conector de eBay" @@ -6399,16 +6501,10 @@ msgstr "Cómo adaptar tus precios a tus clientes y aplicar descuentos." 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 " +"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 "" -"Odoo cuenta con la gran función de lista de precios, la cual permite " -"establecer una estrategia de precios adaptada a su negocio. Una lista de " -"precios es un conjunto de reglas de precios que Odoo utiliza para determinar" -" el precio a sugerir. Puede establecer varios criterios para utilizar un " -"precio específico: periodos, cantidad mínima vendida (si se cumple una " -"cantidad mínima en la orden, se obtendrá un descuento en el precio), etc." #: ../../content/applications/sales/sales/products_prices/prices/pricing.rst:9 msgid "" @@ -7909,18 +8005,10 @@ msgstr "" " el vencimiento de la cotización." #: ../../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 "" -"En cada plantilla podrá especificar descuentos si se activa la opción en los" -" ajustes de la aplicación de **Ventas**." - -#: ../../content/applications/sales/sales/send_quotations/quote_template.rst:46 msgid "Design your template" msgstr "Diseñe su plantilla" -#: ../../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 " @@ -7934,7 +8022,7 @@ msgstr "" "Para hacerlo, puede hacer clic en **Editar** y regresará al Generador de " "cotizaciones." -#: ../../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 " @@ -7944,15 +8032,15 @@ msgstr "" "creación para organizar su cotización. Por ejemplo, puede agregar un bloque " "de contenido para describir sus productos." -#: ../../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 "Utiliza una plantilla de cotización" -#: ../../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 "Cuando cree una cotización, puede escoger una plantilla específica." -#: ../../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." @@ -7960,11 +8048,11 @@ msgstr "" "Puede seleccionar cualquier plantilla de su elección y sugerirla como " "plantilla predeterminada en los ajustes de la aplicación de **Ventas**." -#: ../../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 "Confirmar la cotización" -#: ../../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" @@ -7974,7 +8062,7 @@ msgstr "" "clientes firmen de manera electrónica o paguen en línea. Puede activar estas" " dos opciones directamente en la misma plantilla de cotización. " -#: ../../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." @@ -7982,12 +8070,12 @@ msgstr "" "Ahora cada cotización tendrá esa configuración, aunque siempre puede " "cambiarla." -#: ../../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 ":doc:`get_signature_to_validate`" -#: ../../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 ":doc:`get_paid_to_validate`" diff --git a/locale/es/LC_MESSAGES/services.po b/locale/es/LC_MESSAGES/services.po index 3bd30a73f..bbcfd0dd3 100644 --- a/locale/es/LC_MESSAGES/services.po +++ b/locale/es/LC_MESSAGES/services.po @@ -19,7 +19,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: 2021-11-02 08:49+0000\n" "Last-Translator: Lucia Pacheco , 2022\n" "Language-Team: Spanish (https://www.transifex.com/odoo/teams/41243/es/)\n" @@ -1226,6 +1226,7 @@ msgid ":doc:`reinvoice_from_project`" msgstr ":doc:`reinvoice_from_project`" #: ../../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 "" @@ -1239,54 +1240,150 @@ 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." +"The :guilabel:`Timesheet on Ticket` integration provides more control and " +"transparency over how clients are charged, and what they're specifically " +"billed for." msgstr "" -"Extraiga directamente el tiempo facturable que ha rastreado en sus tickets " -"del servicio de asistencia en los pedidos de venta y las facturas a través " -"de una tarea del proyecto. De este modo, tendrá más control sobre lo que " -"cobra a su cliente y será más eficiente." -#: ../../content/applications/services/helpdesk/timesheet_and_invoice/reinvoice_from_project.rst:10 +#: ../../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 "Configuration" msgstr "Configuración" -#: ../../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*." -msgstr "" -"Vaya a :menuselection:`Helpdesk --> Configuración --> Equipo de Helpdesk -->" -" Editar` y active las opciones *Hoja de tiempo en el ticket* y " -"*Refacturación de tiempo*." - #: ../../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*." +"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 "" -"En *Hoja de tiempo en el ticket*, elija el *Proyecto* al que se vincularán " -"por defecto los tickets (y las hojas de tiempo). Abra su *Enlace externo* " -"para habilitar la función *Factura desde las tareas*." -#: ../../content/applications/services/helpdesk/timesheet_and_invoice/reinvoice_from_project.rst:22 -msgid "Create a sales order and an invoice" -msgstr "Crear un pedido de venta y una factura" - -#: ../../content/applications/services/helpdesk/timesheet_and_invoice/reinvoice_from_project.rst:24 +#: ../../content/applications/services/helpdesk/timesheet_and_invoice/reinvoice_from_project.rst:20 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." +"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 "" -"Una vez que haya registrado el tiempo dedicado en el ticket de servicio de " -"asistencia, en la pestaña de *hojas de horas*, puede acceder fácilmente a la" -" tarea al hacer clic en su nombre." -#: ../../content/applications/services/helpdesk/timesheet_and_invoice/reinvoice_from_project.rst:31 -msgid "*Create Sales Order* and proceed to create the invoice." -msgstr "*Crear Pedido de Venta* y proceder a crear la factura." +#: ../../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: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 msgid "Project" diff --git a/locale/es/LC_MESSAGES/sphinx.po b/locale/es/LC_MESSAGES/sphinx.po index f917b3950..bffd879e7 100644 --- a/locale/es/LC_MESSAGES/sphinx.po +++ b/locale/es/LC_MESSAGES/sphinx.po @@ -5,18 +5,18 @@ # # Translators: # Lucia Pacheco , 2022 -# Martin Trigaux, 2022 # Braulio D. López Vázquez , 2022 # Patricia Gutiérrez Capetillo , 2022 +# Martin Trigaux, 2022 # #, fuzzy 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: 2022-03-18 15:03+0000\n" -"Last-Translator: Patricia Gutiérrez Capetillo , 2022\n" +"Last-Translator: Martin Trigaux, 2022\n" "Language-Team: Spanish (https://www.transifex.com/odoo/teams/41243/es/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -36,7 +36,7 @@ msgstr "Contactar a soporte" msgid "Ask the Odoo Community" msgstr "Pregúntele a la comunidad de Odoo" -#: ../../extensions/odoo_theme/layout_templates/header.html:11 +#: ../../extensions/odoo_theme/layout_templates/header.html:10 msgid "Try Odoo for FREE" msgstr "Pruebe Odoo GRATIS" @@ -153,10 +153,14 @@ msgstr "" "directrices para ayudarlo a mejorar Odoo." #: ../../extensions/odoo_theme/layout_templates/homepage.html:102 -msgid "Write documentation" -msgstr "Escribir documentación" +msgid "Coding guidelines" +msgstr "" #: ../../extensions/odoo_theme/layout_templates/homepage.html:107 +msgid "Documentation" +msgstr "Documentación" + +#: ../../extensions/odoo_theme/layout_templates/homepage.html:112 msgid "Content guidelines" msgstr "Directrices de contenido" diff --git a/locale/es/LC_MESSAGES/websites.po b/locale/es/LC_MESSAGES/websites.po index 36ea7aba1..7d850ae2e 100644 --- a/locale/es/LC_MESSAGES/websites.po +++ b/locale/es/LC_MESSAGES/websites.po @@ -5,10 +5,10 @@ # # Translators: # Paloma Yazmin Reyes Morales , 2022 +# Nicole Kist , 2022 # Juan Carlos Daniel Fernandez , 2022 # Nicolás Broggi , 2022 # Carolina Gonzalez , 2022 -# Nicole Kist , 2022 # Pablo Rojas , 2022 # Francisco de la Peña , 2022 # jabelchi, 2022 @@ -19,20 +19,20 @@ # Leonardo J. Caballero G. , 2022 # Raquel Iciarte , 2022 # Jesús Alan Ramos Rodríguez , 2022 -# Martin Trigaux, 2022 # Alejandro Die Sanchis , 2022 # Braulio D. López Vázquez , 2022 # Marian Cuadra, 2022 # Patricia Gutiérrez Capetillo , 2022 +# Martin Trigaux, 2022 # #, fuzzy 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: 2022-03-18 15:03+0000\n" -"Last-Translator: Patricia Gutiérrez Capetillo , 2022\n" +"Last-Translator: Martin Trigaux, 2022\n" "Language-Team: Spanish (https://www.transifex.com/odoo/teams/41243/es/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -71,12 +71,16 @@ msgstr "" " ``www.example.com`` en lugar de la predeterminada, ``example.odoo.com``." #: ../../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 "" "`Tutoriales de Odoo: Sitio web `_" -#: ../../content/applications/websites/ecommerce.rst:20 +#: ../../content/applications/websites/ecommerce.rst:21 #: ../../content/applications/websites/website.rst:21 msgid "" "`Odoo Tutorials: eCommerce `_" @@ -464,104 +468,98 @@ msgid "Maximize my revenue" msgstr "Maximizar mis ganancias" #: ../../content/applications/websites/ecommerce/maximizing_revenue/cross_selling.rst:3 -msgid "How to sell accessories and optional products (cross-selling)" -msgstr "Cómo vender accesorios y productos opcionales (venta cruzada)" +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:" +"Any sales process is an opportunity to maximize revenues. For example, with " +"an extended warranty or some accessories." msgstr "" -"Usted vende computadoras, ¿por qué no estimular a sus clientes para que " -"compren una pantalla de primera categoría o adquieran una garantía extra? " -"Ese es el objetivo de las funcionalidades de venta cruzada:" #: ../../content/applications/websites/ecommerce/maximizing_revenue/cross_selling.rst:8 -msgid "Accessory products on checkout page," -msgstr "Accesorios en la página de pago," - -#: ../../content/applications/websites/ecommerce/maximizing_revenue/cross_selling.rst:9 msgid "" -"Optional products on a new *Add to Cart* screen (not installed by default)." +"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 "" -"Productos opcionales en una nueva ventana *Añadir a la compra* (no está " -"instalado por defecto)." #: ../../content/applications/websites/ecommerce/maximizing_revenue/cross_selling.rst:12 -msgid "Accessory products when checking out" -msgstr "Accesorios al pagar" +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." +":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 "" -"Los accesorios (por ejemplo para computadoras: el ratón, el teclado) " -"aparecen cuando el cliente revisa el carrito de compra antes de hacer el " -"pago." #: ../../content/applications/websites/ecommerce/maximizing_revenue/cross_selling.rst:20 -msgid "Select accessories in the *Sales* tab of the product detail page." -msgstr "" -"Seleccione accesorios en la pestaña *Ventas* de la página de detalles del " -"producto." +msgid "Accessory Products" +msgstr "Productos de accesorio" -#: ../../content/applications/websites/ecommerce/maximizing_revenue/cross_selling.rst:26 +#: ../../content/applications/websites/ecommerce/maximizing_revenue/cross_selling.rst:22 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." +"**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 "" -"Existe un algoritmo para resolver cuál es el mejor accesorio para mostrar en" -" caso de que se agreguen varios artículos al carrito de compra. Si algún " -"artículo es el accesorio de varios productos agregados a la cesta de compra," -" es muy probable que se ubique en los primeros lugares de la lista de " -"accesorios sugeridos." -#: ../../content/applications/websites/ecommerce/maximizing_revenue/cross_selling.rst:31 -msgid "Optional products when adding to cart" -msgstr "Productos opcionales al agregar al carrito de compra" - -#: ../../content/applications/websites/ecommerce/maximizing_revenue/cross_selling.rst:33 +#: ../../content/applications/websites/ecommerce/maximizing_revenue/cross_selling.rst:25 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." +"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: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 "" -"Los productos opcionales están directamente relacionados al artículo que se " -"agregó al carrito de compra (por ejemplo, para computadoras: la garantía, el" -" sistema operativo, componentes extra). Cada vez que un producto principal " -"se agrega al carrito de compra, aparece una nueva ventana como paso " -"adicional." #: ../../content/applications/websites/ecommerce/maximizing_revenue/cross_selling.rst:40 -msgid "To publish optional products:" -msgstr "Para publicar productos opcionales:" - -#: ../../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." +"`Odoo Tutorials: Alternative, Accessory, and Optional Products " +"`_." msgstr "" -"Instale el componente \"Comercio electrónico, productos opcionales\" en el " -"menú \"Aplicaciones\". También quite el filtro automático para buscar " -"componentes, de lo contrario solo aparecerán las aplicaciones principales." + +#: ../../content/applications/websites/ecommerce/maximizing_revenue/cross_selling.rst:46 +msgid "Optional Products" +msgstr "Productos opcionales" #: ../../content/applications/websites/ecommerce/maximizing_revenue/cross_selling.rst:48 -msgid "Select optional items from the *Sales* tab of the product detail form." -msgstr "" -"Seleccione artículos opcionales desde la pestaña de *ventas* en el " -"formulario de detalles del producto." - -#: ../../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." +"**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: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 "" -"La cantidad de artículos opcionales agregados al carrito de compra es la " -"misma que la del artículo principal." #: ../../content/applications/websites/ecommerce/maximizing_revenue/pricing.rst:3 msgid "Adapt prices to website visitors" @@ -834,10 +832,6 @@ msgstr "" "Active *Productos alternativos* desde el menú *Personalizar* de la página " "web del producto." -#: ../../content/applications/websites/ecommerce/publish.rst:5 -msgid "Launch my website" -msgstr "Lanzar mi sitio web" - #: ../../content/applications/websites/ecommerce/shopper_experience.rst:5 msgid "Get paid" msgstr "Recibir pagos" @@ -964,10 +958,8 @@ msgstr ":doc:`../../../finance/payment_acquirers`" #: ../../content/applications/websites/ecommerce/shopper_experience/payment_acquirer.rst:62 msgid "" ":ref:`Payment Acquirers: Place a hold on a card " -"`" +"`" msgstr "" -":ref:`Payment Acquirers: Realizar una retención del monto en la tarjeta " -"`" #: ../../content/applications/websites/ecommerce/shopper_experience/portal.rst:3 msgid "How customers can access their customer account" @@ -1434,7 +1426,39 @@ msgstr "" "Como llevar el seguimiento del tráfico de su sitio web desde su tablero de " "Odoo" -#: ../../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." @@ -1442,7 +1466,7 @@ msgstr "" "Puede monitorear las estadísticas de tráfico directamente en el tablero de " "Sitio web de Odoo gracias a Google Analytics." -#: ../../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`)." @@ -1451,7 +1475,7 @@ msgstr "" "de seguimiento en sus ajustes de Sitio web (consulte " ":doc:`google_analytics`)." -#: ../../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." @@ -1460,11 +1484,11 @@ msgstr "" "`__ para generar credenciales " "analíticas API. Inicie sesión con su cuenta de Google." -#: ../../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 "Seleccione Anaytics API." -#: ../../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." @@ -1472,15 +1496,15 @@ msgstr "" "Cree un nuevo proyecto y asígnele un nombre (por ejemplo, Odoo). Este " "proyecto se necesita para almacenar sus credenciales API." -#: ../../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 "Habilite el API." -#: ../../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 "Cree credenciales para usar en Odoo." -#: ../../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." @@ -1488,7 +1512,7 @@ msgstr "" "Seleccione *Navegador web (Javascript)* como fuente de llamada y *Datos de " "usuario* como tipo de datos." -#: ../../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" @@ -1502,7 +1526,7 @@ msgstr "" "de Odoo. El *URL autorizado de redirección* es el URL de su instancia de " "Odoo seguido de '/google_account/authentication'." -#: ../../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 " @@ -1515,13 +1539,13 @@ msgstr "" "consentimiento solo aparecerá cuando introduzca la identificación en Odoo " "por primera vez." -#: ../../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 "" "Por último, se le proporciona el ID de cliente. Cópielo y péguelo en Odoo." -#: ../../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." @@ -1529,7 +1553,7 @@ msgstr "" "Abra su tablero de la aplicación de Sitio web en Odoo y vincule su cuenta de" " Google Analytics y pegue su ID de cliente." -#: ../../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 "Como último paso, autorice a Odoo para acceder a Google API." @@ -2840,44 +2864,31 @@ msgstr "Escalabilidad" #: ../../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 " -"`_" +"and eCommerce (Drupal, Wordpress, Magento, Prestashop)." msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:568 -msgid "Todo" -msgstr "Todo" - -#: ../../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 "Mapa del sitio" -#: ../../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, " @@ -2891,24 +2902,24 @@ msgstr "" "`__ el agrupado de URLs de mapas del " "sitio en 45000 pedazos por archivo." -#: ../../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 "" "Cada entrada de mapa del sitio tiene 4 atributos que son calculados " "automáticamente:" -#: ../../content/applications/websites/website/optimize/seo.rst:593 +#: ../../content/applications/websites/website/optimize/seo.rst:587 msgid "```` : the URL of a page" msgstr "```` : la URL de una pagina" -#: ../../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" @@ -2916,11 +2927,11 @@ msgid "" "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 "Datos Estructurados Marcados" -#: ../../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 " @@ -2928,7 +2939,7 @@ msgid "" "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." @@ -2937,7 +2948,7 @@ msgstr "" "incluyendo: Revisiones, Gente, Productos, Negocios, Eventos y " "Organizaciones." -#: ../../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 " @@ -2950,29 +2961,29 @@ msgstr "" "que sus páginas de producto sean mostradas en Google usando información " "adicional como el precio y rating de un producto:" -#: ../../content/applications/websites/website/optimize/seo.rst:627 +#: ../../content/applications/websites/website/optimize/seo.rst:621 msgid "robots.txt" msgstr "robots.txt" -#: ../../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 " @@ -3237,11 +3248,34 @@ 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 " @@ -3250,11 +3284,11 @@ msgid "" "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 "Publicar contenido específico por sitio web" -#: ../../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 " @@ -3262,93 +3296,93 @@ msgid "" "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 "Productos" -#: ../../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 "Blogs" -#: ../../content/applications/websites/website/publish/multi_website.rst:163 +#: ../../content/applications/websites/website/publish/multi_website.rst:172 msgid "Slide Channels" msgstr "Canales de presentaciones" -#: ../../content/applications/websites/website/publish/multi_website.rst:165 +#: ../../content/applications/websites/website/publish/multi_website.rst:174 msgid "Forums" msgstr "Foros" -#: ../../content/applications/websites/website/publish/multi_website.rst:167 +#: ../../content/applications/websites/website/publish/multi_website.rst:176 msgid "Events" msgstr "Eventos" -#: ../../content/applications/websites/website/publish/multi_website.rst:169 +#: ../../content/applications/websites/website/publish/multi_website.rst:178 msgid "Job Positions" msgstr "Puestos de trabajo" -#: ../../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 "Publicar una página en todos los sitios web" -#: ../../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 "Multiempresas" -#: ../../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 " @@ -3356,40 +3390,40 @@ msgid "" "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 "Productos únicamente disponibles en un sitio web" -#: ../../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." @@ -3397,7 +3431,7 @@ msgstr "" "Para hacer que un producto esté disponible en algunos sitios web, pero no en" " todos, debe duplicar el producto para cada sitio web." -#: ../../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 " @@ -3406,41 +3440,41 @@ msgid "" "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 "Tarifas" -#: ../../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 "Medios de pago y métodos de entrega" -#: ../../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 " @@ -3448,11 +3482,11 @@ msgid "" "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 "Cuentas de cliente" -#: ../../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 " @@ -3461,39 +3495,39 @@ msgid "" "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 "" @@ -3540,7 +3574,7 @@ msgid "" 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 diff --git a/locale/fr/LC_MESSAGES/administration.po b/locale/fr/LC_MESSAGES/administration.po index 59e203a6a..271cd92a7 100644 --- a/locale/fr/LC_MESSAGES/administration.po +++ b/locale/fr/LC_MESSAGES/administration.po @@ -20,6 +20,8 @@ # Fernanda Marques , 2022 # JM Mas, 2022 # Khadija Mbazaa , 2022 +# Renaud de Colombel , 2022 +# Eloïse Stilmant , 2022 # Martin Trigaux, 2022 # Cécile Collart , 2022 # @@ -28,7 +30,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: 2022-03-18 14:59+0000\n" "Last-Translator: Cécile Collart , 2022\n" "Language-Team: French (https://www.transifex.com/odoo/teams/41243/fr/)\n" @@ -278,7 +280,7 @@ msgstr "" #: ../../content/administration/install/deploy.rst:153 #: ../../content/administration/install/deploy.rst:276 msgid "in ``/etc/odoo.conf`` set:" -msgstr "" +msgstr "dans ``/etc/odoo.conf`` définir:" #: ../../content/administration/install/deploy.rst:53 msgid "" @@ -304,9 +306,9 @@ msgid "" 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 "PostgreSQL" @@ -371,11 +373,11 @@ msgstr "Autoriser la connexion TCP à partir du réseau 192.168.1.x" #: ../../content/administration/install/deploy.rst:100 msgid "in ``/etc/postgresql/9.5/main/pg_hba.conf`` set:" -msgstr "" +msgstr "dans ``/etc/postgresql/9.5/main/pg_hba.conf`` définir :" #: ../../content/administration/install/deploy.rst:108 msgid "in ``/etc/postgresql/9.5/main/postgresql.conf`` set:" -msgstr "" +msgstr "dans ``/etc/postgresql/9.5/main/postgresql.conf`` définir :" #: ../../content/administration/install/deploy.rst:119 msgid "Configuring Odoo" @@ -1598,7 +1600,7 @@ msgstr "" "packages Enterprise)." #: ../../content/administration/install/install.rst:90 -#: ../../content/administration/install/install.rst:252 +#: ../../content/administration/install/install.rst:254 msgid "Windows" msgstr "Windows" @@ -1640,7 +1642,7 @@ msgid "Odoo will automatically be started at the end of the installation." msgstr "Odoo sera automatiquement lancé à la fin de l'installation." #: ../../content/administration/install/install.rst:105 -#: ../../content/administration/install/install.rst:418 +#: ../../content/administration/install/install.rst:433 msgid "Linux" msgstr "Linux" @@ -1658,9 +1660,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 "Préparez" @@ -1678,9 +1680,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 " @@ -1833,15 +1835,15 @@ msgstr "" "permet de conserver (et de faire fonctionner) plus facilement plusieurs " "versions d'Odoo côte à côte." -#: ../../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**." @@ -1849,102 +1851,102 @@ msgstr "" "Il y a deux façons d'obtenir le code source d'Odoo : sous forme d'une " "**archive** zip ou par **git**." -#: ../../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 "Archiver" -#: ../../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 "Edition Community :" -#: ../../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 "`Page officielle de téléchargement `_" -#: ../../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 "`Dépôt GitHub `_" -#: ../../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 "`Serveur Nightly `_" -#: ../../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 "Édition Enterprise :" -#: ../../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 "`Dépôt GitHub `_" -#: ../../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 "Git" -#: ../../content/administration/install/install.rst:276 -#: ../../content/administration/install/install.rst:442 -#: ../../content/administration/install/install.rst:613 +#: ../../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." +"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)" -msgstr "" -"Édition Enterprise : (voir :ref:`setup/install/editions` pour y accéder)" - -#: ../../content/administration/install/install.rst:292 -#: ../../content/administration/install/install.rst:458 -#: ../../content/administration/install/install.rst:629 +#: ../../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 " +"**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." +"installation. See :ref:`setup/install/editions` to get access to the " +"Enterprise repository." +msgstr "" + +#: ../../content/administration/install/install.rst:296 +#: ../../content/administration/install/install.rst:475 +#: ../../content/administration/install/install.rst:659 +msgid "Clone with HTTPS" msgstr "" -"**Le dépôt git Enterprise ne contient pas le code source complet d'Odoo**. " -"Il s'agit uniquement d'une collection de modules complémentaires. Le code " -"principal du serveur se trouve dans la version Community. Exécuter la " -"version Enterprise signifie en fait exécuter le serveur à partir de la " -"version Community avec l'option addons-path définie sur le dossier contenant" -" la version Enterprise. Vous devez cloner à la fois le référentiel Community" -" et Enterprise pour avoir une installation Odoo Enterprise fonctionnelle." #: ../../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 "Python" -#: ../../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 " @@ -1955,15 +1957,15 @@ msgstr "" "`_ pour télécharger et installer " "la dernière version de Python 3 sur votre machine." -#: ../../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." @@ -1971,13 +1973,13 @@ msgstr "" "Si Python 3 est déjà installé, assurez-vous que la version est 3.7 ou " "supérieure, car les versions précédentes ne sont pas compatibles avec Odoo." -#: ../../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 "Vérifiez également que pip_ est installé pour cette version." -#: ../../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 " @@ -1988,9 +1990,9 @@ msgstr "" "`_ (version supportée : 10.0 " "et plus)." -#: ../../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:" @@ -1999,7 +2001,7 @@ msgstr "" "connecter en tant que `postgres`, vous devez donc créer un nouvel " "utilisateur PostgreSQL :" -#: ../../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`." @@ -2007,45 +2009,45 @@ msgstr "" "Ajoutez le répertoire `bin` de PostgreSQL (par défaut : `C:\\\\\\Program " "Files\\\\\\\\PostgreSQL\\\\\\\\bin`) à votre `PATH`." -#: ../../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 "Ouvrez **pgAdmin**" -#: ../../content/administration/install/install.rst:338 +#: ../../content/administration/install/install.rst:351 msgid "Double-click the server to create a connection." msgstr "Double-cliquez sur le serveur pour créer une connexion." -#: ../../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 "Dépendances" -#: ../../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 " @@ -2054,149 +2056,147 @@ msgid "" "**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 " @@ -2204,86 +2204,100 @@ msgid "" "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." @@ -2354,11 +2368,23 @@ msgstr "" "visiteurs peuvent donc accéder à votre site web via une adresse " "``www.example.com`` plutôt qu'avec celle par défaut ``example.odoo.com``." +#: ../../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 "À propos des noms de domaine" -#: ../../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" @@ -2370,7 +2396,7 @@ msgstr "" " vos visiteurs seront confrontés. Nous vous recommandons de le garder " "*simples, courts, faciles à retenir et à épeler*." -#: ../../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. " @@ -2388,7 +2414,7 @@ msgstr "" "spécifiques (par exemple, ``experience.odoo.com`` pointe vers une page " "spécifique.)" -#: ../../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 " @@ -2400,11 +2426,11 @@ msgstr "" "nombreux serveurs DNS, donc toute modification du DNS peut prendre jusqu'à " "72 heures pour se propager dans le monde entier sur tous les serveurs." -#: ../../content/administration/maintain/domain_names.rst:46 +#: ../../content/administration/maintain/domain_names.rst:51 msgid "Register a free domain name with Odoo" msgstr "Enregistrer un nom de domaine gratuit avec Odoo" -#: ../../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." @@ -2413,14 +2439,14 @@ msgstr "" "Online directement à partir du site web d'Odoo ou via votre gestionnaire de " "base de données." -#: ../../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 "" "Votre nom de domaine est **gratuit pendant un an** si vous l'enregistrez " "avec Odoo !" -#: ../../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." @@ -2428,18 +2454,18 @@ msgstr "" "Le nom de domaine est enregistré auprès de `Gandi " "`_, le bureau d'enregistrement du nom de domaine." -#: ../../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 "" "Vous êtes le propriétaire du nom de domaine et pouvez l'utiliser à d'autres " "fins." -#: ../../content/administration/maintain/domain_names.rst:56 +#: ../../content/administration/maintain/domain_names.rst:61 msgid "Odoo manages payment and technical support for you." msgstr "Odoo gère le paiement et le support technique pour vous." -#: ../../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 " @@ -2452,7 +2478,7 @@ msgstr "" ":guilabel:`paramètres` à côté de votre base de données, puis sur " ":guilabel:`Noms de domaine`." -#: ../../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." @@ -2460,7 +2486,7 @@ msgstr "" "Recherchez le nom de domaine de votre choix pour vérifier sa disponibilité, " "puis sélectionnez celui que vous souhaitez enregistrer pour votre site web." -#: ../../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." @@ -2468,7 +2494,7 @@ msgstr "" "Ensuite, remplissez le formulaire avec vos informations pour devenir " "propriétaire du nom de domaine." -#: ../../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 `." @@ -2477,7 +2503,7 @@ msgstr "" "devez toujours :ref:`mapper votre nom de domaine avec votre site web " "`." -#: ../../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 " @@ -2490,15 +2516,15 @@ msgstr "" "site web pour éviter les abus. Ce processus peut prendre jusqu'à trois " "jours." -#: ../../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 "Ceci n'est pas encore disponible pour les bases de données Odoo.sh." -#: ../../content/administration/maintain/domain_names.rst:87 +#: ../../content/administration/maintain/domain_names.rst:92 msgid "Manage your domain name registered with Odoo" msgstr "Gérer votre nom de domaine enregistré avec Odoo" -#: ../../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 " @@ -2513,7 +2539,7 @@ msgstr "" "données, sur :guilabel:`Noms de domaine`, et enfin sur :guilabel:`Contacts` " "ou :guilabel:`DNS`." -#: ../../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." @@ -2521,18 +2547,18 @@ msgstr "" "Veuillez `soumettre un ticket de support `_ si " "vous avez besoin d'une aide supplémentaire pour gérer votre nom de domaine." -#: ../../content/administration/maintain/domain_names.rst:105 +#: ../../content/administration/maintain/domain_names.rst:110 msgid "Configure your existing domain name" msgstr "Configurer votre nom de domaine existant" -#: ../../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 "" "Si vous possédez déjà un nom de domaine, vous pouvez l'utiliser pour pointer" " vers votre site web." -#: ../../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 " @@ -2542,7 +2568,7 @@ msgstr "" "`, nous vous recommandons vivement de procéder aux actions " "suivantes, dans cet ordre :" -#: ../../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." @@ -2550,14 +2576,14 @@ msgstr "" ":ref:`Ajoutez un enregistrement CNAME ` sur la zone DNS " "de votre nom de domaine." -#: ../../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 "" ":ref:`Mappez votre nom de domaine avec votre base de données Odoo `." -#: ../../content/administration/maintain/domain_names.rst:114 +#: ../../content/administration/maintain/domain_names.rst:119 msgid "" ":ref:`Map your domain name with your Odoo website `." @@ -2565,11 +2591,11 @@ msgstr "" ":ref:`Mappez votre nom de domaine avec votre site web Odoo `." -#: ../../content/administration/maintain/domain_names.rst:119 +#: ../../content/administration/maintain/domain_names.rst:124 msgid "Add a CNAME record" msgstr "Ajouter un enregistrement CNAME" -#: ../../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." @@ -2578,7 +2604,7 @@ msgstr "" " l'adresse IP d'un autre site web plutôt que directement vers une adresse " "IP." -#: ../../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." @@ -2587,13 +2613,13 @@ msgstr "" "données Odoo. Les exigences sont détaillées dans votre gestionnaire de base " "de données." -#: ../../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 "Odoo Online" -#: ../../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``)" @@ -2601,15 +2627,15 @@ msgstr "" "L'adresse cible est l'adresse actuelle de votre base de données, telle que " "définie lors de sa création (par exemple, ``example.odoo.com``)" -#: ../../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 "Odoo.sh" -#: ../../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`." @@ -2617,7 +2643,7 @@ msgstr "" "L'adresse principale de votre projet est définie dans " ":menuselection:`Paramètres --> Nom du projet`." -#: ../../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 --> " @@ -2630,12 +2656,12 @@ msgstr "" ":guilabel:`Comment définir mon domaine ?`. Un message indique l'adresse que " "votre enregistrement CNAME doit cibler." -#: ../../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 "Ouvrez le tableau de bord du gestionnaire de votre nom de domaine." -#: ../../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." @@ -2643,13 +2669,13 @@ msgstr "" "Ouvrez la page de gestion de la **zone DNS** du nom de domaine que vous " "souhaitez configurer." -#: ../../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 "" "Créez un **enregistrement CNAME** pointant vers l'adresse de votre base de " "données." -#: ../../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, " @@ -2660,7 +2686,7 @@ msgstr "" "n'importe quel nom de domaine de votre choix, avec n'importe quel sous-" "domaine (par exemple, ``anything.example .com``)." -#: ../../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 " @@ -2673,7 +2699,7 @@ msgstr "" "``www.example.com`` mais aussi avec le :ref:`naked domain ` ``example.com``." -#: ../../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 " @@ -2685,29 +2711,29 @@ msgstr "" "génère la règle suivante et l'ajoute à votre zone DNS : ``www IN CNAME " "example.odoo.com.``" -#: ../../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 "" "Vous créez également une redirection de ``example.com`` vers " "``wwww.example.com``." -#: ../../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 "" "Vos nouveaux enregistrements DNS sont propagés à tous les serveurs DNS." -#: ../../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 "" "Voici quelques recommandations spécifiques pour créer votre enregistrement " "CNAME :" -#: ../../content/administration/maintain/domain_names.rst:168 +#: ../../content/administration/maintain/domain_names.rst:173 msgid "`GoDaddy `_" msgstr "`GoDaddy `_" -#: ../../content/administration/maintain/domain_names.rst:169 +#: ../../content/administration/maintain/domain_names.rst:174 msgid "" "`Namecheap " "`_" -#: ../../content/administration/maintain/domain_names.rst:170 +#: ../../content/administration/maintain/domain_names.rst:175 msgid "" "`OVH " "`_" -#: ../../content/administration/maintain/domain_names.rst:171 +#: ../../content/administration/maintain/domain_names.rst:176 msgid "" "`CloudFlare `_" @@ -2735,35 +2761,35 @@ msgstr "" "`CloudFlare `_" -#: ../../content/administration/maintain/domain_names.rst:172 -msgid "" -"`Google Domains `_" -msgstr "" -"`Google Domains `_" - #: ../../content/administration/maintain/domain_names.rst:177 +msgid "" +"`Google Domains `_" +msgstr "" +"`Google Domains `_" + +#: ../../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." @@ -2771,11 +2797,11 @@ msgstr "" "Selon votre bureau d'enregistrement de nom de domaine, cette redirection " "peut être déjà pré-configurée." -#: ../../content/administration/maintain/domain_names.rst:195 +#: ../../content/administration/maintain/domain_names.rst:200 msgid "Map your domain name with your Odoo database" msgstr "Mappez votre nom de domaine avec votre base de données Odoo" -#: ../../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 " @@ -2788,7 +2814,7 @@ msgstr "" "de domaine`, puis sur :guilabel:`Utiliser mon propre domaine` en bas de la " "colonne de droite." -#: ../../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. " @@ -2799,7 +2825,7 @@ msgstr "" "CNAME est correctement configuré. Une fois fait, cliquez sur :guilabel:`Je " "confirme, c'est fait`." -#: ../../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" @@ -2810,13 +2836,13 @@ msgstr "" "souhaitez ajouter à cette base de données, puis cliquez sur " ":guilabel:`Ajouter un domaine`." -#: ../../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." @@ -2825,7 +2851,7 @@ msgstr "" "au DNS de votre nom de domaine **avant** de mapper votre nom de domaine avec" " votre base de données Odoo." -#: ../../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. " @@ -2837,7 +2863,7 @@ msgstr "" "certificat*. Ceci est souvent affiché par les navigateurs web sous la forme " "d'un avertissement tel que *\"Votre connexion n'est pas privée\"*." -#: ../../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 " @@ -2850,11 +2876,11 @@ msgstr "" "d'assistance `_ incluant des captures d'écran de " "vos enregistrements CNAME." -#: ../../content/administration/maintain/domain_names.rst:240 +#: ../../content/administration/maintain/domain_names.rst:245 msgid "SSL encryption (HTTPS protocol)" msgstr "Chiffrement SSL (protocole HTTPS)" -#: ../../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, " @@ -2867,7 +2893,7 @@ msgstr "" "``https://`` au début de votre adresse web, plutôt que d'un protocole non " "sécurisé ``http://``." -#: ../../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 " @@ -2879,11 +2905,11 @@ msgstr "" "l'intégration avec `Let's Encrypt Certificate Authority et le protocole ACME" " `_." -#: ../../content/administration/maintain/domain_names.rst:251 +#: ../../content/administration/maintain/domain_names.rst:256 msgid "The certificate generation may take up to 24h." msgstr "La génération du certificat peut prendre jusqu'à 24h." -#: ../../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." @@ -2892,7 +2918,7 @@ msgstr "" "les cinq jours suivant l'ajout de votre nom de domaine dans les paramètres " "de votre base de données." -#: ../../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." @@ -2900,11 +2926,11 @@ msgstr "" "Si vous utilisez déjà un autre service, vous pouvez continuer à l'utiliser " "ou simplement changer pour Odoo." -#: ../../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 `." @@ -2913,14 +2939,14 @@ msgstr "" ":ref:`mapper votre nom de domaine avec votre site web `." -#: ../../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* " @@ -2931,14 +2957,14 @@ msgstr "" "de données (n'importe quel utilisateur du groupe *Paramètres*) depuis " "l'écran de connexion." -#: ../../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 " @@ -2948,7 +2974,7 @@ msgstr "" ":ref:`mode développeur`, puis allez dans :menuselection:`Paramètres --> " "Technique --> Paramètres du système`." -#: ../../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 " @@ -2958,7 +2984,7 @@ msgstr "" "et entrez l'adresse complète de votre site web comme valeur, comme ceci " "``https://www.example.com``." -#: ../../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 (``/``)." @@ -2966,25 +2992,25 @@ msgstr "" "L'URL doit inclure le protocole ``https://`` (ou ``http://``) et ne doit pas" " se terminer par une barre oblique (``/``)." -#: ../../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 "clé : ``web.base.url.freeze``" -#: ../../content/administration/maintain/domain_names.rst:289 +#: ../../content/administration/maintain/domain_names.rst:294 msgid "value: ``True``" msgstr "valeur : ``True``" -#: ../../content/administration/maintain/domain_names.rst:294 +#: ../../content/administration/maintain/domain_names.rst:299 msgid "Map your domain name with your website" msgstr "Mappez votre nom de domaine avec votre site web" -#: ../../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:" @@ -2992,7 +3018,7 @@ msgstr "" "Mapper votre nom de domaine sur votre site web n'est pas la même chose que " "le mapper avec votre base de données :" -#: ../../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." @@ -3000,7 +3026,7 @@ msgstr "" "Cela définit votre nom de domaine comme le principal de votre site web, " "aidant les moteurs de recherche à l'indexer correctement." -#: ../../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." @@ -3008,7 +3034,7 @@ msgstr "" "Cela définit votre nom de domaine comme l'URL de base de votre base de " "données, y compris les liens du portail envoyés par email à vos clients." -#: ../../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." @@ -3016,7 +3042,7 @@ msgstr "" "Si vous avez plusieurs sites Web, cela mappera votre nom de domaine avec le " "site Web approprié." -#: ../../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." @@ -3025,7 +3051,7 @@ msgstr "" "Infos sur le site web`. Si vous avez plusieurs sites web, sélectionnez celui" " que vous souhaitez configurer." -#: ../../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`." @@ -3034,7 +3060,7 @@ msgstr "" "(par exemple, ``https://www.example.com``) et cliquez sur " ":guilabel:`Sauver`." -#: ../../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 " @@ -3044,7 +3070,7 @@ msgstr "" "d'indexer à la fois votre nom de domaine personnalisé ``www.example.com`` et" " votre adresse de base de données Odoo ``example.odoo.com``." -#: ../../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 " @@ -3057,7 +3083,7 @@ msgstr "" "`_ pour résoudre ce " "problème." -#: ../../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 " @@ -3071,7 +3097,7 @@ msgstr "" "indique à Odoo quelle URL utiliser comme :ref:`URL de base ` selon la société utilisée." -#: ../../content/administration/maintain/domain_names.rst:329 +#: ../../content/administration/maintain/domain_names.rst:334 msgid ":doc:`/applications/general/email_communication/email_servers`" msgstr ":doc:`/applications/general/email_communication/email_servers`" @@ -3199,6 +3225,312 @@ msgid "" "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 "Configuration dans Google" + +#: ../../content/administration/maintain/google_oauth.rst:18 +msgid "Create a new project" +msgstr "Créer un nouveau projet" + +#: ../../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 "Configuration dans Odoo" + +#: ../../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 "" @@ -3215,30 +3547,24 @@ 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" @@ -3246,46 +3572,56 @@ msgid "" " 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 +#: ../../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: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 "From on-premises to Odoo.sh" msgstr "" -#: ../../content/administration/maintain/hosting_changes.rst:26 -#: ../../content/administration/maintain/hosting_changes.rst:43 +#: ../../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:27 +#: ../../content/administration/maintain/hosting_changes.rst:30 msgid "...and voilà!" msgstr "" -#: ../../content/administration/maintain/hosting_changes.rst:30 +#: ../../content/administration/maintain/hosting_changes.rst:33 msgid "From Odoo Online to on-premises" msgstr "" -#: ../../content/administration/maintain/hosting_changes.rst:32 -#: ../../content/administration/maintain/hosting_changes.rst:40 +#: ../../content/administration/maintain/hosting_changes.rst:35 +#: ../../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:33 +#: ../../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" @@ -3293,8 +3629,8 @@ msgid "" "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 +#: ../../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" @@ -3302,16 +3638,16 @@ msgid "" "`_)" msgstr "" -#: ../../content/administration/maintain/hosting_changes.rst:35 -#: ../../content/administration/maintain/hosting_changes.rst:60 +#: ../../content/administration/maintain/hosting_changes.rst:38 +#: ../../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:38 +#: ../../content/administration/maintain/hosting_changes.rst:41 msgid "From Odoo Online to Odoo.sh" msgstr "" -#: ../../content/administration/maintain/hosting_changes.rst:41 +#: ../../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 " @@ -3319,28 +3655,99 @@ msgid "" "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)." +"`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 "Europe" + +#: ../../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 "Tout est fait!" + +#: ../../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 " "`." @@ -3726,6 +4133,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 "Mettre à jour" @@ -3844,7 +4252,7 @@ msgid "" 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 "Supprimer" @@ -4192,25 +4600,25 @@ msgstr "N/D Jamais publié pour cette plateforme" msgid "🏁 Future version, not released yet" msgstr "🏁 Prochaine version, pas encore publiée" -#: ../../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 "J'utilise une ancienne version d'Odoo/OpenERP/TinyERP" -#: ../../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 "" "OpenERP 7.0, 6.1, 6.0 et 5.0 ne sont plus supportés, quelle que soit la " "plateforme." -#: ../../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 "" "TinyERP 4.0, 3.0, 2.0 et 1.0 ne sont plus supportés, quelle que soit la " "plateforme." -#: ../../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 `_." @@ -4472,6 +4880,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 "Vue d'ensemble" @@ -4632,7 +5041,7 @@ msgstr "" #: ../../content/administration/odoo_sh/advanced/containers.rst:169 msgid "" "More options are available and detailed in the :doc:`CLI documentation " -"`." +"`." msgstr "" #: ../../content/administration/odoo_sh/advanced/containers.rst:172 @@ -5016,7 +5425,7 @@ msgstr "" 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 @@ -5462,7 +5871,15 @@ msgid "" "gettingstarted-builds>`." 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 @@ -5470,17 +5887,17 @@ msgstr "" msgid "Settings" msgstr "Paramètres" -#: ../../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 " @@ -5493,48 +5910,48 @@ msgid "" "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 " @@ -5542,31 +5959,31 @@ msgid "" "`." 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" @@ -5574,75 +5991,75 @@ msgid "" "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 "ils ne peuvent être configurés qu'à l'aide d'enregistrements ``A``," -#: ../../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 " @@ -5654,11 +6071,11 @@ msgid "" " 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 " @@ -5666,18 +6083,18 @@ msgid "" "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 " @@ -5688,23 +6105,23 @@ msgid "" "`." 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 " @@ -5712,178 +6129,178 @@ msgid "" "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 "Fusionner" -#: ../../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 "Configuration" -#: ../../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 "Connexion" -#: ../../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 "" @@ -6527,9 +6944,9 @@ msgstr "" #: ../../content/administration/odoo_sh/getting_started/first_module.rst:97 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." +":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 @@ -7023,69 +7440,69 @@ 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 " @@ -7095,62 +7512,62 @@ msgid "" "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 " @@ -7165,7 +7582,7 @@ msgid "" "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 " @@ -7173,7 +7590,7 @@ msgid "" "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." @@ -7182,11 +7599,11 @@ msgid "" " 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 " @@ -7197,20 +7614,20 @@ msgid "" " 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 " @@ -7219,13 +7636,13 @@ msgid "" "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 " @@ -7233,7 +7650,7 @@ msgid "" "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." @@ -7595,7 +8012,6 @@ msgid "|assistance-contact|" msgstr "" #: ../../content/administration/upgrade.rst:32 -#: ../../content/administration/upgrade/odoo_sh.rst:66 msgid ":ref:`upgrade/sla`" msgstr "" @@ -7956,35 +8372,41 @@ msgstr "" #: ../../content/administration/upgrade.rst:242 msgid "What upgrading does NOT cover" -msgstr "" +msgstr "Ce que la mise à niveau ne couvre PAS" #: ../../content/administration/upgrade.rst:244 msgid "The cleaning of pre-existing data & configuration while upgrading" msgstr "" +"Le nettoyage des données et de la configuration préexistantes lors de la " +"mise à niveau." #: ../../content/administration/upgrade.rst:245 msgid "" "Any new developments and/or upgrades of your own :ref:`custom modules " "`" msgstr "" +"Tout nouveau développement et/ou mise à niveau de vos propres :ref:`modules " +"personnalisés `." #: ../../content/administration/upgrade.rst:247 msgid "`Training `_ on the latest version" -msgstr "" +msgstr "`Formation `_ sur la dernière version" #: ../../content/administration/upgrade.rst:249 msgid "" "You can get more information about your Enterprise Licence on our :ref:`Odoo" " Enterprise Subscription Agreement ` page." msgstr "" +"Vous pouvez obtenir plus d'informations sur votre licence Enterprise sur " +"notre page :ref:`Contrat d'abonnement d'Odoo Enterprise `." #: ../../content/administration/upgrade.rst:255 msgid ":doc:`upgrade/faq`" -msgstr "" +msgstr ":doc:`upgrade/faq`" #: ../../content/administration/upgrade.rst:256 msgid ":doc:`odoo_sh`" -msgstr "" +msgstr ":doc:`odoo_sh`" #: ../../content/administration/upgrade/faq.rst:8 msgid "FAQ" @@ -7992,23 +8414,27 @@ msgstr "FAQ" #: ../../content/administration/upgrade/faq.rst:13 msgid "Why upgrade" -msgstr "" +msgstr "Pourquoi effectuer une mise à niveau ?" #: ../../content/administration/upgrade/faq.rst:15 msgid "" "You benefit from the latest features of the :ref:`new major version " "` released by Odoo." msgstr "" +"Vous bénéficiez des dernières fonctionnalités de la :ref:`nouvelle version " +"majeure ` publiée par Odoo." #: ../../content/administration/upgrade/faq.rst:17 msgid "" "If you are in an :ref:`unsupported version `, " "you get a new version with support." msgstr "" +"Si vous êtes dans une :ref:`version non supportée `, vous obtenez une nouvelle version avec support." #: ../../content/administration/upgrade/faq.rst:23 msgid "When to upgrade" -msgstr "" +msgstr "Quand effectuer une mise à niveau ?" #: ../../content/administration/upgrade/faq.rst:25 msgid "" @@ -8016,10 +8442,13 @@ msgid "" "version is released or when your version turns unsupported, and you still " "wish to enjoy support." msgstr "" +"Quand vous le souhaitez. Vous pouvez faire votre demande de mise à niveau " +"dès la sortie d'une nouvelle version ou lorsque votre version n'est plus " +"prise en charge et que vous souhaitez encore bénéficier du support." #: ../../content/administration/upgrade/faq.rst:31 msgid "Availability of the new version" -msgstr "" +msgstr "Disponibilité de la nouvelle version" #: ../../content/administration/upgrade/faq.rst:33 msgid "" @@ -8030,14 +8459,24 @@ msgid "" "page `_ and make sure to be happy with your test " "version before requesting the upgrade of your database in production." msgstr "" +"Dès qu'Odoo annonce la sortie d'une nouvelle version majeure, vous pouvez " +"créer une demande de mise à niveau de test pour essayer la dernière version." +" Veuillez noter qu'à ce stade, les scripts de mise à niveau n'auront été " +"testés qu'avec des données de démonstration. Veuillez signaler tout problème" +" que vous pourriez rencontrer lors du test via la page `d'Assistance d'Odoo " +"`_ et assurez-vous d'être satisfait de votre " +"version de test avant de demander la mise à niveau de votre base de données " +"en production." #: ../../content/administration/upgrade/faq.rst:42 msgid "Duration of the upgrade" -msgstr "" +msgstr "Durée de la mise à niveau" #: ../../content/administration/upgrade/faq.rst:44 msgid "It is impossible to give time estimates for every upgrade request." msgstr "" +"Il est impossible de donner des estimations de temps pour chaque demande de " +"mise à niveau." #: ../../content/administration/upgrade/faq.rst:46 msgid "" @@ -8046,16 +8485,24 @@ msgid "" "faster than a multi-company, multi-user database that uses Accounting, " "Sales, Purchase, and Manufacturing." msgstr "" +"En général, plus la base de données est \"petite\", plus la demande de mise " +"à niveau est traitée rapidement. Une base de données mono-utilisateur qui " +"utilise uniquement le CRM sera traitée plus rapidement qu'une base de " +"données multi-sociétés et multi-utilisateurs qui utilise la comptabilité, " +"les ventes, les achats et la fabrication." #: ../../content/administration/upgrade/faq.rst:50 msgid "" "You can expect the time it takes for the platform to upgrade the test " "database to be similar to the production upgrade." msgstr "" +"Vous pouvez vous attendre à ce que le temps nécessaire à la plate-forme pour" +" mettre à niveau la base de données de test soit similaire à celui de la " +"mise à niveau de la production." #: ../../content/administration/upgrade/faq.rst:56 msgid "Duration of the upgrade project" -msgstr "" +msgstr "Durée du projet de mise à niveau" #: ../../content/administration/upgrade/faq.rst:58 msgid "" @@ -8063,42 +8510,51 @@ msgid "" "problems, etc.) and the issues encountered that might need to be addressed " "by our technical team." msgstr "" +"Cela dépend de l'implication des utilisateurs (le temps passé à tester, à " +"signaler les problèmes, etc.) et des problèmes rencontrés qui pourraient " +"devoir être traités par notre équipe technique." #: ../../content/administration/upgrade/faq.rst:61 msgid "So, in a nutshell, what can impact your upgrade lead time?" msgstr "" +"En résumé, qu'est-ce qui peut avoir une incidence sur le délai de mise à " +"niveau ?" #: ../../content/administration/upgrade/faq.rst:63 msgid "Source & targeted versions" -msgstr "" +msgstr "Versions sources et ciblées" #: ../../content/administration/upgrade/faq.rst:64 msgid "Installed apps" -msgstr "" +msgstr "Apps installées" #: ../../content/administration/upgrade/faq.rst:65 msgid "Volume of data" -msgstr "" +msgstr "Volume de données" #: ../../content/administration/upgrade/faq.rst:66 msgid "" "Amount of customization (models, fields, methods, workflows, reports, " "website, etc.)" msgstr "" +"Quantité de personnalisations (modèles, champs, méthodes, flux de travail, " +"rapports, site web, etc.)" #: ../../content/administration/upgrade/faq.rst:67 msgid "" "Installation of new apps or configuration changes after the start of the " "test phase" msgstr "" +"Installation de nouvelles applications ou modification de la configuration " +"après le début de la phase de test." #: ../../content/administration/upgrade/faq.rst:68 msgid "User commitment" -msgstr "" +msgstr "Engagement de l'utilisateur" #: ../../content/administration/upgrade/faq.rst:73 msgid "Upgrade of the custom modules" -msgstr "" +msgstr "Mise à niveau des modules personnalisés" #: ../../content/administration/upgrade/faq.rst:75 msgid "" @@ -8106,16 +8562,22 @@ msgid "" ":ref:`charges_standard`, this optional service is subject to additional " "fees." msgstr "" +"Comme indiqué dans notre :doc:`/legal/terms/enterprise`, section " +":ref:`charges_standard`, ce service optionnel est soumis à des frais " +"supplémentaires." #: ../../content/administration/upgrade/faq.rst:78 msgid "" "Depending on your situation, the custom code could be upgraded by our " "services, by one of our partners, or you can do it yourself." msgstr "" +"En fonction de votre situation, le code personnalisé peut être mis à niveau " +"par nos services, par l'un de nos partenaires, ou vous pouvez le faire vous-" +"même." #: ../../content/administration/upgrade/faq.rst:86 msgid "Upgrade or Migration" -msgstr "" +msgstr "Mise à niveau ou migration" #: ../../content/administration/upgrade/faq.rst:88 msgid "" @@ -8123,10 +8585,14 @@ msgid "" "reflects the change of :ref:`editions ` or " "change of :ref:`hosting type `." msgstr "" +"Une mise à niveau consiste à passer à une version plus récente d'Odoo, " +"tandis qu'une migration reflète le changement d' :ref:`editions ` ou le changement du :ref:`type d'hébergement `." #: ../../content/administration/upgrade/faq.rst:97 msgid "Editions change (from Community to Enterprise)" -msgstr "" +msgstr "Changement d'édition (de Community à Enterprise)" #: ../../content/administration/upgrade/faq.rst:99 msgid "" @@ -8134,38 +8600,50 @@ msgid "" "database you sent was a community or enterprise edition. It is required to " "have an enterprise subscription to upgrade." msgstr "" +"La mise à niveau renvoie toujours une édition Enterprise d'Odoo, que la base" +" de données que vous avez envoyée soit une édition Community ou Enterprise. " +"Il est nécessaire d'avoir un abonnement d'entreprise pour effectuer la mise " +"à niveau." #: ../../content/administration/upgrade/faq.rst:103 msgid "" "If you need assistance on this matter, please contact us via the `Odoo " "Support page `_." msgstr "" +"Si vous avez besoin d'aide à ce sujet, veuillez nous contacter via la page " +"`d'Assistance d'Odoo `_." #: ../../content/administration/upgrade/faq.rst:107 msgid "`Editions `_" -msgstr "" +msgstr "`Éditions `_" #: ../../content/administration/upgrade/faq.rst:112 msgid "" "Switching the hosting types (Self-Hosting vs. Online Hosting - SaaS vs. " "Cloud Platform - Odoo.sh)" msgstr "" +"Changement de type d'hébergement (auto-hébergement vs. hébergement en ligne " +"- SaaS vs. plateforme cloud - Odoo.sh)" #: ../../content/administration/upgrade/faq.rst:114 msgid "" "An upgrade does not cover a change of `Hosting types " "`_." msgstr "" +"Une mise à niveau ne couvre pas un changement de `Type d'hébergement " +"`_." #: ../../content/administration/upgrade/faq.rst:116 msgid "" "Open the following link to get :doc:`more information about how to change " "your hosting type <../maintain/hosting_changes>`." msgstr "" +"Ouvrez le lien suivant pour obtenir :doc:`plus d'informations sur la façon " +"de changer votre type d'hébergement <../maintain/hosting_changes>`." #: ../../content/administration/upgrade/faq.rst:124 msgid "The Upgrade Report" -msgstr "" +msgstr "Le rapport de mise à niveau" #: ../../content/administration/upgrade/faq.rst:126 msgid "" @@ -8178,10 +8656,19 @@ msgid "" "thoroughly and report any discrepancies you might find, before you decide to" " upgrade your production database." msgstr "" +"Lorsqu'une demande de mise à niveau aboutit (en test ou en production), vous" +" recevez une notification par email comprenant un 'rapport de mise à " +"niveau'. Ce rapport vous est également envoyé via l'application Discuss. Il " +"contient des informations précieuses sur les changements survenus lors de la" +" mise à niveau. Bien qu'il serve de guide pour les problèmes éventuels à " +"surveiller, il ne s'agit pas d'une liste exhaustive. Il est impératif de " +"tester la base de données mise à niveau de manière approfondie et de " +"signaler toute anomalie que vous pourriez trouver, avant de décider de " +"mettre à niveau votre base de données de production." #: ../../content/administration/upgrade/faq.rst:136 msgid "Custom views" -msgstr "" +msgstr "Vues personnalisés" #: ../../content/administration/upgrade/faq.rst:138 msgid "" @@ -8191,6 +8678,12 @@ msgid "" "the upgrade is available in the Discuss app, and lists all the custom views " "that might be impacted by this." msgstr "" +"Pendant la mise à niveau, certaines vues personnalisées peuvent être " +"désactivées pour des raisons techniques. Il se peut donc qu'elles doivent " +"être réparées après la mise à niveau. Le :ref:`Rapport de mise à niveau " +"` qui est généré après la mise à niveau est " +"disponible dans l'application Discuss, et liste toutes les vues " +"personnalisées qui pourraient être impactées par cela." #: ../../content/administration/upgrade/faq.rst:146 msgid "Release Notes by version" @@ -8408,144 +8901,269 @@ msgid "" "If you are using the Website or Studio app, we recommend you always do a " "test upgrade before upgrading your production instance." msgstr "" +"Si vous utilisez les applications Site Web ou Studio, nous vous recommandons" +" de toujours effectuer une mise à niveau de test avant de mettre à niveau " +"votre instance de production." -#: ../../content/administration/upgrade/odoo_sh.rst:7 -#: ../../content/administration/upgrade/on_premise.rst:6 -msgid "Test upgrade request" -msgstr "" - -#: ../../content/administration/upgrade/odoo_sh.rst:9 +#: ../../content/administration/upgrade/odoo_sh.rst:10 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." +"Odoo.sh is integrated with the upgrade platform to make the upgrade process " +"easier." msgstr "" +"Odoo.sh est intégré à la plateforme de mise à niveau pour faciliter le " +"processus de mise à niveau." -#: ../../content/administration/upgrade/odoo_sh.rst:15 +#: ../../content/administration/upgrade/odoo_sh.rst:13 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*." +"The :guilabel:`Upgrade` tab is available in the branches view. It is only " +"available for valid projects with a valid production build." msgstr "" +"L'onglet :guilabel:`Mise à niveau` est disponible dans la vue des branches. " +"Il n'est disponible que pour les projets valides avec une version de " +"production valide." #: ../../content/administration/upgrade/odoo_sh.rst:20 -msgid "Test your upgraded database" -msgstr "Testez votre base de données mise à niveau" +msgid "The suggested upgrade steps on Odoo.sh are:" +msgstr "" +"Les étapes de mise à niveau suggérées dans Odoo.sh sont les suivantes :" #: ../../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." +"On a :guilabel:`Development` branch, upgrade your custom modules to keep " +"them compatible with the new version and thoroughly **test them**." msgstr "" -"Au début de votre projet de mise à niveau, assurez-vous de créer une " -"nouvelle branche intermédiaire à des fins de test en forkant votre branche " -"principale." +"Sur une branche de :guilabel:`Development`, mettez à jour vos modules " +"personnalisés pour les rendre compatibles avec la nouvelle version et " +"**testez** de manière approfondie." -#: ../../content/administration/upgrade/odoo_sh.rst:25 +#: ../../content/administration/upgrade/odoo_sh.rst:24 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." +"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 ":doc:`../../administration/upgrade`" +msgstr ":doc:`../../administration/upgrade`" + +#: ../../content/administration/upgrade/odoo_sh.rst:30 +msgid ":doc:`Upgrade FAQ <../upgrade/faq>`" +msgstr ":doc:`FAQ sur l'Upgrade <../upgrade/faq>`" + +#: ../../content/administration/upgrade/odoo_sh.rst:31 +msgid ":doc:`Introduction to Odoo.sh <../odoo_sh/overview/introduction>`" +msgstr ":doc:`Introduction à Odoo.sh <../odoo_sh/overview/introduction>`" + +#: ../../content/administration/upgrade/odoo_sh.rst:36 +msgid "Upgrade your custom modules" +msgstr "Mise à niveau de vos modules personnalisés" + +#: ../../content/administration/upgrade/odoo_sh.rst:38 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." -msgstr "" -"La plateforme détecte automatiquement la version du dump et remplace la " -"version du code source d'Odoo par la version correspondante du build." - -#: ../../content/administration/upgrade/odoo_sh.rst:32 -msgid "" -"Test the upgraded database and make sure everything runs as it's supposed " -"to." -msgstr "" -"Testez la base de données mise à niveau et assurez-vous que tout fonctionne " -"comme prévu." - -#: ../../content/administration/upgrade/odoo_sh.rst:35 -#: ../../content/administration/upgrade/on_premise.rst:41 -msgid "Upgrade your production database" -msgstr "Mise à jour de votre base de données de production" - -#: ../../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:" -msgstr "" -"Une fois que vous avez tout testé et que vous êtes satisfait, recommencez le" -" processus pour obtenir un dump mis à niveau :" - -#: ../../content/administration/upgrade/odoo_sh.rst:40 -msgid "Make a new dump of your production database (as described in step 1)" -msgstr "" -"Créer un nouveau dump de votre base de données de production (comme décrit à" -" l'étape 1)" - -#: ../../content/administration/upgrade/odoo_sh.rst:41 -msgid "Upload it on upgrade.odoo.com and select the Production purpose" -msgstr "" -"Téléchargez-le sur upgrade.odoo.com et sélectionnez l'objectif de production" - -#: ../../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." +"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 "" +"La première étape consiste à mettre à niveau vos modules personnalisés pour " +"qu'ils restent compatibles avec la nouvelle version. Forkez votre branche de" +" :guilabel:`Production` au stade :guilabel:`Development`, puis allez dans " +"les paramètres de votre branche de :guilabel:`Development` et sélectionnez " +"la version de Odoo que vous visez. Si nécessaire, modifiez votre code pour " +"être compatible avec la nouvelle version. Assurez-vous de **tester** que vos" +" fonctionnalités fonctionnent toujours correctement." #: ../../content/administration/upgrade/odoo_sh.rst:45 -msgid "Merge or commit the upgraded custom code in the production branch" -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." +"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 "" +"En fonction de votre contrat, la mise à niveau de vos modules personnalisés " +"peut être effectuée par vous-même, par votre partenaire ou par Odoo (si vous" +" êtes titulaire d'un abonnement incluant la maintenance des " +"personnalisations)." + +#: ../../content/administration/upgrade/odoo_sh.rst:51 +msgid "Upgrade your database on a staging branch" +msgstr "Mettez à niveau votre base de données sur une branche de staging" #: ../../content/administration/upgrade/odoo_sh.rst:53 -#: ../../content/administration/upgrade/on_premise.rst:48 -msgid "Custom modules (if applicable)" -msgstr "Modules personnalisés (le cas échéant)" +msgid "" +"Take the upgraded development branch and drag & drop it to " +":guilabel:`Staging`." +msgstr "" +"Prenez la branche de développement mise à niveau et faites-la glisser vers " +":guilabel:`Staging`." #: ../../content/administration/upgrade/odoo_sh.rst:55 msgid "" -"The upgrade of a database that contains custom modules is a 2 step process." +"Go to the :guilabel:`Upgrade` tab and select the :guilabel:`target version`." +" Then, click on :guilabel:`Test Upgrade`." msgstr "" -"La mise à niveau d'une base de données contenant des modules personnalisés " -"est un processus en 2 étapes." +"Allez dans l'onglet :guilabel:`Mise à niveau` et sélectionnez la " +":guilabel:`version cible`. Ensuite, cliquez sur :guilabel:`Tester la mise à " +"niveau`." -#: ../../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." -msgstr "" -"La mise à niveau standard est effectuée lorsque votre demande est terminée." - -#: ../../content/administration/upgrade/odoo_sh.rst:58 -#: ../../content/administration/upgrade/on_premise.rst:53 +#: ../../content/administration/upgrade/odoo_sh.rst:62 msgid "" -"Your custom modules also need to be upgraded to keep them compatible with " -"the new version." +"The **latest production daily automatic backup** is sent to the `upgrade " +"platform `_ to start the upgrade test process." msgstr "" -"Vos modules personnalisés doivent également être mis à niveau pour rester " -"compatibles avec la nouvelle version." -#: ../../content/administration/upgrade/odoo_sh.rst:60 +#: ../../content/administration/upgrade/odoo_sh.rst:66 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')" +"You can follow the upgrade process by going to the :guilabel:`Upgrade` menu " +"of your :guilabel:`Production` branch." +msgstr "" +"Vous pouvez suivre le processus de mise à niveau en allant dans le menu " +":guilabel:`Mise à niveau` de votre branche de :guilabel:`Production`." + +#: ../../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 "" +"Lorsque le back up mis à niveau est prêt sur la plateforme `de mise à niveau" +" `_, elle est automatiquement téléchargée de " +"nouveau dans votre projet." + +#: ../../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 "" +"La branche est maintenant dans un **mode spécial** : chaque fois qu'un " +"**commit est poussé** sur la branche, une **opération de restauration** de " +"la sauvegarde mise à niveau se produit, et une **mise à niveau de tous les " +"modules personnalisés** se produit. Cela vous permet d'itérer rapidement sur" +" vos scripts de mise à niveau des modules personnalisés. Le fichier de log " +"du processus de mise à niveau peut être trouvé dans " +":file:`~/logs/upgrade.log` dans votre build de mise à jour." + +#: ../../content/administration/upgrade/odoo_sh.rst:78 +msgid "The **special upgrade mode** is automatically closed after 30 days." +msgstr "" +"Le **mode spécial de mise à niveau** est automatiquement fermé après 30 " +"jours." + +#: ../../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 "" +"Il peut arriver que les modules personnalisés ne soient plus nécessaires " +"après une mise à niveau. Les modules personnalisés de la base de données " +"mise à niveau sont définis pour être mis à niveau. Si les modules sont " +"manquants dans le code, la mise à niveau échoue, ce qui fait échouer " +"l'ensemble du processus. Un module vide avec un manifeste et éventuellement " +"un script de mise à niveau personnalisé sont nécessaires pour nettoyer la " +"base de données. La suppression complète du module doit être gérée par la " +"suite." + +#: ../../content/administration/upgrade/odoo_sh.rst:86 +msgid "Functionally test your upgraded database" +msgstr "Test fonctionnel de votre base de données mise à niveau" + +#: ../../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 "" +"Maintenant que la base de données de test mise à niveau est disponible sur " +"votre branche de staging, **testez-la minutieusement** et assurez-vous que " +"tout fonctionne comme prévu. Une fois que vous êtes satisfait du résultat, " +"vous êtes prêt à mettre à niveau votre base de données de production." + +#: ../../content/administration/upgrade/odoo_sh.rst:93 +msgid "Production upgrade" +msgstr "Mise à niveau en production" + +#: ../../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 "" +"Une fois que vous êtes satisfait de vos tests, vous pouvez commencer le " +"processus sur la branche de :guilabel:`Production`." + +#: ../../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 "" +"Sur votre branche de :guilabel:`Production`, allez dans l'onglet " +":guilabel:`Mise à niveau`, sélectionnez la :guilabel:`version ciblée` et " +"cliquez sur le bouton :guilabel:`démarrer la mise à niveau`." + +#: ../../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 "" +"Le processus actuel est **déclenché dès que vous poussez un nouveau commit**" +" dans votre branche. Assurez-vous de pousser du code qui est compatible avec" +" la nouvelle version. Par exemple en fusionnant le code de votre branche de " +"staging mise à niveau." + +#: ../../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 "" +"Vous pouvez voir la progression de la mise à niveau en allant dans l'onglet " +":guilabel:`Mise à niveau` de la branche principale." + +#: ../../content/administration/upgrade/odoo_sh.rst:118 +msgid "Your database is unavailable throughout the process." +msgstr "" +"Votre base de données est indisponible pendant toute la durée du processus." + +#: ../../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 "" +"En cas de problème, la plate-forme annule automatiquement la mise à niveau, " +"comme dans le cas d'une mise à jour ordinaire. En cas de succès, une " +"sauvegarde est toujours effectuée." + +#: ../../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 "" +"La mise à jour de vos modules personnalisés doit être réussie pour que le " +"processus de mise à niveau soit complet. Assurez-vous que le statut de votre" +" mise à jour est :guilabel:`réussie` avant de l'essayer en production." + +#: ../../content/administration/upgrade/on_premise.rst:6 +msgid "Test upgrade request" msgstr "" -"En fonction de votre contrat, la mise à jour de vos modules personnalisés " -"peut être effectuée - par vous-même - par votre Partenaire - par Odoo (si " -"vous avez opté pour un abonnement de 'Maintenance des Personnalisations')" #: ../../content/administration/upgrade/on_premise.rst:8 msgid "There are two ways to create your upgrade request." @@ -8636,6 +9254,10 @@ msgstr "" "Tout problème rencontré lors des tests doit être signalé via l' `assistance " "`_." +#: ../../content/administration/upgrade/on_premise.rst:41 +msgid "Upgrade your production database" +msgstr "Mise à jour de votre base de données de production" + #: ../../content/administration/upgrade/on_premise.rst:43 msgid "" "Once you have completed the testing successfully, you can proceed to upgrade" @@ -8647,6 +9269,10 @@ msgstr "" " base de données mise à niveau à partir du lien dans l'email et importez-la " "dans votre environnement." +#: ../../content/administration/upgrade/on_premise.rst:48 +msgid "Custom modules (if applicable)" +msgstr "Modules personnalisés (le cas échéant)" + #: ../../content/administration/upgrade/on_premise.rst:50 msgid "" "The upgrade of a database that contains custom modules is a two-step " @@ -8655,6 +9281,19 @@ msgstr "" "La mise à niveau d'une base de données contenant des modules personnalisés " "est un processus en deux étapes." +#: ../../content/administration/upgrade/on_premise.rst:52 +msgid "The standard upgrade is done when your upgrade request is completed." +msgstr "" +"La mise à niveau standard est effectuée lorsque votre demande est terminée." + +#: ../../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 "" +"Vos modules personnalisés doivent également être mis à niveau pour rester " +"compatibles avec la nouvelle version." + #: ../../content/administration/upgrade/on_premise.rst:55 msgid "" "Depending on your contract, the upgrade of your custom modules can be done" @@ -8701,6 +9340,8 @@ msgid "" "Click on the action settings icon next to your main database and select the " "*Upgrade* option." msgstr "" +"Cliquez sur l'icône des paramètres d'action à côté de votre base de données " +"principale et sélectionnez l'option *Mise à niveau*." #: ../../content/administration/upgrade/online_hosting.rst:19 msgid "In the pop-up message that will appear, select Test Upgrade." @@ -8714,6 +9355,10 @@ msgid "" "sent to you with the the link to the upgraded database or to provide " "information if the upgrade failed." msgstr "" +"Cela déclenche le processus de mise à niveau automatique. Un email de " +"confirmation vous est alors envoyé avec le lien vers la base de données mise" +" à niveau ou pour vous fournir des informations si la mise à niveau a " +"échoué." #: ../../content/administration/upgrade/online_hosting.rst:28 msgid "" diff --git a/locale/fr/LC_MESSAGES/finance.po b/locale/fr/LC_MESSAGES/finance.po index 6ae50e020..886b4c7c9 100644 --- a/locale/fr/LC_MESSAGES/finance.po +++ b/locale/fr/LC_MESSAGES/finance.po @@ -9,12 +9,11 @@ # Olivier Dony , 2021 # Frédéric LIETART , 2021 # Alain van de Werve , 2021 +# Olivier Lenoir , 2021 # fr trans , 2021 -# ShevAbam, 2021 # William Henrotin , 2021 # Alexandra Jubert, 2021 # Maxime Chambreuil , 2021 -# Olivier Lenoir , 2021 # Jonathan Castillo , 2021 # Sebastien LANGE, 2021 # Benjamin Stienon , 2021 @@ -29,9 +28,7 @@ # Shark McGnark , 2021 # Vallen Delobel , 2021 # Arnaud Willem , 2021 -# Jérôme Tanché , 2021 # Fred Gilson , 2021 -# Pauline Thiry , 2021 # Christelle Pinchart , 2021 # pafnow , 2021 # Richard Mouthier , 2022 @@ -42,19 +39,20 @@ # Camille Dantinne , 2022 # e2f , 2022 # Richard Mathot , 2022 -# Cécile Collart , 2022 # Khadija Mbazaa , 2022 -# Martin Trigaux, 2022 # jb78180 , 2022 +# Jérôme Tanché , 2022 +# Martin Trigaux, 2022 +# Cécile Collart , 2022 # #, fuzzy 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: 2021-11-02 08:47+0000\n" -"Last-Translator: jb78180 , 2022\n" +"Last-Translator: Cécile Collart , 2022\n" "Language-Team: French (https://www.transifex.com/odoo/teams/41243/fr/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -93,32 +91,25 @@ msgstr "" #: ../../content/applications/finance/accounting.rst:18 msgid "" -"`Odoo Tutorials: Invoicing `_" -msgstr "" -"`Tutoriels Odoo : Facturation `_" - -#: ../../content/applications/finance/accounting.rst:19 -msgid "" "`Odoo Tutorials: Accounting `_" msgstr "" "`Tutoriels Odoo : Comptabilité `_" -#: ../../content/applications/finance/accounting.rst:20 +#: ../../content/applications/finance/accounting.rst:19 msgid ":doc:`Accounting Cheat Sheet `" msgstr ":doc:`Accounting Cheat Sheet `" #: ../../content/applications/finance/accounting/bank.rst:5 -msgid "Bank & Cash" -msgstr "Banque et liquidités" +msgid "Bank and cash" +msgstr "" #: ../../content/applications/finance/accounting/bank/feeds.rst:5 -msgid "Bank Feeds" -msgstr "Provenance des relevés bancaires" +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" -msgstr "Relevés bancaires" +msgid "Bank statements" +msgstr "Relevés de compte" #: ../../content/applications/finance/accounting/bank/feeds/bank_statements.rst:5 msgid "" @@ -285,8 +276,8 @@ msgstr "" "Ajouter le lien du document à la nouvelle documentation traitant du lettrage" #: ../../content/applications/finance/accounting/bank/feeds/bank_synchronization.rst:3 -msgid "Bank Synchronization: Automatic Import" -msgstr "Synchronisation bancaire : Importation Automatique" +msgid "Bank synchronization: Automatic import" +msgstr "" #: ../../content/applications/finance/accounting/bank/feeds/bank_synchronization.rst:5 msgid "" @@ -332,6 +323,10 @@ msgid "**Ponto**: Europe (:doc:`more information `)" msgstr "**Ponto**: Europe (:doc:`plus d'informations `)" #: ../../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 @@ -339,6 +334,7 @@ msgstr "**Ponto**: Europe (:doc:`plus d'informations `)" #: ../../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 @@ -358,6 +354,7 @@ msgstr "**Ponto**: Europe (:doc:`plus d'informations `)" #: ../../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 @@ -366,6 +363,7 @@ msgstr "**Ponto**: Europe (:doc:`plus d'informations `)" #: ../../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 @@ -376,7 +374,7 @@ msgstr "**Ponto**: Europe (:doc:`plus d'informations `)" #: ../../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 @@ -387,11 +385,11 @@ msgstr "**Ponto**: Europe (:doc:`plus d'informations `)" msgid "Configuration" msgstr "Configuration" -#: ../../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 "Utilisateurs On-premise" -#: ../../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 " @@ -406,15 +404,15 @@ msgstr "" "d'erreur de connexion, veuillez vérifier que vous n'avez pas de pare-feu ou " "de proxy bloquant l'adresse suivante :" -#: ../../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 "https://production.odoofin.com/" -#: ../../content/applications/finance/accounting/bank/feeds/bank_synchronization.rst:39 +#: ../../content/applications/finance/accounting/bank/feeds/bank_synchronization.rst:42 msgid "First Synchronization" msgstr "Première Synchronisation" -#: ../../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 " @@ -424,7 +422,7 @@ msgstr "" ":menuselection:`Comptabilité --> Configuration --> Ajouter un compte " "bancaire` ou via la barre de configuration du tableau de bord comptable." -#: ../../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." @@ -432,7 +430,7 @@ msgstr "" "Vous pouvez maintenant rechercher votre institution bancaire. Sélectionnez-" "la et suivez les étapes pour vous synchroniser." -#: ../../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." @@ -441,7 +439,7 @@ msgstr "" "veuillez vérifier que votre navigateur Web ne bloque pas les pop-ups et que " "votre bloqueur de publicités est désactivé." -#: ../../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" @@ -461,7 +459,7 @@ msgstr "" " se connecter avec votre établissement bancaire. Ces informations ne sont " "pas stockées sur les serveurs d'Odoo." -#: ../../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 " @@ -472,7 +470,7 @@ msgstr "" "Vous pouvez modifier la périodicité de création des relevés bancaires dans " "les paramètres de votre journal." -#: ../../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`." @@ -481,11 +479,11 @@ msgstr "" ":menuselection:`Comptabilité --> Configuration --> Synchronisation en " "ligne`." -#: ../../content/applications/finance/accounting/bank/feeds/bank_synchronization.rst:65 +#: ../../content/applications/finance/accounting/bank/feeds/bank_synchronization.rst:68 msgid "Synchronize manually" msgstr "Synchroniser manuellement" -#: ../../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 " @@ -496,7 +494,7 @@ msgstr "" "synchroniser manuellement en cliquant sur le bouton *Synchroniser " "maintenant* sur le tableau de bord." -#: ../../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 " @@ -506,7 +504,7 @@ msgstr "" " Synchronisation en ligne`, sélectionnez votre institution puis cliquez sur " "le bouton *Récupérer les transactions*." -#: ../../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" @@ -522,15 +520,15 @@ msgstr "" "synchronisations en ligne. Dans ce cas, assurez-vous d'effectuer des " "synchronisations manuelles." -#: ../../content/applications/finance/accounting/bank/feeds/bank_synchronization.rst:89 +#: ../../content/applications/finance/accounting/bank/feeds/bank_synchronization.rst:92 msgid "Issues" msgstr "Problèmes" -#: ../../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 "Erreur de synchronisation" -#: ../../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 --> " @@ -542,11 +540,11 @@ msgstr "" "Configuration --> Synchronisation en ligne`, sélectionnez la connexion qui a" " échoué, et copiez la description de l'erreur et la référence." -#: ../../content/applications/finance/accounting/bank/feeds/bank_synchronization.rst:99 +#: ../../content/applications/finance/accounting/bank/feeds/bank_synchronization.rst:102 msgid "Synchronization disconnected" msgstr "Synchronisation déconnectée" -#: ../../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." @@ -554,7 +552,7 @@ msgstr "" "If your connection with the proxy is disconnected, you can reconnect with " "the proxy using the *Reconnecter* button." -#: ../../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" @@ -565,13 +563,13 @@ msgstr "" "directement avec votre identifiant client ou la référence de l'erreur " "répertoriée dans le chatter." -#: ../../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 "" "Processus de migration pour les utilisateurs ayant installé Odoo avant " "décembre 2020" -#: ../../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." @@ -579,7 +577,7 @@ msgstr "" "Si vous êtes On-premise, assurez-vous d'abord que votre source est à jour " "avec la dernière version d'Odoo." -#: ../../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." @@ -588,7 +586,7 @@ msgstr "" "doivent installer le nouveau module manuellement pour utiliser les nouvelles" " fonctionnalités." -#: ../../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: " @@ -600,7 +598,7 @@ msgstr "" " et tapez : **account_online_synchronization**. Vous pouvez ensuite cliquer " "sur le bouton *Installer* pour installer le nouveau module." -#: ../../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." @@ -608,7 +606,7 @@ msgstr "" "Enfin, assurez-vous que tous vos utilisateurs actualisent leur page Odoo en " "appuyant sur CTRL+F5." -#: ../../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 " @@ -622,7 +620,7 @@ msgstr "" "--> Configuration --> Synchronisation en ligne`). Il n'est pas possible de " "resynchroniser ces connexions ; il faut en faire de nouveaux." -#: ../../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." @@ -630,7 +628,7 @@ msgstr "" "Veuillez ne pas désinstaller *account_online_sync* qui est le module " "précédent pour la synchronisation en ligne. Le nouveau le remplace." -#: ../../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." @@ -638,17 +636,17 @@ msgstr "" "Par défaut, *account_online_synchronization* est installé automatiquement " "avec la comptabilité." -#: ../../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 "FAQ" -#: ../../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 "La synchronisation ne fonctionne pas en temps réel. Est-ce normal ?" -#: ../../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 " @@ -670,7 +668,7 @@ msgstr "" "maintenant* n'obtienne pas vos dernières transactions si vous avez déjà " "effectué une telle action plus tôt dans la journée." -#: ../../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" @@ -682,13 +680,13 @@ msgstr "" "avec le statut *Envoyé* seront récupérées. Si elle n'est pas encore " "*Postée*, vous devrez attendre que le statut change." -#: ../../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 "" "La fonctionnalité de synchronisation bancaire en ligne est-elle incluse dans" " mon contrat ?" -#: ../../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." @@ -696,13 +694,13 @@ msgstr "" "**Version Community** : non, cette fonctionnalité n'est pas incluse dans la " "version community." -#: ../../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 "" "**Version en ligne** : Oui, même si vous bénéficiez du contrat One App Free." -#: ../../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." @@ -710,11 +708,11 @@ msgstr "" "**Version Entreprise** : Oui, si vous disposez d'un contrat Entreprise " "valide lié à votre base de données." -#: ../../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 "Certaines banques ont un statut \"Bêta\". Qu'est-ce que ça veut dire ?" -#: ../../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 " @@ -731,13 +729,13 @@ msgstr "" "processus de développement puisque le fournisseur disposera de données et de" " retours réels de la connexion." -#: ../../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 "" "Pourquoi mes transactions ne se synchronisent-elles que lorsque j'actualise " "manuellement ?" -#: ../../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," @@ -749,11 +747,11 @@ msgstr "" " ou un autre type de MFA. Pour cette raison, l'intégrateur ne peut pas " "extraire les transactions tant que le code de sécurité n'est pas fourni." -#: ../../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 "Toutes mes transactions passées ne sont pas dans Odoo, pourquoi ?" -#: ../../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." @@ -761,11 +759,11 @@ msgstr "" "Pour certaines institutions, les transactions ne peuvent être récupérées que" " jusqu'à 3 mois dans le passé." -#: ../../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 "Pourquoi ne vois-je aucune transaction ?" -#: ../../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 " @@ -779,11 +777,11 @@ msgstr "" ":menuselection:`Comptabilité --> Configuration --> Synchronisation en ligne`" " pour cliquer sur le bouton *Récupérer les comptes* lors de la connexion." -#: ../../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 "Il se peut également qu'il n'y ait pas de nouvelles transactions." -#: ../../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 " @@ -794,11 +792,11 @@ msgstr "" "veuillez `soumettre un ticket au support d'Odoo " "`_." -#: ../../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 "Comment mettre à jour mes identifiants bancaires ?" -#: ../../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 " @@ -810,18 +808,18 @@ msgstr "" "informations d'identification et cliquez sur le bouton *Mettre à jour les " "informations d'identification*." -#: ../../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 ":doc:`bank_statements`" -#: ../../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 ":doc:`ponto`" -#: ../../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 ":doc:`saltedge`" @@ -1475,11 +1473,8 @@ msgstr "" "lettrage se fera automatiquement." #: ../../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" -msgstr "Lettrage bancaire" +msgid "Bank reconciliation" +msgstr "Rapprochement bancaire" #: ../../content/applications/finance/accounting/bank/reconciliation/reconciliation_models.rst:3 msgid "Reconciliation Models" @@ -1625,7 +1620,7 @@ msgstr "" " créer un nouveau, puis remplissez le formulaire." #: ../../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 "Type" @@ -2442,16 +2437,94 @@ msgstr "" "Les transactions seront ajoutées à l'enregistrement des paiements en espèces" " en cours." +#: ../../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" -msgstr "Localisations Fiscales" +msgid "Fiscal localizations" +msgstr "" #: ../../content/applications/finance/accounting/fiscal_localizations/localizations.rst:5 msgid "Localizations" msgstr "Localisation" #: ../../content/applications/finance/accounting/fiscal_localizations/localizations/argentina.rst:3 -#: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:13 msgid "Argentina" msgstr "Argentine" @@ -2475,7 +2548,7 @@ msgstr "" #: ../../content/applications/finance/accounting/fiscal_localizations/localizations/argentina.rst:10 msgid "`VIDEO WEBINAR OF A COMPLETE DEMO `_." -msgstr "" +msgstr "`WEBINAR D'UNE DEMO COMPLETE `_." #: ../../content/applications/finance/accounting/fiscal_localizations/localizations/argentina.rst:11 msgid "`ECOMMERCE `_." @@ -2684,6 +2757,9 @@ msgid "" "generated, it needs to be uploaded in Odoo, using the pencil next in the " "field “Certificado” and selecting the corresponding file." msgstr "" +"Téléchargez le certificat et la clé privée (Odoo). Une fois le certificat " +"généré, il faut le télécharger dans Odoo, en utilisant le crayon à côté du " +"champ \"Certificado\" et sélectionner le fichier correspondant." #: ../../content/applications/finance/accounting/fiscal_localizations/localizations/argentina.rst:112 msgid "" @@ -3003,6 +3079,9 @@ msgid "" "``wsfev1: Electronic Invoice.`` This is the most common service, is used to " "generated invoices for document types A, B, C, M with no detail per item." msgstr "" +"``wsfev1 : Facture électronique.`` C'est le service le plus courant, il est " +"utilisé pour générer des factures pour les types de documents A, B, C, M " +"sans détail par article." #: ../../content/applications/finance/accounting/fiscal_localizations/localizations/argentina.rst:250 msgid "" @@ -3025,6 +3104,8 @@ msgid "" "**AFIP POS Number**: This is the number configured in the AFIP to identify " "the operations related to this AFIP POS." msgstr "" +"**Numéro de POS AFIP** : Il s'agit du numéro configuré dans l'AFIP pour " +"identifier les opérations liées à ce POS AFIP." #: ../../content/applications/finance/accounting/fiscal_localizations/localizations/argentina.rst:263 msgid "" @@ -3139,7 +3220,7 @@ msgstr "" #: ../../content/applications/finance/accounting/fiscal_localizations/localizations/argentina.rst:328 msgid "Electronic Invoice elements" -msgstr "" +msgstr "Éléments de la facture électronique" #: ../../content/applications/finance/accounting/fiscal_localizations/localizations/argentina.rst:329 msgid "" @@ -3149,22 +3230,32 @@ msgid "" "raised indicating the issue/proposed solution and the invoice remains in " "draft until the related data is corrected." msgstr "" +"En cas d'utilisation de la facture électronique, si toutes les informations " +"sont correctes, la facture est enregistrée de manière standard. Si quelque " +"chose doit être corrigé (voir la section \"Erreurs courantes\" pour plus de " +"détails), un message d'erreur est affiché indiquant le problème et la " +"solution proposée et la facture reste en projet jusqu'à ce que les données " +"soient corrigées." #: ../../content/applications/finance/accounting/fiscal_localizations/localizations/argentina.rst:334 msgid "" "Once the invoice is posted, the information related to the AFIP validation " "and status is displayed in the AFIP Tab, including:" msgstr "" +"Une fois la facture enregistrée, les informations relatives à la validation " +"et au statut AFIP sont affichées dans l'onglet AFIP, notamment :" #: ../../content/applications/finance/accounting/fiscal_localizations/localizations/argentina.rst:337 msgid "AFIP Autorisation: CAE number." -msgstr "" +msgstr "Autorisation AFIP : Numéro CAE." #: ../../content/applications/finance/accounting/fiscal_localizations/localizations/argentina.rst:338 msgid "" "Expiration date: Deadline to deliver the invoice to the customers. Normally " "10 days after the CAE is generated." msgstr "" +"Date d'expiration : Date limite de transmission de la facture aux clients. " +"Normalement 10 jours après la génération du CAE." #: ../../content/applications/finance/accounting/fiscal_localizations/localizations/argentina.rst:340 msgid "Result:" @@ -3172,7 +3263,7 @@ msgstr "Résultat:" #: ../../content/applications/finance/accounting/fiscal_localizations/localizations/argentina.rst:342 msgid "Aceptado en AFIP." -msgstr "" +msgstr "Aceptado en AFIP." #: ../../content/applications/finance/accounting/fiscal_localizations/localizations/argentina.rst:343 msgid "Aceptado con Observaciones." @@ -3187,6 +3278,8 @@ msgid "" "Based on the AFIP Responsibility type, the VAT tax can have a different " "behavior on the pdf report:" msgstr "" +"En fonction du type de responsabilité AFIP, la taxe sur la TVA peut avoir un" +" comportement différent sur le rapport pdf :" #: ../../content/applications/finance/accounting/fiscal_localizations/localizations/argentina.rst:354 msgid "" @@ -3194,6 +3287,9 @@ msgid "" "identified in the report. This condition applies when the customer has the " "following AFIP Responsibility type:" msgstr "" +"**A. Taxe exclue :** Dans ce cas, le montant taxé doit être clairement " +"identifié dans le rapport. Cette condition s'applique lorsque le client a le" +" type de responsabilité AFIP suivant :" #: ../../content/applications/finance/accounting/fiscal_localizations/localizations/argentina.rst:357 msgid "Responsable Inscripto." @@ -3205,6 +3301,10 @@ msgid "" "part of the product price, subtotal and totals. This condition applies when " "the customer has the following AFIP Responsibility types:" msgstr "" +"**B. Montant de la taxe inclus :** Cela signifie que le montant de la taxe " +"est inclus dans le prix du produit, le sous-total et les totaux. Cette " +"condition s'applique lorsque le client possède les types de responsabilité " +"AFIP suivants :" #: ../../content/applications/finance/accounting/fiscal_localizations/localizations/argentina.rst:366 msgid "IVA Sujeto Exento." @@ -3224,11 +3324,11 @@ msgstr "IVA liberado." #: ../../content/applications/finance/accounting/fiscal_localizations/localizations/argentina.rst:376 msgid "Special Use Cases" -msgstr "" +msgstr "Cas d'utilisation particuliers" #: ../../content/applications/finance/accounting/fiscal_localizations/localizations/argentina.rst:379 msgid "Invoices for Services" -msgstr "" +msgstr "Factures pour des services" #: ../../content/applications/finance/accounting/fiscal_localizations/localizations/argentina.rst:380 msgid "" @@ -3236,6 +3336,9 @@ msgid "" "the service starting and ending date, this information can be filled in the" " tab “Other Info”:" msgstr "" +"Pour les factures électroniques qui incluent des services, l'AFIP exige de " +"déclarer la date de début et de fin du service, cette information peut être " +"remplie dans l'onglet “Autres informations” :" #: ../../content/applications/finance/accounting/fiscal_localizations/localizations/argentina.rst:386 msgid "" @@ -3243,6 +3346,9 @@ msgid "" " values will be filled automatically considering the beginning and day of " "the invoice month:" msgstr "" +"Si les dates ne sont pas sélectionnées manuellement avant la validation de " +"la facture, les valeurs seront remplies automatiquement en considérant le " +"début et le jour du mois de la facture :" #: ../../content/applications/finance/accounting/fiscal_localizations/localizations/argentina.rst:394 msgid "Exportation Invoices" @@ -3280,7 +3386,7 @@ msgstr "" #: ../../content/applications/finance/accounting/fiscal_localizations/localizations/argentina.rst:408 msgid "Exempt Taxes." -msgstr "" +msgstr "Exonération d'impôts." #: ../../content/applications/finance/accounting/fiscal_localizations/localizations/argentina.rst:414 msgid "" @@ -3366,6 +3472,13 @@ msgid "" "productivity, through the early collection of credits and receivables issued" " to their clients and / or vendors." msgstr "" +"**Factures:** Il existe plusieurs types de documents classés comme Mipyme " +"également connu sous le nom de facture électronique de crédit (FCE en " +"espagnol), qui est utilisé pour stimuler les PME, son objectif est de " +"développer un mécanisme qui améliore les conditions de financement de ces " +"entreprises et leur permet d'augmenter leur productivité, grâce au " +"recouvrement anticipé des crédits et des créances émises à leurs clients et " +"/ ou fournisseurs." #: ../../content/applications/finance/accounting/fiscal_localizations/localizations/argentina.rst:452 msgid "Specific document types (201, 202, 206, etc)." @@ -3373,7 +3486,7 @@ msgstr "Types de documents spécifiques (201, 202, 206, etc.)." #: ../../content/applications/finance/accounting/fiscal_localizations/localizations/argentina.rst:453 msgid "The emisor should be eligible by the AFIP to MiPyme transactions." -msgstr "" +msgstr "L'émetteur doit être éligible par l'AFIP aux transactions MiPyme." #: ../../content/applications/finance/accounting/fiscal_localizations/localizations/argentina.rst:454 msgid "The amount should be bigger than 100,000 ARS." @@ -3384,24 +3497,34 @@ msgid "" "A bank account type CBU must be related to the emisor, otherwise the invoice" " can’t be validated, having these errors messages for example:" msgstr "" +"Un compte bancaire de type CBU doit être lié à l'émetteur, sinon la facture " +"ne peut pas être validée, voici quelques messages d'erreurs à titre " +"d'exemple :" #: ../../content/applications/finance/accounting/fiscal_localizations/localizations/argentina.rst:461 msgid "" "**Credit& Debit Notes:** When creating a Credit/Debit note related to a FCE " "document, it is important take the next points into consideration:" msgstr "" +"**Notes de crédit et de débit:** Lors de la création d'une note de " +"crédit/débit liée à un document FCE, il est important de prendre en " +"considération les points suivants :" #: ../../content/applications/finance/accounting/fiscal_localizations/localizations/argentina.rst:464 msgid "" "Use the Credit and Debit Note buttons, so the correct reference of the " "originator document passed to the note." msgstr "" +"Utilisez les boutons Note de crédit et Note de débit, afin que la référence " +"correcte du document d'origine soit transmise à la note." #: ../../content/applications/finance/accounting/fiscal_localizations/localizations/argentina.rst:470 msgid "" "The document letter should be the same than the originator document (either " "A or B)." msgstr "" +"La lettre du document doit être la même que celle du document d'origine " +"(soit A, soit B)." #: ../../content/applications/finance/accounting/fiscal_localizations/localizations/argentina.rst:471 msgid "" @@ -3410,6 +3533,11 @@ msgid "" "different between the emission day and the payment date, it’s possible to " "create a credit/debit note to decrease/increase the amount to pay in ARS." msgstr "" +"La même devise que le document source doit être utilisée. Lors de " +"l'utilisation d'une devise secondaire, il y a une différence de change si le" +" taux de change est différent entre le jour d'émission et la date de " +"paiement, il est possible de créer une note de crédit/débit pour " +"diminuer/augmenter le montant à payer en ARS." #: ../../content/applications/finance/accounting/fiscal_localizations/localizations/argentina.rst:476 msgid "In the workflow we can have two scenarios:" @@ -3438,16 +3566,22 @@ msgid "" "the AFIP includes a barcode at the bottom of the format which represent the " "CAE number, the Expiration Date is also displayed as it’s legal requirement:" msgstr "" +"Le rapport PDF relatif aux factures électroniques qui ont été validées par " +"l'AFIP comprend un code-barres en bas du format qui représente le numéro " +"CAE, la date d'expiration est également affichée comme l'exige la loi :" #: ../../content/applications/finance/accounting/fiscal_localizations/localizations/argentina.rst:496 msgid "Troubleshooting and Auditing" -msgstr "" +msgstr "Résolution des problèmes et audit" #: ../../content/applications/finance/accounting/fiscal_localizations/localizations/argentina.rst:497 msgid "" "For auditing and troubleshooting purposes you can get the detailed " "information of an invoice number that has been previously sent to the AFIP," msgstr "" +"À des fins d'audit et de résolution de problèmes, vous pouvez obtenir les " +"informations détaillées d'un numéro de facture qui a été précédemment envoyé" +" à l'AFIP," #: ../../content/applications/finance/accounting/fiscal_localizations/localizations/argentina.rst:507 msgid "" @@ -3455,11 +3589,13 @@ msgid "" "and POS Number as support for any possible issues on the sequence " "synchronization between Odoo and AFIP." msgstr "" +"Vous pouvez également obtenir le dernier numéro utilisé dans AFIP pour un " +"type de document et un numéro de point de vente spécifiques, afin d'éviter " +"tout problème de synchronisation des séquences entre Odoo et AFIP." #: ../../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 "Factures fournisseurs" @@ -3470,6 +3606,10 @@ msgid "" " Responsibility type of Issuer and Customer, but the value can be switched " "if necessary." msgstr "" +"En fonction du journal d'achat sélectionné pour la facture du fournisseur, " +"le type de document est désormais un champ obligatoire. Cette valeur est " +"remplie automatiquement sur la base du type de responsabilité AFIP de " +"l'émetteur et du client, mais la valeur peut être modifiée si nécessaire." #: ../../content/applications/finance/accounting/fiscal_localizations/localizations/argentina.rst:524 msgid "" @@ -3477,6 +3617,9 @@ msgid "" "validated automatically, in case that the format is invalid a user error " "will be displayed indicating the correct format that is expected." msgstr "" +"Le numéro de document doit être enregistré manuellement et le format est " +"validé automatiquement. Si le format n'est pas valide, une erreur " +"utilisateur s'affiche, indiquant le format correct attendu." #: ../../content/applications/finance/accounting/fiscal_localizations/localizations/argentina.rst:531 msgid "" @@ -3484,6 +3627,9 @@ msgid "" "the difference that the document sequence is input by the user: “Document " "Prefix - Letter - Document number\"." msgstr "" +"Le numéro de facture du fournisseur est structuré de la même manière que les" +" factures, à la différence que la séquence des documents est introduite par " +"l'utilisateur : “Préfixe du document - Lettre - Numéro du document\"." #: ../../content/applications/finance/accounting/fiscal_localizations/localizations/argentina.rst:536 msgid "Validate Vendor Bill number in AFIP" @@ -3496,11 +3642,18 @@ msgid "" ":menuselection:`Accounting --> Settings --> Argentinian Localization --> " "Validate document in the AFIP`, considering the following levels:" msgstr "" +"Comme la plupart des entreprises ont des contrôles internes pour vérifier " +"que la facture du fournisseur est liée à un document AFIP valide, une " +"validation automatique peut être définie dans :menuselection:`Comptabilité " +"--> Paramètres --> Localisation argentine --> Valider le document dans " +"l'AFIP`, en considérant les niveaux suivants :" #: ../../content/applications/finance/accounting/fiscal_localizations/localizations/argentina.rst:541 msgid "" "**Not available:** The verification is not done (this is the default value)." msgstr "" +"**Non disponible:** La vérification n'est pas effectuée (c'est la valeur par" +" défaut)." #: ../../content/applications/finance/accounting/fiscal_localizations/localizations/argentina.rst:542 msgid "" @@ -3516,6 +3669,9 @@ msgid "" "**Required:** The verification is done and it doesn't allow the user to " "post the vendor bill if the document number is not valid." msgstr "" +"**Requise:** La vérification est faite et ne permet pas à l'utilisateur " +"d'enregistrer la facture du fournisseur si le numéro du document n'est pas " +"valide." #: ../../content/applications/finance/accounting/fiscal_localizations/localizations/argentina.rst:551 msgid "How to use it in Odoo" @@ -3526,27 +3682,34 @@ msgid "" "This tool incorporates in the vendor bill a new \"Verify on AFIP\" button " "located next to the AFIP Authorization code." msgstr "" +"Cet outil intègre dans la facture du fournisseur un nouveau bouton " +"\"Vérifier sur AFIP\" situé à côté du code d'autorisation AFIP." #: ../../content/applications/finance/accounting/fiscal_localizations/localizations/argentina.rst:558 msgid "" "In case it’s not a valid AFIP authorization the value “Rejected” will be " "displayed and the details of the validation will be added to the chatter." msgstr "" +"S'il ne s'agit pas d'une autorisation AFIP valide, la valeur \"Rejeté\" sera" +" affichée et les détails de la validation seront ajoutés au chat." #: ../../content/applications/finance/accounting/fiscal_localizations/localizations/argentina.rst:566 #: ../../content/applications/finance/accounting/fiscal_localizations/localizations/peru.rst:477 msgid "Special Use cases" -msgstr "" +msgstr "Cas d'utilisation particuliers" #: ../../content/applications/finance/accounting/fiscal_localizations/localizations/argentina.rst:568 msgid "Untaxed Concepts" -msgstr "" +msgstr "Concepts exonérés" #: ../../content/applications/finance/accounting/fiscal_localizations/localizations/argentina.rst:569 msgid "" "There are some transactions that include items that are not part of the VAT " "base amount, this is commonly used in fuel and gasoline invoices." msgstr "" +"Certaines transactions incluent des éléments qui ne font pas partie du " +"montant de base de la TVA. C'est le cas des factures de carburant et " +"d'essence." #: ../../content/applications/finance/accounting/fiscal_localizations/localizations/argentina.rst:572 msgid "" @@ -3554,10 +3717,13 @@ msgid "" "part of the VAT base amount and an additional item to register the amount of" " the Exempt concept:" msgstr "" +"La facture du fournisseur sera enregistrée en utilisant un poste pour chaque" +" produit faisant partie du montant de base de la TVA et un poste " +"supplémentaire pour enregistrer le montant du concept exonéré :" #: ../../content/applications/finance/accounting/fiscal_localizations/localizations/argentina.rst:579 msgid "Perception Taxes" -msgstr "" +msgstr "Taxes de perception" #: ../../content/applications/finance/accounting/fiscal_localizations/localizations/argentina.rst:580 msgid "" @@ -3566,12 +3732,19 @@ msgid "" "product lines, as result we will have one tax group for the VAT and one for " "the perception, the perception default value is always 1.00." msgstr "" +"La facture du fournisseur sera enregistrée en utilisant 1 élément pour " +"chaque produit qui fait partie du montant de base de la TVA, la taxe de " +"perception peut être ajoutée dans n'importe quelle ligne de produit, comme " +"résultat nous aurons un groupe de taxe pour la TVA et un pour la perception," +" la valeur par défaut de la perception est toujours 1.00." #: ../../content/applications/finance/accounting/fiscal_localizations/localizations/argentina.rst:588 msgid "" "You should use the pencil that is the next to the Perception amount to edit " "it and set the correct amount." msgstr "" +"Vous devez utiliser le crayon qui se trouve à côté du montant de Perception " +"pour le modifier et définir le montant correct." #: ../../content/applications/finance/accounting/fiscal_localizations/localizations/argentina.rst:594 msgid "After this is done the invoice can be validated." @@ -3584,6 +3757,8 @@ msgstr "Rapports" #: ../../content/applications/finance/accounting/fiscal_localizations/localizations/argentina.rst:600 msgid "As part of the localization the next Financial reports were added:" msgstr "" +"Dans le cadre de la localisation, les prochains rapports financiers ont été " +"ajoutés :" #: ../../content/applications/finance/accounting/fiscal_localizations/localizations/argentina.rst:606 msgid "VAT Reports" @@ -3619,7 +3794,7 @@ msgstr "Australie" #: ../../content/applications/finance/accounting/fiscal_localizations/localizations/australia.rst:8 msgid "KeyPay Australian Payroll" -msgstr "" +msgstr "KeyPay - Paie australienne" #: ../../content/applications/finance/accounting/fiscal_localizations/localizations/australia.rst:10 msgid "" @@ -3628,10 +3803,15 @@ msgid "" "Payroll administration is still done in KeyPay. We only record the journal " "entries in Odoo." msgstr "" +"Le module KeyPay synchronise automatiquement les écritures comptables des " +"fiches de paie (par exemple, les frais, les charges sociales, les dettes, " +"les impôts) de KeyPay vers Odoo. L'administration de la paie se fait " +"toujours dans KeyPay. Nous enregistrons uniquement les écritures comptables " +"dans Odoo." #: ../../content/applications/finance/accounting/fiscal_localizations/localizations/australia.rst:15 msgid "Configuration Steps" -msgstr "" +msgstr "Étapes de configuration" #: ../../content/applications/finance/accounting/fiscal_localizations/localizations/australia.rst:17 msgid "Create a company located in Australia." @@ -3647,27 +3827,35 @@ msgstr "" #: ../../content/applications/finance/accounting/fiscal_localizations/localizations/australia.rst:19 msgid "Configure the *KeyPay API*." -msgstr "" +msgstr "Configurer *l'API KeyPay*." #: ../../content/applications/finance/accounting/fiscal_localizations/localizations/australia.rst:25 msgid "" "More fields become visible after clicking on *Enable KeyPay Integration*." msgstr "" +"D'autres champs deviennent visibles après avoir cliqué sur *Activer " +"l'intégration KeyPay*." #: ../../content/applications/finance/accounting/fiscal_localizations/localizations/australia.rst:31 msgid "" "You can find the API Key in the *My Account* section of the KeyPay platform." msgstr "" +"Vous pouvez trouver la clé API dans la section *Mon compte* de la plateforme" +" KeyPay." #: ../../content/applications/finance/accounting/fiscal_localizations/localizations/australia.rst:37 msgid "" "The **Payroll URL** is pre-filled with " "``https://keypay.yourpayroll.com.au``. *Please do not change it.*" msgstr "" +"**L'URL de la Paie** est pré-remplie avec " +"``https://keypay.yourpayroll.com.au``. *Veuillez ne pas la modifier.*" #: ../../content/applications/finance/accounting/fiscal_localizations/localizations/australia.rst:39 msgid "You can find the **Business ID** in the KeyPay URL. (i.e., ``189241``)" msgstr "" +"Vous pouvez trouver le **Business ID** dans l'URL KeyPay. (par exemple, " +"``189241``)" #: ../../content/applications/finance/accounting/fiscal_localizations/localizations/australia.rst:45 msgid "You can choose any Odoo journal to post the payslip entries." @@ -3677,7 +3865,7 @@ msgstr "" #: ../../content/applications/finance/accounting/fiscal_localizations/localizations/australia.rst:48 msgid "How does the API work?" -msgstr "" +msgstr "Comment fonctionne l'API ?" #: ../../content/applications/finance/accounting/fiscal_localizations/localizations/australia.rst:50 msgid "" @@ -3685,21 +3873,31 @@ msgid "" "draft mode. The reference includes the KeyPay payslip entry ID in brackets " "for the user to easily retrieve the same record in KeyPay and Odoo." msgstr "" +"L'API synchronise les entrées de journal de KeyPay vers Odoo et les laisse " +"en mode brouillon. La référence inclut l'ID de l'entrée de la fiche de paie " +"KeyPay entre parenthèses pour que l'utilisateur puisse facilement retrouver " +"le même enregistrement dans KeyPay et Odoo." #: ../../content/applications/finance/accounting/fiscal_localizations/localizations/australia.rst:59 msgid "The API sync is triggered by scheduled actions." msgstr "" +"La synchronisation de l'API est déclenchée par des actions programmées." #: ../../content/applications/finance/accounting/fiscal_localizations/localizations/australia.rst:65 msgid "" "KeyPay payslip entries also work based on double-entry bookkeeping. Debit " "must equal credit (like in Odoo)." msgstr "" +"Les entrées des fiches de paie KeyPay fonctionnent également sur la base de " +"la comptabilité en partie double. Le débit doit être égal au crédit (comme " +"dans Odoo)." #: ../../content/applications/finance/accounting/fiscal_localizations/localizations/australia.rst:68 msgid "" "The accounts used by KeyPay are defined in the section **Payroll settings**." msgstr "" +"Les comptes utilisés par KeyPay sont définis dans la section **Paramètres de" +" paie**." #: ../../content/applications/finance/accounting/fiscal_localizations/localizations/australia.rst:74 msgid "" @@ -3722,6 +3920,8 @@ msgid "" "`VIDEO WEBINAR OF CHILEAN LOCALIZATION: INTRO AND DEMO " "`_." msgstr "" +"`WEBINAR SUR LA LOCALISATION CHILIENNE : INTRO ET DEMO " +"`_." #: ../../content/applications/finance/accounting/fiscal_localizations/localizations/chile.rst:11 msgid "`VIDEO WEBINAR OF DELIVERY GUIDE `_." @@ -3742,6 +3942,10 @@ msgid "" "Chile and under the SII (Servicio de Impuestos Internos) regulations and " "guidelines." msgstr "" +"**l10n_cl:** Ajoute des fonctionnalités de comptabilité pour la localisation" +" chilienne, qui représentent la configuration minimale requise pour qu'une " +"entreprise puisse opérer au Chili, selon les réglementations et directives " +"du SII (Servicio de Impuestos Internos)." #: ../../content/applications/finance/accounting/fiscal_localizations/localizations/chile.rst:23 msgid "" @@ -3749,12 +3953,17 @@ msgid "" "generate and receive Electronic Invoice via web service, based on the SII " "regulations." msgstr "" +"**l10n_cl_edi:** Comprend toutes les exigences techniques et fonctionnelles " +"pour générer et recevoir une facture électronique via un service web, sur la" +" base des règlements SII." #: ../../content/applications/finance/accounting/fiscal_localizations/localizations/chile.rst:26 msgid "" "**l10n_cl_reports:** Adds the reports Propuesta F29 y Balance Tributario (8" " columnas)." msgstr "" +"**l10n_cl_reports:** Ajoute les rapports Propuesta F29 y Balance Tributario " +"(8 columnas)." #: ../../content/applications/finance/accounting/fiscal_localizations/localizations/chile.rst:32 msgid "Install the Chilean localization modules" @@ -3767,6 +3976,10 @@ msgid "" "Accounting**. In case this last one is not installed, Odoo installs it " "automatically with E-invoicing." msgstr "" +"Pour cela, allez dans *Apps* et cherchez Chili. Cliquez ensuite sur " +"*Installer* dans le module **Chili E-facturation**. Ce module a une " +"dépendance avec **Chili - Comptabilité**. Dans le cas où ce dernier n'est " +"pas installé, Odoo l'installe automatiquement avec E-facturation." #: ../../content/applications/finance/accounting/fiscal_localizations/localizations/chile.rst:43 msgid "" @@ -3788,6 +4001,11 @@ msgid "" "elements required for Electronic Invoice, the easiest way to configure it is" " in :menuselection:`Accounting --> Settings --> Chilean Localization`." msgstr "" +"Une fois les modules installés, la première étape consiste à configurer les " +"données de votre entreprise. En plus des informations de base, vous devez " +"ajouter toutes les données et les éléments requis pour la facture " +"électronique, la façon la plus simple de le configurer est dans " +":menuselection:`Comptabilité --> Paramètres --> Localisation chilienne`." #: ../../content/applications/finance/accounting/fiscal_localizations/localizations/chile.rst:56 msgid "" @@ -3801,6 +4019,15 @@ msgid "" "communicate this to your Account Manager as a special process outside Odoo " "is required in order to complete this certification." msgstr "" +"Toute la configuration et les fonctionnalités suivantes ne sont disponibles " +"dans Odoo que si votre entreprise a déjà passé le `processus de " +"certification `_ dans le SII - Sistema de " +"Facturación de Mercado, cette certification vous permet de générer des " +"factures électroniques depuis votre ERP et de les envoyer automatiquement au" +" SII. Si votre entreprise n'a pas encore passé cette certification, assurez-" +"vous de le communiquer à votre Account Manager car un processus spécial en " +"dehors d'Odoo est nécessaire pour obtenir cette certification." #: ../../content/applications/finance/accounting/fiscal_localizations/localizations/chile.rst:66 msgid "Fiscal Information" @@ -3811,11 +4038,13 @@ msgid "" "Fill in the fiscal information for your company according to the SII " "register, follow the instructions on each section." msgstr "" +"Remplissez les informations fiscales de votre entreprise selon le registre " +"SII, en suivant les instructions de chaque section." #: ../../content/applications/finance/accounting/fiscal_localizations/localizations/chile.rst:76 #: ../../content/applications/finance/accounting/fiscal_localizations/localizations/chile.rst:186 msgid "Electronic Invoice Data" -msgstr "" +msgstr "Données de facturation électronique" #: ../../content/applications/finance/accounting/fiscal_localizations/localizations/chile.rst:78 msgid "" @@ -3824,10 +4053,15 @@ msgid "" "email address to receive invoices from your vendors and the alias you use to" " send invoices to your customers." msgstr "" +"Cela fait partie des principales informations requises pour générer une " +"facture électronique. Sélectionnez votre environnement et les informations " +"légales, ainsi que l'adresse électronique pour recevoir les factures de vos " +"fournisseurs et l'alias que vous utilisez pour envoyer les factures à vos " +"clients." #: ../../content/applications/finance/accounting/fiscal_localizations/localizations/chile.rst:87 msgid "Configure DTE Incoming email server" -msgstr "" +msgstr "Configurer le serveur de courrier électronique entrant du DTE" #: ../../content/applications/finance/accounting/fiscal_localizations/localizations/chile.rst:89 msgid "" @@ -3835,12 +4069,18 @@ msgid "" " it is crucial to define the DTE incoming email server, considering this " "configuration:" msgstr "" +"Afin de recevoir les courriels de réclamation et d'acceptation de vos " +"clients, il est crucial de définir le serveur de courriel entrant DTE, en " +"considérant cette configuration :" #: ../../content/applications/finance/accounting/fiscal_localizations/localizations/chile.rst:97 msgid "" "For your Go-live make sure you archive/remove from your inbox all the emails" " related to vendor bills that are not required to be processed in Odoo." msgstr "" +"Pour votre Go-live, assurez-vous d'archiver/supprimer de votre boîte de " +"réception tous les courriels relatifs aux factures des fournisseurs qui ne " +"doivent pas être traités dans Odoo." #: ../../content/applications/finance/accounting/fiscal_localizations/localizations/chile.rst:101 #: ../../content/applications/finance/accounting/fiscal_localizations/localizations/peru.rst:215 @@ -3853,6 +4093,9 @@ msgid "" " with the extension ``.pfx`` is required, proceed to this section and load " "your file and password." msgstr "" +"Afin de générer la signature électronique de la facture, un certificat " +"numérique avec l'extension ``.pfx`` est nécessaire, passez à cette section " +"et chargez votre fichier et votre mot de passe." #: ../../content/applications/finance/accounting/fiscal_localizations/localizations/chile.rst:114 msgid "" @@ -3861,6 +4104,11 @@ msgid "" "the other hand, if you need to restrict the certificate for a particular " "user, just define the users in the certificate." msgstr "" +"Un certificat peut être partagé entre plusieurs utilisateurs. Si c'est le " +"cas, laissez le champ utilisateur vide, afin que tous vos utilisateurs de " +"facturation puissent utiliser le même. D'autre part, si vous devez " +"restreindre le certificat à un utilisateur particulier, définissez " +"simplement les utilisateurs dans le certificat." #: ../../content/applications/finance/accounting/fiscal_localizations/localizations/chile.rst:119 msgid "" @@ -3869,6 +4117,10 @@ msgid "" "case, you can manually edit this field by filling it with the Certificate’s " "legal representative RUT." msgstr "" +"Dans certains cas, en fonction du format du certificat, il est possible que " +"le champ Numéro de série du sujet ne soit pas chargé automatiquement. Si " +"c'est le cas, vous pouvez éditer manuellement ce champ en le remplissant " +"avec le RUT du représentant légal du certificat." #: ../../content/applications/finance/accounting/fiscal_localizations/localizations/chile.rst:124 #: ../../content/applications/finance/accounting/fiscal_localizations/localizations/chile.rst:702 @@ -3880,6 +4132,8 @@ msgid "" "The report Propuesta F29 requires two values that need to be defined as part" " of the company configuration:" msgstr "" +"Le rapport Propuesta F29 requiert deux valeurs qui doivent être définies " +"dans le cadre de la configuration de l'entreprise :" #: ../../content/applications/finance/accounting/fiscal_localizations/localizations/chile.rst:134 #: ../../content/applications/finance/accounting/fiscal_localizations/localizations/peru.rst:226 @@ -3894,6 +4148,10 @@ msgid "" "currency rate configuration, and you can set a predefined interval for the " "rate updates." msgstr "" +"Le taux officiel des devises au Chili est fourni par le service chilien " +"`mindicador.cl `_. Vous pouvez trouver ce service " +"dans la configuration du taux de change, et vous pouvez définir un " +"intervalle prédéfini pour les mises à jour du taux." #: ../../content/applications/finance/accounting/fiscal_localizations/localizations/chile.rst:145 msgid "Chart of accounts" @@ -3905,6 +4163,9 @@ msgid "" "included in the localization module. The accounts are mapped automatically " "in:" msgstr "" +"Le plan comptable est installé par défaut comme faisant partie de l'ensemble" +" des données incluses dans le module de localisation. Les comptes sont " +"mappés automatiquement dans :" #: ../../content/applications/finance/accounting/fiscal_localizations/localizations/chile.rst:151 #: ../../content/applications/finance/accounting/fiscal_localizations/localizations/peru.rst:70 @@ -3917,11 +4178,11 @@ msgstr "" #: ../../content/applications/finance/accounting/fiscal_localizations/localizations/chile.rst:153 msgid "Transfer Accounts." -msgstr "" +msgstr "Comptes de transferts." #: ../../content/applications/finance/accounting/fiscal_localizations/localizations/chile.rst:154 msgid "Conversion Rate." -msgstr "" +msgstr "Taux de conversion." #: ../../content/applications/finance/accounting/fiscal_localizations/localizations/chile.rst:158 msgid "Master Data" @@ -3933,10 +4194,13 @@ msgid "" " SII are now available on the Partner form. This information is essential " "for most transactions." msgstr "" +"Dans le cadre de la localisation chilienne, les types d'identification " +"définis par le SII sont désormais disponibles sur le formulaire Partenaire. " +"Cette information est essentielle pour la plupart des transactions." #: ../../content/applications/finance/accounting/fiscal_localizations/localizations/chile.rst:174 msgid "TaxpayerType" -msgstr "" +msgstr "Type de contribuable" #: ../../content/applications/finance/accounting/fiscal_localizations/localizations/chile.rst:176 msgid "" @@ -3956,6 +4220,10 @@ msgid "" "to define the email that is going to appear as the sender of the electronic " "invoice to your customer, and the Industry description." msgstr "" +"Dans le cadre des informations envoyées dans la facture électronique, vous " +"devez définir l'adresse électronique qui apparaîtra comme l'expéditeur de la" +" facture électronique à votre client, ainsi que la description de " +"l'industrie." #: ../../content/applications/finance/accounting/fiscal_localizations/localizations/chile.rst:200 msgid "" @@ -3968,10 +4236,13 @@ msgstr "" #: ../../content/applications/finance/accounting/fiscal_localizations/localizations/chile.rst:210 msgid "Chile has several tax types, the most common ones are:" msgstr "" +"Le Chili compte plusieurs types d'impôts, les plus courants étant les " +"suivants :" #: ../../content/applications/finance/accounting/fiscal_localizations/localizations/chile.rst:212 msgid "VAT. Is the regular VAT and it can have several rates." msgstr "" +"LA TVA. Il s'agit de la TVA normale et elle peut avoir plusieurs taux." #: ../../content/applications/finance/accounting/fiscal_localizations/localizations/chile.rst:213 msgid "" @@ -4012,6 +4283,9 @@ msgid "" " printed reports and that needs to be easily identified within the set of " "invoices as well of account moves." msgstr "" +"Le type de document est une information essentielle qui doit être affichée " +"dans les rapports imprimés et qui doit être facilement identifiée dans " +"l'ensemble des factures et des mouvements de compte." #: ../../content/applications/finance/accounting/fiscal_localizations/localizations/chile.rst:233 msgid "" @@ -4020,18 +4294,26 @@ msgid "" "is applicable and the data is created automatically when the localization " "module is installed." msgstr "" +"Chaque type de document peut avoir une séquence unique par entreprise. Dans " +"le cadre de la localisation, le type de document inclut le pays sur lequel " +"le document est applicable et les données sont créées automatiquement " +"lorsque le module de localisation est installé." #: ../../content/applications/finance/accounting/fiscal_localizations/localizations/chile.rst:253 msgid "" "The Journal related to the Invoice, identifying if the journal uses " "documents." msgstr "" +"Le journal lié à la facture, en indiquant si le journal utilise des " +"documents." #: ../../content/applications/finance/accounting/fiscal_localizations/localizations/chile.rst:254 msgid "" "Condition applied based on the type of Issues and Receiver (ex. Type of " "fiscal regimen of the buyer and type of fiscal regimen of the vendor)." msgstr "" +"Condition appliquée en fonction du type d'émission et de réception (ex. Type" +" de régime fiscal de l'acheteur et type de régime fiscal du vendeur)." #: ../../content/applications/finance/accounting/fiscal_localizations/localizations/chile.rst:265 #: ../../content/applications/finance/accounting/fiscal_localizations/localizations/switzerland.rst:130 @@ -4048,26 +4330,30 @@ msgid "" "Sales Journals in Odoo usually represent a business unit or location, " "example:" msgstr "" +"Les journaux des ventes dans Odoo représentent généralement une unité " +"commerciale ou un emplacement, par exemple :" #: ../../content/applications/finance/accounting/fiscal_localizations/localizations/chile.rst:269 msgid "Ventas Santiago." -msgstr "" +msgstr "Ventas Santiago." #: ../../content/applications/finance/accounting/fiscal_localizations/localizations/chile.rst:270 msgid "Ventas Valparaiso." -msgstr "" +msgstr "Ventas Valparaiso." #: ../../content/applications/finance/accounting/fiscal_localizations/localizations/chile.rst:272 msgid "For the retail stores is common to have one journal per POS:" msgstr "" +"Pour les magasins de détail, il est courant d'avoir un journal par point de " +"vente :" #: ../../content/applications/finance/accounting/fiscal_localizations/localizations/chile.rst:274 msgid "Cashier 1." -msgstr "" +msgstr "Caissier 1." #: ../../content/applications/finance/accounting/fiscal_localizations/localizations/chile.rst:275 msgid "Cashier 2." -msgstr "" +msgstr "Caissier 2." #: ../../content/applications/finance/accounting/fiscal_localizations/localizations/chile.rst:279 #: ../../content/applications/finance/accounting/fiscal_localizations/localizations/switzerland.rst:114 @@ -4091,15 +4377,17 @@ msgstr "" #: ../../content/applications/finance/accounting/fiscal_localizations/localizations/chile.rst:285 msgid "Tax Payments to government." -msgstr "" +msgstr "Paiements d'impôts au gouvernement." #: ../../content/applications/finance/accounting/fiscal_localizations/localizations/chile.rst:286 msgid "Employees payments." -msgstr "" +msgstr "Paiements des employés." #: ../../content/applications/finance/accounting/fiscal_localizations/localizations/chile.rst:292 msgid "When creating sales journals the next information must be filled in:" msgstr "" +"Lors de la création de journaux de vente, les informations suivantes doivent" +" être remplies :" #: ../../content/applications/finance/accounting/fiscal_localizations/localizations/chile.rst:294 msgid "" @@ -4129,7 +4417,7 @@ msgstr "" #: ../../content/applications/finance/accounting/fiscal_localizations/localizations/chile.rst:312 msgid "CAF" -msgstr "" +msgstr "CAF" #: ../../content/applications/finance/accounting/fiscal_localizations/localizations/chile.rst:314 msgid "" @@ -4137,6 +4425,10 @@ msgid "" " issued to your customers, the CAF is a file the SII provides to the Emisor " "with the folio/sequence authorized for the electronic invoice documents." msgstr "" +"Un CAF (Folio Authorization Code) est nécessaire pour chaque type de " +"document émis à l'intention de vos clients. Le CAF est un fichier que le SII" +" fournit à l'Emisor avec le folio/la séquence autorisé(e) pour les documents" +" de facturation électronique." #: ../../content/applications/finance/accounting/fiscal_localizations/localizations/chile.rst:318 msgid "" @@ -4145,12 +4437,20 @@ msgid "" "within all the journals, this means that you only need one active CAF per " "document type and it will be applied on all journals." msgstr "" +"Votre entreprise peut faire plusieurs demandes de folios et obtenir " +"plusieurs CAF, chacun associé à différentes gammes de folios. Les CAF sont " +"partagés dans tous les journaux, ce qui signifie que vous n'avez besoin que " +"d'un seul CAF actif par type de document et qu'il sera appliqué sur tous les" +" journaux." #: ../../content/applications/finance/accounting/fiscal_localizations/localizations/chile.rst:322 msgid "" "Please refer to the SII documentation to check the detail on how to acquire " "the CAF: `SII Timbraje `_." msgstr "" +"Veuillez vous référer à la documentation SII pour vérifier les détails sur " +"la façon d'acquérir le CAF: `SII Timbraje " +"`_." #: ../../content/applications/finance/accounting/fiscal_localizations/localizations/chile.rst:326 msgid "" @@ -4158,6 +4458,9 @@ msgid "" "(Certification mode). Make sure you have the correct CAF set depending on " "your environment." msgstr "" +"Les CAF requis par le SII sont différents de Production à Test (mode " +"Certification). Assurez-vous que vous disposez du bon CAF en fonction de " +"votre environnement." #: ../../content/applications/finance/accounting/fiscal_localizations/localizations/chile.rst:333 msgid "" @@ -4169,7 +4472,7 @@ msgstr "" #: ../../content/applications/finance/accounting/fiscal_localizations/localizations/chile.rst:336 msgid "Access to :menuselection:`Accounting --> Settings --> CAF`" -msgstr "" +msgstr "Accédez à :menuselection:`Comptabilité --> Paramètres --> CAF`" #: ../../content/applications/finance/accounting/fiscal_localizations/localizations/chile.rst:337 msgid "Upload the file." @@ -4177,7 +4480,7 @@ msgstr "Téléchargez le fichier." #: ../../content/applications/finance/accounting/fiscal_localizations/localizations/chile.rst:338 msgid "Save the CAF." -msgstr "" +msgstr "Sauver le CAF." #: ../../content/applications/finance/accounting/fiscal_localizations/localizations/chile.rst:344 msgid "" @@ -4185,20 +4488,26 @@ msgid "" "transaction is used for this document type, the invoice number takes the " "first folio in the sequence." msgstr "" +"Une fois chargé, le statut passe à *En service*. Pour l'instant, lorsqu'une " +"transaction est utilisée pour ce type de document, le numéro de facture " +"prend le premier folio de la séquence." #: ../../content/applications/finance/accounting/fiscal_localizations/localizations/chile.rst:348 msgid "" "In case you have used some folios in your previous system, make sure you set" " the next valid folio when the first transaction is created." msgstr "" +"Si vous avez utilisé certains folios dans votre système précédent, veillez à" +" définir le prochain folio valide lors de la création de la première " +"transaction." #: ../../content/applications/finance/accounting/fiscal_localizations/localizations/chile.rst:354 msgid "Usage and Testing" -msgstr "" +msgstr "Utilisation et test" #: ../../content/applications/finance/accounting/fiscal_localizations/localizations/chile.rst:357 msgid "Electronic Invoice Workflow" -msgstr "" +msgstr "Flux de travail pour les factures électroniques" #: ../../content/applications/finance/accounting/fiscal_localizations/localizations/chile.rst:359 msgid "" @@ -4207,10 +4516,15 @@ msgid "" " diagram we explain how the information transmitted to the SII and between " "the customers and Vendors." msgstr "" +"Dans la localisation chilienne, le flux de travail de la facture " +"électronique couvre l'émission des factures des clients et la réception des " +"factures des vendeurs. Dans le diagramme suivant, nous expliquons comment " +"les informations sont transmises au SII et entre les clients et les " +"vendeurs." #: ../../content/applications/finance/accounting/fiscal_localizations/localizations/chile.rst:369 msgid "Customer invoice Emission" -msgstr "" +msgstr "Emission de la facture client" #: ../../content/applications/finance/accounting/fiscal_localizations/localizations/chile.rst:371 msgid "" @@ -4218,6 +4532,10 @@ msgid "" " created in the standard way, for Chile one of the differentiators is the " "document type which is selected automatically based on the Taxpayer." msgstr "" +"Une fois les partenaires et les journaux créés et configurés, les factures " +"sont créées de manière standard. Pour le Chili, l'un des éléments " +"différenciateurs est le type de document qui est sélectionné automatiquement" +" en fonction du contribuable." #: ../../content/applications/finance/accounting/fiscal_localizations/localizations/chile.rst:375 msgid "You can manually change the document type if needed." @@ -4697,7 +5015,6 @@ msgid "" 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 "Colombie" @@ -6240,6 +6557,450 @@ msgstr "" "incluya IVA de Bienes Cubiertos, se deberá realizar actualización manual " "correspondiente al IVA convencional." +#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/egypt.rst:3 +msgid "Egypt" +msgstr "Égypte" + +#: ../../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 "Nom" + +#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/egypt.rst:17 +msgid "Technical name" +msgstr "Nom technique" + +#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/egypt.rst:18 +#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/france.rst:59 +msgid "Description" +msgstr "Description" + +#: ../../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 "ID client" + +#: ../../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 "Autres informations :" + +#: ../../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 ":doc:`../../taxation/taxes/taxes`" + +#: ../../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 "Clients" + +#: ../../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 "Articles" + +#: ../../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 "France" @@ -6364,10 +7125,6 @@ msgstr "" msgid "Field name" msgstr "Nom du champ" -#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/france.rst:59 -msgid "Description" -msgstr "Description" - #: ../../content/applications/finance/accounting/fiscal_localizations/localizations/france.rst:59 #: ../../content/applications/finance/accounting/fiscal_localizations/overview/fiscal_localization_packages.rst:32 msgid "Use" @@ -6857,10 +7614,6 @@ msgid "" "then 3, then 2." msgstr "" -#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/france.rst:182 -msgid "Name" -msgstr "Nom" - #: ../../content/applications/finance/accounting/fiscal_localizations/localizations/france.rst:182 msgid "Code" msgstr "Code" @@ -7612,7 +8365,7 @@ msgstr "" "`_" #: ../../content/applications/finance/accounting/fiscal_localizations/localizations/germany.rst:3 -#: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:52 +#: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:34 msgid "Germany" msgstr "Allemagne" @@ -7655,7 +8408,7 @@ msgstr "" #: ../../content/applications/finance/accounting/fiscal_localizations/localizations/germany.rst:23 #: ../../content/applications/finance/accounting/fiscal_localizations/localizations/spain.rst:27 -#: ../../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 #: ../../content/applications/finance/accounting/reporting/overview/main_reports.rst:29 msgid "Balance Sheet" msgstr "Bilan" @@ -7663,7 +8416,7 @@ msgstr "Bilan" #: ../../content/applications/finance/accounting/fiscal_localizations/localizations/germany.rst:24 #: ../../content/applications/finance/accounting/fiscal_localizations/localizations/netherlands.rst:19 #: ../../content/applications/finance/accounting/getting_started/initial_configuration/chart_of_accounts.rst:17 -#: ../../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 msgid "Profit & Loss" msgstr "Pertes et Profits" @@ -8448,7 +9201,6 @@ msgid "" msgstr "" #: ../../content/applications/finance/accounting/fiscal_localizations/localizations/italy.rst:3 -#: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:71 msgid "Italy" msgstr "Italie" @@ -9299,11 +10051,11 @@ msgid "" msgstr "" #: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:244 -msgid ":download:`Certificate `" +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 @@ -9521,10 +10273,6 @@ msgid "" "transactions: ``XEXX010101000``" msgstr "" -#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:377 -msgid "Products" -msgstr "Articles" - #: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:379 msgid "" "At the product level there must also configure some parameters in the " @@ -9737,7 +10485,7 @@ msgid "" 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." @@ -9770,94 +10518,109 @@ msgid "" 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 "Acomptes" -#: ../../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 "Étapes à suivre dans Odoo" -#: ../../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 "" "Emission de la facture électronique pour la valeur totale de l'opération" -#: ../../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." @@ -9865,53 +10628,53 @@ msgstr "" "Ajoutez le produit d'acompte par défaut à utiliser à partir des " "configurations Odoo." -#: ../../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:" @@ -9919,7 +10682,7 @@ msgstr "" "Et le coller dans le projet de facture créé à partir de la commande client " "sans déduire les avances :" -#: ../../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 )" @@ -9927,50 +10690,50 @@ msgstr "" "Validez et copiez le Folio Fiscal pour plus tard (dans l'exemple la copie du" " Folio Fiscal est : 50E4FF06-4341-4006-A7C3-A7F653CBEFAE )" -#: ../../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 "Remises en fonction des jours de paiement" -#: ../../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 " @@ -9979,22 +10742,22 @@ msgid "" "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 "Créer un avoir" -#: ../../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" @@ -10004,20 +10767,20 @@ msgid "" " 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 " @@ -10027,7 +10790,7 @@ msgstr "" "verrez 2 paiements créés, réinitialisés en brouillon et annulez le paiement " "qui ne correspond pas - celui lié à la remise." -#: ../../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 " @@ -10039,56 +10802,56 @@ msgstr "" "devons créer une note de crédit spécifiant que la différence a été donnée au" " client sur une **Note de crédit**." -#: ../../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 "Avant 72 heures" -#: ../../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" @@ -10096,21 +10859,21 @@ msgid "" "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" @@ -10118,7 +10881,7 @@ msgid "" " 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 " @@ -10126,33 +10889,33 @@ msgid "" "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 "Annuler les factures payées" -#: ../../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 "Problème" -#: ../../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." @@ -10161,7 +10924,7 @@ msgid "" "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 " @@ -10171,101 +10934,101 @@ msgstr "" "période en cours, vous devez effectuer l'écriture inverse et enregistrer les" " informations d'annulation." -#: ../../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 " @@ -10273,51 +11036,51 @@ msgid "" "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 "Balance générale électronique." -#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:1026 +#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:1034 msgid "DIOT report." msgstr "Rapport DIOT" -#: ../../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 "Comment ajouter des nouveaux comptes?" -#: ../../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." @@ -10325,7 +11088,7 @@ msgstr "" "Si vous ajoutez un compte avec la convention de codage NNN.YY.ZZ où NNN.YY " "est un groupe de codage SAT, votre compte sera configuré automatiquement." -#: ../../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 " @@ -10335,11 +11098,11 @@ msgid "" "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 " "`_" @@ -10347,7 +11110,7 @@ msgid "" "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" @@ -10355,11 +11118,11 @@ msgid "" "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 "Balance générale" -#: ../../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 " @@ -10368,27 +11131,27 @@ msgid "" "(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 "Rapport DIOT (application de comptabilité requise)" -#: ../../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 " @@ -10396,25 +11159,25 @@ msgid "" "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 " @@ -10422,24 +11185,24 @@ msgid "" "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 " @@ -10449,18 +11212,18 @@ msgid "" "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 " @@ -10470,7 +11233,7 @@ msgid "" "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 " @@ -10478,17 +11241,17 @@ msgid "" "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)`." @@ -10496,27 +11259,27 @@ msgstr "" "Allez à :menuselection:`Comptabilité --> Rapports --> Mexique --> " "Transactions avec des tiers (DIOT)`." -#: ../../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 " @@ -10525,21 +11288,21 @@ msgid "" "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 " @@ -10549,7 +11312,7 @@ msgstr "" "tenter de générer la facture fournisseur, vous pouvez corriger ces " "informations lors de la génération du rapport." -#: ../../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." @@ -10557,7 +11320,7 @@ msgstr "" "N'oubliez pas que ce rapport n'affiche que les factures fournisseur " "effectivement payées." -#: ../../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" @@ -10567,67 +11330,67 @@ msgid "" "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 "Liste de vérification de fin d'année" -#: ../../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" @@ -10637,7 +11400,7 @@ msgstr "" "les affectent et leur nature, en veillant à inclure les prêts et les " "immobilisations corporelles." -#: ../../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 " @@ -10646,45 +11409,45 @@ msgid "" " 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 "**Travail en cours**." -#: ../../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 "**Prêts**." -#: ../../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" @@ -10698,11 +11461,11 @@ msgstr "" "être sûr que personne d'autre ne modifie les transactions de l'année " "précédente lors de la vérification des livres." -#: ../../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 " @@ -10710,7 +11473,7 @@ msgid "" "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 " @@ -10719,21 +11482,21 @@ msgid "" "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 " @@ -10741,11 +11504,11 @@ msgid "" "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 " @@ -10754,26 +11517,26 @@ msgid "" "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." @@ -10782,17 +11545,17 @@ msgid "" " 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 "Accédez aux paramètres et activez la fonction multidevise." -#: ../../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 " @@ -10800,22 +11563,22 @@ msgid "" " :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 "" "Allez à :menuselection:`Paramètres --> Technique --> Actions --> Actions " "serveur`" -#: ../../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 "Reherchez l'Action \"Télécharger le fichier XSD au format CFDI\"." -#: ../../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 "Cliquez sur le bouton \"Créer une action contextuelle\"" -#: ../../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`" @@ -10823,17 +11586,17 @@ msgstr "" "Allez sur le formulaire de la société depuis :menuselection:`Paramètres --> " "Utilisateurs&Sociétés --> Sociétés`" -#: ../../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 "Ouvrez l'une de vos sociétés." -#: ../../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 "" "Cliquez sur \"Action\" puis sur \"Télécharger le fichier XSD au format " "CFDI\"." -#: ../../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 " @@ -10843,7 +11606,7 @@ msgstr "" "exemple un produit sans code, ce qui est assez courant) et une erreur " "explicite sera affichée à la place d'une erreur générique sans explication." -#: ../../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 "Si vous voyez une erreur comme celle-ci :" @@ -10858,30 +11621,30 @@ msgid "" "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 "Choisissez la société dans laquelle l'erreur s'est produite." -#: ../../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 "Problèmes et erreurs courants" -#: ../../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 "**Messages d'erreur** (applicable uniquement sur CFDI 3.3):" -#: ../../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': " @@ -10889,7 +11652,7 @@ msgid "" "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': " @@ -10897,7 +11660,7 @@ msgid "" "'[^|]{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 " @@ -10907,29 +11670,29 @@ msgstr "" " dans le produit. Veuillez vous reporter à la fiche du produit et définir " "correctement votre référence interne." -#: ../../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 "**Messages d'erreur** :" -#: ../../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" @@ -10939,25 +11702,25 @@ msgid "" "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 "**Message d'erreur**" -#: ../../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 " @@ -10966,19 +11729,19 @@ msgid "" "'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 "**Solution**: Le mode de paiement est requis sur la facture." -#: ../../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': '' " @@ -10986,14 +11749,14 @@ msgid "" "'{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 " @@ -11002,7 +11765,7 @@ msgid "" " 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." @@ -11010,21 +11773,21 @@ msgstr "" "**Solution** : Le code postal de l'adresse de votre entreprise n'est pas " "valide pour le Mexique, veuillez le corriger." -#: ../../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" @@ -11041,7 +11804,7 @@ msgid "" "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 "" @@ -11056,44 +11819,44 @@ msgid "" "'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 " @@ -11101,7 +11864,7 @@ msgid "" " 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 " @@ -11110,7 +11873,6 @@ msgid "" 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 "Pays-Bas" @@ -11148,7 +11910,6 @@ msgid "Intrastat Report (ICP)" msgstr "Déclaration Intrastat (ICP)" #: ../../content/applications/finance/accounting/fiscal_localizations/localizations/peru.rst:3 -#: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:105 msgid "Peru" msgstr "Pérou" @@ -12398,8 +13159,8 @@ msgstr "" "également mettre à jour vos positions fiscales en conséquence." #: ../../content/applications/finance/accounting/fiscal_localizations/overview/fiscal_localization_packages.rst:3 -msgid "Fiscal Localization Packages" -msgstr "Packages de Localisation Fiscale" +msgid "Fiscal localization packages" +msgstr "" #: ../../content/applications/finance/accounting/fiscal_localizations/overview/fiscal_localization_packages.rst:5 msgid "" @@ -12483,11 +13244,6 @@ msgstr "" msgid ":doc:`../../getting_started/initial_configuration/chart_of_accounts`" msgstr ":doc:`../../getting_started/initial_configuration/chart_of_accounts`" -#: ../../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 ":doc:`../../taxation/taxes/taxes`" - #: ../../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-" @@ -12509,380 +13265,296 @@ msgstr "" " Fiscale ` disponibles sur Odoo." #: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:10 -msgid "Fiscal Localization Packages available" -msgstr "Packages de Localisation Fiscale disponibles" +msgid "Fiscal localization packages available" +msgstr "" #: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:12 msgid "Algeria - Accounting" msgstr "Comptabilité - Algérie" -#: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:15 -msgid "Argentinian Accounting" -msgstr "Comptabilité Argentine" +#: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:13 +msgid "Argentina - Accounting" +msgstr "Comptabilité - Argentine" -#: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:16 -msgid "Argentinian Accounting Reports" -msgstr "Rapports Comptables Argentins" - -#: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:17 -msgid "Argentinian Electronic Invoicing" -msgstr "Facturation Electronique Argentine" - -#: ../../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 "Australie - Comptabilité" -#: ../../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 "Comptabilité - Autriche" -#: ../../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 "Comptabilité - Belgique" -#: ../../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 "Comptabilité - Bolivie" -#: ../../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 "Comptabilité - Brésil" -#: ../../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 "Comptabilité - Canada" -#: ../../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 "Comptabilité - Chili" -#: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:26 -msgid "China" -msgstr "Chine" - -#: ../../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 "China - Comptabilité" -#: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:29 -msgid "China - City Data" -msgstr "Chine - données de la ville" +#: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:22 +msgid "Colombia - Accounting" +msgstr "Colombie - Comptabilité" -#: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:30 -msgid "China - Small Business CoA" -msgstr "Chine - Plan comptable pour petite entreprise" - -#: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:31 -msgid "China - Standard CoA" -msgstr "Chine - Plan comptable standard" - -#: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:35 -msgid "Colombian - Accounting" -msgstr "Comptabilité - Colombie" - -#: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:36 -msgid "Colombian - Point of Sale" -msgstr "Colombien - Point de Vente" - -#: ../../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 "Comptabilité - Costa Rica" -#: ../../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 "Comptabilité - Croatie (RRIF 2012)" -#: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:40 -msgid "Denmark" -msgstr "Danemark" +#: ../../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 "Danemark - Comptabilité" -#: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:43 -msgid "Denmark - Accounting Reports" -msgstr "Danemark - Rapports comptables" - -#: ../../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 "Comptabilité - République Dominicaine" -#: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:46 -msgid "Ecuador - Accounting" -msgstr "Comptabilité - Équateur" +#: ../../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 "Comptabilité - Éthiopie" -#: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:48 -msgid "EU Mini One Stop Shop (MOSS)" -msgstr "EU Mini One Stop Shop (MOSS)" - -#: ../../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 "Localisation Finlandaise" -#: ../../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 "Comptabilité - France" -#: ../../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 "Comptabilité - Générique" -#: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:54 -msgid "Germany - Accounting" -msgstr "Allemagne - Comptabilité" - -#: ../../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 "Allemagne SKR03 - Comptabilité" -#: ../../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 "Allemagne SKR04 - Comptabilité" -#: ../../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 "Comptabilité - Grèce" -#: ../../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 "Comptabilité - Guatemala" -#: ../../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 "Comptabilité - Honduras" -#: ../../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 "Hong Kong - Comptabilité" -#: ../../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 "Comptabilité - Hongrie" -#: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:63 -msgid "India" -msgstr "Inde" - -#: ../../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 "Comptabilité - Inde" -#: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:66 -msgid "Indian - Point of Sale" -msgstr "Indien - Point de Vente" - -#: ../../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 "Comptabilité - Indonésienne" -#: ../../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 "Irlande - Comptabilité" -#: ../../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 "Israël - Comptabilité" -#: ../../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 "Comptabilité - Italie" -#: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:74 -msgid "Italy - E-invoicing" -msgstr "Italie - E-facturation" - -#: ../../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 "Comptabilité - Japon" -#: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:77 -msgid "LATAM" -msgstr "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 "Base de la localisation LATAM" - -#: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:80 -msgid "LATAM Document" -msgstr "Document LATAM" - -#: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:82 -msgid "Lithuania" -msgstr "Lituanie" - -#: ../../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 "Lituanie - Comptabilité" -#: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:85 -msgid "LT - Accounting Reports" -msgstr "LT - Rapports comptables" - -#: ../../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 "Comptabilité - Luxembourg" -#: ../../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 "Comptabilité - Maroc" -#: ../../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 "Comptabilité - Mexique" -#: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:90 -msgid "Mongolia" -msgstr "Mongolie" - -#: ../../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 "Comptabilité - Mongolie" -#: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:93 -msgid "Mongolia - Accounting Reports" -msgstr "Rapports comptables - Mongolie" - -#: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:95 -msgid "Multi Language Chart of Accounts" -msgstr "Plan comptable multi-lingue" - -#: ../../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 "Comptabilité - Pays-Bas" -#: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:99 -msgid "Netherlands - Intrastat Declaration" -msgstr "Pays-Bas - Déclaration Intrastat" - -#: ../../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 "Nouvelle-Zélande – Comptabilité" -#: ../../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 "Comptabilité - Norvège" -#: ../../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 "Comptabilité - OHADA" -#: ../../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 "Comptabilité - Panama" -#: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:107 -msgid "Peruvian Accounting" -msgstr "Comptabilité Péruvienne" +#: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:62 +msgid "Peru - Accounting" +msgstr "Comptabilité - Pérou" -#: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:108 -msgid "Peruvian Accounting Reports" -msgstr "Rapports Comptables Péruviens" - -#: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:109 -msgid "Peruvian Electronic Invoicing" -msgstr "Facturation Electronique Péruvienne" - -#: ../../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 "Comptabilité - Pologne" -#: ../../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 "Comptabilité - Portugal" -#: ../../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 "Comptabilité - Roumanie" -#: ../../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 "Comptabilité - Arabie Saoudite" -#: ../../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 "Comptabilité - Singapour" -#: ../../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 "Slovaque - Comptabilité" + +#: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:69 msgid "Slovenian - Accounting" msgstr "Comptabilité - Slovénie" -#: ../../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 "Afrique du Sud - Comptabilité" -#: ../../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 "Comptabilité - Espagne (PGCE 2008)" -#: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:119 -msgid "Sweden" -msgstr "Suède" +#: ../../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 "Suède - Communication Structurée OCR" - -#: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:122 -msgid "Swedish - Accounting" -msgstr "Suéde - Comptabilité" - -#: ../../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 "Comptabilité - Suisse" -#: ../../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 "Comptabilité - Thailande" -#: ../../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 "Comptabilité - Turquie" -#: ../../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 "Comptabilité - É.A.U" -#: ../../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 "Comptabilité - Grande Bretagne" -#: ../../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 "Comptabilité - Ukraine" -#: ../../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 "Comptabilité - États Unis" -#: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:131 -msgid "Uruguay - Chart of Accounts" -msgstr "Comptabilité - Uruguay" +#: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:81 +msgid "Uruguay - Accounting" +msgstr "Uruguay - Comptabilité" -#: ../../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 "Venezuela - Comptabilité" -#: ../../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 "Comptabilité - Vietnam" -#: ../../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 "Commencer" #: ../../content/applications/finance/accounting/getting_started/initial_configuration.rst:5 -msgid "Initial Configuration" -msgstr "Configuration initiale" +msgid "Initial configuration" +msgstr "" #: ../../content/applications/finance/accounting/getting_started/initial_configuration/chart_of_accounts.rst:3 #: ../../content/applications/finance/accounting/getting_started/initial_configuration/setup.rst:100 @@ -12912,30 +13584,30 @@ msgid "Balance Sheet accounts" msgstr "Comptes de bilan" #: ../../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 "Immobilisations" #: ../../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 "Passifs" #: ../../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 "Capitaux propres" #: ../../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 "Revenus" #: ../../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 "Dépense" @@ -12990,7 +13662,7 @@ msgstr "" "Chaque compte est identifié par son **Code** et son **Nom**, qui indiquent " "également l'objectif du compte." -#: ../../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:" @@ -12998,23 +13670,23 @@ msgstr "" "Configurer correctement le **Type de compte** est essentiel car il sert à " "plusieurs fins :" -#: ../../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:" @@ -13022,90 +13694,90 @@ msgstr "" "Pour configurer un type de compte, ouvrez le sélecteur déroulant du champ " "**Type** et sélectionnez le bon type parmi la liste suivante :" -#: ../../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 "Rapport" -#: ../../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 "Catégorie" -#: ../../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 "Types de compte" -#: ../../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 "Recevable" -#: ../../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 "Banque et liquidités" -#: ../../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 "Actif circulant" -#: ../../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 "Actif immobilisé" -#: ../../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 "Prépaiements" -#: ../../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 "Immobilisations corporelles" -#: ../../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 "Payable" -#: ../../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 "Carte de crédit " -#: ../../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 "Dettes à court terme" -#: ../../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 "Passif immobilisé" -#: ../../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 "Bénéfices de l'année en cours" -#: ../../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 "Autres revenus" -#: ../../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 "Amortissement" -#: ../../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 "Coût des ventes" -#: ../../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 "Autre" -#: ../../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 "Hors bilan" -#: ../../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 "" "Automatisation des investissements, des dépenses reportées et des revenus " "reportés" -#: ../../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 " @@ -13113,70 +13785,69 @@ msgid "" "` 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 "Vous avez trois choix pour le champ **Automatisation** :" -#: ../../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 "**Non :** c'est la valeur par défaut. Rien ne se passe." -#: ../../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 "" "Veuillez vous référer à la documentation associée pour plus d'informations." -#: ../../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 "Taxes par défaut" -#: ../../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 "Étiquettes" -#: ../../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 "Groupes de comptes" -#: ../../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 " @@ -13184,61 +13855,61 @@ msgid "" "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 "Autoriser le lettrage" -#: ../../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 "Obsolète" -#: ../../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 ":doc:`../../payables/supplier_bills/assets`" -#: ../../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 ":doc:`../../payables/supplier_bills/deferred_expenses`" -#: ../../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 ":doc:`../../receivables/customer_invoices/deferred_revenues`" -#: ../../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 @@ -14216,6 +14887,12 @@ msgstr "50" msgid "Total To Pay" msgstr "Total à payer" +#: ../../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 "Lettrage bancaire" + #: ../../content/applications/finance/accounting/getting_started/memento.rst:181 msgid "" "Bank reconciliation is the matching of bank statement lines (provided by " @@ -15398,7 +16075,7 @@ msgstr "" "Les modules suivants doivent être installés pour suivre les coûts. Entrez " "dans le module Aapplication et installez les applications suivantes :" -#: ../../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 " @@ -15410,11 +16087,11 @@ msgstr "" "automatiquement ces coûts à nos clients. Pour suivre et **refacturer les " "coûts** vous devez également installer l'application Gestion des ventes." -#: ../../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 "Activer la Comptabilité Analytique" -#: ../../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 " @@ -15424,7 +16101,7 @@ msgstr "" "l'application de Comptabilité, sélectionnez :menuselection:`Configuration " "--> Configuration` et cochez la Comptabilité Analytique." -#: ../../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." @@ -15432,15 +16109,15 @@ msgstr "" "De plus, faites défiler vers le bas et cocher l'option **Comptabilité " "analytique pour les achats**." -#: ../../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 "N'oubliez pas de sauvegarder vos modifications" -#: ../../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 "Créer un compte analytique." -#: ../../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 " @@ -15453,15 +16130,15 @@ msgstr "" "en un nouveau. Dans cet exemple, nous l'appellerons \"mission de " "consultation\" pour notre client Smith&Co." -#: ../../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 "Nous allons affecter tous nos coûts à ce compte les suivre." -#: ../../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 "Enregistrer une dépense" -#: ../../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." @@ -15470,11 +16147,11 @@ msgstr "" " dû prendre un train pour aller voir notre client. Il a payé son billet lui-" "même." -#: ../../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 "Créer un article de note de frais" -#: ../../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 " @@ -15487,11 +16164,11 @@ msgstr "" "le prix à 15,50 euros. Assurez-vous que la case **Peut être inséré dans une " "note de frais** est cochée." -#: ../../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 "Enregistrer la dépense" -#: ../../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 " @@ -15501,7 +16178,7 @@ msgstr "" "notes de frais --> Créer`. Sélectionnez l'article billet de train et " "affectez-le au compte analytique vu ci-dessus." -#: ../../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." @@ -15509,15 +16186,15 @@ msgstr "" "Soumettez-le au gestionnaire et attendez que le gestionnaire l'approuve et " "comptabilise la pièce." -#: ../../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 "Créer une commande d'achat liée au compte analytique" -#: ../../content/applications/finance/accounting/others/analytic/purchases_expenses.rst:102 +#: ../../content/applications/finance/accounting/others/analytic/purchases_expenses.rst:103 msgid "Purchase Product" msgstr "Article acheté" -#: ../../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 " @@ -15525,7 +16202,7 @@ msgid "" "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 " @@ -15535,11 +16212,11 @@ msgstr "" "le prix de revient (champ **Prix d'achat**) sera affecté au compte " "analytique." -#: ../../content/applications/finance/accounting/others/analytic/purchases_expenses.rst:117 +#: ../../content/applications/finance/accounting/others/analytic/purchases_expenses.rst:118 msgid "Subcontracting" msgstr "Sous-traitance" -#: ../../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 " @@ -15552,17 +16229,17 @@ msgstr "" " commande d'achat au compte analyse concerné. Nous devons juste créer " "l'article approprié." -#: ../../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 "" "Vous pouvez également suivre les coûts avec des feuilles de présence, voir :" " :doc:`timesheets`" -#: ../../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 "Suivre les coûts en comptabilité" -#: ../../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." @@ -15570,7 +16247,7 @@ msgstr "" "Maintenant tout est comptabilisé et affecté au compte analytique. Il suffit " "de l'ouvrir pour vérifier les coûts liés à ce compte." -#: ../../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`." @@ -15578,7 +16255,7 @@ msgstr "" "Entrez dans le module Comptabilité, cliquez sur :menuselection:`Conseiller " "--> Comptes analytiques --> Ouvrir le plan comptable`." -#: ../../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." @@ -15586,7 +16263,7 @@ msgstr "" "Selectionnez \"Mision de conseil - Smith\" et cliquez sur le bouton coût et " "recette pour avoir une vue d'ensemble de tous les coûts liés à ce compte." -#: ../../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 " @@ -17111,10 +17788,10 @@ msgstr "" "Le Journal des Écarts de Change peut être modifié dans la configuration de " "la comptabilité." -#: ../../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 " @@ -17355,6 +18032,10 @@ msgstr "" "Dans l'application comptabilité, allez à :menuselection:`Ventes --> " "Paiements`. Enregistre' le paiement et définir la devise." +#: ../../content/applications/finance/accounting/others/multicurrencies/how_it_works.rst:145 +msgid "Bank Statements" +msgstr "Relevés bancaires" + #: ../../content/applications/finance/accounting/others/multicurrencies/how_it_works.rst:147 #: ../../content/applications/finance/accounting/others/multicurrencies/invoices_payments.rst:94 msgid "" @@ -17505,8 +18186,8 @@ msgid ":doc:`how_it_works`" msgstr ":doc:`how_it_works`" #: ../../content/applications/finance/accounting/payables.rst:5 -msgid "Account Payables" -msgstr "Comptes Débiteurs" +msgid "Account payables" +msgstr "" #: ../../content/applications/finance/accounting/payables/misc/forecast.rst:3 msgid "Forecast future bills to pay" @@ -17643,12 +18324,12 @@ msgstr "" "d'échéance\"." #: ../../content/applications/finance/accounting/payables/pay.rst:5 -msgid "Vendor Payments" -msgstr "Règlements fournisseur" +msgid "Vendor payments" +msgstr "" #: ../../content/applications/finance/accounting/payables/pay/check.rst:3 -msgid "Pay by Checks" -msgstr "Payer par Chèques" +msgid "Pay by checks" +msgstr "" #: ../../content/applications/finance/accounting/payables/pay/check.rst:5 msgid "" @@ -18352,9 +19033,13 @@ msgstr "" msgid ":doc:`check`" msgstr ":doc:`check`" +#: ../../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" -msgstr "Actifs non courants et Immobilisations corporelles" +msgid "Non-current assets and fixed assets" +msgstr "" #: ../../content/applications/finance/accounting/payables/supplier_bills/assets.rst:5 msgid "" @@ -18762,8 +19447,8 @@ msgid "" msgstr "" #: ../../content/applications/finance/accounting/payables/supplier_bills/deferred_expenses.rst:3 -msgid "Deferred Expenses and Prepayments" -msgstr "Dépenses reportées et paiements anticipés" +msgid "Deferred expenses and prepayments" +msgstr "" #: ../../content/applications/finance/accounting/payables/supplier_bills/deferred_expenses.rst:5 msgid "" @@ -19024,8 +19709,156 @@ msgid "" "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 "Tarification" + +#: ../../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 @@ -19448,103 +20281,9 @@ msgid "" " 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 "" -"Numérisez les factures des fournisseurs avec la reconnaissance optique de " -"caractères (OCR)" - -#: ../../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 "Tarification" - -#: ../../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 "" -"Si vous êtes sur Odoo Online (SAAS) et disposez de la version Entreprise, " -"vous bénéficiez de crédits d'essai gratuits pour tester cette " -"fonctionnalité." - -#: ../../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" -msgstr "Reçus d'achat" +msgid "Purchase receipts" +msgstr "" #: ../../content/applications/finance/accounting/payables/supplier_bills/purchase_receipts.rst:5 msgid "" @@ -19609,13 +20348,12 @@ msgid ":doc:`/applications/finance/expenses`" msgstr ":doc:`/applications/finance/expenses`" #: ../../content/applications/finance/accounting/receivables.rst:5 -msgid "Account Receivables" -msgstr "Comptes débiteurs" +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" -msgstr "Factures clients" +msgid "Customer invoices" +msgstr "" #: ../../content/applications/finance/accounting/receivables/customer_invoices/cash_discounts.rst:3 msgid "Offer cash discounts" @@ -19704,7 +20442,7 @@ msgid ":doc:`../../receivables/customer_invoices/payment_terms`" msgstr ":doc:`../../receivables/customer_invoices/payment_terms`" #: ../../content/applications/finance/accounting/receivables/customer_invoices/cash_rounding.rst:3 -msgid "Cash Rounding" +msgid "Cash rounding" msgstr "Arrondi des paiements en espèces" #: ../../content/applications/finance/accounting/receivables/customer_invoices/cash_rounding.rst:5 @@ -19772,7 +20510,7 @@ msgid "" 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 @@ -19930,8 +20668,8 @@ msgstr "" "facture d'origine ci-dessus :" #: ../../content/applications/finance/accounting/receivables/customer_invoices/deferred_revenues.rst:3 -msgid "Deferred Revenues" -msgstr "Revenus reportés" +msgid "Deferred revenues" +msgstr "" #: ../../content/applications/finance/accounting/receivables/customer_invoices/deferred_revenues.rst:5 msgid "" @@ -20654,9 +21392,27 @@ msgstr "" "logiciel et qui veulent continuer l'année en cours sans recommencer depuis " "le début." +#: ../../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" -msgstr "Conditions de paiement et plans de versement" +msgid "Payment terms and installment plans" +msgstr "" #: ../../content/applications/finance/accounting/receivables/customer_invoices/payment_terms.rst:5 msgid "" @@ -20968,44 +21724,44 @@ msgid "" "`_" msgstr "" -#: ../../content/applications/finance/accounting/receivables/customer_invoices/snailmail.rst:3 -msgid "Send your Invoices by Post (Snailmail)" -msgstr "Envoyez vos factures par la poste (courrier postal)" - #: ../../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: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 "Envoyez vos factures par la poste" -#: ../../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." @@ -21013,13 +21769,13 @@ msgstr "" "Assurez-vous que l'adresse de votre client est correctement définie et " "qu'elle inclut un pays avant d'envoyer la lettre." -#: ../../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 " @@ -21028,16 +21784,25 @@ 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 "" +"Si vous êtes sur Odoo Online (SAAS) et disposez de la version Entreprise, " +"vous bénéficiez de crédits d'essai gratuits pour tester cette " +"fonctionnalité." + +#: ../../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" -msgstr "Paiements client" +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 @@ -21172,8 +21937,8 @@ msgid ":doc:`batch_sdd`" msgstr ":doc:`batch_sdd`" #: ../../content/applications/finance/accounting/receivables/customer_payments/batch_sdd.rst:3 -msgid "Batch Payments: SEPA Direct Debit (SDD)" -msgstr "Paiements groupés : prélèvement SEPA (SDD)" +msgid "Batch payments: SEPA Direct Debit (SDD)" +msgstr "" #: ../../content/applications/finance/accounting/receivables/customer_payments/batch_sdd.rst:5 msgid "" @@ -21354,6 +22119,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 "Factures clients" + #: ../../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 " @@ -21689,107 +22458,145 @@ msgstr "" "\"Plus\" sur la carte de la banque concernée)." #: ../../content/applications/finance/accounting/receivables/customer_payments/followup.rst:3 -msgid "Follow-up on invoices and get paid faster" -msgstr "Faites le suivi des factures et soyez payé plus rapidement" +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." +"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" -msgstr "Gérez vos relances" - -#: ../../content/applications/finance/accounting/receivables/customer_payments/followup.rst:13 +#: ../../content/applications/finance/accounting/receivables/customer_payments/followup.rst:11 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." +"`Odoo Tutorials: Payment Follow-up " +"`_" msgstr "" -"Nous vous recommandons de rapprocher vos relevés bancaires avant de lancer " -"votre processus de suivi. Cela vous évitera d'avoir à envoyer un relevé à un" -" client qui vous a déjà payé." -#: ../../content/applications/finance/accounting/receivables/customer_payments/followup.rst:17 +#: ../../content/applications/finance/accounting/receivables/customer_payments/followup.rst:16 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." +"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:20 +msgid "Send an Email" +msgstr "Envoyer un email" + +#: ../../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 "Imprimer une Lettre" + #: ../../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 +#: ../../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 "" -"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`." +"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." -msgstr "" -"Vous pouvez également définir un niveau de confiance pour vos clients en les" -" identifiant comme débiteurs mauvais, normaux ou bons dans les rapports de " -"suivi." +msgid "Follow-up reports" +msgstr "Rapports de suivi" -#: ../../content/applications/finance/accounting/receivables/customer_payments/followup.rst:40 -msgid "Send reminders in batch" -msgstr "Envoyer des rappels groupés" - -#: ../../content/applications/finance/accounting/receivables/customer_payments/followup.rst:42 +#: ../../content/applications/finance/accounting/receivables/customer_payments/followup.rst:35 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." +"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:52 -msgid "Plan a follow-up process" -msgstr "Planifiez un processus de suivi" - -#: ../../content/applications/finance/accounting/receivables/customer_payments/followup.rst:54 +#: ../../content/applications/finance/accounting/receivables/customer_payments/followup.rst:39 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." +"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:59 +#: ../../content/applications/finance/accounting/receivables/customer_payments/followup.rst:43 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." +"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:69 +#: ../../content/applications/finance/accounting/receivables/customer_payments/followup.rst:48 msgid "" -"If you would like to get a reminder before the actual due date, set a " -"negative number of due days." +"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: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: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 "" -"Si vous souhaitez recevoir un rappel avant la date d'échéance réelle, " -"définissez un nombre négatif de jours d'échéance." #: ../../content/applications/finance/accounting/receivables/customer_payments/online_payment.rst:3 -msgid "Invoice Online Payment" -msgstr "Paiement des factures en ligne" +msgid "Invoice online payment" +msgstr "" #: ../../content/applications/finance/accounting/receivables/customer_payments/online_payment.rst:5 msgid "" @@ -22112,7 +22919,7 @@ msgid "" 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 @@ -22754,8 +23561,8 @@ msgid "Taxation" msgstr "" #: ../../content/applications/finance/accounting/taxation/fiscal_year.rst:5 -msgid "Fiscal Year" -msgstr "Exercice fiscal" +msgid "Fiscal year" +msgstr "" #: ../../content/applications/finance/accounting/taxation/fiscal_year/close_fiscal_year.rst:3 msgid "Do a year end in Odoo (close a fiscal year)" @@ -23311,6 +24118,94 @@ msgstr "" "Voilà pourquoi nous recommandons généralement aux entreprises de travailler " "avec une seule référence de prix." +#: ../../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 ":doc:`fiscal_positions`" + #: ../../content/applications/finance/accounting/taxation/taxes/cash_basis_taxes.rst:3 msgid "Manage cash basis taxes" msgstr "" @@ -23424,6 +24319,10 @@ msgid "" "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 " @@ -23470,15 +24369,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 ":doc:`fiscal_positions`" - #: ../../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 @@ -23581,8 +24473,8 @@ msgid "" msgstr "" #: ../../content/applications/finance/accounting/taxation/taxes/fiscal_positions.rst:3 -msgid "Fiscal Positions (tax and account mapping)" -msgstr "Positions fiscales (cartographie fiscale et comptable)" +msgid "Fiscal positions (tax and account mapping)" +msgstr "" #: ../../content/applications/finance/accounting/taxation/taxes/fiscal_positions.rst:5 msgid "" @@ -25516,93 +26408,99 @@ msgstr "" msgid "Online payment acquirers" msgstr "" -#: ../../content/applications/finance/payment_acquirers.rst:56 +#: ../../content/applications/finance/payment_acquirers.rst:61 msgid "Payment flow" msgstr "Flux de paiement" -#: ../../content/applications/finance/payment_acquirers.rst:56 -msgid "Save cards" -msgstr "Sauvegarder les cartes" +#: ../../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" -msgstr "Capturez le montant manuellement" +#: ../../content/applications/finance/payment_acquirers.rst:63 +msgid ":ref:`Manual capture `" +msgstr "" -#: ../../content/applications/finance/payment_acquirers.rst:56 -msgid "Refund from Odoo" -msgstr "Les remboursement dans 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 ":doc:`Adyen `" -#: ../../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 "Paiement d'Odoo" -#: ../../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 "|V|" -#: ../../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 ":doc:`Alipay `" -#: ../../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" -msgstr "Redirection vers le site de l'intermédiaire" +#: ../../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 ":doc:`Authorize.Net `" -#: ../../content/applications/finance/payment_acquirers.rst:68 +#: ../../content/applications/finance/payment_acquirers.rst:78 +msgid "Full only" +msgstr "" + +#: ../../content/applications/finance/payment_acquirers.rst:80 msgid ":doc:`Buckaroo `" msgstr ":doc:`Buckaroo `" -#: ../../content/applications/finance/payment_acquirers.rst:71 +#: ../../content/applications/finance/payment_acquirers.rst:85 msgid ":doc:`Mollie `" msgstr ":doc:`Mollie `" -#: ../../content/applications/finance/payment_acquirers.rst:74 +#: ../../content/applications/finance/payment_acquirers.rst:90 msgid ":doc:`Ogone `" msgstr ":doc:`Ogone `" -#: ../../content/applications/finance/payment_acquirers.rst:77 +#: ../../content/applications/finance/payment_acquirers.rst:95 msgid ":doc:`PayPal `" msgstr ":doc:`PayPal `" -#: ../../content/applications/finance/payment_acquirers.rst:80 +#: ../../content/applications/finance/payment_acquirers.rst:100 msgid "PayU Latam" msgstr "PayU Latam" -#: ../../content/applications/finance/payment_acquirers.rst:83 +#: ../../content/applications/finance/payment_acquirers.rst:105 msgid "PayUMoney" msgstr "PayUMoney" -#: ../../content/applications/finance/payment_acquirers.rst:86 +#: ../../content/applications/finance/payment_acquirers.rst:110 msgid ":doc:`SIPS `" msgstr ":doc:`SIPS `" -#: ../../content/applications/finance/payment_acquirers.rst:89 +#: ../../content/applications/finance/payment_acquirers.rst:115 msgid ":doc:`Stripe `" msgstr ":doc:`Stripe `" -#: ../../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 " @@ -25620,7 +26518,7 @@ msgstr "" "Comptabilité pour effectuer un rapprochement bancaire, qui est un processus " "de contrôle comptable." -#: ../../content/applications/finance/payment_acquirers.rst:105 +#: ../../content/applications/finance/payment_acquirers.rst:133 msgid "Bank payments" msgstr "Paiements bancaires" @@ -25654,128 +26552,59 @@ msgstr "" "<../finance/accounting/receivables/customer_payments/batch_sdd>` pour plus " "d'informations sur ce mode de paiement." -#: ../../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" -msgstr "Ajouter un nouvel acquéreur de paiement" - -#: ../../content/applications/finance/payment_acquirers.rst:129 +#: ../../content/applications/finance/payment_acquirers.rst:148 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*." +"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 "" -"Pour ajouter un nouvel acquéreur de paiement et le mettre à disposition de " -"vos clients, allez dans :menuselection:`Comptabilité --> Configuration --> " -"Acquéreurs de paiement`, recherchez votre acquéreur de paiement, installez " -"le module associé et activez-le. Pour ce faire, ouvrez l'acquéreur de " -"paiement et changez son état de *Désactivé* à *Activé*." -#: ../../content/applications/finance/payment_acquirers.rst:139 +#: ../../content/applications/finance/payment_acquirers.rst:155 +msgid "Save cards for later" +msgstr "" + +#: ../../content/applications/finance/payment_acquirers.rst:157 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." +"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 "" -"Nous vous recommandons d'utiliser le *mode test* sur une base de données " -"dupliquée ou une base de données de test. Le mode test est destiné à être " -"utilisé avec vos identifiants de test/sandbox, mais Odoo génère des bons de " -"commande et des factures comme d'habitude. Il n'est pas toujours possible " -"d'annuler une facture, et cela pourrait créer des problèmes de numérotation " -"de vos factures si vous deviez tester vos acquéreurs de paiement sur votre " -"base de données principale." -#: ../../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" -msgstr "Onglet Identifiants" - -#: ../../content/applications/finance/payment_acquirers.rst:149 +#: ../../content/applications/finance/payment_acquirers.rst:162 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." +"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 "" -"Si ce n'est pas encore fait, rendez-vous sur le site web du fournisseur de " -"paiement en ligne, créez un compte et assurez-vous de disposer des " -"informations d'identification requises pour une utilisation par des tiers. " -"Odoo a besoin de ces informations d'identification pour communiquer avec " -"l'acquéreur du paiement." -#: ../../content/applications/finance/payment_acquirers.rst:153 +#: ../../content/applications/finance/payment_acquirers.rst:166 msgid "" -"The form in this section is specific to the payment acquirer you are " -"configuring. Please refer to the related documentation for more information." +"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 "" -"Le formulaire de cette section est spécifique à l'acquéreur de paiement que " -"vous configurez. Veuillez vous référer à la documentation associée pour plus" -" d'informations." -#: ../../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 "Onglet Configuration" +#: ../../content/applications/finance/payment_acquirers.rst:173 +msgid "Manual capture" +msgstr "" -#: ../../content/applications/finance/payment_acquirers.rst:161 +#: ../../content/applications/finance/payment_acquirers.rst:175 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." +"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 "" -"Vous pouvez modifier l'affichage de l'acquéreur du paiement sur le font-end " -"en modifiant son nom sous le champ **Affiché comme** et les icônes de carte " -"de crédit à afficher sous le champ **Icônes des méthodes de paiement prises " -"en charge**." - -#: ../../content/applications/finance/payment_acquirers.rst:168 -msgid "Save and reuse credit cards" -msgstr "Enregistrer et réutiliser les cartes de crédit" - -#: ../../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 "" -"Avec la fonctionnalité **Enregistrer les cartes**, Odoo peut stocker des " -"**Jetons de paiement** dans votre base de données, qui peuvent être utilisés" -" pour des paiements ultérieurs, sans avoir à ressaisir les détails de " -"paiement. Ceci est particulièrement utile pour le taux de conversion du " -"commerce électronique et les paiements récurrents des abonnements." - -#: ../../content/applications/finance/payment_acquirers.rst:177 -#: ../../content/applications/finance/payment_acquirers/authorize.rst:38 -msgid "Place a hold on a card" -msgstr "Faire une réservation sur une carte" - -#: ../../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:" -msgstr "" -"Si vous souhaitez saisir manuellement un montant au lieu d'avoir une saisie " -"immédiate, vous pouvez activer la saisie manuelle. La saisie manuelle des " -"paiements présente de nombreux avantages :" #: ../../content/applications/finance/payment_acquirers.rst:182 msgid "" @@ -25795,46 +26624,174 @@ msgstr "" #: ../../content/applications/finance/payment_acquirers.rst:185 msgid "" -"Avoid potentially high credit card fees in the event of overselling or " -"cancelled orders." +"Avoid potentially high processing fees for cancelled payments: payment " +"acquirers will not charge you for voiding an authorization." msgstr "" -"Évitez les frais de carte de crédit potentiellement élevés en cas de " -"survente ou de commandes annulées." #: ../../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." +"Hold a security deposit to return later, minus any deductions (e.g., after a" +" damage)." msgstr "" -"Le champ **Capturer le montant manuellement** se trouve sous l'onglet " -"**Configuration**. Si activé, les fonds sont réservés pendant quelques jours" -" sur la carte du client, mais pas encore débités. Veuillez vous référer à la" -" documentation de votre acquéreur pour connaître la durée exacte de " -"réservation." -#: ../../content/applications/finance/payment_acquirers.rst:195 +#: ../../content/applications/finance/payment_acquirers.rst:189 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." +"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." +"Odoo does not support this feature for all payment acquirers but some allow " +"the manual capture from their website interface." msgstr "" -"Odoo ne prend peut-être pas encore en charge la capture manuelle pour tous " -"les acquéreurs, mais certains acquéreurs autorisent la gestion de la capture" -" depuis leurs interfaces." #: ../../content/applications/finance/payment_acquirers.rst:210 +msgid "Refunds" +msgstr "Retours" + +#: ../../content/applications/finance/payment_acquirers.rst:212 +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: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: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:230 +msgid "" +"Each acquirer has its specific configuration flow, depending on :ref:`which " +"feature is available `." +msgstr "" + +#: ../../content/applications/finance/payment_acquirers.rst:236 +msgid "Add a new payment acquirer" +msgstr "Ajouter un nouvel acquéreur de paiement" + +#: ../../content/applications/finance/payment_acquirers.rst:238 +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 "" +"Pour ajouter un nouvel acquéreur de paiement et le mettre à disposition de " +"vos clients, allez dans :menuselection:`Comptabilité --> Configuration --> " +"Acquéreurs de paiement`, recherchez votre acquéreur de paiement, installez " +"le module associé et activez-le. Pour ce faire, ouvrez l'acquéreur de " +"paiement et changez son état de *Désactivé* à *Activé*." + +#: ../../content/applications/finance/payment_acquirers.rst:248 +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 "" +"Nous vous recommandons d'utiliser le *mode test* sur une base de données " +"dupliquée ou une base de données de test. Le mode test est destiné à être " +"utilisé avec vos identifiants de test/sandbox, mais Odoo génère des bons de " +"commande et des factures comme d'habitude. Il n'est pas toujours possible " +"d'annuler une facture, et cela pourrait créer des problèmes de numérotation " +"de vos factures si vous deviez tester vos acquéreurs de paiement sur votre " +"base de données principale." + +#: ../../content/applications/finance/payment_acquirers.rst:256 +#: ../../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 "Onglet Identifiants" + +#: ../../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 "" +"Si ce n'est pas encore fait, rendez-vous sur le site web du fournisseur de " +"paiement en ligne, créez un compte et assurez-vous de disposer des " +"informations d'identification requises pour une utilisation par des tiers. " +"Odoo a besoin de ces informations d'identification pour communiquer avec " +"l'acquéreur du paiement." + +#: ../../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 "" +"Le formulaire de cette section est spécifique à l'acquéreur de paiement que " +"vous configurez. Veuillez vous référer à la documentation associée pour plus" +" d'informations." + +#: ../../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 "Onglet Configuration" + +#: ../../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 "" +"Vous pouvez modifier l'affichage de l'acquéreur du paiement sur le font-end " +"en modifiant son nom sous le champ **Affiché comme** et les icônes de carte " +"de crédit à afficher sous le champ **Icônes des méthodes de paiement prises " +"en charge**." + +#: ../../content/applications/finance/payment_acquirers.rst:277 msgid "Countries" msgstr "Pays" -#: ../../content/applications/finance/payment_acquirers.rst:212 +#: ../../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." @@ -25843,11 +26800,11 @@ msgstr "" "pays. Laissez ce champ vide pour rendre l'acquéreur de paiement disponible " "dans tous les pays." -#: ../../content/applications/finance/payment_acquirers.rst:218 +#: ../../content/applications/finance/payment_acquirers.rst:285 msgid "Payment journal" msgstr "Journal des paiements" -#: ../../content/applications/finance/payment_acquirers.rst:220 +#: ../../content/applications/finance/payment_acquirers.rst:287 msgid "" "The **Payment journal** selected for your payment acquirer must be a *Bank* " "journal." @@ -25855,11 +26812,11 @@ msgstr "" "Le **Journal des paiements** sélectionné pour votre acquéreur de paiement " "doit être un journal *Banque*." -#: ../../content/applications/finance/payment_acquirers.rst:225 +#: ../../content/applications/finance/payment_acquirers.rst:292 msgid "Accounting perspective" msgstr "Perspective Comptable" -#: ../../content/applications/finance/payment_acquirers.rst:227 +#: ../../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 " @@ -25874,7 +26831,7 @@ msgstr "" "comptables de vos paiements. Nous vous recommandons de demander conseil à " "votre comptable." -#: ../../content/applications/finance/payment_acquirers.rst:232 +#: ../../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** " @@ -25884,7 +26841,7 @@ msgstr "" "d'acquéreur pour enregistrer les paiements sur un **Compte d'attente**. Le " "**type** du journal doit être *Journal de banque*." -#: ../../content/applications/finance/payment_acquirers.rst:235 +#: ../../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:" @@ -25892,7 +26849,7 @@ msgstr "" "Vous pouvez utiliser un seul journal pour de nombreux modes de paiement. Et " "pour chaque moyen de paiement, vous pouvez soit :" -#: ../../content/applications/finance/payment_acquirers.rst:237 +#: ../../content/applications/finance/payment_acquirers.rst:304 msgid "" "Define an **Accounting Account** to separate these payments from another " "payment method." @@ -25900,7 +26857,7 @@ msgstr "" "Définissez un **compte comptable** pour séparer ces paiements d'un autre " "mode de paiement." -#: ../../content/applications/finance/payment_acquirers.rst:238 +#: ../../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." @@ -25908,7 +26865,7 @@ msgstr "" "Laissez vide pour revenir au compte par défaut, que vous pouvez voir ou " "modifier dans les paramètres." -#: ../../content/applications/finance/payment_acquirers.rst:244 +#: ../../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." @@ -25917,47 +26874,47 @@ msgstr "" "certains journaux seulement, ou un seul mode de paiement... Ce qui " "correspond le mieux à vos besoins." -#: ../../content/applications/finance/payment_acquirers.rst:248 +#: ../../content/applications/finance/payment_acquirers.rst:315 msgid ":doc:`payment_acquirers/wire_transfer`" msgstr ":doc:`payment_acquirers/wire_transfer`" -#: ../../content/applications/finance/payment_acquirers.rst:249 +#: ../../content/applications/finance/payment_acquirers.rst:316 msgid ":doc:`payment_acquirers/adyen`" msgstr ":doc:`payment_acquirers/adyen`" -#: ../../content/applications/finance/payment_acquirers.rst:250 +#: ../../content/applications/finance/payment_acquirers.rst:317 msgid ":doc:`payment_acquirers/alipay`" msgstr ":doc:`payment_acquirers/alipay`" -#: ../../content/applications/finance/payment_acquirers.rst:251 +#: ../../content/applications/finance/payment_acquirers.rst:318 msgid ":doc:`payment_acquirers/authorize`" msgstr ":doc:`payment_acquirers/authorize`" -#: ../../content/applications/finance/payment_acquirers.rst:252 +#: ../../content/applications/finance/payment_acquirers.rst:319 msgid ":doc:`payment_acquirers/buckaroo`" msgstr ":doc:`payment_acquirers/buckaroo`" -#: ../../content/applications/finance/payment_acquirers.rst:253 +#: ../../content/applications/finance/payment_acquirers.rst:320 msgid ":doc:`payment_acquirers/mollie`" msgstr ":doc:`payment_acquirers/mollie`" -#: ../../content/applications/finance/payment_acquirers.rst:254 +#: ../../content/applications/finance/payment_acquirers.rst:321 msgid ":doc:`payment_acquirers/ogone`" msgstr ":doc:`payment_acquirers/ogone`" -#: ../../content/applications/finance/payment_acquirers.rst:255 +#: ../../content/applications/finance/payment_acquirers.rst:322 msgid ":doc:`payment_acquirers/paypal`" msgstr ":doc:`payment_acquirers/paypal`" -#: ../../content/applications/finance/payment_acquirers.rst:256 +#: ../../content/applications/finance/payment_acquirers.rst:323 msgid ":doc:`payment_acquirers/sips`" msgstr ":doc:`payment_acquirers/sips`" -#: ../../content/applications/finance/payment_acquirers.rst:257 +#: ../../content/applications/finance/payment_acquirers.rst:324 msgid ":doc:`payment_acquirers/stripe`" msgstr ":doc:`payment_acquirers/stripe`" -#: ../../content/applications/finance/payment_acquirers.rst:258 +#: ../../content/applications/finance/payment_acquirers.rst:325 msgid ":doc:`../websites/ecommerce/shopper_experience/payment_acquirer`" msgstr ":doc:`../websites/ecommerce/shopper_experience/payment_acquirer`" @@ -25967,11 +26924,9 @@ msgstr "Adyen" #: ../../content/applications/finance/payment_acquirers/adyen.rst:5 msgid "" -"`Adyen `_ is a Dutch-based company that offers " -"several online payment possibilities." +"`Adyen `_ is a Dutch company that offers several " +"online payment possibilities." msgstr "" -"`Adyen `_ est une société basée aux Pays-Bas qui " -"propose plusieurs possibilités de paiement en ligne." #: ../../content/applications/finance/payment_acquirers/adyen.rst:12 #: ../../content/applications/finance/payment_acquirers/alipay.rst:12 @@ -26042,49 +26997,39 @@ 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." +"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 "" -"Si vous essayez Adyen (en tant que test), avec un *compte test*, changez " -"l'**État** en *Mode test*. Nous vous recommandons de le faire sur une base " -"de données de test Odoo, plutôt que sur votre base de données principale." -#: ../../content/applications/finance/payment_acquirers/adyen.rst:36 +#: ../../content/applications/finance/payment_acquirers/adyen.rst:38 msgid "API Key and Client Key" msgstr "Clé API et Clé Client" -#: ../../content/applications/finance/payment_acquirers/adyen.rst:38 +#: ../../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:`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." +"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 "" -"Afin de récupérer la clé API et la clé Client, connectez-vous à votre compte" -" Adyen, rendez-vous sur :menuselection:`Développeurs--> Identifiants API`. -" -" Si vous avez déjà un utilisateur API, ouvrez-le. - Si vous n'avez pas " -"encore d'utilisateur API, cliquez sur **Créer un nouvel identifiant**. " -"Accédez à :menuselection:`Authentification` et récupérez ou générez votre " -"**clé API** et **clé client**. Veillez à copier votre clé API car vous ne " -"serez pas autorisé à l'obtenir plus tard sans en générer une nouvelle." -#: ../../content/applications/finance/payment_acquirers/adyen.rst:45 +#: ../../content/applications/finance/payment_acquirers/adyen.rst:48 msgid "" -"This is also the place where you'll :ref:`allow payments to be made from " -"your website `." +"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 "" -"C'est également l'endroit où vous :ref:`autoriserez les paiements à partir " -"de votre site web `." -#: ../../content/applications/finance/payment_acquirers/adyen.rst:51 +#: ../../content/applications/finance/payment_acquirers/adyen.rst:55 msgid "HMAC key" msgstr "Clé HMAC" -#: ../../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 " @@ -26092,64 +27037,55 @@ msgid "" "notification`." msgstr "" -#: ../../content/applications/finance/payment_acquirers/adyen.rst:61 +#: ../../content/applications/finance/payment_acquirers/adyen.rst:65 msgid "" -"There, in :menuselection:`Transport --> URL`, enter your server address " -"followed by `/payment/adyen/notification`." +"There, in :menuselection:`General --> Server configuration --> URL`, enter " +"your server address followed by `/payment/adyen/notification`." msgstr "" -"Là, dans :menuselection:`Transport --> URL`, entrez l'adresse de votre " -"serveur suivi de `/payment/adyen/notification`." -#: ../../content/applications/finance/payment_acquirers/adyen.rst:68 +#: ../../content/applications/finance/payment_acquirers/adyen.rst:72 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." +"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 "" -"Continuez ensuite dans :menuselection:`Paramètres supplémentaires --> Clé " -"HMAC --> Générer une nouvelle clé HMAC`. Veillez à le copier car vous ne " -"serez pas autorisé à l'obtenir plus tard sans en générer un nouveau." -#: ../../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 "Vous devez enregistrer le webhook pour finaliser sa création." -#: ../../content/applications/finance/payment_acquirers/adyen.rst:76 +#: ../../content/applications/finance/payment_acquirers/adyen.rst:84 msgid "URLs" msgstr "URLs" -#: ../../content/applications/finance/payment_acquirers/adyen.rst:78 +#: ../../content/applications/finance/payment_acquirers/adyen.rst:86 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**." +":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 "Compte d'Adyen" -#: ../../content/applications/finance/payment_acquirers/adyen.rst:92 +#: ../../content/applications/finance/payment_acquirers/adyen.rst:101 msgid "Allow payments from a specific origin" msgstr "Autoriser les paiements d'une origine spécifique" -#: ../../content/applications/finance/payment_acquirers/adyen.rst:94 +#: ../../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:`Allowed Origins`, then add the URLs from where payments will" -" be made (the URLs of the servers hosting your Odoo instances)." +":menuselection:`Add allowed origins`, then add the URLs from where payments " +"will be made (the URLs of the servers hosting your Odoo instances)." msgstr "" -"Pour autoriser les paiements provenant de votre site web, suivez les étapes " -"de :ref:`adyen/api_and_client_keys` pour accéder à votre utilisateur d'API " -"ensuite allez à :menuselection:`Origines autorisées`, puis ajoutez les URL à" -" partir desquelles les paiements seront effectués (les URL des serveurs " -"hébergeant vos instances Odoo)." -#: ../../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 @@ -26290,25 +27226,30 @@ 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." +"the :guilabel:`State` to :guilabel:`Test Mode`. We recommend doing this on a" +" test Odoo database, rather than on your main database." msgstr "" -"Si vous essayez Authorize.Net (en tant que test), avec un *compte sandbox*, " -"modifiez l' **État** en *Mode test*. Nous vous recommandons de le faire sur " -"une base de données de test Odoo, plutôt que sur votre base de données " -"principale." -#: ../../content/applications/finance/payment_acquirers/authorize.rst:40 +#: ../../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:43 +msgid "Place a hold on a card" +msgstr "Faire une réservation sur une carte" + +#: ../../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." +"`. If enabled, the funds are " +"reserved for 30 days on the customer's card, but not charged yet." msgstr "" -"Avec Authorize.net, vous pouvez activer la :ref:`capture manuelle " -"`. Si activé, les fonds sont réservés " -"pendant 30 jours sur la carte du client, mais pas encore débités." -#: ../../content/applications/finance/payment_acquirers/authorize.rst:44 +#: ../../content/applications/finance/payment_acquirers/authorize.rst:50 msgid "" "After **30 days**, the transaction is **voided automatically** by " "Authorize.net." @@ -26459,10 +27400,6 @@ msgstr "" "d'**Ingenico Payment Services**, est une société basée en France qui fournit" " la technologie utilisée dans les transactions électroniques sécurisées." -#: ../../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, " diff --git a/locale/fr/LC_MESSAGES/general.po b/locale/fr/LC_MESSAGES/general.po index 46ced6642..4b6799691 100644 --- a/locale/fr/LC_MESSAGES/general.po +++ b/locale/fr/LC_MESSAGES/general.po @@ -27,7 +27,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: 2021-11-02 08:47+0000\n" "Last-Translator: Cécile Collart , 2022\n" "Language-Team: French (https://www.transifex.com/odoo/teams/41243/fr/)\n" @@ -719,134 +719,173 @@ msgstr "Synchroniser votre agenda Google avec Odoo" #: ../../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)." +"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 "" -"Odoo s'intègre parfaitement au Calendrier Google, ainsi vous pouvez gérez " -"vos rendez-vous depuis les deux plateformes (les mises à jour s'effectuant " -"dans les deux sens)." -#: ../../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 "Configuration dans Google" -#: ../../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 "" -"Allez sur la `plateforme des APIs de Google " -"`__ pour générer les identifiants de " -"l'API Google Calendar." #: ../../content/applications/general/calendars/google/google_calendar_credentials.rst:14 -msgid "Go to the API & Services page." -msgstr "Allez à la page des API et Services." - -#: ../../content/applications/general/calendars/google/google_calendar_credentials.rst:19 -msgid "Search for *Google Calendar API* and select it." -msgstr "Cherchez *Google Calendar API* et sélectionnez-le." - -#: ../../content/applications/general/calendars/google/google_calendar_credentials.rst:27 -msgid "Enable the API." -msgstr "Activez l'API." - -#: ../../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)." +"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 "" -"Sélectionnez ou créez un projet d'API pour enregistrer les identifiants si " -"vous ne l'avez jamais fait. Donnez-lui un nom explicite (e.g. Odoo Sync)." -#: ../../content/applications/general/calendars/google/google_calendar_credentials.rst:35 -msgid "Create credentials." -msgstr "Créez des identifiants." - -#: ../../content/applications/general/calendars/google/google_calendar_credentials.rst:40 +#: ../../content/applications/general/calendars/google/google_calendar_credentials.rst:18 msgid "" -"Select *Web browser (Javascript)* as calling source and *User data* as kind " -"of data." +"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 "" -"Sélectionnez *Navigateur Web (Javascript)* comme contexte à partir duquel " -"l'API sera appelée et *Données utilisateur* comme type de données." -#: ../../content/applications/general/calendars/google/google_calendar_credentials.rst:46 +#: ../../content/applications/general/calendars/google/google_calendar_credentials.rst:22 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'." +"Next, click :guilabel:`Select a project` and select or create an API project" +" to store credentials." msgstr "" -"Vous pouvez alors créer un Identifiant Client. Entrez le nom de " -"l'application (par ex. Odoo Calendar) et les pages autorisées vers " -"lesquelles vous serez redirigé. L'*Origine du Javascript autorisé* est l'URL" -" de votre instance Odoo. L'*URL de redirection autorisée* est l'URL de votre" -" instance Odoo suivie de '/google_account/authentication'." -#: ../../content/applications/general/calendars/google/google_calendar_credentials.rst:55 +#: ../../content/applications/general/calendars/google/google_calendar_credentials.rst:29 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." +"Give the API Project a clear name like \"Odoo Sync\" so you can easily find " +"it." msgstr "" -"Parcourez l'écran de consentement en entrant le nom du produit (e.g. " -"Calendrier Odoo). Vous pouvez prendre connaissance des options de " -"personnalisation mais ce n'est pas obligatoire. L'écran d'accord " -"n'apparaîtra qu'une fois que vous aurez entré l'identifiant client dans " -"Odoo." -#: ../../content/applications/general/calendars/google/google_calendar_credentials.rst:60 +#: ../../content/applications/general/calendars/google/google_calendar_credentials.rst:31 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." +"Then, open the API Project and click :guilabel:`Enable APIs and Services`." msgstr "" -"Pour terminer, on vous indique votre **ID Client**. Cliquez sur " -"*Credentials* pour obtenir ensuite le **Client Secret**. Vous aurez besoin " -"de ces deux informations dans Odoo." -#: ../../content/applications/general/calendars/google/google_calendar_credentials.rst:67 +#: ../../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:45 +msgid "Create credentials" +msgstr "" + +#: ../../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: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: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:63 +msgid "" +"Skip the third step, :guilabel:`Scopes`, by clicking :guilabel:`Save and " +"Continue`." +msgstr "" + +#: ../../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: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 "" +"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 "Configuration dans Odoo" -#: ../../content/applications/general/calendars/google/google_calendar_credentials.rst:69 +#: ../../content/applications/general/calendars/google/google_calendar_credentials.rst:100 msgid "" -"Install the **Google Calendar** App from the *Apps* menu or by checking the " -"option in :menuselection:`Settings --> General Settings`." +"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 "" -"Installez l'application **Calendrier Google** que vous trouverez dans le " -"menu *Applications* ou en cochant la case dans :menuselection:`Paramètres " -"--> Paramètres Généraux`." -#: ../../content/applications/general/calendars/google/google_calendar_credentials.rst:75 +#: ../../content/applications/general/calendars/google/google_calendar_credentials.rst:108 msgid "" -"Go to :menuselection:`Settings --> General Settings` and enter your **Client" -" ID** and **Client Secret** in Google Calendar option." +"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 "" -"Rendez-vous dans :menuselection:`Paramètres --> Paramètres Généraux` et " -"entrez votre **Id. client** et **Client Secret** dans les paramètres du " -"Calendrier Google." -#: ../../content/applications/general/calendars/google/google_calendar_credentials.rst:81 +#: ../../content/applications/general/calendars/google/google_calendar_credentials.rst:112 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." +"Finally, open the Calendar module in Odoo and click on the " +":guilabel:`Google` sync button to sync Google Calendar with Odoo." msgstr "" -"Le paramétrage est maintenant terminé. Ouvrez votre Calendrier Google et " -"synchronisez-le avec Google. La première fois que vous le faites vous êtes " -"redirigé sur une page Google pour autoriser la connexion. De retour dans " -"Odoo, re-cliquez sur le bouton synchroniser. Vous pouvez cliquer sur ce " -"bouton chaque fois que vous voulez synchroniser votre calendrier." -#: ../../content/applications/general/calendars/google/google_calendar_credentials.rst:89 -msgid "As of now you no longer have excuses to miss a meeting!" +#: ../../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 "" -"À partir de maintenant, vous n'avez plus d'excuses pour rater une réunion !" #: ../../content/applications/general/calendars/outlook/outlook_calendar.rst:3 msgid "Synchronization with Outlook's Calendar" @@ -4184,7 +4223,7 @@ 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 `." +"find more information at: :doc:`In-App Purchase `." msgstr "" #: ../../content/applications/general/users.rst:7 diff --git a/locale/fr/LC_MESSAGES/inventory_and_mrp.po b/locale/fr/LC_MESSAGES/inventory_and_mrp.po index bc308052e..81f67be67 100644 --- a/locale/fr/LC_MESSAGES/inventory_and_mrp.po +++ b/locale/fr/LC_MESSAGES/inventory_and_mrp.po @@ -28,7 +28,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: 2021-11-02 08:48+0000\n" "Last-Translator: Cécile Collart , 2022\n" "Language-Team: French (https://www.transifex.com/odoo/teams/41243/fr/)\n" @@ -2512,19 +2512,19 @@ 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" +"**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 " @@ -2532,14 +2532,14 @@ msgid "" "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 " @@ -2547,11 +2547,11 @@ msgid "" " 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" @@ -2559,23 +2559,23 @@ msgid "" "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 "Délai de livraison au client" -#: ../../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 " @@ -2583,64 +2583,64 @@ msgid "" "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 "Délai de sécurité" -#: ../../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 " @@ -2649,29 +2649,29 @@ msgid "" "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 " @@ -2679,47 +2679,47 @@ msgid "" "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 "Délai de fabrication" -#: ../../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" @@ -2727,19 +2727,19 @@ msgid "" "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 " @@ -2747,65 +2747,65 @@ msgid "" "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)" diff --git a/locale/fr/LC_MESSAGES/productivity.po b/locale/fr/LC_MESSAGES/productivity.po index 91b9f1148..ea5368e16 100644 --- a/locale/fr/LC_MESSAGES/productivity.po +++ b/locale/fr/LC_MESSAGES/productivity.po @@ -8,27 +8,27 @@ # fr trans , 2021 # Jérôme Tanché , 2021 # Laura Piraux , 2021 -# Martin Trigaux, 2021 # Nacim ABOURA , 2021 # 5cad1b0f1319985f8413d48b70c3c192_b038c35, 2021 # Gunther Clauwaert , 2021 # Fernanda Marques , 2021 # Cécile Collart , 2022 +# Martin Trigaux, 2022 # #, fuzzy 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: 2021-11-02 08:49+0000\n" -"Last-Translator: Cécile Collart , 2022\n" +"Last-Translator: Martin Trigaux, 2022\n" "Language-Team: French (https://www.transifex.com/odoo/teams/41243/fr/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Language: fr\n" -"Plural-Forms: nplurals=2; plural=(n > 1);\n" +"Plural-Forms: nplurals=3; plural=(n == 0 || n == 1) ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;\n" #: ../../content/applications/productivity.rst:5 msgid "Productivity" @@ -38,6 +38,128 @@ msgstr "Productivité" msgid "Discuss" msgstr "Messages" +#: ../../content/applications/productivity/discuss/advanced.rst:5 +msgid "Advanced" +msgstr "Avancé" + +#: ../../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 "Vue d'ensemble" @@ -1595,12 +1717,12 @@ msgid "" 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 "" @@ -1660,38 +1782,64 @@ msgid "" "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/fr/LC_MESSAGES/sales.po b/locale/fr/LC_MESSAGES/sales.po index ffcfbfd3e..c97772a35 100644 --- a/locale/fr/LC_MESSAGES/sales.po +++ b/locale/fr/LC_MESSAGES/sales.po @@ -11,7 +11,6 @@ # Nacim ABOURA , 2021 # David David , 2021 # Nicolas BODART , 2021 -# Martin Trigaux, 2021 # 5cad1b0f1319985f8413d48b70c3c192_b038c35, 2021 # Jérôme Tanché , 2021 # Laura Piraux , 2021 @@ -19,24 +18,25 @@ # Priscilla (prs) Odoo , 2021 # 0169fee580ff5de3f9b7241d14f30af9_5f30934 <1948a2319336319ed4429b6139c8c1c2_916898>, 2021 # Alain Prasquier , 2021 -# Cécile Collart , 2022 # Renaud de Colombel , 2022 # Camille Dantinne , 2022 +# Martin Trigaux, 2022 +# Cécile Collart , 2022 # #, fuzzy 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: 2021-11-02 08:49+0000\n" -"Last-Translator: Camille Dantinne , 2022\n" +"Last-Translator: Cécile Collart , 2022\n" "Language-Team: French (https://www.transifex.com/odoo/teams/41243/fr/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Language: fr\n" -"Plural-Forms: nplurals=2; plural=(n > 1);\n" +"Plural-Forms: nplurals=3; plural=(n == 0 || n == 1) ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;\n" #: ../../content/applications/sales.rst:5 #: ../../content/applications/sales/sales.rst:8 @@ -92,7 +92,6 @@ msgstr "" " pour certains canaux depuis leur formulaire de configuration." #: ../../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 @@ -101,8 +100,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 @@ -210,157 +210,161 @@ msgid "It is also possible to merge more than 2 opportunities or leads." msgstr "" "Il est également possible de fusionner plus de deux opportunités ou pistes." -#: ../../content/applications/sales/crm/acquire_leads/generate_from_email.rst:3 -msgid "Generate leads/opportunities from emails" -msgstr "Générer des pistes et des opportunités à partir des emails" - -#: ../../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:3 +msgid "Generate leads/opportunities" msgstr "" -"Automatiser la création de pistes et d'opportunités améliorera " -"considérablement votre efficacité. Par défaut, tout mail envoyé à " -"*sales@database\\_domain.ext* créera une opportunité dans le pipeline du " -"canal de ventes par défaut." -#: ../../content/applications/sales/crm/acquire_leads/generate_from_email.rst:11 +#: ../../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_leads.rst:10 msgid "Configure email aliases" msgstr "Configurer les alias des adresses email" -#: ../../content/applications/sales/crm/acquire_leads/generate_from_email.rst:13 +#: ../../content/applications/sales/crm/acquire_leads/generate_leads.rst:12 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`." +"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 "" -"Chaque équipe de vente peut avoir son propre alias email pour générer " -"automatiquement les pistes/opportunités qui lui sont assignées. Cela est " -"utile si vous gérez plusieurs équipes de vente avec des processus " -"spécifiques. Vous trouverez la configuration des équipes de vente sur " -":menuselection:`Configuration --> Équipes de vente`." -#: ../../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 "" -"Générer des pistes et des opportunités à partir de la page contact de votre " -"site internet" -#: ../../content/applications/sales/crm/acquire_leads/generate_from_website.rst:5 +#: ../../content/applications/sales/crm/acquire_leads/generate_leads.rst:25 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." +"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 "" -"Automatiser la création de pistes et d'opportunités améliorera " -"considérablement votre efficacité. Tout visiteur utilisant le formulaire de " -"contact de votre site web créera une piste ou une opportunité dans le " -"pipeline." -#: ../../content/applications/sales/crm/acquire_leads/generate_from_website.rst:10 -msgid "Use the contact us on your website" -msgstr "Utiliser le formulaire de contact de votre site Web" - -#: ../../content/applications/sales/crm/acquire_leads/generate_from_website.rst:12 -msgid "You should first go to your website app." -msgstr "Rendez-vous, tout d'abord, sur l'application Site Web." - -#: ../../content/applications/sales/crm/acquire_leads/generate_from_website.rst:14 -msgid "|image0|\\ |image1|" -msgstr "|image0|\\ |image1|" - -#: ../../content/applications/sales/crm/acquire_leads/generate_from_website.rst:16 +#: ../../content/applications/sales/crm/acquire_leads/generate_leads.rst:32 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." +"The Contact Form can be activated or deactivated at any time by going to " +":menuselection:`Website --> Go to Website --> Customize --> Contact Form`." msgstr "" -"Avec l'installation de l'application CRM, vous bénéficiez sur votre site Web" -" Odoo d'un formulaire de contact prêt à l'emploi qui génère automatiquement " -"des pistes et des opportunités." -#: ../../content/applications/sales/crm/acquire_leads/generate_from_website.rst:23 +#: ../../content/applications/sales/crm/acquire_leads/generate_leads.rst:39 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*." +"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 "" -"Pour assigner les pistes à une équipe commerciale précise, allez dans " -":menuselection:`Site Web --> Configuration --> Paramètres`, vous trouverez " -"dans la partie *Communication* les informations du formulaire de contact et " -"vous pourrez modifier l'*Équipe commerciale* ou le *Vendeur*." -#: ../../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" -msgstr "Créer un formulaire de contact personnalisé" - -#: ../../content/applications/sales/crm/acquire_leads/generate_from_website.rst:34 +#: ../../content/applications/sales/crm/acquire_leads/generate_leads.rst:46 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.)" +"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 "" -"Vous pouvez vouloir en apprendre plus sur vos visiteurs quand ils utilisent " -"le formulaire de contact pour vous joindre. Vous aurez alors besoin de " -"construire un formulaire de contact personnalisé sur votre site Web. Ces " -"formulaires de contact peuvent générer de nombreux types d'enregistrements " -"dans le système (emails, pistes/opportunités, tâches, tickets d'assistance " -"technique, etc.)." -#: ../../content/applications/sales/crm/acquire_leads/generate_from_website.rst:43 +#: ../../content/applications/sales/crm/acquire_leads/generate_leads.rst:55 +msgid "Customize Contact Forms" +msgstr "" + +#: ../../content/applications/sales/crm/acquire_leads/generate_leads.rst:57 msgid "" -"You will need to install the free *Form Builder* module, only available in " -"Odoo Enterprise." +"Contact Forms can be customized for the specific information your team " +"needs, using the free *Form Builder* module." msgstr "" -"Vous devez installer le module gratuit *Générateur de formulaire*, qui est " -"uniquement disponible dans Odoo Entreprise." -#: ../../content/applications/sales/crm/acquire_leads/generate_from_website.rst:52 +#: ../../content/applications/sales/crm/acquire_leads/generate_leads.rst:60 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." +"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 "" -"Allez tout d'abord sur la page où vous désirez insérer votre formulaire de " -"contact. Dans le mode édition, déplacez le générateur de formulaire dans " -"votre page et vous pourrez ajouter tous les champs que vous souhaitez." -#: ../../content/applications/sales/crm/acquire_leads/generate_from_website.rst:59 +#: ../../content/applications/sales/crm/acquire_leads/generate_leads.rst:68 msgid "" -"By default, any new contact form will send an email. You can switch to " -"lead/opportunity generation in *Change Form Parameters*." +"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 "" -"Par défaut, tout nouveau contact générera l'envoi d'un email. Vous pouvez " -"passer à la génération de pistes ou d'opportunités dans *Modifier les " -"paramètres du formulaire*." -#: ../../content/applications/sales/crm/acquire_leads/generate_from_website.rst:63 +#: ../../content/applications/sales/crm/acquire_leads/generate_leads.rst:73 +msgid "Edit Contact Form fields" +msgstr "" + +#: ../../content/applications/sales/crm/acquire_leads/generate_leads.rst:75 msgid "" -"If the same visitor uses the contact form twice, the second entry will be " -"added to the first lead/opportunity in the chatter." +"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 "" -"Si un même utilisateur utilise le formulaire de contact deux fois, la " -"deuxième entrée sera ajoutée à la première piste ou opportunité dans le " -"chatter." -#: ../../content/applications/sales/crm/acquire_leads/generate_from_website.rst:67 -msgid "Generate leads instead of opportunities" -msgstr "Générer des pistes plutôt que des opportunités" - -#: ../../content/applications/sales/crm/acquire_leads/generate_from_website.rst:69 +#: ../../content/applications/sales/crm/acquire_leads/generate_leads.rst:78 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`." +":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_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_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_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 "" -"Lorsque vous utilisez un formulaire de contact, vous devez utiliser une " -"étape de qualification avant d'attribuer le formulaire aux vendeurs. Pour le" -" faire, activez *Pistes* dans les paramètres CRM et référez-vous à " -":doc:`convert`." #: ../../content/applications/sales/crm/acquire_leads/lead_mining.rst:3 msgid "Lead mining" @@ -417,18 +421,12 @@ msgstr "" #: ../../content/applications/sales/crm/acquire_leads/lead_mining.rst:34 msgid "" -"When choosing to target Companied and their contacts you can choose the " +"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 "" -"Lorsque vous choisissez de cibler des entreprises et leurs contacts, vous " -"pouvez choisir les contacts que vous obtenez en fonction du rôle ou de " -"l'ancienneté. Pour obtenir des informations sur les contacts, assurez-vous " -"de connaître la dernière réglementation de l'UE. Pour plus d'informations " -"sur le règlement général sur la protection des données, consultez le site " -"\"Odoo GDPR `__\"," #: ../../content/applications/sales/crm/acquire_leads/lead_mining.rst:39 msgid "" @@ -466,19 +464,12 @@ msgstr "Tarification" 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 " +" 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 --> In-App Purchases --> View my" -" Services`." +"Credits`; or go to :menuselection:`Settings --> Contacts --> Odoo IAP --> " +"View my Services`." msgstr "" -"Il s'agit d'une fonctionnalité d'achat In-App, chaque piste générée vous " -"coûtera un crédit. Si vous décidez d'obtenir des informations de contact, " -"chaque contact vous coûtera aussi un crédit supplémentaire. Voici le coût de" -" cette `fonctionnalité `__. " -"Pour acheter des crédits, vous pouvez soit aller dans :menuselection:`CRM " -"--> Configuration --> Paramètres --> Acheter des crédits` ; soit dans " -":menuselection:`Settings --> Achats In-App --> Voir mes Services`." #: ../../content/applications/sales/crm/acquire_leads/lead_mining.rst:65 msgid "" @@ -1124,88 +1115,88 @@ msgid ":doc:`../performance/win_loss`" msgstr ":doc:`../performance/win_loss`" #: ../../content/applications/sales/crm/pipeline/multi_sales_team.rst:3 -msgid "Manage multiple sales teams" -msgstr "Gérer plusieurs équipes commerciales" +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*." +"Odoo lets you manage several sales teams, departments, or channels, each " +"with their own unique sales processes, using *Sales Teams*." msgstr "" -"Dans 0doo, vous pouvez gérer plusieurs équipes commerciales, départements ou" -" canaux avec des processus de vente spécifiques. Pour cela, nous utilisons " -"le concept d' *Équipe Commerciale*." #: ../../content/applications/sales/crm/pipeline/multi_sales_team.rst:10 -msgid "Create a new sales channel" -msgstr "Créer une nouvelle équipe commerciale" +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`." +"To create a new Sales Team, go to :menuselection:`CRM --> Configuration --> " +"Sales Teams` then click **Create**." msgstr "" -"Pour créer une nouvelle *Équipe Commerciale*, allez dans " -":menuselection:`Configuration --> Équipes Commerciales`." -#: ../../content/applications/sales/crm/pipeline/multi_sales_team.rst:14 +#: ../../content/applications/sales/crm/pipeline/multi_sales_team.rst:15 msgid "" -"There you can set an email alias to it. Every message sent to that email " -"address will create a lead/opportunity." +"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 "" -"Vous pouvez ici définir un alias mail pour cette équipe. Chaque message " -"envoyé à cette adresse mail créera une piste/opportunité." -#: ../../content/applications/sales/crm/pipeline/multi_sales_team.rst:21 -msgid "Add members to your sales channel" -msgstr "Ajouter des membres à votre équipe commerciale" - -#: ../../content/applications/sales/crm/pipeline/multi_sales_team.rst:23 +#: ../../content/applications/sales/crm/pipeline/multi_sales_team.rst:19 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." +"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 "" -"Vous pouvez ajouter des membres à n'importe quelle équipe ; de cette manière" -" ces membres verront la structure du pipeline de l'équipe commerciale en " -"l'ouvrant. Toute piste/opportunité qui leur aura été assignée sera " -"rattachée à l'équipe commerciale. Par conséquent, on ne peut être membre que" -" d'une seule équipe commerciale." #: ../../content/applications/sales/crm/pipeline/multi_sales_team.rst:28 -msgid "This will ease the process review of the team manager." -msgstr "Ceci facilitera le processus de supervision par le chef d'équipe." - -#: ../../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." +msgid "Add members to a Sales Team" msgstr "" -"Si vous filtrez maintenant sur cette équipe dans votre pipeline, vous verrez" -" toutes ses opportunités." -#: ../../content/applications/sales/crm/pipeline/multi_sales_team.rst:40 -msgid "Sales channel dashboard" -msgstr "Le tableau de bord de l'équipe commerciale" +#: ../../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: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 "" -"Pour voir les opérations et les résultats de n'importe quelle équipe " -"commerciale d'un coup d’œil, le directeur commercial a également accès au " -"*Tableau de bord de l'Équipe Commerciale*, sous le menu *Rapports*." -#: ../../content/applications/sales/crm/pipeline/multi_sales_team.rst:46 +#: ../../content/applications/sales/crm/pipeline/multi_sales_team.rst:44 msgid "" -"It is shared with the whole ecosystem so every revenue stream is included in" -" it: Sales, eCommerce, PoS, etc." +"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 "" -"Il est partagé avec tout son environnement, ainsi toute source de revenu en " -"fait partie : Les ventes, l'e-commerce, les points de vente, etc." #: ../../content/applications/sales/crm/track_leads.rst:5 msgid "Assign and track leads" @@ -1217,129 +1208,91 @@ msgstr "Assigner des pistes d'après leur score" #: ../../content/applications/sales/crm/track_leads/lead_scoring.rst:5 msgid "" -"With *Leads Scoring* you can automatically rank your leads based on selected" -" criteria." +"*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 "" -"Avec le *Classement des Pistes*, vous pouvez classer automatiquement vos " -"pistes en fonction de critères sélectionnés." #: ../../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." +"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 "" -"Par exemple, vous pourriez mieux noter les visiteurs issus de votre pays ou " -"ceux qui ont visité des pages précises de votre site web." #: ../../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)." +"To use scoring, go to :menuselection:`Apps`, remove the :guilabel:`Apps` " +"filter, search for :guilabel:`Lead Scoring` and then install the module." msgstr "" -"Pour utiliser le classement, installez le module gratuit *Classement des " -"Pistes* depuis la page *Apps* (accessible uniquement dans la version Odoo " -"Entreprise)." -#: ../../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 "Créer des règles de notation" -#: ../../content/applications/sales/crm/track_leads/lead_scoring.rst:23 +#: ../../content/applications/sales/crm/track_leads/lead_scoring.rst:24 msgid "" -"You now have a new tab in your *CRM* app called *Leads Management* where you" -" can manage your scoring rules." +"To manage scoring rules, go to :menuselection:`CRM --> Leads --> Scoring " +"Rules`." msgstr "" -"Vous avez maintenant un nouvel onglet *Gestion des Pistes* dans votre " -"application *CRM* où vous pouvez gérer vos règles de notation." #: ../../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." +"Customize your rules to fit the needs of your business, and add as many " +"criteria as you want." msgstr "" -"Voici un exemple pour une piste canadienne, vous pouvez modifier tous les " -"critères sur lesquels vous souhaitez noter vos pistes. Vous pouvez ajouter " -"autant de critères que vous le souhaitez." -#: ../../content/applications/sales/crm/track_leads/lead_scoring.rst:33 +#: ../../content/applications/sales/crm/track_leads/lead_scoring.rst:32 msgid "" -"Every hour every lead without a score will be automatically scanned and " -"assigned their right score according to your scoring rules." +"Every hour, Odoo automatically assigns scores to new leads according to your" +" configured rules." msgstr "" -"Toutes les heures, les pistes n'ayant pas de score seront automatiquement " -"examinées et recevront la note qui correspond à vos règles de notation." -#: ../../content/applications/sales/crm/track_leads/lead_scoring.rst:40 +#: ../../content/applications/sales/crm/track_leads/lead_scoring.rst:39 msgid "Assign leads" msgstr "Assigner des pistes" -#: ../../content/applications/sales/crm/track_leads/lead_scoring.rst:42 +#: ../../content/applications/sales/crm/track_leads/lead_scoring.rst:41 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." +"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 "" -"Une fois les notes calculées, les pistes peuvent être assignées à une équipe" -" particulière en utilisant le même mécanisme de domaine. Pour ce faire, " -"allez dans :menuselection:`CRM --> Gestion des Pistes --> Attibution aux " -"Équipes` et appliquer un domaine spécifique à chacun. Ce domaine peut " -"inclure des notes." -#: ../../content/applications/sales/crm/track_leads/lead_scoring.rst:49 +#: ../../content/applications/sales/crm/track_leads/lead_scoring.rst:50 msgid "" -"Further on, you can assign to a specific vendor in the team with an even " -"more refined domain." +"Assign leads to specific salespeople using further refined Domains at " +":menuselection:`CRM --> Leads --> Leads Assignment`." msgstr "" -"Mieux encore, vous pouvez assigner une piste à un membre de l'équipe en " -"particulier avec un domaine encore plus précis." -#: ../../content/applications/sales/crm/track_leads/lead_scoring.rst:52 +#: ../../content/applications/sales/crm/track_leads/lead_scoring.rst:57 msgid "" -"To do so go to :menuselection:`CRM --> Leads Management --> Leads " -"Assignation`." +"Odoo automatically assigns new leads to teams/salespeople once per day." msgstr "" -"Pour cela, allez dans :menuselection:`CRM --> Gestion des Pistes --> " -"Assignation des pistes`." -#: ../../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 "" -"L'assignation des équipes & pistes affectera les pistes non assignées une " -"fois par jour." #: ../../content/applications/sales/crm/track_leads/lead_scoring.rst:62 -msgid "Evaluate & use the unassigned leads" -msgstr "Évaluer et utiliser les pistes non assignées" +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." +"To view your unassigned leads, go to :menuselection:`CRM --> Leads --> " +"Leads` and select the Unassigned filter." msgstr "" -"Une fois vos règles de notation établies vous aurez certainement encore des " -"pistes non assignées. Certaines d'entre elles pourraient encore se " -"transformer en opportunité aussi il et utile d'en faire quelque chose." -#: ../../content/applications/sales/crm/track_leads/lead_scoring.rst:68 +#: ../../content/applications/sales/crm/track_leads/lead_scoring.rst:72 msgid "" -"In your leads page you can place a filter to find your unassigned leads." +"You can also find unassigned leads and create re-engagement campaigns using " +"the :guilabel:`Email Marketing` or :guilabel:`Marketing Automation` apps." msgstr "" -"Dans la page des pistes, vous pouvez activer un filtre pour trouver toutes " -"vos pistes non-assignées." - -#: ../../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." -msgstr "" -"Pourquoi ne pas utiliser les applications :menuselection:`Marketing Email` " -"ou :menuselection:`Automatisation Marketing` pour leur envoyer un " -"publipostage ? De la même manière, vous pouvez également trouver des pistes " -"non assignées à partir de cet endroit." #: ../../content/applications/sales/crm/track_leads/prospect_visits.rst:3 msgid "Track your prospects visits" @@ -2204,32 +2157,31 @@ 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." +"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 +#: ../../content/applications/sales/point_of_sale/overview/epos_ssc.rst:79 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." +"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 " @@ -2268,13 +2220,9 @@ msgstr "Rendre des produits disponibles dans le Point de Vente" #: ../../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*." +" Products --> Products` and open a product. In the *Point of Sale* tab, " +"enable *Available in Point of Sale*." msgstr "" -"Pour rendre les produits disponibles à la vente, accédez à " -":menuselection:`Point de vente --> Produits --> Produits` et ouvrez un " -"produit. Dans l'onglet *Ventes*, activez *Disponible dans le Point de " -"Vente*." #: ../../content/applications/sales/point_of_sale/overview/getting_started.rst:28 msgid "You can also define if the product has to be weighted or not." @@ -2433,7 +2381,7 @@ msgstr "" #: ../../content/applications/sales/point_of_sale/overview/getting_started.rst:132 msgid "View your statistics" -msgstr "Visualisez vos statistiques" +msgstr "Visualiser ses statistiques" #: ../../content/applications/sales/point_of_sale/overview/getting_started.rst:134 msgid "" @@ -2528,7 +2476,7 @@ msgstr "" #: ../../content/applications/sales/point_of_sale/overview/register.rst:11 msgid "Create a customer" -msgstr "Créez un client" +msgstr "Créer un client" #: ../../content/applications/sales/point_of_sale/overview/register.rst:13 msgid "From your session interface, use the customer button." @@ -2555,9 +2503,146 @@ msgstr "" msgid "Payment Terminals" msgstr "Terminaux de paiement" +#: ../../content/applications/sales/point_of_sale/payment/adyen.rst:3 +msgid "Adyen" +msgstr "Adyen" + +#: ../../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 "Configuration du mode de paiement" + +#: ../../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 "Ajoutez une nouvelle méthode de paiement" + +#: ../../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 "Payer avec un terminal de paiement" + +#: ../../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" -msgstr "Connectez un terminal de paiement Ingenico à votre PdV" +msgid "Ingenico" +msgstr "Ingenico" #: ../../content/applications/sales/point_of_sale/payment/ingenico.rst:5 #: ../../content/applications/sales/point_of_sale/payment/worldline.rst:5 @@ -2618,11 +2703,6 @@ msgstr "" "fois cela fait, rendez-vous sur votre formulaire *IoT Box* dans Odoo et " "vérifiez que la borne a bien été retrouvée." -#: ../../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 "Configuration du mode de paiement" - #: ../../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 " @@ -2643,11 +2723,6 @@ msgstr "" "paiement. Créez un nouveau mode de paiement pour Ingenico, sélectionnez " "l'option terminal de paiement, puis sélectionnez votre terminal de paiement." -#: ../../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 "Payer avec un terminal de paiement" - #: ../../content/applications/sales/point_of_sale/payment/ingenico.rst:55 msgid "" "In your *PoS interface*, when processing a payment, select a *Payment " @@ -2698,8 +2773,8 @@ msgstr "" "trouverez le type de carte qui a été utilisée ainsi que la transaction ID." #: ../../content/applications/sales/point_of_sale/payment/six.rst:3 -msgid "Connect a SIX Payment Terminal to your PoS" -msgstr "Connecter un terminal de paiement SIX à votre PdV" +msgid "SIX" +msgstr "SIX" #: ../../content/applications/sales/point_of_sale/payment/six.rst:5 msgid "" @@ -2711,6 +2786,12 @@ 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 " @@ -2721,73 +2802,58 @@ msgstr "" "exécutent est différent. Les terminaux reçus de Worldline ne sont donc pas " "compatibles avec cette intégration." -#: ../../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 "Configuration du mode de paiement" -#: ../../content/applications/sales/point_of_sale/payment/six.rst:20 +#: ../../content/applications/sales/point_of_sale/payment/six.rst:21 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\"." +"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 "" -"Tout d'abord, assurez-vous que le module PdV SIX est installé. Pour cela, " -"allez dans *Apps*, supprimez le filtre \"Apps\" et recherchez \"PdV Six\"." -#: ../../content/applications/sales/point_of_sale/payment/six.rst:26 +#: ../../content/applications/sales/point_of_sale/payment/six.rst:28 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." +"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 "Payer avec un terminal de paiement" -#: ../../content/applications/sales/point_of_sale/payment/six.rst:36 +#: ../../content/applications/sales/point_of_sale/payment/six.rst:39 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." +"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 "" -"Dans votre interface PdV, sélectionnez un *mode de paiement* à l'aide d'un " -"terminal lorsque vous traitez un paiement. Vérifiez que le montant indiqué " -"dans la colonne Soumissionné est celui qui doit être envoyé au terminal de " -"paiement et cliquez sur *Envoyer*. Cliquez sur annuler pour annuler la " -"requête de paiement." -#: ../../content/applications/sales/point_of_sale/payment/six.rst:44 +#: ../../content/applications/sales/point_of_sale/payment/six.rst:48 msgid "" -"When the payment is done, the status will change to *Payment Successful*. " -"You can always reverse the last transaction by clicking on *Reverse*." +"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 "" -"Aussitôt le paiement effectué, le statut change vers *Paiement réussi*. Il " -"est toujours possible d'annuler la dernière transaction en cliquant sur " -"*Annuler*." -#: ../../content/applications/sales/point_of_sale/payment/six.rst:51 +#: ../../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 *Force Done*. This will allow you to validate the order in" -" Odoo even if the connection between the terminal and Odoo encounters " -"issues." +"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 "" -"En cas de problème avec le terminal de paiement, vous pouvez toujours forcer" -" le paiement à l'aide de *Forcer la validation*. Cela vous permettra de " -"valider la commande dans Odoo même si la connexion entre la borne et Odoo " -"rencontre des problèmes." #: ../../content/applications/sales/point_of_sale/payment/vantiv.rst:3 -msgid "Connect a Vantiv Payment Terminal to your PoS" -msgstr "Connectez un terminal de paiement Vantiv à votre PdV" +msgid "Vantiv" +msgstr "" #: ../../content/applications/sales/point_of_sale/payment/vantiv.rst:5 msgid "" @@ -2846,7 +2912,7 @@ msgstr "" " paiement... et c'est tout." #: ../../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 @@ -3042,7 +3108,7 @@ msgstr "" #: ../../content/applications/sales/point_of_sale/restaurant/bill_printing.rst:22 msgid "Split a Bill" -msgstr "Divisez la facture" +msgstr "Diviser la note" #: ../../content/applications/sales/point_of_sale/restaurant/bill_printing.rst:24 msgid "On your PoS interface, you now have a *Bill* button." @@ -3165,7 +3231,7 @@ msgstr "" #: ../../content/applications/sales/point_of_sale/restaurant/kitchen_printing.rst:20 msgid "Add a printer" -msgstr "Ajoutez une imprimante" +msgstr "Ajouter une imprimante" #: ../../content/applications/sales/point_of_sale/restaurant/kitchen_printing.rst:22 msgid "" @@ -3200,7 +3266,7 @@ msgstr "" #: ../../content/applications/sales/point_of_sale/restaurant/restaurant.rst:3 msgid "Manage your tables" -msgstr "Gérez vos tables" +msgstr "Gestion des tables" #: ../../content/applications/sales/point_of_sale/restaurant/restaurant.rst:5 msgid "" @@ -3244,7 +3310,7 @@ msgstr "" #: ../../content/applications/sales/point_of_sale/restaurant/restaurant.rst:32 msgid "Add a floor" -msgstr "Ajoutez un étage" +msgstr "Ajouter un étage" #: ../../content/applications/sales/point_of_sale/restaurant/restaurant.rst:34 msgid "" @@ -3263,7 +3329,7 @@ msgstr "N'oubliez pas de lier votre salle à votre Point de Vente." #: ../../content/applications/sales/point_of_sale/restaurant/restaurant.rst:50 msgid "Add tables" -msgstr "Ajoutez des tables" +msgstr "Ajouter des tables" #: ../../content/applications/sales/point_of_sale/restaurant/restaurant.rst:52 msgid "" @@ -3304,7 +3370,7 @@ msgstr "" #: ../../content/applications/sales/point_of_sale/restaurant/restaurant.rst:82 msgid "Transfer customer(s)" -msgstr "Transferez des clients" +msgstr "Transférer des clients" #: ../../content/applications/sales/point_of_sale/restaurant/restaurant.rst:84 msgid "" @@ -3402,7 +3468,7 @@ msgstr "" #: ../../content/applications/sales/point_of_sale/restaurant/tips.rst:3 msgid "Integrate a tip option into payment" -msgstr "Intégrez une option de pourboire dans le paiement" +msgstr "Intégrer une option de pourboire dans le paiement" #: ../../content/applications/sales/point_of_sale/restaurant/tips.rst:5 msgid "" @@ -3435,7 +3501,7 @@ msgstr "" #: ../../content/applications/sales/point_of_sale/restaurant/tips.rst:21 msgid "Add Tips to the bill" -msgstr "Ajouter des pourboires à la facture" +msgstr "Ajouter des pourboires à la note" #: ../../content/applications/sales/point_of_sale/restaurant/tips.rst:23 msgid "Once on the payment interface, you now have a new *Tip* button" @@ -3484,7 +3550,7 @@ msgstr "" #: ../../content/applications/sales/point_of_sale/shop/barcode.rst:21 msgid "Add barcodes to product" -msgstr "Ajoutez des codes-barres à vos produits" +msgstr "Ajouter des codes-barres à ses produits" #: ../../content/applications/sales/point_of_sale/shop/barcode.rst:23 msgid "" @@ -3504,7 +3570,7 @@ msgstr "" #: ../../content/applications/sales/point_of_sale/shop/barcode.rst:33 msgid "Scanning products" -msgstr "Scannez des produits" +msgstr "Scanner des produits" #: ../../content/applications/sales/point_of_sale/shop/barcode.rst:35 msgid "" @@ -3517,106 +3583,6 @@ msgstr "" "même produit pour l'ajouter plusieurs fois ou alors modifier manuellement la" " quantité à l'écran." -#: ../../content/applications/sales/point_of_sale/shop/cash_control.rst:3 -msgid "Set-up Cash Control in Point of Sale" -msgstr "Mettez en place un Controle de la Caisse dans votre Point de Vente " - -#: ../../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 "" -"Le Contrôle de la Caisse vous permet de vérifier le montant de la caisse à " -"l'ouverture et à la fermeture. Vous pouvez ainsi vous assurer qu'aucune " -"erreur n'a été commise et qu'aucune somme d'argent n'est manquante." - -#: ../../content/applications/sales/point_of_sale/shop/cash_control.rst:10 -msgid "Activate Cash Control" -msgstr "Activez le Controle de la Caisse" - -#: ../../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 "" -"Pour activer la fonction *Contrôle de la Caisse*, allez à " -":menuselection:`Point de vente --> Configuration --> Point de vente` et " -"sélectionnez votre interface PdV." - -#: ../../content/applications/sales/point_of_sale/shop/cash_control.rst:16 -msgid "Under the payments category, you will find the cash control setting." -msgstr "" -"Dans la catégorie des paiements, vous trouverez le paramètre de Contrôle de " -"la caisse." - -#: ../../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 "" -"Dans cet exemple, vous voyez que je veux avoir 275 $ en différentes coupures" -" à l'ouverture et à la fermeture." - -#: ../../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 "" -"En cliquant sur *Valeurs d'ouverture / fermeture* vous serez capable de " -"créer ces valeurs." - -#: ../../content/applications/sales/point_of_sale/shop/cash_control.rst:31 -msgid "Start a session" -msgstr "Démarrez une session" - -#: ../../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 "" -"Vous avez maintenant ajouté un nouveau bouton visible lorsque vous ouvrez " -"une session, *Définir le solde d'ouverture*" - -#: ../../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 "" -"Par défaut, il utilisera la valeur que vous avez ajoutée auparavant, mais " -"vous pouvez toujours la modifier." - -#: ../../content/applications/sales/point_of_sale/shop/cash_control.rst:46 -msgid "Close a session" -msgstr "Fermer une session" - -#: ../../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 "" -"Lorsque vous souhaitez fermer votre session, vous disposez également d'un " -"bouton * Définir un solde de clôture*." - -#: ../../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 "" -"Vous pouvez alors voir l'équilibre théorique, le solde de clôture réel (ce " -"que vous venez de compter) et la différence entre les deux." - -#: ../../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 "" -"Si vous utilisez l'option *Sortir de l'argent* pour prendre vos transactions" -" pour cette session, vous avez maintenant une différence à somme nulle et le" -" même solde de clôture que votre solde d'ouverture. Votre caisse est prête " -"pour la prochaine session." - #: ../../content/applications/sales/point_of_sale/shop/cash_rounding.rst:3 msgid "Cash Rounding" msgstr "Arrondi des paiements en espèces" @@ -3716,7 +3682,7 @@ msgstr "" #: ../../content/applications/sales/point_of_sale/shop/invoice.rst:9 msgid "Activate invoicing" -msgstr "Activez la facturation" +msgstr "Activer la facturation" #: ../../content/applications/sales/point_of_sale/shop/invoice.rst:11 msgid "" @@ -3737,7 +3703,7 @@ msgstr "" #: ../../content/applications/sales/point_of_sale/shop/invoice.rst:25 msgid "Select a customer" -msgstr "Sélectionnez un client" +msgstr "Sélectionner un client" #: ../../content/applications/sales/point_of_sale/shop/invoice.rst:27 msgid "From your session interface, use the customer button" @@ -3956,6 +3922,147 @@ msgstr "" msgid "When you use it, you can then reprint your last receipt." msgstr "Il vous donne la possibilité de réimprimer votre dernier reçu." +#: ../../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 "Location" @@ -4497,12 +4604,14 @@ msgid "Amazon.nl" msgstr "Amazon.nl" #: ../../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 ":doc:`setup`" #: ../../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 ":doc:`gérer`" @@ -4591,15 +4700,36 @@ msgstr "" #: ../../content/applications/sales/sales/amazon_connector/manage.rst:45 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 "" +"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 "" +"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 "" ":doc:`../../../inventory_and_mrp/inventory/shipping/setup/third_party_shipper`" -#: ../../content/applications/sales/sales/amazon_connector/manage.rst:48 +#: ../../content/applications/sales/sales/amazon_connector/manage.rst:57 msgid "Follow deliveries in FBA" msgstr "Suivi des livraisons en FBA" -#: ../../content/applications/sales/sales/amazon_connector/manage.rst:50 +#: ../../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 " @@ -4610,14 +4740,14 @@ msgid "" "under the FBA program." msgstr "" -#: ../../content/applications/sales/sales/amazon_connector/manage.rst:57 +#: ../../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" @@ -4629,18 +4759,18 @@ msgid "" " 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 "Émettre des factures et enregistrer les paiements" -#: ../../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." @@ -4648,7 +4778,7 @@ msgstr "" "Pour afficher uniquement les commandes liées à Amazon dans la vue liste, " "vous pouvez filtrer les commandes en fonction de l'équipe de vente." -#: ../../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 " @@ -4659,11 +4789,11 @@ msgid "" "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 "Suivez vos ventes Amazon dans les rapports de ventes" -#: ../../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 " @@ -4671,7 +4801,7 @@ msgid "" " 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." @@ -4679,7 +4809,7 @@ msgstr "" "Si vous souhaitez, vous pouvez modifier l'équipe de vente de votre compte " "pour exécuter un état distinct pour les ventes de ce compte. " -#: ../../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 " @@ -4689,8 +4819,9 @@ msgid "" "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 ":doc:`fonctionnalités`" @@ -4699,118 +4830,49 @@ msgid "Configure Amazon Connector in Odoo" msgstr "Configurez le Connecteur Amazon dans Odoo" #: ../../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 "Nom du développeur : ``Odoo S.A.``" - -#: ../../content/applications/sales/sales/amazon_connector/setup.rst:36 -msgid "Developer ID: ``586127723692``" -msgstr "ID développeur : ``586127723692``" - -#: ../../content/applications/sales/sales/amazon_connector/setup.rst:38 -msgid "For the **Europe** region, use these values:" -msgstr "Pour la région **Europe**, utilisez ces valeurs :" - -#: ../../content/applications/sales/sales/amazon_connector/setup.rst:41 -msgid "Developer ID: ``579095187166``" -msgstr "ID développeur: ``579095187166``" - -#: ../../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 "Enregistrez votre compte Amazon dans Odoo" -#: ../../content/applications/sales/sales/amazon_connector/setup.rst:57 +#: ../../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 **CREATE**." +"Accounts` and click on :guilabel:`CREATE`." msgstr "" -#: ../../content/applications/sales/sales/amazon_connector/setup.rst:60 +#: ../../content/applications/sales/sales/amazon_connector/setup.rst:13 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 " -"`." +"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 +#: ../../content/applications/sales/sales/amazon_connector/setup.rst:17 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." +"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 +#: ../../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:23 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." +"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:72 +#: ../../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 " @@ -4818,7 +4880,7 @@ msgid "" " 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, " @@ -4826,7 +4888,7 @@ msgid "" "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 " @@ -4835,7 +4897,7 @@ msgid "" ":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" @@ -4844,7 +4906,7 @@ msgid "" " 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** " @@ -4852,18 +4914,18 @@ msgid "" "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 "Configurer les taxes des produits" -#: ../../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 " @@ -4872,7 +4934,7 @@ msgid "" " 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 " @@ -4880,76 +4942,173 @@ msgid "" "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 +#: ../../content/applications/sales/sales/amazon_connector/setup.rst:78 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." +"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 +#: ../../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." +"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 +#: ../../content/applications/sales/sales/amazon_connector/setup.rst:88 msgid "" -"To add a new marketplace, you must first activate the :ref:`developer mode " -"`." +"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 +#: ../../content/applications/sales/sales/amazon_connector/setup.rst:93 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 " -"`_." +"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 +#: ../../content/applications/sales/sales/amazon_connector/setup.rst:99 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." +"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 +#: ../../content/applications/sales/sales/amazon_connector/setup.rst:104 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." +"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 "Connecteur eBay" @@ -5927,7 +6086,7 @@ msgstr "Comment adapter vos prix à vos clients et appliquer des réductions" 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 " +"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 "" @@ -7232,18 +7391,10 @@ msgid "" 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 "" -"Sur chaque modèle, vous pouvez également spécifier des remises si l'option " -"est activée dans les paramètres **Ventes**." - -#: ../../content/applications/sales/sales/send_quotations/quote_template.rst:46 msgid "Design your template" msgstr "Concevez votre modèle" -#: ../../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 " @@ -7252,23 +7403,23 @@ msgid "" "**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 "Utilisez un template de devis." -#: ../../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 "" "Lors de la création d'un devis, vous pouvez choisir un modèle spécifique." -#: ../../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." @@ -7276,18 +7427,18 @@ msgstr "" "Vous pouvez sélectionner le modèle de votre choix et le suggérer comme " "modèle par défaut dans les paramètres **Ventes**." -#: ../../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 "Confirmez le devis" -#: ../../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." @@ -7295,12 +7446,12 @@ msgstr "" "Tous les devis seront désormais configurés de cette manière. Bien entendu, " "vous pouvez toujours modifier et rendre spécifique chaque devis. " -#: ../../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 ":doc:`get_signature_to_validate`" -#: ../../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 ":doc:`get_paid_to_validate`" diff --git a/locale/fr/LC_MESSAGES/services.po b/locale/fr/LC_MESSAGES/services.po index 2767840f9..cb8809d7e 100644 --- a/locale/fr/LC_MESSAGES/services.po +++ b/locale/fr/LC_MESSAGES/services.po @@ -6,7 +6,7 @@ # Translators: # ShevAbam, 2021 # Richard Mathot , 2021 -# Alexandra Jubert , 2021 +# Alexandra Jubert, 2021 # Fernanda Marques , 2021 # Priscilla (prs) Odoo , 2021 # anthony chaussin , 2021 @@ -20,7 +20,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: 2021-11-02 08:49+0000\n" "Last-Translator: Cécile Collart , 2022\n" "Language-Team: French (https://www.transifex.com/odoo/teams/41243/fr/)\n" @@ -28,7 +28,7 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Language: fr\n" -"Plural-Forms: nplurals=2; plural=(n > 1);\n" +"Plural-Forms: nplurals=3; plural=(n == 0 || n == 1) ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;\n" #: ../../content/applications/services.rst:5 msgid "Services" @@ -1186,6 +1186,7 @@ msgid ":doc:`reinvoice_from_project`" msgstr ":doc:`reinvoice_from_project`" #: ../../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 "" @@ -1198,51 +1199,150 @@ 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." +"The :guilabel:`Timesheet on Ticket` integration provides more control and " +"transparency over how clients are charged, and what they're specifically " +"billed for." msgstr "" -"Ajoutez directement le temps à facturer que vous avez enregistré sur vos " -"tickets d'assistance dans les bons de commande et les factures, via une " -"tâche de projet. Cela vous donne plus de contrôle sur ce que vous facturez à" -" votre client, et c'est plus efficace." -#: ../../content/applications/services/helpdesk/timesheet_and_invoice/reinvoice_from_project.rst:10 +#: ../../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 "Configuration" msgstr "Configuration" -#: ../../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*." -msgstr "" -"Allez dans :menuselection:`Assistance --> Configuration --> Equipes " -"d'assistance --> Modifier` et activez les options *Feuille de temps sur " -"Ticket* et *Refacturation du temps*." - #: ../../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*." +"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" -msgstr "Créez un bon de commande et une facture" - -#: ../../content/applications/services/helpdesk/timesheet_and_invoice/reinvoice_from_project.rst:24 +#: ../../content/applications/services/helpdesk/timesheet_and_invoice/reinvoice_from_project.rst:20 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." +"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 "" -"A présent, une fois que vous avez enregistré le temps que vous avez passé " -"sur le ticket d'assistance, sous l'onglet *Feuilles de temps*, accédez à la " -"tâche en cliquant sur son nom." -#: ../../content/applications/services/helpdesk/timesheet_and_invoice/reinvoice_from_project.rst:31 -msgid "*Create Sales Order* and proceed to create the invoice." -msgstr "*Créez un bon de commande* et lancez la facturation." +#: ../../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: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 msgid "Project" diff --git a/locale/fr/LC_MESSAGES/sphinx.po b/locale/fr/LC_MESSAGES/sphinx.po index 0e61dab33..48be00d65 100644 --- a/locale/fr/LC_MESSAGES/sphinx.po +++ b/locale/fr/LC_MESSAGES/sphinx.po @@ -6,25 +6,25 @@ # Translators: # Fernanda Marques , 2022 # sakodoo , 2022 -# Martin Trigaux, 2022 # Jonathan Castillo , 2022 # JM Mas, 2022 # Cécile Collart , 2022 +# Martin Trigaux, 2022 # #, fuzzy 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: 2022-03-18 15:03+0000\n" -"Last-Translator: Cécile Collart , 2022\n" +"Last-Translator: Martin Trigaux, 2022\n" "Language-Team: French (https://www.transifex.com/odoo/teams/41243/fr/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Language: fr\n" -"Plural-Forms: nplurals=2; plural=(n > 1);\n" +"Plural-Forms: nplurals=3; plural=(n == 0 || n == 1) ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;\n" #: ../../extensions/odoo_theme/layout_templates/footer.html:3 msgid "Get Help" @@ -38,7 +38,7 @@ msgstr "Contacter l'assistance" msgid "Ask the Odoo Community" msgstr "Demander à la communauté Odoo" -#: ../../extensions/odoo_theme/layout_templates/header.html:11 +#: ../../extensions/odoo_theme/layout_templates/header.html:10 msgid "Try Odoo for FREE" msgstr "Essayer Odoo GRATUITEMENT" @@ -157,10 +157,14 @@ msgstr "" "meilleur." #: ../../extensions/odoo_theme/layout_templates/homepage.html:102 -msgid "Write documentation" -msgstr "Écrire de la documentation" +msgid "Coding guidelines" +msgstr "" #: ../../extensions/odoo_theme/layout_templates/homepage.html:107 +msgid "Documentation" +msgstr "Documentation" + +#: ../../extensions/odoo_theme/layout_templates/homepage.html:112 msgid "Content guidelines" msgstr "Directives de contenu" diff --git a/locale/fr/LC_MESSAGES/websites.po b/locale/fr/LC_MESSAGES/websites.po index 187d97922..09c3ee224 100644 --- a/locale/fr/LC_MESSAGES/websites.po +++ b/locale/fr/LC_MESSAGES/websites.po @@ -11,10 +11,10 @@ # Jérôme Tanché , 2022 # Rihab LOUKIL , 2022 # 2bb6a6c9c26c6796aa3f72da499aab31_c4bf95e <50ab448b17d7dd714d37f715e9558f9f_400401>, 2022 -# Martin Trigaux, 2022 # Fernanda Marques , 2022 # Vallen Delobel , 2022 # Shark McGnark , 2022 +# Martin Trigaux, 2022 # Cécile Collart , 2022 # #, fuzzy @@ -22,7 +22,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: 2022-03-18 15:03+0000\n" "Last-Translator: Cécile Collart , 2022\n" "Language-Team: French (https://www.transifex.com/odoo/teams/41243/fr/)\n" @@ -63,11 +63,15 @@ msgstr "" "``www.example.com`` plutôt qu'avec celle par défaut ``example.odoo.com``." #: ../../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 "`Tutoriels Odoo : Site Web `_" -#: ../../content/applications/websites/ecommerce.rst:20 +#: ../../content/applications/websites/ecommerce.rst:21 #: ../../content/applications/websites/website.rst:21 msgid "" "`Odoo Tutorials: eCommerce `_" @@ -453,104 +457,98 @@ msgid "Maximize my revenue" msgstr "Augmenter mon chiffre d'affaires" #: ../../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 "" -"Comment vendre des accessoires et des produits optionnels (vente croisée)" #: ../../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:" +"Any sales process is an opportunity to maximize revenues. For example, with " +"an extended warranty or some accessories." msgstr "" -"Vous vendez des ordinateurs. Alors, pourquoi ne pas inciter vos clients à " -"acheter un écran haut de gamme ou à prendre une garantie supplémentaire? " -"C'est l'objectif des fonctionnalités de la vente croisée." #: ../../content/applications/websites/ecommerce/maximizing_revenue/cross_selling.rst:8 -msgid "Accessory products on checkout page," -msgstr "Des produits accessoires sur la page de vérification," - -#: ../../content/applications/websites/ecommerce/maximizing_revenue/cross_selling.rst:9 msgid "" -"Optional products on a new *Add to Cart* screen (not installed by default)." +"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 "" -"Des produits optionnels sur un nouvel écran *Ajouter au panier* (pas " -"installé par défaut)." #: ../../content/applications/websites/ecommerce/maximizing_revenue/cross_selling.rst:12 -msgid "Accessory products when checking out" -msgstr "Des produits optionnels sur la page de vérification" +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." +":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 "" -"Des accessoires (par ex. pour les ordinateurs : souris, clavier) sont " -"proposés au client lors de l'étape de vérification du panier avant le " -"paiement." #: ../../content/applications/websites/ecommerce/maximizing_revenue/cross_selling.rst:20 -msgid "Select accessories in the *Sales* tab of the product detail page." -msgstr "" -"Sélectionnez les accessoires sur l'onglet *Ventes* de la page détails du " -"produit." +msgid "Accessory Products" +msgstr "Accessoires " -#: ../../content/applications/websites/ecommerce/maximizing_revenue/cross_selling.rst:26 +#: ../../content/applications/websites/ecommerce/maximizing_revenue/cross_selling.rst:22 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." +"**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 "" -"Lorsque plusieurs articles sont ajoutés au panier, un algorithme détermine " -"quels sont les meilleurs accessoires à afficher. Si un article est identifié" -" en tant qu'accessoire à plusieurs produits du panier, il sera probablement " -"affiché en haut de la liste d'accessoires proposés." -#: ../../content/applications/websites/ecommerce/maximizing_revenue/cross_selling.rst:31 -msgid "Optional products when adding to cart" -msgstr "Produits optionnels lors de l'ajout au panier" - -#: ../../content/applications/websites/ecommerce/maximizing_revenue/cross_selling.rst:33 +#: ../../content/applications/websites/ecommerce/maximizing_revenue/cross_selling.rst:25 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." +"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: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 "" -"Des articles optionnels sont directement liés aux articles ajoutés au panier" -" (par ex. pour les ordinateurs : garanties, logiciels OS, composants " -"supplémentaires). Dès que l'article principal est ajouté au panier un nouvel" -" écran de ce type est proposé en tant qu'étape supplémentaire." #: ../../content/applications/websites/ecommerce/maximizing_revenue/cross_selling.rst:40 -msgid "To publish optional products:" -msgstr "Pour publier des produits optionnels:" - -#: ../../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." +"`Odoo Tutorials: Alternative, Accessory, and Optional Products " +"`_." msgstr "" -"Installez le module complémentaire *Produits optionnels eCommerce* sur le " -"menu *Applications*. Pour chercher également dans les modules " -"complémentaires supprimez le filtre par défaut, sinon seules les " -"applications principales seront affichées." + +#: ../../content/applications/websites/ecommerce/maximizing_revenue/cross_selling.rst:46 +msgid "Optional Products" +msgstr "Articles optionnels" #: ../../content/applications/websites/ecommerce/maximizing_revenue/cross_selling.rst:48 -msgid "Select optional items from the *Sales* tab of the product detail form." -msgstr "" -"Sélectionnez articles optionnels sur l'onglet *Ventes* de la page détails du" -" produit." - -#: ../../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." +"**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: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 "" -"La quantité d'articles optionnels ajoutés au panier est identique à celle de" -" l'article principal." #: ../../content/applications/websites/ecommerce/maximizing_revenue/pricing.rst:3 msgid "Adapt prices to website visitors" @@ -814,10 +812,6 @@ msgstr "" "Activez l'option *Produits alternatifs* dans le menu *Personnaliser* de la " "page internet du produit." -#: ../../content/applications/websites/ecommerce/publish.rst:5 -msgid "Launch my website" -msgstr "Lancer mon site Web" - #: ../../content/applications/websites/ecommerce/shopper_experience.rst:5 msgid "Get paid" msgstr "Se faire payer" @@ -928,7 +922,7 @@ msgstr ":doc:`../../../finance/payment_acquirers`" #: ../../content/applications/websites/ecommerce/shopper_experience/payment_acquirer.rst:62 msgid "" ":ref:`Payment Acquirers: Place a hold on a card " -"`" +"`" msgstr "" #: ../../content/applications/websites/ecommerce/shopper_experience/portal.rst:3 @@ -1398,7 +1392,39 @@ msgid "How to track your website traffic from your Odoo Dashboard" msgstr "" "Comment contrôler le trafic de votre site Web via le tableau de bord Odoo." -#: ../../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." @@ -1406,7 +1432,7 @@ msgstr "" "Grâce à Google Analytics, vous pouvez suivre vos statistiques de trafic " "directement depuis le tableau de bord de votre site Web Odoo." -#: ../../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`)." @@ -1415,7 +1441,7 @@ msgstr "" "de suivi dans les paramètres de votre site Web (voir " ":doc:`google_analytics`)." -#: ../../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." @@ -1424,11 +1450,11 @@ msgstr "" " APIs `__ . Connectez-vous avec votre" " compte Google." -#: ../../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 "Sélectionnez Analytics API." -#: ../../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." @@ -1436,15 +1462,15 @@ msgstr "" "Créez un nouveau projet et donnez-lui un nom (par ex. Odoo). La création de " "ce projet est indispensable pour sauvegarder vos identifiants API." -#: ../../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 "Activez l'API." -#: ../../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 "Créez les identifiants que vous utiliserez dans Odoo." -#: ../../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." @@ -1452,7 +1478,7 @@ msgstr "" "Sélectionnez *Navigateur Web (Javascript)* comme contexte à partir duquel " "l'API sera appelée et *Données utilisateur* comme type de données." -#: ../../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" @@ -1466,7 +1492,7 @@ msgstr "" "de redirection autorisée* est l'URL de votre instance Odoo suivie de " "'/google_account/authentication'." -#: ../../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 " @@ -1479,13 +1505,13 @@ msgstr "" "apparaîtra uniquement lorsque vous entrez l'ID client dans Odoo pour la " "première fois." -#: ../../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 "" "Votre ID client est finalement généré. Copiez-le et collez-le dans Odoo." -#: ../../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." @@ -1493,13 +1519,13 @@ msgstr "" "Ouvrez le tableau de bord de votre site web dans Odoo et liez votre compte " "Analytics à votre ID client." -#: ../../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 "Pour finir, autorisez l'accès de Google API à Odoo." #: ../../content/applications/websites/website/optimize/link_tracker.rst:3 msgid "Track clicks and visitors using Link Trackers" -msgstr "Suivez les clics et les visiteurs à l'aide des traqueurs de liens" +msgstr "Suivi des clics et des visiteurs à l'aide des traqueurs de liens" #: ../../content/applications/websites/website/optimize/link_tracker.rst:5 msgid "" @@ -1508,6 +1534,11 @@ msgid "" "are able to identify your best traffic sources and make informed decisions " "about the distribution of your marketing budget." msgstr "" +"Les traqueurs de liens vous permettent de suivre vos campagnes de marketing " +"(emails, bannières publicitaires, articles de blog, messages sur les médias " +"sociaux, liens d'affiliation, etc.) De cette façon, vous êtes en mesure " +"d'identifier vos meilleures sources de trafic et de prendre des décisions " +"éclairées sur la répartition de votre budget marketing." #: ../../content/applications/websites/website/optimize/link_tracker.rst:10 msgid "Configuration" @@ -1518,10 +1549,12 @@ msgid "" "Go to :menuselection:`Website --> Configuration --> Settings` and activate " "*Link Trackers*." msgstr "" +"Allez dans :menuselection:`Website --> Configuration --> Paramètres` et " +"acitvez les *Traqueurs de liens*." #: ../../content/applications/websites/website/optimize/link_tracker.rst:19 msgid "Set up traceable URLs" -msgstr "" +msgstr "Mise en place d'URLs traçables" #: ../../content/applications/websites/website/optimize/link_tracker.rst:21 msgid "" @@ -1529,37 +1562,49 @@ msgid "" "page`. Here, you are able to get a specific tracked URL based on the " "campaign, medium, and source being used." msgstr "" +"Allez sur :menuselection:`Site Web --> Aller sur le site Web --> Promouvoir " +"--> Suivre cette page`. Ici, vous pouvez obtenir une URL de suivi spécifique" +" en fonction de la campagne, du support et de la source utilisés." #: ../../content/applications/websites/website/optimize/link_tracker.rst:28 msgid "" "**URL**: url of the page you want to track (e.g. the home page or a " "product's page)." msgstr "" +"**URL** : url de la page que vous souhaitez suivre (par exemple, la page " +"d'accueil ou la page d'un produit)." #: ../../content/applications/websites/website/optimize/link_tracker.rst:29 msgid "**Campaign**: context of your link (e.g. a special promotion)." msgstr "" +"**Campagne** : contexte de votre lien (par exemple, une promotion spéciale)." #: ../../content/applications/websites/website/optimize/link_tracker.rst:30 msgid "" "**Medium**: channel used to share (deliver) your link (e.g. an email or a " "Facebook ad)." msgstr "" +"**Medium** : canal utilisé pour partager (délivrer) votre lien (par exemple," +" un email ou une publicité Facebook)." #: ../../content/applications/websites/website/optimize/link_tracker.rst:31 msgid "" "**Source**: platform where the traffic originates (e.g. Google or Twitter)." msgstr "" +"**Source** : plateforme d'où provient le trafic (par exemple, Google ou " +"Twitter)." #: ../../content/applications/websites/website/optimize/link_tracker.rst:33 msgid "" "Now, click on *Get tracked link* to generate a URL that you can post or send" " by the source you have decided on." msgstr "" +"Maintenant, cliquez sur *Obtenir un lien tracké* pour générer une URL que " +"vous pouvez afficher ou envoyer par la source que vous avez choisie." #: ../../content/applications/websites/website/optimize/link_tracker.rst:37 msgid "Follow-up on tracked links" -msgstr "" +msgstr "Suivi des liens traqués" #: ../../content/applications/websites/website/optimize/link_tracker.rst:39 msgid "" @@ -1569,10 +1614,18 @@ msgid "" "statistics by clicking on *Stats*, including the number of clicks, and the " "country of origin for those clicks." msgstr "" +"Pour consulter les statistiques de vos liens, allez sur :menuselection:`Site" +" Web --> Aller sur le site Web --> Promouvoir --> Suivre cette page`. Outre " +"la possibilité de voir les liens *les plus cliqués* et *les plus utilisés " +"récemment*, vous pouvez également consulter des statistiques complètes en " +"cliquant sur *Stats*, notamment le nombre de clics et le pays d'origine de " +"ces clics." #: ../../content/applications/websites/website/optimize/link_tracker.rst:50 msgid "You can also access the link tracker on *odoo.com/r* via your browser." msgstr "" +"Vous pouvez également accéder au traqueur de liens sur *odoo.com/r* via " +"votre navigateur." #: ../../content/applications/websites/website/optimize/link_tracker.rst:51 msgid "" @@ -1580,6 +1633,9 @@ msgid "" "developer mode`) and get access to the *Link Tracker* module and its back-" "end functionalities." msgstr "" +"Activez le mode développeur (:menuselection:`Paramètres --> Activer le mode " +"développeur`) et accédez au module *Traqueur de liens* et à ses " +"fonctionnalités back-end." #: ../../content/applications/websites/website/optimize/link_tracker.rst:53 msgid "" @@ -1587,6 +1643,9 @@ msgid "" "allow you to see the number of clicks and visitors to keep you on top of " "your marketing campaigns." msgstr "" +"Intégrés à :doc:`Google Analytics `, ces trackers vous " +"permettent de voir le nombre de clics et de visiteurs pour vous permettre de" +" garder le contrôle de vos campagnes de marketing." #: ../../content/applications/websites/website/optimize/link_tracker.rst:55 msgid "" @@ -1594,10 +1653,15 @@ msgid "" "` application allows " "you to understand where your leads and opportunities are coming from." msgstr "" +"L'intégration avec l'application :doc:`CRM " +"` vous permet de " +"comprendre d'où viennent vos pistes et opportunités." #: ../../content/applications/websites/website/optimize/seo.rst:3 msgid "How to do Search Engine Optimisation (SEO) in Odoo" msgstr "" +"Comment faire de l'optimisation pour les moteurs de recherche (SEO) dans " +"Odoo ?" #: ../../content/applications/websites/website/optimize/seo.rst:5 msgid "" @@ -1756,7 +1820,7 @@ msgstr "" #: ../../content/applications/websites/website/optimize/seo.rst:81 msgid "Use Social Networks" -msgstr "Utilisez les réseaux sociaux" +msgstr "Utilisation des réseaux sociaux" #: ../../content/applications/websites/website/optimize/seo.rst:83 msgid "" @@ -1838,7 +1902,7 @@ msgstr "" #: ../../content/applications/websites/website/optimize/seo.rst:129 msgid "Test Your Website" -msgstr "Testez votre site web" +msgstr "Tester votre site web" #: ../../content/applications/websites/website/optimize/seo.rst:131 msgid "" @@ -2705,7 +2769,7 @@ msgstr "``

Mon texte

``" #: ../../content/applications/websites/website/optimize/seo.rst:532 msgid "Responsive Design" -msgstr "Design responsive" +msgstr "Design réactif" #: ../../content/applications/websites/website/optimize/seo.rst:534 msgid "" @@ -2763,30 +2827,10 @@ msgstr "Modulabilité" #: ../../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 " -"`_" -msgstr "" -"En plus d'être rapide, Odoo est aussi plus flexible que les CMS et eCommerce" -" traditionnels (Drupal, Wordpress, Magento, Prestashop). Le lien suivant " -"fournit une analyse des CMS et eCommerce open source majeurs comparé à Odoo " -"lorsqu'il s'agit de hauts volumes de requêtes: " -"`https://www.odoo.com/slides/slide/197 " -"`_" - -#: ../../content/applications/websites/website/optimize/seo.rst:568 -msgid "Todo" -msgstr "À faire" - -#: ../../content/applications/websites/website/optimize/seo.rst:568 -msgid "fix above link" +"and eCommerce (Drupal, Wordpress, Magento, Prestashop)." 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." @@ -2794,15 +2838,15 @@ msgstr "" "Voici la diapositive qui résume la modulabilité du site Web Odoo et d'Odoo " "eCommerce." -#: ../../content/applications/websites/website/optimize/seo.rst:576 +#: ../../content/applications/websites/website/optimize/seo.rst:570 msgid "Search Engines Files" msgstr "Fichiers des moteurs de recherche" -#: ../../content/applications/websites/website/optimize/seo.rst:579 +#: ../../content/applications/websites/website/optimize/seo.rst:573 msgid "Sitemap" msgstr "Plan du site" -#: ../../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 " @@ -2813,7 +2857,7 @@ msgstr "" "``/sitemap.xml``. Pour des raisons de performance, ce fichier est mis en " "cache et mis à jour toutes les 12 heures." -#: ../../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, " @@ -2827,17 +2871,17 @@ msgstr "" "`__ et en regroupant toutes les URLs " "en 45 000 fragments par fichier." -#: ../../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 "" "Chaque entrée sur le plan du site possède 4 attributs qui sont calculés " "automatiquement :" -#: ../../content/applications/websites/website/optimize/seo.rst:593 +#: ../../content/applications/websites/website/optimize/seo.rst:587 msgid "```` : the URL of a page" msgstr "```` : l'URL d'une page." -#: ../../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" @@ -2848,7 +2892,7 @@ msgstr "" "avec un produit, il peut s'agir de la date de la dernière modification du " "produit ou de la page." -#: ../../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" @@ -2861,11 +2905,11 @@ msgstr "" "priorité d'une page statique est définie par son champ priorité, qui est " "normalisé (16 par défaut)." -#: ../../content/applications/websites/website/optimize/seo.rst:607 +#: ../../content/applications/websites/website/optimize/seo.rst:601 msgid "Structured Data Markup" msgstr "Balisage des données structurées" -#: ../../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 " @@ -2878,7 +2922,7 @@ msgstr "" " d'indexation pour les aider à comprendre votre contenu afin de créer des " "résultats de recherche bien présentés." -#: ../../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." @@ -2887,7 +2931,7 @@ msgstr "" "contenu, notamment : commentaires, personnes, produits, entreprises, " "événements et organisations." -#: ../../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 " @@ -2900,11 +2944,11 @@ msgstr "" "pages produit d'être affichées dans Google avec des informations " "supplémentaires telles que le prix et la note d'un produit :" -#: ../../content/applications/websites/website/optimize/seo.rst:627 +#: ../../content/applications/websites/website/optimize/seo.rst:621 msgid "robots.txt" msgstr "robots.txt" -#: ../../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, " @@ -2915,11 +2959,11 @@ msgstr "" " autorisés, chemin du plan du site, etc.). Odoo le génère automatiquement. " "Voici son contenu :" -#: ../../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 "User-agent: \\* Sitemap: https://www.odoo.com/sitemap.xml " -#: ../../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 " @@ -2929,7 +2973,7 @@ msgstr "" " qu'il n'existent pas d'autres règles d'indexation que celles spécifiées sur" " le plan du site qui se trouve à l'adresse suivante." -#: ../../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 " @@ -3123,7 +3167,7 @@ msgstr "" #: ../../content/applications/websites/website/publish/multi_website.rst:52 msgid "Create the menu" -msgstr "Créez le menu" +msgstr "Création du menu" #: ../../content/applications/websites/website/publish/multi_website.rst:54 msgid "" @@ -3138,7 +3182,7 @@ msgstr "" #: ../../content/applications/websites/website/publish/multi_website.rst:59 msgid "Switch from one website to another" -msgstr "Passez d'un site Web à un autre" +msgstr "Passer d'un site Web à un autre" #: ../../content/applications/websites/website/publish/multi_website.rst:62 msgid "" @@ -3255,11 +3299,34 @@ msgstr "" msgid ":doc:`/administration/maintain/domain_names`" msgstr "" -#: ../../content/applications/websites/website/publish/multi_website.rst:130 -msgid "Customize the visitor experience" -msgstr "Personnalisez l'expérience des visiteurs" +#: ../../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:133 +#: ../../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 "Personnaliser l'expérience des visiteurs" + +#: ../../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 " @@ -3274,11 +3341,11 @@ msgstr "" "flux de travail et les pages automatiques (caisse eCommerce, blogs, " "événements, etc.) car le nombre d'options disponibles y est plus élevé." -#: ../../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 "Publiez un contenu spécifique par site Web" +msgstr "Publier un contenu spécifique par site Web" -#: ../../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 " @@ -3291,7 +3358,7 @@ msgstr "" "d'édition à l'arrière-plan et laisser le champ *Site Web* vide. Le contenu " "sera alors publié sur tous les sites Web." -#: ../../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*:" @@ -3299,35 +3366,35 @@ msgstr "" "Voici tous les éléments que vous pouvez lier à *un site en particulier ou à " "tous les sites Web* :" -#: ../../content/applications/websites/website/publish/multi_website.rst:157 +#: ../../content/applications/websites/website/publish/multi_website.rst:166 msgid "Products" msgstr "Articles" -#: ../../content/applications/websites/website/publish/multi_website.rst:159 +#: ../../content/applications/websites/website/publish/multi_website.rst:168 msgid "Product Categories for eCommerce" msgstr "Catégorie de produits pour le eCommerce" -#: ../../content/applications/websites/website/publish/multi_website.rst:161 +#: ../../content/applications/websites/website/publish/multi_website.rst:170 msgid "Blogs" msgstr "Blogs" -#: ../../content/applications/websites/website/publish/multi_website.rst:163 +#: ../../content/applications/websites/website/publish/multi_website.rst:172 msgid "Slide Channels" msgstr "Canaux de diapositives" -#: ../../content/applications/websites/website/publish/multi_website.rst:165 +#: ../../content/applications/websites/website/publish/multi_website.rst:174 msgid "Forums" msgstr "Forums" -#: ../../content/applications/websites/website/publish/multi_website.rst:167 +#: ../../content/applications/websites/website/publish/multi_website.rst:176 msgid "Events" msgstr "Événements" -#: ../../content/applications/websites/website/publish/multi_website.rst:169 +#: ../../content/applications/websites/website/publish/multi_website.rst:178 msgid "Job Positions" msgstr "Postes" -#: ../../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." @@ -3335,11 +3402,11 @@ msgstr "" "Lorsque vous publiez un enregistrement créé en arrière-plan, en général un " "produit ou un événement, il devient disponible sur tous les sites Web." -#: ../../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 "Publiez une page sur tous les sites Web" +msgstr "Publier une page sur tous les sites Web" -#: ../../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 --> " @@ -3350,7 +3417,7 @@ msgstr "" ":menuselection:`Site Web --> Configuration --> Pages`. Pour cela, laissez le" " champ *site Web* vide." -#: ../../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." @@ -3358,7 +3425,7 @@ msgstr "" "Si vous voulez la dupliquer sur un autre site Web uniquement, copiez la page" " et configurez le nouveau site." -#: ../../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 " @@ -3368,7 +3435,7 @@ msgstr "" "site Web en cours. Une nouvelle page est dupliquée et liée au site. La page " "d'origine reste liée à tous les sites Web." -#: ../../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." @@ -3376,11 +3443,11 @@ msgstr "" "En regroupant les pages par URL dans le gestionnaire de pages, vous " "retrouvez facilement la page originale derrière chaque page éditée." -#: ../../content/applications/websites/website/publish/multi_website.rst:200 +#: ../../content/applications/websites/website/publish/multi_website.rst:209 msgid "Multi-companies" msgstr "Multi-sociétés" -#: ../../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." @@ -3388,7 +3455,7 @@ msgstr "" "Dans un environnement multi-sociétés, chaque site Web peut être relié à une " "société spécifique de votre système." -#: ../../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.)." @@ -3396,7 +3463,7 @@ msgstr "" "Avec une telle configuration, seules les données relatives à la société " "s'affichent sur le site Web (produits, emplois, événements, etc.)." -#: ../../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 " @@ -3408,7 +3475,7 @@ msgstr "" "société actuelle (ainsi qu'à leurs sociétés affiliées ou filiales dans le " "language Odoo). De même pour les visiteurs. " -#: ../../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" @@ -3418,11 +3485,11 @@ msgstr "" " vous changez de site Web. Pour modifier la société et voir son contenu, " "utilisez l'onglet de sélection de société dans le menu." -#: ../../content/applications/websites/website/publish/multi_website.rst:223 +#: ../../content/applications/websites/website/publish/multi_website.rst:232 msgid "Configure your eCommerce website" -msgstr "Configurez votre site Web eCommerce" +msgstr "Configurer votre site Web eCommerce" -#: ../../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 " @@ -3432,11 +3499,11 @@ msgstr "" " avons fait en sorte que l'ensemble du flux puisse être personnalisable pour" " s'adapter à tous les visiteurs de chacun des sites Web." -#: ../../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 "Des produits disponibles sur un seul site Web" -#: ../../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 " @@ -3447,11 +3514,11 @@ msgstr "" "formulaire d'édition du produit. Un champ vide veut dire qu'il est " "disponible sur tous les sites Web." -#: ../../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 "Des produits disponibles sur *certains* sites Web" -#: ../../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." @@ -3459,7 +3526,7 @@ msgstr "" "Pour rendre un produit disponible sur certains site Web uniquement, vous " "devez dupliquer le produit pour chaque site." -#: ../../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 " @@ -3473,11 +3540,11 @@ msgstr "" "dans votre stock. Ainsi, tout article vendu à partir de votre site Web sera " "converti en un article stockable sur le bon de livraison." -#: ../../content/applications/websites/website/publish/multi_website.rst:252 +#: ../../content/applications/websites/website/publish/multi_website.rst:261 msgid "Pricelists" msgstr "Listes de prix" -#: ../../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." @@ -3485,7 +3552,7 @@ msgstr "" "Pour gérer des prix spécifiques par site Web, activez *Divers prix de vente " "par produit* dans les paramètres du site." -#: ../../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 " @@ -3495,7 +3562,7 @@ msgstr "" "pour créer des listes de prix additionnelles. Consultez " ":doc:`../../ecommerce/maximizing_revenue/pricing`." -#: ../../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." @@ -3503,7 +3570,7 @@ msgstr "" "Si vous avez besoin d'aide. Sélectionnez l'un des sites Web pour rendre une " "liste de prix disponible uniquement sur ce site." -#: ../../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 " @@ -3514,11 +3581,11 @@ msgstr "" "Autrement, elle ne sera disponible que pour des opérations de vente en " "arrière-plan ou pour des applications point de vente." -#: ../../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 "Intermédiaires de paiement et modes de livraison" -#: ../../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 " @@ -3531,11 +3598,11 @@ msgstr "" "géolocalisation IP. Maintenant, vous pouvez aussi définir les sites en " "remplissant le champ *Site Web*." -#: ../../content/applications/websites/website/publish/multi_website.rst:279 +#: ../../content/applications/websites/website/publish/multi_website.rst:288 msgid "Customer accounts" msgstr "Comptes client" -#: ../../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 " @@ -3549,11 +3616,11 @@ msgstr "" "site. Cette dernière option est idéale si vous ne voulez pas que les " "visiteurs fassent un lien entre vos différents sites Web." -#: ../../content/applications/websites/website/publish/multi_website.rst:291 +#: ../../content/applications/websites/website/publish/multi_website.rst:300 msgid "Technical hints for customization" msgstr "Des conseils techniques pour la personnalisation" -#: ../../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:" @@ -3561,20 +3628,20 @@ msgstr "" "Si vous désirez publier des éléments personnalisés sur le site Web, voici " "quelques conseils pour les faire fonctionner avec des sites Web multiples :" -#: ../../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 "" "Plan du site : n'oubliez pas le domaine dans le routage pour ne publier " -#: ../../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 "que les données disponibles dans le plan de chaque site Web." -#: ../../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 "Accès : vous devez le nommer" -#: ../../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." @@ -3582,13 +3649,13 @@ msgstr "" "*peut_accèder_depuis_actuel_site Web* sur l'unité de commande pour que le " "visiteur puisse voir un enregistrement sur le site Web en cours." -#: ../../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 "" "Recherche : lorsqu'une liste d'enregistrements est affichée, n'oubliez pas " "de spécifier" -#: ../../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 "" "le domaine pour n'afficher que les enregistrements disponibles sur le site " @@ -3637,7 +3704,7 @@ msgid "" 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 diff --git a/locale/nl/LC_MESSAGES/administration.po b/locale/nl/LC_MESSAGES/administration.po index bb5c7a26a..504a396a8 100644 --- a/locale/nl/LC_MESSAGES/administration.po +++ b/locale/nl/LC_MESSAGES/administration.po @@ -15,7 +15,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: 2022-03-18 14:59+0000\n" "Last-Translator: Martin Trigaux, 2022\n" "Language-Team: Dutch (https://www.transifex.com/odoo/teams/41243/nl/)\n" @@ -231,9 +231,9 @@ msgid "" 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 "" @@ -1238,7 +1238,7 @@ msgid "" msgstr "" #: ../../content/administration/install/install.rst:90 -#: ../../content/administration/install/install.rst:252 +#: ../../content/administration/install/install.rst:254 msgid "Windows" msgstr "" @@ -1275,7 +1275,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 "" @@ -1291,9 +1291,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 "Voorbereiden" @@ -1307,9 +1307,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 " @@ -1453,194 +1453,202 @@ msgid "" "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 "Archiveren" -#: ../../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 +#: ../../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." +"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)" -msgstr "" - -#: ../../content/administration/install/install.rst:292 -#: ../../content/administration/install/install.rst:458 -#: ../../content/administration/install/install.rst:629 +#: ../../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 " +"**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." +"installation. See :ref:`setup/install/editions` to get access to the " +"Enterprise repository." +msgstr "" + +#: ../../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 "Afhankelijkheden" -#: ../../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 " @@ -1649,149 +1657,147 @@ msgid "" "**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 " @@ -1799,86 +1805,100 @@ msgid "" "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." @@ -1932,11 +1952,23 @@ msgid "" "``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" @@ -1944,7 +1976,7 @@ msgid "" "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. " @@ -1954,7 +1986,7 @@ msgid "" "``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 " @@ -1962,37 +1994,37 @@ msgid "" " 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 " @@ -2000,25 +2032,25 @@ msgid "" "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 " @@ -2026,15 +2058,15 @@ msgid "" "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 " @@ -2043,88 +2075,88 @@ msgid "" ":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 --> " @@ -2132,29 +2164,29 @@ msgid "" "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 " @@ -2162,7 +2194,7 @@ msgid "" ":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 " @@ -2170,82 +2202,82 @@ msgid "" "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 "" "Hier zijn een paar specifieke richtlijnen om een CNAME record aan te maken:" -#: ../../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 " @@ -2253,33 +2285,33 @@ msgid "" " 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. " @@ -2287,7 +2319,7 @@ msgid "" "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 " @@ -2295,11 +2327,11 @@ msgid "" "`_ 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, " @@ -2307,7 +2339,7 @@ msgid "" "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 " @@ -2315,135 +2347,135 @@ msgid "" "`_." 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 " @@ -2451,7 +2483,7 @@ msgid "" "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 " @@ -2460,7 +2492,7 @@ msgid "" "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 "" @@ -2588,6 +2620,312 @@ msgid "" "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 "Opzet in Google" + +#: ../../content/administration/maintain/google_oauth.rst:18 +msgid "Create a new project" +msgstr "Maak een nieuw project aan" + +#: ../../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 "Opzetten in Odoo" + +#: ../../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 "" @@ -2604,30 +2942,24 @@ 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" @@ -2635,46 +2967,56 @@ msgid "" " 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 +#: ../../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: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 "From on-premises to Odoo.sh" msgstr "" -#: ../../content/administration/maintain/hosting_changes.rst:26 -#: ../../content/administration/maintain/hosting_changes.rst:43 +#: ../../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:27 +#: ../../content/administration/maintain/hosting_changes.rst:30 msgid "...and voilà!" msgstr "" -#: ../../content/administration/maintain/hosting_changes.rst:30 +#: ../../content/administration/maintain/hosting_changes.rst:33 msgid "From Odoo Online to on-premises" msgstr "" -#: ../../content/administration/maintain/hosting_changes.rst:32 -#: ../../content/administration/maintain/hosting_changes.rst:40 +#: ../../content/administration/maintain/hosting_changes.rst:35 +#: ../../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:33 +#: ../../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" @@ -2682,8 +3024,8 @@ msgid "" "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 +#: ../../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" @@ -2691,16 +3033,16 @@ msgid "" "`_)" msgstr "" -#: ../../content/administration/maintain/hosting_changes.rst:35 -#: ../../content/administration/maintain/hosting_changes.rst:60 +#: ../../content/administration/maintain/hosting_changes.rst:38 +#: ../../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:38 +#: ../../content/administration/maintain/hosting_changes.rst:41 msgid "From Odoo Online to Odoo.sh" msgstr "" -#: ../../content/administration/maintain/hosting_changes.rst:41 +#: ../../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 " @@ -2708,28 +3050,99 @@ msgid "" "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)." +"`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 "Europa" + +#: ../../content/administration/maintain/hosting_changes.rst:61 +msgid "Asia" +msgstr "Azië" + +#: ../../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 "Volledig klaar!" + +#: ../../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 " "`." @@ -3046,6 +3459,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 "Bijwerken" @@ -3163,7 +3577,7 @@ msgid "" 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 "Verwijderen" @@ -3509,21 +3923,21 @@ 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 `_." @@ -3785,6 +4199,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 "Overzicht" @@ -3945,7 +4360,7 @@ msgstr "" #: ../../content/administration/odoo_sh/advanced/containers.rst:169 msgid "" "More options are available and detailed in the :doc:`CLI documentation " -"`." +"`." msgstr "" #: ../../content/administration/odoo_sh/advanced/containers.rst:172 @@ -4329,7 +4744,7 @@ msgstr "" 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 @@ -4775,7 +5190,15 @@ msgid "" "gettingstarted-builds>`." 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 @@ -4783,17 +5206,17 @@ msgstr "" msgid "Settings" msgstr "Instellingen" -#: ../../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 " @@ -4806,48 +5229,48 @@ msgid "" "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 " @@ -4855,31 +5278,31 @@ msgid "" "`." 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" @@ -4887,75 +5310,75 @@ msgid "" "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 " @@ -4967,11 +5390,11 @@ msgid "" " 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 " @@ -4979,18 +5402,18 @@ msgid "" "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 " @@ -5001,23 +5424,23 @@ msgid "" "`." 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 " @@ -5025,178 +5448,178 @@ msgid "" "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 "Samenvoegen" -#: ../../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 "Instellingen" -#: ../../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 "Connectie" -#: ../../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 "" @@ -5835,9 +6258,9 @@ msgstr "" #: ../../content/administration/odoo_sh/getting_started/first_module.rst:97 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." +":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 @@ -6329,69 +6752,69 @@ 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 " @@ -6401,62 +6824,62 @@ msgid "" "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 " @@ -6471,7 +6894,7 @@ msgid "" "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 " @@ -6479,7 +6902,7 @@ msgid "" "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." @@ -6488,11 +6911,11 @@ msgid "" " 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 " @@ -6503,20 +6926,20 @@ msgid "" " 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 " @@ -6525,13 +6948,13 @@ msgid "" "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 " @@ -6539,7 +6962,7 @@ msgid "" "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." @@ -6901,7 +7324,6 @@ msgid "|assistance-contact|" msgstr "" #: ../../content/administration/upgrade.rst:32 -#: ../../content/administration/upgrade/odoo_sh.rst:66 msgid ":ref:`upgrade/sla`" msgstr "" @@ -7671,122 +8093,195 @@ msgid "" "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 +#: ../../content/administration/upgrade/odoo_sh.rst:13 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*." +"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." +"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 +#: ../../content/administration/upgrade/odoo_sh.rst:24 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." +"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 ":doc:`../../administration/upgrade`" +msgstr "" + +#: ../../content/administration/upgrade/odoo_sh.rst:30 +msgid ":doc:`Upgrade FAQ <../upgrade/faq>`" +msgstr "" + +#: ../../content/administration/upgrade/odoo_sh.rst:31 +msgid ":doc:`Introduction to Odoo.sh <../odoo_sh/overview/introduction>`" +msgstr "" + +#: ../../content/administration/upgrade/odoo_sh.rst:36 +msgid "Upgrade your custom modules" +msgstr "" + +#: ../../content/administration/upgrade/odoo_sh.rst:38 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." -msgstr "" - -#: ../../content/administration/upgrade/odoo_sh.rst:32 -msgid "" -"Test the upgraded database and make sure everything runs as it's supposed " -"to." -msgstr "" - -#: ../../content/administration/upgrade/odoo_sh.rst:35 -#: ../../content/administration/upgrade/on_premise.rst:41 -msgid "Upgrade your production database" -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:" -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." +"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." +"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." -msgstr "" - -#: ../../content/administration/upgrade/odoo_sh.rst:58 -#: ../../content/administration/upgrade/on_premise.rst:53 +#: ../../content/administration/upgrade/odoo_sh.rst:62 msgid "" -"Your custom modules also need to be upgraded to keep them compatible with " -"the new version." +"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:60 +#: ../../content/administration/upgrade/odoo_sh.rst:66 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')" +"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: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 @@ -7854,6 +8349,10 @@ msgid "" "`_." 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" @@ -7861,12 +8360,26 @@ msgid "" "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" diff --git a/locale/nl/LC_MESSAGES/finance.po b/locale/nl/LC_MESSAGES/finance.po index e9ad1013b..16374032e 100644 --- a/locale/nl/LC_MESSAGES/finance.po +++ b/locale/nl/LC_MESSAGES/finance.po @@ -7,14 +7,13 @@ # Eric Geens , 2021 # Stephan Van Dyck , 2021 # Cas Vissers , 2021 -# Maxim Vandenbroucke , 2021 # Julia van Orsouw , 2021 # Gunther Clauwaert , 2021 # qveodoo14, 2021 # Odoo Experts Consultants , 2022 -# Yenthe Van Ginneken , 2022 # Erwin van der Ploeg , 2022 # Cas Vissers , 2022 +# Yenthe Van Ginneken , 2022 # Martin Trigaux, 2022 # #, fuzzy @@ -22,7 +21,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: 2021-11-02 08:47+0000\n" "Last-Translator: Martin Trigaux, 2022\n" "Language-Team: Dutch (https://www.transifex.com/odoo/teams/41243/nl/)\n" @@ -56,29 +55,23 @@ 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" -msgstr "Bank en Kas" +msgid "Bank and cash" +msgstr "" #: ../../content/applications/finance/accounting/bank/feeds.rst:5 -msgid "Bank Feeds" -msgstr "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 "Bankafschriften" #: ../../content/applications/finance/accounting/bank/feeds/bank_statements.rst:5 @@ -225,8 +218,8 @@ 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" -msgstr "Bank synchronisatie: Automatisch Importeren" +msgid "Bank synchronization: Automatic import" +msgstr "" #: ../../content/applications/finance/accounting/bank/feeds/bank_synchronization.rst:5 msgid "" @@ -267,6 +260,10 @@ msgid "**Ponto**: Europe (:doc:`more information `)" msgstr "**Ponto**: Europa (:doc:`meer informatie `)" #: ../../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 @@ -274,6 +271,7 @@ msgstr "**Ponto**: Europa (:doc:`meer informatie `)" #: ../../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 @@ -293,6 +291,7 @@ msgstr "**Ponto**: Europa (:doc:`meer informatie `)" #: ../../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 @@ -301,6 +300,7 @@ msgstr "**Ponto**: Europa (:doc:`meer informatie `)" #: ../../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 @@ -311,7 +311,7 @@ msgstr "**Ponto**: Europa (:doc:`meer informatie `)" #: ../../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 @@ -322,11 +322,11 @@ msgstr "**Ponto**: Europa (:doc:`meer informatie `)" msgid "Configuration" msgstr "Configuratie" -#: ../../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 "On-Premise gebruikers" -#: ../../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 " @@ -335,22 +335,22 @@ msgid "" "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 "Eerste Synchronisatie" -#: ../../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." @@ -358,7 +358,7 @@ msgstr "" "U kunt nu uw bankinstelling zoeken. Selecteer uw bankinstelling en volg de " "stappen om te synchroniseren." -#: ../../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." @@ -366,7 +366,7 @@ msgstr "" "Als u problemen ondervindt tijdens uw eerste synchronisatie, controleer dan " "of uw webbrowser geen pop-ups blokkeert en of uw adblocker is uitgeschakeld." -#: ../../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" @@ -383,7 +383,7 @@ msgstr "" "informatie vragen om verbinding te maken met uw bankinstelling. Deze " "informatie wordt niet op de servers van Odoo opgeslagen." -#: ../../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 " @@ -394,17 +394,17 @@ msgstr "" "aangemaakt. U kunt de periodiciteit voor het maken van bankafschriften " "wijzigen in uw journaalinstellingen." -#: ../../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 "Handmatig synchroniseren" -#: ../../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 " @@ -414,14 +414,14 @@ msgstr "" "12 uur gesynchroniseerd. Indien gewenst, kunt u handmatig synchroniseren " "door op de knop *Synchroniseer nu* op het dashboard te klikken." -#: ../../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" @@ -431,15 +431,15 @@ msgid "" "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 "Issues" -#: ../../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 "Synchronisatie gefaald" -#: ../../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 --> " @@ -447,11 +447,11 @@ msgid "" "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 "Synchronisatieverbinding verbroken" -#: ../../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." @@ -459,7 +459,7 @@ msgstr "" "Als uw verbinding met de proxy is verbroken, kunt u opnieuw verbinding maken" " met de knop *Opnieuw verbinden*." -#: ../../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" @@ -470,13 +470,13 @@ msgstr "" "met uw klant-ID of de referentie van de fout die in de chatter wordt " "vermeld." -#: ../../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 "" "Migratieproces voor gebruikers die Odoo voor december 2020 hebben " "geïnstalleerd" -#: ../../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." @@ -484,7 +484,7 @@ msgstr "" "Heeft u een on-premise Odoo, kijk dan na of de broncode up-to-date is met de" " nieuwste versie van Odoo." -#: ../../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." @@ -493,7 +493,7 @@ msgstr "" "nieuwe module handmatig installeren om de nieuwe functionaliteiten te kunnen" " gebruiken." -#: ../../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: " @@ -501,7 +501,7 @@ msgid "" "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." @@ -509,7 +509,7 @@ msgstr "" "Zorg er ten slotte voor dat al uw gebruikers hun Odoo-pagina vernieuwen door" " CTRL+F5 te drukken." -#: ../../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 " @@ -518,7 +518,7 @@ msgid "" "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." @@ -526,7 +526,7 @@ msgstr "" "Verwijder *account_online_sync* niet, dit is de vorige module voor online " "synchronisatie. De nieuwe overschrijft het." -#: ../../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." @@ -534,17 +534,17 @@ msgstr "" "Standaard wordt *account_online_synchronization* automatisch geïnstalleerd " "met Odoo Boekhouding." -#: ../../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 "FAQ" -#: ../../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 "De synchronisatie werkt niet in real-time, is dit normaal?" -#: ../../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 " @@ -565,7 +565,7 @@ msgstr "" "*Synchroniseer nu* niet uw laatste transacties ophaalt als u een dergelijke " "actie al eerder die dag heeft uitgevoerd." -#: ../../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" @@ -573,22 +573,22 @@ msgid "" "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 "Is de functie Online Bank-synchronisatie inbegrepen in mijn contract?" -#: ../../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 "Community Versie: Nee, deze functie zit niet in de Community Versie" -#: ../../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 "Online Versie: Ja, zelfs als u een One App Free contract heeft." -#: ../../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." @@ -596,11 +596,11 @@ msgstr "" "Enterprise versie: Ja, als er een geldig enterprise contract is gekoppeld " "aan uw database." -#: ../../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 "Sommige banken hebben de status \"Beta\", wat betekent dat?" -#: ../../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 " @@ -617,13 +617,13 @@ msgstr "" "aangezien de aanbieder over echte gegevens en feedback van de verbinding " "beschikt." -#: ../../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 "" "Waarom worden mijn transacties alleen gesynchroniseerd als ik handmatig " "ververs?" -#: ../../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," @@ -631,11 +631,11 @@ msgid "" "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 "Waarom zijn oudere transacties niet meer zichtbaar in Odoo?" -#: ../../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." @@ -643,11 +643,11 @@ msgstr "" "Afhankelijk van uw bankinstelling kunnen afschriften maar tot 3 maanden " "terug binnen gehaald worden." -#: ../../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 "Waarom zie ik geen enkele transactie?" -#: ../../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 " @@ -656,40 +656,40 @@ msgid "" "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 "Er kunnen ook geen nieuwe transacties zijn." -#: ../../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 "Hoe kan ik mijn bankgegevens bijwerken?" -#: ../../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 ":doc:`bank_statements`" -#: ../../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 ":doc:`ponto`" -#: ../../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 ":doc:`saltedge`" @@ -1199,11 +1199,8 @@ msgid "" 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" -msgstr "Bank afletteren" +msgid "Bank reconciliation" +msgstr "Afletteren bank" #: ../../content/applications/finance/accounting/bank/reconciliation/reconciliation_models.rst:3 msgid "Reconciliation Models" @@ -1310,7 +1307,7 @@ msgid "" 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 "Soort" @@ -1941,8 +1938,87 @@ msgid "" msgstr "" "De transactie wordt toegevoegd aan de huidige contante betaling registratie." +#: ../../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 @@ -1950,7 +2026,6 @@ msgid "Localizations" msgstr "Lokalisaties" #: ../../content/applications/finance/accounting/fiscal_localizations/localizations/argentina.rst:3 -#: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:13 msgid "Argentina" msgstr "Argentinië" @@ -2833,7 +2908,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 "Leveranciersfacturen" @@ -4016,7 +4090,6 @@ msgid "" 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 "Colombia" @@ -5252,6 +5325,450 @@ msgid "" "correspondiente al IVA convencional." msgstr "" +#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/egypt.rst:3 +msgid "Egypt" +msgstr "Egypte" + +#: ../../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 "Naam" + +#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/egypt.rst:17 +msgid "Technical name" +msgstr "Technische naam" + +#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/egypt.rst:18 +#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/france.rst:59 +msgid "Description" +msgstr "Omschrijving" + +#: ../../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 "Client ID" + +#: ../../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 "Overige informatie:" + +#: ../../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 "Klanten" + +#: ../../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 "Producten" + +#: ../../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 "Frankrijk" @@ -5363,10 +5880,6 @@ msgstr "" msgid "Field name" msgstr "Veldnaam" -#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/france.rst:59 -msgid "Description" -msgstr "Omschrijving" - #: ../../content/applications/finance/accounting/fiscal_localizations/localizations/france.rst:59 #: ../../content/applications/finance/accounting/fiscal_localizations/overview/fiscal_localization_packages.rst:32 msgid "Use" @@ -5851,10 +6364,6 @@ msgid "" "then 3, then 2." msgstr "" -#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/france.rst:182 -msgid "Name" -msgstr "Naam" - #: ../../content/applications/finance/accounting/fiscal_localizations/localizations/france.rst:182 msgid "Code" msgstr "Code" @@ -6514,7 +7023,7 @@ msgid "" msgstr "" #: ../../content/applications/finance/accounting/fiscal_localizations/localizations/germany.rst:3 -#: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:52 +#: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:34 msgid "Germany" msgstr "Duitsland" @@ -6553,7 +7062,7 @@ msgstr "" #: ../../content/applications/finance/accounting/fiscal_localizations/localizations/germany.rst:23 #: ../../content/applications/finance/accounting/fiscal_localizations/localizations/spain.rst:27 -#: ../../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 #: ../../content/applications/finance/accounting/reporting/overview/main_reports.rst:29 msgid "Balance Sheet" msgstr "Balans" @@ -6561,7 +7070,7 @@ msgstr "Balans" #: ../../content/applications/finance/accounting/fiscal_localizations/localizations/germany.rst:24 #: ../../content/applications/finance/accounting/fiscal_localizations/localizations/netherlands.rst:19 #: ../../content/applications/finance/accounting/getting_started/initial_configuration/chart_of_accounts.rst:17 -#: ../../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 msgid "Profit & Loss" msgstr "Winst & Verlies" @@ -7300,7 +7809,6 @@ msgid "" msgstr "" #: ../../content/applications/finance/accounting/fiscal_localizations/localizations/italy.rst:3 -#: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:71 msgid "Italy" msgstr "Italië" @@ -8093,11 +8601,11 @@ msgid "" msgstr "" #: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:244 -msgid ":download:`Certificate `" +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 @@ -8313,10 +8821,6 @@ msgid "" "transactions: ``XEXX010101000``" msgstr "" -#: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:377 -msgid "Products" -msgstr "Producten" - #: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:379 msgid "" "At the product level there must also configure some parameters in the " @@ -8510,7 +9014,7 @@ msgid "" 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." @@ -8543,200 +9047,215 @@ msgid "" 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 "Aanbetalingen" -#: ../../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 " @@ -8745,22 +9264,22 @@ msgid "" "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 "Maak een creditfactuur" -#: ../../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" @@ -8770,27 +9289,27 @@ msgid "" " 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 " @@ -8798,56 +9317,56 @@ msgid "" "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" @@ -8855,21 +9374,21 @@ msgid "" "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" @@ -8877,7 +9396,7 @@ msgid "" " 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 " @@ -8885,33 +9404,33 @@ msgid "" "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." @@ -8920,108 +9439,108 @@ msgid "" "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 " @@ -9029,57 +9548,57 @@ msgid "" "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 " @@ -9089,11 +9608,11 @@ msgid "" "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 " "`_" @@ -9101,7 +9620,7 @@ msgid "" "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" @@ -9109,11 +9628,11 @@ msgid "" "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 "Proefbalans" -#: ../../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 " @@ -9122,27 +9641,27 @@ msgid "" "(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 " @@ -9150,25 +9669,25 @@ msgid "" "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 " @@ -9176,24 +9695,24 @@ msgid "" "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 " @@ -9203,18 +9722,18 @@ msgid "" "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 " @@ -9224,7 +9743,7 @@ msgid "" "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 " @@ -9232,43 +9751,43 @@ msgid "" "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 " @@ -9277,34 +9796,34 @@ msgid "" "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" @@ -9314,74 +9833,74 @@ msgid "" "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 "Jaareinde controlelijst" -#: ../../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 " @@ -9390,45 +9909,45 @@ msgid "" " 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 "**Werk in voortgang**." -#: ../../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 "**Leningen**." -#: ../../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" @@ -9437,11 +9956,11 @@ msgid "" "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 " @@ -9449,7 +9968,7 @@ msgid "" "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 " @@ -9458,21 +9977,21 @@ msgid "" "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 " @@ -9480,11 +9999,11 @@ msgid "" "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 " @@ -9493,26 +10012,26 @@ msgid "" "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." @@ -9521,17 +10040,17 @@ msgid "" " 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 " @@ -9539,41 +10058,41 @@ msgid "" " :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 "" @@ -9588,30 +10107,30 @@ msgid "" "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': " @@ -9619,7 +10138,7 @@ msgid "" "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': " @@ -9627,36 +10146,36 @@ msgid "" "'[^|]{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" @@ -9666,25 +10185,25 @@ msgid "" "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 " @@ -9693,19 +10212,19 @@ msgid "" "'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': '' " @@ -9713,14 +10232,14 @@ msgid "" "'{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 " @@ -9729,27 +10248,27 @@ msgid "" " 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" @@ -9766,7 +10285,7 @@ msgid "" "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 "" @@ -9781,44 +10300,44 @@ msgid "" "'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 " @@ -9826,7 +10345,7 @@ msgid "" " 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 " @@ -9835,7 +10354,6 @@ msgid "" 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 "Nederland" @@ -9871,7 +10389,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 "Peru" @@ -11047,7 +11564,7 @@ msgid "" 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 @@ -11109,11 +11626,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-" @@ -11132,379 +11644,295 @@ msgid "" 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 "Algerije - Boekhouding" -#: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:15 -msgid "Argentinian Accounting" -msgstr "Argentijnse boekhouding" +#: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:13 +msgid "Argentina - Accounting" +msgstr "Argentinië - Boekhouding" -#: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:16 -msgid "Argentinian Accounting Reports" -msgstr "Argentijnse boekhoudrapporten" - -#: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:17 -msgid "Argentinian Electronic Invoicing" -msgstr "Argentijnse elektronische facturering" - -#: ../../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 "Australië - Boekhouding" -#: ../../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 "Oostenrijk - Boekhouding" -#: ../../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 "België - Boekhouding" -#: ../../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 "Bolivië - Boekhouding" -#: ../../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 "Brazilië - Boekhouding" -#: ../../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 "Canada - Boekhouding" -#: ../../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 "Chili - Boekhouding" -#: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:26 -msgid "China" -msgstr "China" - -#: ../../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 "China - Boekhouding" -#: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:29 -msgid "China - City Data" -msgstr "China - data steden" - -#: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:30 -msgid "China - Small Business CoA" -msgstr "China - Kleine bedrijven CoA" - -#: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:31 -msgid "China - Standard CoA" -msgstr "China - Standaard CoA" - -#: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:35 -msgid "Colombian - Accounting" +#: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:22 +msgid "Colombia - Accounting" msgstr "Colombia - Boekhouding" -#: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:36 -msgid "Colombian - Point of Sale" -msgstr "Colombia - Kassa" - -#: ../../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 "Costa Rica - Boekhouding" -#: ../../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 "Croatië - Boekhouding (RRIF 2012)" -#: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:40 -msgid "Denmark" -msgstr "Denemarken" +#: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:25 +msgid "Czech - Accounting" +msgstr "Tsjechisch - Boekhouding" -#: ../../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 "Denemarken - Boekhouding" -#: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:43 -msgid "Denmark - Accounting Reports" -msgstr "Denemarken - Boekhoudrapportages" - -#: ../../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 "Dominicaanse Republiek - Boekhouding" -#: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:46 -msgid "Ecuador - Accounting" -msgstr "Ecuador - Boekhouding" +#: ../../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 "Ethiopië - Boekhouding" -#: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:48 -msgid "EU Mini One Stop Shop (MOSS)" -msgstr "EU Mini One Stop Shop (MOSS)" - -#: ../../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 "Fiscale lokalisatie voor Finland" -#: ../../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 "Frankrijk - Boekhouding" -#: ../../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 "Algemene boekhouding" -#: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:54 -msgid "Germany - Accounting" -msgstr "Duitsland - Boekhouding" - -#: ../../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 "Duitsland SKR03 - Boekhouding" -#: ../../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 "Duitsland SKR04 - Boekhouding" -#: ../../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 "Griekenland - Boekhouding" -#: ../../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 "Guatemala - Boekhouding" -#: ../../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 "Honduras - Boekhouding" -#: ../../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 "Hong Kong - Boekhouding" -#: ../../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 "Hongarije - Boekhouding" -#: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:63 -msgid "India" -msgstr "India" - -#: ../../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 "India - Boekhouding" -#: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:66 -msgid "Indian - Point of Sale" -msgstr "India - Kassa" - -#: ../../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 "Indonesië - Boekhouding" -#: ../../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 "Ierland - Boekhouding" -#: ../../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 "Israel - Boekhouding" -#: ../../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 "Italië - Boekhouding" -#: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:74 -msgid "Italy - E-invoicing" -msgstr "Italië - E-invoicing" - -#: ../../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 "Japan - Boekhouding" -#: ../../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 "LATAM localisatie basis" - -#: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:80 -msgid "LATAM Document" -msgstr "LATAM Document" - -#: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:82 -msgid "Lithuania" -msgstr "Litouwen" - -#: ../../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 "Litouwen - Boekhouding" -#: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:85 -msgid "LT - Accounting Reports" -msgstr "LT - Boekhoudkundige rapporten" - -#: ../../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 "Luxemburg - Boekhouding" -#: ../../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 "Marokko - Boekhouding" -#: ../../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 "Mexico - Boekhouding" -#: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:90 -msgid "Mongolia" -msgstr "Mongolië" - -#: ../../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 "Boekhouding - Mongolië" -#: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:93 -msgid "Mongolia - Accounting Reports" -msgstr "Mongolië - Boekhoudkundige rapporten" - -#: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:95 -msgid "Multi Language Chart of Accounts" -msgstr "Grootboekschema voor meerdere talen" - -#: ../../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 "Nederland - Boekhouding" -#: ../../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 "New Zealand - Boekhouding" -#: ../../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 "Noorwegen - Boekhouding" -#: ../../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 "OHADA - Boekhouding" -#: ../../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 "Pakistan - Boekhouding" + +#: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:61 msgid "Panama - Accounting" msgstr "Panama - Boekhouding" -#: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:107 -msgid "Peruvian Accounting" -msgstr "" +#: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:62 +msgid "Peru - Accounting" +msgstr "Peru - Boekhouding" -#: ../../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 "Polen - Boekhouding" -#: ../../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 "Portugal - Boekhouding" -#: ../../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 "Roemenië - Boekhouding" -#: ../../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 "Saoedi-Arabië - Boekhouding" -#: ../../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 "Singapore - Boekhouding" -#: ../../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 "Slowaaks - Boekhouding" + +#: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:69 msgid "Slovenian - Accounting" msgstr "Slovenië - Boekhouding" -#: ../../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 "Zuid-Afrika - Boekhouding" -#: ../../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 "Spanje - Boekhouding (PGCE 2008)" -#: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:119 -msgid "Sweden" -msgstr "Zweden" +#: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:72 +msgid "Sweden - Accounting" +msgstr "Zweden - Boekhouding" -#: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:121 -msgid "Sweden - Structured Communication OCR" -msgstr "Zweden - OCR voor gestructureerde communicatie" - -#: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:122 -msgid "Swedish - Accounting" -msgstr "Boekhouding - Zweden" - -#: ../../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 "Zwitserland - Boekhouding" -#: ../../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 "Thailand - Boekhouding" -#: ../../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 "Turkije - Boekhouding" -#: ../../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 "Je.A.E. - Boekhouding" -#: ../../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 "UK - Boekhouding" -#: ../../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 "Oekraïne - Boekhouding" -#: ../../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 "Verenigde Staten - Boekhouding" -#: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:131 -msgid "Uruguay - Chart of Accounts" -msgstr "Uruguay - Grootboekschema" +#: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:81 +msgid "Uruguay - Accounting" +msgstr "Uruguay - Boekhouding" -#: ../../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 "Venezuela - Boekhouding" -#: ../../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 "Vietnam - Boekhouding" -#: ../../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" -msgstr "Aan de slag" +msgid "Getting started" +msgstr "Starten" #: ../../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 @@ -11530,30 +11958,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 "Activa" #: ../../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 "Passiva" #: ../../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 "Eigen vermogen" #: ../../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 "Omzet" #: ../../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 "Kosten" @@ -11598,116 +12026,116 @@ msgid "" "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 "Rapport" -#: ../../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 "Categorie" -#: ../../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 "Grootboekrekeningen categorieën" -#: ../../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 "Debiteuren" -#: ../../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 "Bank en kas" -#: ../../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 "Vlottende activa" -#: ../../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 "Langlopende activa" -#: ../../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 "Vooruitbetalingen" -#: ../../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 "Vaste activa" -#: ../../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 "Crediteuren" -#: ../../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 "Creditcard" -#: ../../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 "Kort vreemd vermogen" -#: ../../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 "Lang vreemd vermogen" -#: ../../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 "Huidige jaarwinst" -#: ../../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 "Overige opbrengsten" -#: ../../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 "Afschrijving" -#: ../../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 "Inkoopwaarde van de omzet" -#: ../../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 "Overige" -#: ../../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 "Niet opgenomen in balans" -#: ../../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 " @@ -11715,69 +12143,68 @@ msgid "" "` 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 "Standaard BTW" -#: ../../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 "Labels" -#: ../../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 "Rubrieken" -#: ../../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 " @@ -11785,61 +12212,61 @@ msgid "" "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 "Afletteren toestaan" -#: ../../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 "Vervallen" -#: ../../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 @@ -12620,6 +13047,12 @@ msgstr "50" msgid "Total To Pay" msgstr "Totaal te betalen" +#: ../../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 "Bank afletteren" + #: ../../content/applications/finance/accounting/getting_started/memento.rst:181 msgid "" "Bank reconciliation is the matching of bank statement lines (provided by " @@ -13531,7 +13964,7 @@ msgid "" "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 " @@ -13539,32 +13972,32 @@ msgid "" " 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 "Analytische boekhouding activeren" -#: ../../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 "Vergeet uw wijzigingen niet te bewaren." -#: ../../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 "Maak een analytische rekening." -#: ../../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 " @@ -13572,26 +14005,26 @@ msgid "" "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 "" "We verwijzen al onze kosten door naar deze rekening om ze op te volgen." -#: ../../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 "Registreer een uitgave" -#: ../../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 "Maak een uitgave product" -#: ../../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 " @@ -13599,32 +14032,32 @@ msgid "" " 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 "Boek de uitgave" -#: ../../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 "Inkoopproduct" -#: ../../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 " @@ -13632,18 +14065,18 @@ msgid "" "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 "Uitbestedingen" -#: ../../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 " @@ -13651,33 +14084,33 @@ msgid "" "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 " @@ -14920,10 +15353,10 @@ 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 " @@ -15114,6 +15547,10 @@ msgid "" "Register the payment and set the currency." msgstr "" +#: ../../content/applications/finance/accounting/others/multicurrencies/how_it_works.rst:145 +msgid "Bank Statements" +msgstr "Bankafschriften" + #: ../../content/applications/finance/accounting/others/multicurrencies/how_it_works.rst:147 #: ../../content/applications/finance/accounting/others/multicurrencies/invoices_payments.rst:94 msgid "" @@ -15236,7 +15673,7 @@ msgid ":doc:`how_it_works`" msgstr ":doc:`how_it_works`" #: ../../content/applications/finance/accounting/payables.rst:5 -msgid "Account Payables" +msgid "Account payables" msgstr "" #: ../../content/applications/finance/accounting/payables/misc/forecast.rst:3 @@ -15337,12 +15774,12 @@ msgid "" msgstr "" #: ../../content/applications/finance/accounting/payables/pay.rst:5 -msgid "Vendor Payments" -msgstr "Leverancierbetalingenen" +msgid "Vendor payments" +msgstr "" #: ../../content/applications/finance/accounting/payables/pay/check.rst:3 -msgid "Pay by Checks" -msgstr "Betaling met cheques" +msgid "Pay by checks" +msgstr "" #: ../../content/applications/finance/accounting/payables/pay/check.rst:5 msgid "" @@ -15887,8 +16324,12 @@ msgstr "" msgid ":doc:`check`" msgstr ":doc:`check`" +#: ../../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 @@ -16282,7 +16723,7 @@ msgid "" 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 @@ -16498,8 +16939,156 @@ msgid "" "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 "Prijzen" + +#: ../../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 @@ -16833,100 +17422,9 @@ msgid "" " 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 "Prijzen" - -#: ../../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 "" -"Als u Odoo Online (SAAS) gebruikt of de Enterprise-versie hebt, profiteert u" -" van gratis proeftegoeden om de functie te testen." - -#: ../../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" -msgstr "Inkoopbewijs" +msgid "Purchase receipts" +msgstr "" #: ../../content/applications/finance/accounting/payables/supplier_bills/purchase_receipts.rst:5 msgid "" @@ -16991,13 +17489,12 @@ 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" -msgstr "Klantfacturen" +msgid "Customer invoices" +msgstr "" #: ../../content/applications/finance/accounting/receivables/customer_invoices/cash_discounts.rst:3 msgid "Offer cash discounts" @@ -17076,7 +17573,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 "Kasafronding" #: ../../content/applications/finance/accounting/receivables/customer_invoices/cash_rounding.rst:5 @@ -17136,7 +17633,7 @@ msgid "" 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 @@ -17292,8 +17789,8 @@ msgid "" msgstr "" #: ../../content/applications/finance/accounting/receivables/customer_invoices/deferred_revenues.rst:3 -msgid "Deferred Revenues" -msgstr "Uitgestelde omzet" +msgid "Deferred revenues" +msgstr "" #: ../../content/applications/finance/accounting/receivables/customer_invoices/deferred_revenues.rst:5 msgid "" @@ -17911,8 +18408,26 @@ msgid "" "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 @@ -18162,56 +18677,56 @@ msgid "" "`_" 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 " @@ -18220,16 +18735,24 @@ 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 "" +"Als u Odoo Online (SAAS) gebruikt of de Enterprise-versie hebt, profiteert u" +" van gratis proeftegoeden om de functie te testen." + +#: ../../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" -msgstr "Klantbetalingen" +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 @@ -18361,7 +18884,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 @@ -18504,6 +19027,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 "Klantfacturen" + #: ../../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 " @@ -18775,99 +19302,145 @@ msgid "" 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." +"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" -msgstr "Beheer uw opvolging" - -#: ../../content/applications/finance/accounting/receivables/customer_payments/followup.rst:13 +#: ../../content/applications/finance/accounting/receivables/customer_payments/followup.rst:11 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." +"`Odoo Tutorials: Payment Follow-up " +"`_" msgstr "" -#: ../../content/applications/finance/accounting/receivables/customer_payments/followup.rst:17 +#: ../../content/applications/finance/accounting/receivables/customer_payments/followup.rst:16 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." +"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:20 +msgid "Send an Email" +msgstr "Verzend een e-mail" + +#: ../../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 "Brief afdrukken" + #: ../../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 +#: ../../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 "" -"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`." +"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 "Follow-up reports" +msgstr "Betalingsherinneringen" + +#: ../../content/applications/finance/accounting/receivables/customer_payments/followup.rst:35 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." +"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:40 -msgid "Send reminders in batch" -msgstr "" - -#: ../../content/applications/finance/accounting/receivables/customer_payments/followup.rst:42 +#: ../../content/applications/finance/accounting/receivables/customer_payments/followup.rst:39 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." +"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" -msgstr "" - -#: ../../content/applications/finance/accounting/receivables/customer_payments/followup.rst:54 +#: ../../content/applications/finance/accounting/receivables/customer_payments/followup.rst:43 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." +"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:59 +#: ../../content/applications/finance/accounting/receivables/customer_payments/followup.rst:48 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." +"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:69 +#: ../../content/applications/finance/accounting/receivables/customer_payments/followup.rst:50 msgid "" -"If you would like to get a reminder before the actual due date, set a " -"negative number of due days." +"When the reminder is sent, it is documented in the chatter of the invoice." +msgstr "" + +#: ../../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" -msgstr "Betaal facturen online" +msgid "Invoice online payment" +msgstr "" #: ../../content/applications/finance/accounting/receivables/customer_payments/online_payment.rst:5 msgid "" @@ -19130,7 +19703,7 @@ msgid "" 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 @@ -19672,8 +20245,8 @@ msgid "Taxation" msgstr "" #: ../../content/applications/finance/accounting/taxation/fiscal_year.rst:5 -msgid "Fiscal Year" -msgstr "Boekjaar" +msgid "Fiscal year" +msgstr "" #: ../../content/applications/finance/accounting/taxation/fiscal_year/close_fiscal_year.rst:3 msgid "Do a year end in Odoo (close a fiscal year)" @@ -20173,6 +20746,94 @@ msgstr "" "Dat is waarom we meestal bedrijven aanbevelen om met slechts één " "prijsreferentie te werken." +#: ../../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 "" @@ -20283,6 +20944,10 @@ msgid "" "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 " @@ -20329,15 +20994,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 @@ -20433,7 +21091,7 @@ msgid "" 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 @@ -21963,93 +22621,99 @@ msgstr "" msgid "Online payment acquirers" msgstr "" -#: ../../content/applications/finance/payment_acquirers.rst:56 +#: ../../content/applications/finance/payment_acquirers.rst:61 msgid "Payment flow" msgstr "Betaal flow" -#: ../../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 "Betaling van Odoo" -#: ../../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" -msgstr "Doorverwijzing naar de website van de betalingsprovider." +#: ../../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 "PayU Latam" -#: ../../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 " @@ -22059,7 +22723,7 @@ msgid "" "accounting control process." msgstr "" -#: ../../content/applications/finance/payment_acquirers.rst:105 +#: ../../content/applications/finance/payment_acquirers.rst:133 msgid "Bank payments" msgstr "" @@ -22086,95 +22750,58 @@ msgid "" "information about this payment method." msgstr "" -#: ../../content/applications/finance/payment_acquirers.rst:121 +#: ../../content/applications/finance/payment_acquirers.rst:146 +msgid "Additional features" +msgstr "" + +#: ../../content/applications/finance/payment_acquirers.rst:148 msgid "" -"Each acquirer has its specific configuration flow, depending on :ref:`which " -"feature is available `." +"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:127 -msgid "Add a new payment acquirer" +#: ../../content/applications/finance/payment_acquirers.rst:155 +msgid "Save cards for later" msgstr "" -#: ../../content/applications/finance/payment_acquirers.rst:129 +#: ../../content/applications/finance/payment_acquirers.rst:157 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*." +"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:139 +#: ../../content/applications/finance/payment_acquirers.rst:162 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." +"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: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" -msgstr "" - -#: ../../content/applications/finance/payment_acquirers.rst:149 +#: ../../content/applications/finance/payment_acquirers.rst:166 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." +"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 +#: ../../content/applications/finance/payment_acquirers.rst:173 +msgid "Manual capture" +msgstr "" + +#: ../../content/applications/finance/payment_acquirers.rst:175 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: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:" +"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 @@ -22191,56 +22818,170 @@ msgstr "" #: ../../content/applications/finance/payment_acquirers.rst:185 msgid "" -"Avoid potentially high credit card fees in the event of overselling or " -"cancelled orders." +"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." +"Hold a security deposit to return later, minus any deductions (e.g., after a" +" damage)." msgstr "" -#: ../../content/applications/finance/payment_acquirers.rst:195 +#: ../../content/applications/finance/payment_acquirers.rst:189 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." +"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." +"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 "Refunds" +msgstr "Retouren" + +#: ../../content/applications/finance/payment_acquirers.rst:212 +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: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: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:230 +msgid "" +"Each acquirer has its specific configuration flow, depending on :ref:`which " +"feature is available `." +msgstr "" + +#: ../../content/applications/finance/payment_acquirers.rst:236 +msgid "Add a new payment acquirer" +msgstr "" + +#: ../../content/applications/finance/payment_acquirers.rst:238 +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 "" +"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 +#: ../../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 "Landen" -#: ../../content/applications/finance/payment_acquirers.rst:212 +#: ../../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:218 +#: ../../content/applications/finance/payment_acquirers.rst:285 msgid "Payment journal" msgstr "" -#: ../../content/applications/finance/payment_acquirers.rst:220 +#: ../../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:225 +#: ../../content/applications/finance/payment_acquirers.rst:292 msgid "Accounting perspective" msgstr "" -#: ../../content/applications/finance/payment_acquirers.rst:227 +#: ../../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 " @@ -22249,78 +22990,78 @@ msgid "" "advice." msgstr "" -#: ../../content/applications/finance/payment_acquirers.rst:232 +#: ../../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:235 +#: ../../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:237 +#: ../../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:238 +#: ../../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:244 +#: ../../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:248 +#: ../../content/applications/finance/payment_acquirers.rst:315 msgid ":doc:`payment_acquirers/wire_transfer`" msgstr "" -#: ../../content/applications/finance/payment_acquirers.rst:249 +#: ../../content/applications/finance/payment_acquirers.rst:316 msgid ":doc:`payment_acquirers/adyen`" msgstr "" -#: ../../content/applications/finance/payment_acquirers.rst:250 +#: ../../content/applications/finance/payment_acquirers.rst:317 msgid ":doc:`payment_acquirers/alipay`" msgstr "" -#: ../../content/applications/finance/payment_acquirers.rst:251 +#: ../../content/applications/finance/payment_acquirers.rst:318 msgid ":doc:`payment_acquirers/authorize`" msgstr "" -#: ../../content/applications/finance/payment_acquirers.rst:252 +#: ../../content/applications/finance/payment_acquirers.rst:319 msgid ":doc:`payment_acquirers/buckaroo`" msgstr "" -#: ../../content/applications/finance/payment_acquirers.rst:253 +#: ../../content/applications/finance/payment_acquirers.rst:320 msgid ":doc:`payment_acquirers/mollie`" msgstr "" -#: ../../content/applications/finance/payment_acquirers.rst:254 +#: ../../content/applications/finance/payment_acquirers.rst:321 msgid ":doc:`payment_acquirers/ogone`" msgstr "" -#: ../../content/applications/finance/payment_acquirers.rst:255 +#: ../../content/applications/finance/payment_acquirers.rst:322 msgid ":doc:`payment_acquirers/paypal`" msgstr "" -#: ../../content/applications/finance/payment_acquirers.rst:256 +#: ../../content/applications/finance/payment_acquirers.rst:323 msgid ":doc:`payment_acquirers/sips`" msgstr "" -#: ../../content/applications/finance/payment_acquirers.rst:257 +#: ../../content/applications/finance/payment_acquirers.rst:324 msgid ":doc:`payment_acquirers/stripe`" msgstr "" -#: ../../content/applications/finance/payment_acquirers.rst:258 +#: ../../content/applications/finance/payment_acquirers.rst:325 msgid ":doc:`../websites/ecommerce/shopper_experience/payment_acquirer`" msgstr "" @@ -22330,8 +23071,8 @@ msgstr "Adyen" #: ../../content/applications/finance/payment_acquirers/adyen.rst:5 msgid "" -"`Adyen `_ is a Dutch-based company that offers " -"several online payment possibilities." +"`Adyen `_ is a Dutch company that offers several " +"online payment possibilities." msgstr "" #: ../../content/applications/finance/payment_acquirers/adyen.rst:12 @@ -22393,37 +23134,39 @@ 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" +"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 "API Key and Client Key" +msgstr "" + +#: ../../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:`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." +"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:45 +#: ../../content/applications/finance/payment_acquirers/adyen.rst:48 msgid "" -"This is also the place where you'll :ref:`allow payments to be made from " -"your website `." +"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:51 +#: ../../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 " @@ -22431,54 +23174,55 @@ msgid "" "notification`." msgstr "" -#: ../../content/applications/finance/payment_acquirers/adyen.rst:61 +#: ../../content/applications/finance/payment_acquirers/adyen.rst:65 msgid "" -"There, in :menuselection:`Transport --> URL`, enter your server address " -"followed by `/payment/adyen/notification`." +"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 +#: ../../content/applications/finance/payment_acquirers/adyen.rst:72 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." +"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 +#: ../../content/applications/finance/payment_acquirers/adyen.rst:86 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**." +":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 "Adyen-account" -#: ../../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 +#: ../../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:`Allowed Origins`, then add the URLs from where payments will" -" be made (the URLs of the servers hosting your Odoo instances)." +":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 @@ -22591,18 +23335,30 @@ 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." +"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 +#: ../../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: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." +"`. 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:44 +#: ../../content/applications/finance/payment_acquirers/authorize.rst:50 msgid "" "After **30 days**, the transaction is **voided automatically** by " "Authorize.net." @@ -22722,10 +23478,6 @@ msgid "" "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, " diff --git a/locale/nl/LC_MESSAGES/general.po b/locale/nl/LC_MESSAGES/general.po index 95d9f488f..7a682a19d 100644 --- a/locale/nl/LC_MESSAGES/general.po +++ b/locale/nl/LC_MESSAGES/general.po @@ -18,7 +18,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: 2021-11-02 08:47+0000\n" "Last-Translator: Martin Trigaux, 2022\n" "Language-Team: Dutch (https://www.transifex.com/odoo/teams/41243/nl/)\n" @@ -551,115 +551,173 @@ msgstr "Synchroniseer Google agenda met Odoo" #: ../../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)." +"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 "" -"Odoo is perfect geïntegreerd met Google Kalender zodat u meetings kan zien &" -" beheren vanuit beide platformen (updates werken in beide richtingen)." -#: ../../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 "Opzet in Google" -#: ../../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 "" -"Ga naar het `Google API platform `__ " -"om Google Kalender API login gegevens te genereren. Login met uw Google " -"account." #: ../../content/applications/general/calendars/google/google_calendar_credentials.rst:14 -msgid "Go to the API & Services page." -msgstr "Ga naar de API & Diensten pagina." - -#: ../../content/applications/general/calendars/google/google_calendar_credentials.rst:19 -msgid "Search for *Google Calendar API* and select it." -msgstr "Zoek voor *Google Kalender API* en selecteer deze." - -#: ../../content/applications/general/calendars/google/google_calendar_credentials.rst:27 -msgid "Enable the API." -msgstr "Schakel de API in." - -#: ../../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)." -msgstr "" -"Selecteer of maak een API project om de logingegevens te bewaren indien u " -"dit nog niet heeft gedaan. Geef het een expliciete naam (bijvoorbeeld Odoo " -"sync)." - -#: ../../content/applications/general/calendars/google/google_calendar_credentials.rst:35 -msgid "Create credentials." -msgstr "Maak logingegevens aan." - -#: ../../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." -msgstr "" -"Selecteer *web browser (Javascript) als bron en *Gebruiker data* als type " -"data." - -#: ../../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'." +"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:55 +#: ../../content/applications/general/calendars/google/google_calendar_credentials.rst:18 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." +"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:60 +#: ../../content/applications/general/calendars/google/google_calendar_credentials.rst:22 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." +"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:67 +#: ../../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:31 +msgid "" +"Then, open the API Project and click :guilabel:`Enable APIs and Services`." +msgstr "" + +#: ../../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:45 +msgid "Create credentials" +msgstr "" + +#: ../../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: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: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:63 +msgid "" +"Skip the third step, :guilabel:`Scopes`, by clicking :guilabel:`Save and " +"Continue`." +msgstr "" + +#: ../../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: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 "" +"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 "Opzetten in Odoo" -#: ../../content/applications/general/calendars/google/google_calendar_credentials.rst:69 +#: ../../content/applications/general/calendars/google/google_calendar_credentials.rst:100 msgid "" -"Install the **Google Calendar** App from the *Apps* menu or by checking the " -"option in :menuselection:`Settings --> General Settings`." +"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:75 +#: ../../content/applications/general/calendars/google/google_calendar_credentials.rst:108 msgid "" -"Go to :menuselection:`Settings --> General Settings` and enter your **Client" -" ID** and **Client Secret** in Google Calendar option." +"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 "" -"Ga naar: menuselectie: `Instellingen -> Algemene instellingen` activeer " -"Google Agenda en voer je ** Client ID ** en ** Client Secret ** in ." -#: ../../content/applications/general/calendars/google/google_calendar_credentials.rst:81 +#: ../../content/applications/general/calendars/google/google_calendar_credentials.rst:112 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." +"Finally, open the Calendar module in Odoo and click on the " +":guilabel:`Google` sync button to sync Google Calendar with Odoo." msgstr "" -"De setup is nu compleet. Open jou Odoo Kalender en sync hem met Google. De " -"eerste keer wanner je dit doet zal je doorgestuurd worden naar Google om de " -"connectie te goed te keuren. Eenmaal terug in Odoo, druk nogmaals op de " -"sync knop. Je kan erop klikken telkens je jou kalender wilt synchroniseren." -#: ../../content/applications/general/calendars/google/google_calendar_credentials.rst:89 -msgid "As of now you no longer have excuses to miss a meeting!" -msgstr "Vanaf nu heeft u geen excuses meer om een meeting te missen!" +#: ../../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 msgid "Synchronization with Outlook's Calendar" @@ -3227,7 +3285,7 @@ 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 `." +"find more information at: :doc:`In-App Purchase `." msgstr "" #: ../../content/applications/general/users.rst:7 diff --git a/locale/nl/LC_MESSAGES/productivity.po b/locale/nl/LC_MESSAGES/productivity.po index f76866165..58a2ef328 100644 --- a/locale/nl/LC_MESSAGES/productivity.po +++ b/locale/nl/LC_MESSAGES/productivity.po @@ -4,19 +4,19 @@ # FIRST AUTHOR , YEAR. # # Translators: -# Martin Trigaux, 2021 # Erwin van der Ploeg , 2021 # Yenthe Van Ginneken , 2021 # Gunther Clauwaert , 2021 +# Martin Trigaux, 2022 # #, fuzzy 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: 2021-11-02 08:49+0000\n" -"Last-Translator: Gunther Clauwaert , 2021\n" +"Last-Translator: Martin Trigaux, 2022\n" "Language-Team: Dutch (https://www.transifex.com/odoo/teams/41243/nl/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -32,6 +32,128 @@ msgstr "Productiviteit" msgid "Discuss" msgstr "Discussieer" +#: ../../content/applications/productivity/discuss/advanced.rst:5 +msgid "Advanced" +msgstr "Geavanceerd" + +#: ../../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 "Overzicht" @@ -1423,12 +1545,12 @@ msgid "" 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 "" @@ -1488,38 +1610,64 @@ msgid "" "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/nl/LC_MESSAGES/sales.po b/locale/nl/LC_MESSAGES/sales.po index 39f3a5853..adc98650e 100644 --- a/locale/nl/LC_MESSAGES/sales.po +++ b/locale/nl/LC_MESSAGES/sales.po @@ -9,9 +9,9 @@ # Vincent van Reenen , 2021 # Louisa Van Cauwenberghe , 2021 # Jurre Claassen , 2021 -# Martin Trigaux, 2021 # Eric Geens , 2021 # Gunther Clauwaert , 2021 +# Martin Trigaux, 2022 # Yenthe Van Ginneken , 2022 # #, fuzzy @@ -19,7 +19,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: 2021-11-02 08:49+0000\n" "Last-Translator: Yenthe Van Ginneken , 2022\n" "Language-Team: Dutch (https://www.transifex.com/odoo/teams/41243/nl/)\n" @@ -80,7 +80,6 @@ msgstr "" "kanaal via de configuratie. " #: ../../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 @@ -89,8 +88,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 @@ -186,124 +186,160 @@ 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" -msgstr "Genereer leads/opportuniteiten vanuit e-mails" - -#: ../../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:3 +msgid "Generate leads/opportunities" msgstr "" -"Het automatiseren van de lead / opportuniteit-generatie zal uw efficiëntie " -"aanzienlijk verbeteren. Standaard zal odoo een opportuniteit in de pijplijn " -"van het standaard verkoopkanaal toevoegen voor elke e-mail die wordt " -"verzonden naar * sales@database\\ _domain.ext *." -#: ../../content/applications/sales/crm/acquire_leads/generate_from_email.rst:11 +#: ../../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_leads.rst:10 msgid "Configure email aliases" msgstr "Configureer e-mail aliassen" -#: ../../content/applications/sales/crm/acquire_leads/generate_from_email.rst:13 +#: ../../content/applications/sales/crm/acquire_leads/generate_leads.rst:12 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`." +"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" -msgstr "Genereer leads/opportuniteiten vanaf uw website contact pagina" - -#: ../../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." -msgstr "" -"Het automatiseren van de lead / opportuniteit-generatie zal uw efficiëntie " -"aanzienlijk verbeteren. Een lead/opportuniteit zal in de pijplijn gecreëerd " -"worden voor elke bezoeker die het contactformulier op uw website gebruikt." - -#: ../../content/applications/sales/crm/acquire_leads/generate_from_website.rst:10 -msgid "Use the contact us on your website" -msgstr "Gebruik de contacteer ons op uw website" - -#: ../../content/applications/sales/crm/acquire_leads/generate_from_website.rst:12 -msgid "You should first go to your website app." -msgstr "U moet eerst naar de website app gaan." - -#: ../../content/applications/sales/crm/acquire_leads/generate_from_website.rst:14 -msgid "|image0|\\ |image1|" -msgstr "|image0|\\ |image1|" - -#: ../../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:23 +msgid "Use Contact Forms on your website" msgstr "" -#: ../../content/applications/sales/crm/acquire_leads/generate_from_website.rst:23 +#: ../../content/applications/sales/crm/acquire_leads/generate_leads.rst:25 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*." -msgstr "" -"Om naar een specifiek verkoopkanaal te gaan, ga naar: menuselectie: `Website" -" -> Configuratie -> Instellingen` onder * Communicatie * vindt u de " -"informatie over het Contactformulier en waar u het * Verkoopkanaal * of * " -"Verkoopmedewerker * kunt wijzigen." - -#: ../../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" -msgstr "Maak een gepersonaliseerd contact formulier" - -#: ../../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.)" +"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:43 +#: ../../content/applications/sales/crm/acquire_leads/generate_leads.rst:32 msgid "" -"You will need to install the free *Form Builder* module, only available in " -"Odoo Enterprise." +"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:52 +#: ../../content/applications/sales/crm/acquire_leads/generate_leads.rst:39 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." +"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:59 +#: ../../content/applications/sales/crm/acquire_leads/generate_leads.rst:46 msgid "" -"By default, any new contact form will send an email. You can switch to " -"lead/opportunity generation in *Change Form Parameters*." +"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: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:55 +msgid "Customize Contact Forms" msgstr "" -#: ../../content/applications/sales/crm/acquire_leads/generate_from_website.rst:67 -msgid "Generate leads instead of opportunities" -msgstr "Genereer leads i.p.v. opportuniteiten" - -#: ../../content/applications/sales/crm/acquire_leads/generate_from_website.rst:69 +#: ../../content/applications/sales/crm/acquire_leads/generate_leads.rst:57 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`." +"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_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_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_leads.rst:73 +msgid "Edit Contact Form fields" +msgstr "" + +#: ../../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_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_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_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_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 @@ -346,7 +382,7 @@ msgstr "" #: ../../content/applications/sales/crm/acquire_leads/lead_mining.rst:34 msgid "" -"When choosing to target Companied and their contacts you can choose the " +"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 " @@ -381,11 +417,11 @@ msgstr "Prijzen" 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 " +" 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 --> In-App Purchases --> View my" -" Services`." +"Credits`; or go to :menuselection:`Settings --> Contacts --> Odoo IAP --> " +"View my Services`." msgstr "" #: ../../content/applications/sales/crm/acquire_leads/lead_mining.rst:65 @@ -912,68 +948,87 @@ 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*." +"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" -msgstr "Maak een nieuw verkoopkanaal" +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`." +"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 +#: ../../content/applications/sales/crm/pipeline/multi_sales_team.rst:15 msgid "" -"There you can set an email alias to it. Every message sent to that email " -"address will create a lead/opportunity." +"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 "Voeg leden toe aan het verkoopkanaal" - -#: ../../content/applications/sales/crm/pipeline/multi_sales_team.rst:23 +#: ../../content/applications/sales/crm/pipeline/multi_sales_team.rst:19 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." +"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 +#: ../../content/applications/sales/crm/pipeline/multi_sales_team.rst:30 msgid "" -"If you now filter on this specific channel in your pipeline, you will find " -"all of its opportunities." +"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" -msgstr "Verkoopkanaal 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 +#: ../../content/applications/sales/crm/pipeline/multi_sales_team.rst:44 msgid "" -"It is shared with the whole ecosystem so every revenue stream is included in" -" it: Sales, eCommerce, PoS, etc." +"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 @@ -986,94 +1041,90 @@ 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." +"*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." +"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)." +"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 "Maak een scoreregel aan" -#: ../../content/applications/sales/crm/track_leads/lead_scoring.rst:23 +#: ../../content/applications/sales/crm/track_leads/lead_scoring.rst:24 msgid "" -"You now have a new tab in your *CRM* app called *Leads Management* where you" -" can manage your scoring rules." +"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." +"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 +#: ../../content/applications/sales/crm/track_leads/lead_scoring.rst:32 msgid "" -"Every hour every lead without a score will be automatically scanned and " -"assigned their right score according to your scoring rules." +"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 "Leads toewijzen" -#: ../../content/applications/sales/crm/track_leads/lead_scoring.rst:42 +#: ../../content/applications/sales/crm/track_leads/lead_scoring.rst:41 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." +"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 +#: ../../content/applications/sales/crm/track_leads/lead_scoring.rst:50 msgid "" -"Further on, you can assign to a specific vendor in the team with an even " -"more refined domain." +"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 +#: ../../content/applications/sales/crm/track_leads/lead_scoring.rst:57 msgid "" -"To do so go to :menuselection:`CRM --> Leads Management --> Leads " -"Assignation`." +"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" -msgstr "Evalueer & gebruik de niet toegewezen 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." +"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 +#: ../../content/applications/sales/crm/track_leads/lead_scoring.rst:72 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." +"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 @@ -1780,32 +1831,31 @@ 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." +"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 +#: ../../content/applications/sales/point_of_sale/overview/epos_ssc.rst:79 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." +"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 " @@ -1837,8 +1887,8 @@ 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*." +" 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 @@ -1898,45 +1948,49 @@ msgid "" msgstr "" #: ../../content/applications/sales/point_of_sale/overview/getting_started.rst:82 +msgid "You can use both `,` and `.` on your keyboard as decimal separators." +msgstr "" + +#: ../../content/applications/sales/point_of_sale/overview/getting_started.rst:85 msgid "Return and refund products" msgstr "" -#: ../../content/applications/sales/point_of_sale/overview/getting_started.rst:84 +#: ../../content/applications/sales/point_of_sale/overview/getting_started.rst:87 msgid "" "Having a well-thought-out return policy is key to keep customers satisfied " "and make the process of accepting returns and refunds easy for you." msgstr "" -#: ../../content/applications/sales/point_of_sale/overview/getting_started.rst:87 +#: ../../content/applications/sales/point_of_sale/overview/getting_started.rst:90 msgid "" "To do that, from the PoS interface, select the product and quantity (with " "the +/- button) that the customer wants to return. For multiple products, " "repeat the process individually." msgstr "" -#: ../../content/applications/sales/point_of_sale/overview/getting_started.rst:94 +#: ../../content/applications/sales/point_of_sale/overview/getting_started.rst:97 msgid "" "When on the payment interface, the total is negative. To end the refund, " "process the payment and validate it." msgstr "" -#: ../../content/applications/sales/point_of_sale/overview/getting_started.rst:102 +#: ../../content/applications/sales/point_of_sale/overview/getting_started.rst:105 msgid "Close the PoS session" msgstr "Sluit de kassa sessie af" -#: ../../content/applications/sales/point_of_sale/overview/getting_started.rst:104 +#: ../../content/applications/sales/point_of_sale/overview/getting_started.rst:107 msgid "" "To close your session at the end of the day, click on the close button on " "the upper right corner of your screen and confirm. Now, close the session on" " the dashboard view." msgstr "" -#: ../../content/applications/sales/point_of_sale/overview/getting_started.rst:112 +#: ../../content/applications/sales/point_of_sale/overview/getting_started.rst:115 msgid "" "It’s strongly advised to close your PoS session at the end of each day." msgstr "" -#: ../../content/applications/sales/point_of_sale/overview/getting_started.rst:114 +#: ../../content/applications/sales/point_of_sale/overview/getting_started.rst:117 msgid "" "Once a session is closed, you can see a summary of all transactions per " "payment method. Then, click on a line to see all orders that were paid " @@ -1944,7 +1998,7 @@ msgid "" "post the closing entries." msgstr "" -#: ../../content/applications/sales/point_of_sale/overview/getting_started.rst:123 +#: ../../content/applications/sales/point_of_sale/overview/getting_started.rst:126 msgid "" "To connect the PoS hardware with an Odoo IoT Box, please refer to these " "docs: :doc:`Connect an IoT Box to your database " @@ -1952,24 +2006,24 @@ msgid "" "for the PoS `." msgstr "" -#: ../../content/applications/sales/point_of_sale/overview/getting_started.rst:129 +#: ../../content/applications/sales/point_of_sale/overview/getting_started.rst:132 msgid "View your statistics" msgstr "Bekijk uw statistieken" -#: ../../content/applications/sales/point_of_sale/overview/getting_started.rst:131 +#: ../../content/applications/sales/point_of_sale/overview/getting_started.rst:134 msgid "" "Keeping track of your sales is essential to get meaningful statistics. " "That’s why Odoo provides analyzes about your sales." msgstr "" -#: ../../content/applications/sales/point_of_sale/overview/getting_started.rst:134 +#: ../../content/applications/sales/point_of_sale/overview/getting_started.rst:137 msgid "" "To access your statistics, go to :menuselection:`Point of Sales --> " "Reporting --> Orders`. There, you can see various statistics in graph or " "pivot form." msgstr "" -#: ../../content/applications/sales/point_of_sale/overview/getting_started.rst:142 +#: ../../content/applications/sales/point_of_sale/overview/getting_started.rst:145 msgid "You can also access them through the dashboard." msgstr "" @@ -2052,10 +2106,147 @@ msgstr "" msgid "Payment Terminals" msgstr "Betaalterminals" -#: ../../content/applications/sales/point_of_sale/payment/ingenico.rst:3 -msgid "Connect an Ingenico Payment Terminal to your PoS" +#: ../../content/applications/sales/point_of_sale/payment/adyen.rst:3 +msgid "Adyen" +msgstr "Adyen" + +#: ../../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 "Voeg een nieuwe betaling toe" + +#: ../../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 "Ingenico" +msgstr "Ingenico" + #: ../../content/applications/sales/point_of_sale/payment/ingenico.rst:5 #: ../../content/applications/sales/point_of_sale/payment/worldline.rst:5 msgid "" @@ -2100,11 +2291,6 @@ msgid "" "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 " @@ -2119,11 +2305,6 @@ msgid "" "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 " @@ -2159,8 +2340,8 @@ msgid "" msgstr "" #: ../../content/applications/sales/point_of_sale/payment/six.rst:3 -msgid "Connect a SIX Payment Terminal to your PoS" -msgstr "" +msgid "SIX" +msgstr "SIX" #: ../../content/applications/sales/point_of_sale/payment/six.rst:5 msgid "" @@ -2170,64 +2351,69 @@ 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 +#: ../../content/applications/sales/point_of_sale/payment/six.rst:21 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\"." +"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 +#: ../../content/applications/sales/point_of_sale/payment/six.rst:28 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." +"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 +#: ../../content/applications/sales/point_of_sale/payment/six.rst:39 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." +"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 +#: ../../content/applications/sales/point_of_sale/payment/six.rst:48 msgid "" -"When the payment is done, the status will change to *Payment Successful*. " -"You can always reverse the last transaction by clicking on *Reverse*." +"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 +#: ../../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 *Force Done*. This will allow you to validate the order in" -" Odoo even if the connection between the terminal and Odoo encounters " -"issues." +"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 @@ -2270,8 +2456,8 @@ msgid "" msgstr "" #: ../../content/applications/sales/point_of_sale/payment/worldline.rst:3 -msgid "Connect a Worldline Payment Terminal to the PoS" -msgstr "" +msgid "Worldline" +msgstr "Worldline" #: ../../content/applications/sales/point_of_sale/payment/worldline.rst:9 msgid "Please note that Worldline is currently only available in Belgium." @@ -2826,82 +3012,6 @@ msgid "" "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 "Start een sessie" - -#: ../../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 "Een sessie afsluiten" - -#: ../../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 "Kasafronding" @@ -3163,6 +3273,147 @@ 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 "Verhuur" @@ -3639,12 +3890,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 "" @@ -3721,15 +3974,36 @@ msgstr "" #: ../../content/applications/sales/sales/amazon_connector/manage.rst:45 msgid "" -":doc:`../../../inventory_and_mrp/inventory/shipping/setup/third_party_shipper`" +"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 "" +"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 " @@ -3739,14 +4013,14 @@ msgid "" "under the FBA program." msgstr "" -#: ../../content/applications/sales/sales/amazon_connector/manage.rst:57 +#: ../../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" @@ -3758,24 +4032,24 @@ msgid "" " 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 " @@ -3786,11 +4060,11 @@ msgid "" "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 " @@ -3798,13 +4072,13 @@ msgid "" " 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 " @@ -3814,8 +4088,9 @@ msgid "" "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 "" @@ -3824,118 +4099,49 @@ msgid "Configure Amazon Connector in Odoo" msgstr "" #: ../../content/applications/sales/sales/amazon_connector/setup.rst:6 -msgid "Generate an Authorization Token in Seller Central" +msgid "Register your Amazon account in Odoo" 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." +"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:14 +#: ../../content/applications/sales/sales/amazon_connector/setup.rst:13 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." +"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:19 +#: ../../content/applications/sales/sales/amazon_connector/setup.rst:17 msgid "" -"You might need to use the *main* (or first) administrator account and not " -"one added subsequently." +"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:22 +#: ../../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:23 msgid "" -"In the main menu, select :menuselection:`Apps & Services --> Manage Your " -"Apps`; in the page that displays, click on the ``Authorize new developper`` " -"button:" +"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 "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**." -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 " -"`." -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." -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." -msgstr "" - -#: ../../content/applications/sales/sales/amazon_connector/setup.rst:72 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 " @@ -3943,7 +4149,7 @@ msgid "" " 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, " @@ -3951,7 +4157,7 @@ msgid "" "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 " @@ -3960,7 +4166,7 @@ msgid "" ":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" @@ -3969,7 +4175,7 @@ msgid "" " 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** " @@ -3977,18 +4183,18 @@ msgid "" "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 " @@ -3997,7 +4203,7 @@ msgid "" " 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 " @@ -4005,76 +4211,173 @@ msgid "" "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 +#: ../../content/applications/sales/sales/amazon_connector/setup.rst:78 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." +"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 +#: ../../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." +"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 +#: ../../content/applications/sales/sales/amazon_connector/setup.rst:88 msgid "" -"To add a new marketplace, you must first activate the :ref:`developer mode " -"`." +"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 +#: ../../content/applications/sales/sales/amazon_connector/setup.rst:93 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 " -"`_." +"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 +#: ../../content/applications/sales/sales/amazon_connector/setup.rst:99 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." +"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 +#: ../../content/applications/sales/sales/amazon_connector/setup.rst:104 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." +"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 "e-Bay connector" @@ -5039,7 +5342,7 @@ msgstr "Hoe uw prijzen aan uw klanten aanpassen en kortingen toepassen" 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 " +"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 "" @@ -6251,16 +6554,10 @@ msgid "" 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 " @@ -6269,50 +6566,50 @@ msgid "" "**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/nl/LC_MESSAGES/services.po b/locale/nl/LC_MESSAGES/services.po index 28ff080ac..8ead27ece 100644 --- a/locale/nl/LC_MESSAGES/services.po +++ b/locale/nl/LC_MESSAGES/services.po @@ -13,7 +13,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: 2021-11-02 08:49+0000\n" "Last-Translator: Erwin van der Ploeg , 2021\n" "Language-Team: Dutch (https://www.transifex.com/odoo/teams/41243/nl/)\n" @@ -1197,6 +1197,7 @@ msgid ":doc:`reinvoice_from_project`" msgstr ":doc:`reinvoice_from_project`" #: ../../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 "" @@ -1208,54 +1209,150 @@ msgstr "Factuurtijd besteed aan tickets (Postpaid Support Services)" #: ../../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." +"The :guilabel:`Timesheet on Ticket` integration provides more control and " +"transparency over how clients are charged, and what they're specifically " +"billed for." msgstr "" -"Trek de factureerbare tijd die u hebt bijgehouden op uw helpdesktickets " -"rechtstreeks naar verkooporders en facturen via een projecttaak. Het geeft u" -" meer controle over wat u uw klant in rekening brengt, en het is " -"efficiënter." -#: ../../content/applications/services/helpdesk/timesheet_and_invoice/reinvoice_from_project.rst:10 +#: ../../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 "Configuration" msgstr "Configuratie" -#: ../../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*." -msgstr "" -"Ga naar :menuselection:`Helpdesk --> Configuratie --> Helpdesk team --> " -"Bewerken` en schakel de opties *Timesheet op Ticket* en *Time Reinvoicing* " -"in." - #: ../../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*." +"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 "" -"Kies onder *Timesheet op Ticket* het *Project* waaraan tickets (en " -"timesheets) standaard worden gekoppeld. Open de *Externe link* om de functie" -" *Bill van taken* in te schakelen." -#: ../../content/applications/services/helpdesk/timesheet_and_invoice/reinvoice_from_project.rst:22 -msgid "Create a sales order and an invoice" -msgstr "Een verkooporder en een factuur maken" - -#: ../../content/applications/services/helpdesk/timesheet_and_invoice/reinvoice_from_project.rst:24 +#: ../../content/applications/services/helpdesk/timesheet_and_invoice/reinvoice_from_project.rst:20 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." +"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 "" -"Nu, zodra u de tijd hebt geregistreerd die u aan het helpdeskticket hebt " -"besteed, opent u onder het tabblad *Timesheets* de taak door op de naam te " -"klikken." -#: ../../content/applications/services/helpdesk/timesheet_and_invoice/reinvoice_from_project.rst:31 -msgid "*Create Sales Order* and proceed to create the invoice." -msgstr "*Maak verkooporder aan* en ga verder met het aanmaken van de factuur." +#: ../../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: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 msgid "Project" diff --git a/locale/nl/LC_MESSAGES/sphinx.po b/locale/nl/LC_MESSAGES/sphinx.po index ea73e18fe..3e2d9ad7f 100644 --- a/locale/nl/LC_MESSAGES/sphinx.po +++ b/locale/nl/LC_MESSAGES/sphinx.po @@ -15,7 +15,7 @@ msgid "" msgstr "" "Project-Id-Version: Odoo 15.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-03-18 15:02+0000\n" +"POT-Creation-Date: 2022-07-22 09:36+0000\n" "PO-Revision-Date: 2022-03-18 15:03+0000\n" "Last-Translator: Martin Trigaux, 2022\n" "Language-Team: Dutch (https://www.transifex.com/odoo/teams/41243/nl/)\n" @@ -37,7 +37,7 @@ msgstr "Neem contact op met support" 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 "" @@ -95,11 +95,11 @@ msgid "Installing Odoo" msgstr "" #: ../../extensions/odoo_theme/layout_templates/homepage.html:46 -msgid "System configuration" +msgid "Bugfix updates" msgstr "" #: ../../extensions/odoo_theme/layout_templates/homepage.html:51 -msgid "Bugfix updates" +msgid "Upgrading Odoo" msgstr "" #: ../../extensions/odoo_theme/layout_templates/homepage.html:56 @@ -147,10 +147,14 @@ msgid "" 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 "Documentatie" + +#: ../../extensions/odoo_theme/layout_templates/homepage.html:112 msgid "Content guidelines" msgstr "" diff --git a/locale/nl/LC_MESSAGES/websites.po b/locale/nl/LC_MESSAGES/websites.po index c77c46afb..6c157adae 100644 --- a/locale/nl/LC_MESSAGES/websites.po +++ b/locale/nl/LC_MESSAGES/websites.po @@ -9,17 +9,17 @@ # Maxim Vandenbroucke , 2022 # Pol Van Dingenen , 2022 # Gunther Clauwaert , 2022 -# Martin Trigaux, 2022 # Yenthe Van Ginneken , 2022 +# Martin Trigaux, 2022 # #, fuzzy 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: 2022-03-18 15:03+0000\n" -"Last-Translator: Yenthe Van Ginneken , 2022\n" +"Last-Translator: Martin Trigaux, 2022\n" "Language-Team: Dutch (https://www.transifex.com/odoo/teams/41243/nl/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -51,11 +51,15 @@ msgid "" 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 `_" @@ -393,85 +397,98 @@ msgid "Maximize my revenue" msgstr "Maximaliseer mijn omzet" #: ../../content/applications/websites/ecommerce/maximizing_revenue/cross_selling.rst:3 -msgid "How to sell accessories and optional products (cross-selling)" -msgstr "Hoe accessoires en optionele producten verkopen (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:" +"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 "Product accessoires op de check-out pagina," - -#: ../../content/applications/websites/ecommerce/maximizing_revenue/cross_selling.rst:9 msgid "" -"Optional products on a new *Add to Cart* screen (not installed by default)." +"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" -msgstr "Product accessoires op de check-out pagina" +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." +":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 "" -"Accessoires (bijvoorbeeld voor computers: muis, toetsenbord) worden getoond " -"wanneer de klant het winkelmandje bekijkt voor de betaling." #: ../../content/applications/websites/ecommerce/maximizing_revenue/cross_selling.rst:20 -msgid "Select accessories in the *Sales* tab of the product detail page." -msgstr "" -"Selecteer optionele items in het *Verkopen* tabblad van de product detail " -"pagina." +msgid "Accessory Products" +msgstr "Productaccessoires" -#: ../../content/applications/websites/ecommerce/maximizing_revenue/cross_selling.rst:26 +#: ../../content/applications/websites/ecommerce/maximizing_revenue/cross_selling.rst:22 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." +"**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" -msgstr "Optionele producten wanneer u product toevoegt aan winkelmandje" - -#: ../../content/applications/websites/ecommerce/maximizing_revenue/cross_selling.rst:33 +#: ../../content/applications/websites/ecommerce/maximizing_revenue/cross_selling.rst:25 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." +"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: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:" -msgstr "Om optionele producten te publiceren:" - -#: ../../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." +"`Odoo Tutorials: Alternative, Accessory, and Optional Products " +"`_." msgstr "" +#: ../../content/applications/websites/ecommerce/maximizing_revenue/cross_selling.rst:46 +msgid "Optional Products" +msgstr "Optionele producten" + #: ../../content/applications/websites/ecommerce/maximizing_revenue/cross_selling.rst:48 -msgid "Select optional items from the *Sales* tab of the product detail form." -msgstr "" -"Selecteer optionele items vanuit het **Verkopen** tabblad op het product " -"formulier." - -#: ../../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." +"**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: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 "" -"De hoeveelheid van optioneel toegevoegd producten aan een winkelmandje is " -"hetzelfde als het hoofd product." #: ../../content/applications/websites/ecommerce/maximizing_revenue/pricing.rst:3 msgid "Adapt prices to website visitors" @@ -699,10 +716,6 @@ msgid "" "page." msgstr "" -#: ../../content/applications/websites/ecommerce/publish.rst:5 -msgid "Launch my website" -msgstr "Lanceer mijn website" - #: ../../content/applications/websites/ecommerce/shopper_experience.rst:5 msgid "Get paid" msgstr "Wordt betaald" @@ -805,7 +818,7 @@ msgstr "" #: ../../content/applications/websites/ecommerce/shopper_experience/payment_acquirer.rst:62 msgid "" ":ref:`Payment Acquirers: Place a hold on a card " -"`" +"`" msgstr "" #: ../../content/applications/websites/ecommerce/shopper_experience/portal.rst:3 @@ -1183,7 +1196,39 @@ msgstr ":doc:`google_analytics_dashboard`" msgid "How to track your website traffic from your Odoo Dashboard" msgstr "Hoe uw website trafiek opvolgen vanuit uw Odoo dashboard" -#: ../../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." @@ -1191,7 +1236,7 @@ msgstr "" "U kan uw website trafiek opvolgen vanuit uw Odoo website dashboard dankzij " "Google Analytics." -#: ../../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`)." @@ -1200,7 +1245,7 @@ msgstr "" "tracking ID in te geven bij je Website's instellingen (zie " ":doc:'google_analytics')." -#: ../../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." @@ -1208,11 +1253,11 @@ msgstr "" "Ga naar `Google APIs platform `__ om " "analytics API inloggegevens te genereren. Log in met uw Google account." -#: ../../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 "Selecteer Analytics API." -#: ../../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." @@ -1220,15 +1265,15 @@ msgstr "" "Maak een nieuw project aan en geef het een naam (bijvoorbeeld Odoo). Dit " "project is nodig om uw API logingegevens te bewaren." -#: ../../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 "Schakel de API in." -#: ../../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 "Maak inloggegevens aan om te gebruiken in Odoo." -#: ../../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." @@ -1236,7 +1281,7 @@ msgstr "" "Selecteer *web browser (Javascript) als bron en *Gebruiker data* als type " "data." -#: ../../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" @@ -1250,7 +1295,7 @@ msgstr "" "*Goedgekeurde doorgestuurde URL* is jou Odoo's instatie URL gevolgd door " "'/google_account/authentication'." -#: ../../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 " @@ -1262,18 +1307,18 @@ msgstr "" "maar dit is niet verplicht. Het Toestemming scherm zal enkel getoond worden " "wanneer je de Client ID in Odoo ingeeft voor de eerste keer." -#: ../../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 "Uiteindelijk krijgt u uw client ID. Kopieer en plak deze in Odoo." -#: ../../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 "" "Autoriseer Odoo om toegang te krijgen tot de Google API als laatste stap." @@ -2367,44 +2412,31 @@ msgstr "Schaalbaarheid" #: ../../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 " -"`_" +"and eCommerce (Drupal, Wordpress, Magento, Prestashop)." msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:568 -msgid "Todo" -msgstr "Te doen" - -#: ../../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 "Sitemap" -#: ../../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, " @@ -2418,22 +2450,22 @@ msgstr "" "protocol respecteert om sitemap URL's te groeperen in 45000 stukken per " "bestand." -#: ../../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 "Elke sitemap heeft 4 attributen die automatisch berekend worden:" -#: ../../content/applications/websites/website/optimize/seo.rst:593 +#: ../../content/applications/websites/website/optimize/seo.rst:587 msgid "```` : the URL of a page" msgstr "```` : de URL van een pagina" -#: ../../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" @@ -2441,11 +2473,11 @@ msgid "" "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 "Gestructureerde Gegevens Markup" -#: ../../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 " @@ -2453,7 +2485,7 @@ msgid "" "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." @@ -2461,7 +2493,7 @@ msgstr "" "Google ondersteunt een aantal rijke snippets voor inhoudstypes, inclusief: " "Beoordelingen, Mensen, Producten, Zaken, Evenementen en Organisaties." -#: ../../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 " @@ -2474,29 +2506,29 @@ msgstr "" "toe om getoond te worden in Google en om extra informatie te gebruiken zoals" " de prijs en beoordeling van een product:" -#: ../../content/applications/websites/website/optimize/seo.rst:627 +#: ../../content/applications/websites/website/optimize/seo.rst:621 msgid "robots.txt" msgstr "robots.txt" -#: ../../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 " @@ -2755,11 +2787,34 @@ 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 " @@ -2768,11 +2823,11 @@ msgid "" "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 " @@ -2780,93 +2835,93 @@ msgid "" "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 "Producten" -#: ../../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 "Blogs" -#: ../../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 "Forums" -#: ../../content/applications/websites/website/publish/multi_website.rst:167 +#: ../../content/applications/websites/website/publish/multi_website.rst:176 msgid "Events" msgstr "Evenementen" -#: ../../content/applications/websites/website/publish/multi_website.rst:169 +#: ../../content/applications/websites/website/publish/multi_website.rst:178 msgid "Job Positions" msgstr "Functies" -#: ../../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 "Multi-bedrijven" -#: ../../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 " @@ -2874,46 +2929,46 @@ msgid "" "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 " @@ -2922,41 +2977,41 @@ msgid "" "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 "Prijslijsten" -#: ../../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 " @@ -2964,11 +3019,11 @@ msgid "" "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 " @@ -2977,39 +3032,39 @@ msgid "" "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 "" @@ -3056,7 +3111,7 @@ msgid "" 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 diff --git a/locale/th/LC_MESSAGES/administration.po b/locale/th/LC_MESSAGES/administration.po index ce1005074..b3c0c7520 100644 --- a/locale/th/LC_MESSAGES/administration.po +++ b/locale/th/LC_MESSAGES/administration.po @@ -13,7 +13,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: 2022-03-18 14:59+0000\n" "Last-Translator: Martin Trigaux, 2022\n" "Language-Team: Thai (https://www.transifex.com/odoo/teams/41243/th/)\n" @@ -229,9 +229,9 @@ msgid "" 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 "" @@ -1236,7 +1236,7 @@ msgid "" msgstr "" #: ../../content/administration/install/install.rst:90 -#: ../../content/administration/install/install.rst:252 +#: ../../content/administration/install/install.rst:254 msgid "Windows" msgstr "" @@ -1273,7 +1273,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 "" @@ -1289,9 +1289,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 "" @@ -1305,9 +1305,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 " @@ -1451,194 +1451,202 @@ msgid "" "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 +#: ../../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." +"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)" -msgstr "" - -#: ../../content/administration/install/install.rst:292 -#: ../../content/administration/install/install.rst:458 -#: ../../content/administration/install/install.rst:629 +#: ../../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 " +"**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." +"installation. See :ref:`setup/install/editions` to get access to the " +"Enterprise repository." +msgstr "" + +#: ../../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 " @@ -1647,149 +1655,147 @@ msgid "" "**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 " @@ -1797,86 +1803,100 @@ msgid "" "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." @@ -1930,11 +1950,23 @@ msgid "" "``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" @@ -1942,7 +1974,7 @@ msgid "" "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. " @@ -1952,7 +1984,7 @@ msgid "" "``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 " @@ -1960,37 +1992,37 @@ msgid "" " 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 " @@ -1998,25 +2030,25 @@ msgid "" "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 " @@ -2024,15 +2056,15 @@ msgid "" "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 " @@ -2041,88 +2073,88 @@ msgid "" ":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 --> " @@ -2130,29 +2162,29 @@ msgid "" "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 " @@ -2160,7 +2192,7 @@ msgid "" ":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 " @@ -2168,81 +2200,81 @@ msgid "" "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 " @@ -2250,33 +2282,33 @@ msgid "" " 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. " @@ -2284,7 +2316,7 @@ msgid "" "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 " @@ -2292,11 +2324,11 @@ msgid "" "`_ 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, " @@ -2304,7 +2336,7 @@ msgid "" "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 " @@ -2312,135 +2344,135 @@ msgid "" "`_." 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 " @@ -2448,7 +2480,7 @@ msgid "" "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 " @@ -2457,7 +2489,7 @@ msgid "" "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 "" @@ -2585,6 +2617,312 @@ msgid "" "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 "" @@ -2601,30 +2939,24 @@ 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" @@ -2632,46 +2964,56 @@ msgid "" " 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 +#: ../../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: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 "From on-premises to Odoo.sh" msgstr "" -#: ../../content/administration/maintain/hosting_changes.rst:26 -#: ../../content/administration/maintain/hosting_changes.rst:43 +#: ../../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:27 +#: ../../content/administration/maintain/hosting_changes.rst:30 msgid "...and voilà!" msgstr "" -#: ../../content/administration/maintain/hosting_changes.rst:30 +#: ../../content/administration/maintain/hosting_changes.rst:33 msgid "From Odoo Online to on-premises" msgstr "" -#: ../../content/administration/maintain/hosting_changes.rst:32 -#: ../../content/administration/maintain/hosting_changes.rst:40 +#: ../../content/administration/maintain/hosting_changes.rst:35 +#: ../../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:33 +#: ../../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" @@ -2679,8 +3021,8 @@ msgid "" "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 +#: ../../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" @@ -2688,16 +3030,16 @@ msgid "" "`_)" msgstr "" -#: ../../content/administration/maintain/hosting_changes.rst:35 -#: ../../content/administration/maintain/hosting_changes.rst:60 +#: ../../content/administration/maintain/hosting_changes.rst:38 +#: ../../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:38 +#: ../../content/administration/maintain/hosting_changes.rst:41 msgid "From Odoo Online to Odoo.sh" msgstr "" -#: ../../content/administration/maintain/hosting_changes.rst:41 +#: ../../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 " @@ -2705,28 +3047,99 @@ msgid "" "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)." +"`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 " "`." @@ -3029,6 +3442,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 "อัพเกรด" @@ -3146,7 +3560,7 @@ msgid "" 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 "ลบ" @@ -3492,21 +3906,21 @@ 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 `_." @@ -3768,6 +4182,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 "ภาพรวม" @@ -3928,7 +4343,7 @@ msgstr "" #: ../../content/administration/odoo_sh/advanced/containers.rst:169 msgid "" "More options are available and detailed in the :doc:`CLI documentation " -"`." +"`." msgstr "" #: ../../content/administration/odoo_sh/advanced/containers.rst:172 @@ -4312,7 +4727,7 @@ msgstr "" 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 @@ -4758,7 +5173,15 @@ msgid "" "gettingstarted-builds>`." 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 @@ -4766,17 +5189,17 @@ 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 " @@ -4789,48 +5212,48 @@ msgid "" "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 " @@ -4838,31 +5261,31 @@ msgid "" "`." 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" @@ -4870,75 +5293,75 @@ msgid "" "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 " @@ -4950,11 +5373,11 @@ msgid "" " 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 " @@ -4962,18 +5385,18 @@ msgid "" "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 " @@ -4984,23 +5407,23 @@ msgid "" "`." 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 " @@ -5008,178 +5431,178 @@ msgid "" "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 "" @@ -5818,9 +6241,9 @@ msgstr "" #: ../../content/administration/odoo_sh/getting_started/first_module.rst:97 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." +":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 @@ -6312,69 +6735,69 @@ 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 " @@ -6384,62 +6807,62 @@ msgid "" "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 " @@ -6454,7 +6877,7 @@ msgid "" "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 " @@ -6462,7 +6885,7 @@ msgid "" "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." @@ -6471,11 +6894,11 @@ msgid "" " 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 " @@ -6486,20 +6909,20 @@ msgid "" " 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 " @@ -6508,13 +6931,13 @@ msgid "" "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 " @@ -6522,7 +6945,7 @@ msgid "" "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." @@ -6884,7 +7307,6 @@ msgid "|assistance-contact|" msgstr "" #: ../../content/administration/upgrade.rst:32 -#: ../../content/administration/upgrade/odoo_sh.rst:66 msgid ":ref:`upgrade/sla`" msgstr "" @@ -7654,122 +8076,195 @@ msgid "" "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 +#: ../../content/administration/upgrade/odoo_sh.rst:13 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*." +"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." +"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 +#: ../../content/administration/upgrade/odoo_sh.rst:24 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." +"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 ":doc:`../../administration/upgrade`" +msgstr "" + +#: ../../content/administration/upgrade/odoo_sh.rst:30 +msgid ":doc:`Upgrade FAQ <../upgrade/faq>`" +msgstr "" + +#: ../../content/administration/upgrade/odoo_sh.rst:31 +msgid ":doc:`Introduction to Odoo.sh <../odoo_sh/overview/introduction>`" +msgstr "" + +#: ../../content/administration/upgrade/odoo_sh.rst:36 +msgid "Upgrade your custom modules" +msgstr "" + +#: ../../content/administration/upgrade/odoo_sh.rst:38 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." -msgstr "" - -#: ../../content/administration/upgrade/odoo_sh.rst:32 -msgid "" -"Test the upgraded database and make sure everything runs as it's supposed " -"to." -msgstr "" - -#: ../../content/administration/upgrade/odoo_sh.rst:35 -#: ../../content/administration/upgrade/on_premise.rst:41 -msgid "Upgrade your production database" -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:" -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." +"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." +"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." -msgstr "" - -#: ../../content/administration/upgrade/odoo_sh.rst:58 -#: ../../content/administration/upgrade/on_premise.rst:53 +#: ../../content/administration/upgrade/odoo_sh.rst:62 msgid "" -"Your custom modules also need to be upgraded to keep them compatible with " -"the new version." +"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:60 +#: ../../content/administration/upgrade/odoo_sh.rst:66 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')" +"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: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 @@ -7837,6 +8332,10 @@ msgid "" "`_." 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" @@ -7844,12 +8343,26 @@ msgid "" "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" diff --git a/locale/th/LC_MESSAGES/finance.po b/locale/th/LC_MESSAGES/finance.po index b965f68a2..0d062128b 100644 --- a/locale/th/LC_MESSAGES/finance.po +++ b/locale/th/LC_MESSAGES/finance.po @@ -5,9 +5,9 @@ # # Translators: # Potsawat Manuthamathorn , 2022 -# Khwunchai Jaengsawang , 2022 # Seksan Poltree , 2022 # Odoo Thaidev , 2022 +# Khwunchai Jaengsawang , 2022 # Wichanon Jamwutthipreecha, 2022 # Martin Trigaux, 2022 # @@ -16,7 +16,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: 2021-11-02 08:47+0000\n" "Last-Translator: Martin Trigaux, 2022\n" "Language-Team: Thai (https://www.transifex.com/odoo/teams/41243/th/)\n" @@ -50,30 +50,24 @@ 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" -msgstr "ธนาคาร" +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" -msgstr "ใบแจ้งยอดจากธนาคาร" +msgid "Bank statements" +msgstr "" #: ../../content/applications/finance/accounting/bank/feeds/bank_statements.rst:5 msgid "" @@ -204,7 +198,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 @@ -245,6 +239,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 @@ -252,6 +250,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 @@ -271,6 +270,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 @@ -279,6 +279,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 @@ -289,7 +290,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 @@ -300,11 +301,11 @@ 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 " @@ -313,34 +314,34 @@ msgid "" "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" @@ -351,38 +352,38 @@ msgid "" "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" @@ -392,15 +393,15 @@ msgid "" "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 --> " @@ -408,40 +409,40 @@ msgid "" "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: " @@ -449,13 +450,13 @@ msgid "" "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 " @@ -464,29 +465,29 @@ msgid "" "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 " @@ -498,7 +499,7 @@ msgid "" "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" @@ -506,32 +507,32 @@ msgid "" "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 " @@ -541,11 +542,11 @@ msgid "" " 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," @@ -553,21 +554,21 @@ msgid "" "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 " @@ -576,40 +577,40 @@ msgid "" "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 "" @@ -1092,11 +1093,8 @@ msgid "" 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" -msgstr "Bank Reconciliation Move Presets" +msgid "Bank reconciliation" +msgstr "" #: ../../content/applications/finance/accounting/bank/reconciliation/reconciliation_models.rst:3 msgid "Reconciliation Models" @@ -1203,7 +1201,7 @@ msgid "" 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 "ประเภท" @@ -1825,8 +1823,87 @@ 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 @@ -1834,7 +1911,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 "อาร์เจนตินา" @@ -2717,7 +2793,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 "บิลผู้ขาย" @@ -3900,7 +3975,6 @@ msgid "" 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 "โคลัมเบีย" @@ -5136,6 +5210,450 @@ msgid "" "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 "ฝรั่งเศส" @@ -5247,10 +5765,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" @@ -5735,10 +6249,6 @@ msgid "" "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 "โค้ด" @@ -6397,7 +6907,7 @@ msgid "" msgstr "" #: ../../content/applications/finance/accounting/fiscal_localizations/localizations/germany.rst:3 -#: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:52 +#: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:34 msgid "Germany" msgstr "เยอรมันนี" @@ -6436,7 +6946,7 @@ msgstr "" #: ../../content/applications/finance/accounting/fiscal_localizations/localizations/germany.rst:23 #: ../../content/applications/finance/accounting/fiscal_localizations/localizations/spain.rst:27 -#: ../../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 #: ../../content/applications/finance/accounting/reporting/overview/main_reports.rst:29 msgid "Balance Sheet" msgstr "งบดุล" @@ -6444,7 +6954,7 @@ msgstr "งบดุล" #: ../../content/applications/finance/accounting/fiscal_localizations/localizations/germany.rst:24 #: ../../content/applications/finance/accounting/fiscal_localizations/localizations/netherlands.rst:19 #: ../../content/applications/finance/accounting/getting_started/initial_configuration/chart_of_accounts.rst:17 -#: ../../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 msgid "Profit & Loss" msgstr "กำไร & ขาดทุน" @@ -7183,7 +7693,6 @@ msgid "" msgstr "" #: ../../content/applications/finance/accounting/fiscal_localizations/localizations/italy.rst:3 -#: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:71 msgid "Italy" msgstr "อิตาลี" @@ -7976,11 +8485,11 @@ msgid "" msgstr "" #: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:244 -msgid ":download:`Certificate `" +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 @@ -8196,10 +8705,6 @@ msgid "" "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 " @@ -8393,7 +8898,7 @@ msgid "" 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." @@ -8426,200 +8931,215 @@ msgid "" 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 " @@ -8628,22 +9148,22 @@ msgid "" "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" @@ -8653,27 +9173,27 @@ msgid "" " 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 " @@ -8681,56 +9201,56 @@ msgid "" "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" @@ -8738,21 +9258,21 @@ msgid "" "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" @@ -8760,7 +9280,7 @@ msgid "" " 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 " @@ -8768,33 +9288,33 @@ msgid "" "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." @@ -8803,108 +9323,108 @@ msgid "" "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 " @@ -8912,57 +9432,57 @@ msgid "" "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 " @@ -8972,11 +9492,11 @@ msgid "" "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 " "`_" @@ -8984,7 +9504,7 @@ msgid "" "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" @@ -8992,11 +9512,11 @@ msgid "" "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 " @@ -9005,27 +9525,27 @@ msgid "" "(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 " @@ -9033,25 +9553,25 @@ msgid "" "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 " @@ -9059,24 +9579,24 @@ msgid "" "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 " @@ -9086,18 +9606,18 @@ msgid "" "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 " @@ -9107,7 +9627,7 @@ msgid "" "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 " @@ -9115,43 +9635,43 @@ msgid "" "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 " @@ -9160,34 +9680,34 @@ msgid "" "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" @@ -9197,74 +9717,74 @@ msgid "" "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 " @@ -9273,45 +9793,45 @@ msgid "" " 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" @@ -9320,11 +9840,11 @@ msgid "" "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 " @@ -9332,7 +9852,7 @@ msgid "" "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 " @@ -9341,21 +9861,21 @@ msgid "" "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 " @@ -9363,11 +9883,11 @@ msgid "" "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 " @@ -9376,26 +9896,26 @@ msgid "" "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." @@ -9404,17 +9924,17 @@ msgid "" " 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 " @@ -9422,41 +9942,41 @@ msgid "" " :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 "" @@ -9471,30 +9991,30 @@ msgid "" "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': " @@ -9502,7 +10022,7 @@ msgid "" "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': " @@ -9510,36 +10030,36 @@ msgid "" "'[^|]{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" @@ -9549,25 +10069,25 @@ msgid "" "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 " @@ -9576,19 +10096,19 @@ msgid "" "'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': '' " @@ -9596,14 +10116,14 @@ msgid "" "'{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 " @@ -9612,27 +10132,27 @@ msgid "" " 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" @@ -9649,7 +10169,7 @@ msgid "" "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 "" @@ -9664,44 +10184,44 @@ msgid "" "'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 " @@ -9709,7 +10229,7 @@ msgid "" " 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 " @@ -9718,7 +10238,6 @@ msgid "" 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 "เนเธอร์แลนด์" @@ -9754,7 +10273,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 "เปรู" @@ -10928,7 +11446,7 @@ msgid "" 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 @@ -10990,11 +11508,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-" @@ -11013,379 +11526,295 @@ msgid "" 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" -msgstr "" +#: ../../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 "Austria - Accounting" -#: ../../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 "Belgium - Accounting" -#: ../../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 "Brazilian - Accounting" -#: ../../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" -msgstr "จีน" +#: ../../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 "จีน - CoA ธุรกิจขนาดเล็ก" - -#: ../../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 "การบัญชี - Colombian" - -#: ../../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 "Costa Rica - Accounting" -#: ../../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 "โครเอเชีย - การบัญชี (RRIF 2012)" -#: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:40 -msgid "Denmark" -msgstr "เดนมาร์ก" +#: ../../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 "Dominican Republic - Accounting" -#: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:46 -msgid "Ecuador - Accounting" -msgstr "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 "Ethiopia - Accounting" -#: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:48 -msgid "EU Mini One Stop Shop (MOSS)" -msgstr "EU Mini One Stop Shop (MOSS)" - -#: ../../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 "France - Accounting" -#: ../../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 "Generic - Accounting" -#: ../../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 "Greece - Accounting" -#: ../../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 "Guatemala - Accounting" -#: ../../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 "Honduras - Accounting" -#: ../../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 "Hungarian - Accounting" -#: ../../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 "Indian - Accounting" -#: ../../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 "Italy - Accounting" -#: ../../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 "Japan - Accounting" -#: ../../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 "Luxembourg - Accounting" -#: ../../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 "Maroc - Accounting" -#: ../../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 "Mexico - Accounting" -#: ../../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 "Netherlands - Accounting" -#: ../../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 "OHADA - Accounting" -#: ../../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" -msgstr "" +#: ../../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 "Poland - Accounting" -#: ../../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 "Romania - Accounting" -#: ../../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 "Singapore - Accounting" -#: ../../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 "Slovenian - Accounting" -#: ../../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 "Spain - Accounting (PGCE 2008)" -#: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:119 -msgid "Sweden" -msgstr "สวีเดน" - -#: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:121 -msgid "Sweden - Structured Communication OCR" +#: ../../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: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 "Switzerland - Accounting" -#: ../../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 "Turkey - Accounting" -#: ../../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 "U.A.E. - Accounting" -#: ../../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 "UK - Accounting" -#: ../../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" -msgstr "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 "Venezuela - Accounting" -#: ../../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 @@ -11411,30 +11840,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 "รายจ่าย" @@ -11479,116 +11908,116 @@ msgid "" "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 " @@ -11596,69 +12025,68 @@ msgid "" "` 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 " @@ -11666,61 +12094,61 @@ msgid "" "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 @@ -12488,6 +12916,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 "Bank Reconciliation Move Presets" + #: ../../content/applications/finance/accounting/getting_started/memento.rst:181 msgid "" "Bank reconciliation is the matching of bank statement lines (provided by " @@ -13394,7 +13828,7 @@ msgid "" "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 " @@ -13402,32 +13836,32 @@ msgid "" " 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 " @@ -13435,25 +13869,25 @@ msgid "" "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 " @@ -13461,32 +13895,32 @@ msgid "" " 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 " @@ -13494,18 +13928,18 @@ msgid "" "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 " @@ -13513,33 +13947,33 @@ msgid "" "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 " @@ -14777,10 +15211,10 @@ 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 " @@ -14969,6 +15403,10 @@ msgid "" "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 "" @@ -15085,7 +15523,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 @@ -15185,11 +15623,11 @@ msgid "" msgstr "" #: ../../content/applications/finance/accounting/payables/pay.rst:5 -msgid "Vendor Payments" -msgstr "การชําระเงินให้แก่ผู้ขาย" +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 @@ -15725,8 +16163,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 @@ -16120,7 +16562,7 @@ msgid "" 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 @@ -16336,8 +16778,156 @@ msgid "" "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 @@ -16657,97 +17247,8 @@ msgid "" " 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 @@ -16813,13 +17314,12 @@ 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" -msgstr "ใบกำกับภาษีของลูกค้า" +msgid "Customer invoices" +msgstr "" #: ../../content/applications/finance/accounting/receivables/customer_invoices/cash_discounts.rst:3 msgid "Offer cash discounts" @@ -16898,7 +17398,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 @@ -16958,7 +17458,7 @@ msgid "" 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 @@ -17114,7 +17614,7 @@ msgid "" 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 @@ -17701,8 +18201,26 @@ msgid "" "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 @@ -17952,56 +18470,56 @@ msgid "" "`_" 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 " @@ -18010,16 +18528,22 @@ 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" -msgstr "การชําระเงินของลูกค้า" +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 @@ -18151,7 +18675,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 @@ -18294,6 +18818,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 " @@ -18565,99 +19093,145 @@ msgid "" 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." +"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" -msgstr "" - -#: ../../content/applications/finance/accounting/receivables/customer_payments/followup.rst:13 +#: ../../content/applications/finance/accounting/receivables/customer_payments/followup.rst:11 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." +"`Odoo Tutorials: Payment Follow-up " +"`_" msgstr "" -#: ../../content/applications/finance/accounting/receivables/customer_payments/followup.rst:17 +#: ../../content/applications/finance/accounting/receivables/customer_payments/followup.rst:16 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." +"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: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 +#: ../../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 "" -"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`." +"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 "Follow-up reports" +msgstr "" + +#: ../../content/applications/finance/accounting/receivables/customer_payments/followup.rst:35 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." +"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:40 -msgid "Send reminders in batch" -msgstr "" - -#: ../../content/applications/finance/accounting/receivables/customer_payments/followup.rst:42 +#: ../../content/applications/finance/accounting/receivables/customer_payments/followup.rst:39 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." +"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" -msgstr "" - -#: ../../content/applications/finance/accounting/receivables/customer_payments/followup.rst:54 +#: ../../content/applications/finance/accounting/receivables/customer_payments/followup.rst:43 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." +"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:59 +#: ../../content/applications/finance/accounting/receivables/customer_payments/followup.rst:48 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." +"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:69 +#: ../../content/applications/finance/accounting/receivables/customer_payments/followup.rst:50 msgid "" -"If you would like to get a reminder before the actual due date, set a " -"negative number of due days." +"When the reminder is sent, it is documented in the chatter of the invoice." +msgstr "" + +#: ../../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" -msgstr "ออนไลน์" +msgid "Invoice online payment" +msgstr "" #: ../../content/applications/finance/accounting/receivables/customer_payments/online_payment.rst:5 msgid "" @@ -18920,7 +19494,7 @@ msgid "" 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 @@ -19462,8 +20036,8 @@ msgid "Taxation" msgstr "" #: ../../content/applications/finance/accounting/taxation/fiscal_year.rst:5 -msgid "Fiscal Year" -msgstr "ปีบัญชี" +msgid "Fiscal year" +msgstr "" #: ../../content/applications/finance/accounting/taxation/fiscal_year/close_fiscal_year.rst:3 msgid "Do a year end in Odoo (close a fiscal year)" @@ -19877,6 +20451,94 @@ msgid "" "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 "" @@ -19987,6 +20649,10 @@ msgid "" "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 " @@ -20033,15 +20699,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 @@ -20137,7 +20796,7 @@ msgid "" 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 @@ -21665,93 +22324,99 @@ 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 "PayU Latam" -#: ../../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 " @@ -21761,7 +22426,7 @@ msgid "" "accounting control process." msgstr "" -#: ../../content/applications/finance/payment_acquirers.rst:105 +#: ../../content/applications/finance/payment_acquirers.rst:133 msgid "Bank payments" msgstr "" @@ -21788,95 +22453,58 @@ msgid "" "information about this payment method." msgstr "" -#: ../../content/applications/finance/payment_acquirers.rst:121 +#: ../../content/applications/finance/payment_acquirers.rst:146 +msgid "Additional features" +msgstr "" + +#: ../../content/applications/finance/payment_acquirers.rst:148 msgid "" -"Each acquirer has its specific configuration flow, depending on :ref:`which " -"feature is available `." +"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:127 -msgid "Add a new payment acquirer" +#: ../../content/applications/finance/payment_acquirers.rst:155 +msgid "Save cards for later" msgstr "" -#: ../../content/applications/finance/payment_acquirers.rst:129 +#: ../../content/applications/finance/payment_acquirers.rst:157 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*." +"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:139 +#: ../../content/applications/finance/payment_acquirers.rst:162 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." +"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: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" -msgstr "" - -#: ../../content/applications/finance/payment_acquirers.rst:149 +#: ../../content/applications/finance/payment_acquirers.rst:166 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." +"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 +#: ../../content/applications/finance/payment_acquirers.rst:173 +msgid "Manual capture" +msgstr "" + +#: ../../content/applications/finance/payment_acquirers.rst:175 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: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:" +"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 @@ -21893,56 +22521,170 @@ msgstr "" #: ../../content/applications/finance/payment_acquirers.rst:185 msgid "" -"Avoid potentially high credit card fees in the event of overselling or " -"cancelled orders." +"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." +"Hold a security deposit to return later, minus any deductions (e.g., after a" +" damage)." msgstr "" -#: ../../content/applications/finance/payment_acquirers.rst:195 +#: ../../content/applications/finance/payment_acquirers.rst:189 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." +"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." +"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 "Refunds" +msgstr "การคืนเงิน" + +#: ../../content/applications/finance/payment_acquirers.rst:212 +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: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: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:230 +msgid "" +"Each acquirer has its specific configuration flow, depending on :ref:`which " +"feature is available `." +msgstr "" + +#: ../../content/applications/finance/payment_acquirers.rst:236 +msgid "Add a new payment acquirer" +msgstr "" + +#: ../../content/applications/finance/payment_acquirers.rst:238 +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 "" +"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 +#: ../../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:212 +#: ../../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:218 +#: ../../content/applications/finance/payment_acquirers.rst:285 msgid "Payment journal" msgstr "" -#: ../../content/applications/finance/payment_acquirers.rst:220 +#: ../../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:225 +#: ../../content/applications/finance/payment_acquirers.rst:292 msgid "Accounting perspective" msgstr "" -#: ../../content/applications/finance/payment_acquirers.rst:227 +#: ../../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 " @@ -21951,78 +22693,78 @@ msgid "" "advice." msgstr "" -#: ../../content/applications/finance/payment_acquirers.rst:232 +#: ../../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:235 +#: ../../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:237 +#: ../../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:238 +#: ../../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:244 +#: ../../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:248 +#: ../../content/applications/finance/payment_acquirers.rst:315 msgid ":doc:`payment_acquirers/wire_transfer`" msgstr "" -#: ../../content/applications/finance/payment_acquirers.rst:249 +#: ../../content/applications/finance/payment_acquirers.rst:316 msgid ":doc:`payment_acquirers/adyen`" msgstr "" -#: ../../content/applications/finance/payment_acquirers.rst:250 +#: ../../content/applications/finance/payment_acquirers.rst:317 msgid ":doc:`payment_acquirers/alipay`" msgstr "" -#: ../../content/applications/finance/payment_acquirers.rst:251 +#: ../../content/applications/finance/payment_acquirers.rst:318 msgid ":doc:`payment_acquirers/authorize`" msgstr "" -#: ../../content/applications/finance/payment_acquirers.rst:252 +#: ../../content/applications/finance/payment_acquirers.rst:319 msgid ":doc:`payment_acquirers/buckaroo`" msgstr "" -#: ../../content/applications/finance/payment_acquirers.rst:253 +#: ../../content/applications/finance/payment_acquirers.rst:320 msgid ":doc:`payment_acquirers/mollie`" msgstr "" -#: ../../content/applications/finance/payment_acquirers.rst:254 +#: ../../content/applications/finance/payment_acquirers.rst:321 msgid ":doc:`payment_acquirers/ogone`" msgstr "" -#: ../../content/applications/finance/payment_acquirers.rst:255 +#: ../../content/applications/finance/payment_acquirers.rst:322 msgid ":doc:`payment_acquirers/paypal`" msgstr "" -#: ../../content/applications/finance/payment_acquirers.rst:256 +#: ../../content/applications/finance/payment_acquirers.rst:323 msgid ":doc:`payment_acquirers/sips`" msgstr "" -#: ../../content/applications/finance/payment_acquirers.rst:257 +#: ../../content/applications/finance/payment_acquirers.rst:324 msgid ":doc:`payment_acquirers/stripe`" msgstr "" -#: ../../content/applications/finance/payment_acquirers.rst:258 +#: ../../content/applications/finance/payment_acquirers.rst:325 msgid ":doc:`../websites/ecommerce/shopper_experience/payment_acquirer`" msgstr "" @@ -22032,8 +22774,8 @@ msgstr "Adyen" #: ../../content/applications/finance/payment_acquirers/adyen.rst:5 msgid "" -"`Adyen `_ is a Dutch-based company that offers " -"several online payment possibilities." +"`Adyen `_ is a Dutch company that offers several " +"online payment possibilities." msgstr "" #: ../../content/applications/finance/payment_acquirers/adyen.rst:12 @@ -22095,37 +22837,39 @@ 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" +"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 "API Key and Client Key" +msgstr "" + +#: ../../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:`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." +"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:45 +#: ../../content/applications/finance/payment_acquirers/adyen.rst:48 msgid "" -"This is also the place where you'll :ref:`allow payments to be made from " -"your website `." +"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:51 +#: ../../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 " @@ -22133,54 +22877,55 @@ msgid "" "notification`." msgstr "" -#: ../../content/applications/finance/payment_acquirers/adyen.rst:61 +#: ../../content/applications/finance/payment_acquirers/adyen.rst:65 msgid "" -"There, in :menuselection:`Transport --> URL`, enter your server address " -"followed by `/payment/adyen/notification`." +"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 +#: ../../content/applications/finance/payment_acquirers/adyen.rst:72 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." +"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 +#: ../../content/applications/finance/payment_acquirers/adyen.rst:86 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**." +":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 +#: ../../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:`Allowed Origins`, then add the URLs from where payments will" -" be made (the URLs of the servers hosting your Odoo instances)." +":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 @@ -22293,18 +23038,30 @@ 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." +"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 +#: ../../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: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." +"`. 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:44 +#: ../../content/applications/finance/payment_acquirers/authorize.rst:50 msgid "" "After **30 days**, the transaction is **voided automatically** by " "Authorize.net." @@ -22424,10 +23181,6 @@ msgid "" "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, " diff --git a/locale/th/LC_MESSAGES/productivity.po b/locale/th/LC_MESSAGES/productivity.po index 1ec9a83a6..450956499 100644 --- a/locale/th/LC_MESSAGES/productivity.po +++ b/locale/th/LC_MESSAGES/productivity.po @@ -5,18 +5,18 @@ # # Translators: # Odoo Thaidev , 2022 -# Wichanon Jamwutthipreecha, 2022 # Martin Trigaux, 2022 # Khwunchai Jaengsawang , 2022 +# Wichanon Jamwutthipreecha, 2022 # #, fuzzy 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: 2021-11-02 08:49+0000\n" -"Last-Translator: Khwunchai Jaengsawang , 2022\n" +"Last-Translator: Wichanon Jamwutthipreecha, 2022\n" "Language-Team: Thai (https://www.transifex.com/odoo/teams/41243/th/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -32,6 +32,128 @@ 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 "ภาพรวม" @@ -1406,12 +1528,12 @@ msgid "" 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 "" @@ -1471,38 +1593,64 @@ msgid "" "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/th/LC_MESSAGES/sales.po b/locale/th/LC_MESSAGES/sales.po index 1e13e7a2a..b20884456 100644 --- a/locale/th/LC_MESSAGES/sales.po +++ b/locale/th/LC_MESSAGES/sales.po @@ -5,17 +5,17 @@ # # Translators: # Odoo Thaidev , 2022 -# Wichanon Jamwutthipreecha, 2022 # Martin Trigaux, 2022 +# Wichanon Jamwutthipreecha, 2022 # #, fuzzy 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: 2021-11-02 08:49+0000\n" -"Last-Translator: Martin Trigaux, 2022\n" +"Last-Translator: Wichanon Jamwutthipreecha, 2022\n" "Language-Team: Thai (https://www.transifex.com/odoo/teams/41243/th/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -67,7 +67,6 @@ msgid "" 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 @@ -76,8 +75,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 @@ -163,113 +163,160 @@ 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 +#: ../../content/applications/sales/crm/acquire_leads/generate_leads.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." +"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 +#: ../../content/applications/sales/crm/acquire_leads/generate_leads.rst:12 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`." +"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 +#: ../../content/applications/sales/crm/acquire_leads/generate_leads.rst:25 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." +"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" -msgstr "" - -#: ../../content/applications/sales/crm/acquire_leads/generate_from_website.rst:12 -msgid "You should first go to your website app." -msgstr "" - -#: ../../content/applications/sales/crm/acquire_leads/generate_from_website.rst:14 -msgid "|image0|\\ |image1|" -msgstr "" - -#: ../../content/applications/sales/crm/acquire_leads/generate_from_website.rst:16 +#: ../../content/applications/sales/crm/acquire_leads/generate_leads.rst:32 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." +"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:23 +#: ../../content/applications/sales/crm/acquire_leads/generate_leads.rst:39 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*." +"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:32 -#: ../../content/applications/sales/crm/acquire_leads/generate_from_website.rst:50 -msgid "Create a custom contact form" -msgstr "" - -#: ../../content/applications/sales/crm/acquire_leads/generate_from_website.rst:34 +#: ../../content/applications/sales/crm/acquire_leads/generate_leads.rst:46 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.)" +"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:43 +#: ../../content/applications/sales/crm/acquire_leads/generate_leads.rst:55 +msgid "Customize Contact Forms" +msgstr "" + +#: ../../content/applications/sales/crm/acquire_leads/generate_leads.rst:57 msgid "" -"You will need to install the free *Form Builder* module, only available in " -"Odoo Enterprise." +"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:52 +#: ../../content/applications/sales/crm/acquire_leads/generate_leads.rst:60 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." +"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:59 +#: ../../content/applications/sales/crm/acquire_leads/generate_leads.rst:68 msgid "" -"By default, any new contact form will send an email. You can switch to " -"lead/opportunity generation in *Change Form Parameters*." +"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:63 +#: ../../content/applications/sales/crm/acquire_leads/generate_leads.rst:73 +msgid "Edit Contact Form fields" +msgstr "" + +#: ../../content/applications/sales/crm/acquire_leads/generate_leads.rst:75 msgid "" -"If the same visitor uses the contact form twice, the second entry will be " -"added to the first lead/opportunity in the chatter." +"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:67 -msgid "Generate leads instead of opportunities" -msgstr "" - -#: ../../content/applications/sales/crm/acquire_leads/generate_from_website.rst:69 +#: ../../content/applications/sales/crm/acquire_leads/generate_leads.rst:78 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`." +":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_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_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_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 @@ -312,7 +359,7 @@ msgstr "" #: ../../content/applications/sales/crm/acquire_leads/lead_mining.rst:34 msgid "" -"When choosing to target Companied and their contacts you can choose the " +"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 " @@ -347,11 +394,11 @@ msgstr "กำหนดราคา" 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 " +" 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 --> In-App Purchases --> View my" -" Services`." +"Credits`; or go to :menuselection:`Settings --> Contacts --> Odoo IAP --> " +"View my Services`." msgstr "" #: ../../content/applications/sales/crm/acquire_leads/lead_mining.rst:65 @@ -863,68 +910,87 @@ 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*." +"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`." +"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 +#: ../../content/applications/sales/crm/pipeline/multi_sales_team.rst:15 msgid "" -"There you can set an email alias to it. Every message sent to that email " -"address will create a lead/opportunity." +"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 +#: ../../content/applications/sales/crm/pipeline/multi_sales_team.rst:19 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." +"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 +#: ../../content/applications/sales/crm/pipeline/multi_sales_team.rst:30 msgid "" -"If you now filter on this specific channel in your pipeline, you will find " -"all of its opportunities." +"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 +#: ../../content/applications/sales/crm/pipeline/multi_sales_team.rst:44 msgid "" -"It is shared with the whole ecosystem so every revenue stream is included in" -" it: Sales, eCommerce, PoS, etc." +"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 @@ -937,94 +1003,90 @@ 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." +"*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." +"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)." +"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 +#: ../../content/applications/sales/crm/track_leads/lead_scoring.rst:24 msgid "" -"You now have a new tab in your *CRM* app called *Leads Management* where you" -" can manage your scoring rules." +"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." +"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 +#: ../../content/applications/sales/crm/track_leads/lead_scoring.rst:32 msgid "" -"Every hour every lead without a score will be automatically scanned and " -"assigned their right score according to your scoring rules." +"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 +#: ../../content/applications/sales/crm/track_leads/lead_scoring.rst:41 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." +"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 +#: ../../content/applications/sales/crm/track_leads/lead_scoring.rst:50 msgid "" -"Further on, you can assign to a specific vendor in the team with an even " -"more refined domain." +"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 +#: ../../content/applications/sales/crm/track_leads/lead_scoring.rst:57 msgid "" -"To do so go to :menuselection:`CRM --> Leads Management --> Leads " -"Assignation`." +"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." +"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 +#: ../../content/applications/sales/crm/track_leads/lead_scoring.rst:72 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." +"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 @@ -1715,32 +1777,31 @@ 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." +"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 +#: ../../content/applications/sales/point_of_sale/overview/epos_ssc.rst:79 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." +"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 " @@ -1772,8 +1833,8 @@ 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*." +" 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 @@ -1991,8 +2052,145 @@ msgstr "" msgid "Payment Terminals" msgstr "" +#: ../../content/applications/sales/point_of_sale/payment/adyen.rst:3 +msgid "Adyen" +msgstr "Adyen" + +#: ../../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 @@ -2039,11 +2237,6 @@ msgid "" "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 " @@ -2058,11 +2251,6 @@ msgid "" "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 " @@ -2098,7 +2286,7 @@ msgid "" 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 @@ -2109,64 +2297,69 @@ 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 +#: ../../content/applications/sales/point_of_sale/payment/six.rst:21 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\"." +"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 +#: ../../content/applications/sales/point_of_sale/payment/six.rst:28 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." +"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 +#: ../../content/applications/sales/point_of_sale/payment/six.rst:39 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." +"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 +#: ../../content/applications/sales/point_of_sale/payment/six.rst:48 msgid "" -"When the payment is done, the status will change to *Payment Successful*. " -"You can always reverse the last transaction by clicking on *Reverse*." +"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 +#: ../../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 *Force Done*. This will allow you to validate the order in" -" Odoo even if the connection between the terminal and Odoo encounters " -"issues." +"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 @@ -2209,8 +2402,8 @@ msgid "" msgstr "" #: ../../content/applications/sales/point_of_sale/payment/worldline.rst:3 -msgid "Connect a Worldline Payment Terminal to the PoS" -msgstr "" +msgid "Worldline" +msgstr "Worldline" #: ../../content/applications/sales/point_of_sale/payment/worldline.rst:9 msgid "Please note that Worldline is currently only available in Belgium." @@ -2765,82 +2958,6 @@ msgid "" "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 "การปัดเศษเงินสด" @@ -3101,6 +3218,147 @@ 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 "เช่า" @@ -3558,12 +3816,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 "" @@ -3640,15 +3900,36 @@ msgstr "" #: ../../content/applications/sales/sales/amazon_connector/manage.rst:45 msgid "" -":doc:`../../../inventory_and_mrp/inventory/shipping/setup/third_party_shipper`" +"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 "" +"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 " @@ -3658,14 +3939,14 @@ msgid "" "under the FBA program." msgstr "" -#: ../../content/applications/sales/sales/amazon_connector/manage.rst:57 +#: ../../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" @@ -3677,24 +3958,24 @@ msgid "" " 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 " @@ -3705,11 +3986,11 @@ msgid "" "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 " @@ -3717,13 +3998,13 @@ msgid "" " 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 " @@ -3733,8 +4014,9 @@ msgid "" "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 "" @@ -3743,118 +4025,49 @@ msgid "Configure Amazon Connector in Odoo" msgstr "" #: ../../content/applications/sales/sales/amazon_connector/setup.rst:6 -msgid "Generate an Authorization Token in Seller Central" +msgid "Register your Amazon account in Odoo" 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." +"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:14 +#: ../../content/applications/sales/sales/amazon_connector/setup.rst:13 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." +"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:19 +#: ../../content/applications/sales/sales/amazon_connector/setup.rst:17 msgid "" -"You might need to use the *main* (or first) administrator account and not " -"one added subsequently." +"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:22 +#: ../../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:23 msgid "" -"In the main menu, select :menuselection:`Apps & Services --> Manage Your " -"Apps`; in the page that displays, click on the ``Authorize new developper`` " -"button:" +"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 "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**." -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 " -"`." -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." -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." -msgstr "" - -#: ../../content/applications/sales/sales/amazon_connector/setup.rst:72 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 " @@ -3862,7 +4075,7 @@ msgid "" " 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, " @@ -3870,7 +4083,7 @@ msgid "" "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 " @@ -3879,7 +4092,7 @@ msgid "" ":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" @@ -3888,7 +4101,7 @@ msgid "" " 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** " @@ -3896,18 +4109,18 @@ msgid "" "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 " @@ -3916,7 +4129,7 @@ msgid "" " 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 " @@ -3924,76 +4137,173 @@ msgid "" "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 +#: ../../content/applications/sales/sales/amazon_connector/setup.rst:78 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." +"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 +#: ../../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." +"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 +#: ../../content/applications/sales/sales/amazon_connector/setup.rst:88 msgid "" -"To add a new marketplace, you must first activate the :ref:`developer mode " -"`." +"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 +#: ../../content/applications/sales/sales/amazon_connector/setup.rst:93 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 " -"`_." +"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 +#: ../../content/applications/sales/sales/amazon_connector/setup.rst:99 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." +"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 +#: ../../content/applications/sales/sales/amazon_connector/setup.rst:104 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." +"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 "account_plaid" @@ -4914,7 +5224,7 @@ msgstr "" 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 " +"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 "" @@ -6087,16 +6397,10 @@ msgid "" 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 " @@ -6105,50 +6409,50 @@ msgid "" "**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/th/LC_MESSAGES/sphinx.po b/locale/th/LC_MESSAGES/sphinx.po index 04a0c8512..794567954 100644 --- a/locale/th/LC_MESSAGES/sphinx.po +++ b/locale/th/LC_MESSAGES/sphinx.po @@ -4,17 +4,17 @@ # FIRST AUTHOR , YEAR. # # Translators: -# Wichanon Jamwutthipreecha, 2022 # Martin Trigaux, 2022 +# Wichanon Jamwutthipreecha, 2022 # #, fuzzy 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: 2022-03-18 15:03+0000\n" -"Last-Translator: Martin Trigaux, 2022\n" +"Last-Translator: Wichanon Jamwutthipreecha, 2022\n" "Language-Team: Thai (https://www.transifex.com/odoo/teams/41243/th/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -34,7 +34,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 "" @@ -144,10 +144,14 @@ msgid "" 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/th/LC_MESSAGES/websites.po b/locale/th/LC_MESSAGES/websites.po index 7d207538d..727af4f18 100644 --- a/locale/th/LC_MESSAGES/websites.po +++ b/locale/th/LC_MESSAGES/websites.po @@ -7,17 +7,17 @@ # Khwunchai Jaengsawang , 2022 # monchai7 , 2022 # Odoo Thaidev , 2022 -# Wichanon Jamwutthipreecha, 2022 # Martin Trigaux, 2022 +# Wichanon Jamwutthipreecha, 2022 # #, fuzzy 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: 2022-03-18 15:03+0000\n" -"Last-Translator: Martin Trigaux, 2022\n" +"Last-Translator: Wichanon Jamwutthipreecha, 2022\n" "Language-Team: Thai (https://www.transifex.com/odoo/teams/41243/th/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -49,11 +49,15 @@ msgid "" 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 `_" @@ -368,76 +372,97 @@ 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:" +"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)." +"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." +":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." -msgstr "" +msgid "Accessory Products" +msgstr "สินค้าเสริม" -#: ../../content/applications/websites/ecommerce/maximizing_revenue/cross_selling.rst:26 +#: ../../content/applications/websites/ecommerce/maximizing_revenue/cross_selling.rst:22 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." +"**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" -msgstr "" - -#: ../../content/applications/websites/ecommerce/maximizing_revenue/cross_selling.rst:33 +#: ../../content/applications/websites/ecommerce/maximizing_revenue/cross_selling.rst:25 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." +"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: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." -msgstr "" +#: ../../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 +#: ../../content/applications/websites/ecommerce/maximizing_revenue/cross_selling.rst:51 msgid "" -"The quantity of optional items added to cart is the same than the main item." +"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 @@ -655,10 +680,6 @@ msgid "" "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 "" @@ -761,7 +782,7 @@ msgstr "" #: ../../content/applications/websites/ecommerce/shopper_experience/payment_acquirer.rst:62 msgid "" ":ref:`Payment Acquirers: Place a hold on a card " -"`" +"`" msgstr "" #: ../../content/applications/websites/ecommerce/shopper_experience/portal.rst:3 @@ -1131,49 +1152,81 @@ 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" @@ -1182,7 +1235,7 @@ msgid "" "'/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 " @@ -1190,18 +1243,18 @@ msgid "" "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 "" @@ -2194,44 +2247,31 @@ 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 " -"`_" +"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, " @@ -2240,22 +2280,22 @@ msgid "" "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" @@ -2263,11 +2303,11 @@ msgid "" "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 " @@ -2275,13 +2315,13 @@ msgid "" "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 " @@ -2289,29 +2329,29 @@ msgid "" "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 " @@ -2568,11 +2608,34 @@ 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 " @@ -2581,11 +2644,11 @@ msgid "" "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 " @@ -2593,93 +2656,93 @@ msgid "" "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 " @@ -2687,46 +2750,46 @@ msgid "" "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 " @@ -2735,41 +2798,41 @@ msgid "" "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 " @@ -2777,11 +2840,11 @@ msgid "" "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 " @@ -2790,39 +2853,39 @@ msgid "" "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 "" @@ -2869,7 +2932,7 @@ msgid "" 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 diff --git a/locale/uk/LC_MESSAGES/administration.po b/locale/uk/LC_MESSAGES/administration.po index a58a123b5..90a8fa7c6 100644 --- a/locale/uk/LC_MESSAGES/administration.po +++ b/locale/uk/LC_MESSAGES/administration.po @@ -12,7 +12,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: 2022-03-18 14:59+0000\n" "Last-Translator: Martin Trigaux, 2022\n" "Language-Team: Ukrainian (https://www.transifex.com/odoo/teams/41243/uk/)\n" @@ -228,9 +228,9 @@ msgid "" 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 "" @@ -1235,7 +1235,7 @@ msgid "" msgstr "" #: ../../content/administration/install/install.rst:90 -#: ../../content/administration/install/install.rst:252 +#: ../../content/administration/install/install.rst:254 msgid "Windows" msgstr "" @@ -1272,7 +1272,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 "" @@ -1288,9 +1288,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 "" @@ -1304,9 +1304,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 " @@ -1450,194 +1450,202 @@ msgid "" "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 +#: ../../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." +"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)" -msgstr "" - -#: ../../content/administration/install/install.rst:292 -#: ../../content/administration/install/install.rst:458 -#: ../../content/administration/install/install.rst:629 +#: ../../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 " +"**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." +"installation. See :ref:`setup/install/editions` to get access to the " +"Enterprise repository." +msgstr "" + +#: ../../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 " @@ -1646,149 +1654,147 @@ msgid "" "**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 " @@ -1796,86 +1802,100 @@ msgid "" "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." @@ -1929,11 +1949,23 @@ msgid "" "``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" @@ -1941,7 +1973,7 @@ msgid "" "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. " @@ -1951,7 +1983,7 @@ msgid "" "``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 " @@ -1959,37 +1991,37 @@ msgid "" " 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 " @@ -1997,25 +2029,25 @@ msgid "" "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 " @@ -2023,15 +2055,15 @@ msgid "" "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 " @@ -2040,88 +2072,88 @@ msgid "" ":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 --> " @@ -2129,29 +2161,29 @@ msgid "" "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 " @@ -2159,7 +2191,7 @@ msgid "" ":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 " @@ -2167,82 +2199,82 @@ msgid "" "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 "" "Нижче наведено кілька спеціальних інструкцій для створення запису CNAME:" -#: ../../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 " @@ -2250,33 +2282,33 @@ msgid "" " 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. " @@ -2284,7 +2316,7 @@ msgid "" "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 " @@ -2292,11 +2324,11 @@ msgid "" "`_ 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, " @@ -2304,7 +2336,7 @@ msgid "" "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 " @@ -2312,135 +2344,135 @@ msgid "" "`_." 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 " @@ -2448,7 +2480,7 @@ msgid "" "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 " @@ -2457,7 +2489,7 @@ msgid "" "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 "" @@ -2585,6 +2617,312 @@ msgid "" "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 "Встановлення в Google" + +#: ../../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 "Налаштування в Odoo" + +#: ../../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 "" @@ -2601,30 +2939,24 @@ 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" @@ -2632,46 +2964,56 @@ msgid "" " 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 +#: ../../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: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 "From on-premises to Odoo.sh" msgstr "" -#: ../../content/administration/maintain/hosting_changes.rst:26 -#: ../../content/administration/maintain/hosting_changes.rst:43 +#: ../../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:27 +#: ../../content/administration/maintain/hosting_changes.rst:30 msgid "...and voilà!" msgstr "" -#: ../../content/administration/maintain/hosting_changes.rst:30 +#: ../../content/administration/maintain/hosting_changes.rst:33 msgid "From Odoo Online to on-premises" msgstr "" -#: ../../content/administration/maintain/hosting_changes.rst:32 -#: ../../content/administration/maintain/hosting_changes.rst:40 +#: ../../content/administration/maintain/hosting_changes.rst:35 +#: ../../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:33 +#: ../../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" @@ -2679,8 +3021,8 @@ msgid "" "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 +#: ../../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" @@ -2688,16 +3030,16 @@ msgid "" "`_)" msgstr "" -#: ../../content/administration/maintain/hosting_changes.rst:35 -#: ../../content/administration/maintain/hosting_changes.rst:60 +#: ../../content/administration/maintain/hosting_changes.rst:38 +#: ../../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:38 +#: ../../content/administration/maintain/hosting_changes.rst:41 msgid "From Odoo Online to Odoo.sh" msgstr "" -#: ../../content/administration/maintain/hosting_changes.rst:41 +#: ../../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 " @@ -2705,28 +3047,99 @@ msgid "" "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)." +"`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 " "`." @@ -3099,6 +3512,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 "Оновлення" @@ -3216,7 +3630,7 @@ msgid "" 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 "Видалити" @@ -3562,21 +3976,21 @@ 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 `_." @@ -3838,6 +4252,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 "Загальний огляд" @@ -3998,7 +4413,7 @@ msgstr "" #: ../../content/administration/odoo_sh/advanced/containers.rst:169 msgid "" "More options are available and detailed in the :doc:`CLI documentation " -"`." +"`." msgstr "" #: ../../content/administration/odoo_sh/advanced/containers.rst:172 @@ -4382,7 +4797,7 @@ msgstr "" 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 @@ -4828,7 +5243,15 @@ msgid "" "gettingstarted-builds>`." 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 @@ -4836,17 +5259,17 @@ 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 " @@ -4859,48 +5282,48 @@ msgid "" "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 " @@ -4908,31 +5331,31 @@ msgid "" "`." 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" @@ -4940,75 +5363,75 @@ msgid "" "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 " @@ -5020,11 +5443,11 @@ msgid "" " 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 " @@ -5032,18 +5455,18 @@ msgid "" "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 " @@ -5054,23 +5477,23 @@ msgid "" "`." 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 " @@ -5078,178 +5501,178 @@ msgid "" "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 "" @@ -5888,9 +6311,9 @@ msgstr "" #: ../../content/administration/odoo_sh/getting_started/first_module.rst:97 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." +":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 @@ -6382,69 +6805,69 @@ 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 " @@ -6454,62 +6877,62 @@ msgid "" "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 " @@ -6524,7 +6947,7 @@ msgid "" "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 " @@ -6532,7 +6955,7 @@ msgid "" "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." @@ -6541,11 +6964,11 @@ msgid "" " 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 " @@ -6556,20 +6979,20 @@ msgid "" " 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 " @@ -6578,13 +7001,13 @@ msgid "" "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 " @@ -6592,7 +7015,7 @@ msgid "" "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." @@ -6954,7 +7377,6 @@ msgid "|assistance-contact|" msgstr "" #: ../../content/administration/upgrade.rst:32 -#: ../../content/administration/upgrade/odoo_sh.rst:66 msgid ":ref:`upgrade/sla`" msgstr "" @@ -7724,122 +8146,195 @@ msgid "" "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 +#: ../../content/administration/upgrade/odoo_sh.rst:13 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*." +"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." +"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 +#: ../../content/administration/upgrade/odoo_sh.rst:24 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." +"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 ":doc:`../../administration/upgrade`" +msgstr "" + +#: ../../content/administration/upgrade/odoo_sh.rst:30 +msgid ":doc:`Upgrade FAQ <../upgrade/faq>`" +msgstr "" + +#: ../../content/administration/upgrade/odoo_sh.rst:31 +msgid ":doc:`Introduction to Odoo.sh <../odoo_sh/overview/introduction>`" +msgstr "" + +#: ../../content/administration/upgrade/odoo_sh.rst:36 +msgid "Upgrade your custom modules" +msgstr "" + +#: ../../content/administration/upgrade/odoo_sh.rst:38 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." -msgstr "" - -#: ../../content/administration/upgrade/odoo_sh.rst:32 -msgid "" -"Test the upgraded database and make sure everything runs as it's supposed " -"to." -msgstr "" - -#: ../../content/administration/upgrade/odoo_sh.rst:35 -#: ../../content/administration/upgrade/on_premise.rst:41 -msgid "Upgrade your production database" -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:" -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." +"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." +"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." -msgstr "" - -#: ../../content/administration/upgrade/odoo_sh.rst:58 -#: ../../content/administration/upgrade/on_premise.rst:53 +#: ../../content/administration/upgrade/odoo_sh.rst:62 msgid "" -"Your custom modules also need to be upgraded to keep them compatible with " -"the new version." +"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:60 +#: ../../content/administration/upgrade/odoo_sh.rst:66 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')" +"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: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 @@ -7907,6 +8402,10 @@ msgid "" "`_." 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" @@ -7914,12 +8413,26 @@ msgid "" "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" diff --git a/locale/uk/LC_MESSAGES/finance.po b/locale/uk/LC_MESSAGES/finance.po index c9245d0a5..cbe754c7d 100644 --- a/locale/uk/LC_MESSAGES/finance.po +++ b/locale/uk/LC_MESSAGES/finance.po @@ -14,7 +14,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: 2021-11-02 08:47+0000\n" "Last-Translator: Martin Trigaux, 2022\n" "Language-Team: Ukrainian (https://www.transifex.com/odoo/teams/41243/uk/)\n" @@ -48,29 +48,23 @@ 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" -msgstr "Банк та готівка" +msgid "Bank and cash" +msgstr "" #: ../../content/applications/finance/accounting/bank/feeds.rst:5 -msgid "Bank Feeds" -msgstr "Банківські виписки" +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 @@ -202,7 +196,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 @@ -243,6 +237,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 @@ -250,6 +248,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 @@ -269,6 +268,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 @@ -277,6 +277,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 @@ -287,7 +288,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 @@ -298,11 +299,11 @@ 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 " @@ -311,34 +312,34 @@ msgid "" "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" @@ -349,38 +350,38 @@ msgid "" "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" @@ -390,15 +391,15 @@ msgid "" "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 --> " @@ -406,40 +407,40 @@ msgid "" "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: " @@ -447,13 +448,13 @@ msgid "" "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 " @@ -462,29 +463,29 @@ msgid "" "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 "FAQ" -#: ../../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 " @@ -496,7 +497,7 @@ msgid "" "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" @@ -504,32 +505,32 @@ msgid "" "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 " @@ -539,11 +540,11 @@ msgid "" " 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," @@ -551,21 +552,21 @@ msgid "" "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 " @@ -574,40 +575,40 @@ msgid "" "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 "" @@ -1141,11 +1142,8 @@ 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" -msgstr "Узгодження банківських виписок" +msgid "Bank reconciliation" +msgstr "" #: ../../content/applications/finance/accounting/bank/reconciliation/reconciliation_models.rst:3 msgid "Reconciliation Models" @@ -1252,7 +1250,7 @@ msgid "" 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 "Тип" @@ -1982,8 +1980,87 @@ 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 @@ -1991,7 +2068,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 "Аргентина" @@ -2874,7 +2950,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 "Рахунки постачальників" @@ -4057,7 +4132,6 @@ msgid "" 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 "Колумбія" @@ -5418,6 +5492,450 @@ msgid "" "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 "ID клієнта" + +#: ../../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 "Франція" @@ -5529,10 +6047,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" @@ -6017,10 +6531,6 @@ msgid "" "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 "Код" @@ -6751,7 +7261,7 @@ msgid "" msgstr "" #: ../../content/applications/finance/accounting/fiscal_localizations/localizations/germany.rst:3 -#: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:52 +#: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:34 msgid "Germany" msgstr "Німеччина" @@ -6799,7 +7309,7 @@ msgstr "" #: ../../content/applications/finance/accounting/fiscal_localizations/localizations/germany.rst:23 #: ../../content/applications/finance/accounting/fiscal_localizations/localizations/spain.rst:27 -#: ../../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 #: ../../content/applications/finance/accounting/reporting/overview/main_reports.rst:29 msgid "Balance Sheet" msgstr "Звіт балансу" @@ -6807,7 +7317,7 @@ msgstr "Звіт балансу" #: ../../content/applications/finance/accounting/fiscal_localizations/localizations/germany.rst:24 #: ../../content/applications/finance/accounting/fiscal_localizations/localizations/netherlands.rst:19 #: ../../content/applications/finance/accounting/getting_started/initial_configuration/chart_of_accounts.rst:17 -#: ../../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 msgid "Profit & Loss" msgstr "Доходи та витрати" @@ -7551,7 +8061,6 @@ msgid "" msgstr "" #: ../../content/applications/finance/accounting/fiscal_localizations/localizations/italy.rst:3 -#: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:71 msgid "Italy" msgstr "Італія" @@ -8384,11 +8893,11 @@ msgid "" msgstr "" #: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:244 -msgid ":download:`Certificate `" +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 @@ -8604,10 +9113,6 @@ msgid "" "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 " @@ -8801,7 +9306,7 @@ msgid "" 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." @@ -8834,200 +9339,215 @@ msgid "" 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 " @@ -9036,22 +9556,22 @@ msgid "" "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" @@ -9061,27 +9581,27 @@ msgid "" " 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 " @@ -9089,56 +9609,56 @@ msgid "" "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" @@ -9146,21 +9666,21 @@ msgid "" "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" @@ -9168,7 +9688,7 @@ msgid "" " 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 " @@ -9176,33 +9696,33 @@ msgid "" "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." @@ -9211,108 +9731,108 @@ msgid "" "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 " @@ -9320,57 +9840,57 @@ msgid "" "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 "Звіт DIOT." -#: ../../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 " @@ -9380,11 +9900,11 @@ msgid "" "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 " "`_" @@ -9392,7 +9912,7 @@ msgid "" "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" @@ -9400,11 +9920,11 @@ msgid "" "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 " @@ -9413,27 +9933,27 @@ msgid "" "(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 "Звіт DIOT (вимагає застосування бухгалтерського обліку)" -#: ../../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 " @@ -9441,25 +9961,25 @@ msgid "" "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 " @@ -9467,24 +9987,24 @@ msgid "" "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 " @@ -9494,18 +10014,18 @@ msgid "" "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 " @@ -9515,7 +10035,7 @@ msgid "" "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 " @@ -9523,43 +10043,43 @@ msgid "" "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 " @@ -9568,34 +10088,34 @@ msgid "" "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" @@ -9605,74 +10125,74 @@ msgid "" "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 " @@ -9681,45 +10201,45 @@ msgid "" " 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" @@ -9728,11 +10248,11 @@ msgid "" "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 " @@ -9740,7 +10260,7 @@ msgid "" "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 " @@ -9749,21 +10269,21 @@ msgid "" "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 " @@ -9771,11 +10291,11 @@ msgid "" "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 " @@ -9784,26 +10304,26 @@ msgid "" "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." @@ -9812,11 +10332,11 @@ msgid "" " 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)" @@ -9824,7 +10344,7 @@ msgstr "" "Увімкнення явних помилок на CFDI за допомогою локального валідатора XSD " "(CFDI 3.3)." -#: ../../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 " @@ -9832,22 +10352,22 @@ msgid "" " :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 "" "Перейдіть до :menuselection:`Налаштування --> Технічний --> Дії --> Дії " "сервера`" -#: ../../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 "Шукайте дію під назвою \"Завантажити файли XSD до CFDI\"" -#: ../../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`" @@ -9855,15 +10375,15 @@ msgstr "" "Перейдіть до форми компанії :menuselection:`Налаштування --> Користувачі та " "компанії --> Компанії`" -#: ../../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 "Натисніть \"Дія\", а потім \"Завантажити файл XSD в CFDI\"." -#: ../../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 " @@ -9873,7 +10393,7 @@ 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 "Якщо ви бачите помилку, подібну до цієї:" @@ -9888,30 +10408,30 @@ msgid "" "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': " @@ -9919,7 +10439,7 @@ msgid "" "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': " @@ -9927,36 +10447,36 @@ msgid "" "'[^|]{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" @@ -9966,25 +10486,25 @@ msgid "" "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 " @@ -9993,19 +10513,19 @@ msgid "" "'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': '' " @@ -10013,14 +10533,14 @@ msgid "" "'{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 " @@ -10029,27 +10549,27 @@ msgid "" " 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" @@ -10066,7 +10586,7 @@ msgid "" "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 "" @@ -10081,44 +10601,44 @@ msgid "" "'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 " @@ -10126,7 +10646,7 @@ msgid "" " 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 " @@ -10135,7 +10655,6 @@ msgid "" 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 "Нідерланди" @@ -10178,7 +10697,6 @@ msgid "Intrastat Report (ICP)" msgstr "Звіт Intrastat (ICP)" #: ../../content/applications/finance/accounting/fiscal_localizations/localizations/peru.rst:3 -#: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:105 msgid "Peru" msgstr "Перу" @@ -11406,7 +11924,7 @@ 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 @@ -11468,11 +11986,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-" @@ -11491,379 +12004,295 @@ msgid "" 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" -msgstr "Аргентинський бухоблік" +#: ../../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" -msgstr "Китай - Дані міста" - -#: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:30 -msgid "China - Small Business CoA" -msgstr "Китай - CoA для малого бізнесу" - -#: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:31 -msgid "China - Standard CoA" -msgstr "Китай - Стандартний CoA" - -#: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:35 -msgid "Colombian - Accounting" +#: ../../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: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 "Хорватія - Бухоблік (RRIF 2012)" -#: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:40 -msgid "Denmark" -msgstr "Данія" +#: ../../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" -msgstr "Еквадор - Бухоблік" +#: ../../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 "EU Mini One Stop Shop (MOSS)" - -#: ../../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 "Німеччина SKR03 - Бухоблік" -#: ../../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 "Німеччина SKR04 - Бухоблік" -#: ../../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 "База локалізації LATAM" - -#: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:80 -msgid "LATAM Document" -msgstr "Документ LATAM" - -#: ../../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 "LT - Бухгалтерські звіти" - -#: ../../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 "OHADA - Бухоблік" -#: ../../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 "Пакистан - AccountingБухоблік" + +#: ../../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" -msgstr "" +#: ../../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 "Іспанія - Бухоблік (PGCE 2008)" -#: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:119 -msgid "Sweden" -msgstr "Швеція" - -#: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:121 -msgid "Sweden - Structured Communication OCR" -msgstr "Швеція - Структурована комунікація OCR" - -#: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:122 -msgid "Swedish - Accounting" +#: ../../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: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" -msgstr "Уругвай - план рахунків" +#: ../../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" -msgstr "Розпочніть" +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 @@ -11889,30 +12318,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 "Витрати" @@ -11957,116 +12386,116 @@ msgid "" "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 " @@ -12074,69 +12503,68 @@ msgid "" "` 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 " @@ -12144,61 +12572,61 @@ msgid "" "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 @@ -13078,6 +13506,12 @@ msgstr "50" 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 " @@ -14228,7 +14662,7 @@ 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 " @@ -14240,11 +14674,11 @@ 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 " @@ -14254,7 +14688,7 @@ msgstr "" "оберіть :menuselection:`Налаштування --> Налаштування` та розгорніть розділ" " Аналітичний бухоблік." -#: ../../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." @@ -14262,15 +14696,15 @@ 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 " @@ -14283,16 +14717,16 @@ msgstr "" " У цьому випадку ми називаємо це \"пакет консультацій\" для нашого клієнта " "Smith&Co." -#: ../../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." @@ -14300,11 +14734,11 @@ 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 " @@ -14316,11 +14750,11 @@ msgstr "" "новий товар під назвою квиток на потяг і встановіть собівартість до 15,50 " "євро. Переконайтеся, що позначено рядок **Може бути витрачений**." -#: ../../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 " @@ -14330,7 +14764,7 @@ 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." @@ -14338,15 +14772,15 @@ 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 " @@ -14359,7 +14793,7 @@ 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 " @@ -14369,11 +14803,11 @@ 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 " @@ -14386,16 +14820,16 @@ 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 "" "Ви також можете відстежувати вартість з табелем, дивіться: :doc:`timesheets`" -#: ../../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." @@ -14403,7 +14837,7 @@ 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`." @@ -14412,7 +14846,7 @@ msgstr "" ":menuselection:`Консультант --> Аналітичний бухоблік --> Відкрити плани " "рахунків`." -#: ../../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." @@ -14420,7 +14854,7 @@ msgstr "" "Виберіть \"пакет консультацій - Smith\" і натисніть кнопку Вартість і дохід," " щоби переглянути всі витрати, пов'язані з обліком." -#: ../../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 " @@ -15916,10 +16350,10 @@ msgid "" 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 " @@ -16150,6 +16584,10 @@ msgid "" "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 "" @@ -16297,8 +16735,8 @@ msgid ":doc:`how_it_works`" msgstr ":doc:`how_it_works`" #: ../../content/applications/finance/accounting/payables.rst:5 -msgid "Account Payables" -msgstr "Облікові платежі" +msgid "Account payables" +msgstr "" #: ../../content/applications/finance/accounting/payables/misc/forecast.rst:3 msgid "Forecast future bills to pay" @@ -16431,12 +16869,12 @@ msgstr "" "групи функції \"Термін виконання\"." #: ../../content/applications/finance/accounting/payables/pay.rst:5 -msgid "Vendor Payments" -msgstr "Платежі постачальника" +msgid "Vendor payments" +msgstr "" #: ../../content/applications/finance/accounting/payables/pay/check.rst:3 -msgid "Pay by Checks" -msgstr "Оплачуйте чеками" +msgid "Pay by checks" +msgstr "" #: ../../content/applications/finance/accounting/payables/pay/check.rst:5 msgid "" @@ -17130,8 +17568,12 @@ msgstr "" msgid ":doc:`check`" msgstr ":doc:`check`" +#: ../../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 @@ -17525,7 +17967,7 @@ msgid "" 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 @@ -17741,8 +18183,156 @@ msgid "" "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 @@ -18179,100 +18769,9 @@ 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 "" -"Якщо ви на Odoo Online (SAAS) і у вас версія Enterprise, для тестування " -"функції ви користуєтесь безкоштовними пробними кредитами." - -#: ../../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" -msgstr "Товарні чеки" +msgid "Purchase receipts" +msgstr "" #: ../../content/applications/finance/accounting/payables/supplier_bills/purchase_receipts.rst:5 msgid "" @@ -18337,13 +18836,12 @@ msgid ":doc:`/applications/finance/expenses`" msgstr "" #: ../../content/applications/finance/accounting/receivables.rst:5 -msgid "Account Receivables" -msgstr "Розрахунок з дебіторами" +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" -msgstr "Рахунки клієнта" +msgid "Customer invoices" +msgstr "" #: ../../content/applications/finance/accounting/receivables/customer_invoices/cash_discounts.rst:3 msgid "Offer cash discounts" @@ -18451,7 +18949,7 @@ msgid ":doc:`../../receivables/customer_invoices/payment_terms`" msgstr ":doc:`../../receivables/customer_invoices/payment_terms`" #: ../../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 @@ -18511,8 +19009,8 @@ msgid "" msgstr "" #: ../../content/applications/finance/accounting/receivables/customer_invoices/credit_notes.rst:3 -msgid "Credit Notes and Refunds" -msgstr "Сторно та відшкодування" +msgid "Credit notes and refunds" +msgstr "" #: ../../content/applications/finance/accounting/receivables/customer_invoices/credit_notes.rst:4 msgid "" @@ -18699,8 +19197,8 @@ msgstr "" "фактуру вище:" #: ../../content/applications/finance/accounting/receivables/customer_invoices/deferred_revenues.rst:3 -msgid "Deferred Revenues" -msgstr "Доходи майбутніх періодів" +msgid "Deferred revenues" +msgstr "" #: ../../content/applications/finance/accounting/receivables/customer_invoices/deferred_revenues.rst:5 msgid "" @@ -19349,8 +19847,26 @@ msgid "" "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 @@ -19600,56 +20116,56 @@ msgid "" "`_" 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 " @@ -19658,16 +20174,24 @@ 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 "" +"Якщо ви на Odoo Online (SAAS) і у вас версія Enterprise, для тестування " +"функції ви користуєтесь безкоштовними пробними кредитами." + +#: ../../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" -msgstr "Платежі клієнта" +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 @@ -19799,8 +20323,8 @@ msgid ":doc:`batch_sdd`" msgstr "" #: ../../content/applications/finance/accounting/receivables/customer_payments/batch_sdd.rst:3 -msgid "Batch Payments: SEPA Direct Debit (SDD)" -msgstr "Групові платежі: Прямий дебет SEPA (SDD)" +msgid "Batch payments: SEPA Direct Debit (SDD)" +msgstr "" #: ../../content/applications/finance/accounting/receivables/customer_payments/batch_sdd.rst:5 msgid "" @@ -19944,6 +20468,10 @@ msgstr "" msgid "Get paid with SDD Batch Payments" msgstr "Отримуйте платежі з Груповими платежами SDD" +#: ../../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 " @@ -20275,135 +20803,145 @@ msgstr "" " рахунку)." #: ../../content/applications/finance/accounting/receivables/customer_payments/followup.rst:3 -msgid "Follow-up on invoices and get paid faster" -msgstr "Нагадуйте про рахунки та отримуйте оплату швидше" +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." +"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 "" -"Важливо, щоби ваша компанія отримувала платежі, коли вони протерміновані. " -"Odoo допоможе вам визначити платежі, які затримуються, і дозволить вам " -"надсилати відповідні нагадування." -#: ../../content/applications/finance/accounting/receivables/customer_payments/followup.rst:10 -msgid "Manage your follow-ups" -msgstr "Керування вашими нагадуваннями" - -#: ../../content/applications/finance/accounting/receivables/customer_payments/followup.rst:13 +#: ../../content/applications/finance/accounting/receivables/customer_payments/followup.rst:11 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." +"`Odoo Tutorials: Payment Follow-up " +"`_" msgstr "" -"Ми рекомендуємо узгодити виписки з банку перед запуском процесу подальших " -"дій. Це дозволить уникнути труднощів при надсиланні виписки клієнту, який " -"вже заплатив вам." -#: ../../content/applications/finance/accounting/receivables/customer_payments/followup.rst:17 +#: ../../content/applications/finance/accounting/receivables/customer_payments/followup.rst:16 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." +"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 "" -"Протерміновані рахунки-фактури, які потрібно оплатити, доступні за " -"замовчуванням у :menuselection:`Бухобліку --> Продажі --> Звіти про " -"нагадування`. Там ви можете легко надіслати нагадування електронною поштою " -"або роздрукувати його як лист. Після цього можна натиснути кнопку *Готово*, " -"щоби переглянути нагадування, які потребують вашої уваги." + +#: ../../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 "" -"Щоб уникнути частих надсилань нагадувань за короткий проміжок часу, змініть " -"кількість днів, обчислених між кожним звітом, перейшовши до меню " -":menuselection:`Бухоблік --> Налаштування --> Налаштування --> Платіжне " -"нагадування`." #: ../../content/applications/finance/accounting/receivables/customer_payments/followup.rst:33 +msgid "Follow-up reports" +msgstr "Звіти нагадування" + +#: ../../content/applications/finance/accounting/receivables/customer_payments/followup.rst:35 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." +"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:40 -msgid "Send reminders in batch" -msgstr "Надсилання групових нагадувань" - -#: ../../content/applications/finance/accounting/receivables/customer_payments/followup.rst:42 +#: ../../content/applications/finance/accounting/receivables/customer_payments/followup.rst:39 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." +"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 "" -"Щоби полегшити процес відстеження, ви можете надіслати електронні листи з " -"нагадуванням групою зі сторінки звітів про нагадування. Виберіть усі звіти, " -"які потрібно обробити, натисніть *Дія*, а потім *Виконати нагадування*. " -"Також буде автоматично створено PDF-документ, що містить всі листи, які ви " -"можете надрукувати." -#: ../../content/applications/finance/accounting/receivables/customer_payments/followup.rst:52 -msgid "Plan a follow-up process" -msgstr "Планування нагадувань" - -#: ../../content/applications/finance/accounting/receivables/customer_payments/followup.rst:54 +#: ../../content/applications/finance/accounting/receivables/customer_payments/followup.rst:43 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." +"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 "" -"Щоби спланувати нагадування, перейдіть до меню :menuselection:`Бухоблік --> " -"Налаштування --> Налаштування` та активуйте функцію *Рівні нагадувань* в " -"розділі *Платежі клієнтів*. Потім натисніть кнопку *Рівні нагадувань*, яка " -"з'явилася на сторінці налаштувань." -#: ../../content/applications/finance/accounting/receivables/customer_payments/followup.rst:59 +#: ../../content/applications/finance/accounting/receivables/customer_payments/followup.rst:48 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." +"The contact information available on the invoice or on the contact form is " +"used to send the reminder." msgstr "" -"За замовчуванням в Odoo доступний план нагадувань з кількома діями, але ви " -"можете налаштувати його так, як хочете. Залежно від певної кількості " -"протермінованих днів плануємо надіслати електронний лист, лист або здійснити" -" ручну дію. Ви також можете редагувати шаблон, який використовується для " -"виписки відповідно до етапу процесу." -#: ../../content/applications/finance/accounting/receivables/customer_payments/followup.rst:69 +#: ../../content/applications/finance/accounting/receivables/customer_payments/followup.rst:50 msgid "" -"If you would like to get a reminder before the actual due date, set a " -"negative number of due days." +"When the reminder is sent, it is documented in the chatter of the invoice." +msgstr "" + +#: ../../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" -msgstr "Виставити рахунок на онлайн-оплату" +msgid "Invoice online payment" +msgstr "" #: ../../content/applications/finance/accounting/receivables/customer_payments/online_payment.rst:5 msgid "" @@ -20723,7 +21261,7 @@ msgid "" 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 @@ -21356,8 +21894,8 @@ msgid "Taxation" msgstr "" #: ../../content/applications/finance/accounting/taxation/fiscal_year.rst:5 -msgid "Fiscal Year" -msgstr "Звітний період" +msgid "Fiscal year" +msgstr "" #: ../../content/applications/finance/accounting/taxation/fiscal_year/close_fiscal_year.rst:3 msgid "Do a year end in Odoo (close a fiscal year)" @@ -21923,6 +22461,94 @@ 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 "" @@ -22061,6 +22687,10 @@ 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 " @@ -22107,15 +22737,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 @@ -22211,7 +22834,7 @@ msgid "" 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 @@ -23801,93 +24424,99 @@ 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 "Платіж з Odoo" -#: ../../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" -msgstr "Перенаправлення на веб-сайт покупця" +#: ../../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 "PayU Latam" -#: ../../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 " @@ -23897,7 +24526,7 @@ msgid "" "accounting control process." msgstr "" -#: ../../content/applications/finance/payment_acquirers.rst:105 +#: ../../content/applications/finance/payment_acquirers.rst:133 msgid "Bank payments" msgstr "" @@ -23924,95 +24553,58 @@ msgid "" "information about this payment method." msgstr "" -#: ../../content/applications/finance/payment_acquirers.rst:121 +#: ../../content/applications/finance/payment_acquirers.rst:146 +msgid "Additional features" +msgstr "" + +#: ../../content/applications/finance/payment_acquirers.rst:148 msgid "" -"Each acquirer has its specific configuration flow, depending on :ref:`which " -"feature is available `." +"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:127 -msgid "Add a new payment acquirer" +#: ../../content/applications/finance/payment_acquirers.rst:155 +msgid "Save cards for later" msgstr "" -#: ../../content/applications/finance/payment_acquirers.rst:129 +#: ../../content/applications/finance/payment_acquirers.rst:157 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*." +"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:139 +#: ../../content/applications/finance/payment_acquirers.rst:162 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." +"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: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" -msgstr "" - -#: ../../content/applications/finance/payment_acquirers.rst:149 +#: ../../content/applications/finance/payment_acquirers.rst:166 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." +"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 +#: ../../content/applications/finance/payment_acquirers.rst:173 +msgid "Manual capture" +msgstr "" + +#: ../../content/applications/finance/payment_acquirers.rst:175 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: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:" +"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 @@ -24029,56 +24621,170 @@ msgstr "" #: ../../content/applications/finance/payment_acquirers.rst:185 msgid "" -"Avoid potentially high credit card fees in the event of overselling or " -"cancelled orders." +"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." +"Hold a security deposit to return later, minus any deductions (e.g., after a" +" damage)." msgstr "" -#: ../../content/applications/finance/payment_acquirers.rst:195 +#: ../../content/applications/finance/payment_acquirers.rst:189 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." +"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." +"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 "Refunds" +msgstr "Відшкодування" + +#: ../../content/applications/finance/payment_acquirers.rst:212 +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: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: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:230 +msgid "" +"Each acquirer has its specific configuration flow, depending on :ref:`which " +"feature is available `." +msgstr "" + +#: ../../content/applications/finance/payment_acquirers.rst:236 +msgid "Add a new payment acquirer" +msgstr "" + +#: ../../content/applications/finance/payment_acquirers.rst:238 +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 "" +"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 +#: ../../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:212 +#: ../../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:218 +#: ../../content/applications/finance/payment_acquirers.rst:285 msgid "Payment journal" msgstr "" -#: ../../content/applications/finance/payment_acquirers.rst:220 +#: ../../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:225 +#: ../../content/applications/finance/payment_acquirers.rst:292 msgid "Accounting perspective" msgstr "" -#: ../../content/applications/finance/payment_acquirers.rst:227 +#: ../../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 " @@ -24087,78 +24793,78 @@ msgid "" "advice." msgstr "" -#: ../../content/applications/finance/payment_acquirers.rst:232 +#: ../../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:235 +#: ../../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:237 +#: ../../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:238 +#: ../../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:244 +#: ../../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:248 +#: ../../content/applications/finance/payment_acquirers.rst:315 msgid ":doc:`payment_acquirers/wire_transfer`" msgstr "" -#: ../../content/applications/finance/payment_acquirers.rst:249 +#: ../../content/applications/finance/payment_acquirers.rst:316 msgid ":doc:`payment_acquirers/adyen`" msgstr "" -#: ../../content/applications/finance/payment_acquirers.rst:250 +#: ../../content/applications/finance/payment_acquirers.rst:317 msgid ":doc:`payment_acquirers/alipay`" msgstr "" -#: ../../content/applications/finance/payment_acquirers.rst:251 +#: ../../content/applications/finance/payment_acquirers.rst:318 msgid ":doc:`payment_acquirers/authorize`" msgstr "" -#: ../../content/applications/finance/payment_acquirers.rst:252 +#: ../../content/applications/finance/payment_acquirers.rst:319 msgid ":doc:`payment_acquirers/buckaroo`" msgstr "" -#: ../../content/applications/finance/payment_acquirers.rst:253 +#: ../../content/applications/finance/payment_acquirers.rst:320 msgid ":doc:`payment_acquirers/mollie`" msgstr "" -#: ../../content/applications/finance/payment_acquirers.rst:254 +#: ../../content/applications/finance/payment_acquirers.rst:321 msgid ":doc:`payment_acquirers/ogone`" msgstr "" -#: ../../content/applications/finance/payment_acquirers.rst:255 +#: ../../content/applications/finance/payment_acquirers.rst:322 msgid ":doc:`payment_acquirers/paypal`" msgstr "" -#: ../../content/applications/finance/payment_acquirers.rst:256 +#: ../../content/applications/finance/payment_acquirers.rst:323 msgid ":doc:`payment_acquirers/sips`" msgstr "" -#: ../../content/applications/finance/payment_acquirers.rst:257 +#: ../../content/applications/finance/payment_acquirers.rst:324 msgid ":doc:`payment_acquirers/stripe`" msgstr "" -#: ../../content/applications/finance/payment_acquirers.rst:258 +#: ../../content/applications/finance/payment_acquirers.rst:325 msgid ":doc:`../websites/ecommerce/shopper_experience/payment_acquirer`" msgstr "" @@ -24168,8 +24874,8 @@ msgstr "Adyen" #: ../../content/applications/finance/payment_acquirers/adyen.rst:5 msgid "" -"`Adyen `_ is a Dutch-based company that offers " -"several online payment possibilities." +"`Adyen `_ is a Dutch company that offers several " +"online payment possibilities." msgstr "" #: ../../content/applications/finance/payment_acquirers/adyen.rst:12 @@ -24231,37 +24937,39 @@ 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" +"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 "API Key and Client Key" +msgstr "" + +#: ../../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:`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." +"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:45 +#: ../../content/applications/finance/payment_acquirers/adyen.rst:48 msgid "" -"This is also the place where you'll :ref:`allow payments to be made from " -"your website `." +"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:51 +#: ../../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 " @@ -24269,54 +24977,55 @@ msgid "" "notification`." msgstr "" -#: ../../content/applications/finance/payment_acquirers/adyen.rst:61 +#: ../../content/applications/finance/payment_acquirers/adyen.rst:65 msgid "" -"There, in :menuselection:`Transport --> URL`, enter your server address " -"followed by `/payment/adyen/notification`." +"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 +#: ../../content/applications/finance/payment_acquirers/adyen.rst:72 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." +"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 +#: ../../content/applications/finance/payment_acquirers/adyen.rst:86 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**." +":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 "Обліковий запис Adyen" -#: ../../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 +#: ../../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:`Allowed Origins`, then add the URLs from where payments will" -" be made (the URLs of the servers hosting your Odoo instances)." +":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 @@ -24429,18 +25138,30 @@ 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." +"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 +#: ../../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: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." +"`. 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:44 +#: ../../content/applications/finance/payment_acquirers/authorize.rst:50 msgid "" "After **30 days**, the transaction is **voided automatically** by " "Authorize.net." @@ -24560,10 +25281,6 @@ msgid "" "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, " diff --git a/locale/uk/LC_MESSAGES/general.po b/locale/uk/LC_MESSAGES/general.po index 5cce7586b..856a6edff 100644 --- a/locale/uk/LC_MESSAGES/general.po +++ b/locale/uk/LC_MESSAGES/general.po @@ -12,7 +12,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: 2021-11-02 08:47+0000\n" "Last-Translator: Martin Trigaux, 2022\n" "Language-Team: Ukrainian (https://www.transifex.com/odoo/teams/41243/uk/)\n" @@ -551,129 +551,173 @@ msgstr "Синхронізація Google Календаря з Odoo" #: ../../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)." +"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 "" -"Odoo ідеально інтегрований з Google Calendar, щоб ви могли бачити і керувати" -" своїми зустрічами з обох платформ (оновлення відбуваються в обох " -"напрямках)." -#: ../../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 "Встановлення в Google" -#: ../../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 "" -"Перейдіть до `Платформи Google API " -"`__, щоб створити повноваження Google" -" Календар API. Зайдіть через ваш акаунт Google." #: ../../content/applications/general/calendars/google/google_calendar_credentials.rst:14 -msgid "Go to the API & Services page." -msgstr "Перейдіть до сторінки API та Послуги." - -#: ../../content/applications/general/calendars/google/google_calendar_credentials.rst:19 -msgid "Search for *Google Calendar API* and select it." -msgstr "Знайдіть*Google Calendar API* і виберіть його." - -#: ../../content/applications/general/calendars/google/google_calendar_credentials.rst:27 -msgid "Enable the API." -msgstr "Увімкніть API." - -#: ../../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)." +"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 "" -"Виберіть або створіть проект API для зберігання облікових даних, якщо це ще " -"не було зроблено раніше. Дайте їй конкретне ім'я (наприклад, Odoo Sync)." -#: ../../content/applications/general/calendars/google/google_calendar_credentials.rst:35 -msgid "Create credentials." -msgstr "Створіть облікові дані." - -#: ../../content/applications/general/calendars/google/google_calendar_credentials.rst:40 +#: ../../content/applications/general/calendars/google/google_calendar_credentials.rst:18 msgid "" -"Select *Web browser (Javascript)* as calling source and *User data* as kind " -"of data." +"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 "" -"Виберіть *веб-браузер (Javascript)* як джерело дзвінків та *дані " -"користувача* як види даних." -#: ../../content/applications/general/calendars/google/google_calendar_credentials.rst:46 +#: ../../content/applications/general/calendars/google/google_calendar_credentials.rst:22 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'." +"Next, click :guilabel:`Select a project` and select or create an API project" +" to store credentials." msgstr "" -"Тоді ви можете створити ідентифікатор клієнта. Введіть назву модуля " -"(наприклад, Odoo Calendar) і дозволені сторінки, на які буде відбуватися " -"перенаправлення. *Авторизоване джерело JavaScript* - це ваш приклад URL-" -"адреси Odoo. *Авторизована URI перенаправлення* - це ваш приклад URL-адреси " -"Odoo, а потім -'/google_account/authentication'." -#: ../../content/applications/general/calendars/google/google_calendar_credentials.rst:55 +#: ../../content/applications/general/calendars/google/google_calendar_credentials.rst:29 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." +"Give the API Project a clear name like \"Odoo Sync\" so you can easily find " +"it." msgstr "" -"Перейдіть до етапу Зразок згоди, введіть назву товару (наприклад, Odoo " -"Calendar). Не соромтеся перевіряти параметри налаштування, але це не " -"обов'язково. Екран згоди відображатиметься лише тоді, коли ви вперше введете" -" ідентифікатор клієнта в Odoo." -#: ../../content/applications/general/calendars/google/google_calendar_credentials.rst:60 +#: ../../content/applications/general/calendars/google/google_calendar_credentials.rst:31 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." +"Then, open the API Project and click :guilabel:`Enable APIs and Services`." msgstr "" -"Нарешті, вам надається **ідентифікатор клієнта**. Перейдіть на *Облікові " -"дані*, щоб отримати **Секретний ключ клієнта**. Обидва вони потрібні в Odoo." -#: ../../content/applications/general/calendars/google/google_calendar_credentials.rst:67 +#: ../../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:45 +msgid "Create credentials" +msgstr "" + +#: ../../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: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: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:63 +msgid "" +"Skip the third step, :guilabel:`Scopes`, by clicking :guilabel:`Save and " +"Continue`." +msgstr "" + +#: ../../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: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 "" +"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 "Налаштування в Odoo" -#: ../../content/applications/general/calendars/google/google_calendar_credentials.rst:69 +#: ../../content/applications/general/calendars/google/google_calendar_credentials.rst:100 msgid "" -"Install the **Google Calendar** App from the *Apps* menu or by checking the " -"option in :menuselection:`Settings --> General Settings`." +"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 "" -"Встановіть додаток **Google Каленар** з меню *Додатки* або позначте опцію в " -":menuselection:`Налаштування --> Загальні налаштування`." -#: ../../content/applications/general/calendars/google/google_calendar_credentials.rst:75 +#: ../../content/applications/general/calendars/google/google_calendar_credentials.rst:108 msgid "" -"Go to :menuselection:`Settings --> General Settings` and enter your **Client" -" ID** and **Client Secret** in Google Calendar option." +"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 "" -"Перейдіть до :menuselection:`Налаштування --> Загальні налаштування` та " -"введіть ваш **ID клієнта** та **Секретний ключ клієнта** в налаштуванні " -"Google Календаря." -#: ../../content/applications/general/calendars/google/google_calendar_credentials.rst:81 +#: ../../content/applications/general/calendars/google/google_calendar_credentials.rst:112 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." +"Finally, open the Calendar module in Odoo and click on the " +":guilabel:`Google` sync button to sync Google Calendar with Odoo." msgstr "" -"Налаштування готово. Відкрийте Календар Odoo та синхронізуйте його з Google." -" Якщо ви робите це вперше, ви переадресовуєтеся на Google, щоб авторизувати " -"з'єднання. Повернувшись в Odoo, знову натисніть кнопку синхронізації. Ви " -"можете натискати її, коли хочете синхронізувати свій календар." -#: ../../content/applications/general/calendars/google/google_calendar_credentials.rst:89 -msgid "As of now you no longer have excuses to miss a meeting!" -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 msgid "Synchronization with Outlook's Calendar" @@ -3377,7 +3421,7 @@ 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 `." +"find more information at: :doc:`In-App Purchase `." msgstr "" #: ../../content/applications/general/users.rst:7 diff --git a/locale/uk/LC_MESSAGES/productivity.po b/locale/uk/LC_MESSAGES/productivity.po index 0883dbc83..a5ed7c840 100644 --- a/locale/uk/LC_MESSAGES/productivity.po +++ b/locale/uk/LC_MESSAGES/productivity.po @@ -4,17 +4,17 @@ # FIRST AUTHOR , YEAR. # # Translators: -# Martin Trigaux, 2021 # Alina Lisnenko , 2021 +# Martin Trigaux, 2022 # #, fuzzy 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: 2021-11-02 08:49+0000\n" -"Last-Translator: Alina Lisnenko , 2021\n" +"Last-Translator: Martin Trigaux, 2022\n" "Language-Team: Ukrainian (https://www.transifex.com/odoo/teams/41243/uk/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -30,6 +30,128 @@ 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 "Загальний огляд" @@ -1497,12 +1619,12 @@ msgid "" 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 "" @@ -1562,38 +1684,64 @@ msgid "" "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/uk/LC_MESSAGES/sales.po b/locale/uk/LC_MESSAGES/sales.po index 250053ce3..aa8cfbc95 100644 --- a/locale/uk/LC_MESSAGES/sales.po +++ b/locale/uk/LC_MESSAGES/sales.po @@ -4,7 +4,7 @@ # FIRST AUTHOR , YEAR. # # Translators: -# Martin Trigaux, 2021 +# Martin Trigaux, 2022 # Alina Lisnenko , 2022 # #, fuzzy @@ -12,7 +12,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: 2021-11-02 08:49+0000\n" "Last-Translator: Alina Lisnenko , 2022\n" "Language-Team: Ukrainian (https://www.transifex.com/odoo/teams/41243/uk/)\n" @@ -71,7 +71,6 @@ 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 @@ -80,8 +79,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 @@ -186,149 +186,161 @@ 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" -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:3 +msgid "Generate leads/opportunities" msgstr "" -"Автоматизація генерації ліда/нагоди значно покращить вашу ефективність. За " -"замовчуванням будь-який електронний лист, надісланий на *sales@database\\ " -"_domain.ext*, створить нагоду в рамках каналу продажів за замовчуванням." -#: ../../content/applications/sales/crm/acquire_leads/generate_from_email.rst:11 +#: ../../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_leads.rst:10 msgid "Configure email aliases" msgstr "Налаштуйте псевдоніми електронної пошти" -#: ../../content/applications/sales/crm/acquire_leads/generate_from_email.rst:13 +#: ../../content/applications/sales/crm/acquire_leads/generate_leads.rst:12 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`." +"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 "" -"Кожен канал продажу може мати власний псевдонім електронної пошти, щоб " -"генерувати ліди/нагоди, автоматично призначені для нього. Це корисно, якщо " -"ви керуєте кількома командами продажів з певними бізнес-процесами. Ви " -"знайдете налаштування команд продажу під :menuselection:`Налаштування --> " -"Команди продажів`." -#: ../../content/applications/sales/crm/acquire_leads/generate_from_website.rst:3 -msgid "Generate leads/opportunities from your website contact page" -msgstr "Створіть ліди/нагоди зі сторінки контактів вашого веб-сайту" +#: ../../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 +#: ../../content/applications/sales/crm/acquire_leads/generate_leads.rst:25 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." +"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" -msgstr "Використовуйте зв'яжіться з нами на своєму веб-сайті" - -#: ../../content/applications/sales/crm/acquire_leads/generate_from_website.rst:12 -msgid "You should first go to your website app." -msgstr "Спочатку потрібно перейти до вашого додатка веб-сайту." - -#: ../../content/applications/sales/crm/acquire_leads/generate_from_website.rst:14 -msgid "|image0|\\ |image1|" -msgstr "|image0|\\ |image1|" - -#: ../../content/applications/sales/crm/acquire_leads/generate_from_website.rst:16 +#: ../../content/applications/sales/crm/acquire_leads/generate_leads.rst:32 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." +"The Contact Form can be activated or deactivated at any time by going to " +":menuselection:`Website --> Go to Website --> Customize --> Contact Form`." msgstr "" -"Зі встановленням модуля CRM, ви користуєтесь готовою до використання " -"контактною формою на своєму веб-сайті Odoo, яка автоматично генерує " -"ліди/нагоди." -#: ../../content/applications/sales/crm/acquire_leads/generate_from_website.rst:23 +#: ../../content/applications/sales/crm/acquire_leads/generate_leads.rst:39 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*." +"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 "" -"Щоб перейти на конкретний канал продажів, перейдіть на сторінку " -":menuselection:`Веб-сайт --> Налаштування --> Налаштування` під *Зв'язок* ви" -" знайдете інформацію про контактну форму та куди слід змінити *Канали " -"продажу* або *Продавця*." -#: ../../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" -msgstr "Створіть власну контактну форму" - -#: ../../content/applications/sales/crm/acquire_leads/generate_from_website.rst:34 +#: ../../content/applications/sales/crm/acquire_leads/generate_leads.rst:46 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.)" +"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:43 +#: ../../content/applications/sales/crm/acquire_leads/generate_leads.rst:55 +msgid "Customize Contact Forms" +msgstr "" + +#: ../../content/applications/sales/crm/acquire_leads/generate_leads.rst:57 msgid "" -"You will need to install the free *Form Builder* module, only available in " -"Odoo Enterprise." +"Contact Forms can be customized for the specific information your team " +"needs, using the free *Form Builder* module." msgstr "" -"Вам потрібно буде встановити безкоштовний модуль *Конструктор форм*, який " -"доступний в лише Odoo Enterprise." -#: ../../content/applications/sales/crm/acquire_leads/generate_from_website.rst:52 +#: ../../content/applications/sales/crm/acquire_leads/generate_leads.rst:60 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." +"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:59 +#: ../../content/applications/sales/crm/acquire_leads/generate_leads.rst:68 msgid "" -"By default, any new contact form will send an email. You can switch to " -"lead/opportunity generation in *Change Form Parameters*." +"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:63 +#: ../../content/applications/sales/crm/acquire_leads/generate_leads.rst:73 +msgid "Edit Contact Form fields" +msgstr "" + +#: ../../content/applications/sales/crm/acquire_leads/generate_leads.rst:75 msgid "" -"If the same visitor uses the contact form twice, the second entry will be " -"added to the first lead/opportunity in the chatter." +"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:67 -msgid "Generate leads instead of opportunities" -msgstr "Генеруйте ліди, а не нагоди" - -#: ../../content/applications/sales/crm/acquire_leads/generate_from_website.rst:69 +#: ../../content/applications/sales/crm/acquire_leads/generate_leads.rst:78 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`." +":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_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_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_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 "" -"Під час використання контактної форми, вам слід використовувати крок " -"кваліфікації перед призначенням форми правильному продавцю. Зробивши це, " -"активуйте *Ліди* у налаштуваннях CRM та перейдіть на :doc:`convert`." #: ../../content/applications/sales/crm/acquire_leads/lead_mining.rst:3 msgid "Lead mining" @@ -379,17 +391,12 @@ msgstr "" #: ../../content/applications/sales/crm/acquire_leads/lead_mining.rst:34 msgid "" -"When choosing to target Companied and their contacts you can choose the " +"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 "" -"Під час обрання цілі компнаій та їхні контакти, ви можете обрати окнтакти, " -"які ви отримуєте на основі Ролі або Стажу. Отримавши інформацію про " -"контакти, переконайтеся, що ви в курсі останніх норм ЄС, більше інформації " -"про Загальні положення про захист даних отримайте на `Odoo GDPR " -"`__," #: ../../content/applications/sales/crm/acquire_leads/lead_mining.rst:39 msgid "" @@ -422,11 +429,11 @@ msgstr "Ціноутворення" 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 " +" 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 --> In-App Purchases --> View my" -" Services`." +"Credits`; or go to :menuselection:`Settings --> Contacts --> Odoo IAP --> " +"View my Services`." msgstr "" #: ../../content/applications/sales/crm/acquire_leads/lead_mining.rst:65 @@ -1004,87 +1011,88 @@ msgid ":doc:`../performance/win_loss`" msgstr ":doc:`../performance/win_loss`" #: ../../content/applications/sales/crm/pipeline/multi_sales_team.rst:3 -msgid "Manage multiple sales teams" -msgstr "Управління кількома командами продажу" +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*." +"Odoo lets you manage several sales teams, departments, or channels, each " +"with their own unique sales processes, using *Sales Teams*." msgstr "" -"В Odoo ви можете керувати кількома командами продажів, відділами або " -"каналами з конкретними процесами продажу. Для цього ми використовуємо " -"концепцію *Каналу продажів*." #: ../../content/applications/sales/crm/pipeline/multi_sales_team.rst:10 -msgid "Create a new sales channel" -msgstr "Створіть новий канал продажу" +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`." +"To create a new Sales Team, go to :menuselection:`CRM --> Configuration --> " +"Sales Teams` then click **Create**." msgstr "" -"Щоб створити новий *Канал Продажів*, перейдіть до " -":menuselection:`Налаштування --> Канали продажів`." -#: ../../content/applications/sales/crm/pipeline/multi_sales_team.rst:14 +#: ../../content/applications/sales/crm/pipeline/multi_sales_team.rst:15 msgid "" -"There you can set an email alias to it. Every message sent to that email " -"address will create a lead/opportunity." +"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 +#: ../../content/applications/sales/crm/pipeline/multi_sales_team.rst:19 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." +"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." -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." +msgid "Add members to a Sales Team" msgstr "" -"Якщо ви зараз відфільтруєте цей конкретний канал у вашому конвеєрі, ви " -"знайдете всі його нагоди." -#: ../../content/applications/sales/crm/pipeline/multi_sales_team.rst:40 -msgid "Sales channel dashboard" -msgstr "Інформаційна панель каналу продажів" +#: ../../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: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 +#: ../../content/applications/sales/crm/pipeline/multi_sales_team.rst:44 msgid "" -"It is shared with the whole ecosystem so every revenue stream is included in" -" it: Sales, eCommerce, PoS, etc." +"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 msgid "Assign and track leads" @@ -1096,122 +1104,91 @@ 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." +"*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." +"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)." +"To use scoring, go to :menuselection:`Apps`, remove the :guilabel:`Apps` " +"filter, search for :guilabel:`Lead Scoring` and then install the module." msgstr "" -"Щоб скористатися оцінкою, встановіть безкоштовний модуль *Оцінювання лідів* " -"на сторінці *Додатки* (доступно лише в Odoo Enterprise)." -#: ../../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 +#: ../../content/applications/sales/crm/track_leads/lead_scoring.rst:24 msgid "" -"You now have a new tab in your *CRM* app called *Leads Management* where you" -" can manage your scoring rules." +"To manage scoring rules, go to :menuselection:`CRM --> Leads --> Scoring " +"Rules`." msgstr "" -"У вас тепер є нова вкладка у вашому додатку *CRM* під назвою *Управління " -"лідами*, де ви можете керувати своїми правилами оцінювання." #: ../../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." +"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 +#: ../../content/applications/sales/crm/track_leads/lead_scoring.rst:32 msgid "" -"Every hour every lead without a score will be automatically scanned and " -"assigned their right score according to your scoring rules." +"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 +#: ../../content/applications/sales/crm/track_leads/lead_scoring.rst:41 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." +"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 "" -"Після того, як результати розраховані, ліди можуть бути призначені для " -"конкретних команд за допомогою того самого механізму домену. Щоб це зробити," -" перейдіть до :menuselection:`CRM --> Управління лідами --> Призначення " -"команди` і застосовувати конкретний домен у кожній команді. Цей домен може " -"включати оцінки." -#: ../../content/applications/sales/crm/track_leads/lead_scoring.rst:49 +#: ../../content/applications/sales/crm/track_leads/lead_scoring.rst:50 msgid "" -"Further on, you can assign to a specific vendor in the team with an even " -"more refined domain." +"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 +#: ../../content/applications/sales/crm/track_leads/lead_scoring.rst:57 msgid "" -"To do so go to :menuselection:`CRM --> Leads Management --> Leads " -"Assignation`." +"Odoo automatically assigns new leads to teams/salespeople once per day." msgstr "" -"Щоб зробити це, перейдіть до :menuselection:`CRM --> Управління лідами --> " -"Призначення лідів`." -#: ../../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" -msgstr "Оцініть та використайте непризначені ліди" +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." +"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 +#: ../../content/applications/sales/crm/track_leads/lead_scoring.rst:72 msgid "" -"In your leads page you can place a filter to find your unassigned leads." +"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/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." -msgstr "" -"Чому б не користуватися додатками :menuselection:`Маркетинг електронною " -"поштою` чи :menuselection:`Автоматизація маркетингу`, щоб надсилати їм " -"масову електронну пошту? Ви також можете легко знайти такі непризначені ліди" -" звідти." #: ../../content/applications/sales/crm/track_leads/prospect_visits.rst:3 msgid "Track your prospects visits" @@ -1997,32 +1974,31 @@ 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." +"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 +#: ../../content/applications/sales/point_of_sale/overview/epos_ssc.rst:79 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." +"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 " @@ -2054,8 +2030,8 @@ 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*." +" 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 @@ -2115,45 +2091,49 @@ msgid "" msgstr "" #: ../../content/applications/sales/point_of_sale/overview/getting_started.rst:82 +msgid "You can use both `,` and `.` on your keyboard as decimal separators." +msgstr "" + +#: ../../content/applications/sales/point_of_sale/overview/getting_started.rst:85 msgid "Return and refund products" msgstr "" -#: ../../content/applications/sales/point_of_sale/overview/getting_started.rst:84 +#: ../../content/applications/sales/point_of_sale/overview/getting_started.rst:87 msgid "" "Having a well-thought-out return policy is key to keep customers satisfied " "and make the process of accepting returns and refunds easy for you." msgstr "" -#: ../../content/applications/sales/point_of_sale/overview/getting_started.rst:87 +#: ../../content/applications/sales/point_of_sale/overview/getting_started.rst:90 msgid "" "To do that, from the PoS interface, select the product and quantity (with " "the +/- button) that the customer wants to return. For multiple products, " "repeat the process individually." msgstr "" -#: ../../content/applications/sales/point_of_sale/overview/getting_started.rst:94 +#: ../../content/applications/sales/point_of_sale/overview/getting_started.rst:97 msgid "" "When on the payment interface, the total is negative. To end the refund, " "process the payment and validate it." msgstr "" -#: ../../content/applications/sales/point_of_sale/overview/getting_started.rst:102 +#: ../../content/applications/sales/point_of_sale/overview/getting_started.rst:105 msgid "Close the PoS session" msgstr "Закрийте сесію точки продажу" -#: ../../content/applications/sales/point_of_sale/overview/getting_started.rst:104 +#: ../../content/applications/sales/point_of_sale/overview/getting_started.rst:107 msgid "" "To close your session at the end of the day, click on the close button on " "the upper right corner of your screen and confirm. Now, close the session on" " the dashboard view." msgstr "" -#: ../../content/applications/sales/point_of_sale/overview/getting_started.rst:112 +#: ../../content/applications/sales/point_of_sale/overview/getting_started.rst:115 msgid "" "It’s strongly advised to close your PoS session at the end of each day." msgstr "" -#: ../../content/applications/sales/point_of_sale/overview/getting_started.rst:114 +#: ../../content/applications/sales/point_of_sale/overview/getting_started.rst:117 msgid "" "Once a session is closed, you can see a summary of all transactions per " "payment method. Then, click on a line to see all orders that were paid " @@ -2161,7 +2141,7 @@ msgid "" "post the closing entries." msgstr "" -#: ../../content/applications/sales/point_of_sale/overview/getting_started.rst:123 +#: ../../content/applications/sales/point_of_sale/overview/getting_started.rst:126 msgid "" "To connect the PoS hardware with an Odoo IoT Box, please refer to these " "docs: :doc:`Connect an IoT Box to your database " @@ -2169,24 +2149,24 @@ msgid "" "for the PoS `." msgstr "" -#: ../../content/applications/sales/point_of_sale/overview/getting_started.rst:129 +#: ../../content/applications/sales/point_of_sale/overview/getting_started.rst:132 msgid "View your statistics" msgstr "Переглянути статистику" -#: ../../content/applications/sales/point_of_sale/overview/getting_started.rst:131 +#: ../../content/applications/sales/point_of_sale/overview/getting_started.rst:134 msgid "" "Keeping track of your sales is essential to get meaningful statistics. " "That’s why Odoo provides analyzes about your sales." msgstr "" -#: ../../content/applications/sales/point_of_sale/overview/getting_started.rst:134 +#: ../../content/applications/sales/point_of_sale/overview/getting_started.rst:137 msgid "" "To access your statistics, go to :menuselection:`Point of Sales --> " "Reporting --> Orders`. There, you can see various statistics in graph or " "pivot form." msgstr "" -#: ../../content/applications/sales/point_of_sale/overview/getting_started.rst:142 +#: ../../content/applications/sales/point_of_sale/overview/getting_started.rst:145 msgid "You can also access them through the dashboard." msgstr "" @@ -2275,10 +2255,147 @@ msgstr "" msgid "Payment Terminals" msgstr "Платіжні термінали" -#: ../../content/applications/sales/point_of_sale/payment/ingenico.rst:3 -msgid "Connect an Ingenico Payment Terminal to your PoS" +#: ../../content/applications/sales/point_of_sale/payment/adyen.rst:3 +msgid "Adyen" +msgstr "Adyen" + +#: ../../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 "Ingenico" +msgstr "Ingenico" + #: ../../content/applications/sales/point_of_sale/payment/ingenico.rst:5 #: ../../content/applications/sales/point_of_sale/payment/worldline.rst:5 msgid "" @@ -2323,11 +2440,6 @@ msgid "" "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 " @@ -2342,11 +2454,6 @@ msgid "" "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 " @@ -2382,8 +2489,8 @@ msgid "" msgstr "" #: ../../content/applications/sales/point_of_sale/payment/six.rst:3 -msgid "Connect a SIX Payment Terminal to your PoS" -msgstr "" +msgid "SIX" +msgstr "SIX" #: ../../content/applications/sales/point_of_sale/payment/six.rst:5 msgid "" @@ -2393,64 +2500,69 @@ 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 +#: ../../content/applications/sales/point_of_sale/payment/six.rst:21 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\"." +"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 +#: ../../content/applications/sales/point_of_sale/payment/six.rst:28 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." +"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 +#: ../../content/applications/sales/point_of_sale/payment/six.rst:39 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." +"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 +#: ../../content/applications/sales/point_of_sale/payment/six.rst:48 msgid "" -"When the payment is done, the status will change to *Payment Successful*. " -"You can always reverse the last transaction by clicking on *Reverse*." +"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 +#: ../../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 *Force Done*. This will allow you to validate the order in" -" Odoo even if the connection between the terminal and Odoo encounters " -"issues." +"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 @@ -2493,8 +2605,8 @@ msgid "" msgstr "" #: ../../content/applications/sales/point_of_sale/payment/worldline.rst:3 -msgid "Connect a Worldline Payment Terminal to the PoS" -msgstr "" +msgid "Worldline" +msgstr "Worldline" #: ../../content/applications/sales/point_of_sale/payment/worldline.rst:9 msgid "Please note that Worldline is currently only available in Belgium." @@ -3090,104 +3202,6 @@ 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 "" -"Щоб активувати функцію *Контроль готівки*, перейдіть до " -":menuselection:`Точки продажу --> Налаштування --> Точка продажу` та " -"виберіть свій інтерфейс точки продажу." - -#: ../../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 "" -"У цьому прикладі ви можете бачити, що ви хочете мати 275 доларів у різній " -"деномінації під час відкриття та закриття." - -#: ../../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 "Округлення готівки" @@ -3472,6 +3486,147 @@ 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 "Оренда" @@ -3948,12 +4103,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 "" @@ -4030,15 +4187,36 @@ msgstr "" #: ../../content/applications/sales/sales/amazon_connector/manage.rst:45 msgid "" -":doc:`../../../inventory_and_mrp/inventory/shipping/setup/third_party_shipper`" +"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 "" +"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 " @@ -4048,14 +4226,14 @@ msgid "" "under the FBA program." msgstr "" -#: ../../content/applications/sales/sales/amazon_connector/manage.rst:57 +#: ../../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" @@ -4067,24 +4245,24 @@ msgid "" " 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 " @@ -4095,11 +4273,11 @@ msgid "" "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 " @@ -4107,13 +4285,13 @@ msgid "" " 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 " @@ -4123,8 +4301,9 @@ msgid "" "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 "" @@ -4133,118 +4312,49 @@ msgid "Configure Amazon Connector in Odoo" msgstr "" #: ../../content/applications/sales/sales/amazon_connector/setup.rst:6 -msgid "Generate an Authorization Token in Seller Central" +msgid "Register your Amazon account in Odoo" 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." +"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:14 +#: ../../content/applications/sales/sales/amazon_connector/setup.rst:13 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." +"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:19 +#: ../../content/applications/sales/sales/amazon_connector/setup.rst:17 msgid "" -"You might need to use the *main* (or first) administrator account and not " -"one added subsequently." +"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:22 +#: ../../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:23 msgid "" -"In the main menu, select :menuselection:`Apps & Services --> Manage Your " -"Apps`; in the page that displays, click on the ``Authorize new developper`` " -"button:" +"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 "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**." -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 " -"`." -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." -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." -msgstr "" - -#: ../../content/applications/sales/sales/amazon_connector/setup.rst:72 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 " @@ -4252,7 +4362,7 @@ msgid "" " 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, " @@ -4260,7 +4370,7 @@ msgid "" "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 " @@ -4269,7 +4379,7 @@ msgid "" ":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" @@ -4278,7 +4388,7 @@ msgid "" " 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** " @@ -4286,18 +4396,18 @@ msgid "" "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 " @@ -4306,7 +4416,7 @@ msgid "" " 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 " @@ -4314,76 +4424,173 @@ msgid "" "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 +#: ../../content/applications/sales/sales/amazon_connector/setup.rst:78 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." +"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 +#: ../../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." +"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 +#: ../../content/applications/sales/sales/amazon_connector/setup.rst:88 msgid "" -"To add a new marketplace, you must first activate the :ref:`developer mode " -"`." +"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 +#: ../../content/applications/sales/sales/amazon_connector/setup.rst:93 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 " -"`_." +"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 +#: ../../content/applications/sales/sales/amazon_connector/setup.rst:99 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." +"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 +#: ../../content/applications/sales/sales/amazon_connector/setup.rst:104 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." +"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 "конектор eBay " @@ -5441,7 +5648,7 @@ msgstr "Як адаптувати ціни до ваших клієнтів і 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 " +"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 "" @@ -6748,16 +6955,10 @@ msgid "" 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 " @@ -6766,50 +6967,50 @@ msgid "" "**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/uk/LC_MESSAGES/sphinx.po b/locale/uk/LC_MESSAGES/sphinx.po index a15a1308b..cc6431c04 100644 --- a/locale/uk/LC_MESSAGES/sphinx.po +++ b/locale/uk/LC_MESSAGES/sphinx.po @@ -12,7 +12,7 @@ msgid "" msgstr "" "Project-Id-Version: Odoo 15.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-03-18 15:02+0000\n" +"POT-Creation-Date: 2022-07-22 09:36+0000\n" "PO-Revision-Date: 2022-03-18 15:03+0000\n" "Last-Translator: Martin Trigaux, 2022\n" "Language-Team: Ukrainian (https://www.transifex.com/odoo/teams/41243/uk/)\n" @@ -34,7 +34,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 "" @@ -92,11 +92,11 @@ msgid "Installing Odoo" msgstr "" #: ../../extensions/odoo_theme/layout_templates/homepage.html:46 -msgid "System configuration" +msgid "Bugfix updates" msgstr "" #: ../../extensions/odoo_theme/layout_templates/homepage.html:51 -msgid "Bugfix updates" +msgid "Upgrading Odoo" msgstr "" #: ../../extensions/odoo_theme/layout_templates/homepage.html:56 @@ -144,10 +144,14 @@ msgid "" 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/uk/LC_MESSAGES/websites.po b/locale/uk/LC_MESSAGES/websites.po index 0d36190ba..d2ae83fcb 100644 --- a/locale/uk/LC_MESSAGES/websites.po +++ b/locale/uk/LC_MESSAGES/websites.po @@ -5,17 +5,17 @@ # # Translators: # Zoriana Zaiats, 2022 -# Martin Trigaux, 2022 # Alina Lisnenko , 2022 +# Martin Trigaux, 2022 # #, fuzzy 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: 2022-03-18 15:03+0000\n" -"Last-Translator: Alina Lisnenko , 2022\n" +"Last-Translator: Martin Trigaux, 2022\n" "Language-Team: Ukrainian (https://www.transifex.com/odoo/teams/41243/uk/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -47,11 +47,15 @@ msgid "" 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 `_" @@ -394,97 +398,98 @@ 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)" -msgstr "Як продавати аксесуари та функціональні товари (перехресний продаж)" +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:" +"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)." +"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" -msgstr "Аксесуари під час перевірки" +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." +":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." -msgstr "" -"Виберіть аксесуари на вкладці *Продажі* на сторінці відомостей про товар." +msgid "Accessory Products" +msgstr "Аксесуари" -#: ../../content/applications/websites/ecommerce/maximizing_revenue/cross_selling.rst:26 +#: ../../content/applications/websites/ecommerce/maximizing_revenue/cross_selling.rst:22 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." +"**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" -msgstr "Додаткові товари при додаванні до кошика" - -#: ../../content/applications/websites/ecommerce/maximizing_revenue/cross_selling.rst:33 +#: ../../content/applications/websites/ecommerce/maximizing_revenue/cross_selling.rst:25 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." +"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: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 "" -"Необов'язкові товари безпосередньо пов'язані з елементом, доданим до кошика " -"(наприклад, для комп'ютерів: гарантія, програмне забезпечення для ОS, " -"додаткові компоненти). Кожного разу, коли основний товар додається до " -"кошика, такий новий екран з'являється як додатковий крок." #: ../../content/applications/websites/ecommerce/maximizing_revenue/cross_selling.rst:40 -msgid "To publish 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." +"`Odoo Tutorials: Alternative, Accessory, and Optional Products " +"`_." msgstr "" -"Встановіть *Додаткові товари електронної комерції* в меню *Додатки*. " -"Вилучіть фільтр за замовчуванням для пошуку в аддонах, інакше з'являться " -"лише основні модулі." + +#: ../../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." -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." +"**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: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 msgid "Adapt prices to website visitors" @@ -739,10 +744,6 @@ msgid "" 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 "Отримайте оплату" @@ -845,7 +846,7 @@ msgstr "" #: ../../content/applications/websites/ecommerce/shopper_experience/payment_acquirer.rst:62 msgid "" ":ref:`Payment Acquirers: Place a hold on a card " -"`" +"`" msgstr "" #: ../../content/applications/websites/ecommerce/shopper_experience/portal.rst:3 @@ -1238,7 +1239,39 @@ msgid "How to track your website traffic from your Odoo Dashboard" msgstr "" "Як відслідковувати трафік вашого веб-сайту з інформаційної панелі Odoo" -#: ../../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." @@ -1246,7 +1279,7 @@ msgstr "" "Ви можете слідкувати за вашою статистикою трафіку прямо з панелі " "інструментів веб-сайту Odoo завдяки Google Analytics." -#: ../../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`)." @@ -1254,7 +1287,7 @@ msgstr "" "Для початку створіть обліковий запис Google Analytics та введіть ID " "відстеження у налаштуваннях вашого веб-сайту. (see :doc:`google_analytics`)." -#: ../../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." @@ -1263,11 +1296,11 @@ msgstr "" "`__ для створення облікових даних " "Analytics API. Ввійдіть у свій обліковий запис Google." -#: ../../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 "Виберіть Analytics API." -#: ../../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." @@ -1275,15 +1308,15 @@ msgstr "" "Створіть новий проект і надішліть йому назву (наприклад, Odoo). Цей проект " "необхідний для зберігання ваших облікових даних API." -#: ../../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 "Увімкніть API." -#: ../../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 "Створіть облікові дані для використання в Odoo." -#: ../../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." @@ -1291,7 +1324,7 @@ msgstr "" "Виберіть *веб-браузер (Javascript)* як джерело дзвінків та *дані " "користувача* як види даних." -#: ../../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" @@ -1305,7 +1338,7 @@ msgstr "" "URI* перенаправлення - це URL-адреса вашої версії Odoo, а потімy " "'/google_account/authentication'." -#: ../../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 " @@ -1317,18 +1350,18 @@ msgstr "" " обов'язково. Екран згоди відображатиметься лише тоді, коли ви вперше " "введете ID клієнта в Odoo." -#: ../../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 "Нарешті, вам надається ID клієнта. Скопіюйте та вставте його в Odoo." -#: ../../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 "" "В якості останнього кроку дозвольте Odoo отримати доступ до Google API." @@ -2487,44 +2520,31 @@ 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 " -"`_" +"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, " @@ -2537,22 +2557,22 @@ msgstr "" "файл індексу Sitemap, дотримуючись групування у файлі `sitemaps.org protocol" " `__ у 45000 шт. на файл." -#: ../../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 "Кожна карта сайту містить 4 атрибути, які обчислюються автоматично:" -#: ../../content/applications/websites/website/optimize/seo.rst:593 +#: ../../content/applications/websites/website/optimize/seo.rst:587 msgid "```` : the URL of a page" msgstr "```` : URL-адреса сторінки" -#: ../../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" @@ -2560,11 +2580,11 @@ msgid "" "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 " @@ -2572,7 +2592,7 @@ msgid "" "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." @@ -2580,7 +2600,7 @@ msgstr "" "Google підтримує безліч багатих фрагментів для типів вмісту, зокрема: " "огляди, люди, товари, компанії, події та організації." -#: ../../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 " @@ -2592,29 +2612,29 @@ msgstr "" "форуму та контактних адрес. Це дозволяє відображати ваші сторінки товару в " "Google за допомогою додаткової інформації, такої як ціна та рейтинг товару:" -#: ../../content/applications/websites/website/optimize/seo.rst:627 +#: ../../content/applications/websites/website/optimize/seo.rst:621 msgid "robots.txt" msgstr "robots.txt" -#: ../../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 " @@ -2893,11 +2913,34 @@ 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 " @@ -2906,11 +2949,11 @@ msgid "" "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 " @@ -2918,93 +2961,93 @@ msgid "" "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 " @@ -3012,46 +3055,46 @@ msgid "" "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 " @@ -3060,41 +3103,41 @@ msgid "" "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 " @@ -3102,11 +3145,11 @@ msgid "" "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 " @@ -3115,39 +3158,39 @@ msgid "" "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 "" @@ -3194,7 +3237,7 @@ msgid "" 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 diff --git a/locale/zh_CN/LC_MESSAGES/administration.po b/locale/zh_CN/LC_MESSAGES/administration.po index 872a445fb..c2225d979 100644 --- a/locale/zh_CN/LC_MESSAGES/administration.po +++ b/locale/zh_CN/LC_MESSAGES/administration.po @@ -15,17 +15,17 @@ # Datasource International , 2022 # Mandy Choy , 2022 # Jeffery CHEN , 2022 -# Martin Trigaux, 2022 # 山西清水欧度(QQ:54773801) <54773801@qq.com>, 2022 +# Martin Trigaux, 2022 # #, fuzzy 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: 2022-03-18 14:59+0000\n" -"Last-Translator: 山西清水欧度(QQ:54773801) <54773801@qq.com>, 2022\n" +"Last-Translator: Martin Trigaux, 2022\n" "Language-Team: Chinese (China) (https://www.transifex.com/odoo/teams/41243/zh_CN/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -254,9 +254,9 @@ msgstr "" "list”启动参数来阻止列出数据库，并阻止对数据库管理屏幕的访问。另请参见security_。" #: ../../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 "PostgreSQL" @@ -1347,7 +1347,7 @@ msgstr "" "软件包都可以从我们的download_页面下载（您必须以付费客户或合作伙伴身份登录才能下载企业版软件包）。" #: ../../content/administration/install/install.rst:90 -#: ../../content/administration/install/install.rst:252 +#: ../../content/administration/install/install.rst:254 msgid "Windows" msgstr "Windows" @@ -1384,7 +1384,7 @@ msgid "Odoo will automatically be started at the end of the installation." msgstr "Odoo将在安装结束时自动启动。" #: ../../content/administration/install/install.rst:105 -#: ../../content/administration/install/install.rst:418 +#: ../../content/administration/install/install.rst:433 msgid "Linux" msgstr "Linux" @@ -1402,9 +1402,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 "准备" @@ -1420,9 +1420,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 " @@ -1577,111 +1577,116 @@ msgid "" "more easily keep (and run) multiple versions of Odoo side-by-side." msgstr "最后，它提供了对系统设置的更大控制，并允许更轻松地并排保存（和运行）多个版本的Odoo。" -#: ../../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 "有两种方法可以获得Odoo的源代码：作为zip **archive**或通过**git**。" -#: ../../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 "'GitHub repository '_" -#: ../../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 "'GitHub repository '_" -#: ../../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 "Git" -#: ../../content/administration/install/install.rst:276 -#: ../../content/administration/install/install.rst:442 -#: ../../content/administration/install/install.rst:613 +#: ../../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." -msgstr "以下要求在您的计算机上安装git_，并且您具有 git 命令的基本知识。" +"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)" -msgstr "企业版：（请参阅：ref：'setup/install/editions' 以获取访问权限）" - -#: ../../content/administration/install/install.rst:292 -#: ../../content/administration/install/install.rst:458 -#: ../../content/administration/install/install.rst:629 +#: ../../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 " +"**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." +"installation. See :ref:`setup/install/editions` to get access to the " +"Enterprise repository." +msgstr "" + +#: ../../content/administration/install/install.rst:296 +#: ../../content/administration/install/install.rst:475 +#: ../../content/administration/install/install.rst:659 +msgid "Clone with HTTPS" msgstr "" -"**企业 git 存储库不包含完整的 Odoo " -"源代码**。它只是额外附加组件的集合。主服务器代码位于社区版本中。运行企业版实际上意味着从社区版本运行服务器，并将插件路径选项设置为具有企业版的文件夹。您需要克隆社区和企业存储库才能进行" -" Odoo 企业版安装。" #: ../../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 "Python" -#: ../../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 " @@ -1691,27 +1696,27 @@ msgstr "" "3.7或更高版本才能运行。访问“Python的下载页面”_在您的计算机上下载并安装最新版本的Python" " 3。" -#: ../../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 "在安装过程中，选中“**将 Python 3 添加到 PATH**”，然后单击“**自定义安装**”并确保选中“**pip**”。" -#: ../../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 "如果已经安装了Python 3，请确保版本为3.7或更高版本，因为以前的版本与Odoo不兼容。" -#: ../../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 "还要验证是否为此版本安装了pip_。" -#: ../../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 " @@ -1720,16 +1725,16 @@ msgstr "" "Odoo使用PostgreSQL作为数据库管理系统。“下载并安装 PostgreSQL " "”_（支持的版本：10.0 及更高版本）。" -#: ../../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 "" "默认情况下，唯一的用户是'postgres'，但Odoo禁止以'postgres'的身份连接，所以你需要创建一个新的PostgreSQL用户：" -#: ../../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`." @@ -1737,45 +1742,45 @@ msgstr "" "将PostgreSQL的“bin”目录（默认情况下：“C：\\\\Program " "Files\\\\PostgreSQL\\\\\\\\bin”）添加到您的“PATH”中。" -#: ../../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 "使用 pg admin gui 创建一个具有密码的 postgres 用户：" -#: ../../content/administration/install/install.rst:337 +#: ../../content/administration/install/install.rst:350 msgid "Open **pgAdmin**." msgstr "打开 **pgAdmin**。" -#: ../../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 "选择：menuselection：'对象 --> 创建 --> 登录名/组角色'。" -#: ../../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 "在“角色名称”字段中输入用户名（例如“odoo”）。" -#: ../../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 "打开“**定义**”选项卡并输入密码（例如“odoo”），然后单击“保存”。“。”odoo“（”odoo“）" -#: ../../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 " @@ -1787,49 +1792,49 @@ msgstr "" "的生成工具”。`_." msgstr "下载并安装 'nodejs '_。" -#: ../../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 "安装 'rtlcss'：" -#: ../../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: " @@ -1837,24 +1842,24 @@ msgid "" msgstr "" "编辑系统环境的变量“PATH”以添加“rtlcss.cmd”所在的文件夹（通常为：“C：\\\\Users\\\\\\\\AppData\\\\Roaming\\\\npm\\\\”）。" -#: ../../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 "运行 Odoo" -#: ../../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 "一旦设置了所有依赖项，就可以通过运行服务器的命令行界面“odoo-bin”来启动Odoo。它位于Odoo社区目录的根目录。" -#: ../../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 " @@ -1863,38 +1868,38 @@ msgstr "" "要配置服务器，您可以指定 ：ref：'命令行参数' 或 ：ref：'配置文件 " "'。" -#: ../../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 "PostgreSQL 用户和密码。" -#: ../../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 " @@ -1902,38 +1907,36 @@ msgid "" msgstr "" "其中“CommunityPath”是Odoo社区安装的路径，“dbuser”是PostgreSQL登录名，“dbpassword”是PostgreSQL密码，“mydb”是“localhost：8069”上的默认数据库。" -#: ../../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 " -"`." -msgstr ":d oc：'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 "Odoo需要Python 3.7或更高版本才能运行。使用包管理器在计算机上下载并安装 Python 3（如果尚未完成）。" -#: ../../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 "Odoo使用PostgreSQL作为数据库管理系统。使用包管理器下载并安装 PostgreSQL（支持的版本：10.0 及更高版本）。" -#: ../../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 "在 Debian/Unbuntu 上，可以通过执行以下命令来实现：" -#: ../../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 "由于您的PostgreSQL用户与您的Unix登录名同名，因此您将能够在没有密码的情况下连接到数据库。" -#: ../../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 " @@ -1942,25 +1945,25 @@ msgid "" msgstr "" "对于使用原生代码的库，有必要在Odoo的Python依赖之前安装开发工具和原生依赖项。它们可用于Python，PostgreSQL，libxml2，libxslt1，libevent，libsasl2和libldap2的'-dev'或'-devel'包。" -#: ../../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 "在 Debian/Unbuntu 上，以下命令应该安装所有必需的库：" -#: ../../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 "导航到 Odoo 社区安装的路径（“CommunityPath”），并在需求文件上运行 **pip**：" -#: ../../content/administration/install/install.rst:548 +#: ../../content/administration/install/install.rst:574 msgid "Download and install **nodejs** and **npm** with your package manager." msgstr "使用包管理器下载并安装 **nodejs** 和 **npm**。" -#: ../../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" @@ -1969,18 +1972,18 @@ msgstr "" "PostgreSQL " "用户和密码。Odoo除了“psycopg2的默认值”_之外没有默认值：通过端口“5432”上的UNIX套接字与当前用户连接，没有密码。" -#: ../../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 "其中“CommunityPath”是Odoo社区安装的路径，“mydb”是“localhost：8069”上提供的默认数据库。" -#: ../../content/administration/install/install.rst:589 +#: ../../content/administration/install/install.rst:617 msgid "Mac OS" msgstr "Mac OS" -#: ../../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 " @@ -1989,7 +1992,7 @@ msgstr "" "Odoo需要Python 3.7或更高版本才能运行。使用首选的包管理器（homebrew_、macports_）在计算机上下载并安装 Python " "3（如果尚未完成）。" -#: ../../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 " @@ -1998,36 +2001,50 @@ msgstr "" "Odoo使用PostgreSQL作为数据库管理系统。使用'postgres.app " "'_下载并安装PostgreSQL（支持的版本：10.0及更高版本）。" -#: ../../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 "非Python依赖项需要与包管理器一起安装：" -#: ../../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 "下载并安装您选择的软件包管理器（homebrew_、macports_）。" -#: ../../content/administration/install/install.rst:702 +#: ../../content/administration/install/install.rst:746 msgid "Install non-python dependencies." msgstr "安装非 python 依赖项。" -#: ../../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 "使用您的首选包管理器下载并安装**nodejs**（homebrew_，macports_）。" -#: ../../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 "Docker" -#: ../../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." @@ -2088,11 +2105,23 @@ msgstr "" "Odoo为所有Odoo Online数据库提供一个：ref：'免费的自定义域名<域名/odoo-" "register>'。然后，访问者可以使用“www.example.com”等地址而不是默认的“example.odoo.com”来访问您的网站。" +#: ../../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" @@ -2101,7 +2130,7 @@ msgid "" 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. " @@ -2113,7 +2142,7 @@ msgstr "" "**子域** " "是属于另一个域的一部分的域。它通常是指主域名之前的附加部分。传统上，大多数网站使用“www.”子域，但也可以使用任何字母串。您可以使用子域名将访问者定向到主网站以外的其他网站或特定页面（例如，“experience.odoo.com”指向特定页面）。" -#: ../../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 " @@ -2123,37 +2152,37 @@ msgstr "" "所有域名都在**域名系统**或**DNS**中引用，该系统是互联网的巨型目录。有许多 DNS 服务器，因此对 DNS 的任何修改最多可能需要 72 " "小时才能在所有服务器上传播到全球。" -#: ../../content/administration/maintain/domain_names.rst:46 +#: ../../content/administration/maintain/domain_names.rst:51 msgid "Register a free domain name with Odoo" msgstr "使用Odoo注册免费域名" -#: ../../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 "您可以直接从Odoo网站或数据库管理器为您的Odoo在线数据库注册域名。" -#: ../../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 "您的域名**免费一年**，如果您在Odoo注册！" -#: ../../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 "域名已在域名注册商「Gandi 」注册。" -#: ../../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 "Odoo为您管理付款和技术支持。" -#: ../../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 " @@ -2164,25 +2193,25 @@ msgstr "" "-->域名'。或者，打开“数据库管理器”_，单击数据库旁边的 " "：guilabel：'settings' 按钮，然后单击 ：guilabel：'域名'。" -#: ../../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 "您的域名直接链接到您的数据库，但您仍然需要：ref：'将您的域名与您的网站<域名/网站地图>'。" -#: ../../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 " @@ -2192,15 +2221,15 @@ msgstr "" "免费域名也可用于免费的Odoo " "Online数据库（例如，如果您只安装了一个应用程序）。在这种情况下，Odoo会审查您的请求和您的网站，以避免滥用。此过程最多可能需要三天时间。" -#: ../../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 "这尚不适用于 Odoo.sh 数据库。" -#: ../../content/administration/maintain/domain_names.rst:87 +#: ../../content/administration/maintain/domain_names.rst:92 msgid "Manage your domain name registered with Odoo" msgstr "管理您在Odoo注册的域名" -#: ../../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 " @@ -2211,88 +2240,88 @@ msgstr "" "要管理您在Odoo注册的域名的DNS记录或可视化与其关联的联系人，请打开“数据库管理器”_，单击数据库旁边的：guilabel：'settings'按钮，在：guilabel：'Domain" " names'上，然后在：guilabel：'Contacts'或：guilabel：'DNS'上。" -#: ../../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 "为避免 ：ref：'SSL 证书验证<域名/ssl>'的任何问题，我们强烈建议您按以下顺序执行以下操作：" -#: ../../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 "：ref：在域名的 DNS 区域上添加一个 CNAME 记录<域名/cname>”。" -#: ../../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 "：ref：'将您的域名与 Odoo 数据库<域名/db-map>'" -#: ../../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 "：ref：'将您的域名与您的Odoo网站<域名/网站地图>'。" -#: ../../content/administration/maintain/domain_names.rst:119 +#: ../../content/administration/maintain/domain_names.rst:124 msgid "Add a CNAME record" msgstr "添加 CNAME 记录" -#: ../../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 "**CNAME 记录**是一种指向另一个网站的 IP 地址而不是直接指向某个 IP 地址的 DNS 记录。" -#: ../../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 "您需要一个指向您的Odoo数据库的CNAME记录。数据库管理器中详细介绍了这些要求。" -#: ../../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 "Odoo Online" -#: ../../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 "目标地址是数据库的当前地址，在创建时定义（例如，“example.odoo.com”）" -#: ../../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 "Odoo.sh" -#: ../../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 "项目的主地址在 ：menuselection：'Settings --> Project Name' 中定义。" -#: ../../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 --> " @@ -2302,22 +2331,22 @@ msgstr "" "如果要定位特定分支（生产，暂存或开发），请转到：“分支选择：”分支 - >选择您的分支 - >设置 - " ">自定义域“，然后单击：guilabel：”如何设置我的域？”此时将显示一条消息，指示您的 CNAME 记录应定位到哪个地址。" -#: ../../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 "打开要配置的域名的“DNS 区域”管理页面。" -#: ../../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 "创建指向数据库地址的“CNAME”记录。" -#: ../../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, " @@ -2325,7 +2354,7 @@ msgid "" msgstr "" "虽然Odoo建议为您的“www.”子域创建一个CNAME记录（“www.example.com”，但您当然可以使用您选择的任何域名，以及任何子域（例如，“anything.example.com”）。" -#: ../../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 " @@ -2334,7 +2363,7 @@ msgid "" msgstr "" "您拥有域名“example.com”，并且您在地址“example.odoo.com”拥有Odoo在线数据库。您希望主要使用域“www.example.com”访问Odoo数据库，但也希望使用：ref：“裸域<域名/裸域>”example.com“。访问Odoo数据库。" -#: ../../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 " @@ -2344,24 +2373,24 @@ msgstr "" "为此，您需要为“www”子域创建一个 CNAME 记录，并将“example.odoo.com”作为目标。DNS 区域管理器生成以下规则并将其添加到 " "DNS 区域：“www IN CNAME example.odoo.com”。" -#: ../../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 "您还可以创建从“example.com”到“wwww.example.com”的重定向。" -#: ../../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 "您的新 DNS 记录将传播到所有 DNS 服务器。" -#: ../../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 "以下是一些创建CNAME记录的特定指引：" -#: ../../content/administration/maintain/domain_names.rst:168 +#: ../../content/administration/maintain/domain_names.rst:173 msgid "`GoDaddy `_" msgstr "“GoDaddy ”_" -#: ../../content/administration/maintain/domain_names.rst:169 +#: ../../content/administration/maintain/domain_names.rst:174 msgid "" "`Namecheap " "'_" -#: ../../content/administration/maintain/domain_names.rst:170 +#: ../../content/administration/maintain/domain_names.rst:175 msgid "" "`OVH " "”_" -#: ../../content/administration/maintain/domain_names.rst:171 +#: ../../content/administration/maintain/domain_names.rst:176 msgid "" "`CloudFlare `_" @@ -2389,44 +2418,44 @@ msgstr "" "'CloudFlare '_" -#: ../../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 "**裸域名**是在地址开头没有任何子域名的域名（例如，“odoo.com”而不是“www.odoo.com”）。" -#: ../../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 "创建一个从裸域名（“example.com”）到您的主域名（“www.example.com”）的**重定向**。" -#: ../../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 "将您的域名与 Odoo 数据库进行映射" -#: ../../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 " @@ -2436,7 +2465,7 @@ msgstr "" "打开数据库管理器“_，单击数据库旁边的 ：guilabel：'settings' " "按钮，单击 ：guilabel：'Domain names'，然后单击右列底部的 ：guilabel：'Use my own domain'。" -#: ../../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. " @@ -2444,7 +2473,7 @@ msgid "" msgstr "" "键入要添加到此数据库的域名，然后单击：guilabel：'Verify'以检查CNAME记录是否已正确配置。完成后，点击：guilabel：'我确认，它完成了'。" -#: ../../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" @@ -2453,7 +2482,7 @@ msgstr "" "转到：menuselection：'分支-->选择您的分支 " "-->设置-->自定义域'，键入要添加到此数据库的域名，然后单击：guilabel：'添加域'。" -#: ../../content/administration/maintain/domain_names.rst:223 +#: ../../content/administration/maintain/domain_names.rst:228 msgid "" ":ref:`Odoo.sh branches: settings tab `" @@ -2461,14 +2490,14 @@ msgstr "" "：ref：'Odoo.sh分支： 设置选项卡 '" -#: ../../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 "" "确保 ：ref：'添加一个 CNAME 记录<域名/cname>' 到域名的 DNS **之前** 将您的域名与 Odoo 数据库进行映射。" -#: ../../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. " @@ -2478,7 +2507,7 @@ msgstr "" "如果不这样做，可能会妨碍验证 ：ref：'SSL 证书<域名/ssl>'，并导致 *证书名称不匹配* 错误。这通常由 Web 浏览器显示为警告，例如 " "*“您的连接不是专用的”*。" -#: ../../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 " @@ -2488,11 +2517,11 @@ msgstr "" "如果是这种情况，并且您在不到五天前已将域名添加到数据库的设置中，请等待 24 " "小时，因为验证可能仍会发生。否则，请“提交支持票证”_，包括您的CNAME记录的屏幕截图。" -#: ../../content/administration/maintain/domain_names.rst:240 +#: ../../content/administration/maintain/domain_names.rst:245 msgid "SSL encryption (HTTPS protocol)" msgstr "SSL 加密（HTTPS 协议）" -#: ../../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, " @@ -2501,7 +2530,7 @@ msgid "" msgstr "" "**SSL加密**是一种基于加密的互联网安全协议。它允许您的访问者通过安全连接浏览您的网站，该连接在您的网址开头显示为“https://”协议，而不是不安全的“http://”协议。" -#: ../../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 " @@ -2511,47 +2540,47 @@ msgstr "" "Odoo为每个域生成一个单独的SSL证书：ref：'在数据库管理器中映射<域名/db-" "map>“，使用与”让我们加密证书颁发机构和ACME协议“_的集成。" -#: ../../content/administration/maintain/domain_names.rst:251 +#: ../../content/administration/maintain/domain_names.rst:256 msgid "The certificate generation may take up to 24h." msgstr "证书生成最多可能需要 24 小时。" -#: ../../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 "如果您已经在使用其他服务，则可以继续使用它或简单地更改为Odoo。" -#: ../../content/administration/maintain/domain_names.rst:259 +#: ../../content/administration/maintain/domain_names.rst:264 msgid "Web base URL of a database" msgstr "数据库的 Web 基本 URL" -#: ../../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 "如果你有Odoo网站，你可以忽略这一部分，直接：ref：'将您的域名与您的网站<域名/网站地图>'。" -#: ../../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 "数据库的**Web基本URL**或**根URL**会影响您的主网站地址以及发送给客户的所有链接（例如，报价，门户链接等）。" -#: ../../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 "要对其进行配置，请使用您的自定义地址访问您的Odoo数据库，然后从登录屏幕以数据库管理员身份（*设置*组中的任何用户）登录。" -#: ../../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 " @@ -2559,7 +2588,7 @@ msgid "" msgstr "" "使用原始Odoo子域地址（例如，“example.odoo.com”）连接到数据库也会更新数据库的Web基本URL。请参阅下文，防止这些自动更新。" -#: ../../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 " @@ -2569,7 +2598,7 @@ msgstr "" "：menuselection：'Settings --> Technical --> System Parameters'。" -#: ../../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 " @@ -2577,68 +2606,68 @@ msgid "" msgstr "" "找到名为“web.base.url”的密钥（如果不存在，则创建它），然后输入网站的完整地址作为值，例如“https://www.example.com”。" -#: ../../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 "URL 必须包含协议“https://”（或“http://”），并且不得以斜杠 （“/”） 结尾。" -#: ../../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 "要防止在管理员登录数据库时自动更新 Web 基本 URL，可以创建以下系统参数：" -#: ../../content/administration/maintain/domain_names.rst:288 +#: ../../content/administration/maintain/domain_names.rst:293 msgid "key: ``web.base.url.freeze``" msgstr "key： ''web.base.url.freeze''" -#: ../../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 "它将域名定义为数据库的基本 URL，包括通过电子邮件发送给客户的门户链接。" -#: ../../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 "转到：menuselection：'网站 --> 配置 -->设置 --> 网站信息'。如果您有多个网站，请选择要配置的网站。" -#: ../../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 "" "在：guilabel：'Domain'字段中，填写您网站的网址（例如，''https://www.example.com''），然后单击：guilabel：'Save'。" -#: ../../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 " @@ -2646,7 +2675,7 @@ msgid "" msgstr "" "将您的域名与Odoo网站进行映射可防止Google将您的自定义域名“www.example.com”和原始odoo数据库地址“example.odoo.com”编入索引。" -#: ../../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 " @@ -2656,7 +2685,7 @@ msgstr "" "如果这两个地址都已编入索引，则 Google 可能需要一些时间才能移除第二个地址的索引。您也可以尝试使用“Google Search Console " "”_ 来解决此问题。" -#: ../../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 " @@ -2667,7 +2696,7 @@ msgstr "" "如果您的数据库中有多个网站和公司，请确保在网站设置中选择正确的 ：guilabel：'Company'，位于 ：guilabel：'Domain' " "设置旁边。这样做会根据正在使用的公司指示Odoo要将哪个URL用作：ref：'base URL'。" -#: ../../content/administration/maintain/domain_names.rst:329 +#: ../../content/administration/maintain/domain_names.rst:334 msgid ":doc:`/applications/general/email_communication/email_servers`" msgstr ":d oc：'/applications/general/email_communication/email_servers'" @@ -2801,6 +2830,312 @@ msgid "" msgstr "" "无需手动启动服务器，服务正在运行。您应该能够使用通常的识别方式连接到您的Odoo企业版实例。然后，您可以通过在表单输入中输入通过电子邮件收到的代码，将您的数据库与Odoo企业订阅链接" +#: ../../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 "在Google中设定" + +#: ../../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 "设置Odoo" + +#: ../../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 "更改托管解决方案" @@ -2817,30 +3152,24 @@ msgid "From on-premises to Odoo Online" msgstr "从本地到 Odoo Online" #: ../../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 "Odoo Online与**非标准应用程序**不兼容。" - -#: ../../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 "创建数据库的 ：ref：'duplicate'：在此副本中，卸载所有 **非标准应用**。" -#: ../../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" @@ -2851,39 +3180,49 @@ msgstr "" "并附加转储（如果文件太大，请使用任何文件传输服务并将链接附加到票证）。还要包括您的订阅号和要用于数据库的 URL（例如：my-" "company.odoo.com）。" -#: ../../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 +#: ../../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 "Odoo Online与**非标准应用程序**不兼容。" + +#: ../../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 "From on-premises to Odoo.sh" msgstr "从本地到 Odoo.sh" -#: ../../content/administration/maintain/hosting_changes.rst:26 -#: ../../content/administration/maintain/hosting_changes.rst:43 +#: ../../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 "按照 ：ref：'导入 Odoo.sh 文档'的数据库部分进行操作。" -#: ../../content/administration/maintain/hosting_changes.rst:27 +#: ../../content/administration/maintain/hosting_changes.rst:30 msgid "...and voilà!" msgstr "...瞧！" -#: ../../content/administration/maintain/hosting_changes.rst:30 +#: ../../content/administration/maintain/hosting_changes.rst:33 msgid "From Odoo Online to on-premises" msgstr "从 Odoo 在线到本地" -#: ../../content/administration/maintain/hosting_changes.rst:32 -#: ../../content/administration/maintain/hosting_changes.rst:40 +#: ../../content/administration/maintain/hosting_changes.rst:35 +#: ../../content/administration/maintain/hosting_changes.rst:43 msgid "" "Log into `your Odoo Online user portal " "`_ and look for the version " @@ -2891,7 +3230,7 @@ msgid "" msgstr "" "登录“您的Odoo在线用户门户”_并查找数据库的版本号。" -#: ../../content/administration/maintain/hosting_changes.rst:33 +#: ../../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" @@ -2902,8 +3241,8 @@ msgstr "" "：ref：'主要版本'，你还不能在本地托管它，你必须首先将其升级到一个新的主要版本。（*例如：如果您的数据库运行的Odoo" " 12.3不是主要版本，您必须首先将其升级到Odoo 13.0或14.0。" -#: ../../content/administration/maintain/hosting_changes.rst:34 -#: ../../content/administration/maintain/hosting_changes.rst:42 +#: ../../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" @@ -2912,16 +3251,16 @@ msgid "" msgstr "" "通过单击数据库名称旁边的“Gear”图标下载数据库备份，然后单击：menuselection：'Download'（如果由于备份文件太大而下载失败，请联系“我们的支持'_）" -#: ../../content/administration/maintain/hosting_changes.rst:35 -#: ../../content/administration/maintain/hosting_changes.rst:60 +#: ../../content/administration/maintain/hosting_changes.rst:38 +#: ../../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:38 +#: ../../content/administration/maintain/hosting_changes.rst:41 msgid "From Odoo Online to Odoo.sh" msgstr "从Odoo在线到 Odoo.sh" -#: ../../content/administration/maintain/hosting_changes.rst:41 +#: ../../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 " @@ -2932,30 +3271,99 @@ msgstr "" "托管它，你必须首先将其升级到一个新的主要版本。（*例如：如果您的数据库运行的Odoo 12.3不是主要版本，您必须首先将其升级到Odoo " "13.0或14.0。" -#: ../../content/administration/maintain/hosting_changes.rst:46 +#: ../../content/administration/maintain/hosting_changes.rst:49 msgid "From Odoo.sh to Odoo Online" msgstr "从 Odoo.sh 到Odoo在线" -#: ../../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." -msgstr "卸载所有**非标准应用**：首先在过渡版本中对其进行测试，然后在生产版本中进行测试。" +#: ../../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)." +"`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 "" -"“创建支持票证”_，并包括您的订阅号和要用于数据库的 URL（例如：my-" -"company.odoo.com）。" #: ../../content/administration/maintain/hosting_changes.rst:57 +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 "从 Odoo.sh 到本地" -#: ../../content/administration/maintain/hosting_changes.rst:59 +#: ../../content/administration/maintain/hosting_changes.rst:86 msgid "" "Grab a :ref:`backup of your Odoo.sh production database " "`." @@ -3279,6 +3687,7 @@ msgid ":ref:`online/users`" msgstr "：ref：'online/users'" #: ../../content/administration/maintain/online.rst:36 +#: ../../content/administration/odoo_sh/getting_started/branches.rst:285 #: ../../content/administration/upgrade.rst:10 msgid "Upgrade" msgstr "升级" @@ -3399,7 +3808,7 @@ msgid "" 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 "删除" @@ -3748,21 +4157,21 @@ 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 "我仍在使用老版本的 Odoo/OpenERP/TinyERP" -#: ../../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 "OpenERP 7.0、6.1、6.0和5.0在任何平台上均不再提供支持。" -#: ../../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 "TinyERP 4.0、3.0、2.0和1.0在任何平台上均不再提供支持。" -#: ../../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 `_." @@ -4047,6 +4456,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 "概述" @@ -4221,8 +4631,8 @@ msgstr "“---在初始化后停止”将在服务器实例完成您请求的操 #: ../../content/administration/odoo_sh/advanced/containers.rst:169 msgid "" "More options are available and detailed in the :doc:`CLI documentation " -"`." -msgstr "更多选项在:d中提供并详细介绍了”。" +"`." +msgstr "" #: ../../content/administration/odoo_sh/advanced/containers.rst:172 msgid "" @@ -4632,10 +5042,8 @@ msgstr "" 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 "" -"此方法等效于通过“应用”菜单或通过 :d oc：“命令行”的 ：code：'-u' " -"开关执行模块升级。" #: ../../content/administration/odoo_sh/getting_started/branches.rst:47 msgid "" @@ -5114,7 +5522,15 @@ msgstr "" "：ref：'构建视图'中的 Odoo.sh 转储下载按钮 。" -#: ../../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 @@ -5122,17 +5538,17 @@ 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 " @@ -5147,16 +5563,16 @@ msgstr "" "对于开发和暂存分支，您可以在收到新提交时更改分支的行为。默认情况下，开发分支将创建新的生成，过渡分支将更新以前的生成（请参阅 " "：ref：'生产阶段'）。如果您正在使用的功能需要特定的设置或配置，这将特别有用，以避免在每次提交时都必须再次手动设置它。如果为过渡分支选择新建版本，则每次推送提交时，它都会从生产版本中生成一个新副本。从暂存到开发的分支将自动设置为“不执行任何操作”。" -#: ../../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 ` " @@ -5165,32 +5581,32 @@ msgstr "" "*仅安装我的模块*将仅安装分支的模块。这是默认选项。排除了 ：ref：'子模块 '。" -#: ../../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 "*完整安装（所有模块）*将安装Odoo的分支模块，子模块中包含的模块和所有标准模块。运行完整安装时，将禁用测试套件。" -#: ../../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 "如果启用了测试，标准 Odoo 模块套件最多可能需要 1 小时。此设置仅适用于开发版本。暂存版本复制生产版本，而生产版本仅复制安装基础。" -#: ../../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 " @@ -5200,31 +5616,31 @@ msgstr "" "对于开发分支，可以选择启用或禁用测试套件。默认情况下，它处于启用状态。启用测试套件后，您可以通过指定测试标记 " "：ref：'测试标记<开发人员/参考/测试/选择>'来限制它们。" -#: ../../content/administration/odoo_sh/getting_started/branches.rst:326 +#: ../../content/administration/odoo_sh/getting_started/branches.rst:337 msgid "**Odoo Version**" msgstr "**Odoo版本**" -#: ../../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 "仅对于开发分支，如果您想在生产数据库升级到较新版本的过程中测试升级后的代码或开发功能，则可以更改Odoo的版本。" -#: ../../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 "您可以选择自动从最新的错误，安全性和性能修复中受益。您的Odoo服务器的来源将每周更新一次。这是“最新”选项。" -#: ../../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" @@ -5234,44 +5650,44 @@ msgstr "" "您可以通过从日期列表中选择 Odoo 源来选择它们，从而将 Odoo 源固定到特定修订版。修订将在 3 " "个月后过期。当到期日期临近时，您将收到邮件通知，如果您之后不采取行动，您将自动设置为最新修订版。" -#: ../../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 "您可以在此处为所选分支配置其他域。可以添加其他 *.odoo.com* 域或您自己的自定义域。对于后者，您必须：" -#: ../../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 "在注册商的域名管理器中，使用设置为生产数据库域名的“CNAME”记录配置域名。" -#: ../../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 "例如，要将 *www.mycompany.com* 与数据库 *mycompany.odoo.com* 相关联：" -#: ../../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 "在 Odoo.sh 中，在项目设置的自定义域中添加 *www.mycompany.com*，" -#: ../../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 " @@ -5280,31 +5696,31 @@ msgstr "" "在您的域名管理器中（例如 *godaddy.com*、*gandi.net*、*ovh.com*），将 *www.mycompany.com* " "配置为值为 *mycompany.odoo.com* 的“CNAME”记录。" -#: ../../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 "不接受裸域名（例如 *mycompany.com*）：" -#: ../../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 "它们只能使用“A”记录进行配置，" -#: ../../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 "“A”记录仅接受 IP 地址作为值，" -#: ../../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 "升级、硬件故障或您希望在其他国家或大洲托管数据库后，数据库的 IP 地址可能会发生变化。" -#: ../../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 "因此，由于 IP 地址的更改，裸域可能突然不再工作。" -#: ../../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 " @@ -5319,11 +5735,11 @@ msgstr "" " *mycompany.com* 配置为重定向到 *www.mycompany.com*。大多数域管理器都具有配置此重定向的功能。这通常称为 Web " "重定向。" -#: ../../content/administration/odoo_sh/getting_started/branches.rst:372 +#: ../../content/administration/odoo_sh/getting_started/branches.rst:383 msgid "**HTTPS/SSL**" msgstr "**HTTPS/SSL**" -#: ../../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 " @@ -5332,18 +5748,18 @@ msgid "" msgstr "" "如果正确设置了重定向，平台将在一小时内自动生成一个带有“让我们加密”_的SSL证书，您的域将通过HTTPS访问。" -#: ../../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 "虽然目前无法在 Odoo.sh 平台上配置自己的SSL证书，但如果有足够的需求，我们正在考虑该功能。" -#: ../../content/administration/odoo_sh/getting_started/branches.rst:382 +#: ../../content/administration/odoo_sh/getting_started/branches.rst:393 msgid "**SPF and DKIM compliance**" msgstr "**SPF 和 DKIM 合规性**" -#: ../../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 " @@ -5357,23 +5773,23 @@ msgstr "" " ：ref：'SPF ' 和 ：ref：'DKIM " "' 的文档中介绍了配置步骤。" -#: ../../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 "忘记配置您的SPF或DKIM以授权Odoo作为发送主机可能会导致您的电子邮件作为垃圾邮件在您的联系人收件箱中传递。" -#: ../../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 "在视图的右上角，可以使用不同的 shell 命令。" -#: ../../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 " @@ -5383,88 +5799,88 @@ msgstr "" "每个命令都可以在剪贴板中复制以在终端中使用，其中一些命令可以直接从 Odoo.sh " "通过单击*run*按钮使用，在这种情况下，弹出窗口将提示用户以定义最终占位符，例如“”，“”，..." -#: ../../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 "下载 Git 存储库。" -#: ../../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 "克隆存储库 *odoo/odoo*。" -#: ../../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 "：code：'--recurse-submodules'：下载存储库的子模块。子模块中包含的子模块也会被下载。" -#: ../../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 "：code：'--branch'：签出存储库的特定分支，在本例中为 *master*。" -#: ../../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 "*run* 按钮不可用于此命令，因为它应该在您的计算机上使用。" -#: ../../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 "基于分支 *master* 创建一个名为 *feature-1* 的新分支，然后将其签出。" -#: ../../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 "将新分支 *feature-1* 上传到远程存储库。" -#: ../../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 "合并当前分支中的分支 *staging-1*。" -#: ../../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 "上载您刚刚在远程存储库的 *master* 分支中添加的更改。" -#: ../../content/administration/odoo_sh/getting_started/branches.rst:456 +#: ../../content/administration/odoo_sh/getting_started/branches.rst:467 msgid "SSH" msgstr "SSH" -#: ../../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 "为了使用 SSH，您必须设置配置文件 SSH 公钥（如果尚未设置）。为此，请按照下列步骤操作：" -#: ../../content/administration/odoo_sh/getting_started/branches.rst:462 +#: ../../content/administration/odoo_sh/getting_started/branches.rst:473 msgid "" "`Generate a new SSH key '_" -#: ../../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 " "”_（仅应用步骤 1）" -#: ../../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 "将复制的内容粘贴到您的配置文件SSH键，然后按“添加”" -#: ../../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 "要使用 ssh 连接到构建，请在终端中使用以下命令：" -#: ../../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 "您将在右上角的 SSH 选项卡中找到此命令的快捷方式。" -#: ../../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" @@ -5516,29 +5932,29 @@ msgstr "" "collaborators>'，您将被授予对生成的 ssh 访问权限。" -#: ../../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 "不能保证长时间运行的 ssh 连接。空闲连接将断开连接以释放资源。" -#: ../../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." @@ -5546,25 +5962,25 @@ msgstr "" "子模块功能在本文档的 ：ref：'Submodules ' 一章中有详细说明。" -#: ../../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 "将存储库 ** 的分支 *master* 添加为当前分支中路径 ** 下的子模块。" -#: ../../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 "删除存储库的本地副本中的分支。" @@ -6242,12 +6658,10 @@ msgstr "或者，从您的计算机上，如果您有一个：ref：'安装Odoo< #: ../../content/administration/odoo_sh/getting_started/first_module.rst:97 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." +":download:`download this module structure template " +"` in which you replace every occurrences of " +"*my_module* to the name of your choice." msgstr "" -"如果您不想在计算机上安装Odoo，您也可以:d " -"ownload：'下载此模块结构模板“，您可以在其中将每个出现的*my_module*替换为您选择的名称。" #: ../../content/administration/odoo_sh/getting_started/first_module.rst:101 msgid "The below structure will be generated:" @@ -6760,44 +7174,44 @@ 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 "您可以在开发和过渡版本中编辑源代码（*/src* 下的文件）。" -#: ../../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 "Github 存储库的源代码位于 */src/user* 下，" -#: ../../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 "Odoo的源代码位于" -#: ../../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 "*/src/odoo* （'odoo/odoo '_），" -#: ../../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 "" "*/src/enterprise* （'odoo/enterprise '_），" -#: ../../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 `_)." @@ -6805,13 +7219,13 @@ msgstr "" "*/src/themes* （'odoo/design-themes '_）。" -#: ../../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` " @@ -6820,7 +7234,7 @@ msgstr "" "然后，您可以开始进行更改。您可以使用菜单 ：menuselection：'File --> Save ..文件“或按 ：kbd：”Ctrl+S“ " "快捷方式。" -#: ../../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 " @@ -6828,7 +7242,7 @@ msgid "" msgstr "" "如果您保存的Python文件位于Odoo服务器插件路径下，Odoo将检测到它并自动重新加载，以便您的更改立即反映出来，而无需手动重新启动服务器。" -#: ../../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 " @@ -6840,45 +7254,45 @@ msgstr "" "但是，如果更改是存储在数据库中的数据（如字段的标签或视图），则必须更新相应的模块才能应用更改。您可以使用菜单更新当前打开的文件的模块：菜单选择：'Odoo" " -->更新当前模块'。请注意，被视为当前打开的文件是文本编辑器中聚焦的文件，而不是文件浏览器中突出显示的文件。" -#: ../../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 "您可以提交更改并将其推送到 Github 存储库。" -#: ../../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 "使用 ：code：'cd ~/src/user' 将目录更改为 *~/src/user*，" -#: ../../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 "使用 ：code：'git add'暂存您的更改，" -#: ../../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 "使用 ：code：'git commit' 提交更改，" -#: ../../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 "使用 ：code：'git push https HEAD：' 推送您的更改。" -#: ../../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)," @@ -6886,18 +7300,18 @@ msgstr "" "*https* 是您的 *HTTPS* Github 远程存储库的名称（例如 " "https://github.com/username/repository.git），" -#: ../../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 "HEAD 是对您提交的最新修订版的引用，" -#: ../../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 " @@ -6918,7 +7332,7 @@ 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 " @@ -6928,7 +7342,7 @@ msgstr "" "Git 源文件夹 *~/src/user* " "不是在分支上签出的，而是在分离的修订版上签出的：这是因为构建工作是在特定修订版而不是分支上。换句话说，这意味着您可以在同一分支上拥有多个构建版本，但具有不同的修订版。" -#: ../../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." @@ -6940,11 +7354,11 @@ msgstr "" "settings>'，可能会创建一个新的构建版本。您可以继续在推送的编辑器中工作，因为它将具有与创建的新版本相同的修订版本，但始终确保在使用分支最新修订版本的生成编辑器中。" -#: ../../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 " @@ -6959,7 +7373,7 @@ msgstr "" "shell的最有趣的补充之一是“丰富的显示”_功能。因此，您将能够以HTML格式显示对象。" -#: ../../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 " "`_." @@ -6967,14 +7381,14 @@ msgstr "" "例如，您可以使用“pandas ”_来显示CSV文件的单元格。" -#: ../../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 "您还可以打开 Odoo Shell 控制台来使用数据库的 Odoo 注册表和模型方法。您也可以直接读取或写入您的记录。" -#: ../../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 " @@ -6985,13 +7399,13 @@ msgstr "" "在 Odoo " "控制台中，事务会自动提交。这意味着，例如，记录中的更改可以有效地应用于数据库中。如果更改用户名，则该用户的名称也会在数据库中更改。因此，您应该在生产数据库上谨慎使用Odoo控制台。" -#: ../../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 "您可以使用 *env* 调用数据库注册表的模型，例如 ：code：'env['res.users']'。" -#: ../../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 " @@ -7002,7 +7416,7 @@ 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." @@ -7377,7 +7791,6 @@ msgid "|assistance-contact|" msgstr "|辅助-接触|" #: ../../content/administration/upgrade.rst:32 -#: ../../content/administration/upgrade/odoo_sh.rst:66 msgid ":ref:`upgrade/sla`" msgstr "：ref：'upgrade/sla'" @@ -8173,130 +8586,196 @@ msgid "" "test upgrade before upgrading your production instance." msgstr "如果您使用的是网站或 Studio 应用程序，我们建议您始终在升级生产实例之前执行测试升级。" -#: ../../content/administration/upgrade/odoo_sh.rst:7 -#: ../../content/administration/upgrade/on_premise.rst:6 -msgid "Test upgrade request" -msgstr "测试升级请求" - -#: ../../content/administration/upgrade/odoo_sh.rst:9 +#: ../../content/administration/upgrade/odoo_sh.rst:10 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." +"Odoo.sh is integrated with the upgrade platform to make the upgrade process " +"easier." msgstr "" -"下载数据库的转储（从 ：ref：'Builds 视图 '），选择" -" “精确副本” 和 “不带文件存储” 选项。在 https://upgrade.odoo.com/upload " -"上传.sql.gz转储并选择测试目的。处理完后，您将获得数据库的转储作为回报。" -#: ../../content/administration/upgrade/odoo_sh.rst:15 +#: ../../content/administration/upgrade/odoo_sh.rst:13 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*." +"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" -msgstr "测试已升级的数据库" +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." -msgstr "在升级项目开始时，请确保通过分叉主分支来创建新的过渡分支以进行测试。" +"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 +#: ../../content/administration/upgrade/odoo_sh.rst:24 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." -msgstr "过渡生成完成后（如果由于版本不兼容而失败也没关系），请在分支的“*备份*”选项卡中导入升级后的转储。" +"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 ":doc:`../../administration/upgrade`" +msgstr "" + +#: ../../content/administration/upgrade/odoo_sh.rst:30 +msgid ":doc:`Upgrade FAQ <../upgrade/faq>`" +msgstr "" + +#: ../../content/administration/upgrade/odoo_sh.rst:31 +msgid ":doc:`Introduction to Odoo.sh <../odoo_sh/overview/introduction>`" +msgstr "" + +#: ../../content/administration/upgrade/odoo_sh.rst:36 +msgid "Upgrade your custom modules" +msgstr "" + +#: ../../content/administration/upgrade/odoo_sh.rst:38 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." -msgstr "该平台会自动检测转储的版本，并将Odoo源代码的版本更改为构建的相应版本。" - -#: ../../content/administration/upgrade/odoo_sh.rst:32 -msgid "" -"Test the upgraded database and make sure everything runs as it's supposed " -"to." -msgstr "测试升级后的数据库，确保一切按预期运行。" - -#: ../../content/administration/upgrade/odoo_sh.rst:35 -#: ../../content/administration/upgrade/on_premise.rst:41 -msgid "Upgrade your production database" -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:" -msgstr "一旦你测试了所有内容并且你满意，重新开始这个过程以获得最新的升级转储：" - -#: ../../content/administration/upgrade/odoo_sh.rst:40 -msgid "Make a new dump of your production database (as described in step 1)" -msgstr "对生产数据库进行新的转储（如步骤 1 中所述）" - -#: ../../content/administration/upgrade/odoo_sh.rst:41 -msgid "Upload it on upgrade.odoo.com and select the Production purpose" -msgstr "将其上传到 upgrade.odoo.com 并选择生产目的" - -#: ../../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." -msgstr "接收新升级的转储并将其导入生产分支。构建可能会被标记为失败，因为平台将使用升级后的数据库的Odoo版本以及旧的自定义代码来运行它。" +"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" -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." +"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:51 +msgid "Upgrade your database on a staging branch" msgstr "" -"如果出现任何问题，请记住您可以还原备份。在您对生产数据库执行任何 Odoo.sh " -"操作之前，平台将始终创建一个。如果恢复的备份来自以前的版本，平台将检测到它，并在需要时将项目的Odoo版本更改回去。" #: ../../content/administration/upgrade/odoo_sh.rst:53 -#: ../../content/administration/upgrade/on_premise.rst:48 -msgid "Custom modules (if applicable)" -msgstr "自定义模块（如果适用）" +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." -msgstr "包含自定义模块的数据库的升级过程分为 2 个步骤。" +"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." -msgstr "标准升级在升级请求完成后完成。" - -#: ../../content/administration/upgrade/odoo_sh.rst:58 -#: ../../content/administration/upgrade/on_premise.rst:53 +#: ../../content/administration/upgrade/odoo_sh.rst:62 msgid "" -"Your custom modules also need to be upgraded to keep them compatible with " -"the new version." -msgstr "您的自定义模块也需要升级，以使其与新版本兼容。" +"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:60 +#: ../../content/administration/upgrade/odoo_sh.rst:66 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')" -msgstr "根据您的合同，您的自定义模块的升级可以由您的合作伙伴 - Odoo自己完成（如果您持有“自定义维护”的订阅）" +"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: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 msgid "There are two ways to create your upgrade request." @@ -8368,6 +8847,10 @@ msgid "" "`_." 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" @@ -8375,12 +8858,26 @@ msgid "" "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" diff --git a/locale/zh_CN/LC_MESSAGES/finance.po b/locale/zh_CN/LC_MESSAGES/finance.po index d1eb7a9bf..4de2c251b 100644 --- a/locale/zh_CN/LC_MESSAGES/finance.po +++ b/locale/zh_CN/LC_MESSAGES/finance.po @@ -7,25 +7,20 @@ # bf2549c5415a9287249cba2b8a5823c7, 2021 # waveyeung , 2021 # 宣一敏 , 2021 -# liAnGjiA , 2021 +# Felix Yang , 2021 # liulixia , 2021 -# rsh <263737@qq.com>, 2021 # John Lin , 2021 -# Eddie Lim , 2021 # Emily Jia , 2021 # 敬雲 林 , 2021 # LINYUN TONG , 2021 -# guohuadeng , 2021 # Jeff Yu - Elico Corp , 2021 # v2exerer <9010446@qq.com>, 2021 -# Felix Yang , 2021 # zpq001 , 2021 # 黎伟杰 <674416404@qq.com>, 2021 # Connie Xiao , 2021 # fausthuang, 2021 # Richard yang , 2021 # Gary Wei , 2021 -# 老窦 北京 <2662059195@qq.com>, 2021 # Cécile Collart , 2021 # Norman Chang , 2021 # 湘子 南 <1360857908@qq.com>, 2021 @@ -36,10 +31,11 @@ # Benson , 2022 # 稀饭~~ , 2022 # e2f , 2022 -# Mandy Choy , 2022 -# Datasource International , 2022 -# Martin Trigaux, 2022 # Jeana Jiang, 2022 +# 老窦 北京 <2662059195@qq.com>, 2022 +# Datasource International , 2022 +# Mandy Choy , 2022 +# Martin Trigaux, 2022 # 山西清水欧度(QQ:54773801) <54773801@qq.com>, 2022 # #, fuzzy @@ -47,7 +43,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: 2021-11-02 08:47+0000\n" "Last-Translator: 山西清水欧度(QQ:54773801) <54773801@qq.com>, 2022\n" "Language-Team: Chinese (China) (https://www.transifex.com/odoo/teams/41243/zh_CN/)\n" @@ -81,29 +77,23 @@ msgstr "**Odoo会计**是一款功能齐全的会计应用程序。会计生产 #: ../../content/applications/finance/accounting.rst:18 msgid "" -"`Odoo Tutorials: Invoicing `_" -msgstr "`Odoo教程：发票 `_" - -#: ../../content/applications/finance/accounting.rst:19 -msgid "" "`Odoo Tutorials: Accounting `_" msgstr "`Odoo教程：会计 `_" -#: ../../content/applications/finance/accounting.rst:20 +#: ../../content/applications/finance/accounting.rst:19 msgid ":doc:`Accounting Cheat Sheet `" msgstr ":doc:`会计备忘单 `" #: ../../content/applications/finance/accounting/bank.rst:5 -msgid "Bank & Cash" -msgstr "银行&现金" +msgid "Bank and cash" +msgstr "" #: ../../content/applications/finance/accounting/bank/feeds.rst:5 -msgid "Bank Feeds" -msgstr "银行费用" +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 @@ -240,8 +230,8 @@ 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" -msgstr "银行同步：自动导入" +msgid "Bank synchronization: Automatic import" +msgstr "" #: ../../content/applications/finance/accounting/bank/feeds/bank_synchronization.rst:5 msgid "" @@ -283,6 +273,10 @@ msgid "**Ponto**: Europe (:doc:`more information `)" msgstr "**先斗**： 欧洲 （:d oc：'更多信息 '）" #: ../../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 @@ -290,6 +284,7 @@ msgstr "**先斗**： 欧洲 （:d oc：'更多信息 '）" #: ../../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 @@ -309,6 +304,7 @@ msgstr "**先斗**： 欧洲 （:d oc：'更多信息 '）" #: ../../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 @@ -317,6 +313,7 @@ msgstr "**先斗**： 欧洲 （:d oc：'更多信息 '）" #: ../../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 @@ -327,7 +324,7 @@ msgstr "**先斗**： 欧洲 （:d oc：'更多信息 '）" #: ../../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 @@ -338,11 +335,11 @@ msgstr "**先斗**： 欧洲 （:d oc：'更多信息 '）" 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 " @@ -352,34 +349,34 @@ msgid "" msgstr "" "为了能够使用此服务，您需要拥有有效的Odoo企业订阅。因此，请确保您的数据库已在您的Odoo企业合约中注册。我们还在您的数据库和第三方提供商之间使用代理，因此，如果发生连接错误，请检查您是否没有防火墙或代理阻止以下地址：" -#: ../../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 "https://production.odoofin.com/" -#: ../../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 "如果您在首次同步期间遇到任何问题，请确认您的 Web 浏览器不会阻止弹出窗口，并且您的广告拦截器已禁用。" -#: ../../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" @@ -391,38 +388,38 @@ msgid "" msgstr "" "在第一次同步期间，系统将要求您提供电话号码以保护您的帐户。我们要求提供此类信息的原因是，我们不希望您的数据落入坏人之手。因此，如果我们检测到您帐户中存在可疑活动，我们会阻止来自您帐户的所有请求，您需要使用该电话号码重新激活该请求。第三方提供商可能会要求您提供更多信息，以便与您的银行机构建立联系。这些信息不会存储在Odoo的服务器上。" -#: ../../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 "首次同步后，默认情况下，创建的日志每 12 小时同步一次。如果您愿意，可以通过单击仪表板上的*立即同步*按钮手动同步。" -#: ../../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" @@ -433,15 +430,15 @@ msgid "" 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 --> " @@ -451,17 +448,17 @@ msgstr "" "要向“Odoo支持”_报告连接错误，请转到：menuselection：'Accounting " "--> Configuration --> Online Synchronization'，选择失败的连接，然后复制错误描述和引用。" -#: ../../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" @@ -470,23 +467,23 @@ msgstr "" "这种断开连接可能是由 Odoo 支持引起的。在这种情况下，请直接与您的客户 ID " "或聊天中列出的错误参考联系“支持”_。" -#: ../../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 "在2020年12月之前安装了Odoo的用户的迁移过程" -#: ../../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 "如果您位于本地，请首先确保您的源代码是最新版本的Odoo的最新版本。" -#: ../../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 "在 2020 年 12 月之前创建数据库的用户需要手动安装新模块才能使用新功能。" -#: ../../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: " @@ -496,13 +493,13 @@ msgstr "" "为此，请转到：菜单选择：\"应用程序 - " ">更新应用程序列表\"，删除搜索栏中的默认过滤器，然后键入：**account_online_synchronization**。然后，您可以单击\"安装\"按钮以安装新模块。" -#: ../../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 "最后，确保所有用户都按 Ctrl+F5 刷新其 Odoo 页面。" -#: ../../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 " @@ -513,29 +510,29 @@ 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 "请不要卸载 *account_online_sync*，这是用于在线同步的上一个模块。新的将覆盖它。" -#: ../../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 "默认情况下，*account_online_synchronization* 随记帐自动安装。" -#: ../../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 " @@ -550,7 +547,7 @@ 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" @@ -559,32 +556,32 @@ msgid "" 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 "一些银行的状态为\"Beta\"。这是什么意思？" -#: ../../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 " @@ -595,11 +592,11 @@ msgid "" msgstr "" "这意味着我们的第三方提供商尚未完全支持银行机构。可能会出现错误或其他问题。Odoo不支持在Beta阶段银行出现的技术问题，但用户仍然可以选择连接。与这些银行建立联系有助于开发过程，因为提供商将获得来自连接的真实数据和反馈。" -#: ../../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," @@ -607,21 +604,21 @@ msgid "" "provided." msgstr "某些银行有额外的安全措施，需要额外的步骤，如短信/电子邮件身份验证代码或其他类型的 MFA。因此，在提供安全代码之前，集成器无法提取事务." -#: ../../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 "所有我的过去交易都不在Odoo，为什么？" -#: ../../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 "对于某些机构，能提取过去最多只3个月的交易。" -#: ../../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 " @@ -632,11 +629,11 @@ msgstr "" "在第一次同步期间，您选择了决定与Odoo同步的银行帐户。如果您没有同步任何帐户，则可以转到：菜单选择：\"会计 -->配置 " "-->联机同步\"，单击连接上的*Fetch Accounts*按钮。" -#: ../../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 " @@ -645,29 +642,29 @@ 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 ":doc:`bank_statements`" -#: ../../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 ":d oc：'ponto'" -#: ../../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 ":d oc：\"盐边\"" @@ -1173,10 +1170,7 @@ msgid "" 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 @@ -1290,7 +1284,7 @@ msgid "" 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 "类型" @@ -1935,16 +1929,94 @@ 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" -msgstr "Fiscal Localizations" +msgid "Fiscal localizations" +msgstr "" #: ../../content/applications/finance/accounting/fiscal_localizations/localizations.rst:5 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 "阿根廷" @@ -3034,7 +3106,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 "供应商账单" @@ -4468,7 +4539,6 @@ msgstr "" "been received by the SII." #: ../../content/applications/finance/accounting/fiscal_localizations/localizations/colombia.rst:3 -#: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:33 msgid "Colombia" msgstr "哥伦比亚" @@ -5990,6 +6060,604 @@ msgstr "" "incluya IVA de Bienes Cubiertos, se deberá realizar actualización manual " "correspondiente al IVA convencional." +#: ../../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 "客户端 ID" + +#: ../../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 "" +"Odoo 电子商务\n" +"---------------\n" +"\n" +"### 通过出色的联机商店优化销售.\n" +"\n" +"Odoo 是一个开放源码电子商务\n" +"不同于你以前见过的任何东西. 获取一个很棒的产品目录\n" +"和很棒的产品描述页面.\n" +"\n" +"它功能齐全，与您的管理软件整合，完全\n" +"可定制且超级简单.\n" +"\n" +"创建很棒的产品页面\n" +"----------------\n" +"\n" +"Odoo 独特的 *'edit inline'* 和构建模块方法使产品页面\n" +"创作出奇的容易. 想改变一个产品的价格? 或者把它\n" +"以黑体显示? 想要为特定产品增加横幅? \"只需点击并更改.\n" +"所见即所得. 真的.\n" +"\n" +"拖放精心设计的 *'Building Blocks'* 以创造精美的产品\n" +"您的客户会喜欢的页面.\n" +"\n" +"增加每个订单的收入\n" +"-------------------\n" +"\n" +"内置的交叉销售功能可帮助您提供与\n" +"相关的额外产品购物者放入购物车的物品. (例如配饰)\n" +"\n" +"Odoo 的追加销售算法允许您向访客展示相似但更多\n" +"比您看到的更贵的产品，有奖励措施.\n" +"\n" +"联机编辑功能可让您轻松更改价格，引导\n" +"只需点击一下，即可推广或微调产品描述.\n" +"\n" +"一个干净的 Google Analytics 整合\n" +"------------------------------------\n" +"\n" +"清楚地了解您的销售渠道. Odoo 的 Google Analytics 跟踪器\n" +"缺省设置为跟踪与购物相关的所有类型的事件\n" +"购物车、号召性用语等.\n" +"\n" +"由于 Odoo 营销工具(群发邮件、活动等)也与\n" +"相关联Google Analytics，您可以全面了解您的业务.\n" +"\n" +"瞄准新市场\n" +"--------\n" +"\n" +"毫不费力地将您的网站翻译成多种语言. Odoo 推荐\n" +"并自动跨页面传播翻译.\n" +"\n" +"我们的翻译\"按需\"功能让您受益于专业\n" +"翻译器自动翻译您的所有更改. 只需更改任何部分\n" +"关于您的网站(一篇新部落格文章、一次页面修改、产品描述，\n" +"...) 并且翻译版本会在大约 32 小时内自动更新.\n" +"\n" +"微调您的目录\n" +"---------------------\n" +"\n" +"完全控制您如何在目录页面中显示您的产品：\n" +"促销丝带、产品的相关尺寸、折扣、变体、网格/列表\n" +"视图等.\n" +"\n" +"联机编辑任何产品，使您的网站随客户需求而发展.\n" +"\n" +"获取新客户\n" +"---------\n" +"\n" +"SEO 工具已准备好使用，无需设置. Odoo 推荐\n" +"根据谷歌搜索最多的关键词，谷歌分析跟踪你的\n" +"购物车事件、站点地图是自动为 Google 索引创建的，\n" +"等等\n" +"\n" +"我们甚至会自动制作结构化内容来宣传您的产品和活动\n" +"在 Google 中效率很高.\n" +"\n" +"利用社群媒体\n" +"---------\n" +"\n" +"使用 Odoo 联机编辑功能轻松创建新的登录页面. 发送\n" +"您的不同营销活动的访客到特定目标网页到\n" +"优化转换.\n" +"\n" +"管理经销商网络\n" +"-------------------------\n" +"\n" +"管理经销商网络以瞄准新市场、在当地开展业务或扩大\n" +"你的发行版. 让他们访问你的经销商门户以获得高效\n" +"合作.\n" +"\n" +"联机推广您的经销商，将潜在客户转发给经销商(内置\n" +"地理定位功能)，定义具体的价格表，引导忠诚度计划\n" +"(向您的最佳客户或经销商提供特定折扣)等.\n" +"\n" +"在您的联机商店中受益于 Odoo 的强大功能：强大的税务引擎，\n" +"灵活的定价结构、真正的库存管理解决方案、经销商\n" +"接口，支持不同行为的产品；实物，\n" +"事件、服务、变体和选项等.\n" +"\n" +"您无需与仓库、销售或会计软件交互.\n" +"一切都与 Odoo 整合. 没有痛苦，即时.\n" +"\n" +"一个干净的结帐过程\n" +"------------\n" +"\n" +"通过干净的结帐流程将大多数访客兴趣转化为真实订单\n" +"步骤最少，每一页都有很好的可用性.\n" +"\n" +"自定义结帐流程以满足您的业务需求：付款方式，\n" +"配送方式、交叉销售、特殊条件等\n" +"\n" +"还有更多……\n" +"----------------\n" +"\n" +"### 联机销售\n" +"\n" +"- 移动界面\n" +"- 销售产品、活动或服务\n" +"- 灵活的价目表\n" +"- 产品多变体\n" +"- 多个商店\n" +"- 很棒的结帐过程\n" +"\n" +"### 客户服务\n" +"\n" +"- 跟踪订单的客户门户\n" +"- 通过网站即时聊天协助购物\n" +"- 退货管理\n" +"- 高级运输规则\n" +"- 优惠券或礼券\n" +"\n" +"### 订单管理\n" +"\n" +"- 高级仓库管理功能\n" +"- 发票和会计整合\n" +"- 群发邮件和客户细分\n" +"- 领导自动化和营销活动\n" +"- 持久购物车\n" +"\n" +"与其它应用程序完全整合\n" +"--------------------------------\n" +"\n" +"### CMS\n" +"\n" +"无需技术知识即可轻松创建出色的网站.\n" +"\n" +"### 博客\n" +"\n" +"撰写新闻，吸引新访客，创建客户忠诚度.\n" +"\n" +"### 联机活动\n" +"\n" +"联机安排、组织、推广或销售活动；会议、网络研讨会、培训等.\n" +"\n" + +#: ../../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 ":d oc：'../../税收/税收/税收'" + +#: ../../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 "法国" @@ -6106,10 +6774,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" @@ -6598,10 +7262,6 @@ msgid "" "then 3, then 2." msgstr "匹配是从最左边的数字完成的，从使用所有数字开始，然后是3，然后是2。" -#: ../../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 "代号" @@ -7323,7 +7983,7 @@ msgstr "" "`_" #: ../../content/applications/finance/accounting/fiscal_localizations/localizations/germany.rst:3 -#: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:52 +#: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:34 msgid "Germany" msgstr "德国" @@ -7370,7 +8030,7 @@ msgstr "" #: ../../content/applications/finance/accounting/fiscal_localizations/localizations/germany.rst:23 #: ../../content/applications/finance/accounting/fiscal_localizations/localizations/spain.rst:27 -#: ../../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 #: ../../content/applications/finance/accounting/reporting/overview/main_reports.rst:29 msgid "Balance Sheet" msgstr "资产负债表" @@ -7378,7 +8038,7 @@ msgstr "资产负债表" #: ../../content/applications/finance/accounting/fiscal_localizations/localizations/germany.rst:24 #: ../../content/applications/finance/accounting/fiscal_localizations/localizations/netherlands.rst:19 #: ../../content/applications/finance/accounting/getting_started/initial_configuration/chart_of_accounts.rst:17 -#: ../../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 msgid "Profit & Loss" msgstr "利润损失" @@ -8225,7 +8885,6 @@ msgstr "" "invoice to draft, edit it and re-assign a new serial number." #: ../../content/applications/finance/accounting/fiscal_localizations/localizations/italy.rst:3 -#: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:71 msgid "Italy" msgstr "意大利" @@ -9121,12 +9780,12 @@ msgid "" msgstr "如果您仍然没有一个合同 PAC，并且想要测试电子发票，则可以使用以下 SAT 测试证书：" #: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:244 -msgid ":download:`Certificate `" -msgstr ":d拥有：“证书<文件/证书.cer>”" +msgid ":download:`Certificate `" +msgstr "" #: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:245 -msgid ":download:`Certificate Key `" -msgstr ":d拥有：“证书密钥<文件/证书.key>”" +msgid ":download:`Certificate Key `" +msgstr "" #: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:246 msgid "**Password:** ``12345678a``" @@ -9347,10 +10006,6 @@ msgid "" "transactions: ``XEXX010101000``" msgstr "在 XML 中，增值税自动替换为国外交易记录的通用增值税：“XEXX010101000”" -#: ../../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 " @@ -9562,7 +10217,7 @@ msgid "" msgstr "如果在注册付款时，它是PPD类型，则将生成付款补充（XML）及其详细信息。" #: ../../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." @@ -9595,201 +10250,216 @@ msgid "" 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 "注册 PUE 付款" -#: ../../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 "如果在注册付款时它是PUE类型，那么在这种情况下，不会生成付款补充（XML），因为它不是必需的。" -#: ../../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 "开具操作总价值的电子发票（全票）。（CFDI原产地：07|预付发票，第 1 点）" -#: ../../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 "开具*Egreso*类型的电子发票。（CFDI原产地：07|Invoice_total，第2点）" -#: ../../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 "在Odoo中要遵循的步骤" -#: ../../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 "首付产品必须类型为*服务*，并且必须使用**NSPSC产品类别**：*84111506服务事实*。" -#: ../../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 "将首付产品添加为默认产品，以便在 Odoo 配置中使用。" -#: ../../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 "通过在上一步中创建的预付款发票的开头 + Folio Fiscal 添加“07 |”来添加预付款发票的原始 CFDI。" -#: ../../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 "验证并复制作品集会计以供以后使用（在示例中，作品集会计副本为：50E4FF06-4341-4006-A7C3-A7F653CBEFAE）" -#: ../../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 "从预付款发票创建**贷方通知单**（在确认之前必须编辑更正发票，请参阅以下2个图像下面的说明）" -#: ../../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 "在*确认*贷方通知单之前，请使用“'07|编辑原始 CFDIXXX“，而不是前缀”01“|三十''" -#: ../../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 "如果转到发票的 XML，则应在 CFDI 中看到与预付款发票的关系类型 07 和 Folio Fiscal。" -#: ../../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 " @@ -9800,22 +10470,22 @@ msgstr "" "现金折扣是您可以提供的激励措施，用于激励客户在指定时间段内付款。例如，如果客户在发票的最初 5 天内向您付款（即在 30 天内到期），则提供 2% " "d的折扣。这种方法可以大大缩短您的平均客户付款期。" -#: ../../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" @@ -9827,27 +10497,27 @@ msgstr "" "要配置预付款的折扣，请转到：菜单选择：“会计 - >配置 - >付款条件”，然后单击*创建*。添加具有相应值（例如，98% of 2% " "d计数的总价）和产品/服务有效的天数（例如 5 天）的百分比类型。如有必要，您还可以更改到期余额类型（在本例中为 30 天）。" -#: ../../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 "在指定折扣应用的天内注册付款，在我们的例子中，是在创建销售发票后的5天内。" -#: ../../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 "然后转到总计所在的发票底部，在那里您将看到2付款创建，重置为草稿并取消不对应的付款 - 与折扣相关的付款。" -#: ../../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 " @@ -9856,56 +10526,56 @@ msgid "" 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 "72 小时前" -#: ../../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 "如果需要取消在72小时内验证并发送给SAT的发票，请按照以下步骤操作。" -#: ../../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 "72 小时后" -#: ../../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 "如果需要取消超过72小时验证并发送给SAT的发票，则必须要求客户接受取消，为此必须遵循以下步骤。" -#: ../../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" @@ -9914,21 +10584,21 @@ msgid "" msgstr "" "点击*请求EDI取消*通知SAT您要取消发票，在这种情况下，客户必须进入SAT网页并批准它。（Odoo中**电子发票**字段的状态更改为*取消*）" -#: ../../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 "当客户（收件人/客户）在其SAT门户中批准取消时，现在可以将发票更改为草稿，然后单击*取消条目*。" -#: ../../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 "Odoo与SAT同步，通过预定操作更新**电子发票**的状态，在SAT中取消的发票将在Odoo中取消。" -#: ../../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" @@ -9938,7 +10608,7 @@ msgstr "" "单击“**请求 EDI 取消**”后，“电子发票”字段的状态将为“取消”，但 SAT 的状态将与“有效”相同，它将保持活动状态，直到最终客户/收件人在 " "SAT 中批准取消。" -#: ../../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 " @@ -9947,33 +10617,33 @@ msgid "" msgstr "" "一旦在SAT中取消，Odoo将通过每天执行的计划操作来同步SAT的状态，以同步SAT，电子发票和Odoo的状态（此计划操作可以通过进入开发人员模式手动执行）。" -#: ../../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 "如果发票在SAT中被取消，在Odoo中也会被取消，这允许您将发票切换到草稿并最终取消发票（*取消输入*）。" -#: ../../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 "如果发票已支付，则必须从发票创建贷方通知单，以便识别原始 CFDI 并在以后取消原始发票。" -#: ../../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." @@ -9983,108 +10653,108 @@ msgid "" msgstr "" "如果发票是上个月的发票，并且该期间已关闭，则该收入已在财务报告和政府中申报。在Odoo中，取消发票时，日记帐分录被消除，就好像已经报告的收入不存在一样，这代表了一个财政问题，因为收入已经在上个月申报了。" -#: ../../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 "在 SAT 取消发票" -#: ../../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 "如果会计期间因封锁日期而关闭，Odoo将不允许修改或添加与该会计期间相对应的日期的会计分录。" -#: ../../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 "在 SAT 中取消发票" -#: ../../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 "如果会计期间关闭，发票在SAT中被取消，Odoo中的状态将被公布，而**电子发票**状态将为*已发送*，SAT状态为*已取消*。" -#: ../../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 " @@ -10093,40 +10763,40 @@ msgid "" 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 "在Odoo中对墨西哥的会计由3份报告组成：" -#: ../../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 "电子会计科目表（称为 COA 并显示为 COA）。" -#: ../../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 "DIOT report." -#: ../../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 "1. 和 2.被视为电子会计，DIOT是仅在会计环境中可用的报告。" -#: ../../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 "您可以在：menuselection：'会计 -->报告 --> 墨西哥' 中找到所有这些报告" -#: ../../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" @@ -10135,17 +10805,17 @@ msgstr "" "电子发票从未如此简单，只需转到：menuselection：'会计 ->报告 -> 墨西哥 -> COA'，然后单击按钮 **导出为 SAT " "（XML）**。" -#: ../../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 "How to add new accounts ?" -#: ../../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 "如果使用 NNN 添加帐户。是的。ZZ 编码约定，其中 NNN.YY是一个SAT编码组，您的帐户将自动设置。" -#: ../../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 " @@ -10157,11 +10827,11 @@ msgstr "" "为新银行帐户添加帐户的示例转到：菜单选择：“会计 -->设置 -->科目表”，然后在“创建”按钮中创建一个新帐户，并尝试创建一个编号为 " "102.01.99 的帐户，一旦您更改为建立名称，您将看到一个自动配置的标签，配置的标签是选择在 XML 的 COA 中使用的标签。" -#: ../../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 " "`_" @@ -10171,7 +10841,7 @@ msgstr "" "要了解所有可能的标签，您可以在SAT网站上阅读“附件24”_，该部分名为**Código" " agrupador de cuentas del SAT**。" -#: ../../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" @@ -10180,11 +10850,11 @@ msgid "" msgstr "" "当您安装l10n_mx模块并且您的会计科目表依赖于它时（当您在数据库中安装墨西哥作为国家/地区的配置时，这会自动发生），默认情况下，它将具有最常用的标签。如果未创建所需的标记，则可以创建它。" -#: ../../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 " @@ -10195,27 +10865,27 @@ msgstr "" "与 COA 完全相同，但使用初始余额的贷方和借方，一旦您正确配置了 COA，您可以转到 ：menuselection：'Reports --> " "试算表'，这是自动生成的，可以使用顶部的按钮导出为 XML SAT （XML）**，以及之前选择要导出的时间段。" -#: ../../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 "所有正常的分析和列出的功能都可以在这里找到，以及任何正常的Odoo报告。" -#: ../../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 "DIOT Report (Requires Accounting App)" -#: ../../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 "什么是 DIOT 以及展示 SAT 的重要性" -#: ../../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 "当涉及到SAT管理服务的程序时，我们知道我们不应该忽视我们所呈现的内容。" -#: ../../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 " @@ -10224,25 +10894,25 @@ msgid "" msgstr "" "DIOT是第三方运营信息声明（DIOT），这是增值税的一项额外义务，我们必须将我们的运营状态提供给第三方，或者与我们的供应商一起被认为是相同的。" -#: ../../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 "这适用于个人和角色莫拉莱斯，因此，如果我们有增值税要提交给SAT并与供应商打交道，则必须发送DIOT。" -#: ../../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 "When to file the DIOT and in what format ?" -#: ../../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 "展示DIOT很容易，因为像所有格式一样，您可以在SAT页面上获得它，这是您可以在SAT网站上找到的电子表格A-29。" -#: ../../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 " @@ -10251,24 +10921,24 @@ msgid "" msgstr "" "如果您每个月与第三方有业务往来，则有必要像我们对增值税所做的那样出示DIOT，因此，如果在一月份我们与供应商达成协议，那么到2月份，我们必须提供与所述数据相关的信息。" -#: ../../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 "DIOT在哪里展示？" -#: ../../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 "您可以以不同的方式展示DIOT，这取决于您将选择哪一个，哪一个会更适合您，因为您每个月或每次与供应商打交道时都会展示它。" -#: ../../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 "A-29表格是电子的，因此您可以在SAT页面上显示它，但这是在进行了多达500次注册之后。" -#: ../../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 " @@ -10280,18 +10950,18 @@ msgstr "" "一旦这500条记录被输入SAT，您必须将它们提交给当地纳税人服务管理局（ALSC），并与您的税务地址通信，这些记录可以在CD或USB等数字存储介质上提交，一旦验证，他们将返回您，所以毫无疑问，您仍然会有这些光盘，当然，" " 您的 CD 或 USB。" -#: ../../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 "在DIOT中查看官方SAT文件时，您会发现批量加载，当然，我们认为的第一件事是什么？，根据SAT网站，它是：" -#: ../../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 " @@ -10302,7 +10972,7 @@ msgid "" msgstr "" "“批量加载”是将数据库从纳税人在文本文件中与供应商进行的交易记录（.txt）进行转换。这些文件具有必要的结构，可以应用并导入到第三方系统的操作信息声明中，从而避免直接捕获，从而优化了在集成中投入的时间，以便及时和形式地向SAT进行演示。" -#: ../../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 " @@ -10310,18 +10980,18 @@ msgid "" "Third Parties." msgstr "您可以使用它来呈现DIOT，因为它是允许的，这将促进此操作，因此它不存在，以避免在与第三方操作的信息声明方面与SAT保持一致。" -#: ../../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 "如何在Odoo中生成此报告？" -#: ../../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)`." @@ -10329,27 +10999,27 @@ msgstr "" "Go to :menuselection:`Accounting --> Reports --> Mexico --> Transactions " "with third partied (DIOT)`." -#: ../../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 "单击*导出 （XLSX）* 或 *打印 （TXT）*" -#: ../../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 "将下载的文件保存在安全的地方，转到SAT网站并按照必要的步骤进行声明。" -#: ../../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 "有关 DIOT 的供应商和发票数据的重要注意事项" -#: ../../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 " @@ -10360,34 +11030,34 @@ msgstr "" "所有供应商都必须在会计选项卡中配置名为“DIOT信息”的字段，只需在地址中选择适当的国家/地区即可完成L10N " "MX国籍字段，而无需在那里执行任何其他操作，但必须在所有提供商中配置l10n MX类型的操作。" -#: ../../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 "此报告有 3 个增值税选项，16%，0% and 免税，Odoo 中的一个发票行如果没有税收，则被视为免税，其他 2 个税种已正确配置。" -#: ../../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 "请记住，要支付代表预付款的发票，您必须首先请求发票，然后付款并按照标准Odoo程序正确对帐付款。" -#: ../../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" @@ -10398,74 +11068,74 @@ msgid "" msgstr "" "如果未考虑其中一些注意事项，则当您在TXT中生成DIOT时，将显示这样的消息，其中包含验证此特定报告所需的所有合作伙伴，这就是我们建议使用此报告的原因，而不仅仅是用于导出您的法律信息。义务，但在月底之前生成它，并将其用作您的听觉过程，以查看您的所有合作伙伴是否都已正确配置。" -#: ../../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 "Odoo的结束财政期" -#: ../../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 "将Odoo中的银行余额与对账单上的当前银行余额进行比较。使用报告**银行对帐**来帮助您完成此操作。" -#: ../../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 " @@ -10476,38 +11146,38 @@ 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" @@ -10515,7 +11185,7 @@ msgid "" msgstr "" "如果您的会计师正在进行年终审计，他们将希望拥有资产负债表项目（例如贷款，银行帐户，预付款，销售税报告等）的副本进行比较。您在Odoo中的余额。" -#: ../../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" @@ -10525,11 +11195,11 @@ msgid "" 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 " @@ -10538,7 +11208,7 @@ msgid "" msgstr "" "在Odoo中，无需进行特定的年终条目来关闭报告收入账户。练习的结果在账户类型（当年收入）中自动计算，收入 - 支出之间的差额将被累积以计算它。" -#: ../../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 " @@ -10548,7 +11218,7 @@ msgid "" msgstr "" "这些报告是实时创建的，这意味着**收入报告**直接对应于您在Odoo中指定的年份的截止日期。此外，在您生成**收入报告**的任何时候，开始日期将对应于**会计年度**的开始日期，帐户余额将全部为0。" -#: ../../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 " @@ -10556,14 +11226,14 @@ msgid "" msgstr "" "截至 12 月 31 日，资产负债表显示未确认的当年收益（MX 账户中的科目类型本年度未分配总收益 305.01.01 ['当前年度收益'类型]）" -#: ../../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 "会计师应创建一个日记帐分录，以确认“往年结果”账户（墨西哥为304.01.01）上往年累计收益中的年度结果 - 这是一个股票账户。" -#: ../../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 " @@ -10572,11 +11242,11 @@ msgid "" 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 " @@ -10586,26 +11256,26 @@ msgid "" msgstr "" "会计师创建日记帐分录以查找当年的**当前收益**后，他们必须将**结束日期**设置为会计年度的最后一天。确保在这样做之前，**资产负债表**中当年的当前收益是否正确报告余额0。" -#: ../../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 "Extra Recommended features" -#: ../../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." @@ -10615,11 +11285,11 @@ msgid "" msgstr "" "在墨西哥，几乎所有公司都以不同的货币发送和接收付款。如果要执行此操作，可以启用多币种的使用。您还应该启用与**墨西哥银行服务**的同步，因为这将允许您自动获得SAT的汇率，而无需每天在Odoo中手动创建此信息。" -#: ../../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)" @@ -10627,7 +11297,7 @@ msgstr "" "Enabling Explicit errors on the CFDI using the XSD local validator (CFDI " "3.3)" -#: ../../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 " @@ -10637,21 +11307,21 @@ msgstr "" "通常，您希望从xml上错误设置的字段中收到显式错误，如果启用检查，则这些错误会更好地通知用户，以启用与xsd一起检查功能，请按照以下步骤操作（启用：ref：'developer" " mode '）。" -#: ../../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 "" "Go to :menuselection:`Settings --> Technical --> Actions --> Server Actions`" -#: ../../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 "Look for the Action called \"Download XSD files to CFDI\"" -#: ../../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 "Click on button \"Create Contextual Action\"" -#: ../../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`" @@ -10659,15 +11329,15 @@ msgstr "" "Go to the company form :menuselection:`Settings --> Users&Companies --> " "Companies`" -#: ../../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 "Open any company you have." -#: ../../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 "Click on \"Action\" and then on \"Download XSD file to CFDI\"." -#: ../../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 " @@ -10677,7 +11347,7 @@ msgstr "" "code which is pretty common) and an explicit error will be shown instead a " "generic one with no explanation." -#: ../../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 "If you see an error like this:" @@ -10695,30 +11365,30 @@ msgstr "" "'{http://www.sat.gob.mx/sitio_internet/cfd/catalogos}c_TipoRelacion' 不解析为 " "a（n） 简单类型定义。第 36 行。”" -#: ../../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 "这可能是由在另一台服务器中还原的数据库备份引起的，也可能是由于未正确下载 XSD 文件引起的。请按照与上述相同的步骤操作，但：" -#: ../../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 "Go to the company in which the error occurs." -#: ../../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 "单击*操作*，然后单击*将XSD文件下载到CFDI*。" -#: ../../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 "**Error messages** (Only applicable on CFDI 3.3):" -#: ../../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': " @@ -10729,7 +11399,7 @@ msgstr "" "'{http://www.sat.gob.mx/cfd/3}Concepto'， 属性 'NoIdentificacion'： [facet " "'minLength'] 值 '' 的长度为 '0';这低于允许的最小长度'1'。" -#: ../../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': " @@ -10740,7 +11410,7 @@ msgstr "" "'{http://www.sat.gob.mx/cfd/3}Concepto'， 属性 'NoIdentificacion'： [facet " "'pattern'] 值 '' 不被模式 '[^|] 接受{1,100}'.''" -#: ../../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 " @@ -10750,15 +11420,15 @@ msgstr "" "product, please go to the product form and set your internal reference " "properly." -#: ../../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 "**Error messages**:" -#: ../../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 " @@ -10767,7 +11437,7 @@ msgstr "" "''6：0：ERROR：SCHEMASV：SCHEMAV_CVC_COMPLEX_TYPE_4： Element " "'{http://www.sat.gob.mx/cfd/3}RegimenFiscal'： 属性 'Regimen' 是必需的，但缺少。" -#: ../../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 " @@ -10776,7 +11446,7 @@ msgstr "" "''5：0：ERROR：SCHEMASV：SCHEMAV_CVC_COMPLEX_TYPE_4： 元素 " "'{http://www.sat.gob.mx/cfd/3}Emisor'： 属性 'RegimenFiscal' 是必需的，但缺少。" -#: ../../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" @@ -10787,25 +11457,25 @@ msgid "" msgstr "" "**解决方案**：您忘记在公司的合作伙伴上设置适当的“财务状况”。转到客户，删除客户筛选器并查找称为您公司的合作伙伴，并设置适当的财务状况，这是您的公司所做的与SAT可能值列表相关的业务类型，另一种选择可能是您忘记遵循有关财务状况的注意事项。" -#: ../../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 "您需要转到财政头寸设置并设置正确的代码（它是名称的前3个数字），例如，对于测试，您需要设置601，它将看起来像图片。" -#: ../../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 "出于测试目的，此值必须设置为“601 - General de Ley Personas Morales”，这是增值税演示所需的值。" -#: ../../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 "**Error message**:" -#: ../../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 " @@ -10819,11 +11489,11 @@ msgstr "" "'13'， '14'， '15'， '17'， '23'， '24'， '25'， '26'， '27'， '28'， '29'， '30'， " "'99'}''" -#: ../../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 "**Solution**: The payment method is required on your invoice." -#: ../../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': " @@ -10833,8 +11503,8 @@ msgstr "" "'{http://www.sat.gob.mx/cfd/3}Comprobante'， attribute 'LugarExpedicion'： " "[facet 'enumeration'] 值 '' 不是集合 {'00'' 的元素" -#: ../../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': '' " @@ -10845,7 +11515,7 @@ msgstr "" "'{http://www.sat.gob.mx/cfd/3}Comprobante'， 属性 'LugarExpedicion'： '' 不是原子类型 " "'{http://www.sat.gob.mx/sitio_internet/cfd/catalogos}c_CodigoPostal' 的有效值。" -#: ../../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 " @@ -10854,7 +11524,7 @@ msgstr "" "''5：0：ERROR：SCHEMASV：SCHEMAV_CVC_COMPLEX_TYPE_4： 元素 " "'{http://www.sat.gob.mx/cfd/3}Emisor'：属性 'Rfc' 是必需的，但缺少。" -#: ../../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 " @@ -10865,13 +11535,13 @@ msgstr "" "**解决方案**：您必须正确配置公司地址，这是一组必填字段，您可以在：menuselection中转到您的公司配置：'设置-->用户和公司-->公司'，然后按照本节中的步骤填写地址的所有必填字段：：ref：'mx-" "legal-info'。" -#: ../../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 " @@ -10880,7 +11550,7 @@ msgstr "" "''18：0：ERROR：SCHEMASV：SCHEMAV_CVC_COMPLEX_TYPE_4： Element " "'{http://www.sat.gob.mx/cfd/3}Traslado'： 属性 'TipoFactor' 是必需的，但缺少。" -#: ../../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 " @@ -10889,7 +11559,7 @@ msgstr "" "''34：0：ERROR：SCHEMASV：SCHEMAV_CVC_COMPLEX_TYPE_4： Element " "'{http://www.sat.gob.mx/cfd/3}Traslado'： 属性 'TipoFactor' 是必需的，但缺少。" -#: ../../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" @@ -10910,7 +11580,7 @@ msgstr "" "“如果 cce11： ComercioExterior： TipoOperacion registered 是 '1' 或 '2'，则必须注册 XXXX" " 属性。" -#: ../../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 "**解决方案**：有必要指定国际贸易术语解释通则。" @@ -10927,27 +11597,27 @@ msgstr "" "''属性 cce11： 外贸： 货物： 货物： 海关单位必须具有目录 catCFDI： c_FraccionArancelaria 列 'UMT' " "当属性 cce11： 外贸： 货物： 我 ''" -#: ../../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 "**解决方案**：关税分数必须具有计量单位01的代码，对应于千克。" -#: ../../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 "：缩写：'CFDI（Comprobante Fiscal Digital por Internet）'：在线数字税收收据" -#: ../../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 "：缩写：'CSD （Certificado de Sello Digital）'： Digital Seal Certificate" -#: ../../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" @@ -10955,11 +11625,11 @@ msgstr "" "：abbr：'PAC （Proveedores Autorizados de Certificación）'： Authorized " "Certification Provider" -#: ../../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 " @@ -10967,7 +11637,7 @@ msgid "" msgstr "" "附录：可以附加到互联网数字税收收据（CFDI）的信息补充，这些信息通常是墨西哥某些公司（如沃尔玛，Tiendas Sorianas等）所要求的。" -#: ../../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 " @@ -10977,7 +11647,7 @@ msgstr "" "：abbr：'UUID（通用唯一标识符）'：它是通用唯一标识符的英文首字母缩写。UUID 相当于 Folio Fiscal，它由 32 " "个十六进制数字组成，以连字符分隔的 5 个组显示。" -#: ../../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 " @@ -10987,7 +11657,6 @@ msgstr "" "LCO：义务纳税人名单（LCO）是国家税务总局发布的名单，用于核算其授权开具发票和工资单的所有纳税人。这意味着，为了能够以电子方式向您的客户开具账单，您必须在此数据库中。" #: ../../content/applications/finance/accounting/fiscal_localizations/localizations/netherlands.rst:2 -#: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:96 msgid "Netherlands" msgstr "荷兰" @@ -11030,7 +11699,6 @@ msgid "Intrastat Report (ICP)" msgstr "Intrastat Report (ICP)" #: ../../content/applications/finance/accounting/fiscal_localizations/localizations/peru.rst:3 -#: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:105 msgid "Peru" msgstr "秘鲁" @@ -12311,8 +12979,8 @@ msgstr "" "your fiscal positions accordingly." #: ../../content/applications/finance/accounting/fiscal_localizations/overview/fiscal_localization_packages.rst:3 -msgid "Fiscal Localization Packages" -msgstr "财政本地化软件包" +msgid "Fiscal localization packages" +msgstr "" #: ../../content/applications/finance/accounting/fiscal_localizations/overview/fiscal_localization_packages.rst:5 msgid "" @@ -12389,11 +13057,6 @@ msgstr ":d：'localizations_list'" msgid ":doc:`../../getting_started/initial_configuration/chart_of_accounts`" msgstr ":d oc：'../../getting_started/initial_configuration/chart_of_accounts'" -#: ../../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 ":d oc：'../../税收/税收/税收'" - #: ../../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-" @@ -12414,380 +13077,296 @@ msgstr "" "Packages'的列表。" #: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:10 -msgid "Fiscal Localization Packages available" -msgstr "提供财务本地化包" +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" -msgstr "阿根廷会计" +#: ../../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" -msgstr "中国 - 城市数据" +#: ../../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 "Colombian - Accounting" - -#: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:36 -msgid "Colombian - Point of Sale" -msgstr "哥伦比亚 - POS" - -#: ../../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 "克罗地亚-会计 (RRIF 2012)" -#: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:40 -msgid "Denmark" -msgstr "丹麦" +#: ../../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 "Denmark - Accounting Reports" - -#: ../../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" -msgstr "厄瓜多尔 - 会计" +#: ../../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 "欧盟的一站式迷你商店 (MOSS)" - -#: ../../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 "德国 SKR04 - 财务" -#: ../../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 "德国 SKR04 - 财务" -#: ../../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 "印度-门店POS" - -#: ../../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" -msgstr "拉丁美洲" +#: ../../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 "LT - 会计报表" - -#: ../../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 "OHADA - 会计" -#: ../../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" -msgstr "秘鲁会计" +#: ../../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 "西班牙 － 会计(PGCE 2008)" -#: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:119 -msgid "Sweden" -msgstr "瑞典" +#: ../../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 "瑞典 - 结构化通信 OCR" - -#: ../../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" -msgstr "乌拉圭会计模块" +#: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:81 +msgid "Uruguay - Accounting" +msgstr "Uruguay - Accounting" -#: ../../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 ":d：'fiscal_localization_packages'" #: ../../content/applications/finance/accounting/getting_started.rst:5 -msgid "Getting Started" -msgstr "入门" +msgid "Getting started" +msgstr "POS 入门" #: ../../content/applications/finance/accounting/getting_started/initial_configuration.rst:5 -msgid "Initial Configuration" -msgstr "初始配置" +msgid "Initial configuration" +msgstr "" #: ../../content/applications/finance/accounting/getting_started/initial_configuration/chart_of_accounts.rst:3 #: ../../content/applications/finance/accounting/getting_started/initial_configuration/setup.rst:100 @@ -12812,30 +13391,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 "费用" @@ -12881,116 +13460,116 @@ msgid "" "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 " @@ -13000,69 +13579,68 @@ msgstr "" "某些科目类型会显示新字段**自动化**创建:ref:`资产`分录、:ref:`递延费用`分录和:ref:`递延收入`分录." -#: ../../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 " @@ -13071,7 +13649,7 @@ msgid "" 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 " @@ -13080,54 +13658,54 @@ msgstr "" "如要显示科目组的**试算表**报告，前往 :menuselection:`会计 --> 报告 --> " "试算表`，然后打开*选项*菜单并选择**层级及小计**." -#: ../../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 ":doc:`../../payables/supplier_bills/assets`" -#: ../../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 ":doc:`../../payables/supplier_bills/deferred_expenses`" -#: ../../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 ":doc:`../../receivables/customer_invoices/deferred_revenues`" -#: ../../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 @@ -13923,6 +14501,12 @@ msgstr "50" 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 " @@ -14859,7 +15443,7 @@ msgid "" "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 " @@ -14869,32 +15453,32 @@ 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 "下一步是启动分析会计。在会计软件，选择 :menuselection:`配置 --> 设置` ， 选择分析会计。" -#: ../../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 " @@ -14904,25 +15488,25 @@ msgstr "" "首先，你应该创建一个分析科目用来记录所有的费用。输入会计应用程序，选择 :menuselection:`配置 --> 分析帐户` " "创建一个新的。在这种情况下，我们将称之为“咨询包\" ，为我们的客户Smith&Co所创建。 " -#: ../../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 "我们先登记一个费用。我们的IT技术人员乘火车去看我们的客户。他自己支付机票." -#: ../../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 " @@ -14932,32 +15516,32 @@ msgstr "" "我们首先需要创建一个可报销的产品。进入 **报销** 模块，点击 :menuselection:`配置 --> 报销产品` " "。创建一个新产品，名为火车票，设置成本价格为15.50欧元。确保 **可以报销** 已勾选。" -#: ../../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 "进入报销模块，点击 :menuselection:`我的费用 --> 创建` 。选择火车票产品，将其链接之前讨论过的科目上。" -#: ../../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 " @@ -14966,18 +15550,18 @@ msgid "" 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 " @@ -14987,33 +15571,33 @@ 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 "你也可以用工时表跟踪成本, 请参阅 : :doc:`timesheets` " -#: ../../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 "进入会计模块，点击 :menuselection:`顾问 --> 分析会计 --> 打开图表` 。" -#: ../../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 " @@ -16297,10 +16881,10 @@ 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 " @@ -16499,6 +17083,10 @@ msgid "" "Register the payment and set the currency." msgstr "在会计应用程序中，前往 :menuselection:`销售 --> 付款`。登记付款并设置币种." +#: ../../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 "" @@ -16616,8 +17204,8 @@ msgid ":doc:`how_it_works`" msgstr ":doc:`how_it_works`" #: ../../content/applications/finance/accounting/payables.rst:5 -msgid "Account Payables" -msgstr "应付账款" +msgid "Account payables" +msgstr "" #: ../../content/applications/finance/accounting/payables/misc/forecast.rst:3 msgid "Forecast future bills to pay" @@ -16722,12 +17310,12 @@ msgid "" msgstr "从这个页面上,使用汇总“到期日”功能, 通过数据透视表或图表视图可得到下个月的应付到期额。" #: ../../content/applications/finance/accounting/payables/pay.rst:5 -msgid "Vendor Payments" -msgstr "供应商账单" +msgid "Vendor payments" +msgstr "" #: ../../content/applications/finance/accounting/payables/pay/check.rst:3 -msgid "Pay by Checks" -msgstr "使用支票支付" +msgid "Pay by checks" +msgstr "" #: ../../content/applications/finance/accounting/payables/pay/check.rst:5 msgid "" @@ -17280,9 +17868,13 @@ msgstr "用SEPA支付,收款人必须有有效的IBAN和BIC。如果这个提示 msgid ":doc:`check`" msgstr ":doc:`check`" +#: ../../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" -msgstr "非流动资产和固定资产" +msgid "Non-current assets and fixed assets" +msgstr "" #: ../../content/applications/finance/accounting/payables/supplier_bills/assets.rst:5 msgid "" @@ -17690,8 +18282,8 @@ msgstr "" "例如，你可将此科目选择为某产品默认的**费用科目**，以自动化其采购流程。（参见:ref:`product-assets-account`）." #: ../../content/applications/finance/accounting/payables/supplier_bills/deferred_expenses.rst:3 -msgid "Deferred Expenses and Prepayments" -msgstr "递延费用和预付款" +msgid "Deferred expenses and prepayments" +msgstr "" #: ../../content/applications/finance/accounting/payables/supplier_bills/deferred_expenses.rst:5 msgid "" @@ -17917,9 +18509,157 @@ msgid "" "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" -msgstr "管理供应商账单" +msgid "Manage vendor bills" +msgstr "" #: ../../content/applications/finance/accounting/payables/supplier_bills/manage.rst:5 msgid "" @@ -18249,103 +18989,9 @@ msgid "" msgstr "" "当然建立一个供应商账单并选择合适的采购订单，你可以继续选择增加的采购订单.Odoo将根据你选择的采购订单增加行项目。如果你没有从首个采购订单删除之前的行项目，供应商账单将会链接到所有合适的采购单." -#: ../../content/applications/finance/accounting/payables/supplier_bills/ocr.rst:3 -msgid "Digitize Vendor Bills with Optical Character Recognition (OCR)" -msgstr "使用光学字符识别（OCR）数字化供应商账单" - -#: ../../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 "转到：menuselection：'会计 -->设置 -->账单数字化'，然后选择是应自动（使用 OCR）还是手动（按需）处理账单。" - -#: ../../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 "" -"扫描帐单，然后转到 :menuselection:`会计 --> 供应商 --> 帐单` 并上传您的文档。 " -"根据您的配置，它要么自动处理文档，或者您需要单击 *发送数字化* 以手动进行." - -#: ../../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 "一旦数据从PDF中提取出来，如果有必要，您可以通过单击相应的标记 (在 *编辑* 模式下可用) 并选择正确的信息来纠正它." - -#: ../../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 "*账单数字化*是一种*应用内购买（IAP）*服务，需要预付积分才能工作。对一个文档进行数字化会消耗一个配额。" - -#: ../../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 "" -"如要购买积分，请转到:menuselection:`会计 --> 配置 --> 设置 --> 帐单数字化` ，然后单击 *购买积分* ，或转到 " -":menuselection:`设置 --> Odoo IAP` ，然后单击 *查看我的服务* ." - -#: ../../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 "如果你是Odoo Online (SAAS)企业版用户，你可用免费试用积点来测试这项功能." - -#: ../../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" -msgstr "采购收据" +msgid "Purchase receipts" +msgstr "" #: ../../content/applications/finance/accounting/payables/supplier_bills/purchase_receipts.rst:5 msgid "" @@ -18415,13 +19061,12 @@ msgid ":doc:`/applications/finance/expenses`" msgstr ":d oc：'/applications/finance/expense'" #: ../../content/applications/finance/accounting/receivables.rst:5 -msgid "Account Receivables" -msgstr "应收账款" +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" -msgstr "客户结算单" +msgid "Customer invoices" +msgstr "" #: ../../content/applications/finance/accounting/receivables/customer_invoices/cash_discounts.rst:3 msgid "Offer cash discounts" @@ -18506,7 +19151,7 @@ msgid ":doc:`../../receivables/customer_invoices/payment_terms`" msgstr ":doc:`../../receivables/customer_invoices/payment_terms`" #: ../../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 @@ -18566,8 +19211,8 @@ msgid "" msgstr "在编辑发票草稿时，打开*其他信息*选项卡，前往*会计信息*部分，并选择适当的*现金舍入方法*." #: ../../content/applications/finance/accounting/receivables/customer_invoices/credit_notes.rst:3 -msgid "Credit Notes and Refunds" -msgstr "贷项凭单和退款" +msgid "Credit notes and refunds" +msgstr "" #: ../../content/applications/finance/accounting/receivables/customer_invoices/credit_notes.rst:4 msgid "" @@ -18726,8 +19371,8 @@ msgid "" msgstr "这是生成并用于逆转以上原发票的贷项凭单日记账分录：" #: ../../content/applications/finance/accounting/receivables/customer_invoices/deferred_revenues.rst:3 -msgid "Deferred Revenues" -msgstr "递延收入" +msgid "Deferred revenues" +msgstr "" #: ../../content/applications/finance/accounting/receivables/customer_invoices/deferred_revenues.rst:5 msgid "" @@ -19335,9 +19980,27 @@ msgid "" "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" -msgstr "付款条件和分期付款计划" +msgid "Payment terms and installment plans" +msgstr "" #: ../../content/applications/finance/accounting/receivables/customer_invoices/payment_terms.rst:5 msgid "" @@ -19586,56 +20249,56 @@ msgid "" "`_" msgstr "'Odoo教程：条款和条件（T&C）和付款条款'_" -#: ../../content/applications/finance/accounting/receivables/customer_invoices/snailmail.rst:3 -msgid "Send your Invoices by Post (Snailmail)" -msgstr "邮寄发票(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: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 "在电子邮件收件箱总是被挤得满满当当的时候，直接邮寄是吸引个人关注的好方法.Odoo可直接从数据库向全球各地邮政寄送发票和催款报告." -#: ../../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 "设置Snailmail" -#: ../../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 "前往 :menuselection:`会计 --> 设置 --> Snailmail`并启用此功能." -#: ../../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 "*Snailmail*是一项*应用内购买(IAP)*服务，需要预付费邮戳（=信用）才能运行。发送一份文件消耗一个邮戳." -#: ../../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 " @@ -19646,17 +20309,23 @@ 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 "如果你是Odoo Online (SAAS)企业版用户，你可用免费试用积点来测试这项功能." + +#: ../../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" -msgstr "客户付款" +msgid "Customer payments" +msgstr "" #: ../../content/applications/finance/accounting/receivables/customer_payments/batch.rst:3 -msgid "Batch Payments: Batch Deposits (checks, cash etc.)" -msgstr "批量支付:批量存款(支票、现金等)" +msgid "Batch payments: Batch deposits (checks, cash etc.)" +msgstr "" #: ../../content/applications/finance/accounting/receivables/customer_payments/batch.rst:5 msgid "" @@ -19799,8 +20468,8 @@ msgid ":doc:`batch_sdd`" msgstr ":doc:`batch_sdd`" #: ../../content/applications/finance/accounting/receivables/customer_payments/batch_sdd.rst:3 -msgid "Batch Payments: SEPA Direct Debit (SDD)" -msgstr "批量付款：SEPA直接借记(SDD)" +msgid "Batch payments: SEPA Direct Debit (SDD)" +msgstr "" #: ../../content/applications/finance/accounting/receivables/customer_payments/batch_sdd.rst:5 msgid "" @@ -19956,6 +20625,10 @@ msgstr "*关闭* 或 *撤销* 授权后，便无法将其重新激活." msgid "Get paid with SDD Batch Payments" msgstr "通过SDD批量付款功能收款" +#: ../../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 " @@ -20237,106 +20910,145 @@ msgstr "" "进入会计应用仪表板中的选项)." #: ../../content/applications/finance/accounting/receivables/customer_payments/followup.rst:3 -msgid "Follow-up on invoices and get paid faster" -msgstr "发票催款及更快收款" +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." -msgstr "对于你的企业而言，在逾期付款时收取款项非常重要。Odoo将帮助你识别延迟付款，并可发送适当的提醒." - -#: ../../content/applications/finance/accounting/receivables/customer_payments/followup.rst:10 -msgid "Manage your follow-ups" -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." -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." +"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 "" -"你需要催款的逾期发票默认在 :menuselection:`会计 --> 销售 --> " -"催款报告`中。你可在此以电子邮件形式发送提醒或打印为信件。然后，你可点击*完成*按钮，查看需要关注的下一项催款." + +#: ../../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: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:20 +msgid "Send an Email" +msgstr "发送EMail" + +#: ../../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." -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`." +msgid ":ref:`Send a Letter `" +msgstr "" + +#: ../../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 "" -"如要避免短时间内发送过多提醒，前往 :menuselection:`会计 --> 配置 --> 设置 --> 付款催收`，更改每次报告之间间隔的天数." #: ../../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." -msgstr "你还可在催款报告上将客户标记为次级、正常或优级债务人，设置客户的信度等级." +msgid "Follow-up reports" +msgstr "催款报告" -#: ../../content/applications/finance/accounting/receivables/customer_payments/followup.rst:40 -msgid "Send reminders in batch" -msgstr "批量发送提醒" - -#: ../../content/applications/finance/accounting/receivables/customer_payments/followup.rst:42 +#: ../../content/applications/finance/accounting/receivables/customer_payments/followup.rst:35 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." +"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 "" -"为减轻催款流程的工作量，你可从催款报告页面批量发送提醒邮件。选择需要处理的所有报告，点击*操作*，然后点击*处理催款*。系统将自动生成一份PDF文件，其中包括你需要打印的所有催款信函." -#: ../../content/applications/finance/accounting/receivables/customer_payments/followup.rst:52 -msgid "Plan a follow-up process" -msgstr "计划催款流程" - -#: ../../content/applications/finance/accounting/receivables/customer_payments/followup.rst:54 +#: ../../content/applications/finance/accounting/receivables/customer_payments/followup.rst:39 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." +"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 "" -"如要计划催款流程，前往 :menuselection:`会计 --> 配置 --> " -"设置`并在*客户付款*部分启用*催款等级*功能。然后，点击你的设置页面新出现的*催款等级*按钮." -#: ../../content/applications/finance/accounting/receivables/customer_payments/followup.rst:59 +#: ../../content/applications/finance/accounting/receivables/customer_payments/followup.rst:43 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." +"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 "" -"Odoo中默认可用的催款计划包括多项操作，但你可根据自己的需要自定义。根据具体的逾期天数，计划发送邮件、信件或采取人为操作。你还可根据流程阶段编辑使用的声明模板." -#: ../../content/applications/finance/accounting/receivables/customer_payments/followup.rst:69 +#: ../../content/applications/finance/accounting/receivables/customer_payments/followup.rst:48 msgid "" -"If you would like to get a reminder before the actual due date, set a " -"negative number of due days." -msgstr "如果你想在实际逾期日期之前收到提醒，可将逾期天数设为负数." +"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: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: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" -msgstr "结算单在线付款" +msgid "Invoice online payment" +msgstr "" #: ../../content/applications/finance/accounting/receivables/customer_payments/online_payment.rst:5 msgid "" @@ -20616,8 +21328,8 @@ msgstr "" "如果您在2022年1月13日之前创建了Odoo数据库，请：ref：'升级<一般/升级>'account_intrastat'模块以添加新的交易代码，并：ref：'install<一般/安装>''account_intrastat_expiry'模块以存档旧代码。" #: ../../content/applications/finance/accounting/reporting/declarations/tax_returns.rst:3 -msgid "Tax Return (VAT Declaration)" -msgstr "纳税申报表（增值税申报）" +msgid "Tax return (VAT declaration)" +msgstr "" #: ../../content/applications/finance/accounting/reporting/declarations/tax_returns.rst:5 msgid "" @@ -21188,8 +21900,8 @@ msgid "Taxation" msgstr "税务" #: ../../content/applications/finance/accounting/taxation/fiscal_year.rst:5 -msgid "Fiscal Year" -msgstr "会计年度" +msgid "Fiscal year" +msgstr "" #: ../../content/applications/finance/accounting/taxation/fiscal_year/close_fiscal_year.rst:3 msgid "Do a year end in Odoo (close a fiscal year)" @@ -21639,6 +22351,94 @@ msgid "" 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 ":doc:`fiscal_positions`" + #: ../../content/applications/finance/accounting/taxation/taxes/cash_basis_taxes.rst:3 msgid "Manage cash basis taxes" msgstr "管理现金基础税" @@ -21755,6 +22555,10 @@ msgid "" msgstr "" "最后两个日记账项目是中性的，但它们可确保基本税金额的准确性，以保证Odoo税收报告的准确性。我们建议使用默认的收入科目。该科目的余额将始终为零." +#: ../../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 " @@ -21811,16 +22615,9 @@ msgstr "具有多个公司的数据库：默认税值是各公司特有的." msgid ":doc:`taxes`" msgstr ":doc:`taxes`" -#: ../../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 ":doc:`fiscal_positions`" - #: ../../content/applications/finance/accounting/taxation/taxes/eu_distance_selling.rst:3 -msgid "EU intra-community Distance Selling" -msgstr "欧盟内部远程销售" +msgid "EU intra-community distance selling" +msgstr "" #: ../../content/applications/finance/accounting/taxation/taxes/eu_distance_selling.rst:5 msgid "" @@ -21919,8 +22716,8 @@ msgid "" msgstr "" #: ../../content/applications/finance/accounting/taxation/taxes/fiscal_positions.rst:3 -msgid "Fiscal Positions (tax and account mapping)" -msgstr "财政状况（税收和帐户映射）" +msgid "Fiscal positions (tax and account mapping)" +msgstr "" #: ../../content/applications/finance/accounting/taxation/taxes/fiscal_positions.rst:5 msgid "" @@ -23508,93 +24305,99 @@ 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" -msgstr "手动获取金额" - -#: ../../content/applications/finance/payment_acquirers.rst:56 -msgid "Refund from Odoo" +#: ../../content/applications/finance/payment_acquirers.rst:63 +msgid ":ref:`Manual capture `" msgstr "" -#: ../../content/applications/finance/payment_acquirers.rst:59 +#: ../../content/applications/finance/payment_acquirers.rst:64 +msgid ":ref:`Refunds `" +msgstr "" + +#: ../../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 "从Odoo付款" -#: ../../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" -msgstr "重定向跳转至所请求的付款收单方网站" +#: ../../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 "PayU Latam" -#: ../../content/applications/finance/payment_acquirers.rst:83 +#: ../../content/applications/finance/payment_acquirers.rst:105 msgid "PayUMoney" msgstr "PayUMoney" -#: ../../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 " @@ -23604,7 +24407,7 @@ msgid "" "accounting control process." msgstr "" -#: ../../content/applications/finance/payment_acquirers.rst:105 +#: ../../content/applications/finance/payment_acquirers.rst:133 msgid "Bank payments" msgstr "银行付款" @@ -23631,97 +24434,58 @@ msgid "" "information about this payment method." msgstr "" -#: ../../content/applications/finance/payment_acquirers.rst:121 +#: ../../content/applications/finance/payment_acquirers.rst:146 +msgid "Additional features" +msgstr "" + +#: ../../content/applications/finance/payment_acquirers.rst:148 msgid "" -"Each acquirer has its specific configuration flow, depending on :ref:`which " -"feature is available `." +"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:127 -msgid "Add a new payment acquirer" +#: ../../content/applications/finance/payment_acquirers.rst:155 +msgid "Save cards for later" msgstr "" -#: ../../content/applications/finance/payment_acquirers.rst:129 +#: ../../content/applications/finance/payment_acquirers.rst:157 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*." +"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:139 +#: ../../content/applications/finance/payment_acquirers.rst:162 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." +"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 "" -"我们建议在复制数据库或测试数据库上使用 **测试模式** 。 测试模式旨在与您的测试/沙盒凭据一起使用，但是Odoo会像往常一样生成销售订单和发票。 " -"并非总是可以取消发票，如果要在主数据库上测试人付款收单行，这可能会给发票编号带来一些问题。" -#: ../../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" -msgstr "凭据选项卡" - -#: ../../content/applications/finance/payment_acquirers.rst:149 +#: ../../content/applications/finance/payment_acquirers.rst:166 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." +"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 +#: ../../content/applications/finance/payment_acquirers.rst:173 +msgid "Manual capture" +msgstr "" + +#: ../../content/applications/finance/payment_acquirers.rst:175 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: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:" +"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 @@ -23738,56 +24502,172 @@ msgstr "" #: ../../content/applications/finance/payment_acquirers.rst:185 msgid "" -"Avoid potentially high credit card fees in the event of overselling or " -"cancelled orders." +"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." +"Hold a security deposit to return later, minus any deductions (e.g., after a" +" damage)." msgstr "" -#: ../../content/applications/finance/payment_acquirers.rst:195 +#: ../../content/applications/finance/payment_acquirers.rst:189 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." +"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." +"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 "Refunds" +msgstr "退款" + +#: ../../content/applications/finance/payment_acquirers.rst:212 +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: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: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:230 +msgid "" +"Each acquirer has its specific configuration flow, depending on :ref:`which " +"feature is available `." +msgstr "" + +#: ../../content/applications/finance/payment_acquirers.rst:236 +msgid "Add a new payment acquirer" +msgstr "" + +#: ../../content/applications/finance/payment_acquirers.rst:238 +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 "" +"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 "" +"我们建议在复制数据库或测试数据库上使用 **测试模式** 。 测试模式旨在与您的测试/沙盒凭据一起使用，但是Odoo会像往常一样生成销售订单和发票。 " +"并非总是可以取消发票，如果要在主数据库上测试人付款收单行，这可能会给发票编号带来一些问题。" + +#: ../../content/applications/finance/payment_acquirers.rst:256 +#: ../../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:212 +#: ../../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:218 +#: ../../content/applications/finance/payment_acquirers.rst:285 msgid "Payment journal" msgstr "付款日记账" -#: ../../content/applications/finance/payment_acquirers.rst:220 +#: ../../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:225 +#: ../../content/applications/finance/payment_acquirers.rst:292 msgid "Accounting perspective" msgstr "会计的观点" -#: ../../content/applications/finance/payment_acquirers.rst:227 +#: ../../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 " @@ -23798,78 +24678,78 @@ msgstr "" "直接转到您的一个银行帐户的 **银行付款** 遵循其通常的对帐工作流程。 但是，使用 **在线付款提供商** " "记录的付款要求您考虑如何记录付款的日记帐分录。 我们建议您向会计师咨询。" -#: ../../content/applications/finance/payment_acquirers.rst:232 +#: ../../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:235 +#: ../../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:237 +#: ../../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:238 +#: ../../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:244 +#: ../../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:248 +#: ../../content/applications/finance/payment_acquirers.rst:315 msgid ":doc:`payment_acquirers/wire_transfer`" msgstr "" -#: ../../content/applications/finance/payment_acquirers.rst:249 +#: ../../content/applications/finance/payment_acquirers.rst:316 msgid ":doc:`payment_acquirers/adyen`" msgstr "" -#: ../../content/applications/finance/payment_acquirers.rst:250 +#: ../../content/applications/finance/payment_acquirers.rst:317 msgid ":doc:`payment_acquirers/alipay`" msgstr "" -#: ../../content/applications/finance/payment_acquirers.rst:251 +#: ../../content/applications/finance/payment_acquirers.rst:318 msgid ":doc:`payment_acquirers/authorize`" msgstr "" -#: ../../content/applications/finance/payment_acquirers.rst:252 +#: ../../content/applications/finance/payment_acquirers.rst:319 msgid ":doc:`payment_acquirers/buckaroo`" msgstr "" -#: ../../content/applications/finance/payment_acquirers.rst:253 +#: ../../content/applications/finance/payment_acquirers.rst:320 msgid ":doc:`payment_acquirers/mollie`" msgstr "" -#: ../../content/applications/finance/payment_acquirers.rst:254 +#: ../../content/applications/finance/payment_acquirers.rst:321 msgid ":doc:`payment_acquirers/ogone`" msgstr "" -#: ../../content/applications/finance/payment_acquirers.rst:255 +#: ../../content/applications/finance/payment_acquirers.rst:322 msgid ":doc:`payment_acquirers/paypal`" msgstr "" -#: ../../content/applications/finance/payment_acquirers.rst:256 +#: ../../content/applications/finance/payment_acquirers.rst:323 msgid ":doc:`payment_acquirers/sips`" msgstr "" -#: ../../content/applications/finance/payment_acquirers.rst:257 +#: ../../content/applications/finance/payment_acquirers.rst:324 msgid ":doc:`payment_acquirers/stripe`" msgstr "" -#: ../../content/applications/finance/payment_acquirers.rst:258 +#: ../../content/applications/finance/payment_acquirers.rst:325 msgid ":doc:`../websites/ecommerce/shopper_experience/payment_acquirer`" msgstr "" @@ -23879,8 +24759,8 @@ msgstr "Adyen" #: ../../content/applications/finance/payment_acquirers/adyen.rst:5 msgid "" -"`Adyen `_ is a Dutch-based company that offers " -"several online payment possibilities." +"`Adyen `_ is a Dutch company that offers several " +"online payment possibilities." msgstr "" #: ../../content/applications/finance/payment_acquirers/adyen.rst:12 @@ -23942,37 +24822,39 @@ 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" +"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 "API Key and Client Key" +msgstr "" + +#: ../../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:`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." +"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:45 +#: ../../content/applications/finance/payment_acquirers/adyen.rst:48 msgid "" -"This is also the place where you'll :ref:`allow payments to be made from " -"your website `." +"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:51 +#: ../../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 " @@ -23980,54 +24862,55 @@ msgid "" "notification`." msgstr "" -#: ../../content/applications/finance/payment_acquirers/adyen.rst:61 +#: ../../content/applications/finance/payment_acquirers/adyen.rst:65 msgid "" -"There, in :menuselection:`Transport --> URL`, enter your server address " -"followed by `/payment/adyen/notification`." +"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 +#: ../../content/applications/finance/payment_acquirers/adyen.rst:72 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." +"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 +#: ../../content/applications/finance/payment_acquirers/adyen.rst:86 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**." +":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 "Adyen帐户" -#: ../../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 +#: ../../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:`Allowed Origins`, then add the URLs from where payments will" -" be made (the URLs of the servers hosting your Odoo instances)." +":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 @@ -24140,20 +25023,30 @@ 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." +"the :guilabel:`State` to :guilabel:`Test Mode`. We recommend doing this on a" +" test Odoo database, rather than on your main database." msgstr "" -"如果您尝试使用 *沙箱帐户* 来测试Authorize.Net，请将 **状态** 更改为 *测试模式 * 。 " -"我们建议在Odoo测试数据库上执行此操作而不是在你的主数据库上。" -#: ../../content/applications/finance/payment_acquirers/authorize.rst:40 +#: ../../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: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." +"`. 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:44 +#: ../../content/applications/finance/payment_acquirers/authorize.rst:50 msgid "" "After **30 days**, the transaction is **voided automatically** by " "Authorize.net." @@ -24273,164 +25166,6 @@ msgid "" "in secure electronic transactions." msgstr "" -#: ../../content/applications/finance/payment_acquirers/ogone.rst:9 -msgid "Configuration on Odoo" -msgstr "" -"Odoo 电子商务\n" -"---------------\n" -"\n" -"### 通过出色的联机商店优化销售.\n" -"\n" -"Odoo 是一个开放源码电子商务\n" -"不同于你以前见过的任何东西. 获取一个很棒的产品目录\n" -"和很棒的产品描述页面.\n" -"\n" -"它功能齐全，与您的管理软件整合，完全\n" -"可定制且超级简单.\n" -"\n" -"创建很棒的产品页面\n" -"----------------\n" -"\n" -"Odoo 独特的 *'edit inline'* 和构建模块方法使产品页面\n" -"创作出奇的容易. 想改变一个产品的价格? 或者把它\n" -"以黑体显示? 想要为特定产品增加横幅? \"只需点击并更改.\n" -"所见即所得. 真的.\n" -"\n" -"拖放精心设计的 *'Building Blocks'* 以创造精美的产品\n" -"您的客户会喜欢的页面.\n" -"\n" -"增加每个订单的收入\n" -"-------------------\n" -"\n" -"内置的交叉销售功能可帮助您提供与\n" -"相关的额外产品购物者放入购物车的物品. (例如配饰)\n" -"\n" -"Odoo 的追加销售算法允许您向访客展示相似但更多\n" -"比您看到的更贵的产品，有奖励措施.\n" -"\n" -"联机编辑功能可让您轻松更改价格，引导\n" -"只需点击一下，即可推广或微调产品描述.\n" -"\n" -"一个干净的 Google Analytics 整合\n" -"------------------------------------\n" -"\n" -"清楚地了解您的销售渠道. Odoo 的 Google Analytics 跟踪器\n" -"缺省设置为跟踪与购物相关的所有类型的事件\n" -"购物车、号召性用语等.\n" -"\n" -"由于 Odoo 营销工具(群发邮件、活动等)也与\n" -"相关联Google Analytics，您可以全面了解您的业务.\n" -"\n" -"瞄准新市场\n" -"--------\n" -"\n" -"毫不费力地将您的网站翻译成多种语言. Odoo 推荐\n" -"并自动跨页面传播翻译.\n" -"\n" -"我们的翻译\"按需\"功能让您受益于专业\n" -"翻译器自动翻译您的所有更改. 只需更改任何部分\n" -"关于您的网站(一篇新部落格文章、一次页面修改、产品描述，\n" -"...) 并且翻译版本会在大约 32 小时内自动更新.\n" -"\n" -"微调您的目录\n" -"---------------------\n" -"\n" -"完全控制您如何在目录页面中显示您的产品：\n" -"促销丝带、产品的相关尺寸、折扣、变体、网格/列表\n" -"视图等.\n" -"\n" -"联机编辑任何产品，使您的网站随客户需求而发展.\n" -"\n" -"获取新客户\n" -"---------\n" -"\n" -"SEO 工具已准备好使用，无需设置. Odoo 推荐\n" -"根据谷歌搜索最多的关键词，谷歌分析跟踪你的\n" -"购物车事件、站点地图是自动为 Google 索引创建的，\n" -"等等\n" -"\n" -"我们甚至会自动制作结构化内容来宣传您的产品和活动\n" -"在 Google 中效率很高.\n" -"\n" -"利用社群媒体\n" -"---------\n" -"\n" -"使用 Odoo 联机编辑功能轻松创建新的登录页面. 发送\n" -"您的不同营销活动的访客到特定目标网页到\n" -"优化转换.\n" -"\n" -"管理经销商网络\n" -"-------------------------\n" -"\n" -"管理经销商网络以瞄准新市场、在当地开展业务或扩大\n" -"你的发行版. 让他们访问你的经销商门户以获得高效\n" -"合作.\n" -"\n" -"联机推广您的经销商，将潜在客户转发给经销商(内置\n" -"地理定位功能)，定义具体的价格表，引导忠诚度计划\n" -"(向您的最佳客户或经销商提供特定折扣)等.\n" -"\n" -"在您的联机商店中受益于 Odoo 的强大功能：强大的税务引擎，\n" -"灵活的定价结构、真正的库存管理解决方案、经销商\n" -"接口，支持不同行为的产品；实物，\n" -"事件、服务、变体和选项等.\n" -"\n" -"您无需与仓库、销售或会计软件交互.\n" -"一切都与 Odoo 整合. 没有痛苦，即时.\n" -"\n" -"一个干净的结帐过程\n" -"------------\n" -"\n" -"通过干净的结帐流程将大多数访客兴趣转化为真实订单\n" -"步骤最少，每一页都有很好的可用性.\n" -"\n" -"自定义结帐流程以满足您的业务需求：付款方式，\n" -"配送方式、交叉销售、特殊条件等\n" -"\n" -"还有更多……\n" -"----------------\n" -"\n" -"### 联机销售\n" -"\n" -"- 移动界面\n" -"- 销售产品、活动或服务\n" -"- 灵活的价目表\n" -"- 产品多变体\n" -"- 多个商店\n" -"- 很棒的结帐过程\n" -"\n" -"### 客户服务\n" -"\n" -"- 跟踪订单的客户门户\n" -"- 通过网站即时聊天协助购物\n" -"- 退货管理\n" -"- 高级运输规则\n" -"- 优惠券或礼券\n" -"\n" -"### 订单管理\n" -"\n" -"- 高级仓库管理功能\n" -"- 发票和会计整合\n" -"- 群发邮件和客户细分\n" -"- 领导自动化和营销活动\n" -"- 持久购物车\n" -"\n" -"与其它应用程序完全整合\n" -"--------------------------------\n" -"\n" -"### CMS\n" -"\n" -"无需技术知识即可轻松创建出色的网站.\n" -"\n" -"### 博客\n" -"\n" -"撰写新闻，吸引新访客，创建客户忠诚度.\n" -"\n" -"### 联机活动\n" -"\n" -"联机安排、组织、推广或销售活动；会议、网络研讨会、培训等.\n" -"\n" - #: ../../content/applications/finance/payment_acquirers/ogone.rst:17 msgid "" "Odoo needs your **API Credentials** to connect with your Ogone account, " diff --git a/locale/zh_CN/LC_MESSAGES/general.po b/locale/zh_CN/LC_MESSAGES/general.po index 81551b4c5..e0b9efb76 100644 --- a/locale/zh_CN/LC_MESSAGES/general.po +++ b/locale/zh_CN/LC_MESSAGES/general.po @@ -21,7 +21,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: 2021-11-02 08:47+0000\n" "Last-Translator: 山西清水欧度(QQ:54773801) <54773801@qq.com>, 2022\n" "Language-Team: Chinese (China) (https://www.transifex.com/odoo/teams/41243/zh_CN/)\n" @@ -573,107 +573,173 @@ msgstr "将谷歌日历与Odoo同步" #: ../../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)." -msgstr "Odoo能完美集成谷歌日历，因此能从两个平台上管理你的会议（同时通过两种方式更新日程）。" +"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 "在Google中设定" -#: ../../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 "" -"打开`谷歌 APIs 平台 ，生成谷歌日历API " -"凭证，然后用谷歌帐号登录。" #: ../../content/applications/general/calendars/google/google_calendar_credentials.rst:14 -msgid "Go to the API & Services page." -msgstr "进入API和服务页面。" - -#: ../../content/applications/general/calendars/google/google_calendar_credentials.rst:19 -msgid "Search for *Google Calendar API* and select it." -msgstr "搜索 *谷歌日历API* 并选择它。" - -#: ../../content/applications/general/calendars/google/google_calendar_credentials.rst:27 -msgid "Enable the API." -msgstr "启用API接口。" - -#: ../../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)." -msgstr "选择或创建 API 项目以存储凭据（如果之前尚未完成）。给它一个显式名称（例如 Odoo 同步）。" - -#: ../../content/applications/general/calendars/google/google_calendar_credentials.rst:35 -msgid "Create credentials." -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." -msgstr "选择 *网页浏览器（Javascript）* 作为调用源，选择 *用户数据* 作为数据类型。" - -#: ../../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'." +"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 "" -"然后，您可以创建客户端 ID。输入应用程序的名称（例如 Odoo 日历）和将重定向的允许页面。*授权JavaScript源* 是 Odoo 的实例 " -"URL。 *授权重定向 URI* 是您的 Odoo 的实例 URL，后跟'/google_account/authentication'。" -#: ../../content/applications/general/calendars/google/google_calendar_credentials.rst:55 +#: ../../content/applications/general/calendars/google/google_calendar_credentials.rst:18 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." +"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 "" -"通过输入产品名称（例如 Odoo 日历）执行同意屏幕步骤。请随意检查自定义选项，但这不是强制性的。仅当首次在 Odoo 中输入客户端 ID " -"时，才会显示同意屏幕。" -#: ../../content/applications/general/calendars/google/google_calendar_credentials.rst:60 +#: ../../content/applications/general/calendars/google/google_calendar_credentials.rst:22 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." -msgstr "最后，您得到了您的 **客户端 ID** 。也转到 **凭据** 以获取 **客户端机密** 。这两个都是Odoo所必需的。" +"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:67 +#: ../../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:31 +msgid "" +"Then, open the API Project and click :guilabel:`Enable APIs and Services`." +msgstr "" + +#: ../../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:45 +msgid "Create credentials" +msgstr "" + +#: ../../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: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: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:63 +msgid "" +"Skip the third step, :guilabel:`Scopes`, by clicking :guilabel:`Save and " +"Continue`." +msgstr "" + +#: ../../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: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 "" +"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 "设置Odoo" -#: ../../content/applications/general/calendars/google/google_calendar_credentials.rst:69 +#: ../../content/applications/general/calendars/google/google_calendar_credentials.rst:100 msgid "" -"Install the **Google Calendar** App from the *Apps* menu or by checking the " -"option in :menuselection:`Settings --> General Settings`." -msgstr "从 *应用* 菜单安装 **谷歌日历** 应用程序，或通过菜单选择中的选项 :menuselection:`设置 --> 常规设置`。" - -#: ../../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." +"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 "" -"转到菜单选择 :menuselection:`设置 --> 常规设置`，并在谷歌日历选项中输入您的 **客户端 ID** 和 **客户端机密**。" -#: ../../content/applications/general/calendars/google/google_calendar_credentials.rst:81 +#: ../../content/applications/general/calendars/google/google_calendar_credentials.rst:108 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." +"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 "" -"设置现已就绪。打开Odoo日历，与谷歌日历同步。首次同步时会转到谷歌，对链接进行授权。返回Odoo后，再次点击同步按钮。任何时候同步均可点击这个按钮。" -#: ../../content/applications/general/calendars/google/google_calendar_credentials.rst:89 -msgid "As of now you no longer have excuses to miss a meeting!" -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 msgid "Synchronization with Outlook's Calendar" @@ -3376,10 +3442,8 @@ 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 `." +"find more information at: :doc:`In-App Purchase `." msgstr "" -"我非常欢迎通过Odoo应用程序提供我自己的IAP服务！这是为持续的服务使用获得经常性收入的绝佳机会，而不是 - 并且可能代替 - " -"唯一的初始购买。请在以下位置找到更多信息：:d oc：'应用内购买'。" #: ../../content/applications/general/users.rst:7 msgid "Users & Companies" diff --git a/locale/zh_CN/LC_MESSAGES/productivity.po b/locale/zh_CN/LC_MESSAGES/productivity.po index 7538f8371..323bb995f 100644 --- a/locale/zh_CN/LC_MESSAGES/productivity.po +++ b/locale/zh_CN/LC_MESSAGES/productivity.po @@ -9,22 +9,22 @@ # fausthuang, 2021 # LINYUN TONG , 2021 # 黎伟杰 <674416404@qq.com>, 2021 -# Martin Trigaux, 2021 # Jeffery CHEN , 2021 # 稀饭~~ , 2021 # F4NNIU , 2021 # Mandy Choy , 2021 # 新 陈 , 2021 # 山西清水欧度(QQ:54773801) <54773801@qq.com>, 2022 +# Martin Trigaux, 2022 # #, fuzzy 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: 2021-11-02 08:49+0000\n" -"Last-Translator: 山西清水欧度(QQ:54773801) <54773801@qq.com>, 2022\n" +"Last-Translator: Martin Trigaux, 2022\n" "Language-Team: Chinese (China) (https://www.transifex.com/odoo/teams/41243/zh_CN/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -40,6 +40,128 @@ 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 "概述" @@ -1453,12 +1575,12 @@ msgid "" 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 "" @@ -1518,38 +1640,64 @@ msgid "" "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/zh_CN/LC_MESSAGES/sales.po b/locale/zh_CN/LC_MESSAGES/sales.po index 3f9785953..a82b64a8e 100644 --- a/locale/zh_CN/LC_MESSAGES/sales.po +++ b/locale/zh_CN/LC_MESSAGES/sales.po @@ -20,20 +20,20 @@ # fausthuang, 2021 # 稀饭~~ , 2021 # John Lin , 2021 -# Mandy Choy , 2021 # Miao Zhou , 2021 # Datasource International , 2021 -# Martin Trigaux, 2022 # 山西清水欧度(QQ:54773801) <54773801@qq.com>, 2022 +# Martin Trigaux, 2022 +# Mandy Choy , 2022 # #, fuzzy 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: 2021-11-02 08:49+0000\n" -"Last-Translator: 山西清水欧度(QQ:54773801) <54773801@qq.com>, 2022\n" +"Last-Translator: Mandy Choy , 2022\n" "Language-Team: Chinese (China) (https://www.transifex.com/odoo/teams/41243/zh_CN/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -85,7 +85,6 @@ msgid "" msgstr "你可从CRM设置启用这一模式。它默认适用于你的所有销售渠道。但可从配置表单将它设置为适用于特定渠道。" #: ../../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 @@ -94,8 +93,9 @@ msgstr "你可从CRM设置启用这一模式。它默认适用于你的所有销 #: ../../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 @@ -182,122 +182,161 @@ msgstr "以下是在列表视图下的具体操作方法。选择想要合并的 msgid "It is also possible to merge more than 2 opportunities or leads." msgstr "你也可以合并2个以上商机或线索。" -#: ../../content/applications/sales/crm/acquire_leads/generate_from_email.rst:3 -msgid "Generate leads/opportunities from emails" -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:3 +msgid "Generate leads/opportunities" msgstr "" -"自动化线索/商机生成将大大提高您的效率。 默认情况下，任何发送到 *sales@database\\_domain.ext* " -"的电子邮件都会在默认销售渠道中创造商机。" -#: ../../content/applications/sales/crm/acquire_leads/generate_from_email.rst:11 +#: ../../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_leads.rst:10 msgid "Configure email aliases" msgstr "配置电子邮件别名" -#: ../../content/applications/sales/crm/acquire_leads/generate_from_email.rst:13 +#: ../../content/applications/sales/crm/acquire_leads/generate_leads.rst:12 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`." +"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 "" -"每个销售团队都可以有自己的电子邮件别名，以生成自动分配给它的线索/商机。如果你需要管理有特定业务流程的多个销售团队，这项功能非常有用。你可在 " -":menuselection:`配置 --> 销售团队`下面找到销售团队配置的相关内容。" -#: ../../content/applications/sales/crm/acquire_leads/generate_from_website.rst:3 -msgid "Generate leads/opportunities from your website contact page" -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." -msgstr "自动生成销售线索/商机将大大提高您的效率。 任何使用您网站上的联系表的访问者都会在管道中创建销售线索/商机。" - -#: ../../content/applications/sales/crm/acquire_leads/generate_from_website.rst:10 -msgid "Use the contact us on your website" -msgstr "使用您网站上的联系页面" - -#: ../../content/applications/sales/crm/acquire_leads/generate_from_website.rst:12 -msgid "You should first go to your website app." -msgstr "首先转到您的网站应用。" - -#: ../../content/applications/sales/crm/acquire_leads/generate_from_website.rst:14 -msgid "|image0|\\ |image1|" -msgstr "|image0|\\ |image1|" - -#: ../../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." -msgstr "通过已安装的CRM应用程序，你可通过Odoo网站上即时可用的联系人表单，自动生成线索/商机。" - -#: ../../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:23 +msgid "Use Contact Forms on your website" msgstr "" -"要更改为特定销售渠道，请转到 :menuselection:`网站 --> 配置 --> 设置`下 *通信* 您将找到联系表信息以及更改 *销售渠道* " -"或 *销售人员* 的位置。" -#: ../../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" -msgstr "创建自定义联系人表单" - -#: ../../content/applications/sales/crm/acquire_leads/generate_from_website.rst:34 +#: ../../content/applications/sales/crm/acquire_leads/generate_leads.rst:25 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.)" +"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:43 +#: ../../content/applications/sales/crm/acquire_leads/generate_leads.rst:32 msgid "" -"You will need to install the free *Form Builder* module, only available in " -"Odoo Enterprise." -msgstr "你需要安装免费的 *表单生成器* 模块，仅在Odoo企业版中可用。" - -#: ../../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." -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*." -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." -msgstr "如果同一访问者使用联系人表单两次，第二次输入的内容将添加到沟通栏的首个线索中。" - -#: ../../content/applications/sales/crm/acquire_leads/generate_from_website.rst:67 -msgid "Generate leads instead of opportunities" -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`." +"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_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_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_leads.rst:55 +msgid "Customize Contact Forms" +msgstr "" + +#: ../../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_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_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_leads.rst:73 +msgid "Edit Contact Form fields" +msgstr "" + +#: ../../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_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_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_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_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 "" -"在使用联系人表单时，在将表单分配给合适的销售人员之前，需要有一个资格鉴定步骤。如要进行此项操作，在CRM设置中启用 *线索* 并参见:doc:`转换`。" #: ../../content/applications/sales/crm/acquire_leads/lead_mining.rst:3 msgid "Lead mining" @@ -340,14 +379,12 @@ msgstr "在这里点击 **生成线索** 按钮，在弹出的窗口中可设置 #: ../../content/applications/sales/crm/acquire_leads/lead_mining.rst:34 msgid "" -"When choosing to target Companied and their contacts you can choose the " +"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 "" -"在选择目标公司及其联系人时，你可以根据职位或资历选择得到的联系人。在获取联系人信息时，请注意了解最新的欧盟法规，请在`Odoo GDPR " -"`__，了解通用数据保护条例的更多信息。" #: ../../content/applications/sales/crm/acquire_leads/lead_mining.rst:39 msgid "" @@ -378,15 +415,12 @@ msgstr "价格" 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 " +" 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 --> In-App Purchases --> View my" -" Services`." +"Credits`; or go to :menuselection:`Settings --> Contacts --> Odoo IAP --> " +"View my Services`." msgstr "" -"这是一项应用内购买功能，每条生成的线索将花费一个积点。如果你选择获取联系人信息，每个联系人也会花费一个额外积点。以下是这项`功能的定价 " -"`__。如要购买积点，你可前往 " -":menuselection:`CRM --> 配置 --> 设定 --> 购买积点`；或前往`设定 --> 应用内购买 --> 查看我的服务`。" #: ../../content/applications/sales/crm/acquire_leads/lead_mining.rst:65 msgid "" @@ -915,71 +949,88 @@ msgid ":doc:`../performance/win_loss`" msgstr ":doc:`../performance/win_loss`" #: ../../content/applications/sales/crm/pipeline/multi_sales_team.rst:3 -msgid "Manage multiple sales teams" -msgstr "管理多个销售团队" +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*." -msgstr "在 Odoo 中，您可以管理多个销售团队、部门或具有特定销售流程的渠道。为此，我们使用 *销售渠道* 的概念。" +"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" -msgstr "创建新的销售渠道" +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`." -msgstr "要创建新的 *销售渠道* ，请转到 :menuselection:`配置 --> 销售渠道`。" - -#: ../../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." -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." +"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: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: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." -msgstr "这将简化团队经理的流程评审。" +msgid "Add members to a Sales Team" +msgstr "" -#: ../../content/applications/sales/crm/pipeline/multi_sales_team.rst:33 +#: ../../content/applications/sales/crm/pipeline/multi_sales_team.rst:30 msgid "" -"If you now filter on this specific channel in your pipeline, you will find " -"all of its opportunities." -msgstr "如果现在筛选管道中的此特定通道，您将找到其所有商机。" +"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" -msgstr "销售渠道仪表板" +#: ../../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*." -msgstr "要一目了然地查看任何销售渠道的运营和结果，销售经理还可以访问 *报告* 下的 *销售渠道仪表板* 。" +msgid "Sales Team dashboard" +msgstr "" -#: ../../content/applications/sales/crm/pipeline/multi_sales_team.rst:46 +#: ../../content/applications/sales/crm/pipeline/multi_sales_team.rst:44 msgid "" -"It is shared with the whole ecosystem so every revenue stream is included in" -" it: Sales, eCommerce, PoS, etc." -msgstr "它与整个生态系统共享，因此每个收入流都包含在其中：销售、电子商务、PoS 等。" +"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 msgid "Assign and track leads" @@ -991,99 +1042,91 @@ 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." +"*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." -msgstr "例如，您可以对您所在国家/地区的客户或访问您网站上特定网页的客户进行评分。" +"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)." -msgstr "要使用评分，请在 *应用* 页面下安装免费模块 *销售线索* （仅在 Odoo 企业版中提供）。" +"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 +#: ../../content/applications/sales/crm/track_leads/lead_scoring.rst:24 msgid "" -"You now have a new tab in your *CRM* app called *Leads Management* where you" -" can manage your scoring rules." -msgstr "现在，您的 *CRM* 应用中有一个名为 *销售线索管理* 的新选项卡，您可以在其中管理评分规则。" +"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." +"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 +#: ../../content/applications/sales/crm/track_leads/lead_scoring.rst:32 msgid "" -"Every hour every lead without a score will be automatically scanned and " -"assigned their right score according to your scoring rules." -msgstr "每小时没有得分的一个线索都会被自动扫描，并根据您的评分规则分配正确的分数。" +"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 +#: ../../content/applications/sales/crm/track_leads/lead_scoring.rst:41 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." +"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 "" -"计算分数后，可以使用相同的域机制将销售线索分配给特定团队。为此，请转到菜单选择 :menuselection:`CRM --> 销售线索管理 --> " -"团队分配'，并在每个团队中应用特定域。此域可以包含分数。" -#: ../../content/applications/sales/crm/track_leads/lead_scoring.rst:49 +#: ../../content/applications/sales/crm/track_leads/lead_scoring.rst:50 msgid "" -"Further on, you can assign to a specific vendor in the team with an even " -"more refined domain." -msgstr "此外，您可以向团队中的特定供应商分配更精细的域。" +"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 +#: ../../content/applications/sales/crm/track_leads/lead_scoring.rst:57 msgid "" -"To do so go to :menuselection:`CRM --> Leads Management --> Leads " -"Assignation`." -msgstr "要执行此操作，请转到菜单选择:menuselection:`CRM -->销售线索管理 --> 分配销售线索`。" +"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." -msgstr "团队和销售线索分配将每天调派一次未分配的销售线索。" +#: ../../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" -msgstr "评估和使用未分配的销售线索" +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." -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." +"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:72 +msgid "" +"You can also find unassigned leads and create re-engagement campaigns using " +"the :guilabel:`Email Marketing` or :guilabel:`Marketing Automation` apps." msgstr "" -"为什么不使用: :menuselection:`邮件营销' 或 :menuselection:`营销自动化` " -"应用程序向他们发送促销电邮？您还可以从那里轻松找到此类未分配的销售线索。" #: ../../content/applications/sales/crm/track_leads/prospect_visits.rst:3 msgid "Track your prospects visits" @@ -1809,32 +1852,31 @@ 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." +"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 +#: ../../content/applications/sales/point_of_sale/overview/epos_ssc.rst:79 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." +"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 " @@ -1866,11 +1908,9 @@ msgstr "使产品可在PoS中使用" #: ../../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*." +" Products --> Products` and open a product. In the *Point of Sale* tab, " +"enable *Available in Point of Sale*." msgstr "" -"要使产品可供销售，请转到 :menuselection:`POS --> 产品 --> 产品`，然后打开一个产品。 在 *销售* 标签中，启用 " -"*在POS可用* 。" #: ../../content/applications/sales/point_of_sale/overview/getting_started.rst:28 msgid "You can also define if the product has to be weighted or not." @@ -2093,9 +2133,146 @@ msgstr "完成后，点击保存按钮。然后，你在未来的交易中就可 msgid "Payment Terminals" msgstr "付款终端" +#: ../../content/applications/sales/point_of_sale/payment/adyen.rst:3 +msgid "Adyen" +msgstr "Adyen" + +#: ../../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" -msgstr "将Ingenico支付终端连接到你的PoS" +msgid "Ingenico" +msgstr "Ingenico " #: ../../content/applications/sales/point_of_sale/payment/ingenico.rst:5 #: ../../content/applications/sales/point_of_sale/payment/worldline.rst:5 @@ -2141,11 +2318,6 @@ msgid "" "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 " @@ -2162,11 +2334,6 @@ msgstr "" "回到 :menuselection:`POS --> 配置 --> " "POS`，进入支付版块并查看你的支付方式。为Ingenico创建新支付方式，选择支付终端选项Ingenico，并选择你的支付终端设备。" -#: ../../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 " @@ -2203,8 +2370,8 @@ msgid "" msgstr "付款处理完毕后，在支付记录上可以看到使用的卡片类型和交易ID。" #: ../../content/applications/sales/point_of_sale/payment/six.rst:3 -msgid "Connect a SIX Payment Terminal to your PoS" -msgstr "将SIX支付终端连接到您的PoS" +msgid "SIX" +msgstr "" #: ../../content/applications/sales/point_of_sale/payment/six.rst:5 msgid "" @@ -2214,6 +2381,12 @@ msgstr "连接SIX付款终端可让您向客户提供流畅的付款流程，并 #: ../../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 " @@ -2222,60 +2395,58 @@ msgstr "" "尽管Worldline最近已经收购了SIX 付款服务，并且两家公司都使用Yomani付款终端，但是它们运行的固件是不同的。 " "因此，从Worldline收到的终端与此集成不兼容。" -#: ../../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 +#: ../../content/applications/sales/point_of_sale/payment/six.rst:21 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\"." -msgstr "首先，确保已安装POS Six模块。 为此，转到 *应用程式* ，删除“应用程式”过滤器，然后搜索“ POS Six”。" +"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 +#: ../../content/applications/sales/point_of_sale/payment/six.rst:28 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." +"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 +#: ../../content/applications/sales/point_of_sale/payment/six.rst:39 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." +"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 "" -"在*PoS界面*，当处理付款时，选择使用支付终端的*支付方式*。检查栏目中的金额是否为须发送到付款终端的金额并单击*发送*。如你想要取消付款请求，点击取消。" -#: ../../content/applications/sales/point_of_sale/payment/six.rst:44 +#: ../../content/applications/sales/point_of_sale/payment/six.rst:48 msgid "" -"When the payment is done, the status will change to *Payment Successful*. " -"You can always reverse the last transaction by clicking on *Reverse*." -msgstr "支付完成后，状态将变为*付款成功*。你可随时点击*逆转*，逆转最近一项操作。" +"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 +#: ../../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 *Force Done*. This will allow you to validate the order in" -" Odoo even if the connection between the terminal and Odoo encounters " -"issues." +"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" -msgstr "将Vantiv支付终端接入你的PoS" +msgid "Vantiv" +msgstr "" #: ../../content/applications/sales/point_of_sale/payment/vantiv.rst:5 msgid "" @@ -2319,8 +2490,8 @@ msgid "" msgstr "付款时，在你的PoS界面选择Vantiv支付方式并...完成。" #: ../../content/applications/sales/point_of_sale/payment/worldline.rst:3 -msgid "Connect a Worldline Payment Terminal to the PoS" -msgstr "" +msgid "Worldline" +msgstr "Worldline" #: ../../content/applications/sales/point_of_sale/payment/worldline.rst:9 msgid "Please note that Worldline is currently only available in Belgium." @@ -2883,82 +3054,6 @@ msgid "" "times or change the quantity manually on the screen." msgstr "从你的PoS接口，用条码扫描器扫描任何条码。产品将被添加，你可以多次扫描同一件产品，将它添加多次，也可在屏幕上手动更改数量。" -#: ../../content/applications/sales/point_of_sale/shop/cash_control.rst:3 -msgid "Set-up Cash Control in Point of Sale" -msgstr "设置POS的现金控制" - -#: ../../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 "如要启用*现金管理*功能，前往 :menuselection:`POS --> 配置 --> POS`并选择你的PoS界面。" - -#: ../../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 "在本例中，你可以看到我想在开台和关台时有275美元各种面额的现金。" - -#: ../../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 "现金舍入" @@ -3221,6 +3316,147 @@ msgstr "在你的PoS界面，现在可以看到*重新打印收据*按钮。" 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 "出租" @@ -3682,12 +3918,14 @@ msgid "Amazon.nl" msgstr "Amazon.nl" #: ../../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 ":doc:`setup`" #: ../../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 ":doc:`manage`" @@ -3766,14 +4004,35 @@ msgstr "" #: ../../content/applications/sales/sales/amazon_connector/manage.rst:45 msgid "" -":doc:`../../../inventory_and_mrp/inventory/shipping/setup/third_party_shipper`" +"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 "" +"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 "" +"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 "在FBA中跟进发货" -#: ../../content/applications/sales/sales/amazon_connector/manage.rst:50 +#: ../../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 " @@ -3787,14 +4046,14 @@ msgstr "" ":menuselection:`库存 --> 报告 --> " "产品移动`下找到相关记录。他们在**Amazon**的特定库位取货。这个库位代表你在Amazon仓库中的库存，并允许你在FBA程序下管理产品库存。" -#: ../../content/applications/sales/sales/amazon_connector/manage.rst:57 +#: ../../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 "如要在Odoo中追踪你的Amazon (FBA)库存，你可在补货后进行库存调整。你还可通过Amazon库位的重订货规则触发自动补货。" -#: ../../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" @@ -3807,11 +4066,11 @@ msgid "" msgstr "" "Amazon库位可通过Odoo管理的Amazon账户进行配置。同一家公司的所有账户默认使用同一库位。但是，你可以按电商平台追踪库存。首先，从已同步的电商平台列表中删除想要单独追踪库存的电商平台。然后，为该账户创建另一个注册账户，并删除所有其他电商平台。最后，为第二个注册账户分配其他库位。" -#: ../../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 " @@ -3819,13 +4078,13 @@ msgid "" msgstr "" "你可以在Odoo中为Amazon订单开发票。在销售订单中点击**创建发票**。你也可从订单列表视图中批量创建发票。然后，确认发票并发送给客户。" -#: ../../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 "如要在列表视图中只显示与Amazon相关的订单，可以按销售团队筛选订单。" -#: ../../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 " @@ -3837,11 +4096,11 @@ msgid "" msgstr "" "由于Amazon作为中间方已收到客户付款，你可以在Amazon专用的付款日记账中登记发票付款情况（例如，为Amazon付款设立专门的中间方账户）。对于从Amazon收到的供应商账单也可进行同样操作，并专门用于记录佣金。当你的银行账户在月底收到余额并在Odoo中录入银行对账单时，你只需按收到的金额录入Amazon中间方账户。" -#: ../../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 "在销售报告中追踪你的Amazon销售情况" -#: ../../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 " @@ -3850,13 +4109,13 @@ msgid "" 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 " @@ -3867,8 +4126,9 @@ msgid "" 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 ":doc:`features`" @@ -3877,128 +4137,49 @@ msgid "Configure Amazon Connector in Odoo" msgstr "在Odoo中配置Amazon连接器" #: ../../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 "" -"亚马逊连接器使用授权令牌，该令牌允许Odoo从您的亚马逊卖家平台帐户中获取数据。 " -"只需单击几下即可直接通过卖方中心获取此令牌，并且需要在Odoo数据库配置中进行设置。" - -#: ../../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 "在主菜单中，选择 :menuselection:`应用和服务 --> 管理您的应用` 在显示的页面中，单击``授权新开发者`` 按钮：" - -#: ../../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 "开发者名称： ``Odoo S.A.``" - -#: ../../content/applications/sales/sales/amazon_connector/setup.rst:36 -msgid "Developer ID: ``586127723692``" -msgstr "开发者编号：``586127723692``" - -#: ../../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 "开发者编号： ``579095187166``" - -#: ../../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 "然后，亚马逊将通知您，通过提交表格，您将向Odoo S.A.授予访问卖方中央信息的权限。" - -#: ../../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 "" -"如果没有存储在Odoo数据库中的授权令牌，Odoo " -"S.A.将无法访问您的亚马逊帐户信息。我们不会将这些令牌直接存储在我们的平台上，因此无法在亚马逊连接器正常流程之外访问您的帐户信息。" - -#: ../../content/applications/sales/sales/amazon_connector/setup.rst:53 msgid "Register your Amazon account in Odoo" msgstr "在Odoo中注册你的Amazon账户" -#: ../../content/applications/sales/sales/amazon_connector/setup.rst:57 +#: ../../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 **CREATE**." +"Accounts` and click on :guilabel:`CREATE`." msgstr "" -"如要在Odoo中注册你的卖家账户，前往 :menuselection:`销售 --> 配置 --> 设置 --> 连接器 --> Amazon同步 " -"--> Amazon账户`并点击**创建**。" -#: ../../content/applications/sales/sales/amazon_connector/setup.rst:60 +#: ../../content/applications/sales/sales/amazon_connector/setup.rst:13 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 " -"`." +"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 "" -"可以在 **卖家帐户信息** 页面上的 **您的商家令牌** 链接中的卖家平台中找到 **卖家ID** 。 **授权令牌** 是您在 " -":ref:`上一步`中生成的令牌。" -#: ../../content/applications/sales/sales/amazon_connector/setup.rst:64 +#: ../../content/applications/sales/sales/amazon_connector/setup.rst:17 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." -msgstr "保存后，将检查您的凭据。 如果出现问题，会显示错误 - 在亚马逊识别您的凭据之前，无法保存信息。" +"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 +#: ../../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:23 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." -msgstr "在注册账户后，该账户可用的电商平台在**电商平台**选项卡下列出并同步。如需要，你可将某些项目从已同步电商平台列表中删除，以禁用同步。" +"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:72 +#: ../../content/applications/sales/sales/amazon_connector/setup.rst:28 msgid "Match database products in Amazon" msgstr "与Amazon的数据库产品匹配" -#: ../../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 " @@ -4007,7 +4188,7 @@ msgid "" msgstr "" "在Amazon订单同步后，Odoo将针对Amazon上售出的每件产品创造三个销售订单项目：分别针对电商平台产品、运费（如有）和礼品包装费（如有）。" -#: ../../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, " @@ -4016,7 +4197,7 @@ msgid "" msgstr "" "通过将**内部参考编号**与电商平台商品的**SKU**匹配，与运费的**发运代码**匹配，以及与包装费的**礼品包装**代码匹配，即可为销售订单项目选择数据库产品。" -#: ../../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 " @@ -4027,7 +4208,7 @@ msgstr "" "对于电商平台产品，所有产品配对保存为**Amazon产品方案**，列在账户表单**产品方案**统计按钮下。当确定产品配对后自动创建产品方案，并用于之后的订单查找SKU。如果未找到匹配SKU的产品方案，则:ref:`使用内部参考编号" " `。" -#: ../../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" @@ -4037,7 +4218,7 @@ msgid "" msgstr "" "通过更改产品方案的产品或SKU，可强制将电商平台商品与特定产品配对。如为自动完成，则可手动创建产品方案。如你不使用内部参考编号作为SKU或用不同条件销售产品，这项功能非常有用。" -#: ../../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** " @@ -4046,18 +4227,18 @@ msgid "" msgstr "" "如特定SKU或礼品包装代码未找到内部参考编号匹配的数据库产品，则使用默认数据库产品**Amazon销售**。它将使用默认产品**Amazon发货**和发运代码。" -#: ../../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 " @@ -4067,7 +4248,7 @@ msgid "" msgstr "" "如要允许在Odoo中对Amazon销售产品进行税务报告，则销售订单项目适用的税收设置在产品上或由财政状况决定。确保在Odoo的产品页面或按财政状况设置正确的税收，以免卖家中心和Odoo中的小计金额存在差异。" -#: ../../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 " @@ -4076,89 +4257,173 @@ msgid "" msgstr "" "由于Amazon适用的税收不一定与Odoo的配置完全相同，某些订单的金额可能与卖家中心有细微差异。在与Odoo付款情况对账时，可冲销并解决这些差异。" -#: ../../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 +#: ../../content/applications/sales/sales/amazon_connector/setup.rst:78 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." +"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 "" -"Odoo并未正式支持某些亚马逊市场（例如亚马逊巴西），但可能与您的卖家帐户兼容。 如果您想使用这些市场，可以手动添加。 " -"有关本地支持的市场的详尽列表，请参见 :ref:`此处` 。" -#: ../../content/applications/sales/sales/amazon_connector/setup.rst:128 +#: ../../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." +"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 +#: ../../content/applications/sales/sales/amazon_connector/setup.rst:88 msgid "" -"To add a new marketplace, you must first activate the :ref:`developer mode " -"`." +"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 "完成后，转到 :menuselection:`销售 --> 设置 --> 设定 --> 连接器- -->亚马逊同步--> 亚马逊市场`。" -#: ../../content/applications/sales/sales/amazon_connector/setup.rst:137 +#: ../../content/applications/sales/sales/amazon_connector/setup.rst:93 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 " -"`_." +"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 "" -"从那里，你可以创建一个新的市场记录。 如 `亚马逊文档 " -"`_" -" 中所述，您将需要市场ID和市场的终端。" -#: ../../content/applications/sales/sales/amazon_connector/setup.rst:141 +#: ../../content/applications/sales/sales/amazon_connector/setup.rst:99 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." +"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 "" -"将记录的名称设置为 ``亚马逊`` 以方便地检索它 (例如: ``Amazon.se``). The **代码**, **域** 和 " -"**API标识符”** 字段应分别保存亚马逊文档中的 *国家代码*, *亚马逊MWS端点* 和 *MarketplaceId* 。" -#: ../../content/applications/sales/sales/amazon_connector/setup.rst:145 +#: ../../content/applications/sales/sales/amazon_connector/setup.rst:104 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." +"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 "" -"保存市场后，您应该通过以下方式更新亚马逊账户配置： :menuselection:`销售 --> 设置 --> 设定 --> 连接器 --> 亚马逊同步" -" --> 亚马逊账户`, 在以下位置打开帐户並使用的新市场，请转到 **市场** 选项卡然后单击 " -"**更新可用市场**（动画应确认操作成功）。新添加的市场将自动添加到同步市场列表中。 如果没有将新市场添加到列表中，则意味着您的卖方帐户不兼容或不可用。" -#: ../../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 "由于Odoo并未正式支持手动添加的市场，因此无法保证可以如上所述添加一个市场，也无法保证在与Odoo支持人员联系时将其视为错误。" +#: ../../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 "将Odoo更新到最新版本" + +#: ../../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 "通过新的Odoo模块可以使用新的身份验证机制。 为了能够安装它，您必须确保您的Odoo源代码是最新的。" + +#: ../../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 "如果您在Odoo.com或Odoo.sh平台上使用Odoo，则您的代码已经是最新的，您可以继续执行下一步。" + +#: ../../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 "新模块必须由您的Odoo实例 *发现*，才能在 **应用** 菜单中使用。" + +#: ../../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 "eBay 接口" @@ -5119,12 +5384,10 @@ msgstr "如何根据客户调整价格并应用折扣" 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 " +"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 "" -"Odoo拥有强大的价格表功能，支持适合你公司的定价策略。价格表是指Odoo搜索并确定建议价格的定价或定价规则列表。你可设置使用特定价格的多项条件：期限、最小销售数量（满足最低订购量并获得价格折扣" -" ）等。" #: ../../content/applications/sales/sales/products_prices/prices/pricing.rst:9 msgid "" @@ -6337,16 +6600,10 @@ msgid "" 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 " @@ -6356,50 +6613,50 @@ msgid "" 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 ":doc:`get_signature_to_validate`" -#: ../../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 ":doc:`get_paid_to_validate`" diff --git a/locale/zh_CN/LC_MESSAGES/services.po b/locale/zh_CN/LC_MESSAGES/services.po index 6e493f17b..1bc160069 100644 --- a/locale/zh_CN/LC_MESSAGES/services.po +++ b/locale/zh_CN/LC_MESSAGES/services.po @@ -18,7 +18,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: 2021-11-02 08:49+0000\n" "Last-Translator: 山西清水欧度(QQ:54773801) <54773801@qq.com>, 2022\n" "Language-Team: Chinese (China) (https://www.transifex.com/odoo/teams/41243/zh_CN/)\n" @@ -976,6 +976,7 @@ msgid ":doc:`reinvoice_from_project`" msgstr ":doc:`reinvoice_from_project`" #: ../../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 "" @@ -986,42 +987,150 @@ 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." -msgstr "直接将服务台的服务单记录的应计费时间拉入销售订单，并通过项目任务开具发票。它有助于控制向客户收取的费用并提高效率。" +"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 +#: ../../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 "Configuration" 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*." -msgstr "" -"转到 :menuselection:`服务台 --> 设置 --> 服务台团队 --> 并启用选项 *工单上的时间表* 和 *时间重新开票* 。" - #: ../../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*." +"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" -msgstr "创建销售订单和发票" - -#: ../../content/applications/services/helpdesk/timesheet_and_invoice/reinvoice_from_project.rst:24 +#: ../../content/applications/services/helpdesk/timesheet_and_invoice/reinvoice_from_project.rst:20 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." -msgstr "现在，一旦您记录了在服务台的服务时间，就可以在 *工时单* 选项卡下单击其名称来访问该任务。" +"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:31 -msgid "*Create Sales Order* and proceed to create the invoice." -msgstr "*创建销售订单 *并继续创建发票。" +#: ../../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: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 msgid "Project" diff --git a/locale/zh_CN/LC_MESSAGES/sphinx.po b/locale/zh_CN/LC_MESSAGES/sphinx.po index f4b525718..e5fbd207d 100644 --- a/locale/zh_CN/LC_MESSAGES/sphinx.po +++ b/locale/zh_CN/LC_MESSAGES/sphinx.po @@ -7,18 +7,18 @@ # Mandy Choy , 2022 # Benson , 2022 # 稀饭~~ , 2022 -# Martin Trigaux, 2022 # 黎伟杰 <674416404@qq.com>, 2022 # 山西清水欧度(QQ:54773801) <54773801@qq.com>, 2022 +# Martin Trigaux, 2022 # #, fuzzy 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: 2022-03-18 15:03+0000\n" -"Last-Translator: 山西清水欧度(QQ:54773801) <54773801@qq.com>, 2022\n" +"Last-Translator: Martin Trigaux, 2022\n" "Language-Team: Chinese (China) (https://www.transifex.com/odoo/teams/41243/zh_CN/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -38,7 +38,7 @@ msgstr "联系支持" msgid "Ask the Odoo Community" msgstr "询问 Odoo 社区" -#: ../../extensions/odoo_theme/layout_templates/header.html:11 +#: ../../extensions/odoo_theme/layout_templates/header.html:10 msgid "Try Odoo for FREE" msgstr "免费试用 Odoo" @@ -148,10 +148,14 @@ msgid "" msgstr "您想为 Odoo 做出贡献但不知道从哪里开始？教程和指南可帮助您使 Odoo 变得更好。" #: ../../extensions/odoo_theme/layout_templates/homepage.html:102 -msgid "Write documentation" -msgstr "编写文档" +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/zh_CN/LC_MESSAGES/websites.po b/locale/zh_CN/LC_MESSAGES/websites.po index 9984eebab..a6e462ff9 100644 --- a/locale/zh_CN/LC_MESSAGES/websites.po +++ b/locale/zh_CN/LC_MESSAGES/websites.po @@ -14,19 +14,19 @@ # mrshelly , 2022 # Datasource International , 2022 # Connie Xiao , 2022 -# Martin Trigaux, 2022 # Jeffery CHEN , 2022 # Mandy Choy , 2022 # 山西清水欧度(QQ:54773801) <54773801@qq.com>, 2022 +# Martin Trigaux, 2022 # #, fuzzy 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: 2022-03-18 15:03+0000\n" -"Last-Translator: 山西清水欧度(QQ:54773801) <54773801@qq.com>, 2022\n" +"Last-Translator: Martin Trigaux, 2022\n" "Language-Team: Chinese (China) (https://www.transifex.com/odoo/teams/41243/zh_CN/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -60,11 +60,15 @@ msgstr "" "register>'。然后，访问者可以使用“www.example.com”等地址而不是默认的“example.odoo.com”来访问您的网站。" #: ../../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 `_" @@ -384,78 +388,98 @@ 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)" -msgstr "如何销售附件和可选产品（交叉销售）" +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:" -msgstr "当你出售计电脑时， 为什么不鼓励您的客户购买一流的屏幕或额外保修？ 这就是交叉销售功能的目标：" +"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)." -msgstr "新的 *添加到购物车* 屏幕上的可选产品（默认情况下未安装）。" +"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" -msgstr "结帐时配套产品" +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." -msgstr "当客户在付款前查看购物车时，会显示配件（例如，电脑的配件：鼠标，键盘）。" +":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." -msgstr "在产品详细信息页面的 *销售* 标签中选择配件。" +msgid "Accessory Products" +msgstr "配件" -#: ../../content/applications/websites/ecommerce/maximizing_revenue/cross_selling.rst:26 +#: ../../content/applications/websites/ecommerce/maximizing_revenue/cross_selling.rst:22 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." -msgstr "当多个产品被添加到购物车时，这是一种预测附件产品的最佳算法。如果某一附件对应多个加入购物车的产品，那么它很可能会出现在推荐附件的最顶端。" - -#: ../../content/applications/websites/ecommerce/maximizing_revenue/cross_selling.rst:31 -msgid "Optional products when adding to cart" -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." +"**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: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: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:" -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." -msgstr "在 *应用程式* 菜单中安装 *电子商务可选产品* 插件，移除默认过滤器并在插件上搜索，否则只会显示主要的应用程式。" +"`Odoo Tutorials: Alternative, Accessory, and Optional Products " +"`_." +msgstr "" + +#: ../../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." -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." -msgstr "添加到购物车的可选项目数量与主要项目相同。" +"**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: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 msgid "Adapt prices to website visitors" @@ -673,10 +697,6 @@ msgid "" "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 "付款" @@ -779,7 +799,7 @@ msgstr "" #: ../../content/applications/websites/ecommerce/shopper_experience/payment_acquirer.rst:62 msgid "" ":ref:`Payment Acquirers: Place a hold on a card " -"`" +"`" msgstr "" #: ../../content/applications/websites/ecommerce/shopper_experience/portal.rst:3 @@ -1167,19 +1187,51 @@ msgstr ":doc:`google_analytics_dashboard`" msgid "How to track your website traffic from your Odoo Dashboard" msgstr "如何从Odoo仪表中跟踪你的网站流量" -#: ../../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 "有了Google Analytics，你可以直接从Odoo网站跟踪你的流量统计。" -#: ../../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 "准备步骤包括创建一个Google Analytics账号并在网址设置中输入跟踪ID（参见doc:`google_analytics`）" -#: ../../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." @@ -1187,31 +1239,31 @@ msgstr "" "在 `Google API平台 `__中生成Analytics API " "凭证，再用Google账户登录。" -#: ../../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 "选择Analytics API。" -#: ../../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 "创建一个新项目并命名（如Odoo），此项目用于存放你的API凭证。" -#: ../../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 "启用API接口。" -#: ../../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 "创建一个用于Odoo的凭证。" -#: ../../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 "选择 *网页浏览器（Javascript）* 作为调用源，选择 *用户数据* 作为数据类型。" -#: ../../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" @@ -1222,7 +1274,7 @@ msgstr "" "接着创建一个客户端ID。输入应用的名称（如Odoo）及允许转向的页面。*授权JavaScript源文件* 是你的实例URL地址，*授权转向URI* " "是你Odoo实例的URL地址'/google_account/authentication'。" -#: ../../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 " @@ -1232,18 +1284,18 @@ msgstr "" "输入产品名称（如在Odoo中输入Google " "Analytics），完成用户许可步骤，可任意选择自定义选项（非强制）。只有第一次在Odoo中输入客户端ID时显示用户许可画面。" -#: ../../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 "最后，你会获得一个客户端ID。将此ID复制粘贴到Odoo。" -#: ../../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 "最后，授权Odoo访问Google API接口。" @@ -2294,40 +2346,24 @@ 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 " -"`_" -msgstr "" -"除了速度快，Odoo也比传统的CMS和电子商务（Drupal、Wordpress、Magento、Prestashop）更具可扩展性。以下链接提供了在高查询量时主要的开源CMS和电子商务与Odoo的分析比较：`https://www.odoo.com/slides/slide/197" -" `_" - -#: ../../content/applications/websites/website/optimize/seo.rst:568 -msgid "Todo" -msgstr "待办" - -#: ../../content/applications/websites/website/optimize/seo.rst:568 -msgid "fix above link" +"and eCommerce (Drupal, Wordpress, Magento, Prestashop)." 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 "这里总结了Odoo网站和电子商务可扩展性的概览。" -#: ../../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 " @@ -2335,7 +2371,7 @@ msgid "" msgstr "" "网站地图向搜索引擎机器人指出索引的页面。Odoo将自动生成 ``/sitemap.xml`` 文件。基于性能原因，该文件被缓存，并将每12小时更新一次。" -#: ../../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, " @@ -2346,22 +2382,22 @@ msgstr "" "默认情况下，所有的URL将在``/sitemap.xml``文件，但是如果有很多页，Odoo将自动创建一个网站地图索引文件，遵守`sitemaps.org" " protocol `__ 在每个文件的45000中分组网站地图 URL。" -#: ../../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 "每一个网站的入口有4个属性，自动计算：" -#: ../../content/applications/websites/website/optimize/seo.rst:593 +#: ../../content/applications/websites/website/optimize/seo.rst:587 msgid "```` : the URL of a page" msgstr "```` : 页面的URL" -#: ../../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" @@ -2370,11 +2406,11 @@ msgid "" msgstr "" "````：模块可以基于自己的内容有优先级算法（例如：一个论坛可能基于投票的数量分配优先权）。静态页面的优先级是由它的优先级字段定义的，呈常规化（16是默认值）。" -#: ../../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 " @@ -2384,13 +2420,13 @@ msgstr "" "结构化数据标记是用来在搜索引擎结果中生成Rich " "Snippets的。这是网站所有者用于将结构化数据发送给搜索引擎机器人的途径；帮助它们了解你的内容，并产生良好的搜索结果。" -#: ../../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 " @@ -2400,11 +2436,11 @@ msgstr "" "Odoo实现微观数据在`schema.org `__ 中定义，对活动, " "电子商务产品，论坛帖子和联系地址的描述。这可以让你的产品页面显示在谷歌信息栏，如产品的价格和评级：" -#: ../../content/applications/websites/website/optimize/seo.rst:627 +#: ../../content/applications/websites/website/optimize/seo.rst:621 msgid "robots.txt" msgstr "robots.txt" -#: ../../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, " @@ -2412,18 +2448,18 @@ msgid "" msgstr "" "在编制网站索引时，搜索引擎首先查看``/robots.txt``文件的一般索引规则（允许的机器人、网站地图路径等）。Odoo自动创建该文件。其内容是：" -#: ../../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 "用户代理：\\* Sitemap: https://www.odoo.com/sitemap.xml" -#: ../../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 " @@ -2696,11 +2732,34 @@ 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 " @@ -2711,11 +2770,11 @@ 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 " @@ -2725,51 +2784,51 @@ 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 --> " @@ -2778,42 +2837,42 @@ msgstr "" "只能在当前网站创建新的静态页面并发布。你可以将它复制到其他网站，路径为 :menuselection:`网站 --> 配置 --> 页面`。请将 " "*网站* 字段留空。" -#: ../../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 "通过页面管理器按URL对页面进行分组，你可以快速找到每个编辑页面后面的原始页面。" -#: ../../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 " @@ -2821,46 +2880,46 @@ msgid "" "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 " @@ -2871,17 +2930,17 @@ msgstr "" "如果你需要通过唯一参考编号来管理库存，你应安装 *制造* 应用程序并创建 *套件* (BoMs) " "物料清单。每个套件将每个发布的“虚拟”产品关联到库存中管理的主要参考编号。这样，从你的网站出售的任何项目将在交货单中转换为可库存的产品。" -#: ../../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 " @@ -2890,24 +2949,24 @@ msgstr "" "然后，前往 :menuselection:`网站 --> 产品 --> 价目表 `创建其他价目表。参见 " ":doc:`../../ecommerce/maximizing_revenue/pricing`。" -#: ../../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 "如果选择了 *可选择* ，字段留空则意味着它适用于所有网站。否则，它只能用于销售和POS应用程序的后端操作。" -#: ../../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 " @@ -2917,11 +2976,11 @@ msgstr "" "默认情况下，所有网站都部署了已发布的付款收单机构和交货方式。你在网站配置中定义国家，即可通过Geo IP确定每个国家使用的具体支付收单机构。你也可填写 " "*网站* 字段，对每个网站进行设置。" -#: ../../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 " @@ -2931,39 +2990,39 @@ msgid "" 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 "*can_access_from_current_website* 以确保访问者可在当前网站中看到记录。" -#: ../../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 "不要忘记指定域只显示当前网站可用的记录。" @@ -3012,7 +3071,7 @@ msgid "" 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