From ad7b6362753110ec355d308532218f812d3805a6 Mon Sep 17 00:00:00 2001 From: Martin Trigaux Date: Tue, 20 Jun 2023 08:23:10 +0000 Subject: [PATCH] [I18N] *: export 16.0 source terms closes odoo/documentation#4769 X-original-commit: eb68fc1 Signed-off-by: Martin Trigaux (mat) --- locale/sources/administration.pot | 563 +++++---- locale/sources/finance.pot | 1585 +++++++++++++++++--------- locale/sources/inventory_and_mrp.pot | 46 +- locale/sources/legal.pot | 32 +- locale/sources/marketing.pot | 267 +++-- locale/sources/productivity.pot | 224 +++- locale/sources/sales.pot | 551 +++------ locale/sources/services.pot | 523 +++++---- locale/sources/websites.pot | 382 +++---- 9 files changed, 2398 insertions(+), 1775 deletions(-) diff --git a/locale/sources/administration.pot b/locale/sources/administration.pot index 793554daa..633b8d55f 100644 --- a/locale/sources/administration.pot +++ b/locale/sources/administration.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: Odoo saas-16.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-06-03 06:55+0000\n" +"POT-Creation-Date: 2023-06-20 08:18+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -913,7 +913,7 @@ msgstr "" #: ../../content/administration/install/install.rst:59 #: ../../content/administration/maintain/domain_names.rst:166 #: ../../content/administration/maintain/domain_names.rst:236 -#: ../../content/administration/maintain/supported_versions.rst:27 +#: ../../content/administration/maintain/supported_versions.rst:31 #: ../../content/administration/upgrade/odoo_online.rst:3 msgid "Odoo Online" msgstr "" @@ -1910,7 +1910,7 @@ msgstr "" #: ../../content/administration/maintain/domain_names.rst:171 #: ../../content/administration/maintain/domain_names.rst:250 -#: ../../content/administration/maintain/supported_versions.rst:27 +#: ../../content/administration/maintain/supported_versions.rst:32 #: ../../content/administration/odoo_sh.rst:5 #: ../../content/administration/upgrade/odoo_sh.rst:3 msgid "Odoo.sh" @@ -2954,6 +2954,8 @@ msgstr "" #: ../../content/administration/maintain/odoo_online.rst:38 #: ../../content/administration/odoo_sh/getting_started/branches.rst:293 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:77 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:113 #: ../../content/administration/upgrade.rst:10 msgid "Upgrade" msgstr "" @@ -3320,274 +3322,342 @@ msgstr "" msgid "**Major releases are in bold type.**" msgstr "" -#: ../../content/administration/maintain/supported_versions.rst:27 +#: ../../content/administration/maintain/supported_versions.rst:33 #: ../../content/administration/upgrade/on_premise.rst:3 msgid "On-Premise" msgstr "" -#: ../../content/administration/maintain/supported_versions.rst:27 +#: ../../content/administration/maintain/supported_versions.rst:34 msgid "Release date" msgstr "" -#: ../../content/administration/maintain/supported_versions.rst:27 +#: ../../content/administration/maintain/supported_versions.rst:35 msgid "End of support" msgstr "" -#: ../../content/administration/maintain/supported_versions.rst:29 -msgid "Odoo saas~16.2" +#: ../../content/administration/maintain/supported_versions.rst:36 +msgid "Odoo saas~16.3" msgstr "" -#: ../../content/administration/maintain/supported_versions.rst:29 -#: ../../content/administration/maintain/supported_versions.rst:31 -#: ../../content/administration/maintain/supported_versions.rst:33 -#: ../../content/administration/maintain/supported_versions.rst:39 -#: ../../content/administration/maintain/supported_versions.rst:41 +#: ../../content/administration/maintain/supported_versions.rst:37 +#: ../../content/administration/maintain/supported_versions.rst:43 +#: ../../content/administration/maintain/supported_versions.rst:55 +#: ../../content/administration/maintain/supported_versions.rst:56 +#: ../../content/administration/maintain/supported_versions.rst:57 +#: ../../content/administration/maintain/supported_versions.rst:73 +#: ../../content/administration/maintain/supported_versions.rst:74 +#: ../../content/administration/maintain/supported_versions.rst:75 +#: ../../content/administration/maintain/supported_versions.rst:79 +#: ../../content/administration/maintain/supported_versions.rst:80 +#: ../../content/administration/maintain/supported_versions.rst:81 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:58 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:59 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:62 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:63 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:66 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:67 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:70 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:71 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:74 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:75 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:78 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:79 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:82 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:83 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:86 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:87 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:91 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:95 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:99 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:103 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:107 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:111 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:115 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:119 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:122 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:123 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:127 msgid "|green|" msgstr "" -#: ../../content/administration/maintain/supported_versions.rst:29 -#: ../../content/administration/maintain/supported_versions.rst:31 -#: ../../content/administration/maintain/supported_versions.rst:35 -#: ../../content/administration/maintain/supported_versions.rst:37 +#: ../../content/administration/maintain/supported_versions.rst:38 +#: ../../content/administration/maintain/supported_versions.rst:39 +#: ../../content/administration/maintain/supported_versions.rst:44 #: ../../content/administration/maintain/supported_versions.rst:45 -#: ../../content/administration/maintain/supported_versions.rst:49 -#: ../../content/administration/maintain/supported_versions.rst:53 -#: ../../content/administration/maintain/supported_versions.rst:55 -#: ../../content/administration/maintain/supported_versions.rst:59 -#: ../../content/administration/maintain/supported_versions.rst:61 +#: ../../content/administration/maintain/supported_versions.rst:50 +#: ../../content/administration/maintain/supported_versions.rst:51 +#: ../../content/administration/maintain/supported_versions.rst:62 #: ../../content/administration/maintain/supported_versions.rst:63 -#: ../../content/administration/maintain/supported_versions.rst:65 +#: ../../content/administration/maintain/supported_versions.rst:68 +#: ../../content/administration/maintain/supported_versions.rst:69 +#: ../../content/administration/maintain/supported_versions.rst:92 +#: ../../content/administration/maintain/supported_versions.rst:93 +#: ../../content/administration/maintain/supported_versions.rst:104 +#: ../../content/administration/maintain/supported_versions.rst:105 +#: ../../content/administration/maintain/supported_versions.rst:116 +#: ../../content/administration/maintain/supported_versions.rst:117 +#: ../../content/administration/maintain/supported_versions.rst:122 +#: ../../content/administration/maintain/supported_versions.rst:123 +#: ../../content/administration/maintain/supported_versions.rst:134 +#: ../../content/administration/maintain/supported_versions.rst:135 +#: ../../content/administration/maintain/supported_versions.rst:140 +#: ../../content/administration/maintain/supported_versions.rst:146 +#: ../../content/administration/maintain/supported_versions.rst:147 +#: ../../content/administration/maintain/supported_versions.rst:152 msgid "N/A" msgstr "" -#: ../../content/administration/maintain/supported_versions.rst:29 +#: ../../content/administration/maintain/supported_versions.rst:40 +msgid "June 2023" +msgstr "" + +#: ../../content/administration/maintain/supported_versions.rst:41 +msgid "September 2023 (planned)" +msgstr "" + +#: ../../content/administration/maintain/supported_versions.rst:42 +msgid "Odoo saas~16.2" +msgstr "" + +#: ../../content/administration/maintain/supported_versions.rst:46 msgid "March 2023" msgstr "" -#: ../../content/administration/maintain/supported_versions.rst:29 -msgid "June 2023 (planned)" +#: ../../content/administration/maintain/supported_versions.rst:47 +msgid "July 2023 (planned)" msgstr "" -#: ../../content/administration/maintain/supported_versions.rst:31 +#: ../../content/administration/maintain/supported_versions.rst:48 msgid "Odoo saas~16.1" msgstr "" -#: ../../content/administration/maintain/supported_versions.rst:31 -msgid "February 2023" -msgstr "" - -#: ../../content/administration/maintain/supported_versions.rst:31 -msgid "April 2023" -msgstr "" - -#: ../../content/administration/maintain/supported_versions.rst:33 -msgid "**Odoo 16.0**" -msgstr "" - -#: ../../content/administration/maintain/supported_versions.rst:33 -#: ../../content/administration/maintain/supported_versions.rst:43 -msgid "October 2022" -msgstr "" - -#: ../../content/administration/maintain/supported_versions.rst:33 -msgid "October 2025 (planned)" -msgstr "" - -#: ../../content/administration/maintain/supported_versions.rst:35 -msgid "Odoo saas~15.2" -msgstr "" - -#: ../../content/administration/maintain/supported_versions.rst:35 -#: ../../content/administration/maintain/supported_versions.rst:37 -#: ../../content/administration/maintain/supported_versions.rst:43 -#: ../../content/administration/maintain/supported_versions.rst:45 -#: ../../content/administration/maintain/supported_versions.rst:47 #: ../../content/administration/maintain/supported_versions.rst:49 -#: ../../content/administration/maintain/supported_versions.rst:51 -#: ../../content/administration/maintain/supported_versions.rst:53 -#: ../../content/administration/maintain/supported_versions.rst:55 -#: ../../content/administration/maintain/supported_versions.rst:57 -#: ../../content/administration/maintain/supported_versions.rst:59 #: ../../content/administration/maintain/supported_versions.rst:61 -#: ../../content/administration/maintain/supported_versions.rst:63 -#: ../../content/administration/maintain/supported_versions.rst:65 +#: ../../content/administration/maintain/supported_versions.rst:67 +#: ../../content/administration/maintain/supported_versions.rst:85 +#: ../../content/administration/maintain/supported_versions.rst:86 +#: ../../content/administration/maintain/supported_versions.rst:87 +#: ../../content/administration/maintain/supported_versions.rst:91 +#: ../../content/administration/maintain/supported_versions.rst:97 +#: ../../content/administration/maintain/supported_versions.rst:98 +#: ../../content/administration/maintain/supported_versions.rst:99 +#: ../../content/administration/maintain/supported_versions.rst:103 +#: ../../content/administration/maintain/supported_versions.rst:109 +#: ../../content/administration/maintain/supported_versions.rst:110 +#: ../../content/administration/maintain/supported_versions.rst:111 +#: ../../content/administration/maintain/supported_versions.rst:115 +#: ../../content/administration/maintain/supported_versions.rst:121 +#: ../../content/administration/maintain/supported_versions.rst:127 +#: ../../content/administration/maintain/supported_versions.rst:128 +#: ../../content/administration/maintain/supported_versions.rst:129 +#: ../../content/administration/maintain/supported_versions.rst:133 +#: ../../content/administration/maintain/supported_versions.rst:139 +#: ../../content/administration/maintain/supported_versions.rst:141 +#: ../../content/administration/maintain/supported_versions.rst:145 +#: ../../content/administration/maintain/supported_versions.rst:151 +#: ../../content/administration/maintain/supported_versions.rst:153 msgid "|red|" msgstr "" -#: ../../content/administration/maintain/supported_versions.rst:35 +#: ../../content/administration/maintain/supported_versions.rst:52 +msgid "February 2023" +msgstr "" + +#: ../../content/administration/maintain/supported_versions.rst:53 +msgid "April 2023" +msgstr "" + +#: ../../content/administration/maintain/supported_versions.rst:54 +msgid "**Odoo 16.0**" +msgstr "" + +#: ../../content/administration/maintain/supported_versions.rst:58 +#: ../../content/administration/maintain/supported_versions.rst:89 +msgid "October 2022" +msgstr "" + +#: ../../content/administration/maintain/supported_versions.rst:59 +msgid "October 2025 (planned)" +msgstr "" + +#: ../../content/administration/maintain/supported_versions.rst:60 +msgid "Odoo saas~15.2" +msgstr "" + +#: ../../content/administration/maintain/supported_versions.rst:64 msgid "March 2022" msgstr "" -#: ../../content/administration/maintain/supported_versions.rst:35 +#: ../../content/administration/maintain/supported_versions.rst:65 msgid "January 2023" msgstr "" -#: ../../content/administration/maintain/supported_versions.rst:37 +#: ../../content/administration/maintain/supported_versions.rst:66 msgid "Odoo saas~15.1" msgstr "" -#: ../../content/administration/maintain/supported_versions.rst:37 +#: ../../content/administration/maintain/supported_versions.rst:70 msgid "February 2022" msgstr "" -#: ../../content/administration/maintain/supported_versions.rst:37 +#: ../../content/administration/maintain/supported_versions.rst:71 msgid "July 2022" msgstr "" -#: ../../content/administration/maintain/supported_versions.rst:39 +#: ../../content/administration/maintain/supported_versions.rst:72 msgid "**Odoo 15.0**" msgstr "" -#: ../../content/administration/maintain/supported_versions.rst:39 -#: ../../content/administration/maintain/supported_versions.rst:47 +#: ../../content/administration/maintain/supported_versions.rst:76 +#: ../../content/administration/maintain/supported_versions.rst:101 msgid "October 2021" msgstr "" -#: ../../content/administration/maintain/supported_versions.rst:39 +#: ../../content/administration/maintain/supported_versions.rst:77 msgid "October 2024 (planned)" msgstr "" -#: ../../content/administration/maintain/supported_versions.rst:41 +#: ../../content/administration/maintain/supported_versions.rst:78 msgid "**Odoo 14.0**" msgstr "" -#: ../../content/administration/maintain/supported_versions.rst:41 -#: ../../content/administration/maintain/supported_versions.rst:51 +#: ../../content/administration/maintain/supported_versions.rst:82 +#: ../../content/administration/maintain/supported_versions.rst:113 msgid "October 2020" msgstr "" -#: ../../content/administration/maintain/supported_versions.rst:41 +#: ../../content/administration/maintain/supported_versions.rst:83 msgid "October 2023 (planned)" msgstr "" -#: ../../content/administration/maintain/supported_versions.rst:43 +#: ../../content/administration/maintain/supported_versions.rst:84 msgid "**Odoo 13.0**" msgstr "" -#: ../../content/administration/maintain/supported_versions.rst:43 -#: ../../content/administration/maintain/supported_versions.rst:57 +#: ../../content/administration/maintain/supported_versions.rst:88 +#: ../../content/administration/maintain/supported_versions.rst:131 msgid "October 2019" msgstr "" -#: ../../content/administration/maintain/supported_versions.rst:45 +#: ../../content/administration/maintain/supported_versions.rst:90 msgid "Odoo saas~12.3" msgstr "" -#: ../../content/administration/maintain/supported_versions.rst:45 +#: ../../content/administration/maintain/supported_versions.rst:94 msgid "August 2019" msgstr "" -#: ../../content/administration/maintain/supported_versions.rst:47 +#: ../../content/administration/maintain/supported_versions.rst:96 msgid "**Odoo 12.0**" msgstr "" -#: ../../content/administration/maintain/supported_versions.rst:47 -#: ../../content/administration/maintain/supported_versions.rst:61 +#: ../../content/administration/maintain/supported_versions.rst:100 +#: ../../content/administration/maintain/supported_versions.rst:143 msgid "October 2018" msgstr "" -#: ../../content/administration/maintain/supported_versions.rst:49 +#: ../../content/administration/maintain/supported_versions.rst:102 msgid "Odoo saas~11.3" msgstr "" -#: ../../content/administration/maintain/supported_versions.rst:49 +#: ../../content/administration/maintain/supported_versions.rst:106 msgid "April 2018" msgstr "" -#: ../../content/administration/maintain/supported_versions.rst:51 +#: ../../content/administration/maintain/supported_versions.rst:108 msgid "**Odoo 11.0**" msgstr "" -#: ../../content/administration/maintain/supported_versions.rst:51 -#: ../../content/administration/maintain/supported_versions.rst:65 +#: ../../content/administration/maintain/supported_versions.rst:112 +#: ../../content/administration/maintain/supported_versions.rst:155 msgid "October 2017" msgstr "" -#: ../../content/administration/maintain/supported_versions.rst:53 +#: ../../content/administration/maintain/supported_versions.rst:114 msgid "Odoo 10.saas~15" msgstr "" -#: ../../content/administration/maintain/supported_versions.rst:53 +#: ../../content/administration/maintain/supported_versions.rst:118 msgid "March 2017" msgstr "" -#: ../../content/administration/maintain/supported_versions.rst:55 +#: ../../content/administration/maintain/supported_versions.rst:120 msgid "Odoo 10.saas~14" msgstr "" -#: ../../content/administration/maintain/supported_versions.rst:55 +#: ../../content/administration/maintain/supported_versions.rst:124 msgid "January 2017" msgstr "" -#: ../../content/administration/maintain/supported_versions.rst:57 +#: ../../content/administration/maintain/supported_versions.rst:126 msgid "**Odoo 10.0**" msgstr "" -#: ../../content/administration/maintain/supported_versions.rst:57 +#: ../../content/administration/maintain/supported_versions.rst:130 msgid "October 2016" msgstr "" -#: ../../content/administration/maintain/supported_versions.rst:59 +#: ../../content/administration/maintain/supported_versions.rst:132 msgid "Odoo 9.saas~11" msgstr "" -#: ../../content/administration/maintain/supported_versions.rst:59 +#: ../../content/administration/maintain/supported_versions.rst:136 msgid "May 2016" msgstr "" -#: ../../content/administration/maintain/supported_versions.rst:61 +#: ../../content/administration/maintain/supported_versions.rst:138 msgid "**Odoo 9.0**" msgstr "" -#: ../../content/administration/maintain/supported_versions.rst:61 +#: ../../content/administration/maintain/supported_versions.rst:142 msgid "October 2015" msgstr "" -#: ../../content/administration/maintain/supported_versions.rst:63 +#: ../../content/administration/maintain/supported_versions.rst:144 msgid "Odoo 8.saas~6" msgstr "" -#: ../../content/administration/maintain/supported_versions.rst:63 +#: ../../content/administration/maintain/supported_versions.rst:148 msgid "February 2015" msgstr "" -#: ../../content/administration/maintain/supported_versions.rst:65 +#: ../../content/administration/maintain/supported_versions.rst:150 msgid "**Odoo 8.0**" msgstr "" -#: ../../content/administration/maintain/supported_versions.rst:65 +#: ../../content/administration/maintain/supported_versions.rst:154 msgid "September 2014" msgstr "" -#: ../../content/administration/maintain/supported_versions.rst:70 +#: ../../content/administration/maintain/supported_versions.rst:159 msgid "|green| Supported version" msgstr "" -#: ../../content/administration/maintain/supported_versions.rst:72 +#: ../../content/administration/maintain/supported_versions.rst:161 msgid "|red| End-of-support" msgstr "" -#: ../../content/administration/maintain/supported_versions.rst:74 +#: ../../content/administration/maintain/supported_versions.rst:163 msgid "N/A Never released for this platform" msgstr "" -#: ../../content/administration/maintain/supported_versions.rst:76 +#: ../../content/administration/maintain/supported_versions.rst:165 msgid "šŸ Future version, not released yet" msgstr "" -#: ../../content/administration/maintain/supported_versions.rst:87 +#: ../../content/administration/maintain/supported_versions.rst:176 msgid "I run an older version of Odoo/OpenERP/TinyERP" msgstr "" -#: ../../content/administration/maintain/supported_versions.rst:89 +#: ../../content/administration/maintain/supported_versions.rst:178 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:91 +#: ../../content/administration/maintain/supported_versions.rst:180 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:93 +#: ../../content/administration/maintain/supported_versions.rst:182 msgid "Even though we don't support older versions, you can always `upgrade from any version `_." msgstr "" @@ -3981,7 +4051,7 @@ msgid "Your scheduled actions should be `idempotent `." -msgstr "" - -#: ../../content/administration/odoo_sh/getting_started/settings.rst:112 -msgid "Configure the deploy keys for the private repositories you use as submodules in your branches to allow Odoo.sh to download them." -msgstr "" - -#: ../../content/administration/odoo_sh/getting_started/settings.rst:116 -msgid "These settings are required for **private repositories** only. If you are looking on how to set up your submodules, instructions are available in the chapter :ref:`Submodules ` of this documentation." -msgstr "" - -#: ../../content/administration/odoo_sh/getting_started/settings.rst:123 -msgid "When a repository is private, it is not possible to publicly download its branches and revisions. For that reason, you need to configure a deploy key for Odoo.sh, so the remote Git server allows our platform to download the revisions of this private repository." -msgstr "" - -#: ../../content/administration/odoo_sh/getting_started/settings.rst:128 -msgid "To configure the deploy key for a private repository, proceed as follows:" -msgstr "" - #: ../../content/administration/odoo_sh/getting_started/settings.rst:130 -msgid "in the input, paste the SSH URL of your private sub-repository and click on *Add*," -msgstr "" - -#: ../../content/administration/odoo_sh/getting_started/settings.rst:132 -msgid "e.g. *git@github.com:USERNAME/REPOSITORY.git*" -msgstr "" - -#: ../../content/administration/odoo_sh/getting_started/settings.rst:133 -msgid "it can be another Git server than Github, such as Bitbucket, Gitlab or even your own self-hosted server" -msgstr "" - -#: ../../content/administration/odoo_sh/getting_started/settings.rst:136 -msgid "copy the public key," -msgstr "" - -#: ../../content/administration/odoo_sh/getting_started/settings.rst:138 -msgid "it should look like *ssh-rsa some...random...characters...here...==*" -msgstr "" - -#: ../../content/administration/odoo_sh/getting_started/settings.rst:140 -msgid "in the settings of the private sub-repository, add the public key amongst the deploy keys." -msgstr "" - -#: ../../content/administration/odoo_sh/getting_started/settings.rst:142 -msgid "Github.com: :menuselection:`Settings --> Deploy keys --> Add deploy key`" -msgstr "" - -#: ../../content/administration/odoo_sh/getting_started/settings.rst:143 -msgid "Bitbucket.com: :menuselection:`Settings --> Access keys --> Add key`" -msgstr "" - -#: ../../content/administration/odoo_sh/getting_started/settings.rst:144 -msgid "Gitlab.com: :menuselection:`Settings --> Repository --> Deploy Keys`" +msgid "\\* Only in staging branches" msgstr "" #: ../../content/administration/odoo_sh/getting_started/settings.rst:145 -msgid "Self-hosted: append the key to the git userā€™s authorized_keys file in its .ssh directory" +msgid "Public Access" msgstr "" -#: ../../content/administration/odoo_sh/getting_started/settings.rst:148 -msgid "Storage Size" +#: ../../content/administration/odoo_sh/getting_started/settings.rst:147 +msgid "Allow public access to your development builds." msgstr "" -#: ../../content/administration/odoo_sh/getting_started/settings.rst:150 -msgid "This section shows the storage size used by your project." +#: ../../content/administration/odoo_sh/getting_started/settings.rst:152 +msgid "If activated, this option exposes the Builds page publicly, allowing visitors to connect to your development builds." msgstr "" #: ../../content/administration/odoo_sh/getting_started/settings.rst:155 -msgid "Storage size is computed as follows:" +msgid "In addition, visitors have access to the logs, shell and mails of your development builds." msgstr "" #: ../../content/administration/odoo_sh/getting_started/settings.rst:157 -msgid "the size of the PostgreSQL database" -msgstr "" - -#: ../../content/administration/odoo_sh/getting_started/settings.rst:159 -msgid "the size of the disk files available in your container: database filestore, sessions storage directory..." +msgid "Production and staging builds are excluded, visitors can only see their status." msgstr "" #: ../../content/administration/odoo_sh/getting_started/settings.rst:162 -msgid "In case you want to analyze disk usage, you can run the tool `ncdu `_ in your Web Shell." +msgid "Custom domains" msgstr "" -#: ../../content/administration/odoo_sh/getting_started/settings.rst:165 -msgid "Should your production database size grow to exceed what's provisioned in your subscription, it will automatically be synchronized with it." +#: ../../content/administration/odoo_sh/getting_started/settings.rst:164 +msgid "To configure additional domains please refer to the corresponding branch's :ref:`settings tab `." msgstr "" -#: ../../content/administration/odoo_sh/getting_started/settings.rst:169 -msgid "Database Workers" +#: ../../content/administration/odoo_sh/getting_started/settings.rst:172 +msgid "Configure the deploy keys for the private repositories you use as submodules in your branches to allow Odoo.sh to download them." msgstr "" -#: ../../content/administration/odoo_sh/getting_started/settings.rst:171 -msgid "Additional database workers can be configured here. More workers help increase the load your production database is able to handle. If you add more, it will automatically be synchronized with your subscription." +#: ../../content/administration/odoo_sh/getting_started/settings.rst:176 +msgid "These settings are required for **private repositories** only. If you are looking on how to set up your submodules, instructions are available in the chapter :ref:`Submodules ` of this documentation." msgstr "" -#: ../../content/administration/odoo_sh/getting_started/settings.rst:179 -msgid "Adding more workers will not magically solve all performance issues. It only allows the server to handle more connections at the same time. If some operations are unusually slow, it's most likely a problem with the code, if it's not due to your own customizations you can open a ticket `here `_." +#: ../../content/administration/odoo_sh/getting_started/settings.rst:183 +msgid "When a repository is private, it is not possible to publicly download its branches and revisions. For that reason, you need to configure a deploy key for Odoo.sh, so the remote Git server allows our platform to download the revisions of this private repository." msgstr "" -#: ../../content/administration/odoo_sh/getting_started/settings.rst:185 -msgid "Staging Branches" +#: ../../content/administration/odoo_sh/getting_started/settings.rst:188 +msgid "To configure the deploy key for a private repository, proceed as follows:" msgstr "" -#: ../../content/administration/odoo_sh/getting_started/settings.rst:187 -msgid "Additional staging branches allow you to develop and test more features at the same time. If you add more, it will automatically be synchronized with your subscription." +#: ../../content/administration/odoo_sh/getting_started/settings.rst:190 +msgid "in the input, paste the SSH URL of your private sub-repository and click on *Add*," msgstr "" -#: ../../content/administration/odoo_sh/getting_started/settings.rst:194 -msgid "Activation" +#: ../../content/administration/odoo_sh/getting_started/settings.rst:192 +msgid "e.g. *git@github.com:USERNAME/REPOSITORY.git*" +msgstr "" + +#: ../../content/administration/odoo_sh/getting_started/settings.rst:193 +msgid "it can be another Git server than Github, such as Bitbucket, Gitlab or even your own self-hosted server" msgstr "" #: ../../content/administration/odoo_sh/getting_started/settings.rst:196 +msgid "copy the public key," +msgstr "" + +#: ../../content/administration/odoo_sh/getting_started/settings.rst:198 +msgid "it should look like *ssh-rsa some...random...characters...here...==*" +msgstr "" + +#: ../../content/administration/odoo_sh/getting_started/settings.rst:200 +msgid "in the settings of the private sub-repository, add the public key amongst the deploy keys." +msgstr "" + +#: ../../content/administration/odoo_sh/getting_started/settings.rst:202 +msgid "Github.com: :menuselection:`Settings --> Deploy keys --> Add deploy key`" +msgstr "" + +#: ../../content/administration/odoo_sh/getting_started/settings.rst:203 +msgid "Bitbucket.com: :menuselection:`Settings --> Access keys --> Add key`" +msgstr "" + +#: ../../content/administration/odoo_sh/getting_started/settings.rst:204 +msgid "Gitlab.com: :menuselection:`Settings --> Repository --> Deploy Keys`" +msgstr "" + +#: ../../content/administration/odoo_sh/getting_started/settings.rst:205 +msgid "Self-hosted: append the key to the git userā€™s authorized_keys file in its .ssh directory" +msgstr "" + +#: ../../content/administration/odoo_sh/getting_started/settings.rst:208 +msgid "Storage Size" +msgstr "" + +#: ../../content/administration/odoo_sh/getting_started/settings.rst:210 +msgid "This section shows the storage size used by your project." +msgstr "" + +#: ../../content/administration/odoo_sh/getting_started/settings.rst:215 +msgid "Storage size is computed as follows:" +msgstr "" + +#: ../../content/administration/odoo_sh/getting_started/settings.rst:217 +msgid "the size of the PostgreSQL database" +msgstr "" + +#: ../../content/administration/odoo_sh/getting_started/settings.rst:219 +msgid "the size of the disk files available in your container: database filestore, sessions storage directory..." +msgstr "" + +#: ../../content/administration/odoo_sh/getting_started/settings.rst:222 +msgid "In case you want to analyze disk usage, you can run the tool `ncdu `_ in your Web Shell." +msgstr "" + +#: ../../content/administration/odoo_sh/getting_started/settings.rst:225 +msgid "Should your production database size grow to exceed what's provisioned in your subscription, it will automatically be synchronized with it." +msgstr "" + +#: ../../content/administration/odoo_sh/getting_started/settings.rst:229 +msgid "Database Workers" +msgstr "" + +#: ../../content/administration/odoo_sh/getting_started/settings.rst:231 +msgid "Additional database workers can be configured here. More workers help increase the load your production database is able to handle. If you add more, it will automatically be synchronized with your subscription." +msgstr "" + +#: ../../content/administration/odoo_sh/getting_started/settings.rst:239 +msgid "Adding more workers will not magically solve all performance issues. It only allows the server to handle more connections at the same time. If some operations are unusually slow, it's most likely a problem with the code, if it's not due to your own customizations you can open a ticket `here `_." +msgstr "" + +#: ../../content/administration/odoo_sh/getting_started/settings.rst:245 +msgid "Staging Branches" +msgstr "" + +#: ../../content/administration/odoo_sh/getting_started/settings.rst:247 +msgid "Additional staging branches allow you to develop and test more features at the same time. If you add more, it will automatically be synchronized with your subscription." +msgstr "" + +#: ../../content/administration/odoo_sh/getting_started/settings.rst:254 +msgid "Activation" +msgstr "" + +#: ../../content/administration/odoo_sh/getting_started/settings.rst:256 msgid "Shows the status of the project's activation. You can change the project's activation code if needed." msgstr "" diff --git a/locale/sources/finance.pot b/locale/sources/finance.pot index 5ca1c0ae2..ba34487fc 100644 --- a/locale/sources/finance.pot +++ b/locale/sources/finance.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: Odoo saas-16.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-06-03 06:55+0000\n" +"POT-Creation-Date: 2023-06-20 08:18+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -396,10 +396,12 @@ msgstr "" #: ../../content/applications/finance/accounting/bank/reconciliation_models.rst:69 #: ../../content/applications/finance/accounting/customer_invoices/cash_discounts.rst:23 #: ../../content/applications/finance/accounting/customer_invoices/cash_rounding.rst:14 +#: ../../content/applications/finance/accounting/customer_invoices/customer_addresses.rst:13 #: ../../content/applications/finance/accounting/customer_invoices/electronic_invoicing.rst:61 #: ../../content/applications/finance/accounting/customer_invoices/epc_qr_code.rst:21 #: ../../content/applications/finance/accounting/customer_invoices/payment_terms.rst:46 #: ../../content/applications/finance/accounting/customer_invoices/snailmail.rst:12 +#: ../../content/applications/finance/accounting/customer_invoices/terms_conditions.rst:16 #: ../../content/applications/finance/accounting/get_started/multi_currency.rst:15 #: ../../content/applications/finance/accounting/get_started/vat_units.rst:22 #: ../../content/applications/finance/accounting/payments/batch.rst:11 @@ -417,10 +419,10 @@ msgstr "" #: ../../content/applications/finance/accounting/taxes.rst:53 #: ../../content/applications/finance/accounting/taxes/B2B_B2C.rst:60 #: ../../content/applications/finance/accounting/taxes/cash_basis.rst:14 -#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:30 +#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:17 #: ../../content/applications/finance/accounting/taxes/fiscal_positions.rst:20 #: ../../content/applications/finance/accounting/taxes/retention.rst:23 -#: ../../content/applications/finance/accounting/taxes/vat_validation.rst:13 +#: ../../content/applications/finance/accounting/taxes/vat_verification.rst:13 #: ../../content/applications/finance/accounting/vendor_bills/invoice_digitization.rst:18 #: ../../content/applications/finance/documents.rst:17 #: ../../content/applications/finance/fiscal_localizations.rst:21 @@ -438,14 +440,15 @@ msgstr "" #: ../../content/applications/finance/fiscal_localizations/mexico.rst:78 #: ../../content/applications/finance/fiscal_localizations/peru.rst:25 #: ../../content/applications/finance/fiscal_localizations/united_kingdom.rst:6 -#: ../../content/applications/finance/payment_providers.rst:303 +#: ../../content/applications/finance/payment_providers.rst:302 #: ../../content/applications/finance/payment_providers/adyen.rst:17 #: ../../content/applications/finance/payment_providers/alipay.rst:12 #: ../../content/applications/finance/payment_providers/authorize.rst:9 #: ../../content/applications/finance/payment_providers/demo.rst:9 #: ../../content/applications/finance/payment_providers/mollie.rst:8 -#: ../../content/applications/finance/payment_providers/paypal.rst:122 +#: ../../content/applications/finance/payment_providers/paypal.rst:136 #: ../../content/applications/finance/payment_providers/sips.rst:9 +#: ../../content/applications/finance/payment_providers/wire_transfer.rst:30 msgid "Configuration" msgstr "" @@ -2389,6 +2392,46 @@ msgstr "" msgid "And here is the credit noteā€™s journal entry generated to reverse the original invoice above:" msgstr "" +#: ../../content/applications/finance/accounting/customer_invoices/customer_addresses.rst:3 +msgid "Delivery and invoice addresses" +msgstr "" + +#: ../../content/applications/finance/accounting/customer_invoices/customer_addresses.rst:5 +msgid "Companies often have multiple locations, and it is common that a customer invoice should be sent to one address and the delivery should be sent to another. Odoo's **Customer Addresses** feature is designed to handle this scenario by making it easy to specify which address to use for each case." +msgstr "" + +#: ../../content/applications/finance/accounting/customer_invoices/customer_addresses.rst:10 +msgid ":doc:`overview`" +msgstr "" + +#: ../../content/applications/finance/accounting/customer_invoices/customer_addresses.rst:15 +msgid "To specify a sales order's invoice and delivery addresses, first go to :menuselection:`Accounting --> Configuration --> Settings`. In the :guilabel:`Customer Invoices` section, enable :guilabel:`Customer Addresses` and click :guilabel:`Save`." +msgstr "" + +#: ../../content/applications/finance/accounting/customer_invoices/customer_addresses.rst:19 +msgid "On quotations and sales orders, there are now fields for :guilabel:`Invoice Address` and :guilabel:`Delivery Address`. If the customer has an invoice or delivery address listed on their contact record, the corresponding field will use that address by default, but any contact's address can be used instead." +msgstr "" + +#: ../../content/applications/finance/accounting/customer_invoices/customer_addresses.rst:25 +msgid "Invoice and deliver to different addresses" +msgstr "" + +#: ../../content/applications/finance/accounting/customer_invoices/customer_addresses.rst:27 +msgid "Delivery orders and their delivery slip reports use the address set as the :guilabel:`Delivery Address` on the sales order. By default, invoice reports show both the shipping address and the invoice address to assure the customer that the delivery is going to the correct location." +msgstr "" + +#: ../../content/applications/finance/accounting/customer_invoices/customer_addresses.rst:31 +msgid "Emails also go to different addresses. The quotation and sales order are sent to the main contact's email, as usual, but the invoice is sent to the email of the address set as the :guilabel:`Invoice Address` on the sales order." +msgstr "" + +#: ../../content/applications/finance/accounting/customer_invoices/customer_addresses.rst:36 +msgid "Reports, such as the delivery slip and invoice report, can be :doc:`customized using Studio `." +msgstr "" + +#: ../../content/applications/finance/accounting/customer_invoices/customer_addresses.rst:38 +msgid "If :doc:`Send by Post ` is checked when you click :guilabel:`Send & Print`, the invoice will be mailed to the invoice address." +msgstr "" + #: ../../content/applications/finance/accounting/customer_invoices/deferred_revenues.rst:3 msgid "Deferred revenues" msgstr "" @@ -2905,6 +2948,82 @@ msgstr "" msgid "If you want to issue an invoice without an EPC QR code, remove the IBAN indicated in the :guilabel:`Recipient Bank` field, under the :guilabel:`Other Info` tab of the invoice." msgstr "" +#: ../../content/applications/finance/accounting/customer_invoices/incoterms.rst:3 +msgid "Incoterms" +msgstr "" + +#: ../../content/applications/finance/accounting/customer_invoices/incoterms.rst:5 +msgid ":abbr:`Incoterms (International Commercial Terms)` are standardized trade terms used in international transactions to define the rights and responsibilities of buyers and sellers. They establish the obligations related to the delivery of goods, the transfer of risks, and the distribution of costs between the parties involved. Incoterms specify important details, such as the point at which the risk and costs transfer from the seller to the buyer, the responsibility for transportation, insurance, customs clearance, and other relevant aspects of the transaction." +msgstr "" + +#: ../../content/applications/finance/accounting/customer_invoices/incoterms.rst:13 +msgid "By default, all 11 Incoterms are available in Odoo:" +msgstr "" + +#: ../../content/applications/finance/accounting/customer_invoices/incoterms.rst:15 +msgid "**EXW**: Ex works" +msgstr "" + +#: ../../content/applications/finance/accounting/customer_invoices/incoterms.rst:16 +msgid "**FCA**: Free carrier" +msgstr "" + +#: ../../content/applications/finance/accounting/customer_invoices/incoterms.rst:17 +msgid "**FAS**: Free alongside ship" +msgstr "" + +#: ../../content/applications/finance/accounting/customer_invoices/incoterms.rst:18 +msgid "**FOB**: Free on board" +msgstr "" + +#: ../../content/applications/finance/accounting/customer_invoices/incoterms.rst:19 +msgid "**CFR**: Cost and freight" +msgstr "" + +#: ../../content/applications/finance/accounting/customer_invoices/incoterms.rst:20 +msgid "**CIF**: Cost, insurance and freight" +msgstr "" + +#: ../../content/applications/finance/accounting/customer_invoices/incoterms.rst:21 +msgid "**CPT**: Carriage paid to" +msgstr "" + +#: ../../content/applications/finance/accounting/customer_invoices/incoterms.rst:22 +msgid "**CIP**: Carriage and insurance paid to" +msgstr "" + +#: ../../content/applications/finance/accounting/customer_invoices/incoterms.rst:23 +msgid "**DPU**: Delivered at place unloaded" +msgstr "" + +#: ../../content/applications/finance/accounting/customer_invoices/incoterms.rst:24 +msgid "**DPA**: Delivered at place" +msgstr "" + +#: ../../content/applications/finance/accounting/customer_invoices/incoterms.rst:25 +msgid "**DDP**: Delivered duty paid" +msgstr "" + +#: ../../content/applications/finance/accounting/customer_invoices/incoterms.rst:28 +msgid ":doc:`../reporting/intrastat`" +msgstr "" + +#: ../../content/applications/finance/accounting/customer_invoices/incoterms.rst:33 +msgid "Define an Incoterm" +msgstr "" + +#: ../../content/applications/finance/accounting/customer_invoices/incoterms.rst:35 +msgid "To define an Incoterm manually, create an invoice or bill, click the :guilabel:`Other Info` tab, and select the :guilabel:`Incoterm`." +msgstr "" + +#: ../../content/applications/finance/accounting/customer_invoices/incoterms.rst:41 +msgid "Default Incoterm configuration" +msgstr "" + +#: ../../content/applications/finance/accounting/customer_invoices/incoterms.rst:43 +msgid "You can set a default Incoterm rule to **automatically** populate the Incoterm field on all newly created invoices and bills. Under :menuselection:`Accounting/Invoicing --> Configuration --> Settings`, scroll down to the :guilabel:`Customer Invoices` section, and select an Incoterm in the :guilabel:`Default Incoterm` field." +msgstr "" + #: ../../content/applications/finance/accounting/customer_invoices/overview.rst:3 msgid "Invoicing processes" msgstr "" @@ -3453,6 +3572,46 @@ msgstr "" msgid "Click `here `_ to know about our *Privacy Policy*." msgstr "" +#: ../../content/applications/finance/accounting/customer_invoices/terms_conditions.rst:3 +msgid "Default terms and conditions (T&C)" +msgstr "" + +#: ../../content/applications/finance/accounting/customer_invoices/terms_conditions.rst:5 +msgid "Specifying terms and conditions is essential to establish important contractual points, such as return and refunds, warranty, and after-sale services." +msgstr "" + +#: ../../content/applications/finance/accounting/customer_invoices/terms_conditions.rst:8 +msgid "You can add default terms and conditions at the bottom of all customer invoices, sales orders, and quotations, either as text or a link to a web page." +msgstr "" + +#: ../../content/applications/finance/accounting/customer_invoices/terms_conditions.rst:12 +msgid "`Odoo Tutorial: Terms & Conditions `_" +msgstr "" + +#: ../../content/applications/finance/accounting/customer_invoices/terms_conditions.rst:18 +msgid "Go to :menuselection:`Accounting --> Configuration --> Settings`. Under the :guilabel:`Customer Invoices`, enable :guilabel:`Default Terms & Conditions`. By default, the :guilabel:`Add a Note` option is selected, and the terms and conditions are displayed at the bottom of the document. Enter the terms and conditions in the text box below." +msgstr "" + +#: ../../content/applications/finance/accounting/customer_invoices/terms_conditions.rst:-1 +msgid "Example of terms and conditions as a note" +msgstr "" + +#: ../../content/applications/finance/accounting/customer_invoices/terms_conditions.rst:27 +msgid "You can also add a PDF version of your terms and conditions as an attachment when sending the document via email. Edit the email templates if you want to include them by default." +msgstr "" + +#: ../../content/applications/finance/accounting/customer_invoices/terms_conditions.rst:30 +msgid "Alternatively, to display the terms and conditions on a web page, select the :guilabel:`Add a link to a Web Page` option and click :guilabel:`Save`. Click :guilabel:`Update Terms`, edit the content, and click :guilabel:`Save`. The link to that page is then added as a note in your document." +msgstr "" + +#: ../../content/applications/finance/accounting/customer_invoices/terms_conditions.rst:35 +msgid "You can edit the layout and content of the page using the :doc:`Website ` app. If the Website app is activated, the :guilabel:`Edit in Website Builder` option then replaces :guilabel:`Update Terms`." +msgstr "" + +#: ../../content/applications/finance/accounting/customer_invoices/terms_conditions.rst:-1 +msgid "Example of terms and conditions as a web page" +msgstr "" + #: ../../content/applications/finance/accounting/get_started.rst:5 msgid "Get started" msgstr "" @@ -4366,6 +4525,7 @@ msgstr "" #: ../../content/applications/finance/accounting/get_started/chart_of_accounts.rst:189 #: ../../content/applications/finance/accounting/reporting/tax_returns.rst:123 +#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:38 msgid ":doc:`../../fiscal_localizations`" msgstr "" @@ -5409,7 +5569,7 @@ msgid "Follow-up on invoices" msgstr "" #: ../../content/applications/finance/accounting/payments/follow_up.rst:5 -msgid "A follow-up message can be sent to customers when a payment is overdue. Odoo helps you identify late payments and allows you to schedule and send the appropriate reminders, using **follow-up actions** that trigger automatically one or more actions according to the number of overdue days. You can send your follow-ups via different means such as email, post, or SMS." +msgid "A follow-up message can be sent to customers when a payment is overdue. Odoo helps you identify late payments and allows you to schedule and send the appropriate reminders using **follow-up actions** that automatically trigger 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/payments/follow_up.rst:11 @@ -5417,74 +5577,94 @@ msgid "`Odoo Tutorials: Payment Follow-up 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/payments/follow_up.rst:20 -msgid "Send an email;" +msgid "To configure a :guilabel:`Follow-Up Action`, go to :menuselection:`Accounting --> Configuration --> Follow-up Levels`, and select or create (a) new follow-up level(s). Several follow-up actions are available by default under the :guilabel:`Notification` tab, and the **name** as well as the **number of days** can be changed. The follow-up :guilabel:`Actions` available are:" msgstr "" #: ../../content/applications/finance/accounting/payments/follow_up.rst:21 -msgid ":ref:`Send an SMS message `;" +msgid ":guilabel:`Send Email`;" msgstr "" #: ../../content/applications/finance/accounting/payments/follow_up.rst:22 -msgid "Print a letter;" +msgid ":ref:`Send a Letter `;" msgstr "" #: ../../content/applications/finance/accounting/payments/follow_up.rst:23 -msgid ":ref:`Send a letter `;" +msgid ":ref:`Send an SMS message `." msgstr "" -#: ../../content/applications/finance/accounting/payments/follow_up.rst:24 -msgid "Manual action (creates a task)." +#: ../../content/applications/finance/accounting/payments/follow_up.rst:25 +msgid "You can use a pre-filled template for your messages by selecting a :guilabel:`Content Template`. To change the template used, hover over the field and click the :guilabel:`-->`. If enabled, SMS messages have a specific :guilabel:`Sms Template` field." msgstr "" -#: ../../content/applications/finance/accounting/payments/follow_up.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/payments/follow_up.rst:30 -msgid "To send a reminder before the actual due date is reached, set a negative number of due days." +#: ../../content/applications/finance/accounting/payments/follow_up.rst:29 +msgid "It is possible to automatically send a reminder by enabling the :guilabel:`Automatic` option, and attaching the *open* invoice(s) by enabling :guilabel:`Attach Invoices`, within a specific follow-up action." msgstr "" #: ../../content/applications/finance/accounting/payments/follow_up.rst:33 -msgid "Follow-up reports" +msgid "By clicking on the :guilabel:`Activity` tab, scheduling activities (tasks) is possible. That way, an activity is automatically scheduled when the follow-up is triggered. To do so, enable :guilabel:`Schedule Activity`, and select a :guilabel:`Responsible` person for the task. Choose an :guilabel:`Activity Type`, and enter a :guilabel:`Summary` on how to handle the activity, if desired." msgstr "" -#: ../../content/applications/finance/accounting/payments/follow_up.rst:35 -msgid "The overdue invoices you need to follow up on are available in :menuselection:`Accounting --> Customers --> Follow-up Reports`. From there, you can identify all the customers that have late unpaid invoices." -msgstr "" - -#: ../../content/applications/finance/accounting/payments/follow_up.rst:39 -msgid "When you open a customer, you see all their unpaid invoices (overdue or not). The due dates of the late invoices appear in red. Select the invoices that are not late yet in the :guilabel:`Excluded` column to exclude them from the reminder you send." +#: ../../content/applications/finance/accounting/payments/follow_up.rst:40 +msgid "Set a negative number of days to send a reminder before the actual due date." msgstr "" #: ../../content/applications/finance/accounting/payments/follow_up.rst:43 -msgid "It is up to you to decide how to remind your customer. You can select :guilabel:`Print Letter`, :guilabel:`Send By Email`, :guilabel:`Send By Post`, :guilabel:`Send By SMS`. Then, click on :guilabel:`Done` to view the next follow-up that needs your attention." +msgid "Follow-up reports" msgstr "" -#: ../../content/applications/finance/accounting/payments/follow_up.rst:48 -msgid "The contact information available on the invoice or on the contact form is used to send the reminder." +#: ../../content/applications/finance/accounting/payments/follow_up.rst:45 +msgid "Overdue invoices you need to follow up on are available in :menuselection:`Accounting --> Customers --> Follow-up Reports`. By default, Odoo filters by :guilabel:`Overdue Invoices`, but you can also filter by :guilabel:`In need of action` in the :guilabel:`Filters` menu." msgstr "" -#: ../../content/applications/finance/accounting/payments/follow_up.rst:50 -msgid "When the reminder is sent, it is documented in the chatter of the invoice." +#: ../../content/applications/finance/accounting/payments/follow_up.rst:49 +msgid "When selecting an invoice, you can see all of the customer's unpaid invoices (overdue or not), with the due dates of late invoices appearing in red. You can exclude invoices from a reminder by clicking :guilabel:`Exclude from Follow-ups`. You can set either :guilabel:`Automatic` or :guilabel:`Manual` reminders as well as a :guilabel:`Responsible` person for that customer." msgstr "" -#: ../../content/applications/finance/accounting/payments/follow_up.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." +#: ../../content/applications/finance/accounting/payments/follow_up.rst:54 +msgid "To send reminders, click on :guilabel:`Follow up`, and select the action(s) you want to perform from:" msgstr "" -#: ../../content/applications/finance/accounting/payments/follow_up.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." +#: ../../content/applications/finance/accounting/payments/follow_up.rst:57 +msgid ":guilabel:`Print`;" +msgstr "" + +#: ../../content/applications/finance/accounting/payments/follow_up.rst:58 +msgid ":guilabel:`Email`;" +msgstr "" + +#: ../../content/applications/finance/accounting/payments/follow_up.rst:59 +msgid ":guilabel:`Sms`;" msgstr "" #: ../../content/applications/finance/accounting/payments/follow_up.rst:60 -msgid "Debtor's trust level" +msgid ":guilabel:`By post`." msgstr "" #: ../../content/applications/finance/accounting/payments/follow_up.rst:62 +msgid "You can :guilabel:`Attach Invoices` and change the content templates from this view. When done, click :guilabel:`Send` or :guilabel:`Send & Print`." +msgstr "" + +#: ../../content/applications/finance/accounting/payments/follow_up.rst:66 +msgid "The contact information on the invoice or the contact form is used to send the reminder." +msgstr "" + +#: ../../content/applications/finance/accounting/payments/follow_up.rst:67 +msgid "When the reminder is sent, it is documented in the chatter of the invoice." +msgstr "" + +#: ../../content/applications/finance/accounting/payments/follow_up.rst:68 +msgid "If it is not the right time for a reminder, you can specify the :guilabel:`Next Reminder` date. You will get the next report according to the next reminder date set." +msgstr "" + +#: ../../content/applications/finance/accounting/payments/follow_up.rst:72 +msgid "Reconcile all bank statements right before launching the follow-up process to avoid sending a reminder to a customer that has already paid." +msgstr "" + +#: ../../content/applications/finance/accounting/payments/follow_up.rst:76 +msgid "Debtor's trust level" +msgstr "" + +#: ../../content/applications/finance/accounting/payments/follow_up.rst:78 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 "" @@ -5492,23 +5672,23 @@ msgstr "" msgid "Set debtor's trust level" msgstr "" -#: ../../content/applications/finance/accounting/payments/follow_up.rst:70 +#: ../../content/applications/finance/accounting/payments/follow_up.rst:86 msgid "Send reminders in batches" msgstr "" -#: ../../content/applications/finance/accounting/payments/follow_up.rst:72 +#: ../../content/applications/finance/accounting/payments/follow_up.rst:88 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/payments/follow_up.rst:77 +#: ../../content/applications/finance/accounting/payments/follow_up.rst:93 msgid ":doc:`../../../general/in_app_purchase`" msgstr "" -#: ../../content/applications/finance/accounting/payments/follow_up.rst:78 +#: ../../content/applications/finance/accounting/payments/follow_up.rst:94 msgid ":doc:`../../../marketing/sms_marketing/pricing/pricing_and_faq`" msgstr "" -#: ../../content/applications/finance/accounting/payments/follow_up.rst:79 +#: ../../content/applications/finance/accounting/payments/follow_up.rst:95 msgid ":doc:`../customer_invoices/snailmail`" msgstr "" @@ -7055,35 +7235,23 @@ msgstr "" msgid "Enable the Intrastat report by going to :menuselection:`Accounting --> Configuration --> Settings`. Under the :guilabel:`Customer Invoices` section, tick :guilabel:`Intrastat` and then :guilabel:`Save`." msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:33 -msgid "If your Odoo database was created before **January 13, 2022**, first :ref:`upgrade ` the `account_intrastat` module to add the new transaction codes and :ref:`install ` the `account_intrastat_expiry` module to archive the old codes." -msgstr "" - -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:40 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:35 msgid "Default transaction codes: invoice and refund" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:42 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:37 msgid "You can set a default :ref:`transaction code ` for all newly created invoice and refund transactions. Under :menuselection:`Accounting --> Configuration --> Settings`, select a :guilabel:`Default invoice transaction code` and/or a :guilabel:`Default refund transaction code` and then :guilabel:`Save`. The code will be set automatically on all respective invoice lines." msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:50 -msgid "Default Incoterm rule" -msgstr "" - -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:52 -msgid "You can set a default :ref:`Incoterm rule ` to automatically populate the Incoterm field on all newly created invoices and bills. Under :menuselection:`Accounting --> Configuration --> Settings`, select the company's :guilabel:`Default Incoterm` and then :guilabel:`Save`." -msgstr "" - -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:60 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:45 msgid "Region code" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:62 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:47 msgid "The region code is **only used by Belgian companies**. Under :menuselection:`Accounting --> Configuration --> Settings`, select the :guilabel:`Company Intrastat Region` where the company is located and then :guilabel:`Save`." msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:67 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:52 msgid "If your warehouses are located in more than one region, you can define the region code at the level of each warehouse instead. To do so, go to :menuselection:`Inventory --> Configuration --> Warehouses`, select a warehouse, set its :guilabel:`Intrastat region`, and then :guilabel:`Save`." msgstr "" @@ -7091,67 +7259,67 @@ msgstr "" msgid "Adding the Intrastat region to a warehouse" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:78 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:63 msgid "Product configuration" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:80 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:65 msgid "All products must be properly configured to be included in the Intrastat report." msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:85 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:70 msgid "Commodity code" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:87 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:72 msgid "Commodity codes are internationally recognized reference numbers used to classify goods depending on their **nature**. Intrastat uses the `Combined Nomenclature `_." msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:90 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:75 msgid "To add a commodity code, go to :menuselection:`Accounting --> Customers --> Products` and select a product. Under the :guilabel:`Accounting` tab, set the product's :guilabel:`Commodity Code`." msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:94 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:79 msgid "`National Bank of Belgium - Intrastat commodity codes `_" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:100 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:85 msgid "Quantity: weight and supplementary unit" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:102 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:87 msgid "Depending on the nature of the goods, it is necessary to specify either the product's weight in kilos (without packaging) or the product's supplementary unit, such as square meter (`m2`), number of items (`p/st`), liter (`l`), or gram (`g`)." msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:106 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:91 msgid "To add a product's weight or supplementary unit, go to :menuselection:`Accounting --> Customers --> Products` and select a product. Under the :guilabel:`Accounting` tab, depending on the commodity code set, either fill in the product :guilabel:`Weight` or its :guilabel:`Supplementary Units`." msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:113 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:98 msgid "Country of origin" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:115 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:100 msgid "To add the product's country of origin, go to :menuselection:`Accounting --> Customers --> Products` and select a product. Under the :guilabel:`Accounting` tab, set the :guilabel:`Country of Origin`." msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:121 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:106 msgid "Invoices and bills configuration" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:123 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:108 msgid "Once products are properly configured, several settings must be configured on the invoices and bills you create." msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:129 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:114 msgid "Transaction code" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:131 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:116 msgid "Transaction codes are used to identify a transaction's nature. :ref:`Default transaction codes ` can be set for invoice and refund transactions." msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:134 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:119 msgid "To set a transaction code on an invoice line, create an invoice or a bill, click the columns selection button, tick :guilabel:`Intrastat`, and use the newly-added :guilabel:`Intrastat` column to select a transaction code." msgstr "" @@ -7159,131 +7327,115 @@ msgstr "" msgid "Adding the Intrastat column to an invoice or bill" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:143 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:128 msgid "`National Bank of Belgium - Intrastat: Nature of transactions from January 2022 `_" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:149 -msgid "Incoterm rule" -msgstr "" - -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:151 -msgid "Incoterms are 11 internationally recognized rules defining the responsibilities of sellers and buyers, specifying who is responsible for paying and managing the shipment, insurance, documentation, customs clearance, and other logistical activities. A :ref:`default Incoterm ` can be set for all invoices and bills." -msgstr "" - -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:156 -msgid "To set the Incoterm manually, create an invoice or a bill, click the :guilabel:`Other Info` tab, and select the :guilabel:`Incoterm`." -msgstr "" - -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:160 -msgid "`Wikipedia: Incoterms `_" -msgstr "" - -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:165 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:134 msgid "Partner country" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:167 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:136 msgid "The partner country represents the vendor's country for bills and the customer's country for invoices. It is automatically filled in using the country set in the contact's :guilabel:`Country` field." msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:171 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:140 msgid "To edit the partner country manually, create an invoice or a bill, click the :guilabel:`Other Info` tab, and select the :guilabel:`Intrastat Country`." msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:177 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:146 msgid "Transport code" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:179 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:148 msgid "The transport code identifies the presumed **mode of transport** used to send the goods (arrival or dispatch)." msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:182 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:151 msgid "To add the transport code, create an invoice or a bill, go to the :guilabel:`Other info` tab, and select the :guilabel:`Intrastat Transport Mode`." msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:188 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:157 msgid "Value of the goods" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:190 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:159 msgid "The value of a good is the untaxed :guilabel:`Subtotal` (:guilabel:`Price` multiplied by :guilabel:`Quantity`) of an invoice line." msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:196 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:165 msgid "Partner configuration" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:198 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:167 msgid "Two fields from the partner's contact form are used with Intrastat: :guilabel:`VAT` and :guilabel:`Country`. The country can be :ref:`manually set ` on the invoice or bill." msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:203 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:172 msgid "Generate the Intrastat report" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:205 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:174 msgid "Generate the report by going to :menuselection:`Accounting --> Reporting --> Audit Reports: Intrastat Report`. It is automatically computed based on the :ref:`default configuration ` and the information found on the :ref:`products `, :ref:`invoices and bills `, and :ref:`partners `." msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:211 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:180 msgid "Export the report as a PDF, XLSX, or XML file to post it to your legal administration." msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:213 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:182 msgid "Each report line refers to a single invoice line and contains the following information:" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:215 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:184 msgid "Invoice or bill reference number;" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:216 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:185 msgid "System, which is a code automatically generated depending on whether the document is an invoice (dispatch) or a bill (arrival);" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:218 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:187 msgid ":ref:`Country `, which is the vendor's country for arrivals and the customer's country for dispatches;" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:220 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:189 msgid ":ref:`Transaction Code `;" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:221 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:190 msgid "(If your company is located in Belgium) :ref:`Region Code `;" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:222 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:191 msgid ":ref:`Commodity Code `;" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:223 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:192 msgid ":ref:`Origin Country `;" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:224 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:193 msgid ":ref:`Partner VAT `;" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:225 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:194 msgid ":ref:`Transport Code `;" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:226 -msgid ":ref:`Incoterm Code `;" +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:195 +msgid ":doc:`Incoterm Code <../customer_invoices/incoterms>`;" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:227 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:196 msgid ":ref:`Weight `;" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:228 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:197 msgid ":ref:`Supplementary Units `; and" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:229 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:198 msgid ":ref:`Value `, which is always expressed in euros even if the original invoice or bill used another currency." msgstr "" @@ -7520,7 +7672,7 @@ msgid "If you forgot to lock your tax date before clicking on :guilabel:`Closing msgstr "" #: ../../content/applications/finance/accounting/reporting/tax_returns.rst:121 -#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:69 +#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:37 #: ../../content/applications/finance/accounting/taxes/fiscal_positions.rst:114 #: ../../content/applications/finance/accounting/taxes/retention.rst:70 msgid ":doc:`../taxes`" @@ -8319,7 +8471,7 @@ msgid "Use the :guilabel:`Avalara Code` field that's available on customers, quo msgstr "" #: ../../content/applications/finance/accounting/taxes/avatax.rst:74 -#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:68 +#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:39 #: ../../content/applications/finance/accounting/taxes/taxcloud.rst:151 msgid ":doc:`fiscal_positions`" msgstr "" @@ -8450,63 +8602,56 @@ msgid "EU intra-community distance selling" msgstr "" #: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:5 -msgid "**Distance sales within the European Union** include cross-border sales of goods and services to a private consumer (B2C) in another EU Member State when the seller doesn't meet face-to-face with the customer. Organizations must ensure that the VAT on distance sales is paid to the Member State in which the goods or services are delivered." +msgid "EU intra-community distance selling involves the cross-border trade of goods and services from vendors registered for VAT purposes to individuals (B2C) located in a European Union member state. The transaction is conducted remotely, typically through online platforms, mail orders, telephone, or other means of communication." msgstr "" -#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:11 -msgid "This remains true even if your organization is located outside of the European Union." +#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:10 +msgid "EU intra-community distance selling is subject to specific VAT rules and regulations. The vendor must charge VAT per the VAT rate applicable in the buyer's country." msgstr "" -#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:13 -msgid "While this regulation mainly applies to :doc:`eCommerce <../../../websites/ecommerce>` sales to private EU consumers, it is also valid for mail order sales and telesales." -msgstr "" - -#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:16 -msgid "The Union **One-Stop Shop (OSS)** is an online portal where businesses can register for the OSS and declare their intra-community distance sales. Each EU member state integrates an online OSS portal." +#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:14 +msgid "This remains applicable even if the vendor is located outside of the European Union." msgstr "" #: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:19 -msgid "The **EU intra-community Distance Selling** feature helps your organization comply with this regulation by creating and configuring new :doc:`fiscal positions ` and :doc:`taxes <../taxes>` based on your company's country." -msgstr "" - -#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:24 -msgid "`European Commission: OSS | Taxation and Customs Union `_" -msgstr "" - -#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:32 -msgid "Go to :menuselection:`Accounting/Invoicing --> Settings --> Taxes`, then enable **EU intra-community Distance Selling** (or **EU Digital Goods VAT** if you created your database before July 1, 2021), and *Save*." +msgid "The **EU Intra-community Distance Selling** feature helps you comply with this regulation by creating and configuring new **fiscal positions** and **taxes** based on your company's country. To enable it, go to :menuselection:`Accounting --> Configuration --> Settings --> Taxes`, tick :guilabel:`EU Intra-community Distance Selling`, and :guilabel:`Save`." msgstr "" #: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:-1 msgid "EU intra-community Distance Selling feature in Odoo Accounting settings" msgstr "" -#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:41 -msgid "Please :ref:`upgrade the module ` `l10n_eu_service` if you already installed it before **July 1, 2021**, or if you activated the feature **EU Digital Goods VAT** in the Accounting settings. Then, make sure to :ref:`refresh the tax mapping `." +#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:28 +msgid "Whenever you add or modify taxes, you can automatically update your fiscal positions. To do so, go to :menuselection:`Accounting/Invoicing --> Settings --> Taxes --> EU Intra-community Distance Selling` and click on the :guilabel:`Refresh tax mapping`." msgstr "" -#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:49 -msgid "Fiscal Positions and Taxes" -msgstr "" - -#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:51 -msgid "Once enabled, the feature automatically creates all the necessary taxes and fiscal positions needed for each EU member state, based on your company's country." -msgstr "" - -#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:54 +#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:33 msgid "We highly recommend checking that the proposed mapping is suitable for the products and services you sell before using it." msgstr "" -#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:60 -msgid "Refresh tax mapping" +#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:42 +msgid "One-Stop Shop (OSS)" msgstr "" -#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:62 -msgid "Whenever you add or modify taxes, you can update automatically your fiscal positions." +#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:44 +msgid "The :abbr:`OSS (One-Stop Shop)` system introduced by the European Union simplifies VAT collection for **cross-border** sales of goods and services. It primarily applies to business-to-consumer **(B2C)** cases. With the OSS, businesses can register for VAT in their home country and use a single online portal to handle VAT obligations for their sales within the EU. There are **two primary schemes**: the **Union OSS** scheme for cross-border services and the **Import OSS** scheme for goods valued at or below ā‚¬150." msgstr "" -#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:64 -msgid "To do so, go to :menuselection:`Accounting/Invoicing --> Settings --> Taxes --> EU intra-community Distance Selling` and click on the *Refresh tax mapping* button." +#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:52 +#: ../../content/applications/finance/fiscal_localizations/argentina.rst:679 +msgid "Reports" +msgstr "" + +#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:54 +msgid "To generate **OSS sales** or **OSS imports** reports and submit them onto the OSS portal, go to :menuselection:`Accounting --> Reporting --> Tax Report`, click :guilabel:`Report: Generic Tax report`, and select either :guilabel:`OSS Sales` or :guilabel:`OSS Imports`. Once selected, click on :guilabel:`PDF`, :guilabel:`XLSX`, or :guilabel:`XML` in the top-left corner. This generates the currently-opened report in the selected format. Once generated, log into the platform of your competent federal authority to submit it onto the OSS portal." +msgstr "" + +#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:-1 +msgid "OSS reports view" +msgstr "" + +#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:65 +msgid "`European Commission: OSS | Taxation and Customs Union `_" msgstr "" #: ../../content/applications/finance/accounting/taxes/fiscal_positions.rst:3 @@ -8849,51 +8994,51 @@ msgstr "" msgid "Another unexpected behavior is possible. For example, you sell a product for which you have a promotion program that provides a 50% discount. If the product's tax rate is 7%, the tax rate computed from the TaxCloud integration displays 3.5%. This happens because the discount is included in the price sent to TaxCloud. However, in Odoo, the discount is on another line entirely. Still, the tax computation is correct. Indeed, a 3.5% tax on the full price is the equivalent of a 7% tax on half the price, but this might be unexpected from a user point of view." msgstr "" -#: ../../content/applications/finance/accounting/taxes/vat_validation.rst:3 -msgid "VIES VAT numbers validation" +#: ../../content/applications/finance/accounting/taxes/vat_verification.rst:3 +msgid "VAT numbers verification (VIES)" msgstr "" -#: ../../content/applications/finance/accounting/taxes/vat_validation.rst:5 +#: ../../content/applications/finance/accounting/taxes/vat_verification.rst:5 msgid "**VAT Information Exchange System** - abbreviated **VIES** - is a tool provided by the European Commission that allows you to check the validity of VAT numbers of companies registered in the European Union." msgstr "" -#: ../../content/applications/finance/accounting/taxes/vat_validation.rst:9 +#: ../../content/applications/finance/accounting/taxes/vat_verification.rst:9 msgid "Odoo provides a feature to **Verify VAT Numbers** when you save a contact. This helps you make sure that your contacts provided you with a valid VAT number without leaving Odoo interface." msgstr "" -#: ../../content/applications/finance/accounting/taxes/vat_validation.rst:15 +#: ../../content/applications/finance/accounting/taxes/vat_verification.rst:15 msgid "To enable this feature, go to :menuselection:`Accounting --> Configuration --> Settings --> Taxes`, enable the **Verify VAT Numbers** feature, and click on *Save*." msgstr "" -#: ../../content/applications/finance/accounting/taxes/vat_validation.rst:-1 +#: ../../content/applications/finance/accounting/taxes/vat_verification.rst:-1 msgid "Enable \"Verify VAT Numbers\" in Odoo Accounting" msgstr "" -#: ../../content/applications/finance/accounting/taxes/vat_validation.rst:23 +#: ../../content/applications/finance/accounting/taxes/vat_verification.rst:23 msgid "VAT Number validation" msgstr "" -#: ../../content/applications/finance/accounting/taxes/vat_validation.rst:25 +#: ../../content/applications/finance/accounting/taxes/vat_verification.rst:25 msgid "Whenever you create or modify a contact, make sure to fill out the **Country** and **VAT** fields." msgstr "" -#: ../../content/applications/finance/accounting/taxes/vat_validation.rst:-1 +#: ../../content/applications/finance/accounting/taxes/vat_verification.rst:-1 msgid "Fill out the contact form with the country and VAT number before clicking on *Save*" msgstr "" -#: ../../content/applications/finance/accounting/taxes/vat_validation.rst:31 +#: ../../content/applications/finance/accounting/taxes/vat_verification.rst:31 msgid "When you click on *Save*, Odoo runs a VIES VAT number check, and displays an error message if the VAT number is invalid." msgstr "" -#: ../../content/applications/finance/accounting/taxes/vat_validation.rst:-1 +#: ../../content/applications/finance/accounting/taxes/vat_verification.rst:-1 msgid "Odoo displays an error message instead of saving when the VAT number is invalid" msgstr "" -#: ../../content/applications/finance/accounting/taxes/vat_validation.rst:39 +#: ../../content/applications/finance/accounting/taxes/vat_verification.rst:39 msgid "This tool checks the VAT number's validity but does not check the other fields' validity." msgstr "" -#: ../../content/applications/finance/accounting/taxes/vat_validation.rst:43 +#: ../../content/applications/finance/accounting/taxes/vat_verification.rst:43 msgid "`European Commission: VIES search engine `__" msgstr "" @@ -8916,7 +9061,6 @@ msgid "Bill creation" msgstr "" #: ../../content/applications/finance/accounting/vendor_bills.rst:19 -#: ../../content/applications/finance/expenses.rst:58 msgid "Manually" msgstr "" @@ -9862,246 +10006,563 @@ msgid "Expenses" msgstr "" #: ../../content/applications/finance/expenses.rst:7 -msgid "**Odoo Expenses** streamlines the management of expenses. Employees can submit their expenses; managers can approve them; accountants can record them and process the payments." +msgid "Odoo **Expenses** streamlines the management of expenses. After an employee submits their expenses in Odoo, the expenses are reviewed by management and accounting teams. Once approved, payments can then be processed and disbursed back to the employee for reimbursement(s)." msgstr "" -#: ../../content/applications/finance/expenses.rst:11 +#: ../../content/applications/finance/expenses.rst:12 msgid "`Odoo Expenses: product page `_" msgstr "" -#: ../../content/applications/finance/expenses.rst:14 -msgid "How to set expense types" +#: ../../content/applications/finance/expenses.rst:15 +msgid "Set expense types" msgstr "" -#: ../../content/applications/finance/expenses.rst:16 -msgid "The first step to track expenses is to configure the expense types (managed as products in Odoo) that your company allows, from the *Configuration* menu. When a specific expense is reimbursed at a fixed price, set a cost on the product. Otherwise keep the cost at 0.0 and employees will report the real cost per expense." +#: ../../content/applications/finance/expenses.rst:17 +msgid "The first step to track expenses is to configure the different *expense types* for the company (managed as *products* in Odoo). Each \"product\" can be as specific or generalized as needed. Go to :menuselection:`Expenses app --> Configuration --> Expense Products` to view the current expensable products in a default kanban view." msgstr "" -#: ../../content/applications/finance/expenses.rst:24 -msgid "Here are some examples:" +#: ../../content/applications/finance/expenses.rst:-1 +msgid "Set expense costs on products." msgstr "" #: ../../content/applications/finance/expenses.rst:26 -msgid "Restaurant:" -msgstr "" - -#: ../../content/applications/finance/expenses.rst:28 -#: ../../content/applications/finance/expenses.rst:34 -msgid "Cost: 0.00 (the cost of the ticket will be recorded on every expense)" -msgstr "" - -#: ../../content/applications/finance/expenses.rst:29 -msgid "Travel with Personal Car:" -msgstr "" - -#: ../../content/applications/finance/expenses.rst:31 -msgid "Cost: 0.30 (the price per mile reimbursed by the company is fixed)" +msgid "To create a new expense product, click :guilabel:`Create`. A product form will appear. Only two fields are required, the :guilabel:`Product Name` and the :guilabel:`Unit of Measure`. Enter the :guilabel:`Product Name` in the field, and select the :guilabel:`Unit of Measure` from the drop-down menu (most products will be set to :guilabel:`Units`)." msgstr "" #: ../../content/applications/finance/expenses.rst:32 -msgid "Hotel:" +msgid "The *Sales* app is where specification on the units of measure are created and edited (e.g. units, miles, nights, etc.). Go to :menuselection:`Sales app --> Configuration --> Settings` and ensure `Units of Measure` is checked off in the `Product Catalog` section. Click on the :guilabel:`Units of Measure` internal link to view, create, and edit the units of measure. Refer to :doc:`this document ` to learn more about units of measure and how to configure them." msgstr "" -#: ../../content/applications/finance/expenses.rst:36 -msgid "Others:" +#: ../../content/applications/finance/expenses.rst:43 +msgid "The :guilabel:`Cost` field on the product form is populated with a value of `0.00` by default. When a specific expense should always be reimbursed for a particular price, enter that amount in the :guilabel:`Cost` field. Otherwise, leave the :guilabel:`Cost` set to `0.00`, and employees will report the actual cost when submitting an expense report." msgstr "" -#: ../../content/applications/finance/expenses.rst:38 -msgid "Cost: 0.0" +#: ../../content/applications/finance/expenses.rst:49 +msgid "Here are some examples for when to set a specific :guilabel:`Cost` on a product vs. leaving the :guilabel:`Cost` at `0.00`:" msgstr "" -#: ../../content/applications/finance/expenses.rst:40 -msgid "Don't forget to set an expense tax on each expense type (and an account if you use Odoo Accounting). It's usually a good practice to use a tax that is configured with :ref:`Tax Included in Price `. That way, employees report expenses with prices including taxes, which is usually the expected behaviour." -msgstr "" - -#: ../../content/applications/finance/expenses.rst:48 -msgid "The *Sales* app allows you to specify units of measure for your expense types (units, miles, nights, etc.). Go to :menuselection:`Sales --> Configuration --> Settings` and check *Some products may be sold/purchased in different units of measure (advanced)*." +#: ../../content/applications/finance/expenses.rst:52 +msgid "**Meals**: Set the :guilabel:`Cost` to `0.00`. When an employee logs an expense for a meal, they enter the actual amount of the bill and will be reimbursed for that amount. An expense for a meal costing $95.23 would equal a reimbursement for $95.23." msgstr "" #: ../../content/applications/finance/expenses.rst:55 -msgid "How to record expenses" +msgid "**Mileage**: Set the :guilabel:`Cost` to `0.30`. When an employee logs an expense for \"mileage\", they enter the number of miles driven, and are reimbursed 0.30 per mile they entered. An expense for 100 miles would equal a reimbursement for $30.00." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:58 +msgid "**Monthly Parking**: Set the :guilabel:`Cost` to `75.00`. When an employee logs an expense for \"monthly parking\", the reimbursement would be for $75.00." msgstr "" #: ../../content/applications/finance/expenses.rst:60 -msgid "As an employee (Employee in user access rights), you can record expenses from :menuselection:`My Expenses --> Expenses to Submit`." +msgid "**Expenses**: Set the :guilabel:`Cost` to `0.00`. When an employee logs an expense that is not a meal, mileage, or monthly parking, they use the generic :guilabel:`Expenses` product. An expense for a laptop costing $350.00 would be logged as an :guilabel:`Expenses` product, and the reimbursement would be for $350.00." msgstr "" -#: ../../content/applications/finance/expenses.rst:66 -msgid "Select the related product and enter either the total amount you paid (with Quantity = 1) or the unit price if Quantity is countable (e.g. number of hotel nights)." +#: ../../content/applications/finance/expenses.rst:65 +msgid "Select an :guilabel:`Expense Account` if using the Odoo *Accounting* app. It is recommended to check with the accounting department to determine the correct account to reference in this field as it will affect reports." msgstr "" #: ../../content/applications/finance/expenses.rst:69 -msgid "Enter the expense date." +msgid "Set a tax on each product in the :guilabel:`Vendor Taxes` and :guilabel:`Customer Taxes` fields if applicable. It is considered good practice to use a tax that is configured with :ref:`Tax Included in Price `. Taxes will be automatically configured if this is set." msgstr "" -#: ../../content/applications/finance/expenses.rst:70 -msgid "Choose if you paid the bill on your own (and expect to be reimbursed) or if the company paid directly (e.g. if you used a company's credit card)." +#: ../../content/applications/finance/expenses.rst:76 +msgid "Record expenses" msgstr "" -#: ../../content/applications/finance/expenses.rst:72 -msgid "Set the bill reference, add some notes if requested and attach a photo/scan of the receipt from the discussion thread. That will help the manager and the accountant validate it." +#: ../../content/applications/finance/expenses.rst:79 +msgid "Manually create a new expense" msgstr "" -#: ../../content/applications/finance/expenses.rst:80 -msgid "In one click from emails" -msgstr "" - -#: ../../content/applications/finance/expenses.rst:82 -msgid "Let your employees record their expenses from a simple email. Make a snapshot of the receipt and send it by email, or simply forward a bill!" +#: ../../content/applications/finance/expenses.rst:81 +msgid "To record a new expense, begin in the main :menuselection:`Expenses` app dashboard, which presents the default :guilabel:`My Expenses to Report` view. This view can also be accessed from :menuselection:`Expenses app --> My Expenses --> My Expenses to Report`." msgstr "" #: ../../content/applications/finance/expenses.rst:85 -msgid "The only thing to do is setting up an email alias in :menuselection:`Expenses --> Configuration --> Settings` (e.g. *expenses* @mycompany.odoo.com). For security purposes, only authenticated employee emails (cfr. *Work Email* in employee detail form) are accepted." +msgid "First, click :guilabel:`Create`, and then fill out the various fields on the form." msgstr "" -#: ../../content/applications/finance/expenses.rst:91 -msgid "The expense product is set automatically if the mail subject contains the product's internal reference in first position. Type the expense amount in the mail subject to set it on the expense too (e.g. Ref001 Food 100ā‚¬)." +#: ../../content/applications/finance/expenses.rst:87 +msgid ":guilabel:`Description`: Enter a short description for the expense in the :guilabel:`Description` field. This should be short and informative, such as `lunch with client` or `hotel for conference`." msgstr "" -#: ../../content/applications/finance/expenses.rst:96 -msgid "How to submit expenses to managers" +#: ../../content/applications/finance/expenses.rst:90 +msgid ":guilabel:`Product`: Select the product from the drop-down menu that most closely corresponds to the expense. For example, an airplane ticket would be appropriate for an expense :guilabel:`Product` named :guilabel:`Air Travel`." msgstr "" -#: ../../content/applications/finance/expenses.rst:98 -msgid "When you are ready to submit your expenses to your manager (e.g. at the end of a business trip, or once a month), go to the menu :menuselection:`My Expenses --> Expenses to Submit`. Select all expenses from the list view and click on :menuselection:`Action --> Submit to Manager`. Save the newly created expense report (i.e. set of expenses), and wait for your manager to approve it." +#: ../../content/applications/finance/expenses.rst:93 +msgid ":guilabel:`Unit Price`: Enter the total amount paid for the expense in one of two ways:" msgstr "" -#: ../../content/applications/finance/expenses.rst:108 -msgid "You can also submit expenses one by one from the *Submit to Manager* button on the form view of an expense." +#: ../../content/applications/finance/expenses.rst:95 +msgid "If the expense is for one single item/expense, enter the cost in the :guilabel:`Unit Price` field, and leave the :guilabel:`Quantity` `1.00`." msgstr "" -#: ../../content/applications/finance/expenses.rst:111 -msgid "All your submitted expense reports can be found in :menuselection:`Expenses --> My Expenses --> Expense Reports`." +#: ../../content/applications/finance/expenses.rst:97 +msgid "If the expense is for multiples of the same item/expense, enter the price *per unit* in the :guilabel:`Unit Price` field, and enter the *quantity of units* in the :guilabel:`Quantity` field." msgstr "" -#: ../../content/applications/finance/expenses.rst:116 -msgid "How to approve expenses" +#: ../../content/applications/finance/expenses.rst:102 +msgid "In the case of a hotel stay, for example, the :guilabel:`Unit Price` would be set as the cost *per night*, and set the :guilabel:`Quantity` to the *number of nights* stayed." msgstr "" -#: ../../content/applications/finance/expenses.rst:118 -msgid "HR and team managers get an overview of all expense reports to validate from the top menu :menuselection:`To Approve --> Expense Reports to Approve`. Such users must have at least *Officers* access rights for *Expenses*." +#: ../../content/applications/finance/expenses.rst:105 +msgid ":guilabel:`Taxes`: If taxes were paid on the expense, select the tax percentage using the drop-down menu. Tax options are pre-configured based on the localization setting selected when the database was created. Adding any new taxes should only be done when necessary." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:110 +msgid "When a tax is selected, the :guilabel:`Total` value will update in real time to show the added taxes." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:113 +msgid ":guilabel:`Paid By`: Click the radio button to indicate who paid for the expense and should be reimbursed. If the employee paid for the expense (and should be reimbursed) select :guilabel:`Employee (to reimburse)`. If the company paid directly instead (e.g. if the company credit card was used to pay for the expense) select :guilabel:`Company`." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:117 +msgid ":guilabel:`Expense Date`: Using the calendar module, enter the date the expense was incurred. Use the :guilabel:`< (left)` and :guilabel:`> (right)` arrows to navigate to the correct month, then click on the specific day to enter the selection." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:120 +msgid ":guilabel:`Bill Reference`: If there is any reference text that should be included for the expense, enter it in this field." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:122 +msgid ":guilabel:`Account`: Select the expense account that this expense should be logged on from the drop-down menu." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:124 +msgid ":guilabel:`Employee`: Using the drop-down menu, select the employee this expense is for." msgstr "" #: ../../content/applications/finance/expenses.rst:125 -msgid "They can review expense reports, approve or reject them, as well as providing feedback thanks to the integrated communication tool." +msgid ":guilabel:`Customer to Reinvoice`: If the expense is something that should be paid for by a customer, select the customer that will be invoiced for this expense from the drop-down menu. For example, if a customer wishes to have an on-site meeting, and agrees to pay for the expenses associated with it (such as travel, hotel, meals, etc.), then all expenses tied to that meeting would indicate that customer as the :guilabel:`Customer to Reinvoice`." msgstr "" -#: ../../content/applications/finance/expenses.rst:131 -msgid "As a team manager you can easily find the expense reports of your team members. You need to be set as manager in the detail form of those employees." +#: ../../content/applications/finance/expenses.rst:130 +msgid ":guilabel:`Analytic Account`: Select the account the expense should be written against from the drop-down menu." msgstr "" -#: ../../content/applications/finance/expenses.rst:139 -msgid "How to post expenses in accounting" +#: ../../content/applications/finance/expenses.rst:132 +msgid ":guilabel:`Company`: If multiple companies are set-up, select the company this expense should be filed for from the drop-down menu. If there is only one company, this field will be automatically populated." msgstr "" -#: ../../content/applications/finance/expenses.rst:141 -msgid "Once expense reports approved by managers, the accounting department goes to :menuselection:`Expenses --> Accountant --> Expense Reports To Post` to check accounts, products and taxes. They can click *Post Journal Entries* to post related journal entries into your books. To do so, the user must have following access rights:" +#: ../../content/applications/finance/expenses.rst:135 +msgid ":guilabel:`Notes...`: If any notes are needed in order to clarify the expense, enter them in the notes field." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:138 +msgid "Once all the fields have been filled out, click :guilabel:`Save`." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:-1 +msgid "A filled in expense form for a client lunch." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:145 +msgid "Attach a receipt" msgstr "" #: ../../content/applications/finance/expenses.rst:147 -msgid "Accounting: Accountant or Adviser" +msgid "After the expense is saved, the next step is to attach a receipt. A new :guilabel:`Attach Receipt` button appears after the entry is saved, beneath the former :guilabel:`Save` button (which turns into an :guilabel:`Edit` button)." msgstr "" -#: ../../content/applications/finance/expenses.rst:148 -msgid "Expenses: Manager" +#: ../../content/applications/finance/expenses.rst:-1 +msgid "Attach a receipt after saving the record." msgstr "" -#: ../../content/applications/finance/expenses.rst:151 -msgid "To post an expense, a *Home Address* must be set on the employee. If you get a related blocking message when posting, click the employee, go to *Personal Information* tab and select/create the contact of your employee in the address book. A contact has been automatically created if this person is using Odoo." -msgstr "" - -#: ../../content/applications/finance/expenses.rst:158 -msgid "How to reimburse employees" -msgstr "" - -#: ../../content/applications/finance/expenses.rst:160 -msgid "You can now see all the expense reports to reimburse in :menuselection:`Expenses --> Accountant --> Expense Reports To Pay`. To record the payment or pay by check, click *Register a Payment*." -msgstr "" - -#: ../../content/applications/finance/expenses.rst:164 -msgid "See how you can easily manage the payment process in Odoo:" +#: ../../content/applications/finance/expenses.rst:155 +msgid "Click the new :guilabel:`Attach Receipt` button, and a file explorer appears. Navigate to the receipt to be attached, and click :guilabel:`Open`. A new :guilabel:`Receipts` smart button appears at the top, and the new receipt is recorded in the chatter. More than one receipt can be attached to an individual expense, as needed. The number of receipts attached to the expense will be noted on the smart button." msgstr "" #: ../../content/applications/finance/expenses.rst:166 -msgid ":doc:`accounting/payments/pay_checks`" +msgid "Automatically create new expenses from an email" msgstr "" -#: ../../content/applications/finance/expenses.rst:167 -msgid ":doc:`accounting/payments/pay_sepa`" +#: ../../content/applications/finance/expenses.rst:168 +msgid "Instead of individually creating each expense in the *Expenses* app, expenses can be automatically created by sending an email to an email alias." msgstr "" #: ../../content/applications/finance/expenses.rst:171 -msgid "How to re-invoice expenses to your customers" +msgid "To do so, first, an email alias needs to be configured. Go to :menuselection:`Expenses app --> Configuration --> Settings`. Ensure :guilabel:`Incoming Emails` is checked off." msgstr "" -#: ../../content/applications/finance/expenses.rst:173 -msgid "If you track expenses on customer projects, you can charge them back to your customers automatically." +#: ../../content/applications/finance/expenses.rst:-1 +#: ../../content/applications/finance/expenses.rst:0 +msgid "Create the domain alias by clicking the link." msgstr "" -#: ../../content/applications/finance/expenses.rst:177 +#: ../../content/applications/finance/expenses.rst:179 +msgid "If the domain alias needs to be set up, :guilabel:`Setup your domain alias` will appear beneath the incoming emails check box instead of the email address field. Refer to this documentation for setup instructions and more information: :doc:`/administration/maintain/domain_names`. Once the domain alias is configured, the email address field will be visible beneath the incoming emails section." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:185 +msgid "Next, enter the email address to be used in the email field, then click :guilabel:`Save`. Now that the email address has been entered, emails can be sent to that alias to create new expenses without having to be in the Odoo database." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:189 +msgid "To submit an expense via email, create a new email and enter the product's *internal reference* code (if available) and the amount of the expense in the email subject. Next, attach the receipt to the email. Odoo creates the expense by taking the information in the email subject and combining it with the receipt." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:194 +msgid "To check an expense product's internal reference, go to :menuselection:`Expenses app --> Configuration --> Expense Products`. If an internal reference is listed on the product, it is visible in this view as :guilabel:`(Ref###)`." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:-1 +msgid "Internal reference numbers are listed in the main Expense Products view." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:202 +msgid "To add an internal reference on an expense product, click on the product, then click :guilabel:`Edit`. In edit mode, enter the :guilabel:`Internal Reference` in the field. Beneath the :guilabel:`Internal Reference` field, this sentence appears: :guilabel:`Use this reference as a subject prefix when submitting by email.`." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:212 +msgid "For security purposes, only authenticated employee emails are accepted by Odoo when creating an expense from an email. To confirm an authenticated employee email address, go to the employee card in the :guilabel:`Employees` app, and refer to the :guilabel:`Work Email` in the main field." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:221 +msgid "If submitting an expense via email for a $25.00 meal during a work trip, the email subject would be `Ref005 Meal $25.00`." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:224 +msgid "Explanation:" +msgstr "" + +#: ../../content/applications/finance/expenses.rst:226 +msgid "The :guilabel:`Internal Reference` for the expense product `Meals` is `Ref005`" +msgstr "" + +#: ../../content/applications/finance/expenses.rst:227 +msgid "The :guilabel:`Cost` for the expense is `$25.00`" +msgstr "" + +#: ../../content/applications/finance/expenses.rst:230 +msgid "Create an expense report" +msgstr "" + +#: ../../content/applications/finance/expenses.rst:232 +msgid "When expenses are ready to submit (such as at the end of a business trip, or once a month), an *expense report* needs to be created. Go to the main :menuselection:`Expenses` app dashboard, which displays a default :guilabel:`My Expenses` view, or go to :menuselection:`Expenses app --> My Expenses --> My Expenses to Report`." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:237 +msgid "First, each individual expense for the report must be selected by clicking the check box next to each entry, or quickly select all the expenses in the list by clicking the check box next to :guilabel:`Expense Date`." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:-1 +msgid "Select the expenses to submit, then create the report." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:245 +msgid "Once the expenses have been selected, click the :guilabel:`Create Report` button. The new report appears with all the expenses listed, and the number of documents is visible in the :guilabel:`Documents` smart button." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:249 +msgid "It is recommended to add a short summary for each report to help keep expenses organized. Click the :guilabel:`Edit` button, and the :guilabel:`Expense Report Summary` field appears. Enter a short description for the expense report (such as `Client Trip NYC`, or `Repairs for Company Car`). Next, select a :guilabel:`Manager` from the drop-down menu to assign a manager to review the report." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:-1 +msgid "Enter a short description and select a manager for the report." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:258 +msgid "If some expenses are not on the report that should be, they can still be added. Click :guilabel:`Add a line` at the bottom of the :guilabel:`Expense` tab. Click the check box next to each expense to add, then click :guilabel:`Select`. The items now appear on the report that was just created." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:-1 +msgid "Add more expenses to the report before submitting." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:267 +msgid ":guilabel:`Add a line` only appears when the document is in edit mode. It does not appear otherwise." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:270 +msgid "When all edits have been completed, click :guilabel:`Save`." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:273 +msgid "Submit an expense report" +msgstr "" + +#: ../../content/applications/finance/expenses.rst:275 +msgid "When an expense report is completed, the next step is to submit the report to a manager for approval. Reports must be individually submitted, and cannot be submitted in batches. Open the specific report from the list of expense reports (if the report is not already open). To view all expense reports, go to :menuselection:`Expenses app --> My Expenses --> My Reports`." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:280 +msgid "If the list is large, grouping the results by status may be helpful since only reports that are in a :guilabel:`Draft` mode need to be submitted, reports with an :guilabel:`Approved` or :guilabel:`Submitted` status do not." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:-1 +msgid "Submit the report to the manager." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:289 +msgid "The status of each report is shown in the :guilabel:`Status` column on the far right. If the :guilabel:`Status` column is not visible, click the :guilabel:`ā‹® (additional options)` icon at the end of the row, and check the box next to :guilabel:`Status`." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:293 +msgid "Click on a report to open it, then click :guilabel:`Submit To Manager`. After submitting a report, the next step is to wait for the manager to approve it." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:297 +msgid "The :ref:`expenses/approve`, :ref:`expenses/post`, and :ref:`expenses/reimburse` sections are **only** for users with the *necessary rights*." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:303 +msgid "Approve expenses" +msgstr "" + +#: ../../content/applications/finance/expenses.rst:305 +msgid "In Odoo, not just anyone can approve expense reportsā€” only users with the necessary rights (or permissions) can. This means that a user must have at least *Team Approver* rights for the *Expenses* app. Employees with the necessary rights can review expense reports, and approve or reject them, as well as provide feedback thanks to the integrated communication tool." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:310 +msgid "To see who has rights to approve, go to the main :menuselection:`Settings` app and click on :guilabel:`Manage Users`." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:314 +msgid "If the *Settings* app is not available, then certain rights are not set on the account. In the :guilabel:`Access Rights` tab of a user's card in the :menuselection:`Settings` app, the :guilabel:`Administration` section is set to one of three options:" +msgstr "" + +#: ../../content/applications/finance/expenses.rst:318 +msgid ":guilabel:`None (blank)`: The user cannot access the *Settings* app at all." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:319 +msgid ":guilabel:`Access Rights`: The user can only view the :guilabel:`User's & Companies` section of the *Settings* app." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:321 +msgid ":guilabel:`Settings`: The user has access to the entire *Settings* app with no restrictions." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:323 +msgid "Please refer to :doc:`this document ` to learn more about managing users and their access rights." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:326 +msgid "Click on an individual to view their card, which displays the :guilabel:`Access Rights` tab in the default view. Scroll down to the :guilabel:`Human Resources` section. Under :guilabel:`Expenses`, there are four options:" +msgstr "" + +#: ../../content/applications/finance/expenses.rst:330 +msgid ":guilabel:`None (blank)`: A blank field means the user has no rights to view or approve expense reports, and can only view their own." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:332 +msgid ":guilabel:`Team Approver`: The user can only view and approve expense reports for their own specific team." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:334 +msgid ":guilabel:`All Approver`: The user can view and approve any expense report." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:335 +msgid ":guilabel:`Administrator`: The user can view and approve any expense report as well as access the reporting and configuration menus in the *Expenses* app." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:338 +msgid "Users who are able to approve expense reports (typically managers) can easily view all expense reports to validate. Go to :menuselection:`Expenses app --> Expense Reports --> Reports to Approve`. This view lists all the expense reports that have been submitted but not approved, as noted by the :guilabel:`Submitted` tag in the status column." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:-1 +msgid "Reports to validate are found on the Reports to Approve page." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:347 +msgid "Reports can be approved in two ways (individually or several at once) and refused only one way. To approve multiple expense reports at once, remain in the list view. First, select the reports to approve by clicking the check box next to each report, or click the box next to :guilabel:`Employee` to select all reports in the list. Next, click on the :guilabel:`āš™ļø Action (gear)` icon, then click :guilabel:`Approve Report`." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:-1 +msgid "Approve multiple reports by clicking the checkboxes next to each report." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:357 +msgid "To approve an individual report, click on a report to go to a detailed view of that report. In this view, several options are presented: :guilabel:`Approve`, :guilabel:`Refuse`, or :guilabel:`Reset to draft`. Click :guilabel:`Approve` to approve the report." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:361 +msgid "If :guilabel:`Refuse` is clicked, a pop-up window appears. Enter a brief explanation for the refusal in the :guilabel:`Reason to refuse Expense` field, then click :guilabel:`Refuse`." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:-1 +#: ../../content/applications/finance/expenses.rst:0 +msgid "Send messages in the chatter." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:368 +msgid "Team managers can easily view all the expense reports for their team members. While in the :guilabel:`Reports to Approve` view, click on :guilabel:`Filters`, then click :guilabel:`My Team`. This presents all the reports for the manager's team." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:-1 +msgid "Select the My Team filter." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:377 +msgid "If more information is needed, such as a receipt is missing, communication is easy from the chatter. In an individual report, simply type in a message, tagging the proper person (if needed), and post it to the chatter by clicking :guilabel:`Send`. The message is posted in the chatter, and the person tagged will be notified via email of the message, as well as anyone following." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:390 +msgid "Post expenses in accounting" +msgstr "" + +#: ../../content/applications/finance/expenses.rst:392 +msgid "Once an expense report is approved, the next step is to post the report to the accounting journal. To view all expense reports to post, go to :menuselection:`Expenses --> Expense Reports --> Reports To Post`." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:-1 +msgid "View reports to post by clicking on expense reports, then reports to post." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:400 +msgid "Just like approvals, expense reports can be posted in two ways (individually or several at once). To post multiple expense reports at once, remain in the list view. First, select the reports to post by clicking the check box next to each report, or click the box next to :guilabel:`Employee` to select all reports in the list. Next, click on the :guilabel:`āš™ļø Action (gear)` icon, then click :guilabel:`Post Entries`." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:-1 +msgid "Post multiple reports from the Post Entries view." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:410 +msgid "To post an individual report, click on a report to go to the detailed view of that report. In this view, several options are presented: :guilabel:`Post Journal Entries`, :guilabel:`Report In Next Payslip`, or :guilabel:`Refuse`. Click :guilabel:`Post Journal Entries` to post the report." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:414 +msgid "If :guilabel:`Refuse` is clicked, a pop-up window appears. Enter a brief explanation for the refusal in the :guilabel:`Reason to refuse Expense` field, then click :guilabel:`Refuse`. Refused reports can be viewed by going to :menuselection:`Expenses app --> Expense Reports --> All Reports`. This list shows all reports, including the refused ones." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:420 +msgid "To post expense reports to an accounting journal, the user must have following access rights:" +msgstr "" + +#: ../../content/applications/finance/expenses.rst:422 +msgid "Accounting: Accountant or Adviser" +msgstr "" + +#: ../../content/applications/finance/expenses.rst:423 +msgid "Expenses: Manager" +msgstr "" + +#: ../../content/applications/finance/expenses.rst:428 +msgid "Reimburse employees" +msgstr "" + +#: ../../content/applications/finance/expenses.rst:430 +msgid "After an expense report is posted to an accounting journal, the next step is to reimburse the employee. To view all expense reports to pay, go to :menuselection:`Expenses --> Expense Reports --> Reports To Pay`." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:-1 +msgid "View reports to pay by clicking on expense reports, then reports to pay." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:438 +msgid "Just like approvals and posting, expense reports can be paid in two ways (individually or several at once). To pay multiple expense reports at once, remain in the list view. First, select the reports to pay by clicking the check box next to each report, or click the box next to :guilabel:`Employee` to select all reports in the list. Next, click on the :guilabel:`āš™ļø Action (gear)` icon, then click :guilabel:`Register Payment`." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:-1 +msgid "Post multiple reports by clicking the checkboxes, clicking the gear, then post the entries." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:448 +msgid "To pay an individual report, click on a report to go to a detailed view of that report. Click :guilabel:`Register Payment` to pay the employee." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:452 +msgid "Re-invoice expenses to customers" +msgstr "" + +#: ../../content/applications/finance/expenses.rst:454 +msgid "If expenses are tracked on customer projects, expenses can be automatically charged back to the customer. This is done by creating an expense report, then creating a sales order with the expensed items on it. Then, managers approve the expense report, and the accounting department posts the journal entries. Finally, the customer is invoiced." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:460 #: ../../content/applications/finance/fiscal_localizations/india.rst:55 #: ../../content/applications/finance/fiscal_localizations/india.rst:195 msgid "Setup" msgstr "" -#: ../../content/applications/finance/expenses.rst:179 -msgid "Enable **Customer Billing** in the Expenses settings" +#: ../../content/applications/finance/expenses.rst:462 +msgid "First, specify the invoicing policy for each expense product. Go to :menuselection:`Expenses app --> Configuration --> Expense Products`. Click on the expense product to edit, then click :guilabel:`Edit`. Under the :guilabel:`Invoicing` section, select the :guilabel:`Invoicing Policy` and :guilabel:`Re-Invoicing Policy` by clicking the radio button next to the desired selection." msgstr "" -#: ../../content/applications/finance/expenses.rst:181 -msgid "Go to the product configuration menu and set the invoicing method on all your Expense types:" +#: ../../content/applications/finance/expenses.rst:467 +msgid ":guilabel:`Invoicing Policy`:" msgstr "" -#: ../../content/applications/finance/expenses.rst:184 -msgid "Ordered quantities: it will invoice expenses based on the ordered quantity" +#: ../../content/applications/finance/expenses.rst:469 +msgid ":guilabel:`Ordered quantities`: Expense product will only invoice expenses based on the ordered quantity." msgstr "" -#: ../../content/applications/finance/expenses.rst:187 -msgid "Delivered quantities: it will invoice expenses based on the expenses quantity" +#: ../../content/applications/finance/expenses.rst:471 +msgid ":guilabel:`Delivered quantities`: Expense product will only invoice expenses based on the delivered quantity." msgstr "" -#: ../../content/applications/finance/expenses.rst:190 -msgid "At cost: will invoice expenses at their real cost." +#: ../../content/applications/finance/expenses.rst:474 +msgid ":guilabel:`Re-Invoicing Policy`:" msgstr "" -#: ../../content/applications/finance/expenses.rst:192 -msgid "At sales price: will invoice based on a fixed sales price set on the sale order." +#: ../../content/applications/finance/expenses.rst:476 +msgid ":guilabel:`No`: Expense product will not be re-invoiced." msgstr "" -#: ../../content/applications/finance/expenses.rst:199 -msgid "Create an order" +#: ../../content/applications/finance/expenses.rst:477 +msgid ":guilabel:`At cost`: Expense product will invoice expenses at their real cost." msgstr "" -#: ../../content/applications/finance/expenses.rst:201 -msgid "As a salesman, create and confirm a Sales Order for the services delivered to your customer. If you don't put any expense in the order, it will be added automatically once posted by the accountant." +#: ../../content/applications/finance/expenses.rst:478 +msgid ":guilabel:`At sales price`: Expense product will invoice the price set on the sale order." msgstr "" -#: ../../content/applications/finance/expenses.rst:206 -msgid "Link the expense to the Sale Order." +#: ../../content/applications/finance/expenses.rst:481 +msgid "Create an expense" msgstr "" -#: ../../content/applications/finance/expenses.rst:212 -msgid "Submit, validate and post expenses" +#: ../../content/applications/finance/expenses.rst:483 +msgid "First, when :ref:`creating a new expense `, the correct information needs to be entered in order to re-invoice a customer. Select the :guilabel:`Customer to Reinvoice` from the drop-down menu. Next, select the :guilabel:`Analytic Account` the expense will be posted to." msgstr "" -#: ../../content/applications/finance/expenses.rst:214 -msgid "As a manager, make sure the analytic account is set on every expense line on approving expenses reports. Click the line to add one if missing. Employees are already able to set one when submitting." +#: ../../content/applications/finance/expenses.rst:-1 +msgid "Ensure the customer to be invoiced is called out on the expense." msgstr "" -#: ../../content/applications/finance/expenses.rst:221 -msgid "As an accountant, post journal entries." +#: ../../content/applications/finance/expenses.rst:492 +msgid "Create a quote and sales order" msgstr "" -#: ../../content/applications/finance/expenses.rst:224 +#: ../../content/applications/finance/expenses.rst:494 +msgid "In the :menuselection:`Sales` app, create a quote for the customer being invoiced, listing the expense products. First, click :guilabel:`Create` to create a new quotation. Next, select the :guilabel:`Customer` being invoiced for the expenses from the drop-down menu." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:498 +msgid "In the :guilabel:`Order Lines` tab, click :guilabel:`Add a product`. In the :guilabel:`Product` field, select the first item being invoiced from the drop-down menu, or type in the product name. Then, update the :guilabel:`Quantity`, the :guilabel:`Delivered` quantity, and the :guilabel:`Unit Price` if needed. Repeat this for all products being invoiced. When all the products have been added to the quote, click :guilabel:`Confirm` and the quotation becomes a sales order." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:-1 +msgid "Create and confirm the sales order with the expenses listed as products." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:508 +msgid "Once the quote turns into a sales order, a :guilabel:`Delivered` column appears. The delivered quantity must be updated for each item. Click on the `0.000` field for each product, and enter the delivered quantity. When all delivered quantities have been entered, click :guilabel:`Save`." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:513 +msgid "Validate and post expenses" +msgstr "" + +#: ../../content/applications/finance/expenses.rst:515 +msgid "Only employees with permissions (typically managers or supervisors) can :ref:`approve expenses `. Before approving an expense report, ensure the :guilabel:`Analytic Account` is set on every expense line of a report. If an :guilabel:`Analytic Account` is missing, click :guilabel:`Edit` and select the correct account from the drop-down menu, then click :guilabel:`Approve` or :guilabel:`Refuse`." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:521 +msgid "The accounting department is typically responsible for :ref:`posting journal entries `. Once an expense report is approved, it can then be posted." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:525 msgid "Invoice expenses" msgstr "" -#: ../../content/applications/finance/expenses.rst:226 -msgid "Now you can invoice the order. It shows up in :menuselection:`Sales --> Invoicing --> Sales` to Invoice. The expenses have been added automatically in the order lines. Such items show up in blue (i.e. to invoice)." +#: ../../content/applications/finance/expenses.rst:527 +msgid "Once the quote has turned into a sales order, and the expense report has been approved, it is time to invoice the customer. Go to :menuselection:`Sales app --> To Invoice --> Orders to Invoice` to view the sales orders ready to be invoiced." msgstr "" -#: ../../content/applications/finance/expenses.rst:234 -msgid "e (i.e. to invoice)." +#: ../../content/applications/finance/expenses.rst:531 +msgid "Next, find the sales order related to the expense report, click into it, and then click :guilabel:`Create Invoice` and a :guilabel:`Create invoices` pop-up window appears. Select if the invoice is a :guilabel:`Regular invoice`, :guilabel:`Down payment (percentage)`, or :guilabel:`Down payment (fixed amount)` by clicking the radio button next to the selection. For either down payment options, enter the amount (fixed or percentage) in the :guilabel:`Down Payment Amount` field. Finally, click either :guilabel:`create and view invoice` or :guilabel:`create invoice`." msgstr "" #: ../../content/applications/finance/fiscal_localizations.rst:5 @@ -11395,10 +11856,6 @@ msgstr "" msgid "Enter the perception amount." msgstr "" -#: ../../content/applications/finance/fiscal_localizations/argentina.rst:679 -msgid "Reports" -msgstr "" - #: ../../content/applications/finance/fiscal_localizations/argentina.rst:681 msgid "As part of the localization installation, financial reporting for Argentina was added to the :guilabel:`Accounting` dashboard. Access these reports by navigating to :menuselection:`Accounting --> Reporting --> Argentinean Reports`" msgstr "" @@ -18021,7 +18478,7 @@ msgid "Have a `Certificate of Digital Seal `_, `Quadrum (formerly Finkok) `_ and `SW Sapien - Smarter Web `_." +msgid "Choose a PAC and purchase stamps. Currently the Mexican location in Odoo works with the following PACs: `SoluciĆ³n Factible `_, `Quadrum (formerly Finkok) `_ and `SW Sapien - Smarter Web `_." msgstr "" #: ../../content/applications/finance/fiscal_localizations/mexico.rst:37 @@ -18225,7 +18682,7 @@ msgid "Another important step to configure electronic invoicing in Odoo is to en msgstr "" #: ../../content/applications/finance/fiscal_localizations/mexico.rst:211 -msgid "Remember that you must register directly with the PAC of your choice before you start creating invoices from Odoo. We have the following PACs available: `Quadrum `_, `SoluciĆ³n Factible `_ and `SW Sapien - Smarter Web `_." +msgid "Remember that you must register directly with the PAC of your choice before you start creating invoices from Odoo. We have the following PACs available: `Quadrum `_, `SoluciĆ³n Factible `_ and `SW Sapien - Smarter Web `_." msgstr "" #: ../../content/applications/finance/fiscal_localizations/mexico.rst:216 @@ -21496,138 +21953,138 @@ msgid "When selected, Odoo displays your payment information with a payment refe msgstr "" #: ../../content/applications/finance/payment_providers.rst:0 -msgid "SEPA Direct Debit" +msgid ":doc:`SEPA Direct Debit <../finance/accounting/payments/batch_sdd>`" msgstr "" #: ../../content/applications/finance/payment_providers.rst:0 -msgid "Your customers can sign a SEPA Direct Debit mandate online and get their bank account charged directly. :doc:`Click here <../finance/accounting/payments/batch_sdd>` for more information about this payment method." +msgid "Your customers can sign a SEPA Direct Debit mandate online and get their bank account charged directly." msgstr "" -#: ../../content/applications/finance/payment_providers.rst:189 +#: ../../content/applications/finance/payment_providers.rst:188 msgid "Additional features" msgstr "" -#: ../../content/applications/finance/payment_providers.rst:191 +#: ../../content/applications/finance/payment_providers.rst:190 msgid "Some payment providers support additional features for the payment flow. Refer to the :ref:`table above ` to check if your payment provider supports these features." msgstr "" -#: ../../content/applications/finance/payment_providers.rst:198 +#: ../../content/applications/finance/payment_providers.rst:197 msgid "Tokenization" msgstr "" -#: ../../content/applications/finance/payment_providers.rst:200 +#: ../../content/applications/finance/payment_providers.rst:199 msgid "If your payment provider supports this feature, customers can choose to save their card for later. A **payment token** is created in Odoo and can be used as a payment method for subsequent payments without having to enter the card details again. This is particularly useful for the eCommerce conversion rate and for subscriptions that use recurring payments." msgstr "" -#: ../../content/applications/finance/payment_providers.rst:205 +#: ../../content/applications/finance/payment_providers.rst:204 msgid "Enable this feature by navigating to the :guilabel:`Configuration` tab from your payment provider and by ticking the :guilabel:`Allow Saving Payment Methods` checkbox." msgstr "" -#: ../../content/applications/finance/payment_providers.rst:209 +#: ../../content/applications/finance/payment_providers.rst:208 msgid "You remain fully PCI-compliant when you enable this feature because Odoo does not store the card details directly. Instead, it creates a payment token that only holds a reference to the card details stored on the payment provider's server." msgstr "" -#: ../../content/applications/finance/payment_providers.rst:216 +#: ../../content/applications/finance/payment_providers.rst:215 msgid "Manual capture" msgstr "" -#: ../../content/applications/finance/payment_providers.rst:218 +#: ../../content/applications/finance/payment_providers.rst:217 msgid "If your payment provider 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_providers.rst:225 +#: ../../content/applications/finance/payment_providers.rst:224 msgid "Receive the payment confirmation and wait until the order is shipped to capture the payment." msgstr "" -#: ../../content/applications/finance/payment_providers.rst:226 +#: ../../content/applications/finance/payment_providers.rst:225 msgid "Review and verify that orders are legitimate before the payment is completed and the fulfillment process starts." msgstr "" -#: ../../content/applications/finance/payment_providers.rst:228 +#: ../../content/applications/finance/payment_providers.rst:227 msgid "Avoid potentially high processing fees for cancelled payments: payment providers will not charge you for voiding an authorization." msgstr "" -#: ../../content/applications/finance/payment_providers.rst:230 +#: ../../content/applications/finance/payment_providers.rst:229 msgid "Hold a security deposit to return later, minus any deductions (e.g., after a damage)." msgstr "" -#: ../../content/applications/finance/payment_providers.rst:232 +#: ../../content/applications/finance/payment_providers.rst:231 msgid "Enable this feature by navigating to the :guilabel:`Configuration` tab from your payment provider and by ticking the :guilabel:`Capture Amount Manually` checkbox." msgstr "" -#: ../../content/applications/finance/payment_providers.rst:235 +#: ../../content/applications/finance/payment_providers.rst:234 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_providers.rst:240 +#: ../../content/applications/finance/payment_providers.rst:239 msgid "Some payment providers support capturing only part of the authorized amount. The remaining amount can then be either captured or voided. These providers have the value **Full and partial** in the :ref:`table above `. The providers that only support capturing or voiding the full amount have the value **Full only**." msgstr "" -#: ../../content/applications/finance/payment_providers.rst:244 +#: ../../content/applications/finance/payment_providers.rst:243 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 provider's documentation for the exact reservation duration." msgstr "" -#: ../../content/applications/finance/payment_providers.rst:247 +#: ../../content/applications/finance/payment_providers.rst:246 msgid "Odoo does not support this feature for all payment providers but some allow the manual capture from their website interface." msgstr "" -#: ../../content/applications/finance/payment_providers.rst:253 +#: ../../content/applications/finance/payment_providers.rst:252 msgid "Refunds" msgstr "" -#: ../../content/applications/finance/payment_providers.rst:255 +#: ../../content/applications/finance/payment_providers.rst:254 msgid "If your payment provider 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_providers.rst:260 +#: ../../content/applications/finance/payment_providers.rst:259 msgid "Some payment providers support refunding only part of the amount. The remaining amount can then optionally be refunded too. These providers have the value **Full and partial** in the :ref:`table above `. The providers that only support refunding the full amount have the value **Full only**." msgstr "" -#: ../../content/applications/finance/payment_providers.rst:264 +#: ../../content/applications/finance/payment_providers.rst:263 msgid "Odoo does not support this feature for all payment providers but some allow to refund payments from their website interface." msgstr "" -#: ../../content/applications/finance/payment_providers.rst:270 +#: ../../content/applications/finance/payment_providers.rst:269 msgid "Express checkout" msgstr "" -#: ../../content/applications/finance/payment_providers.rst:272 +#: ../../content/applications/finance/payment_providers.rst:271 msgid "If your payment provider supports this feature, customers can use the **Google Pay** and **Apple Pay** buttons to pay their eCommerce orders in one click without filling the contact form. Using one of those buttons, customers go straight from the cart to the confirmation page, stopping by the payment form of Google or Apple to validate the payment." msgstr "" -#: ../../content/applications/finance/payment_providers.rst:277 +#: ../../content/applications/finance/payment_providers.rst:276 msgid "Enable this feature by navigating to the :guilabel:`Configuration` tab from your payment provider and by ticking the :guilabel:`Allow Express Checkout` checkbox." msgstr "" -#: ../../content/applications/finance/payment_providers.rst:281 +#: ../../content/applications/finance/payment_providers.rst:280 msgid "All prices shown in the express checkout payment form are always taxes included." msgstr "" -#: ../../content/applications/finance/payment_providers.rst:286 +#: ../../content/applications/finance/payment_providers.rst:285 msgid "Extra Fees" msgstr "" -#: ../../content/applications/finance/payment_providers.rst:288 +#: ../../content/applications/finance/payment_providers.rst:287 msgid "If supported by the payment provider, you can add **extra fees** to online transactions. Fees can be configured either as **fixed** amounts and percentages, **variable** amounts and percentages, or *both* simultaneously. These can be applied according to **domestic** or **international** geolocation." msgstr "" -#: ../../content/applications/finance/payment_providers.rst:293 +#: ../../content/applications/finance/payment_providers.rst:292 msgid "To enable fees, from the *eCommerce* or *Accounting* app, head to :menuselection:`Configuration --> Payment Providers` and select the desired supported provider. Click on the :guilabel:`Fees` tab and check the :guilabel:`Add Extra Fees` box. Configure the settings to your needs." msgstr "" -#: ../../content/applications/finance/payment_providers.rst:298 +#: ../../content/applications/finance/payment_providers.rst:297 msgid "Fees are calculated on the tax-included price." msgstr "" -#: ../../content/applications/finance/payment_providers.rst:306 +#: ../../content/applications/finance/payment_providers.rst:305 msgid "Each provider has its specific configuration flow, depending on :ref:`which feature is available `." msgstr "" -#: ../../content/applications/finance/payment_providers.rst:312 +#: ../../content/applications/finance/payment_providers.rst:311 msgid "Add a new payment provider" msgstr "" -#: ../../content/applications/finance/payment_providers.rst:314 +#: ../../content/applications/finance/payment_providers.rst:313 msgid "To add a new payment provider and make it available to your customers, go to :menuselection:`Accounting --> Configuration --> Payment Providers`, look for your payment provider, install the related module, and activate it. To do so, open the payment provider and change its state from *Disabled* to *Enabled*." msgstr "" @@ -21635,120 +22092,119 @@ msgstr "" msgid "Click on install, then on activate to make the payment provider available on Odoo." msgstr "" -#: ../../content/applications/finance/payment_providers.rst:324 +#: ../../content/applications/finance/payment_providers.rst:323 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 providers on your main database." msgstr "" -#: ../../content/applications/finance/payment_providers.rst:332 +#: ../../content/applications/finance/payment_providers.rst:331 #: ../../content/applications/finance/payment_providers/adyen.rst:23 #: ../../content/applications/finance/payment_providers/alipay.rst:18 #: ../../content/applications/finance/payment_providers/authorize.rst:15 #: ../../content/applications/finance/payment_providers/buckaroo.rst:31 #: ../../content/applications/finance/payment_providers/mollie.rst:14 -#: ../../content/applications/finance/payment_providers/paypal.rst:17 #: ../../content/applications/finance/payment_providers/sips.rst:15 msgid "Credentials tab" msgstr "" -#: ../../content/applications/finance/payment_providers.rst:334 +#: ../../content/applications/finance/payment_providers.rst:333 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 provider." msgstr "" -#: ../../content/applications/finance/payment_providers.rst:338 +#: ../../content/applications/finance/payment_providers.rst:337 msgid "The form in this section is specific to the payment provider you are configuring. Please refer to the related documentation for more information." msgstr "" -#: ../../content/applications/finance/payment_providers.rst:344 +#: ../../content/applications/finance/payment_providers.rst:343 #: ../../content/applications/finance/payment_providers/authorize.rst:40 #: ../../content/applications/finance/payment_providers/stripe.rst:119 msgid "Configuration tab" msgstr "" -#: ../../content/applications/finance/payment_providers.rst:346 +#: ../../content/applications/finance/payment_providers.rst:345 msgid "You can change the payment provider'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_providers.rst:353 +#: ../../content/applications/finance/payment_providers.rst:352 msgid "Currencies" msgstr "" -#: ../../content/applications/finance/payment_providers.rst:355 +#: ../../content/applications/finance/payment_providers.rst:354 msgid "All payment providers have a different list of available currencies. They are preconfigured and available in the :guilabel:`Configuration` tab. They serve as a first filter during payment operations, i.e. the payment provider is not displayed as available for payment if the currency is not in the supported list." msgstr "" -#: ../../content/applications/finance/payment_providers.rst:361 +#: ../../content/applications/finance/payment_providers.rst:360 msgid "As there might be errors, updates, and unknowns in the lists of available currencies, it is possible to add or remove currencies." msgstr "" -#: ../../content/applications/finance/payment_providers.rst:364 +#: ../../content/applications/finance/payment_providers.rst:363 msgid "If the list of supported currencies is empty, it either means the list is too long to be displayed, or Odoo does not have information on that payment provider. The payment provider remains available, even though it is possible the payment will be refused at a later stage should the currency not be supported. This field is required if the user needs to select a currency when setting up their payment provider account." msgstr "" -#: ../../content/applications/finance/payment_providers.rst:373 +#: ../../content/applications/finance/payment_providers.rst:372 msgid "Countries" msgstr "" -#: ../../content/applications/finance/payment_providers.rst:375 +#: ../../content/applications/finance/payment_providers.rst:374 msgid "Restrict the use of the payment provider to a selection of countries. Leave this field blank to make the payment provider available in all countries." msgstr "" -#: ../../content/applications/finance/payment_providers.rst:381 +#: ../../content/applications/finance/payment_providers.rst:378 msgid "Maximum Amount" msgstr "" -#: ../../content/applications/finance/payment_providers.rst:383 +#: ../../content/applications/finance/payment_providers.rst:380 msgid "Restrict the maximum amount that can be paid with the selected provider. Leave this field to `0.00` to make the payment provider available regardless of the payment amount." msgstr "" -#: ../../content/applications/finance/payment_providers.rst:387 +#: ../../content/applications/finance/payment_providers.rst:384 msgid "This feature is not intended to work on pages which allow the customer to update the payment amount. For example, the **Donation** snippet of the Website app, and the **Checkout** page of the **eCommerce** app when paid delivery methods are enabled." msgstr "" -#: ../../content/applications/finance/payment_providers.rst:392 +#: ../../content/applications/finance/payment_providers.rst:391 msgid "Payment journal" msgstr "" -#: ../../content/applications/finance/payment_providers.rst:394 +#: ../../content/applications/finance/payment_providers.rst:393 msgid "The **Payment journal** selected for your payment provider must be a *Bank* journal." msgstr "" -#: ../../content/applications/finance/payment_providers.rst:399 +#: ../../content/applications/finance/payment_providers.rst:398 msgid "Publish on the website" msgstr "" -#: ../../content/applications/finance/payment_providers.rst:401 +#: ../../content/applications/finance/payment_providers.rst:400 msgid "By default, payment providers are *unpublished*, which means that only internal users can see them on the website. Your customers cannot make payments through an unpublished provider but they can still manage :dfn:`(delete and assign to a subscription)` their already existing tokens linked to such an provider. This conveniently allows you to test an provider while preventing making payments and registering new tokens." msgstr "" -#: ../../content/applications/finance/payment_providers.rst:407 +#: ../../content/applications/finance/payment_providers.rst:406 msgid "Click on the :guilabel:`Publish` button located in the top right corner of the provider's form to publish it on the website and make it available to your customers. Click on the :guilabel:`Unpublish` button to unpublish it." msgstr "" -#: ../../content/applications/finance/payment_providers.rst:412 +#: ../../content/applications/finance/payment_providers.rst:411 msgid "Payment providers are automatically published and unpublished when you respectively change their state to `enabled` and `test`." msgstr "" -#: ../../content/applications/finance/payment_providers.rst:418 +#: ../../content/applications/finance/payment_providers.rst:417 msgid "Accounting perspective" msgstr "" -#: ../../content/applications/finance/payment_providers.rst:420 +#: ../../content/applications/finance/payment_providers.rst:419 msgid "The **Bank Payments** that go directly to one of your bank accounts follow their usual reconciliation workflows. However, payments recorded with **Online Payment Providers** require you to consider how you want to record your payments' journal entries. We recommend you to ask your accountant for advice." msgstr "" -#: ../../content/applications/finance/payment_providers.rst:425 +#: ../../content/applications/finance/payment_providers.rst:424 msgid "You need to select a *Payment Journal* on your provider configuration to record the payments, on a **Outstanding Account**. The Journal's **type** must be *Bank Journal*." msgstr "" -#: ../../content/applications/finance/payment_providers.rst:428 +#: ../../content/applications/finance/payment_providers.rst:427 msgid "You can use a single journal for many payment methods. And for each payment method, you can either:" msgstr "" -#: ../../content/applications/finance/payment_providers.rst:430 +#: ../../content/applications/finance/payment_providers.rst:429 msgid "Define an **Accounting Account** to separate these payments from another payment method." msgstr "" -#: ../../content/applications/finance/payment_providers.rst:431 +#: ../../content/applications/finance/payment_providers.rst:430 msgid "Leave blank to fallback on the default account, which you can see or change in the settings." msgstr "" @@ -21756,67 +22212,67 @@ msgstr "" msgid "A bank journal in the \"Incoming Payments Tab\"." msgstr "" -#: ../../content/applications/finance/payment_providers.rst:437 +#: ../../content/applications/finance/payment_providers.rst:436 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_providers.rst:441 +#: ../../content/applications/finance/payment_providers.rst:440 msgid ":doc:`payment_providers/wire_transfer`" msgstr "" -#: ../../content/applications/finance/payment_providers.rst:442 +#: ../../content/applications/finance/payment_providers.rst:441 msgid ":doc:`payment_providers/adyen`" msgstr "" -#: ../../content/applications/finance/payment_providers.rst:443 +#: ../../content/applications/finance/payment_providers.rst:442 msgid ":doc:`payment_providers/alipay`" msgstr "" -#: ../../content/applications/finance/payment_providers.rst:444 +#: ../../content/applications/finance/payment_providers.rst:443 msgid ":doc:`payment_providers/authorize`" msgstr "" -#: ../../content/applications/finance/payment_providers.rst:445 +#: ../../content/applications/finance/payment_providers.rst:444 msgid ":doc:`payment_providers/asiapay`" msgstr "" -#: ../../content/applications/finance/payment_providers.rst:446 +#: ../../content/applications/finance/payment_providers.rst:445 msgid ":doc:`payment_providers/buckaroo`" msgstr "" -#: ../../content/applications/finance/payment_providers.rst:447 +#: ../../content/applications/finance/payment_providers.rst:446 msgid ":doc:`payment_providers/demo`" msgstr "" -#: ../../content/applications/finance/payment_providers.rst:448 +#: ../../content/applications/finance/payment_providers.rst:447 msgid ":doc:`payment_providers/mercado_pago`" msgstr "" -#: ../../content/applications/finance/payment_providers.rst:449 +#: ../../content/applications/finance/payment_providers.rst:448 msgid ":doc:`payment_providers/mollie`" msgstr "" -#: ../../content/applications/finance/payment_providers.rst:450 +#: ../../content/applications/finance/payment_providers.rst:449 msgid ":doc:`payment_providers/ogone`" msgstr "" -#: ../../content/applications/finance/payment_providers.rst:451 +#: ../../content/applications/finance/payment_providers.rst:450 msgid ":doc:`payment_providers/paypal`" msgstr "" -#: ../../content/applications/finance/payment_providers.rst:452 +#: ../../content/applications/finance/payment_providers.rst:451 msgid ":doc:`payment_providers/razorpay`" msgstr "" -#: ../../content/applications/finance/payment_providers.rst:453 +#: ../../content/applications/finance/payment_providers.rst:452 msgid ":doc:`payment_providers/sips`" msgstr "" -#: ../../content/applications/finance/payment_providers.rst:454 +#: ../../content/applications/finance/payment_providers.rst:453 msgid ":doc:`payment_providers/stripe`" msgstr "" -#: ../../content/applications/finance/payment_providers.rst:455 +#: ../../content/applications/finance/payment_providers.rst:454 msgid ":doc:`../websites/ecommerce/checkout_payment_shipping/payments`" msgstr "" @@ -21836,14 +22292,14 @@ msgstr "" #: ../../content/applications/finance/payment_providers/demo.rst:12 #: ../../content/applications/finance/payment_providers/mollie.rst:11 #: ../../content/applications/finance/payment_providers/ogone.rst:9 -#: ../../content/applications/finance/payment_providers/paypal.rst:14 +#: ../../content/applications/finance/payment_providers/paypal.rst:93 #: ../../content/applications/finance/payment_providers/sips.rst:12 #: ../../content/applications/finance/payment_providers/stripe.rst:12 msgid ":ref:`payment_providers/add_new`" msgstr "" #: ../../content/applications/finance/payment_providers/adyen.rst:10 -#: ../../content/applications/finance/payment_providers/adyen.rst:146 +#: ../../content/applications/finance/payment_providers/adyen.rst:163 #: ../../content/applications/finance/payment_providers/alipay.rst:39 #: ../../content/applications/finance/payment_providers/asiapay.rst:42 #: ../../content/applications/finance/payment_providers/authorize.rst:53 @@ -21851,11 +22307,10 @@ msgstr "" #: ../../content/applications/finance/payment_providers/flutterwave.rst:44 #: ../../content/applications/finance/payment_providers/mercado_pago.rst:30 #: ../../content/applications/finance/payment_providers/mollie.rst:31 -#: ../../content/applications/finance/payment_providers/paypal.rst:141 +#: ../../content/applications/finance/payment_providers/paypal.rst:157 #: ../../content/applications/finance/payment_providers/razorpay.rst:46 #: ../../content/applications/finance/payment_providers/sips.rst:32 #: ../../content/applications/finance/payment_providers/stripe.rst:142 -#: ../../content/applications/finance/payment_providers/wire_transfer.rst:39 msgid ":doc:`../payment_providers`" msgstr "" @@ -21904,18 +22359,30 @@ msgid "API Key and Client Key" msgstr "" #: ../../content/applications/finance/payment_providers/adyen.rst:48 -msgid "In order to retrieve the API Key and the Client Key, log into your Adyen account, go to :menuselection:`Developers --> API Credentials`. - If you already have an API user, open it. - If you don't have an API user yet, click on **Create new credential**. Go to :menuselection:`Server settings --> Authentification` and copy or generate your **API Key**. Be careful to copy your API key as you'll not be allowed to get it later without generating a new one." +msgid "In order to retrieve the API Key and the Client Key, log into your Adyen account, go to :menuselection:`Developers --> API Credentials`." msgstr "" -#: ../../content/applications/finance/payment_providers/adyen.rst:56 +#: ../../content/applications/finance/payment_providers/adyen.rst:51 +msgid "If you already have an API user, open it." +msgstr "" + +#: ../../content/applications/finance/payment_providers/adyen.rst:52 +msgid "If you don't have an API user yet, click on **Create new credential**." +msgstr "" + +#: ../../content/applications/finance/payment_providers/adyen.rst:54 +msgid "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_providers/adyen.rst:58 msgid "Now, head to :menuselection:`Client settings --> Authentification` and cody or generate your **Client Key**. This is also the place where you can :ref:`allow payments to be made from your website `." msgstr "" -#: ../../content/applications/finance/payment_providers/adyen.rst:63 +#: ../../content/applications/finance/payment_providers/adyen.rst:65 msgid "HMAC key" msgstr "" -#: ../../content/applications/finance/payment_providers/adyen.rst:65 +#: ../../content/applications/finance/payment_providers/adyen.rst:67 msgid "In order to retrieve the HMAC Key, you'll need to configure a `Standard Notification` webhook. For this, log into your Adyen account then go to :menuselection:`Developers --> Webhooks --> Add webhook --> Add Standard notification`." msgstr "" @@ -21923,7 +22390,7 @@ msgstr "" msgid "Configure a webhook." msgstr "" -#: ../../content/applications/finance/payment_providers/adyen.rst:73 +#: ../../content/applications/finance/payment_providers/adyen.rst:75 msgid "There, in :menuselection:`General --> Server configuration --> URL`, enter your server address followed by `/payment/adyen/notification`." msgstr "" @@ -21931,7 +22398,7 @@ msgstr "" msgid "Enter the notification URL." msgstr "" -#: ../../content/applications/finance/payment_providers/adyen.rst:80 +#: ../../content/applications/finance/payment_providers/adyen.rst:82 msgid "Then enter :menuselection:`Security --> HMAC Key --> Generate`. Be careful to copy the key as you will not be allowed to do it later without generating a new one." msgstr "" @@ -21939,31 +22406,63 @@ msgstr "" msgid "Generate a HMAC key and save it." msgstr "" -#: ../../content/applications/finance/payment_providers/adyen.rst:87 +#: ../../content/applications/finance/payment_providers/adyen.rst:89 msgid "You have to save the webhook to finalize its creation." msgstr "" -#: ../../content/applications/finance/payment_providers/adyen.rst:92 -msgid "URLs" -msgstr "" - #: ../../content/applications/finance/payment_providers/adyen.rst:94 -msgid "To retrieve the URLs, log into your Adyen account, go to :menuselection:`Developers --> API URLs`. Select one of the URLs listed next to :guilabel:`Classic Recurring API` as your :guilabel:`Recurring API URL` and one listed next to :guilabel:`Checkout API` as your :guilabel:`Checkout API URL`." +msgid "API URLs" msgstr "" -#: ../../content/applications/finance/payment_providers/adyen.rst:-1 -msgid "Get the links for the different API." +#: ../../content/applications/finance/payment_providers/adyen.rst:96 +msgid "All Adyen API URLs include a customer area-specific prefix generated by Adyen. To configure the URLs, proceed as follows:" msgstr "" -#: ../../content/applications/finance/payment_providers/adyen.rst:104 +#: ../../content/applications/finance/payment_providers/adyen.rst:99 +msgid "Log into your Adyen account, then go to :menuselection:`Developers --> API URLs`." +msgstr "" + +#: ../../content/applications/finance/payment_providers/adyen.rst:100 +msgid "Copy the :guilabel:`Prefix` for your live Customer area (i.e., **data center**) and save it for later." +msgstr "" + +#: ../../content/applications/finance/payment_providers/adyen.rst:0 +msgid "Copy the prefix for the Adyen APIs" +msgstr "" + +#: ../../content/applications/finance/payment_providers/adyen.rst:106 +msgid "In Odoo, :ref:`navigate to the payment provider Adyen `." +msgstr "" + +#: ../../content/applications/finance/payment_providers/adyen.rst:107 +msgid "In the :guilabel:`Checkout API URL` field, enter the following URL and replace `yourprefix` with the prefix you previously saved: `https://yourprefix-checkout-live.adyenpayments.com/checkout`" +msgstr "" + +#: ../../content/applications/finance/payment_providers/adyen.rst:110 +msgid "In the :guilabel:`Recurring API URL` field, enter the following URL and replace `yourprefix` with the prefix you previously saved: `https://yourprefix-pal-live.adyenpayments.com/pal/servlet/Recurring`." +msgstr "" + +#: ../../content/applications/finance/payment_providers/adyen.rst:115 +msgid "If you are trying Adyen as a test, you can use the following URLs instead:" +msgstr "" + +#: ../../content/applications/finance/payment_providers/adyen.rst:117 +msgid ":guilabel:`Checkout API URL`: `https://checkout-test.adyen.com`" +msgstr "" + +#: ../../content/applications/finance/payment_providers/adyen.rst:118 +msgid ":guilabel:`Recurring API URL`: `https://pal-test.adyen.com/pal/servlet/Recurring`" +msgstr "" + +#: ../../content/applications/finance/payment_providers/adyen.rst:121 msgid "Adyen Account" msgstr "" -#: ../../content/applications/finance/payment_providers/adyen.rst:109 +#: ../../content/applications/finance/payment_providers/adyen.rst:126 msgid "Allow payments from a specific origin" msgstr "" -#: ../../content/applications/finance/payment_providers/adyen.rst:111 +#: ../../content/applications/finance/payment_providers/adyen.rst:128 msgid "To allow payment originated from your website, follow the steps in :ref:`adyen/api_and_client_keys` to navigate to your API user and go to :menuselection:`Add allowed origins`, then add the URLs from where payments will be made (the URLs of the servers hosting your Odoo instances)." msgstr "" @@ -21971,21 +22470,21 @@ msgstr "" msgid "Allows payments originated from a specific domain." msgstr "" -#: ../../content/applications/finance/payment_providers/adyen.rst:120 +#: ../../content/applications/finance/payment_providers/adyen.rst:137 #: ../../content/applications/finance/payment_providers/authorize.rst:43 #: ../../content/applications/finance/payment_providers/stripe.rst:124 msgid "Place a hold on a card" msgstr "" -#: ../../content/applications/finance/payment_providers/adyen.rst:122 +#: ../../content/applications/finance/payment_providers/adyen.rst:139 msgid "Adyen allows you to capture an amount manually instead of having an immediate capture." msgstr "" -#: ../../content/applications/finance/payment_providers/adyen.rst:124 +#: ../../content/applications/finance/payment_providers/adyen.rst:141 msgid "To set it up, enable the **Capture Amount Manually** option on Odoo, as explained in the :ref:`payment providers documentation `." msgstr "" -#: ../../content/applications/finance/payment_providers/adyen.rst:127 +#: ../../content/applications/finance/payment_providers/adyen.rst:144 msgid "Then, open your Adyen Merchant Account, go to :menuselection:`Account --> Settings`, and set the **Capture Delay** to **manual**." msgstr "" @@ -21993,15 +22492,15 @@ msgstr "" msgid "Capture Delay settings in Adyen" msgstr "" -#: ../../content/applications/finance/payment_providers/adyen.rst:135 +#: ../../content/applications/finance/payment_providers/adyen.rst:152 msgid "If you configure Odoo to capture amounts manually, make sure to set the **Capture Delay** to **manual** on Adyen. Otherwise, the transaction will be blocked in the authorized state in Odoo." msgstr "" -#: ../../content/applications/finance/payment_providers/adyen.rst:138 +#: ../../content/applications/finance/payment_providers/adyen.rst:155 msgid "Odoo doesn't support the partial capture yet. Be aware that if you make a partial capture from Adyen's interface, Odoo will manage it as if it was a full capture." msgstr "" -#: ../../content/applications/finance/payment_providers/adyen.rst:142 +#: ../../content/applications/finance/payment_providers/adyen.rst:159 msgid "After **7 days**, if the transaction hasn't been captured yet, the customer has the right to **revoke** it." msgstr "" @@ -22543,7 +23042,7 @@ msgid "To allow your customers to save their credit card credentials for future msgstr "" #: ../../content/applications/finance/payment_providers/ogone.rst:103 -#: ../../content/applications/finance/payment_providers/paypal.rst:11 +#: ../../content/applications/finance/payment_providers/paypal.rst:90 msgid "Settings in Odoo" msgstr "" @@ -22552,158 +23051,170 @@ msgid "To set up Ogone in Odoo, head to :menuselection:`Accounting --> Configura msgstr "" #: ../../content/applications/finance/payment_providers/paypal.rst:3 -msgid "Paypal" +msgid "PayPal" msgstr "" #: ../../content/applications/finance/payment_providers/paypal.rst:5 -msgid "`Paypal `_ is available and popular worldwide. It doesn't charge any subscription fee, and creating an account is very easy. That's why we recommend it for starters in Odoo. It works as a seamless flow where the customer is routed to the Paypal website to register the payment." +msgid "`Paypal `_ is an American online payment provider available worldwide, and one of the few that does not charge a subscription fee." +msgstr "" + +#: ../../content/applications/finance/payment_providers/paypal.rst:9 +msgid "Settings in PayPal" +msgstr "" + +#: ../../content/applications/finance/payment_providers/paypal.rst:11 +msgid "To access your PayPal account settings, log into PayPal, open the :guilabel:`Account Settings`, and open the :guilabel:`Website payments` menu." +msgstr "" + +#: ../../content/applications/finance/payment_providers/paypal.rst:-1 +msgid "PayPal account menu" msgstr "" #: ../../content/applications/finance/payment_providers/paypal.rst:19 -msgid "Odoo needs your **API Credentials** to connect with your PayPal account, which comprise:" +msgid "Note that for PayPal to work **in Odoo**, the options :ref:`Auto Return `, :ref:`PDT `, and :ref:`IPN ` **must** all be enabled." msgstr "" -#: ../../content/applications/finance/payment_providers/paypal.rst:21 -msgid "**Email**: your login email address in Paypal." +#: ../../content/applications/finance/payment_providers/paypal.rst:25 +msgid "Auto Return" msgstr "" -#: ../../content/applications/finance/payment_providers/paypal.rst:22 -msgid "**PDT Identity Token**: the key used to verify the authenticity of transactions." +#: ../../content/applications/finance/payment_providers/paypal.rst:27 +msgid "The **Auto Return** feature automatically redirects customers to Odoo once the payment is processed." msgstr "" -#: ../../content/applications/finance/payment_providers/paypal.rst:23 -msgid "**Use IPN**: whether you want to use Instant Payment Notification. Already checked, you don't have to change it." +#: ../../content/applications/finance/payment_providers/paypal.rst:29 +msgid "From :guilabel:`Website payments`, go to :menuselection:`Website preferences --> Update --> Auto return for website payments --> Auto return` and select :guilabel:`On`. Enter the address of your Odoo database (e.g., `https://yourcompany.odoo.com`) in the :guilabel:`Return URL` field, and :guilabel:`Save`." msgstr "" -#: ../../content/applications/finance/payment_providers/paypal.rst:26 -msgid "You can copy your credentials from your Paypal account and paste them into the related fields under the **Credentials** tab." +#: ../../content/applications/finance/payment_providers/paypal.rst:35 +msgid "Any URL does the job. Odoo only needs the setting to be enabled since it uses another URL." msgstr "" -#: ../../content/applications/finance/payment_providers/paypal.rst:30 -msgid "To set the **PDT Identity Token**, switch to :ref:`developer mode ` and retrieve the token by following the configuration step :ref:`paypal/enable-pdt`." +#: ../../content/applications/finance/payment_providers/paypal.rst:40 +msgid "Payment Data Transfer (PDT)" msgstr "" -#: ../../content/applications/finance/payment_providers/paypal.rst:34 -msgid "If you are trying Paypal as a test, using a :ref:`Paypal Sandbox account `, change the **State** to *Test Mode*. We recommend doing this on a test Odoo database rather than on your main database." +#: ../../content/applications/finance/payment_providers/paypal.rst:42 +msgid ":abbr:`PDT (Payment Data Transfer)` allows to receive payment confirmations, displays the payment status to the customers, and verifies the authenticity of the payments. From :menuselection:`Website preferences --> Update`, scroll down to :guilabel:`Payment data transfer` and select :guilabel:`On`." msgstr "" -#: ../../content/applications/finance/payment_providers/paypal.rst:39 -msgid "Fees tab" +#: ../../content/applications/finance/payment_providers/paypal.rst:47 +msgid "PayPal displays your **PDT Identity Token** as soon as :ref:`Auto return ` and :ref:`Payment Data Transfer (PDT) ` are enabled. If you need the **PDT Identity Token**, disable and re-enable :guilabel:`Payment data transfer` to display the token again." msgstr "" -#: ../../content/applications/finance/payment_providers/paypal.rst:41 -msgid "You can charge extra fees to your customers for paying with Paypal to cover the transaction fees Paypal charges you. Once redirected to Paypal, your customer sees an extra amount applied to the order amount." +#: ../../content/applications/finance/payment_providers/paypal.rst:54 +msgid "Instant Payment Notification (IPN)" msgstr "" -#: ../../content/applications/finance/payment_providers/paypal.rst:45 -msgid "To activate this, go to Paypal configuration's :guilabel:`Fees` tab in Odoo and activate :guilabel:`Add Extra Fees`." -msgstr "" - -#: ../../content/applications/finance/payment_providers/paypal.rst:48 -msgid "You can refer to `Paypal Fees `_ to set up fees." -msgstr "" - -#: ../../content/applications/finance/payment_providers/paypal.rst:51 -msgid "`Traders in the EU `_ are not allowed to charge extra fees for paying with credit cards." -msgstr "" - -#: ../../content/applications/finance/payment_providers/paypal.rst:55 -msgid "Settings in Paypal" -msgstr "" - -#: ../../content/applications/finance/payment_providers/paypal.rst:57 -msgid "First, set up your Paypal account to build a seamless customer experience with Odoo." -msgstr "" - -#: ../../content/applications/finance/payment_providers/paypal.rst:59 -msgid "Log into your PayPal account and open the account settings. Then, go to :menuselection:`Account menu --> Account settings --> Website payments`." +#: ../../content/applications/finance/payment_providers/paypal.rst:56 +msgid ":abbr:`IPN (Instant Payment Notifications)` is similar to **PDT**, but allows for more notifications, such as chargeback notifications. To enable **IPN**, go to :menuselection:`Website payments --> Instant payment notifications --> Update` and click :guilabel:`Choose IPN settings`. Enter a :guilabel:`Notification URL`, select :guilabel:`Receive IPN messages (Enabled)`, and :guilabel:`Save`." msgstr "" #: ../../content/applications/finance/payment_providers/paypal.rst:63 -msgid "Enable Auto Return" +msgid "PayPal Account Optional" msgstr "" #: ../../content/applications/finance/payment_providers/paypal.rst:65 -msgid "The *Auto Return* feature automatically redirects your customers to Odoo once the payment is processed." +msgid "We advise not to prompt customers to log in with a PayPal account upon payment. It is better and more accessible for customers to pay with a debit/credit card. To disable that prompt, go to :menuselection:`Account Settings --> Website payments --> Update` and select :guilabel:`On` for :guilabel:`PayPal account optional`." msgstr "" -#: ../../content/applications/finance/payment_providers/paypal.rst:68 -msgid "From the *Website payments* settings page, go to :menuselection:`Website preferences --> Update --> Auto return for website payments` and select **On**. Enter the address of your Odoo database (e.g., `https://yourcompany.odoo.com`) in the **Return URL** field." -msgstr "" - -#: ../../content/applications/finance/payment_providers/paypal.rst:73 -msgid "Any URL will do the job. Odoo only needs the setting to be enabled since it uses another URL." -msgstr "" - -#: ../../content/applications/finance/payment_providers/paypal.rst:78 -msgid "Enable Payment Data Transfer (PDT)" -msgstr "" - -#: ../../content/applications/finance/payment_providers/paypal.rst:80 -msgid "Enable the *Payment Data Transfer* feature to receive payment confirmations immediately. This feature also displays the payment status to the customers and verifies the authenticity of the payments." -msgstr "" - -#: ../../content/applications/finance/payment_providers/paypal.rst:84 -msgid "From the *Website payments* settings page, go to :menuselection:`Website preferences --> Update --> Payment data transfer` and select **On**. PayPal displays your **PDT Identity Token** as soon as the change is saved." -msgstr "" - -#: ../../content/applications/finance/payment_providers/paypal.rst:89 -msgid "Paypal Account Optional" -msgstr "" - -#: ../../content/applications/finance/payment_providers/paypal.rst:91 -msgid "We advise you to not prompt customers to log in with a Paypal account when they get to pay. Let them pay with debit/credit cards as well, or you might lose some deals. Make sure this setting is turned on." -msgstr "" - -#: ../../content/applications/finance/payment_providers/paypal.rst:96 +#: ../../content/applications/finance/payment_providers/paypal.rst:71 msgid "Payment Messages Format" msgstr "" -#: ../../content/applications/finance/payment_providers/paypal.rst:98 -msgid "Suppose you use accented characters (or anything else than primary Latin characters) for your customer names or addresses. In that case, you **must** configure the encoding format of the payment request sent by Odoo to Paypal. Otherwise, some transactions fail without notice." +#: ../../content/applications/finance/payment_providers/paypal.rst:73 +msgid "If you use accented characters (or anything other than primary Latin characters) for customer names or addresses, then you **must** configure the encoding format of the payment request sent by Odoo to PayPal. If you do not, some transactions fail without notice." msgstr "" -#: ../../content/applications/finance/payment_providers/paypal.rst:102 -msgid "To do so, go to `your production account `_. Then, click *More Options* and set the two default encoding formats as **UTF-8**." +#: ../../content/applications/finance/payment_providers/paypal.rst:77 +msgid "To do so, go to `your production account `_. Then, click :guilabel:`More Options` and set the two default encoding formats as :guilabel:`UTF-8`." msgstr "" -#: ../../content/applications/finance/payment_providers/paypal.rst:106 -msgid "Your Paypal account is ready!" -msgstr "" - -#: ../../content/applications/finance/payment_providers/paypal.rst:109 +#: ../../content/applications/finance/payment_providers/paypal.rst:82 msgid "For Encrypted Website Payments & EWP_SETTINGS error, please check the `Paypal documentation `_." msgstr "" -#: ../../content/applications/finance/payment_providers/paypal.rst:112 +#: ../../content/applications/finance/payment_providers/paypal.rst:85 msgid "Configure your :ref:`Paypal Sandbox account `, then follow this `link `_ to configure the encoding format in a test environment." msgstr "" -#: ../../content/applications/finance/payment_providers/paypal.rst:119 -msgid "Test environment" +#: ../../content/applications/finance/payment_providers/paypal.rst:96 +msgid "Credentials" msgstr "" -#: ../../content/applications/finance/payment_providers/paypal.rst:124 -msgid "Thanks to Paypal Sandbox accounts, you can test the entire payment flow in Odoo." +#: ../../content/applications/finance/payment_providers/paypal.rst:98 +msgid "Odoo needs your **API Credentials** to connect with your PayPal account. To do so, go to :menuselection:`Accounting --> Configuration --> Payment Providers` and :guilabel:`Activate` PayPal. Then, enter your PayPal account credentials in the :guilabel:`Credentials` tab:" +msgstr "" + +#: ../../content/applications/finance/payment_providers/paypal.rst:102 +msgid ":guilabel:`Email`: the login email address in Paypal;" +msgstr "" + +#: ../../content/applications/finance/payment_providers/paypal.rst:103 +msgid ":guilabel:`PDT Identity Token`: the key used to verify the authenticity of transactions;" +msgstr "" + +#: ../../content/applications/finance/payment_providers/paypal.rst:104 +msgid ":guilabel:`Use IPN`: enable for PayPal to work properly in Odoo." +msgstr "" + +#: ../../content/applications/finance/payment_providers/paypal.rst:107 +msgid "Save the :guilabel:`PDT Identity Token` for later use." +msgstr "" + +#: ../../content/applications/finance/payment_providers/paypal.rst:109 +msgid "To set the :guilabel:`PDT Identity Token`, switch to :ref:`developer mode ` and retrieve the token by following the configuration steps at :ref:`paypal/pdt`." +msgstr "" + +#: ../../content/applications/finance/payment_providers/paypal.rst:113 +msgid "The PayPal **Merchant ID** is not required in Odoo." +msgstr "" + +#: ../../content/applications/finance/payment_providers/paypal.rst:115 +msgid "If you are trying PayPal as a test, using a :ref:`PayPal Sandbox account `, change the :guilabel:`State` to :guilabel:`Test Mode`. We recommend doing this on a test Odoo database rather than on your main database." +msgstr "" + +#: ../../content/applications/finance/payment_providers/paypal.rst:120 +msgid "Extra fees" +msgstr "" + +#: ../../content/applications/finance/payment_providers/paypal.rst:122 +msgid "You can charge :ref:`extra fees ` to customers choosing to pay with PayPal in order to cover the transaction fees PayPal charges you." msgstr "" #: ../../content/applications/finance/payment_providers/paypal.rst:126 -msgid "Log into the `Paypal Developer Site `_ using your Paypal credentials, which creates two sandbox accounts:" +msgid "You can refer to `Paypal Fees `_ to set up fees." msgstr "" -#: ../../content/applications/finance/payment_providers/paypal.rst:129 -msgid "A business account (to use as merchants, e.g., `pp.merch01-facilitator@example.com `_)." +#: ../../content/applications/finance/payment_providers/paypal.rst:128 +msgid "`Traders in the EU `_ are not allowed to charge extra fees for paying with credit cards." msgstr "" -#: ../../content/applications/finance/payment_providers/paypal.rst:131 -msgid "A default personal account (to use as shoppers, e.g., `pp.merch01-buyer@example.com `_)." -msgstr "" - -#: ../../content/applications/finance/payment_providers/paypal.rst:134 -msgid "Log into Paypal Sandbox using the merchant account and follow the same configuration instructions. Enter your sandbox credentials in Odoo and ensure Paypal is set on *Test Mode*. We recommend doing this on a test Odoo database rather than your main database." +#: ../../content/applications/finance/payment_providers/paypal.rst:133 +msgid "Test environment" msgstr "" #: ../../content/applications/finance/payment_providers/paypal.rst:138 +msgid "Thanks to PayPal sandbox accounts, you can test the entire payment flow in Odoo." +msgstr "" + +#: ../../content/applications/finance/payment_providers/paypal.rst:140 +msgid "Log into the `Paypal Developer Site `_ using your PayPal credentials, which creates two sandbox accounts:" +msgstr "" + +#: ../../content/applications/finance/payment_providers/paypal.rst:143 +msgid "A business account (to use as merchants, e.g., `pp.merch01-facilitator@example.com `_);" +msgstr "" + +#: ../../content/applications/finance/payment_providers/paypal.rst:145 +msgid "A default personal account (to use as shoppers, e.g., `pp.merch01-buyer@example.com `_)." +msgstr "" + +#: ../../content/applications/finance/payment_providers/paypal.rst:148 +msgid "Log into PayPal sandbox using the merchant account and follow the same configuration instructions. Enter your sandbox credentials in Odoo (:menuselection:`Accounting --> Configuration --> Payment Providers --> PayPal` in the :guilabel:`Credentials` tab, and make sure the status is set on :guilabel:`Test Mode`. We recommend doing this on a test Odoo database rather than your main database." +msgstr "" + +#: ../../content/applications/finance/payment_providers/paypal.rst:154 msgid "Run a test transaction from Odoo using the sandbox personal account." msgstr "" @@ -23067,39 +23578,75 @@ msgid "This operation must be repeated whenever your web domain changes." msgstr "" #: ../../content/applications/finance/payment_providers/wire_transfer.rst:3 -msgid "How to get paid with wire transfers" +msgid "Wire transfers" msgstr "" #: ../../content/applications/finance/payment_providers/wire_transfer.rst:5 -msgid "**Wire Transfer** is the default payment method available. The aim is providing your customers with your bank details so they can pay on their own. This is very easy to start with but slow and inefficient process-wise. Opt for payment providers as soon as you can!" +msgid "The **Wire transfer** payment method allows you to provide payment instructions to your customers, such as the bank details and communication. They are displayed:" msgstr "" -#: ../../content/applications/finance/payment_providers/wire_transfer.rst:10 -msgid "How to provide customers with payment instructions" +#: ../../content/applications/finance/payment_providers/wire_transfer.rst:8 +msgid "at the end of the checkout process, once the customer has selected :guilabel:`Wire transfer` as a payment method and clicked the :guilabel:`Pay now` button:" msgstr "" -#: ../../content/applications/finance/payment_providers/wire_transfer.rst:12 -msgid "Put your payment instructions in the **Thanks Message** of your payment method." +#: ../../content/applications/finance/payment_providers/wire_transfer.rst:0 +msgid "Payment instructions at checkout" msgstr "" -#: ../../content/applications/finance/payment_providers/wire_transfer.rst:17 -msgid "They will appear to the customers when they place an order." +#: ../../content/applications/finance/payment_providers/wire_transfer.rst:14 +msgid "on the customer portal:" msgstr "" -#: ../../content/applications/finance/payment_providers/wire_transfer.rst:23 -msgid "How to manage an order once you get paid" +#: ../../content/applications/finance/payment_providers/wire_transfer.rst:0 +msgid "Payment instructions on the customer portal" msgstr "" -#: ../../content/applications/finance/payment_providers/wire_transfer.rst:25 -msgid "Whenever a customer pays by wire transfer, the order stays in an intermediary stage **Quotation Sent** (i.e. unpaid order). When you get paid, you confirm the order manually to launch the delivery." +#: ../../content/applications/finance/payment_providers/wire_transfer.rst:20 +msgid "While this method is very accessible and requires minimal setup, it is very inefficient process-wise. We recommend setting up a :doc:`payment provider <../payment_providers>` instead." msgstr "" -#: ../../content/applications/finance/payment_providers/wire_transfer.rst:30 -msgid "How to create other manual payment methods" +#: ../../content/applications/finance/payment_providers/wire_transfer.rst:22 +msgid "Online orders remain in the :guilabel:`Quotation sent` (i.e., unpaid order) stage until you receive the payment and :guilabel:`Confirm` the order." +msgstr "" + +#: ../../content/applications/finance/payment_providers/wire_transfer.rst:26 +msgid "**Wire transfer** can be used as a template for other payment methods that are processed manually, such as checks, by renaming or duplicating it." msgstr "" #: ../../content/applications/finance/payment_providers/wire_transfer.rst:32 -msgid "If you manage a B2B business, you can create other manually-processed payment methods like paying by check. To do so, just rename *Wire Transfer* or duplicate it." +msgid "To configure **Wire Transfer**, go to :menuselection:`Accounting / Website --> Configuration --> Payment Providers`, and open the :guilabel:`Wire Transfer` card. Then, in the :guilabel:`Configuration` tab:" +msgstr "" + +#: ../../content/applications/finance/payment_providers/wire_transfer.rst:36 +msgid "Select the :guilabel:`Communication` to be used;" +msgstr "" + +#: ../../content/applications/finance/payment_providers/wire_transfer.rst:38 +msgid ":guilabel:`Based on Document Reference`: sales order or invoice number" +msgstr "" + +#: ../../content/applications/finance/payment_providers/wire_transfer.rst:39 +msgid ":guilabel:`Based on Customer ID`: customer identifier" +msgstr "" + +#: ../../content/applications/finance/payment_providers/wire_transfer.rst:41 +msgid "Tick the :guilabel:`Enable QR codes` check box to activate :doc:`QR code payments <../accounting/customer_invoices/epc_qr_code>`." +msgstr "" + +#: ../../content/applications/finance/payment_providers/wire_transfer.rst:44 +msgid "Define the payment instructions in the :guilabel:`Messages` tab:" +msgstr "" + +#: ../../content/applications/finance/payment_providers/wire_transfer.rst:-1 +msgid "Define payment instructions" +msgstr "" + +#: ../../content/applications/finance/payment_providers/wire_transfer.rst:49 +msgid "If you have already defined :doc:`a bank account <../accounting/bank>`, the account number will be automatically added to the default message generated by Odoo. You can also add it afterwards and update the message by clicking :guilabel:`Reload pending message`." +msgstr "" + +#: ../../content/applications/finance/payment_providers/wire_transfer.rst:54 +msgid ":ref:`payment_providers/journal`" msgstr "" #: ../../content/applications/finance/sign.rst:3 diff --git a/locale/sources/inventory_and_mrp.pot b/locale/sources/inventory_and_mrp.pot index 348dad79c..fec9d86bc 100644 --- a/locale/sources/inventory_and_mrp.pot +++ b/locale/sources/inventory_and_mrp.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: Odoo saas-16.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-06-03 06:55+0000\n" +"POT-Creation-Date: 2023-06-20 08:18+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -1098,7 +1098,7 @@ msgid "Manage serial numbers for shipping and receiving" msgstr "" #: ../../content/applications/inventory_and_mrp/inventory/management/lots_serial_numbers/serial_numbers.rst:95 -msgid "Serial numbers can be assigned for both **incoming** and **outgoing** goods. For incoming goods, lot numbers are assigned directly on the purchase order form. For outgoing goods, lot numbers are assigned directly on the sales order form." +msgid "Serial numbers can be assigned for both **incoming** and **outgoing** goods. For incoming goods, serial numbers are assigned directly on the purchase order form. For outgoing goods, serial numbers are assigned directly on the sales order form." msgstr "" #: ../../content/applications/inventory_and_mrp/inventory/management/lots_serial_numbers/serial_numbers.rst:100 @@ -2426,38 +2426,42 @@ msgid ":doc:`Using the inventory valuation Reporting --> Balance Sheet`. At the top of the dashboard, change the :guilabel:`As of` field value to :guilabel:`Today`, and adjust the filtering :guilabel:`Options` to :guilabel:`Unfold All` in order to see all of the latest data displayed, all at once." msgstr "" -#: ../../content/applications/inventory_and_mrp/inventory/management/reporting/inventory_valuation_config.rst:122 +#: ../../content/applications/inventory_and_mrp/inventory/management/reporting/inventory_valuation_config.rst:128 msgid "Under the parent :guilabel:`Current Assets` line item, look for the nested :guilabel:`Stock Valuation Account` line item, where the total valuation of all of the inventory on hand is displayed." msgstr "" -#: ../../content/applications/inventory_and_mrp/inventory/management/reporting/inventory_valuation_config.rst:126 +#: ../../content/applications/inventory_and_mrp/inventory/management/reporting/inventory_valuation_config.rst:132 msgid "Access more specific information with the :guilabel:`Stock Valuation Account` drop-down menu, by selecting either the :guilabel:`General Ledger` to see an itemized view of all of the journal entries, or by selecting :guilabel:`Journal Items` to review all of the individualized journal entries that were submitted to the account. As well, annotations to the :guilabel:`Balance Sheet` can be added by choosing :guilabel:`Annotate`, filling in the text box, and clicking :guilabel:`Save`." msgstr "" @@ -3038,7 +3042,7 @@ msgid "Configure multi-step routes" msgstr "" #: ../../content/applications/inventory_and_mrp/inventory/management/shipments_deliveries/receipts_delivery_two_steps.rst:34 -msgid "First, make sure the :guilabel:`Multi-Step Routes` option is enabled in :menuselection:`Inventory --> Configuration --> Settings`, under the ::guilabel:`Warehouse` heading. After enabling the setting, :guilabel:`Save` the changes." +msgid "First, make sure the :guilabel:`Multi-Step Routes` option is enabled in :menuselection:`Inventory --> Configuration --> Settings`, under the :guilabel:`Warehouse` heading. After enabling the setting, :guilabel:`Save` the changes." msgstr "" #: ../../content/applications/inventory_and_mrp/inventory/management/shipments_deliveries/receipts_delivery_two_steps.rst:39 @@ -3058,7 +3062,7 @@ msgid "Set incoming and outgoing shipment options to receive and deliver in two msgstr "" #: ../../content/applications/inventory_and_mrp/inventory/management/shipments_deliveries/receipts_delivery_two_steps.rst:59 -msgid "Activating two-step receipts and deliveries will create new *input* and *output* locations, which by default, are labeled :guilabel:`WH/Input` and :guilabel:`WH/Output`, respectively, on the :guilabel:`Locations` dashboard. To rename these locations, go to :menuselection:`Configuration --> Locations`, select the :guilabel:`Location` to change, and then click :guilabel:`Edit`. On the location form, update the ::guilabel:`Location Name`, make any other changes (if necessary) and :guilabel:`Save` the changes." +msgid "Activating two-step receipts and deliveries will create new *input* and *output* locations, which by default, are labeled :guilabel:`WH/Input` and :guilabel:`WH/Output`, respectively, on the :guilabel:`Locations` dashboard. To rename these locations, go to :menuselection:`Configuration --> Locations`, select the :guilabel:`Location` to change, and then click :guilabel:`Edit`. On the location form, update the :guilabel:`Location Name`, make any other changes (if necessary) and :guilabel:`Save` the changes." msgstr "" #: ../../content/applications/inventory_and_mrp/inventory/management/shipments_deliveries/receipts_delivery_two_steps.rst:67 @@ -3066,11 +3070,11 @@ msgid "Process a receipt in two steps (input + stock)" msgstr "" #: ../../content/applications/inventory_and_mrp/inventory/management/shipments_deliveries/receipts_delivery_two_steps.rst:78 -msgid "For businesses with multiple warehouses that have different step configurations, the :guilabel:`Deliver To` field on the ::abbr:`PO (Purchase Order)` form may need to be specifed as the correct *input location* connected to the two-step warehouse, which can be done by selecting the warehouse from the drop-down selection that includes the `Receipts` label at the end of the name." +msgid "For businesses with multiple warehouses that have different step configurations, the :guilabel:`Deliver To` field on the :abbr:`PO (Purchase Order)` form may need to be specified as the correct *input location* connected to the two-step warehouse, which can be done by selecting the warehouse from the drop-down selection that includes the `Receipts` label at the end of the name." msgstr "" #: ../../content/applications/inventory_and_mrp/inventory/management/shipments_deliveries/receipts_delivery_two_steps.rst:84 -msgid "After confirming the ::abbr:`PO (Purchase Order)`, a :guilabel:`Receipt` smart button will appear in the top-right corner of the :abbr:`PO (Purchase Order)` form ā€” click it to reveal the associated receipt." +msgid "After confirming the :abbr:`PO (Purchase Order)`, a :guilabel:`Receipt` smart button will appear in the top-right corner of the :abbr:`PO (Purchase Order)` form ā€” click it to reveal the associated receipt." msgstr "" #: ../../content/applications/inventory_and_mrp/inventory/management/shipments_deliveries/receipts_delivery_two_steps.rst:-1 @@ -3121,11 +3125,11 @@ msgid "Process a delivery order in two steps (pick + ship)" msgstr "" #: ../../content/applications/inventory_and_mrp/inventory/management/shipments_deliveries/receipts_delivery_two_steps.rst:145 -msgid "In the :menuselection:`Sales` application, create a new quote by clicking :guilabel:`Create`. Select (or create) a :guilabel:`Customer`, add a storable :guilabel:`Product` to the order lines, and then click :guilabel:`Confirm`." +msgid "In the :menuselection:`Sales` application, create a new quote by clicking :guilabel:`Create`. Select or create a :guilabel:`Customer`, add a storable :guilabel:`Product` to the order lines, and then click :guilabel:`Confirm`." msgstr "" #: ../../content/applications/inventory_and_mrp/inventory/management/shipments_deliveries/receipts_delivery_two_steps.rst:149 -msgid "After confirming the ::abbr:`SO (Sales Order)`, a :guilabel:`Receipt` smart button will appear in the top-right corner of the :abbr:`PO (Sales Order)` form ā€” click it to reveal the associated receipt." +msgid "After confirming the :abbr:`SO (Sales Order)`, a :guilabel:`Delivery` smart button will appear in the top-right corner of the :abbr:`SO (Sales Order)` form. Click it to reveal the associated delivery forms." msgstr "" #: ../../content/applications/inventory_and_mrp/inventory/management/shipments_deliveries/receipts_delivery_two_steps.rst:-1 @@ -3146,7 +3150,7 @@ msgid "Process the picking" msgstr "" #: ../../content/applications/inventory_and_mrp/inventory/management/shipments_deliveries/receipts_delivery_two_steps.rst:170 -msgid "The picking and delivery order will be created once the sales order is confirmed. When the :guilabel:`Delivery` smart button appears, click it to arrive to the :guilabel:`Transfers` dashboard, which lists both the picking and the delivery orders." +msgid "The picking and delivery order will be created once the sales order is confirmed. When the :guilabel:`Delivery` smart button appears, click it to reveal the :guilabel:`Transfers` dashboard, which lists both the picking and the delivery orders." msgstr "" #: ../../content/applications/inventory_and_mrp/inventory/management/shipments_deliveries/receipts_delivery_two_steps.rst:174 @@ -3167,7 +3171,7 @@ msgid "The delivery order will be ready to be processed once the picking is comp msgstr "" #: ../../content/applications/inventory_and_mrp/inventory/management/shipments_deliveries/receipts_delivery_two_steps.rst:203 -msgid "The delivery order associated with the :abbr:`SO (Sales Order)` can also be quickly accessed by clicking on the ::guilabel:`Delivery` smart button again, and choosing the delivery order on the ::guilabel:`Transfers` page (which should now be marked as ::guilabel:`Ready`)." +msgid "The delivery order associated with the :abbr:`SO (Sales Order)` can also be quickly accessed by clicking on the :guilabel:`Delivery` smart button again, and choosing the delivery order on the :guilabel:`Transfers` page (which should now be marked as :guilabel:`Ready`)." msgstr "" #: ../../content/applications/inventory_and_mrp/inventory/management/shipments_deliveries/receipts_delivery_two_steps.rst:-1 diff --git a/locale/sources/legal.pot b/locale/sources/legal.pot index a70ea61c2..bf46873a8 100644 --- a/locale/sources/legal.pot +++ b/locale/sources/legal.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: Odoo saas-16.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-06-03 06:55+0000\n" +"POT-Creation-Date: 2023-06-20 08:18+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -4955,58 +4955,58 @@ msgid "Conditions GĆ©nĆ©rales de Vente" msgstr "" #: ../../content/legal/terms/i18n/terms_of_sale_fr.rst:9 -msgid "`Download PDF `_" +msgid "`Download PDF `_" msgstr "" -#: ../../content/legal/terms/i18n/terms_of_sale_fr.rst:10 +#: ../../content/legal/terms/i18n/terms_of_sale_fr.rst:11 msgid "DerniĆØre modification: 20 octobre 2021." msgstr "" -#: ../../content/legal/terms/i18n/terms_of_sale_fr.rst:12 +#: ../../content/legal/terms/i18n/terms_of_sale_fr.rst:13 msgid "Ces conditions rĆ©gissent la vente de produits et services entre Odoo S.A. et ses filiales (collectivement, \"Odoo S.A.\") et le client. Des conditions supplĆ©mentaires peuvent s'appliquer pour d'autres services offerts par Odoo S.A. (par exemple, l'Odoo Enterprise Subscription Agreement). Si ces conditions supplĆ©mentaires entrent en contradiction avec les Conditions GĆ©nĆ©rales de Vente, les conditions supplĆ©mentaires prĆ©vaudront." msgstr "" -#: ../../content/legal/terms/i18n/terms_of_sale_fr.rst:19 +#: ../../content/legal/terms/i18n/terms_of_sale_fr.rst:20 msgid "Veuillez lire ces conditions attentivement avant de faire une commande auprĆØs d'Odoo S.A. En commandant auprĆØs d'Odoo S.A., le client marque son accord avec les prĆ©sentes conditions." msgstr "" -#: ../../content/legal/terms/i18n/terms_of_sale_fr.rst:23 +#: ../../content/legal/terms/i18n/terms_of_sale_fr.rst:24 msgid "Le client renonce explicitement Ć  ses propres conditions gĆ©nĆ©rales, mĆŖme dans le cas oĆ¹ celles-ci seraient postĆ©rieures aux prĆ©sentes conditions gĆ©nĆ©rales. Toute dĆ©rogation doit, pour ĆŖtre valable, ĆŖtre convenue de maniĆØre expresse, prĆ©alable et par Ć©crit. Les prĆ©sentes conditions sont une prolongation du contrat signĆ© entre parties et font en tant que telles partie intĆ©grante de la relation contractuelle entre parties." msgstr "" -#: ../../content/legal/terms/i18n/terms_of_sale_fr.rst:30 +#: ../../content/legal/terms/i18n/terms_of_sale_fr.rst:31 msgid "Toutes les offres, tarifs ou listes de prix dā€™Odoo S.A. sā€™entendent, sauf stipulation contraire, sans engagement. Sauf stipulation contraire, toutes les factures sont payables Ć  Odoo S.A. au comptant, au moment de la livraison. L'endroit de paiement est le siĆØge social de Odoo S.A. peut envoyer des factures pour des marchandises dĆ©jĆ  livrĆ©es mĆŖme avant la livraison complĆØte des marchandises. Le Client ne peut en aucun cas compenser une quelconque crĆ©ance sur Odoo S.A. avec son obligation de paiement, sauf stipulation contraire." msgstr "" -#: ../../content/legal/terms/i18n/terms_of_sale_fr.rst:38 +#: ../../content/legal/terms/i18n/terms_of_sale_fr.rst:39 msgid "Si la facture nā€™est pas payĆ©e Ć  son Ć©chĆ©ance, elle sera, Ć  titre dā€™indemnitĆ© forfaitaire, majorĆ©e de 15% et majorĆ©e d'autres indemnitĆ©s, Ć©ventuellement dues pour tout prĆ©judice, Ć  dĆ©montrer par Odoo S.A.. Le non-paiement de tout ou partie dā€™une facture Ć  son Ć©chĆ©ance rend immĆ©diatement exigibles toutes sommes ou toutes factures dues non-encore Ć©chue. En cas de non-paiement dā€™une facture, Odoo S.A. Ā a le droit de rompre toutes les conventions de vente qui restent encore Ć  exĆ©cuter." msgstr "" -#: ../../content/legal/terms/i18n/terms_of_sale_fr.rst:46 +#: ../../content/legal/terms/i18n/terms_of_sale_fr.rst:47 msgid "Si le Client est autorisĆ© Ć  effectuer des paiements Ć  terme, lā€™absence de paiement dā€™un seul terme entraĆ®nera de plein droit et sans mise en demeure lā€™exigibilitĆ© de toute la dette, nonobstant toute indemnitĆ© supplĆ©mentaire." msgstr "" -#: ../../content/legal/terms/i18n/terms_of_sale_fr.rst:50 +#: ../../content/legal/terms/i18n/terms_of_sale_fr.rst:51 msgid "Certains pays appliquent une retenue Ć  la source sur le montant de la facture, conformĆ©ment Ć  leur lĆ©gislation interne. La retenue Ć  la source sera rĆ©glĆ©e par le client, auprĆØs de l'administration fiscale. En aucun cas, Odoo S.A. ne sera impliquĆ©e dans les coĆ»ts liĆ©s Ć  la lĆ©gislation du pays. Le montant de la facture est donc dĆ» Ć  Odoo S.A. dans son intĆ©gralitĆ© et nā€™inclus pas les coĆ»ts relatifs Ć  la lĆ©gislation du pays oĆ¹ se trouve le client. Pour les clients implantĆ©s dans plusieurs pays, les prix applicables seront toujours basĆ©s sur l'implantation gĆ©ographique ayant la liste de prix la plus Ć©levĆ©e, sauf stipulation contraire par Ć©crit au moment de la commande." msgstr "" -#: ../../content/legal/terms/i18n/terms_of_sale_fr.rst:60 +#: ../../content/legal/terms/i18n/terms_of_sale_fr.rst:61 msgid "Odoo S.A. s'engage Ć  faire ses meilleurs efforts en vue de fournir en temps utile des services performants. Toutefois, aucune de ses obligations ne peut ĆŖtre considĆ©rĆ©e comme Ć©tant une obligation de rĆ©sultat. Odoo S.A. ne peut, en aucun cas, ĆŖtre appelĆ©e en garantie par le client dans le cadre de demandes en dommages et intĆ©rĆŖts formulĆ©e par le consommateur final Ć  l'encontre du client." msgstr "" -#: ../../content/legal/terms/i18n/terms_of_sale_fr.rst:66 +#: ../../content/legal/terms/i18n/terms_of_sale_fr.rst:67 msgid "Dans la limite autorisĆ©e par la loi, la responsabilitĆ© globale de chaque partie, ainsi que de ses filiales ne dĆ©passera pas 50% du montant total rĆ©glĆ© par le Client en vertu des prĆ©sentes conditions au cours des 12 mois prĆ©cĆ©dant la date de l'Ć©vĆ©nement donnant lieu Ć  une telle rĆ©clamation. Des rĆ©clamations multiples n'augmenteront pas cette limite." msgstr "" -#: ../../content/legal/terms/i18n/terms_of_sale_fr.rst:72 +#: ../../content/legal/terms/i18n/terms_of_sale_fr.rst:73 msgid "Toute rĆ©clamation doit, pour ĆŖtre recevable, ĆŖtre notifiĆ©e Ć  Odoo S.A., Ć  son siĆØge social, par courrier recommandĆ© dans les 8 jours suivant la livraison des marchandises ou la prestation des services." msgstr "" -#: ../../content/legal/terms/i18n/terms_of_sale_fr.rst:76 +#: ../../content/legal/terms/i18n/terms_of_sale_fr.rst:77 msgid "Odoo S.A. se rĆ©serve le droit de modifier ces conditions Ć  n'importe quel moment et sans notification prĆ©alable. Le client est soumis aux conditions en application au moment de son acceptation de ces conditions." msgstr "" -#: ../../content/legal/terms/i18n/terms_of_sale_fr.rst:80 +#: ../../content/legal/terms/i18n/terms_of_sale_fr.rst:81 msgid "Tout litige rĆ©sultant de la prĆ©sente convention ressort de lā€™application du droit belge et est de la compĆ©tence des Tribunaux de lā€™arrondissement du siĆØge social dā€™Odoo S.A. hormis le droit dā€™Odoo S.A. de porter le litige devant une autre juridiction compĆ©tente." msgstr "" @@ -5483,7 +5483,7 @@ msgid "General Terms of Sale" msgstr "" #: ../../content/legal/terms/terms_of_sale.rst:9 -msgid "`Download PDF <../../terms_of_sale.pdf>`_" +msgid "`Download PDF `_" msgstr "" #: ../../content/legal/terms/terms_of_sale.rst:11 diff --git a/locale/sources/marketing.pot b/locale/sources/marketing.pot index 08e47929d..0070516ee 100644 --- a/locale/sources/marketing.pot +++ b/locale/sources/marketing.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: Odoo saas-16.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-06-03 06:55+0000\n" +"POT-Creation-Date: 2023-06-20 08:18+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -779,124 +779,131 @@ msgid "Target an audience" msgstr "" #: ../../content/applications/marketing/marketing_automation/getting_started/target_audience.rst:5 -msgid "Delivering marketing campaigns to the *right* audience is paramount when trying to grow a business. The :guilabel:`Odoo Marketing Automation` application helps marketers to do just that by providing filtering tools, that can be as simple or as complex as necessary, to reach the right customers at the right time." +msgid "Delivering marketing campaigns to the right audience is paramount when trying to grow a business. The Odoo *Marketing Automation* application helps marketers to do just that by providing detailed filtering tools, which can be as simple (or as complex) as necessary, to reach the right customers at the right time." msgstr "" #: ../../content/applications/marketing/marketing_automation/getting_started/target_audience.rst:11 -msgid "Work with target filters" +msgid "Configure target filters" msgstr "" #: ../../content/applications/marketing/marketing_automation/getting_started/target_audience.rst:13 -msgid "When configuring the filters on a marketing campaign, there are some options that have an arrow icon beside them. The arrow signifies that the filter has more refined parameters within it." +msgid "When configuring the target filters on a marketing campaign, there are some options that have an :guilabel:`> (arrow)` icon beside them. The :guilabel:`> (arrow)` icon signifies that the particular filter has more refined parameters within it that can be customized." msgstr "" #: ../../content/applications/marketing/marketing_automation/getting_started/target_audience.rst:-1 msgid "The drop-down filter menu in the Marketing Automation application." msgstr "" -#: ../../content/applications/marketing/marketing_automation/getting_started/target_audience.rst:20 -msgid "Filters can be extended by adding *branches* and *nodes*. A *node* adds another filtering parameter to a group of targeting conditions (e.g. a new line), and a *branch* creates a narrowly refined cluster of parameters, allowing filters to be grouped with *Any* or *All* statements." -msgstr "" - -#: ../../content/applications/marketing/marketing_automation/getting_started/target_audience.rst:24 -msgid "Every time a new branch is created, there are two options:" +#: ../../content/applications/marketing/marketing_automation/getting_started/target_audience.rst:21 +msgid "Filters can be extended by adding *branches* and *nodes*. A *node* adds another filtering parameter to a group of targeting conditions (e.g. a new line), and a *branch* creates a narrowly refined cluster of parameters, allowing filters to be grouped with :guilabel:`ANY` or :guilabel:`ALL` statements." msgstr "" #: ../../content/applications/marketing/marketing_automation/getting_started/target_audience.rst:26 -msgid "Either the records can match :guilabel:`ALL` criteria for the upcoming rules (an AND statement where all criteria must match)." +msgid "Every time a new branch is created, there are two options:" msgstr "" -#: ../../content/applications/marketing/marketing_automation/getting_started/target_audience.rst:29 -msgid "Or, the records can match :guilabel:`ANY` criteria for the upcoming rules (an OR statement where only one of the criteria must match)." +#: ../../content/applications/marketing/marketing_automation/getting_started/target_audience.rst:28 +msgid "Either the records can match :guilabel:`ALL` criteria for the upcoming rules (creating an AND statement where *all* criteria must match)." msgstr "" -#: ../../content/applications/marketing/marketing_automation/getting_started/target_audience.rst:32 -msgid "To change between these two options, simply click the drop-down arrow icon in the green box and select :guilabel:`Any` or :guilabel:`All`." +#: ../../content/applications/marketing/marketing_automation/getting_started/target_audience.rst:30 +msgid "Or, the records can match :guilabel:`ANY` criteria for the upcoming rules (creating an OR statement where *only one* of the criteria must match)." msgstr "" -#: ../../content/applications/marketing/marketing_automation/getting_started/target_audience.rst:35 -msgid "To add a node, click on the :guilabel:`+ (plus sign icon)` and to add another branch click on the :guilabel:`... (ellipses icon)`. To exclude a :guilabel:`node` (or a :guilabel:`branch`), click on :guilabel:`x (delete)`." +#: ../../content/applications/marketing/marketing_automation/getting_started/target_audience.rst:33 +msgid "To change between these two options, simply click the drop-down arrow icon in the green box and select :guilabel:`ANY` or :guilabel:`ALL`." msgstr "" -#: ../../content/applications/marketing/marketing_automation/getting_started/target_audience.rst:44 +#: ../../content/applications/marketing/marketing_automation/getting_started/target_audience.rst:36 +msgid "To add a node, click on the :guilabel:`āž• (plus sign)` icon, and to add another branch click on the :guilabel:`ā‹Æ (ellipses)` icon. To exclude a node or a branch, click on :guilabel:`āœ– (delete)` icon to delete it." +msgstr "" + +#: ../../content/applications/marketing/marketing_automation/getting_started/target_audience.rst:45 msgid "Use cases" msgstr "" -#: ../../content/applications/marketing/marketing_automation/getting_started/target_audience.rst:46 -msgid "The following scenarios below outline different combinations of filters a marketing campaign might commonly use." +#: ../../content/applications/marketing/marketing_automation/getting_started/target_audience.rst:47 +msgid "The following scenarios outline different combinations of filters a marketing campaign might commonly use." msgstr "" -#: ../../content/applications/marketing/marketing_automation/getting_started/target_audience.rst:50 -msgid "Scenario #1: Narrow the target down to new opportunities in the pipeline" +#: ../../content/applications/marketing/marketing_automation/getting_started/target_audience.rst:51 +msgid "Scenario #1: Narrow target down to new opportunities in the pipeline" msgstr "" -#: ../../content/applications/marketing/marketing_automation/getting_started/target_audience.rst:52 -msgid "While in Edit mode on a campaign template form, select the :guilabel:`Target` field, and click :guilabel:`Search More` from the drop-down menu. Then, search for :guilabel:`Lead/Opportunity` and select it." +#: ../../content/applications/marketing/marketing_automation/getting_started/target_audience.rst:53 +msgid "While in *Edit mode* on a campaign template form (by clicking the :guilabel:`Edit` button), select the :guilabel:`Target` field, and click :guilabel:`Search More` from the drop-down menu. Then, search for :guilabel:`Lead/Opportunity`, and select it." msgstr "" -#: ../../content/applications/marketing/marketing_automation/getting_started/target_audience.rst:56 -msgid "Next, click :guilabel:`Add Filter` in the :guilabel:`Filter` field. Click on the default :guilabel:`ID` filter option in the first portion of the filter equation. Doing so reveals a drop-down menu full of filter options. From this drop-down, scroll down (or search for) :guilabel:`Type`." +#: ../../content/applications/marketing/marketing_automation/getting_started/target_audience.rst:57 +msgid "Next, click :guilabel:`Add Filter` in the :guilabel:`Filter` field. Then, click on the default :guilabel:`ID` filter option in the first portion of the filter equation. Doing so reveals a drop-down menu full of filter options. From this drop-down, scroll down (or search for) :guilabel:`Type`." msgstr "" -#: ../../content/applications/marketing/marketing_automation/getting_started/target_audience.rst:61 -msgid "Keep the second portion of the filter equation on the default :guilabel:`= (equal sign)`." +#: ../../content/applications/marketing/marketing_automation/getting_started/target_audience.rst:62 +msgid "Keep the second portion of the filter equation on the default :guilabel:`šŸŸ° (equal sign)` icon." msgstr "" -#: ../../content/applications/marketing/marketing_automation/getting_started/target_audience.rst:63 -msgid "Then, change the third (and final) portion of the filter equation from :guilabel:`Lead` to :guilabel:`Opportunity`. The number of :guilabel:`Records` that fit this specific filter equation will change as the equation is customized." +#: ../../content/applications/marketing/marketing_automation/getting_started/target_audience.rst:64 +msgid "Next, change the third (and final) portion of the filter equation from :guilabel:`Lead` to :guilabel:`Opportunity`. The number of :guilabel:`Records` that fit this specific filter equation changes as the equation is customized." msgstr "" -#: ../../content/applications/marketing/marketing_automation/getting_started/target_audience.rst:67 -#: ../../content/applications/marketing/marketing_automation/getting_started/target_audience.rst:103 -msgid "Add another node to this filter by clicking the :guilabel:`+ (plus sign)` to the right of the equation." +#: ../../content/applications/marketing/marketing_automation/getting_started/target_audience.rst:68 +msgid "Add another node to this filter by clicking the :guilabel:`āž• (plus sign)` icon to the right of the equation." msgstr "" -#: ../../content/applications/marketing/marketing_automation/getting_started/target_audience.rst:70 -msgid "With \"new\" opportunities being the target of this filter, the second node will focus on only locating opportunities that are in the :guilabel:`New` stage of the pipeline. To do that, select the default :guilabel:`ID` from the first portion of the second filter equation, and scroll down (or search for) :guilabel:`Stage` from the field drop-down menu." +#: ../../content/applications/marketing/marketing_automation/getting_started/target_audience.rst:71 +msgid "With \"new\" opportunities being the target of this filter, the second node will focus on *only* locating opportunities that are in the :guilabel:`New` stage of the pipeline. To do that, select the default :guilabel:`ID` from the first portion of the second filter equation, and scroll down (or search for) :guilabel:`Stage` from the field drop-down menu." msgstr "" -#: ../../content/applications/marketing/marketing_automation/getting_started/target_audience.rst:75 -msgid "Once again, leave the second portion of the filter equation on :guilabel:`= (equal sign)`." +#: ../../content/applications/marketing/marketing_automation/getting_started/target_audience.rst:76 +msgid "Once again, leave the second portion of the filter equation on :guilabel:`šŸŸ° (equal sign)` icon." msgstr "" -#: ../../content/applications/marketing/marketing_automation/getting_started/target_audience.rst:77 -msgid "Lastly, highlight the default value in the third (and final) portion of the second filter equation and type in :guilabel:`New`. With that completed, Odoo will only target opportunities that are in the \"New\" stage of the pipeline." +#: ../../content/applications/marketing/marketing_automation/getting_started/target_audience.rst:78 +msgid "Lastly, highlight the default value in the third (and final) portion of the second filter equation, and type in `New`. With that in place, Odoo only targets opportunities that are in the \"New\" stage of the pipeline." msgstr "" #: ../../content/applications/marketing/marketing_automation/getting_started/target_audience.rst:-1 msgid "A standard scenario using filters in the Odoo Marketing Automation app." msgstr "" -#: ../../content/applications/marketing/marketing_automation/getting_started/target_audience.rst:86 -msgid "Scenario #2: Narrow the target down to the event attendees that purchased a specific ticket" +#: ../../content/applications/marketing/marketing_automation/getting_started/target_audience.rst:87 +msgid "Scenario #2: Narrow down target to event attendees who purchased a specific ticket" msgstr "" -#: ../../content/applications/marketing/marketing_automation/getting_started/target_audience.rst:88 -msgid "While in Edit mode on a campaign template form, select the :guilabel:`Target` field, and click :guilabel:`Search More` from the drop-down menu. Then, scroll down (or search for) :guilabel:`Event` and select it." +#: ../../content/applications/marketing/marketing_automation/getting_started/target_audience.rst:89 +msgid "While in *Edit mode* on a campaign template form (by clicking the :guilabel:`Edit` button), select the :guilabel:`Target` field, and click :guilabel:`Search More` from the drop-down menu. Then, scroll down (or search for) :guilabel:`Event`, and select it." msgstr "" -#: ../../content/applications/marketing/marketing_automation/getting_started/target_audience.rst:92 +#: ../../content/applications/marketing/marketing_automation/getting_started/target_audience.rst:93 msgid "Next, click :guilabel:`Add Filter` in the :guilabel:`Filter` field. Click on the default :guilabel:`ID` filter option in the first portion of the filter equation. Doing so reveals a drop-down menu full of filter options. From this drop-down, scroll down (or search for) :guilabel:`Event`." msgstr "" -#: ../../content/applications/marketing/marketing_automation/getting_started/target_audience.rst:97 -msgid "Click the the default :guilabel:`= (equal sign)` in the second portion of the filter equation. This reveals a drop-down menu. On this menu, select :guilabel:`contains`." +#: ../../content/applications/marketing/marketing_automation/getting_started/target_audience.rst:98 +msgid "Click the default :guilabel:`šŸŸ° (equal sign)` icon in the second portion of the filter equation. This reveals a drop-down menu. From this drop-down menu, select :guilabel:`contains`." msgstr "" -#: ../../content/applications/marketing/marketing_automation/getting_started/target_audience.rst:100 -msgid "In the third (and final) empty portion of the filter equation, type in the name of the event(s) that you would like Odoo to consider for this campaign filter." +#: ../../content/applications/marketing/marketing_automation/getting_started/target_audience.rst:101 +msgid "In the third (and final) empty portion of the filter equation, type in the name of the event(s) that Odoo should consider for this campaign filter." msgstr "" -#: ../../content/applications/marketing/marketing_automation/getting_started/target_audience.rst:106 -msgid "The second node will focus on targeting this campaign to attendees who purchase a specific type of ticket to the aforementioned event(s) in the first filter equation. To do that, select the default :guilabel:`ID` from the first portion of the second filter equation, and scroll down (or search for) :guilabel:`Event Ticket` from the field drop-down menu. Then, in that same drop-down menu, select :guilabel:`Name`." +#: ../../content/applications/marketing/marketing_automation/getting_started/target_audience.rst:104 +msgid "Then, add another node to this filter by clicking the :guilabel:`āž• (plus sign)` icon to the right of the equation." msgstr "" -#: ../../content/applications/marketing/marketing_automation/getting_started/target_audience.rst:112 -msgid "Once again, click the the default :guilabel:`= (equal sign)` in the second portion of the filter equation, and select :guilabel:`contains`." +#: ../../content/applications/marketing/marketing_automation/getting_started/target_audience.rst:107 +msgid "The second node will focus on targeting this campaign to attendees who purchase a specific type of ticket to the aforementioned event(s) mentioned in the first filter equation." msgstr "" -#: ../../content/applications/marketing/marketing_automation/getting_started/target_audience.rst:115 -msgid "Lastly, in the third (and final) portion of the second filter equation, which will be blank, type in the name of the ticket type that should be used for the filter. In this case, :guilabel:`Standard` is the name of the event ticket type for this sample filter." +#: ../../content/applications/marketing/marketing_automation/getting_started/target_audience.rst:110 +msgid "To do that, select the default :guilabel:`ID` from the first portion of the second filter equation, and scroll down (or search for) :guilabel:`Event Ticket` from the field drop-down menu. Then, in that same drop-down menu, select :guilabel:`Name`." +msgstr "" + +#: ../../content/applications/marketing/marketing_automation/getting_started/target_audience.rst:114 +msgid "Once again, click the default :guilabel:`šŸŸ° (equal sign)` icon in the second portion of the filter equation, and select :guilabel:`contains`." +msgstr "" + +#: ../../content/applications/marketing/marketing_automation/getting_started/target_audience.rst:117 +msgid "Lastly, in the third (and final) portion of the second filter equation, which is blank, type in the name of the ticket type that should be used for the filter. In this case, :guilabel:`Standard` is the name of the event ticket type for this sample filter." msgstr "" #: ../../content/applications/marketing/marketing_automation/getting_started/target_audience.rst:-1 @@ -904,7 +911,7 @@ msgid "An event ticket filter in the Odoo Marketing Automation application." msgstr "" #: ../../content/applications/marketing/marketing_automation/getting_started/testing_running.rst:3 -msgid "Testing and running a campaign" +msgid "Testing/running campaigns" msgstr "" #: ../../content/applications/marketing/marketing_automation/getting_started/testing_running.rst:5 @@ -912,39 +919,51 @@ msgid "Odoo gives users the ability to test marketing campaigns (and mailings) b msgstr "" #: ../../content/applications/marketing/marketing_automation/getting_started/testing_running.rst:8 -msgid "First, open the :guilabel:`Marketing Automation` application and click on a campaign. Make sure the campaign already has activities configured on it (or build a campaign by following the directions here on :doc:`this documentation `). To start a test, click the :guilabel:`Launch a Test` button at the top of the template form." +msgid "First, open the :menuselection:`Marketing Automation` application, and select the desired campaign, which reveals that campaign's detail form." +msgstr "" + +#: ../../content/applications/marketing/marketing_automation/getting_started/testing_running.rst:11 +msgid "On the campaign detail form, make sure the campaign already has activities configured (or build a campaign by following the directions here on :doc:`this documentation `)." +msgstr "" + +#: ../../content/applications/marketing/marketing_automation/getting_started/testing_running.rst:15 +msgid "To start a test, click the :guilabel:`Launch a Test` button at the top of the campaign form." msgstr "" #: ../../content/applications/marketing/marketing_automation/getting_started/testing_running.rst:-1 msgid "Launch a test button in Odoo Marketing Automation." msgstr "" -#: ../../content/applications/marketing/marketing_automation/getting_started/testing_running.rst:17 -msgid "When clicked, a pop-up window appears. In the dropdown field choose a specific record to run the test on, or create a brand new record by clicking the :guilabel:`Search More...` link at the bottom of the dropdown menu, and then click the :guilabel:`Create` button." +#: ../../content/applications/marketing/marketing_automation/getting_started/testing_running.rst:21 +msgid "When clicked, a :guilabel:`Launch a test` pop-up window appears. In the drop-down field, choose an existing record (or create a new one) to run the test on. To create a brand new record, click the :guilabel:`Search More...` link at the bottom of the drop-down menu, and then click the :guilabel:`Create` button." msgstr "" -#: ../../content/applications/marketing/marketing_automation/getting_started/testing_running.rst:21 -msgid "Once the record is selected, click :guilabel:`Continue`, and Odoo will redirect to the campaign test page." +#: ../../content/applications/marketing/marketing_automation/getting_started/testing_running.rst:26 +msgid "Doing so reveals a blank contact form, in which the :guilabel:`Name` and :guilabel:`Email` **must** be entered. When all the necessary information has been entered, click :guilabel:`Save`, and Odoo returns to the :guilabel:`Launch a test` pop-up, with that new record in the :guilabel:`Choose an existing record or create a new one to test` field." +msgstr "" + +#: ../../content/applications/marketing/marketing_automation/getting_started/testing_running.rst:31 +msgid "Once a record is selected, click :guilabel:`Continue`, and Odoo reveals the campaign test page." msgstr "" #: ../../content/applications/marketing/marketing_automation/getting_started/testing_running.rst:-1 msgid "Test screen in Odoo Marketing Automation." msgstr "" -#: ../../content/applications/marketing/marketing_automation/getting_started/testing_running.rst:28 -msgid "Here, the name of the :guilabel:`Record` being tested is visible, along with the precise time this test workflow was started. Beneath that is the first activity (or activities) in the workflow." +#: ../../content/applications/marketing/marketing_automation/getting_started/testing_running.rst:37 +msgid "On the campaign test page, the name of the :guilabel:`Record` being tested is visible, along with the precise time this test workflow was started in the :guilabel:`Workflow Started On` field. Beneath that, in the :guilabel:`Workflow` section is the first activity (or activities) in the workflow that's being tested." msgstr "" -#: ../../content/applications/marketing/marketing_automation/getting_started/testing_running.rst:31 -msgid "To start a test, click the :guilabel:`Run` icon beside the first activity in the workflow. When clicked, the page will reload, and Odoo will show the various results (and analytics) connected to that specific activity." +#: ../../content/applications/marketing/marketing_automation/getting_started/testing_running.rst:42 +msgid "To start a test, click the :guilabel:`Run` button, represented by a :guilabel:`ā–¶ļø (play button)` icon beside the first activity in the workflow. When clicked, the page reloads, and Odoo shows the various results (and analytics) connected to that specific activity as they occur, in real-time." msgstr "" #: ../../content/applications/marketing/marketing_automation/getting_started/testing_running.rst:-1 msgid "Workflow test progress in Odoo Marketing Automation." msgstr "" -#: ../../content/applications/marketing/marketing_automation/getting_started/testing_running.rst:39 -msgid "Once all the workflow activities are completed, the test will end and be moved to the :guilabel:`Completed` stage. To stop a test before all the workflow activities are completed, click the :guilabel:`Stop` button." +#: ../../content/applications/marketing/marketing_automation/getting_started/testing_running.rst:50 +msgid "Once all the workflow activities are completed, the test will end, and move to the :guilabel:`Completed` stage. To stop a test before all the workflow activities are completed, click the :guilabel:`Stop` button in the upper-left corner of the campaign test page." msgstr "" #: ../../content/applications/marketing/marketing_automation/getting_started/workflow_activities.rst:3 @@ -952,115 +971,127 @@ msgid "Marketing activities" msgstr "" #: ../../content/applications/marketing/marketing_automation/getting_started/workflow_activities.rst:5 -msgid "When creating a campaign in the :guilabel:`Marketing Automation` app, users can plan marketing activities such as email or SMS campaigns. To get started, navigate to the :guilabel:`Workflow` area, and click :guilabel:`Add New Activity`. A blank activity template will appear where parameters can be set for that specific activity." +msgid "When creating a campaign in the *Marketing Automation* app, users can plan marketing activities, such as email or SMS campaigns." msgstr "" -#: ../../content/applications/marketing/marketing_automation/getting_started/workflow_activities.rst:10 -msgid "When :guilabel:`Add New Activity` is selected, a blank activity template will appear with the following customizable fields:" +#: ../../content/applications/marketing/marketing_automation/getting_started/workflow_activities.rst:8 +msgid "To get started, navigate to the bottom of a marketing automation campaign detail form, and click :guilabel:`Add New Activity`. Doing so reveals a :guilabel:`Create Activities` pop-up window. This pop-up window is a blank activity template, where specific parameters can be set for that particular activity." +msgstr "" + +#: ../../content/applications/marketing/marketing_automation/getting_started/workflow_activities.rst:13 +msgid "The following fields are available in the :guilabel:`Create Activities` pop-up window (when :guilabel:`Add New Activity` is clicked):" msgstr "" #: ../../content/applications/marketing/marketing_automation/getting_started/workflow_activities.rst:-1 msgid "An activity template in Odoo Marketing Automation." msgstr "" -#: ../../content/applications/marketing/marketing_automation/getting_started/workflow_activities.rst:17 +#: ../../content/applications/marketing/marketing_automation/getting_started/workflow_activities.rst:20 msgid ":guilabel:`Activity Name`: the title of the activity." msgstr "" -#: ../../content/applications/marketing/marketing_automation/getting_started/workflow_activities.rst:18 -msgid ":guilabel:`Activity Type`: choose between Email, Server Action (internal Odoo operation), or SMS." +#: ../../content/applications/marketing/marketing_automation/getting_started/workflow_activities.rst:21 +msgid ":guilabel:`Activity Type`: choose between `Email`, `Server Action` (internal Odoo operation), or `SMS`." msgstr "" -#: ../../content/applications/marketing/marketing_automation/getting_started/workflow_activities.rst:19 +#: ../../content/applications/marketing/marketing_automation/getting_started/workflow_activities.rst:23 msgid ":guilabel:`Mail Template`: choose from pre-configured templates (or create a new one on-the-fly)." msgstr "" -#: ../../content/applications/marketing/marketing_automation/getting_started/workflow_activities.rst:20 +#: ../../content/applications/marketing/marketing_automation/getting_started/workflow_activities.rst:24 msgid ":guilabel:`Trigger`: choose when this activity should be triggered." msgstr "" -#: ../../content/applications/marketing/marketing_automation/getting_started/workflow_activities.rst:21 +#: ../../content/applications/marketing/marketing_automation/getting_started/workflow_activities.rst:25 msgid ":guilabel:`Expiry Duration`: configure to stop the actions after a specific amount of time (after the scheduled date). When selected, a :guilabel:`Cancel after` field appears, in which the user can choose how many :guilabel:`Hours, Days, Weeks, or Months` they want the actions to cease after the initial date." msgstr "" -#: ../../content/applications/marketing/marketing_automation/getting_started/workflow_activities.rst:25 -msgid ":guilabel:`Activity Filter`: domain related to this activity (and all subsequent Child Activities)." +#: ../../content/applications/marketing/marketing_automation/getting_started/workflow_activities.rst:29 +msgid ":guilabel:`Activity Filter`: domain related to this activity (and all subsequent child activities)." msgstr "" -#: ../../content/applications/marketing/marketing_automation/getting_started/workflow_activities.rst:27 +#: ../../content/applications/marketing/marketing_automation/getting_started/workflow_activities.rst:31 msgid ":guilabel:`Applied Filter`: activity will *only* be performed if it satisfies the specified domain (filter)." msgstr "" -#: ../../content/applications/marketing/marketing_automation/getting_started/workflow_activities.rst:30 -msgid "After the activity's settings are fully configured, click :guilabel:`Save & Close` to finish creating the activity." -msgstr "" - #: ../../content/applications/marketing/marketing_automation/getting_started/workflow_activities.rst:34 -msgid "Workflow activity" -msgstr "" - -#: ../../content/applications/marketing/marketing_automation/getting_started/workflow_activities.rst:36 -msgid "Once saved, the :guilabel:`Workflow Activity` will appear in Odoo, where each activity will be shown as a graph by default. The configured trigger time for that activity can be found to the left of the :guilabel:`Workflow Activity` card." +msgid "After the activity's settings are fully configured, click :guilabel:`Save & Close` to save the activity and return to the marketing automation campaign form, :guilabel:`Save & New` to save the activity and immediately create another one in a fresh :guilabel:`Create Activities` pop-up window, or :guilabel:`Discard` to delete the activity and return to the marketing automation campaign form." msgstr "" #: ../../content/applications/marketing/marketing_automation/getting_started/workflow_activities.rst:40 -msgid "In the :guilabel:`Workflow Activity` section, there is also the number of activities that are successful or rejected. The :guilabel:`Success` and :guilabel:`Rejected` numbers are color-coded in the graph for easy reference (in green and red, respectively)." +msgid "Workflow activity" +msgstr "" + +#: ../../content/applications/marketing/marketing_automation/getting_started/workflow_activities.rst:42 +msgid "Once an activity is saved, the :guilabel:`Workflow Activity` section appears at the bottom of the marketing automation campaign form. Each activity is displayed as a line graph." +msgstr "" + +#: ../../content/applications/marketing/marketing_automation/getting_started/workflow_activities.rst:45 +msgid "The configured :guilabel:`Trigger` time for that activity can be found to the left of the :guilabel:`Workflow Activity` card in the :guilabel:`Workflow` section." +msgstr "" + +#: ../../content/applications/marketing/marketing_automation/getting_started/workflow_activities.rst:48 +msgid "Once the activity has been triggered, a figure representing the number of :guilabel:`Success` or :guilabel:`Rejected` activities will be displayed to the right of the graph." msgstr "" #: ../../content/applications/marketing/marketing_automation/getting_started/workflow_activities.rst:-1 msgid "Typical workflow activity in Odoo Marketing Automation." msgstr "" -#: ../../content/applications/marketing/marketing_automation/getting_started/workflow_activities.rst:49 -msgid "If the :guilabel:`Activity Type` of the activity is set to :guilabel:`Email`, there are more in-depth analytics beneath the :guilabel:`Workflow Activity` data detailing how many emails have been :guilabel:`Sent`, and what percentage of those have been :guilabel:`Clicked`, :guilabel:`Replied` to, or :guilabel:`Bounced`." +#: ../../content/applications/marketing/marketing_automation/getting_started/workflow_activities.rst:56 +msgid "If the :guilabel:`Activity Type` of the activity is set to :guilabel:`Email`, there are more in-depth analytics beneath the activity graph data, detailing how many emails have been :guilabel:`Sent`, and what percentage of those have been :guilabel:`Clicked`, :guilabel:`Replied` to, or :guilabel:`Bounced`." msgstr "" -#: ../../content/applications/marketing/marketing_automation/getting_started/workflow_activities.rst:55 +#: ../../content/applications/marketing/marketing_automation/getting_started/workflow_activities.rst:62 msgid "Child activities" msgstr "" -#: ../../content/applications/marketing/marketing_automation/getting_started/workflow_activities.rst:57 -msgid "Odoo also has the option to :guilabel:`Add Child Activity`. *Child Activities* are sub-activities that are connected to (and triggered by) the activity above it, which is also known as its *Parent Activity*." -msgstr "" - -#: ../../content/applications/marketing/marketing_automation/getting_started/workflow_activities.rst:61 -msgid "Odoo provides a number of triggering options to launch a :guilabel:`Child Activity` - all of which depend on the trigger configurations related to the parent activity. Under the desired parent activity, hover over :guilabel:`Add child activity`, and select the trigger:" -msgstr "" - -#: ../../content/applications/marketing/marketing_automation/getting_started/workflow_activities.rst:65 -msgid ":guilabel:`Add Another Activity`: instantly add another activity." -msgstr "" - -#: ../../content/applications/marketing/marketing_automation/getting_started/workflow_activities.rst:66 -msgid ":guilabel:`Opened`: the next activity will be triggered if the (email) recipient opens the mailing." +#: ../../content/applications/marketing/marketing_automation/getting_started/workflow_activities.rst:64 +msgid "There is also the option to add a *child activity* by clicking :guilabel:`Add child activity`, located at the bottom of each activity block in the :guilabel:`Workflow` section of a marketing automation form." msgstr "" #: ../../content/applications/marketing/marketing_automation/getting_started/workflow_activities.rst:68 -msgid ":guilabel:`Not Opened`: the next activity will be triggered if the recipient does not open the mailing." -msgstr "" - -#: ../../content/applications/marketing/marketing_automation/getting_started/workflow_activities.rst:70 -msgid ":guilabel:`Replied`: the next activity will be triggered if the recipient replies to the mailing." +msgid "Child activities are sub-activities that are connected to (and triggered by) the activity above it, which is also known as its *parent activity*." msgstr "" #: ../../content/applications/marketing/marketing_automation/getting_started/workflow_activities.rst:71 -msgid ":guilabel:`Not Replied`: the next activity will be triggered if the recipient does not reply to the mailing." -msgstr "" - -#: ../../content/applications/marketing/marketing_automation/getting_started/workflow_activities.rst:73 -msgid ":guilabel:`Clicked`: the next activity will be triggered if the recipient clicks on a link included in the mailing." +msgid "Odoo provides a number of triggering options to launch a child activity - all of which depend on the trigger configurations related to the parent activity. Under the desired parent activity, hover over :guilabel:`Add child activity`, and select any of the following triggers:" msgstr "" #: ../../content/applications/marketing/marketing_automation/getting_started/workflow_activities.rst:75 +msgid ":guilabel:`Add Another Activity`: instantly add another activity." +msgstr "" + +#: ../../content/applications/marketing/marketing_automation/getting_started/workflow_activities.rst:76 +msgid ":guilabel:`Opened`: the next activity will be triggered if the (email) recipient opens the mailing." +msgstr "" + +#: ../../content/applications/marketing/marketing_automation/getting_started/workflow_activities.rst:78 +msgid ":guilabel:`Not Opened`: the next activity will be triggered if the recipient does not open the mailing." +msgstr "" + +#: ../../content/applications/marketing/marketing_automation/getting_started/workflow_activities.rst:80 +msgid ":guilabel:`Replied`: the next activity will be triggered if the recipient replies to the mailing." +msgstr "" + +#: ../../content/applications/marketing/marketing_automation/getting_started/workflow_activities.rst:81 +msgid ":guilabel:`Not Replied`: the next activity will be triggered if the recipient does not reply to the mailing." +msgstr "" + +#: ../../content/applications/marketing/marketing_automation/getting_started/workflow_activities.rst:83 +msgid ":guilabel:`Clicked`: the next activity will be triggered if the recipient clicks on a link included in the mailing." +msgstr "" + +#: ../../content/applications/marketing/marketing_automation/getting_started/workflow_activities.rst:85 msgid ":guilabel:`Not Clicked`: the next activity will be triggered if the recipient does not click on a link included in the mailing." msgstr "" -#: ../../content/applications/marketing/marketing_automation/getting_started/workflow_activities.rst:77 +#: ../../content/applications/marketing/marketing_automation/getting_started/workflow_activities.rst:87 msgid ":guilabel:`Bounced`: the next activity will be triggered if the mailing is bounced (not sent)." msgstr "" -#: ../../content/applications/marketing/marketing_automation/getting_started/workflow_activities.rst:79 -msgid "Once a trigger is selected, the user can configure the child activity (it has the same configuration options as a regular activity) and click :guilabel:`Save & Close`` to finish creating the child activity." +#: ../../content/applications/marketing/marketing_automation/getting_started/workflow_activities.rst:89 +msgid "Once a trigger is selected, the user can configure the child activity (it has the same configuration options as a regular activity), and click :guilabel:`Save & Close` to finish creating the child activity, which will then be displayed in the :guilabel:`Workflow` section, in a slightly indented position beneath its parent activity." msgstr "" #: ../../content/applications/marketing/sms_marketing.rst:8 diff --git a/locale/sources/productivity.pot b/locale/sources/productivity.pot index 20b45366a..64d3d618d 100644 --- a/locale/sources/productivity.pot +++ b/locale/sources/productivity.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: Odoo saas-16.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-06-03 06:55+0000\n" +"POT-Creation-Date: 2023-06-20 08:18+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -1078,6 +1078,7 @@ msgid "Ensure that the server is configured." msgstr "" #: ../../content/applications/productivity/iot/config/https_certificate_iot.rst:94 +#: ../../content/applications/productivity/iot/config/windows_iot.rst:99 msgid ":doc:`/applications/productivity/iot/config/connect`" msgstr "" @@ -1337,6 +1338,7 @@ msgid "Set up is done, you can launch a new PoS Session." msgstr "" #: ../../content/applications/productivity/iot/config/troubleshooting.rst:3 +#: ../../content/applications/productivity/iot/config/windows_iot.rst:105 msgid "Troubleshooting" msgstr "" @@ -1476,6 +1478,226 @@ msgstr "" msgid "The cashdrawer should be connected to the printer and the *Cashdrawer* checkbox should be ticked in the POS configuration." msgstr "" +#: ../../content/applications/productivity/iot/config/windows_iot.rst:3 +msgid "Connect Windows IoT Odoo" +msgstr "" + +#: ../../content/applications/productivity/iot/config/windows_iot.rst:5 +msgid "A Virtual IoT box is a computer program that needs to be downloaded and installed on a Windows computer. This requires a Windows operating system with an Odoo 16 or later database." +msgstr "" + +#: ../../content/applications/productivity/iot/config/windows_iot.rst:8 +msgid "The Windows virtual :abbr:`IoT (Internet of Things)` box works the same way as a physical :abbr:`IoT (Internet of Things)` box, with the ability to run most of the same devices. All :abbr:`POS (Point of Sale)` devices work with it, such as a scale or printer. Payment terminals will also work, but it should be noted that :abbr:`MRP (Material Requirement Planning)` devices are not compatible. *These include cameras or measurement tools.*" +msgstr "" + +#: ../../content/applications/productivity/iot/config/windows_iot.rst:15 +msgid "Pre-requisites" +msgstr "" + +#: ../../content/applications/productivity/iot/config/windows_iot.rst:17 +msgid "The following items will be needed to complete the Windows :abbr:`IoT (Internet of Things)` installation." +msgstr "" + +#: ../../content/applications/productivity/iot/config/windows_iot.rst:20 +msgid "Odoo 16 database or any version above." +msgstr "" + +#: ../../content/applications/productivity/iot/config/windows_iot.rst:21 +msgid ":abbr:`IoT (Internet of Things)` compatible devices (except those mentioned above). Refer to: `Odoo's compatible IoT devices `_." +msgstr "" + +#: ../../content/applications/productivity/iot/config/windows_iot.rst:23 +msgid "Device drivers for Windows." +msgstr "" + +#: ../../content/applications/productivity/iot/config/windows_iot.rst:26 +msgid "Odoo recommends using an updated, recent version of Windows (Windows 10/11) as some older operating systems can cause the Windows virtual :abbr:`IoT (Internet of Things)` to not work." +msgstr "" + +#: ../../content/applications/productivity/iot/config/windows_iot.rst:29 +msgid "Windows computer (laptop, desktop, or server)." +msgstr "" + +#: ../../content/applications/productivity/iot/config/windows_iot.rst:30 +msgid "Odoo :abbr:`IoT (Internet of Things)` subscription. Refer to: :ref:`iot/iot-eligibility`." +msgstr "" + +#: ../../content/applications/productivity/iot/config/windows_iot.rst:33 +msgid "Connect the Windows virtual Iot box to an Odoo database" +msgstr "" + +#: ../../content/applications/productivity/iot/config/windows_iot.rst:35 +msgid "The Windows virtual IoT box is simple to setup in just a few easy steps. Follow this process when installing the Windows virtual IoT software for the first time." +msgstr "" + +#: ../../content/applications/productivity/iot/config/windows_iot.rst:39 +msgid "Download and initial installation" +msgstr "" + +#: ../../content/applications/productivity/iot/config/windows_iot.rst:41 +msgid "To begin the installation, navigate to the Odoo 16 or higher installation package for Enterprise or Community - Windows edition at `Odoo's download page `_. Next, install and setup the Odoo :file:`.exe` file. After the instructions screen, click :guilabel:`Next` to start the installation and agree to the :abbr:`TOS (Terms of Service)`." +msgstr "" + +#: ../../content/applications/productivity/iot/config/windows_iot.rst:46 +msgid "During the next step of the installation, select :guilabel:`Odoo IoT` from the :guilabel:`Select the type of install` dropdown." +msgstr "" + +#: ../../content/applications/productivity/iot/config/windows_iot.rst:50 +msgid "For reference, the following should be installed:" +msgstr "" + +#: ../../content/applications/productivity/iot/config/windows_iot.rst:52 +msgid "**Odoo server**" +msgstr "" + +#: ../../content/applications/productivity/iot/config/windows_iot.rst:53 +msgid "**Odoo IoT**" +msgstr "" + +#: ../../content/applications/productivity/iot/config/windows_iot.rst:54 +msgid "**Nginx WebServer**" +msgstr "" + +#: ../../content/applications/productivity/iot/config/windows_iot.rst:55 +msgid "**Ghostscript interpreter**" +msgstr "" + +#: ../../content/applications/productivity/iot/config/windows_iot.rst:57 +msgid "Ensure there is enough space on the computer for the installation and click :guilabel:`Next`." +msgstr "" + +#: ../../content/applications/productivity/iot/config/windows_iot.rst:60 +msgid "Setting the destination and completing the installation" +msgstr "" + +#: ../../content/applications/productivity/iot/config/windows_iot.rst:62 +msgid "To complete the installation, select the :guilabel:`Destination Folder` and click :guilabel:`Install`." +msgstr "" + +#: ../../content/applications/productivity/iot/config/windows_iot.rst:66 +msgid "Choosing ``C:\\odoo`` as the install location will allow for the Nginx server to start. If the folder doesn't exist, then create it. Otherwise the installation files will be spread throughout the hard drive." +msgstr "" + +#: ../../content/applications/productivity/iot/config/windows_iot.rst:71 +msgid "Odoo's Windows virtual IoT software shouldn't be installed inside any of the Window's User's directories. Doing so won't allow for Nginx to initialize." +msgstr "" + +#: ../../content/applications/productivity/iot/config/windows_iot.rst:74 +msgid "The installation may take a few minutes. When complete, click :guilabel:`Next` to continue." +msgstr "" + +#: ../../content/applications/productivity/iot/config/windows_iot.rst:76 +msgid "Ensure that the :guilabel:`Start Odoo` box is checked and click :guilabel:`Finish`. After installation, the Odoo server will run and automatically open `http://localhost:8069` on your web browser. The webpage should display the :abbr:`IoT (Internet of Things)` box homepage." +msgstr "" + +#: ../../content/applications/productivity/iot/config/windows_iot.rst:81 +msgid "A restart of the Windows IoT program may be necessary should the web browser not display anything. :ref:`iot/restart_windows_iot`" +msgstr "" + +#: ../../content/applications/productivity/iot/config/windows_iot.rst:85 +msgid "Connecting devices" +msgstr "" + +#: ../../content/applications/productivity/iot/config/windows_iot.rst:87 +msgid "Next, connect the :abbr:`IoT (Internet of Things)` devices to the Windows computer. Windows should automatically detect the device because the driver is pre-installed on the computer. If not, search for and install the Windows driver for the device." +msgstr "" + +#: ../../content/applications/productivity/iot/config/windows_iot.rst:91 +msgid "Following connecting devices to the computer, refresh the :abbr:`IoT (Internet of Things)` box homepage and verify the device is seen. If not, reload the handlers through the :abbr:`IoT (Internet of Things)` box homepage." +msgstr "" + +#: ../../content/applications/productivity/iot/config/windows_iot.rst:95 +msgid "Finally, connect Windows :abbr:`IoT (Internet of Things)` to a database using existing instructions (manually using the Token)." +msgstr "" + +#: ../../content/applications/productivity/iot/config/windows_iot.rst:101 +msgid "Now the installation is complete, the devices connected to :abbr:`IoT (Internet of Things)` can be used to complete processes/actions." +msgstr "" + +#: ../../content/applications/productivity/iot/config/windows_iot.rst:110 +msgid "Restart Windows IoT box" +msgstr "" + +#: ../../content/applications/productivity/iot/config/windows_iot.rst:112 +msgid "In some instances a manual restart of the physical :abbr:`IoT (Internet of Things)` box can resolve the issue of an :abbr:`IoT (Internet of Things)` box not showing up on the database. For the Windows virtual :abbr:`IoT (Internet of Things)` box a manual restart of the Odoo server can resolve database connection issues." +msgstr "" + +#: ../../content/applications/productivity/iot/config/windows_iot.rst:117 +msgid "To restart the virtual Windows IoT server:" +msgstr "" + +#: ../../content/applications/productivity/iot/config/windows_iot.rst:119 +msgid "Type `Services` into the Windows :guilabel:`Search Bar`." +msgstr "" + +#: ../../content/applications/productivity/iot/config/windows_iot.rst:120 +msgid "Select the :menuselection:`Services` App and scroll down to the :guilabel:`Odoo` service." +msgstr "" + +#: ../../content/applications/productivity/iot/config/windows_iot.rst:121 +msgid "Right click on :guilabel:`Odoo` and select :guilabel:`Start` or :guilabel:`Restart`. This action will manually restart the Odoo IoT server." +msgstr "" + +#: ../../content/applications/productivity/iot/config/windows_iot.rst:125 +msgid "Firewalls" +msgstr "" + +#: ../../content/applications/productivity/iot/config/windows_iot.rst:127 +msgid "Firewalls keep devices safe and secure. Sometimes they can block connections that should be made though. The Windows virtual :abbr:`IoT (Internet of Things)` box software may not be reachable to the :abbr:`LAN (Local Area Network)` due to a firewall preventing the connection. Consult your local IT support team to make exceptions (network discovery) in the :abbr:`OS (Operating System)` or firewall program. Windows has their own firewall as do other virus protection programs." +msgstr "" + +#: ../../content/applications/productivity/iot/config/windows_iot.rst:134 +msgid "A client might encounter a time when they are able to reach the homepage of the :abbr:`IoT (Internet of Things)` box, yet they cannot access it from another computer/mobile device/tablet on the same network." +msgstr "" + +#: ../../content/applications/productivity/iot/config/windows_iot.rst:139 +msgid "Making an exception on Windows Defender" +msgstr "" + +#: ../../content/applications/productivity/iot/config/windows_iot.rst:141 +msgid "It's possible to allow other devices to access the Windows virtual :abbr:`IoT (Internet of Things)` box while keeping the firewall on. This is done by creating a rule on *Windows Defender* and allowing communication through port `8069`. The following process describes the steps to take in order to make this exception." +msgstr "" + +#: ../../content/applications/productivity/iot/config/windows_iot.rst:147 +msgid "Create a rule in Windows Defender" +msgstr "" + +#: ../../content/applications/productivity/iot/config/windows_iot.rst:149 +msgid "First, open the *Windows Firewall* by navigating to the :menuselection:`Start Menu` and typing in `Firewall`. Then, open the :menuselection:`Windows Defender Firewall` program. In the left-hand menu, navigate to :guilabel:`Advanced Settings`." +msgstr "" + +#: ../../content/applications/productivity/iot/config/windows_iot.rst:153 +msgid "Once :guilabel:`Advanced Settings` have been selected, click :guilabel:`Inbound Rules` in the left-hand menu. Then, in the right-hand menu column (under :guilabel:`Inbound Rules`), click on :guilabel:`New Rule` to create a new rule." +msgstr "" + +#: ../../content/applications/productivity/iot/config/windows_iot.rst:158 +msgid "Configure new rule" +msgstr "" + +#: ../../content/applications/productivity/iot/config/windows_iot.rst:160 +msgid "On the :menuselection:`Rule Type` screen, select :guilabel:`Port`. Then click :guilabel:`Next`. From the :menuselection:`Protocol and Ports` page leave the rule application to :guilabel:`TCP`. Then, select :guilabel:`Specific Local Ports` for the :guilabel:`ports` option. In the text box, type in `8069`. Finally click :guilabel:`Next` to continue to the next step." +msgstr "" + +#: ../../content/applications/productivity/iot/config/windows_iot.rst:165 +msgid "On the :menuselection:`Actions` page, select :guilabel:`Allow the connection` and click :guilabel:`Next`. The following page on the :menuselection:`Rule Configuration` wizard is the :guilabel:`Profile` page. On this page, select whichever connection type applies to the network the Windows machine is operating on. Ideally, select :guilabel:`Private` only connections. The *Private* connection type is the most secure connection while allowing the selected port to communicate. Click :guilabel:`Next` to continue." +msgstr "" + +#: ../../content/applications/productivity/iot/config/windows_iot.rst:172 +msgid "Finally, assign a new, unique name to the rule. For example, this name can be `Odoo`. Optionally, add a brief description in the :guilabel:`Description` field. Click :guilabel:`Finish` to complete the :guilabel:`Rule Configuration` wizard. Now, the new rule is active and devices can connect to the Windows virtual :abbr:`IoT (Internet of Things)` box." +msgstr "" + +#: ../../content/applications/productivity/iot/config/windows_iot.rst:178 +msgid "Uninstalling Windows IoT" +msgstr "" + +#: ../../content/applications/productivity/iot/config/windows_iot.rst:180 +msgid "Uninstalling the Windows virtual :abbr:`IoT (Internet of Things)` box is done through the Windows program manager. Using any Windows version, search for `program`. Then, select :guilabel:`Add or Remove Programs` located in the control panel. Search for `Odoo` and click the :guilabel:`three dot menu` to uninstall." +msgstr "" + +#: ../../content/applications/productivity/iot/config/windows_iot.rst:185 +msgid "Confirm the un-installation and follow the steps to uninstall through the Odoo uninstall guide." +msgstr "" + #: ../../content/applications/productivity/iot/devices.rst:5 msgid "Devices" msgstr "" diff --git a/locale/sources/sales.pot b/locale/sources/sales.pot index 01d9bc3bd..7d178dedc 100644 --- a/locale/sources/sales.pot +++ b/locale/sources/sales.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: Odoo saas-16.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-06-03 06:55+0000\n" +"POT-Creation-Date: 2023-06-20 08:18+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -57,6 +57,7 @@ msgstr "" #: ../../content/applications/sales/crm/track_leads/lead_scoring.rst:44 #: ../../content/applications/sales/crm/track_leads/prospect_visits.rst:12 #: ../../content/applications/sales/point_of_sale/configuration.rst:6 +#: ../../content/applications/sales/point_of_sale/employee_login.rst:13 #: ../../content/applications/sales/point_of_sale/payment_methods/terminals/adyen.rst:13 #: ../../content/applications/sales/point_of_sale/payment_methods/terminals/ingenico.rst:12 #: ../../content/applications/sales/point_of_sale/payment_methods/terminals/six.rst:16 @@ -76,7 +77,6 @@ msgstr "" #: ../../content/applications/sales/sales/products_prices/products/variants.rst:23 #: ../../content/applications/sales/sales/send_quotations/orders_and_variants.rst:9 #: ../../content/applications/sales/sales/send_quotations/quote_template.rst:9 -#: ../../content/applications/sales/sales/send_quotations/terms_and_conditions.rst:16 #: ../../content/applications/sales/subscriptions/closing.rst:31 #: ../../content/applications/sales/subscriptions/upselling.rst:25 msgid "Configuration" @@ -1168,7 +1168,7 @@ msgid "From the **POS dashboard**, click :guilabel:`New Session`, and at the :gu msgstr "" #: ../../content/applications/sales/point_of_sale.rst:26 -msgid "Multiple users can be connected to the same session at the same time. However, the session can only be opened once on the same browser." +msgid ":doc:`Multiple users ` can be logged into the same session at the same time. However, the session can only be opened once on the same browser." msgstr "" #: ../../content/applications/sales/point_of_sale.rst:32 @@ -1176,7 +1176,7 @@ msgid "Sell products" msgstr "" #: ../../content/applications/sales/point_of_sale.rst:34 -msgid "Click products to add them to the cart. To change the **quantity**, click :guilabel:`Qty` and enter the number of products using the keypad. To add a **discount** or modify the product **price**, click respectively :guilabel:`% Disc` or :guilabel:`Price` and enter the amounts." +msgid "Click on products to add them to the cart. To change the **quantity**, click :guilabel:`Qty` and enter the number of products using the keypad. To add a **discount** or modify the product **price**, click respectively :guilabel:`% Disc` or :guilabel:`Price` and enter the amounts." msgstr "" #: ../../content/applications/sales/point_of_sale.rst:38 @@ -1196,42 +1196,30 @@ msgid "**Cash** is selected by default if you enter the amount without choosing msgstr "" #: ../../content/applications/sales/point_of_sale.rst:52 -msgid "Register customers" +msgid "Set customers" msgstr "" #: ../../content/applications/sales/point_of_sale.rst:54 -msgid "Registering your customers gives you the ability to grant them various privileges such as discounts, loyalty program, specific communication. It is also required if they want an invoice and registering them makes any future interaction with them faster." +msgid "You can create and set customers from an :ref:`open POS session `. Registering your customer is necessary to :doc:`collect their loyalty points and grant them rewards `, automatically apply the :doc:`attributed pricelist `, or :ref:`generate and print an invoice `." msgstr "" -#: ../../content/applications/sales/point_of_sale.rst:58 -msgid "From your session interface, use the customer button." -msgstr "" - -#: ../../content/applications/sales/point_of_sale.rst:62 -msgid "Create a new one by using this button." +#: ../../content/applications/sales/point_of_sale.rst:60 +msgid "To access the list of customers, click :guilabel:`Customer` on the POS interface. Then, select a customer or create a new one by clicking :guilabel:`Create`, completing the form, and saving." msgstr "" #: ../../content/applications/sales/point_of_sale.rst:66 -msgid "You will be invited to fill out the customer form with their information." -msgstr "" - -#: ../../content/applications/sales/point_of_sale.rst:71 -msgid "Use the save button when you are done. You can then select that customer in any future transactions." -msgstr "" - -#: ../../content/applications/sales/point_of_sale.rst:77 msgid "Customer notes" msgstr "" -#: ../../content/applications/sales/point_of_sale.rst:79 +#: ../../content/applications/sales/point_of_sale.rst:68 msgid "You can add **customer notes** about specific products directly from an open :ref:`POS session `. For instance, to provide cleaning and maintenance tips. They can also be used to track a customer's particular request, such as not wanting the product to be assembled for them." msgstr "" -#: ../../content/applications/sales/point_of_sale.rst:83 +#: ../../content/applications/sales/point_of_sale.rst:72 msgid "To do so, select a product and click :guilabel:`Customer Note` on the pad. Doing so opens a pop-up window in which you can add or modify content for the note." msgstr "" -#: ../../content/applications/sales/point_of_sale.rst:87 +#: ../../content/applications/sales/point_of_sale.rst:76 msgid "Product notes from an :doc:`imported SO ` are displayed identically in the cart." msgstr "" @@ -1239,7 +1227,7 @@ msgstr "" msgid "Customer note button and notes (SO and POS session) on products in the cart" msgstr "" -#: ../../content/applications/sales/point_of_sale.rst:93 +#: ../../content/applications/sales/point_of_sale.rst:82 msgid "Customer notes appear on customers' receipts and invoices similarly to how they appear in the cart, under the related product." msgstr "" @@ -1247,35 +1235,35 @@ msgstr "" msgid "Customer receipt with notes from an SO and from the customer note feature" msgstr "" -#: ../../content/applications/sales/point_of_sale.rst:102 +#: ../../content/applications/sales/point_of_sale.rst:91 msgid "Return and refund products" msgstr "" -#: ../../content/applications/sales/point_of_sale.rst:104 +#: ../../content/applications/sales/point_of_sale.rst:93 msgid "To return and refund a product," msgstr "" -#: ../../content/applications/sales/point_of_sale.rst:106 +#: ../../content/applications/sales/point_of_sale.rst:95 msgid ":ref:`start a session ` from the **POS dashboard**;" msgstr "" -#: ../../content/applications/sales/point_of_sale.rst:107 +#: ../../content/applications/sales/point_of_sale.rst:96 msgid "click :guilabel:`Refund` and select the corresponding order;" msgstr "" -#: ../../content/applications/sales/point_of_sale.rst:108 +#: ../../content/applications/sales/point_of_sale.rst:97 msgid "select the product and the quantity to refund using the keypad;" msgstr "" -#: ../../content/applications/sales/point_of_sale.rst:109 +#: ../../content/applications/sales/point_of_sale.rst:98 msgid "click :guilabel:`Refund` to go back to the previous screen;" msgstr "" -#: ../../content/applications/sales/point_of_sale.rst:110 +#: ../../content/applications/sales/point_of_sale.rst:99 msgid "once the order is completed, click :guilabel:`Payment` to proceed to the refund;" msgstr "" -#: ../../content/applications/sales/point_of_sale.rst:111 +#: ../../content/applications/sales/point_of_sale.rst:100 msgid "click :guilabel:`Validate` and :guilabel:`New Order` to move on to the next customer." msgstr "" @@ -1283,31 +1271,31 @@ msgstr "" msgid "refund view from a POS" msgstr "" -#: ../../content/applications/sales/point_of_sale.rst:117 +#: ../../content/applications/sales/point_of_sale.rst:106 msgid "You can filter the **orders list** by :guilabel:`Receipt Number`, :guilabel:`Date` or :guilabel:`Customer` using the search bar." msgstr "" -#: ../../content/applications/sales/point_of_sale.rst:119 +#: ../../content/applications/sales/point_of_sale.rst:108 msgid "You can also refund a product by selecting the returned product from an open session, and setting a negative quantity that equals the number of returned products. To do so, click :guilabel:`Qty` and :guilabel:`+/-`, followed by the quantity of returned products." msgstr "" -#: ../../content/applications/sales/point_of_sale.rst:126 +#: ../../content/applications/sales/point_of_sale.rst:115 msgid "Close the POS session" msgstr "" -#: ../../content/applications/sales/point_of_sale.rst:128 +#: ../../content/applications/sales/point_of_sale.rst:117 msgid "To close your session, click :guilabel:`Close` in the upper right corner of your screen; doing so opens the :guilabel:`Closing Control` pop-up screen. From this screen, you can retrieve various information:" msgstr "" -#: ../../content/applications/sales/point_of_sale.rst:132 +#: ../../content/applications/sales/point_of_sale.rst:121 msgid "the number of orders made and the total amount made during the session;" msgstr "" -#: ../../content/applications/sales/point_of_sale.rst:133 +#: ../../content/applications/sales/point_of_sale.rst:122 msgid "the expected amounts grouped by payment method." msgstr "" -#: ../../content/applications/sales/point_of_sale.rst:135 +#: ../../content/applications/sales/point_of_sale.rst:124 msgid "Before closing this window, count your cash using the calculator icon. Doing so opens a pop-up window that computes the total amount in the cash drawer depending on the coins and bills counted and added manually. Then, click :guilabel:`Confirm` or :guilabel:`Discard` to close the window. The computed amount is set in the :guilabel:`Counted` column, and the :guilabel:`Money Details` are specified in the **Notes** section." msgstr "" @@ -1315,23 +1303,23 @@ msgstr "" msgid "How to close a POS session." msgstr "" -#: ../../content/applications/sales/point_of_sale.rst:144 +#: ../../content/applications/sales/point_of_sale.rst:133 msgid "Once you are done controlling the amounts, click :guilabel:`Close Session` to close and go back to the **POS dashboard**." msgstr "" -#: ../../content/applications/sales/point_of_sale.rst:148 +#: ../../content/applications/sales/point_of_sale.rst:137 msgid "You can let the session open by clicking :guilabel:`Backend` or abort and keep selling by clicking :guilabel:`Discard`." msgstr "" -#: ../../content/applications/sales/point_of_sale.rst:150 +#: ../../content/applications/sales/point_of_sale.rst:139 msgid "Depending on your setup, you might only be allowed to close a session if the expected cash revenue equals the counted cash. To close it anyway, click :guilabel:`Ok` on the :guilabel:`Payments Difference` screen." msgstr "" -#: ../../content/applications/sales/point_of_sale.rst:155 +#: ../../content/applications/sales/point_of_sale.rst:144 msgid "It is strongly advised to close your POS session at the end of each day." msgstr "" -#: ../../content/applications/sales/point_of_sale.rst:156 +#: ../../content/applications/sales/point_of_sale.rst:145 msgid "To look at all your previous sessions, go to :menuselection:`Point of Sale --> Orders --> Sessions`." msgstr "" @@ -1764,75 +1752,71 @@ msgid ":doc:`epos_ssc`" msgstr "" #: ../../content/applications/sales/point_of_sale/employee_login.rst:3 -msgid "Log in with employee" +msgid "Multi-employee management" msgstr "" #: ../../content/applications/sales/point_of_sale/employee_login.rst:5 -msgid "With Odoo *Point of Sale*, you can manage multiple cashiers. This feature allows you to keep track of who is working, when and how much each cashier made for that session." +msgid "Odoo Point of Sale allows you to manage access to a specific POS by enabling the **Multi Employees per Session** feature. When activated, :ref:`you can select which users can log into the POS ` and :ref:`keep track of the employees involved in each order `." msgstr "" -#: ../../content/applications/sales/point_of_sale/employee_login.rst:9 -msgid "There are three ways to switch cashiers in Odoo: by *selecting the cashier*, by *entering a PIN code* or by *scanning a barcode*." +#: ../../content/applications/sales/point_of_sale/employee_login.rst:15 +msgid ":ref:`Access the POS settings ` and select your POS, or click the vertical ellipsis button (:guilabel:`ā‹®`) on a POS card and click :guilabel:`Edit`. Then, enable :guilabel:`Multi Employees per Session`, and add the allowed employees in the :guilabel:`Allowed Employees` field." msgstr "" -#: ../../content/applications/sales/point_of_sale/employee_login.rst:13 -msgid "To manage multiple cashiers, you need several employees (at least two)." +#: ../../content/applications/sales/point_of_sale/employee_login.rst:-1 +msgid "setting to enable multiple cashiers in POS" msgstr "" -#: ../../content/applications/sales/point_of_sale/employee_login.rst:18 -msgid "Set up log in with employees" +#: ../../content/applications/sales/point_of_sale/employee_login.rst:26 +msgid "Practical application" msgstr "" -#: ../../content/applications/sales/point_of_sale/employee_login.rst:20 -msgid "To enable the feature, go to your *PoS settings* and check log in with employees on your *PoS form*. Then, add the employees that have access to the cash register." +#: ../../content/applications/sales/point_of_sale/employee_login.rst:28 +msgid "Once the feature is activated, cashiers can log in :ref:`by scanning their badge ` or selecting their name from the list of allowed employees to :ref:`open the session `." msgstr "" -#: ../../content/applications/sales/point_of_sale/employee_login.rst:27 -msgid "Now, you can switch cashier easily." +#: ../../content/applications/sales/point_of_sale/employee_login.rst:-1 +msgid "window to open a session when the multiple cashiers feature is enabled" msgstr "" -#: ../../content/applications/sales/point_of_sale/employee_login.rst:30 -msgid "Switch without pin codes" +#: ../../content/applications/sales/point_of_sale/employee_login.rst:35 +msgid "To switch to another user :ref:`from an open session `, click the employee name at the top-right of the screen and select the employee to swap with from the list." msgstr "" -#: ../../content/applications/sales/point_of_sale/employee_login.rst:32 -msgid "The easiest way to switch cashiers is without a code. To do so, click on the cashier name in your PoS interface." +#: ../../content/applications/sales/point_of_sale/employee_login.rst:-1 +msgid "button to switch from one cashier to another." msgstr "" -#: ../../content/applications/sales/point_of_sale/employee_login.rst:38 -msgid "Now, you just have to click on your name." +#: ../../content/applications/sales/point_of_sale/employee_login.rst:41 +msgid "You can also require your employees to enter a pin code every time they log into a POS to prevent them from logging in as someone else. To define the code, go to the **Employees** app, open the employee form, and click the :guilabel:`HR settings` tab. Then, enter a pin code of your choice in the :guilabel:`PIN Code` field of the :guilabel:`Attendance/Point of Sale` category." msgstr "" -#: ../../content/applications/sales/point_of_sale/employee_login.rst:46 -msgid "Switch cashier with pin codes" +#: ../../content/applications/sales/point_of_sale/employee_login.rst:-1 +msgid "setting on the employee form to assign a badge ID and a PIN code." msgstr "" -#: ../../content/applications/sales/point_of_sale/employee_login.rst:48 -msgid "You can set a pin code on each cashier. To set up a pin code, go to the employee form and add a security PIN, in the *HR settings tab*." +#: ../../content/applications/sales/point_of_sale/employee_login.rst:52 +msgid "Log in using badges" msgstr "" #: ../../content/applications/sales/point_of_sale/employee_login.rst:54 -msgid "Now, when switching cashier, a PIN password will be asked." +msgid "For your employees to be able to log in by scanning their badge, they must have a badge ID assigned. To do so, go to the **Employees** app, open the employee form, and click the :guilabel:`HR settings` tab. Then, enter the badge ID of your choice in the :guilabel:`Badge ID` field of the :guilabel:`Attendance/Point of Sale` category or click :guilabel:`Generate`." msgstr "" -#: ../../content/applications/sales/point_of_sale/employee_login.rst:62 -msgid "Switch cashier with barcodes" +#: ../../content/applications/sales/point_of_sale/employee_login.rst:59 +msgid "To switch to another user, lock the session by clicking the lock-shaped icon (:guilabel:`šŸ”“`) at the top-right of the screen and scan your badge." msgstr "" -#: ../../content/applications/sales/point_of_sale/employee_login.rst:64 -msgid "You can ask your employees to log themselves with their badges. To do so, set up a barcode at the same place you add the PIN code. Print the badge and when they will scan it, the cashier will be switched to that employee." +#: ../../content/applications/sales/point_of_sale/employee_login.rst:65 +msgid "Analytics" msgstr "" -#: ../../content/applications/sales/point_of_sale/employee_login.rst:73 -msgid "Find who was the cashier" +#: ../../content/applications/sales/point_of_sale/employee_login.rst:67 +msgid "Once you close and post the POS session, access the comprehensive report to review all session activities, including who initiated the session and who handled specific orders. To access the session's report, click the vertical ellipsis button (:guilabel:`ā‹®`) on the POS card and select :guilabel:`Sessions` from the :guilabel:`View` section. Then, select a specific session for more detailed information, and click the :guilabel:`Orders` button to view a list of all orders placed during that session." msgstr "" -#: ../../content/applications/sales/point_of_sale/employee_login.rst:75 -msgid "Once you have closed your *PoS session*, you can have an overview of the amount each cashier sold for. To do so, go to the orders menu." -msgstr "" - -#: ../../content/applications/sales/point_of_sale/employee_login.rst:81 -msgid "Now, you can open the order and have a summary of the sold products." +#: ../../content/applications/sales/point_of_sale/employee_login.rst:74 +msgid "To get an overview of all orders, regardless of the session, click the vertical ellipsis button (:guilabel:`ā‹®`) on the POS card and select :guilabel:`Orders` from the :guilabel:`View` section." msgstr "" #: ../../content/applications/sales/point_of_sale/payment_methods.rst:5 @@ -2806,19 +2790,19 @@ msgstr "" msgid "You can filter the list of orders using the search bar. Type in your reference and click :guilabel:`Receipt Number`, :guilabel:`Date`, or :guilabel:`Customer`." msgstr "" -#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:39 +#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:40 msgid "Invoices" msgstr "" -#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:41 +#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:42 msgid "In Point of Sale, you can issue and print invoices upon payment at the cash register or retrieve all the past invoiced orders." msgstr "" -#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:45 +#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:46 msgid "Set a customer" msgstr "" -#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:47 +#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:48 msgid "First, you need to open a session and set your customer. Open the **POS interface** by going to :menuselection:`Point of Sale --> New session --> Open session`. Then, click :guilabel:`Customer` to access the list of **customers**." msgstr "" @@ -2826,23 +2810,23 @@ msgstr "" msgid "customer selection and creation button" msgstr "" -#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:54 +#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:55 msgid "From there, you can either set an existing customer by clicking their name or create a new one by clicking :guilabel:`Create`. Doing so opens a customer creation form to fill in with their information. Click :guilabel:`Save` to validate and set this new customer." msgstr "" -#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:59 +#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:60 msgid "You can also **edit** a customer's information by clicking :guilabel:`Details`." msgstr "" -#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:60 +#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:61 msgid "If you did not set your customer during the order, you can do so at the payment screen by clicking :guilabel:`Customer`." msgstr "" -#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:64 +#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:65 msgid "Invoice a customer" msgstr "" -#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:66 +#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:67 msgid "Once an order is done, click :guilabel:`Payment` to move to the **payment screen**. Click :guilabel:`Invoice` underneath the customer's name to enable issuing and printing invoices upon payment." msgstr "" @@ -2850,23 +2834,23 @@ msgstr "" msgid "button to generate an invoice in POS" msgstr "" -#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:73 +#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:74 msgid "Select the payment method and click :guilabel:`Validate`. The **invoice** is automatically issued and ready to be downloaded and/or printed." msgstr "" -#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:77 +#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:78 msgid "Retrieve invoices" msgstr "" -#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:79 +#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:80 msgid "To retrieve invoices from the **POS dashboard**," msgstr "" -#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:81 +#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:82 msgid "access all orders made through your POS by going to :menuselection:`Point of Sale --> Orders --> Orders`;" msgstr "" -#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:83 +#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:84 msgid "to access an order's invoice, open the **order form** by selecting the order, then click :guilabel:`Invoice`." msgstr "" @@ -2874,19 +2858,19 @@ msgstr "" msgid "invoice smart button from an order form" msgstr "" -#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:90 +#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:91 msgid "**Invoiced orders** can be identified by the :guilabel:`Invoiced` status in the :guilabel:`Status` column." msgstr "" -#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:92 +#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:93 msgid "You can filter the list of orders to invoiced orders by clicking :guilabel:`Filters` and :guilabel:`Invoiced`." msgstr "" -#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:96 +#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:97 msgid "QR codes to generate invoices" msgstr "" -#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:98 +#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:99 msgid "Customers can also request an invoice by scanning the **QR code** printed on their receipt. Upon scanning, they must fill in a form with their billing information and click :guilabel:`Get my invoice`. On the one hand, doing so generates an invoice available for download. On the other hand, the order status goes from :guilabel:`Paid` or :guilabel:`Posted` to :guilabel:`Invoiced` in the Odoo backend." msgstr "" @@ -2894,7 +2878,7 @@ msgstr "" msgid "order status change" msgstr "" -#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:107 +#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:108 msgid "To use this feature, you have to enable QR codes on receipts by going to :menuselection:`Point of Sale --> Configuration --> Settings`. Then, select the POS in the :guilabel:`Point of Sale` field, scroll down to the :guilabel:`Bills & Receipts` section and enable :guilabel:`Use QR code on ticket`." msgstr "" @@ -3358,7 +3342,7 @@ msgid "Log employees" msgstr "" #: ../../content/applications/sales/point_of_sale/shop/barcode.rst:60 -msgid "You can also use a barcode scanner to log your employees. To do so, :ref:`restrict access ` to the POS and :ref:`use barcodes to log your employees in ` your POS." +msgid "You can also use a barcode scanner to log your employees. To do so, :ref:`restrict access ` to the POS and :ref:`use barcodes to log your employees in ` your POS." msgstr "" #: ../../content/applications/sales/point_of_sale/shop/sales_order.rst:3 @@ -4461,28 +4445,59 @@ msgid "You can then invoice that first milestone." msgstr "" #: ../../content/applications/sales/sales/invoicing/proforma.rst:3 -#: ../../content/applications/sales/sales/invoicing/proforma.rst:22 -msgid "Send a pro-forma invoice" +msgid "Pro-forma invoices" msgstr "" #: ../../content/applications/sales/sales/invoicing/proforma.rst:5 -msgid "A pro-forma invoice is an abridged or estimated invoice in advance of a delivery of goods. It notes the kind and quantity of goods, their value, and other important information such as weight and transportation charges. Pro-forma invoices are commonly used as preliminary invoices with a quotation, or for customs purposes in importation. They differ from a normal invoice in not being a demand or request for payment." +msgid "A *pro-forma invoice* is an abridged or estimated invoice sent in advance of a delivery of goods. It notes the kind and quantity of goods, their value, and other important information, such as weight and transportation charges." msgstr "" -#: ../../content/applications/sales/sales/invoicing/proforma.rst:13 +#: ../../content/applications/sales/sales/invoicing/proforma.rst:9 +msgid "Pro-forma invoices are commonly used as preliminary invoices with a quotation. They are also used for customs purposes during importation. They differ from a normal invoice in that they are not a demand (or request) for payment." +msgstr "" + +#: ../../content/applications/sales/sales/invoicing/proforma.rst:14 msgid "Activate the feature" msgstr "" -#: ../../content/applications/sales/sales/invoicing/proforma.rst:15 -msgid "Go to :menuselection:`SALES --> Configuration --> Settings` and activate the *Pro-Forma Invoice* feature." +#: ../../content/applications/sales/sales/invoicing/proforma.rst:16 +msgid "In order to utilize pro-forma invoices, the *Pro-Forma Invoice* feature **must** be activated. To do that, navigate to :menuselection:`Sales app --> Configuration --> Settings`, and in the :guilabel:`Quotations & Orders` section, click the checkbox next to :guilabel:`Pro-Forma Invoice`. Then, click :guilabel:`Save` to save all changes." msgstr "" -#: ../../content/applications/sales/sales/invoicing/proforma.rst:24 -msgid "From any quotation or sales order, you know have an option to send a pro-forma invoice." +#: ../../content/applications/sales/sales/invoicing/proforma.rst:-1 +msgid "The Pro-Forma Invoice feature setting in the Odoo Sales application." msgstr "" -#: ../../content/applications/sales/sales/invoicing/proforma.rst:30 -msgid "When you click on send, Odoo will send an email with the pro-forma invoice in attachment." +#: ../../content/applications/sales/sales/invoicing/proforma.rst:26 +msgid "Send a pro-forma invoice" +msgstr "" + +#: ../../content/applications/sales/sales/invoicing/proforma.rst:28 +msgid "With the :guilabel:`Pro-Forma Invoice` feature activated, the option to send a pro-forma invoice is now available on any quotation or sales order, via the :guilabel:`Send Pro-Forma Invoice` button." +msgstr "" + +#: ../../content/applications/sales/sales/invoicing/proforma.rst:-1 +msgid "The Send Pro-Forma Invoice button on a typical sales order in Odoo Sales." +msgstr "" + +#: ../../content/applications/sales/sales/invoicing/proforma.rst:35 +msgid "When the :guilabel:`Send Pro-Forma Invoice` button is clicked, an email pop-up appears. The :guilabel:`Recipients` field is auto-populated with the customer from the sales order or quotation. Then, if needed, modify the :guilabel:`Subject` field and the body of the email. The pro-forma invoice is automatically added as an attachment to the email." +msgstr "" + +#: ../../content/applications/sales/sales/invoicing/proforma.rst:40 +msgid "When ready, click :guilabel:`Send`, and Odoo instantly sends the email, with the attached pro-forma invoice, to the customer." +msgstr "" + +#: ../../content/applications/sales/sales/invoicing/proforma.rst:-1 +msgid "The email pop-up window that appears with pro-forma invoice attached in Odoo Sales." +msgstr "" + +#: ../../content/applications/sales/sales/invoicing/proforma.rst:48 +msgid "To preview what the pro-forma invoice looks like, click on the PDF at the bottom of the email pop-up window *before* clicking :guilabel:`Send`. When clicked, the pro-forma invoice is downloaded instantly. Open that PDF to view (and review) the pro-forma invoice." +msgstr "" + +#: ../../content/applications/sales/sales/invoicing/proforma.rst:0 +msgid "Sample pro-forma invoice PDF from Odoo Sales." msgstr "" #: ../../content/applications/sales/sales/invoicing/time_materials.rst:3 @@ -4782,7 +4797,6 @@ msgid "The Odoo *Sales*, *eCommerce*, and *Point of Sale* applications allow use msgstr "" #: ../../content/applications/sales/sales/products_prices/loyalty_discount.rst:11 -#: ../../content/applications/sales/sales/send_quotations/different_addresses.rst:10 msgid "Configure the settings" msgstr "" @@ -5817,78 +5831,9 @@ msgstr "" #: ../../content/applications/sales/sales/send_quotations/get_paid_to_validate.rst:50 #: ../../content/applications/sales/sales/send_quotations/get_signature_to_validate.rst:51 #: ../../content/applications/sales/sales/send_quotations/optional_products.rst:65 -#: ../../content/applications/sales/sales/send_quotations/terms_and_conditions.rst:115 msgid ":doc:`quote_template`" msgstr "" -#: ../../content/applications/sales/sales/send_quotations/different_addresses.rst:3 -msgid "Deliver and invoice to different addresses" -msgstr "" - -#: ../../content/applications/sales/sales/send_quotations/different_addresses.rst:5 -msgid "People and businesses often use separate addresses for billing (invoicing) and shipping (delivery) purposes. With the Odoo *Sales* app, contacts can have different specified addresses for delivery and invoicing." -msgstr "" - -#: ../../content/applications/sales/sales/send_quotations/different_addresses.rst:12 -msgid "Go to :menuselection:`Invoicing --> Configuration --> Settings` and scroll down to the :guilabel:`Customer Invoices` section. Then, check the box next to :guilabel:`Customer Addresses`, and click :guilabel:`Save`." -msgstr "" - -#: ../../content/applications/sales/sales/send_quotations/different_addresses.rst:17 -msgid "Navigating through the *Invoicing* app will not be possible if the *Accounting* app has been installed. Instead, go through :menuselection:`Accounting --> Configuration --> Settings` to enable the :guilabel:`Customer Addresses` feature." -msgstr "" - -#: ../../content/applications/sales/sales/send_quotations/different_addresses.rst:-1 -msgid "Activate the Customer Addresses setting." -msgstr "" - -#: ../../content/applications/sales/sales/send_quotations/different_addresses.rst:26 -msgid "Configure the contact form" -msgstr "" - -#: ../../content/applications/sales/sales/send_quotations/different_addresses.rst:28 -msgid "Navigate to the :menuselection:`Contacts` app (or to :menuselection:`Sales --> Orders --> Customers`), and click on a customer to open their contact form." -msgstr "" - -#: ../../content/applications/sales/sales/send_quotations/different_addresses.rst:31 -msgid "Under the :guilabel:`Contacts & Addresses` tab, click :guilabel:`Add`." -msgstr "" - -#: ../../content/applications/sales/sales/send_quotations/different_addresses.rst:-1 -msgid "Add a contact/address to the contact form" -msgstr "" - -#: ../../content/applications/sales/sales/send_quotations/different_addresses.rst:37 -msgid "Then, select which type of address to add to the contact form (i.e. :guilabel:`Invoice Address` or :guilabel:`Delivery Address`)." -msgstr "" - -#: ../../content/applications/sales/sales/send_quotations/different_addresses.rst:-1 -msgid "Create a new contact/address on a contact form." -msgstr "" - -#: ../../content/applications/sales/sales/send_quotations/different_addresses.rst:44 -msgid "Enter the address information. Then click :guilabel:`Save & Close` to save the address and close the :guilabel:`Create Contact` window. Or, click :guilabel:`Save & New` to save this address and immediately input another one." -msgstr "" - -#: ../../content/applications/sales/sales/send_quotations/different_addresses.rst:49 -msgid "Add addresses to the quotation" -msgstr "" - -#: ../../content/applications/sales/sales/send_quotations/different_addresses.rst:51 -msgid "When a customer is added to a quotation, the :guilabel:`Invoice Address` and :guilabel:`Delivery Address` fields will autopopulate according to the addresses specified on the customer's contact form." -msgstr "" - -#: ../../content/applications/sales/sales/send_quotations/different_addresses.rst:-1 -msgid "Invoice and Delivery Addresses autopopulate on a quotation." -msgstr "" - -#: ../../content/applications/sales/sales/send_quotations/different_addresses.rst:59 -msgid "The :guilabel:`Invoice Address` and :guilabel:`Delivery Address` can also be edited directly from the quotation by clicking on the :guilabel:`Internal link` buttons next to each address line." -msgstr "" - -#: ../../content/applications/sales/sales/send_quotations/different_addresses.rst:62 -msgid "These addresses can be updated at any time to ensure accurate invoicing and delivery." -msgstr "" - #: ../../content/applications/sales/sales/send_quotations/get_paid_to_validate.rst:3 msgid "Get paid to confirm an order" msgstr "" @@ -6127,217 +6072,99 @@ msgid "Line items for grid variants." msgstr "" #: ../../content/applications/sales/sales/send_quotations/quote_template.rst:3 -msgid "Use quotation templates" +msgid "Quotation templates" msgstr "" #: ../../content/applications/sales/sales/send_quotations/quote_template.rst:5 -msgid "By creating custom quotation templates, you will save a lot of time. Indeed, with the use of templates, you will be able to send complete quotations at a fast pace." +msgid "Using quotation templates speeds up the creation of sales orders by filling in most quotation fields automatically." msgstr "" #: ../../content/applications/sales/sales/send_quotations/quote_template.rst:11 -msgid "To enable this feature, go to :menuselection:`Sales --> Configuration --> Settings` and activate **Quotation Templates**." +msgid "Go to :menuselection:`Sales --> Configuration --> Settings` and enable :guilabel:`Quotation Templates`." msgstr "" -#: ../../content/applications/sales/sales/send_quotations/quote_template.rst:-1 -msgid "How to enable quotation templates on Odoo Sales?" +#: ../../content/applications/sales/sales/send_quotations/quote_template.rst:15 +msgid "Create a template" msgstr "" -#: ../../content/applications/sales/sales/send_quotations/quote_template.rst:19 -msgid "For even more convenience, it is also recommended to add the **Quotation Builder** feature which will help you design your quotation templates very easily. This option will automatically install the Odoo Website App." +#: ../../content/applications/sales/sales/send_quotations/quote_template.rst:17 +msgid "Go to :menuselection:`Sales --> Configuration --> Quotations Templates` and click :guilabel:`New`." msgstr "" -#: ../../content/applications/sales/sales/send_quotations/quote_template.rst:-1 -msgid "How to enable quotation builder on Odoo Sales?" +#: ../../content/applications/sales/sales/send_quotations/quote_template.rst:20 +msgid "Apart from the name, all template fields are optional." +msgstr "" + +#: ../../content/applications/sales/sales/send_quotations/quote_template.rst:22 +msgid "After having named the template, choose default values for the following fields:" +msgstr "" + +#: ../../content/applications/sales/sales/send_quotations/quote_template.rst:24 +msgid ":guilabel:`Quotation expires after`: choose the number of days for which the quotation is valid." +msgstr "" + +#: ../../content/applications/sales/sales/send_quotations/quote_template.rst:25 +msgid ":guilabel:`Online confirmation`: after sending the quotation by email, it is possible to ask the customer to confirm it online on their customer portal:" +msgstr "" + +#: ../../content/applications/sales/sales/send_quotations/quote_template.rst:28 +msgid "by providing a :guilabel:`Signature`," msgstr "" #: ../../content/applications/sales/sales/send_quotations/quote_template.rst:29 -msgid "Create your first template" +msgid "by making a :guilabel:`Payment`," msgstr "" -#: ../../content/applications/sales/sales/send_quotations/quote_template.rst:31 -msgid "Quotation templates are under :menuselection:`Sales --> Configuration`." +#: ../../content/applications/sales/sales/send_quotations/quote_template.rst:30 +msgid "or both." msgstr "" -#: ../../content/applications/sales/sales/send_quotations/quote_template.rst:33 -msgid "You can create a new template or edit an existing one. Once named, you will be able to select products and quantities as well as the expiration time of the quotation." +#: ../../content/applications/sales/sales/send_quotations/quote_template.rst:32 +msgid ":guilabel:`Confirmation Mail`: select an email template to automatically send an email to the customer upon confirming the quotation." +msgstr "" + +#: ../../content/applications/sales/sales/send_quotations/quote_template.rst:35 +msgid "On the :guilabel:`Lines` tab, add the default products and their quantity. Add :doc:`optional products ` in the :guilabel:`Optional Products` tab." +msgstr "" + +#: ../../content/applications/sales/sales/send_quotations/quote_template.rst:38 +msgid "Finally, add any specific sales terms and conditions on the :guilabel:`Terms & Conditions` tab." +msgstr "" + +#: ../../content/applications/sales/sales/send_quotations/quote_template.rst:41 +msgid "If the terms and conditions are standard across all quotations, :doc:`set them globally in the Accounting/Invoicing settings ` instead." +msgstr "" + +#: ../../content/applications/sales/sales/send_quotations/quote_template.rst:46 +msgid "Design a template" +msgstr "" + +#: ../../content/applications/sales/sales/send_quotations/quote_template.rst:48 +msgid "Customize the appearance of quotations on the customer portal by going to :menuselection:`Sales --> Configuration --> Settings` and enabling the :guilabel:`Quotation Builder` feature." +msgstr "" + +#: ../../content/applications/sales/sales/send_quotations/quote_template.rst:52 +msgid "If necessary, Odoo automatically activates the :doc:`Website ` app when enabling this feature." +msgstr "" + +#: ../../content/applications/sales/sales/send_quotations/quote_template.rst:55 +msgid "Select a template by going to :menuselection:`Sales --> Configuration --> Quotations Templates` and clicking on a template. Then click the :guilabel:`Design Template` button. On the website builder, click :guilabel:`Edit`. Drag and drop the building blocks, edit the content, and :guilabel:`Save`." msgstr "" #: ../../content/applications/sales/sales/send_quotations/quote_template.rst:-1 -msgid "Create a new quotation template on Odoo Sales" -msgstr "" - -#: ../../content/applications/sales/sales/send_quotations/quote_template.rst:42 -msgid "Design your template" -msgstr "" - -#: ../../content/applications/sales/sales/send_quotations/quote_template.rst:44 -msgid "You will have the possibility to design your template and edit the customer interface in order to manage what clients will see before accepting and paying the quotation. For example, you will be able to describe your company, your services and your products. To do so, you can click on **Edit** and you will be brought to the quotation builder." -msgstr "" - -#: ../../content/applications/sales/sales/send_quotations/quote_template.rst:-1 -msgid "Design your quotation template on Odoo Sales" -msgstr "" - -#: ../../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:-1 -msgid "Drag & drop building blocks to create your quotation template on Odoo Sales" +msgid "Using the quotation builder" msgstr "" #: ../../content/applications/sales/sales/send_quotations/quote_template.rst:63 -msgid "Use a quotation template" +msgid "Use a template" msgstr "" #: ../../content/applications/sales/sales/send_quotations/quote_template.rst:65 -msgid "When creating a quotation, you can choose a specific template." +msgid "When creating a quotation, choose a template under the :guilabel:`Quotation Template` field. All the fields are then filled accordingly. Manually edit any pre-filled field if needed." msgstr "" -#: ../../content/applications/sales/sales/send_quotations/quote_template.rst:-1 -msgid "Select a specific template on Odoo Sales" -msgstr "" - -#: ../../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:77 -msgid "Confirm the quotation" -msgstr "" - -#: ../../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:-1 -msgid "Allow your customers to sign electronically or to pay online on Odoo Sales" -msgstr "" - -#: ../../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: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:93 -#: ../../content/applications/sales/sales/send_quotations/terms_and_conditions.rst:117 -msgid ":doc:`get_paid_to_validate`" -msgstr "" - -#: ../../content/applications/sales/sales/send_quotations/terms_and_conditions.rst:3 -msgid "Add terms & conditions" -msgstr "" - -#: ../../content/applications/sales/sales/send_quotations/terms_and_conditions.rst:5 -msgid "Specifying terms and conditions is essential to set out important contractual points such as payment terms, limitation of liability and delivery terms between customers and sellers. Every seller must declare all formal information concerning products and company policy. On the other hand, each customer must take note of all these conditions before committing to anything. With Odoo Sales, it is very easy to include your default terms and conditions on every quotation, sales order, and invoice that you manage." -msgstr "" - -#: ../../content/applications/sales/sales/send_quotations/terms_and_conditions.rst:13 -msgid "Default Terms & Conditions" -msgstr "" - -#: ../../content/applications/sales/sales/send_quotations/terms_and_conditions.rst:18 -msgid "Go to :menuselection:`Accounting --> Configuration --> Settings` and activate *Default Terms & Conditions*." -msgstr "" - -#: ../../content/applications/sales/sales/send_quotations/terms_and_conditions.rst:-1 -msgid "How to enable Default Terms & Conditions on Odoo Sales?" -msgstr "" - -#: ../../content/applications/sales/sales/send_quotations/terms_and_conditions.rst:27 -msgid "Please note that this feature is activated via the settings of the **Invoicing App** and **not** via the settings of the **Sales App**. Moreover, you don't need to install the invoicing application since it is done automatically with the installation of the sales application." -msgstr "" - -#: ../../content/applications/sales/sales/send_quotations/terms_and_conditions.rst:32 -msgid "DT&C on your quotations, sales orders, and invoices" -msgstr "" - -#: ../../content/applications/sales/sales/send_quotations/terms_and_conditions.rst:34 -msgid "In the settings of the **Invoicing App**, you have the possibility to insert your default terms and conditions." -msgstr "" - -#: ../../content/applications/sales/sales/send_quotations/terms_and_conditions.rst:-1 -msgid "Default Terms & Conditions on quotation on Odoo Sales" -msgstr "" - -#: ../../content/applications/sales/sales/send_quotations/terms_and_conditions.rst:42 -msgid "They appear subsequently on every quotation, sales order, and invoice." -msgstr "" - -#: ../../content/applications/sales/sales/send_quotations/terms_and_conditions.rst:45 -msgid "DT&C on your quotation templates" -msgstr "" - -#: ../../content/applications/sales/sales/send_quotations/terms_and_conditions.rst:47 -msgid "According to your business needs, you can specify your terms and conditions on your quotation templates. This is interesting if you have different terms and conditions within your company." -msgstr "" - -#: ../../content/applications/sales/sales/send_quotations/terms_and_conditions.rst:-1 -msgid "Add Default Terms & Conditions to your quotation templates on Odoo Sales" -msgstr "" - -#: ../../content/applications/sales/sales/send_quotations/terms_and_conditions.rst:56 -msgid "Be sure to check out our documentation about quotation templates: :doc:`quote_template`, to master each step of this amazing feature." -msgstr "" - -#: ../../content/applications/sales/sales/send_quotations/terms_and_conditions.rst:60 -msgid "General Terms & Conditions" -msgstr "" - -#: ../../content/applications/sales/sales/send_quotations/terms_and_conditions.rst:63 -msgid "GT&C on your website" -msgstr "" - -#: ../../content/applications/sales/sales/send_quotations/terms_and_conditions.rst:65 -msgid "Use the **Website App** and create your own general terms and conditions page. For example, here is the Odoo terms and conditions page:" -msgstr "" - -#: ../../content/applications/sales/sales/send_quotations/terms_and_conditions.rst:-1 -msgid "General Terms & Conditions on your website" -msgstr "" - -#: ../../content/applications/sales/sales/send_quotations/terms_and_conditions.rst:73 -msgid "You can refer to this page in the footer of all your documents. The layout is available in the **General Settings** under the **Business Documents** category. For example, this footer appears in every document from Odoo." -msgstr "" - -#: ../../content/applications/sales/sales/send_quotations/terms_and_conditions.rst:-1 -msgid "General Terms & Conditions in your business documents" -msgstr "" - -#: ../../content/applications/sales/sales/send_quotations/terms_and_conditions.rst:83 -msgid "GT&C as attachment in your emails" -msgstr "" - -#: ../../content/applications/sales/sales/send_quotations/terms_and_conditions.rst:85 -msgid "Attach an external document with your general terms and conditions when you are about to send your quotation by email to your customers." -msgstr "" - -#: ../../content/applications/sales/sales/send_quotations/terms_and_conditions.rst:-1 -msgid "General Terms & conditions as attachment in your email" -msgstr "" - -#: ../../content/applications/sales/sales/send_quotations/terms_and_conditions.rst:94 -msgid "GT&C as attachment in your quotation templates" -msgstr "" - -#: ../../content/applications/sales/sales/send_quotations/terms_and_conditions.rst:96 -msgid "Create and edit email templates to set a default attachment for all quotation emails that you will send in the future. To do so, you have to go to :menuselection:`Sales --> Configuration --> Quotation templates` and create a new quotation template or modify an existing one. Under the confirmation tab, you are now able to activate online signatures, online payments and to set a confirmation mail in which you have the possibility to configure the default attachment. There, you can put your general terms & conditions." -msgstr "" - -#: ../../content/applications/sales/sales/send_quotations/terms_and_conditions.rst:-1 -msgid "General Terms & conditions as attachment in your quotation templates" -msgstr "" - -#: ../../content/applications/sales/sales/send_quotations/terms_and_conditions.rst:109 -msgid "To customize your email templates, activate the **developer mode** and go to :menuselection:`Settings --> Technical --> Email --> Templates`." -msgstr "" - -#: ../../content/applications/sales/sales/send_quotations/terms_and_conditions.rst:112 -msgid "With Odoo Sales it is now very simple to deal with terms & conditions." +#: ../../content/applications/sales/sales/send_quotations/quote_template.rst:69 +msgid "Go to :menuselection:`Sales --> Configuration --> Settings` to select a :guilabel:`Default Template`." msgstr "" #: ../../content/applications/sales/subscriptions.rst:5 @@ -6405,7 +6232,7 @@ msgid "Fill out the quotation normally, making sure to select a recurrence and a msgstr "" #: ../../content/applications/sales/subscriptions.rst:42 -msgid "You can define different invoice and delivery addresses by enabling the :doc:`Customer Addresses ` feature." +msgid "You can define different invoice and delivery addresses by enabling the :doc:`Customer Addresses ` feature." msgstr "" #: ../../content/applications/sales/subscriptions.rst:48 @@ -6778,7 +6605,7 @@ msgid "In the :guilabel:`Optional Products` tab, enter any optional products tha msgstr "" #: ../../content/applications/sales/subscriptions/plans.rst:77 -msgid "If the subscription plan has unique :doc:`terms and conditions `, add them in the :guilabel:`Terms & Conditions` tab. If terms conditions are specified on a plan, these will be used instead of the default terms and conditions set up in the *Sales* app settings." +msgid "If the subscription plan has unique :doc:`terms and conditions `, add them in the :guilabel:`Terms & Conditions` tab. If terms conditions are specified on a plan, these will be used instead of the default terms and conditions set up in the *Sales* app settings." msgstr "" #: ../../content/applications/sales/subscriptions/plans.rst:-1 diff --git a/locale/sources/services.pot b/locale/sources/services.pot index b4a752bb8..490c2b097 100644 --- a/locale/sources/services.pot +++ b/locale/sources/services.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: Odoo saas-16.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-06-03 06:55+0000\n" +"POT-Creation-Date: 2023-06-20 08:18+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -45,7 +45,6 @@ msgid ":doc:`../../inventory_and_mrp/inventory`" msgstr "" #: ../../content/applications/services/field_service/default_warehouse.rst:16 -#: ../../content/applications/services/helpdesk/timesheet_and_invoice/reinvoice_from_project.rst:13 #: ../../content/applications/services/project/project_management.rst:17 msgid "Configuration" msgstr "" @@ -594,6 +593,290 @@ msgstr "" msgid "Customers with access to the portal will be able to view their tickets under :menuselection:`My Account --> Tickets`." msgstr "" +#: ../../content/applications/services/helpdesk/advanced/track_and_bill.rst:3 +msgid "Track and bill time" +msgstr "" + +#: ../../content/applications/services/helpdesk/advanced/track_and_bill.rst:5 +msgid "Odoo *Helpdesk* provides teams with the ability to track the amount of hours spent working on a ticket, and to bill a customer for that time. Through integrations with the *Sales*, *Timesheets* and *Accounting* applications, customers can be charged once the work is completed, or before it has even begun." +msgstr "" + +#: ../../content/applications/services/helpdesk/advanced/track_and_bill.rst:11 +msgid "Since the *Track & Bill Time* features require integration with other applications, enabling them may result in the installation of additional modules (or applications)." +msgstr "" + +#: ../../content/applications/services/helpdesk/advanced/track_and_bill.rst:14 +msgid "Installing a new application on a *One-App-Free* database triggers a 15-day trial. At the end of the trial, if a paid subscription has not been added to the database, it will no longer be active or accessible." +msgstr "" + +#: ../../content/applications/services/helpdesk/advanced/track_and_bill.rst:19 +msgid "Configure track and bill time features" +msgstr "" + +#: ../../content/applications/services/helpdesk/advanced/track_and_bill.rst:21 +msgid "Before a customer can be invoiced for support services, the *Track & Bill Time* features must first be enabled. These features must be enabled on each *Helpdesk* team where they will be utilized." +msgstr "" + +#: ../../content/applications/services/helpdesk/advanced/track_and_bill.rst:25 +msgid "Enable track and bill time on a helpdesk team" +msgstr "" + +#: ../../content/applications/services/helpdesk/advanced/track_and_bill.rst:27 +msgid "To view and enable the :guilabel:`Track & Bill Time` features on a *Helpdesk* team, first navigate to :menuselection:`Helpdesk --> Configuration --> Teams`. Then select a team from the list or :doc:`create a new one `. This will reveal a team's settings page." +msgstr "" + +#: ../../content/applications/services/helpdesk/advanced/track_and_bill.rst:32 +msgid "On the team's settings page, scroll to the :guilabel:`Track & Bill Time` section. Check the boxes labeled :guilabel:`Timesheets` and :guilabel:`Time Billing`." +msgstr "" + +#: ../../content/applications/services/helpdesk/advanced/track_and_bill.rst:35 +msgid "Once the :guilabel:`Timesheets` box is checked, a new field appears, labeled :guilabel:`Project`." +msgstr "" + +#: ../../content/applications/services/helpdesk/advanced/track_and_bill.rst:37 +msgid "The project selected in this field is where all the timesheets for this team's tickets will be recorded. Click into the drop-down menu to select a :guilabel:`Project`." +msgstr "" + +#: ../../content/applications/services/helpdesk/advanced/track_and_bill.rst:40 +msgid "To create a new project where the timesheets will be recorded, click into the drop-down menu, type a name for the project, and then click :guilabel:`Create`." +msgstr "" + +#: ../../content/applications/services/helpdesk/advanced/track_and_bill.rst:-1 +msgid "View of a helpdesk team settings page emphasizing the track and bill time settings." +msgstr "" + +#: ../../content/applications/services/helpdesk/advanced/track_and_bill.rst:50 +msgid "Configure service products" +msgstr "" + +#: ../../content/applications/services/helpdesk/advanced/track_and_bill.rst:52 +msgid "When the :guilabel:`Time Billing` feature is enabled, a new product is created in the *Sales* app called :guilabel:`Service on Timesheets`. This product can be found under :menuselection:`Sales --> Products --> Products`. Search for `Service on Timesheets` in the :guilabel:`Search...` bar. This is the product that will be used when invoicing for *post-paid support services* after they have been completed." +msgstr "" + +#: ../../content/applications/services/helpdesk/advanced/track_and_bill.rst:58 +msgid "Select :guilabel:`Service on Timesheets` from the product page. This reveals the product detail form. The product is configured with the :guilabel:`Product Type` set to :guilabel:`Service` and the :guilabel:`Invoicing Policy` set to :guilabel:`Based on Timesheets`." +msgstr "" + +#: ../../content/applications/services/helpdesk/advanced/track_and_bill.rst:-1 +msgid "View of a service product with the invoicing policy set to 'Based on timesheets'." +msgstr "" + +#: ../../content/applications/services/helpdesk/advanced/track_and_bill.rst:66 +msgid "In order to invoice for support services before the work has been completed (also known as *prepaid support services*), a separate product with a different invoicing policy must be created." +msgstr "" + +#: ../../content/applications/services/helpdesk/advanced/track_and_bill.rst:69 +msgid "To create a new service product, go to :menuselection:`Sales --> Products --> Products` and click :guilabel:`New`. This will reveal a blank product detail form." +msgstr "" + +#: ../../content/applications/services/helpdesk/advanced/track_and_bill.rst:72 +msgid "On the new product form, add a :guilabel:`Product Name`, and set the :guilabel:`Product Type` to :guilabel:`Service`. Then, set the :guilabel:`Invoicing Policy` to :guilabel:`Prepaid/Fixed Price`. This means an invoice can be generated and payment can be received for this product before any timesheets entries have been recorded for these services." +msgstr "" + +#: ../../content/applications/services/helpdesk/advanced/track_and_bill.rst:-1 +msgid "View of a service product with the invoicing policy set to 'prepaid/fixed'." +msgstr "" + +#: ../../content/applications/services/helpdesk/advanced/track_and_bill.rst:81 +msgid "Finally, set the :guilabel:`Sales Price`, and confirm that the :guilabel:`Unit of Measure` is set to :guilabel:`Hours`." +msgstr "" + +#: ../../content/applications/services/helpdesk/advanced/track_and_bill.rst:85 +msgid "Invoice prepaid support services" +msgstr "" + +#: ../../content/applications/services/helpdesk/advanced/track_and_bill.rst:87 +msgid "When support services are billed on a fixed price, an invoice can be created before any work is completed on the issue. In this case, a service product with the invoicing policy set to :guilabel:`Prepaid/Fixed Price` would be used, just like :ref:`the section above `." +msgstr "" + +#: ../../content/applications/services/helpdesk/advanced/track_and_bill.rst:93 +msgid "Create a sales order with prepaid product" +msgstr "" + +#: ../../content/applications/services/helpdesk/advanced/track_and_bill.rst:95 +msgid "To invoice a customer for prepaid support services, first create a sales order (SO) with the support services product. To do this, go to :menuselection:`Sales --> Orders --> Quotations --> New`, which reveals a blank quotation form." +msgstr "" + +#: ../../content/applications/services/helpdesk/advanced/track_and_bill.rst:99 +msgid "Then, fill out the quotation form with the customer information." +msgstr "" + +#: ../../content/applications/services/helpdesk/advanced/track_and_bill.rst:101 +msgid "Go to the :guilabel:`Order Lines` tab of the quotation and click :guilabel:`Add a Product`. Then, select the *prepaid services product* configured in the steps above. Update the :guilabel:`Quantity` field with the number of hours." +msgstr "" + +#: ../../content/applications/services/helpdesk/advanced/track_and_bill.rst:105 +msgid "After updating any other necessary information, :guilabel:`Confirm` the quotation. This converts the quotation into an :abbr:`SO (sales order)`." +msgstr "" + +#: ../../content/applications/services/helpdesk/advanced/track_and_bill.rst:109 +msgid "Create and send an invoice for prepaid services" +msgstr "" + +#: ../../content/applications/services/helpdesk/advanced/track_and_bill.rst:111 +msgid "Once the :abbr:`SO (sales order)` has been confirmed, click the :guilabel:`Create Invoice` button. This will open a :guilabel:`Create Invoices` pop-up window." +msgstr "" + +#: ../../content/applications/services/helpdesk/advanced/track_and_bill.rst:114 +msgid "If no down payment will be collected, the :guilabel:`Create Invoice` type can remain as :guilabel:`Regular Invoice`. If a down payment will be collected, choose between either :guilabel:`Down payment (percentage)` or :guilabel:`Down payment (fixed amount)`." +msgstr "" + +#: ../../content/applications/services/helpdesk/advanced/track_and_bill.rst:118 +msgid "When the necessary information has been entered, click :guilabel:`Create Draft Invoice`." +msgstr "" + +#: ../../content/applications/services/helpdesk/advanced/track_and_bill.rst:120 +msgid "The invoice can then be sent to the customer for payment." +msgstr "" + +#: ../../content/applications/services/helpdesk/advanced/track_and_bill.rst:123 +msgid "Create helpdesk ticket for prepaid services" +msgstr "" + +#: ../../content/applications/services/helpdesk/advanced/track_and_bill.rst:125 +msgid "To create a *Helpdesk* ticket for prepaid services, navigate to :menuselection:`Helpdesk` and click the :guilabel:`Tickets` button to reveal a specific team's pipeline. Click :guilabel:`New` to create a new ticket." +msgstr "" + +#: ../../content/applications/services/helpdesk/advanced/track_and_bill.rst:129 +msgid "On the blank ticket form, create a ticket :guilabel:`Title`, and enter the :guilabel:`Customer` information." +msgstr "" + +#: ../../content/applications/services/helpdesk/advanced/track_and_bill.rst:132 +msgid "When the customer name is added, the :guilabel:`Sales Order Item` field will automatically populate with the most recent prepaid sales order item that has time remaining." +msgstr "" + +#: ../../content/applications/services/helpdesk/advanced/track_and_bill.rst:136 +msgid "Track hours on helpdesk ticket" +msgstr "" + +#: ../../content/applications/services/helpdesk/advanced/track_and_bill.rst:138 +msgid "Time spent working on a *Helpdesk* ticket is tracked on the *Timesheets* tab on the specific ticket." +msgstr "" + +#: ../../content/applications/services/helpdesk/advanced/track_and_bill.rst:140 +msgid "On the ticket detail form, click on the :guilabel:`Timesheets` tab and click :guilabel:`Add a line`. Choose an :guilabel:`Employee`, add a :guilabel:`Description` of the task, and enter the number of :guilabel:`Hours Spent`." +msgstr "" + +#: ../../content/applications/services/helpdesk/advanced/track_and_bill.rst:144 +msgid "As new lines are added to :guilabel:`Timesheets` tab, the :guilabel:`Remaining Hours on SO` field is automatically updated." +msgstr "" + +#: ../../content/applications/services/helpdesk/advanced/track_and_bill.rst:-1 +msgid "View of the timesheets tab on a ticket with an emphasis on the remaining hours on an SO." +msgstr "" + +#: ../../content/applications/services/helpdesk/advanced/track_and_bill.rst:152 +msgid "If the number of hours on the :guilabel:`Timesheets` tab exceeds the number of hours sold, the :guilabel:`Remaining Hours of SO` will turn red." +msgstr "" + +#: ../../content/applications/services/helpdesk/advanced/track_and_bill.rst:155 +msgid "As hours are added to the :guilabel:`Timesheets` tab, they are automatically updated in the :guilabel:`Delivered` field on the :abbr:`SO (sales order)`, as well." +msgstr "" + +#: ../../content/applications/services/helpdesk/advanced/track_and_bill.rst:159 +msgid "Invoice post-paid support services" +msgstr "" + +#: ../../content/applications/services/helpdesk/advanced/track_and_bill.rst:161 +msgid "When support services are billed based on the amount of time spent on an issue, an invoice cannot be created before the total number of hours required to solve the problem have been entered on a timesheet. In this case, a service product with the invoicing policy set to :guilabel:`Based on Timesheets` would be used, like the one created above." +msgstr "" + +#: ../../content/applications/services/helpdesk/advanced/track_and_bill.rst:167 +msgid "Create a sales order with a time-tracked product" +msgstr "" + +#: ../../content/applications/services/helpdesk/advanced/track_and_bill.rst:169 +msgid "To invoice a customer for post-paid support services, first create a sales order (SO) with the *support services product*. To do this, go to :menuselection:`Sales --> Orders --> Quotations --> New`." +msgstr "" + +#: ../../content/applications/services/helpdesk/advanced/track_and_bill.rst:173 +msgid "Fill out the quotation with the customer information." +msgstr "" + +#: ../../content/applications/services/helpdesk/advanced/track_and_bill.rst:175 +msgid "On the :guilabel:`Order Lines` tab, click :guilabel:`Add a Product`. Select the post-paid services product configured in the steps above. After updating any other necessary information, :guilabel:`Confirm` the quotation." +msgstr "" + +#: ../../content/applications/services/helpdesk/advanced/track_and_bill.rst:180 +msgid "Unlike with the prepaid services quotation, Odoo will not allow an invoice to be created at this time. That is because no services have been performed; in other words nothing has been delivered, therefore, there is nothing to invoice." +msgstr "" + +#: ../../content/applications/services/helpdesk/advanced/track_and_bill.rst:185 +msgid "Create a helpdesk ticket for time-tracked services" +msgstr "" + +#: ../../content/applications/services/helpdesk/advanced/track_and_bill.rst:187 +msgid "To record a *Timesheet* entry for time-tracker services, go to :menuselection:`Helpdesk` and select the appropriate team for which these services apply." +msgstr "" + +#: ../../content/applications/services/helpdesk/advanced/track_and_bill.rst:190 +msgid "If there is already an existing ticket for this issue, select it from the kanban view. This will open the ticket details form. If there is no existing ticket for this customer issue, click :guilabel:`New` to create a new ticket and enter the necessary customer information on the blank ticket details form." +msgstr "" + +#: ../../content/applications/services/helpdesk/advanced/track_and_bill.rst:195 +msgid "After selecting or creating a ticket, go to the :guilabel:`Sales Order Line` drop-down menu. Select the :abbr:`SO (sales order)` created in the previous step." +msgstr "" + +#: ../../content/applications/services/helpdesk/advanced/track_and_bill.rst:199 +msgid "Track support hours on a ticket" +msgstr "" + +#: ../../content/applications/services/helpdesk/advanced/track_and_bill.rst:201 +msgid "In order to create an invoice for a product based on timesheets, hours need to be tracked and recorded. At this point, the service is considered *delivered*. To record hours for this support service, click on the :guilabel:`Timesheets` tab of the ticket." +msgstr "" + +#: ../../content/applications/services/helpdesk/advanced/track_and_bill.rst:205 +msgid "Click :guilabel:`Add a Line` to record a new entry. Select an :guilabel:`Employee` from the drop-down menu, and record the time spent in the :guilabel:`Hours Spent` column." +msgstr "" + +#: ../../content/applications/services/helpdesk/advanced/track_and_bill.rst:208 +msgid "Repeat these steps as needed until all time spent on the issues has been recorded." +msgstr "" + +#: ../../content/applications/services/helpdesk/advanced/track_and_bill.rst:-1 +msgid "View of the timesheets tab on a helpdesk ticket." +msgstr "" + +#: ../../content/applications/services/helpdesk/advanced/track_and_bill.rst:215 +msgid "Create an invoice for hours tracked on a ticket" +msgstr "" + +#: ../../content/applications/services/helpdesk/advanced/track_and_bill.rst:217 +msgid "After the customer's issue has been solved, and it is determined no new timesheet entries will be made, an invoice can be created, and the customer can be billed." +msgstr "" + +#: ../../content/applications/services/helpdesk/advanced/track_and_bill.rst:220 +msgid "To do this, return to the :abbr:`SO (sales order)` by clicking on the :guilabel:`Sales Order` smart button at the top of the ticket." +msgstr "" + +#: ../../content/applications/services/helpdesk/advanced/track_and_bill.rst:223 +msgid "Before creating the invoice, confirm that the number in the :guilabel:`Delivered` column matches the total number of :guilabel:`Hours Spent` listed in the :guilabel:`Timesheets` tab on the ticket." +msgstr "" + +#: ../../content/applications/services/helpdesk/advanced/track_and_bill.rst:-1 +msgid "View of a sales order with emphasis on the delivered column." +msgstr "" + +#: ../../content/applications/services/helpdesk/advanced/track_and_bill.rst:230 +msgid "Then, click :guilabel:`Create Invoice`. This will open a :guilabel:`Create Invoices` pop-up window. If no down payment will be collected, the :guilabel:`Create Invoice` type can remain as :guilabel:`Regular Invoice`. If a down payment will be collected, choose between either :guilabel:`Down payment (percentage)` or :guilabel:`Down payment (fixed amount)`." +msgstr "" + +#: ../../content/applications/services/helpdesk/advanced/track_and_bill.rst:236 +msgid "Use the :guilabel:`Timesheets Period` field if this invoice should only include timesheets from a certain time period. If this field is left blank, *all* applicable timesheets that have not yet been invoiced will be included." +msgstr "" + +#: ../../content/applications/services/helpdesk/advanced/track_and_bill.rst:-1 +msgid "View of create invoices pop up showing timesheets period fields." +msgstr "" + +#: ../../content/applications/services/helpdesk/advanced/track_and_bill.rst:244 +msgid "When the necessary information has been entered, click :guilabel:`Create Invoice`. The invoice can then be sent to the customer for payment." +msgstr "" + +#: ../../content/applications/services/helpdesk/advanced/track_and_bill.rst:248 +msgid ":doc:`/applications/inventory_and_mrp/inventory/management/products/uom`" +msgstr "" + #: ../../content/applications/services/helpdesk/overview.rst:5 #: ../../content/applications/services/timesheets/overview.rst:5 msgid "Overview" @@ -613,7 +896,6 @@ msgstr "" #: ../../content/applications/services/helpdesk/overview/forum_and_elearning.rst:14 #: ../../content/applications/services/helpdesk/overview/forum_and_elearning.rst:52 -#: ../../content/applications/services/helpdesk/timesheet_and_invoice/invoice_time.rst:11 msgid "Set up" msgstr "" @@ -1867,241 +2149,6 @@ msgstr "" msgid ":doc:`Allow customers to close their tickets `" msgstr "" -#: ../../content/applications/services/helpdesk/timesheet_and_invoice.rst:5 -msgid "Timesheet and Invoice" -msgstr "" - -#: ../../content/applications/services/helpdesk/timesheet_and_invoice/invoice_time.rst:3 -msgid "Invoice Time Spent on Tickets (Prepaid Support Services)" -msgstr "" - -#: ../../content/applications/services/helpdesk/timesheet_and_invoice/invoice_time.rst:5 -msgid "Have the option to work with prepaid support services, meaning that a sales order and a corresponding invoice are issued and, once the service is done, you can deduct the time spent. Odoo allows it to happen because the applications are fully integrated, resulting in faster responses to your customer needs." -msgstr "" - -#: ../../content/applications/services/helpdesk/timesheet_and_invoice/invoice_time.rst:14 -msgid "Step 1: Set up a helpdesk team" -msgstr "" - -#: ../../content/applications/services/helpdesk/timesheet_and_invoice/invoice_time.rst:17 -msgid "Go to :menuselection:`Helpdesk --> Configuration --> Helpdesk Teams`, create or edit an existing team, and enable *Timesheet on Ticket* and *Time Reinvoicing*." -msgstr "" - -#: ../../content/applications/services/helpdesk/timesheet_and_invoice/invoice_time.rst:20 -msgid "Select or create a project under *Timesheet on Ticket*. The selected/created is the one at which employees timesheet on by default. However, it can be ultimately modified on each ticket." -msgstr "" - -#: ../../content/applications/services/helpdesk/timesheet_and_invoice/invoice_time.rst:-1 -msgid "View of a helpdesk team settings page emphasizing the timesheet on ticket and time\n" -"reinvoicing features in Odoo Helpdesk" -msgstr "" - -#: ../../content/applications/services/helpdesk/timesheet_and_invoice/invoice_time.rst:28 -msgid "Step 2: Set up a service" -msgstr "" - -#: ../../content/applications/services/helpdesk/timesheet_and_invoice/invoice_time.rst:31 -msgid "Go to :menuselection:`Sales --> Configuration --> Settings` and enable *Units of Measure* to optionally be able to choose *hours* (for example) as the unit of measure of your service." -msgstr "" - -#: ../../content/applications/services/helpdesk/timesheet_and_invoice/invoice_time.rst:33 -msgid "Then, go to :menuselection:`Sales --> Products --> Products`, create or edit an existing one, and set its *Product Type* as *Service*." -msgstr "" - -#: ../../content/applications/services/helpdesk/timesheet_and_invoice/invoice_time.rst:-1 -msgid "View of a product's form emphasizing the product type and unit of measure fields in Odoo\n" -"Sales" -msgstr "" - -#: ../../content/applications/services/helpdesk/timesheet_and_invoice/invoice_time.rst:40 -msgid "Now, select the invoicing management you would like to have under the *Sales* tab. We recommend the following configuration:" -msgstr "" - -#: ../../content/applications/services/helpdesk/timesheet_and_invoice/invoice_time.rst:-1 -msgid "View of a product form and the invoicing options under the tab sales in Odoo Sales" -msgstr "" - -#: ../../content/applications/services/helpdesk/timesheet_and_invoice/invoice_time.rst:47 -msgid "This configuration ensures that the customer is invoiced by the number of hours predicted in the sales order, meaning that less or extra hours recorded are not taken into account. It also ensures that every time a sales order is confirmed, a new task is created under the right project, automating the process." -msgstr "" - -#: ../../content/applications/services/helpdesk/timesheet_and_invoice/invoice_time.rst:53 -msgid "We recommend setting up a specific project, as it was done for this flow example. The important thing to remember is that the sales order item needs to be set on the corresponding project or task, in order to reinvoice the time spent on a ticket." -msgstr "" - -#: ../../content/applications/services/helpdesk/timesheet_and_invoice/invoice_time.rst:58 -msgid "Prevision an invoice and record time" -msgstr "" - -#: ../../content/applications/services/helpdesk/timesheet_and_invoice/invoice_time.rst:61 -msgid "Step 1: Place an order" -msgstr "" - -#: ../../content/applications/services/helpdesk/timesheet_and_invoice/invoice_time.rst:63 -msgid "Go to :menuselection:`Sales --> Orders --> Orders` and create one for the helpdesk service product you have previously set up, with the customer who needs the ticket to be opened. Set the number of hours needed to assist the customer and *Confirm* the order." -msgstr "" - -#: ../../content/applications/services/helpdesk/timesheet_and_invoice/invoice_time.rst:-1 -msgid "View of a sales order emphasizing the order lines in Odoo Sales" -msgstr "" - -#: ../../content/applications/services/helpdesk/timesheet_and_invoice/invoice_time.rst:72 -msgid "Step 2: Invoice the customer" -msgstr "" - -#: ../../content/applications/services/helpdesk/timesheet_and_invoice/invoice_time.rst:74 -msgid "In *Sales*, select the respective sales order to *Create Invoice*." -msgstr "" - -#: ../../content/applications/services/helpdesk/timesheet_and_invoice/invoice_time.rst:-1 -msgid "View of a sales order emphasizing the create invoice button in Odoo Sales" -msgstr "" - -#: ../../content/applications/services/helpdesk/timesheet_and_invoice/invoice_time.rst:82 -msgid "Step 3: Link the task to the ticket" -msgstr "" - -#: ../../content/applications/services/helpdesk/timesheet_and_invoice/invoice_time.rst:84 -msgid "Now, in *Helpdesk*, create or edit the respective ticket and link it to the task created by the confirmation of the sales order." -msgstr "" - -#: ../../content/applications/services/helpdesk/timesheet_and_invoice/invoice_time.rst:-1 -msgid "View of a helpdesk ticket emphasizing the field task in Odoo Helpdesk" -msgstr "" - -#: ../../content/applications/services/helpdesk/timesheet_and_invoice/invoice_time.rst:92 -msgid "Step 4: Record the time spent" -msgstr "" - -#: ../../content/applications/services/helpdesk/timesheet_and_invoice/invoice_time.rst:94 -msgid "Still on the respective helpdesk ticket, record the hours performed under the *Timesheets* tab." -msgstr "" - -#: ../../content/applications/services/helpdesk/timesheet_and_invoice/invoice_time.rst:-1 -msgid "View of a helpdesk ticket emphasizing the timesheets tab in Odoo Helpdesk" -msgstr "" - -#: ../../content/applications/services/helpdesk/timesheet_and_invoice/invoice_time.rst:100 -msgid "Note that the hours recorded on the ticket form are shown on the *Delivered* column in the sales order." -msgstr "" - -#: ../../content/applications/services/helpdesk/timesheet_and_invoice/invoice_time.rst:-1 -msgid "View of a sales order emphasizing the delivered column in Odoo Sales" -msgstr "" - -#: ../../content/applications/services/helpdesk/timesheet_and_invoice/invoice_time.rst:108 -msgid "Hours recorded on the ticket are automatically shown in *Timesheets* and on the dedicated task." -msgstr "" - -#: ../../content/applications/services/helpdesk/timesheet_and_invoice/invoice_time.rst:111 -msgid ":doc:`reinvoice_from_project`" -msgstr "" - -#: ../../content/applications/services/helpdesk/timesheet_and_invoice/invoice_time.rst:112 -#: ../../content/applications/services/helpdesk/timesheet_and_invoice/reinvoice_from_project.rst:104 -msgid ":doc:`/applications/inventory_and_mrp/inventory/management/products/uom`" -msgstr "" - -#: ../../content/applications/services/helpdesk/timesheet_and_invoice/reinvoice_from_project.rst:3 -msgid "Invoice Time Spent on Tickets (Postpaid Support Services)" -msgstr "" - -#: ../../content/applications/services/helpdesk/timesheet_and_invoice/reinvoice_from_project.rst:5 -msgid "The :guilabel:`Timesheets` 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: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:15 -msgid "To turn on the :guilabel:`Timesheets` feature, go to :menuselection:`Helpdesk --> Configuration --> Helpdesk Teams`, select a Helpdesk team, and then, click :guilabel:`Edit`. Next, enable the options :guilabel:`Timesheets` and :guilabel:`Time Billing`. 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:20 -msgid "Once the :guilabel:`Timesheets` feature is enabled, a :guilabel:`Project` drop-down option will appear below :guilabel:`Timesheets`. 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: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, set the :guilabel:`Invoicing Policy` to :guilabel:`Based on Timesheets`. 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:-1 -msgid "Create a sales order and add a product." -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 :guilabel:`Helpdesk` dashboard, clicking :guilabel:`Tickets` on the team's card, and locating the correct ticket. 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:-1 -msgid "Record time spent on a 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 "To link the :guilabel:`Sales Order` to the ticket, start on the ticket form and click :guilabel:`Edit`. Next, select the :guilabel:`Sales Order` that was created earlier from the :guilabel:`Sales Order Item` drop-down menu. Odoo will automatically filter the options to only show sales orders that are connected to the ticket's customer. Lastly, click :guilabel:`Save` to connect the ticket and the :guilabel:`Sales Order Item`." -msgstr "" - -#: ../../content/applications/services/helpdesk/timesheet_and_invoice/reinvoice_from_project.rst:-1 -msgid "Link the SO item to the ticket." -msgstr "" - -#: ../../content/applications/services/helpdesk/timesheet_and_invoice/reinvoice_from_project.rst:77 -msgid "The :guilabel:`Sales Order Item` can be connected to the ticket before or after any timesheets are recorded, the order doesn't matter." -msgstr "" - -#: ../../content/applications/services/helpdesk/timesheet_and_invoice/reinvoice_from_project.rst:81 -msgid "Modify billing rates" -msgstr "" - -#: ../../content/applications/services/helpdesk/timesheet_and_invoice/reinvoice_from_project.rst:83 -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:88 -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:93 -msgid "Create the invoice" -msgstr "" - -#: ../../content/applications/services/helpdesk/timesheet_and_invoice/reinvoice_from_project.rst:95 -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 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:103 -msgid ":doc:`invoice_time`" -msgstr "" - #: ../../content/applications/services/project.rst:8 msgid "Project" msgstr "" diff --git a/locale/sources/websites.pot b/locale/sources/websites.pot index 931278354..75b149f8c 100644 --- a/locale/sources/websites.pot +++ b/locale/sources/websites.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: Odoo saas-16.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-06-03 06:55+0000\n" +"POT-Creation-Date: 2023-06-20 08:18+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -346,7 +346,7 @@ msgid ":doc:`../checkout_payment_shipping/checkout`" msgstr "" #: ../../content/applications/websites/ecommerce/checkout_payment_shipping/payments.rst:14 -#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:93 +#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:95 #: ../../content/applications/websites/website/configuration.rst:5 #: ../../content/applications/websites/website/configuration/cookies_bar.rst:24 #: ../../content/applications/websites/website/reporting/link_tracker.rst:10 @@ -486,7 +486,7 @@ msgid "eCommerce management" msgstr "" #: ../../content/applications/websites/ecommerce/ecommerce_management/customer_accounts.rst:3 -#: ../../content/applications/websites/website/configuration/multi_website.rst:288 +#: ../../content/applications/websites/website/configuration/multi_website.rst:130 msgid "Customer accounts" msgstr "" @@ -843,6 +843,7 @@ msgid "Other options include **multiple views (Pivot, etc.), comparison** by per msgstr "" #: ../../content/applications/websites/ecommerce/ecommerce_management/performance.rst:34 +#: ../../content/applications/websites/website/configuration/multi_website.rst:153 msgid "Analytics" msgstr "" @@ -867,7 +868,6 @@ msgid ":doc:`/applications/websites/website/reporting/plausible`" msgstr "" #: ../../content/applications/websites/ecommerce/managing_products.rst:5 -#: ../../content/applications/websites/website/configuration/multi_website.rst:166 msgid "Products" msgstr "" @@ -1293,40 +1293,40 @@ msgstr "" msgid ":doc:`/applications/inventory_and_mrp/inventory/management/products/uom`" msgstr "" -#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:81 +#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:83 msgid "Price configuration: pricelists" msgstr "" -#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:83 +#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:85 msgid "Pricelists are the primary tool to manage prices on your eCommerce. They allow you to define website-specific prices - different from the price on the product template - based on the **country group**, **currency**, **minimum quantity**, **period**, or **variant**. You can create as many pricelists as needed, but it is mandatory to have at least one pricelist configured per website. If no custom pricelists are added, Odoo defaults to the **Public Pricelist** for all websites." msgstr "" -#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:90 -#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:118 +#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:92 +#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:120 msgid ":doc:`/applications/sales/sales/products_prices/prices/pricing`" msgstr "" -#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:95 +#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:97 msgid "Pricelists can be found under :menuselection:`Website --> eCommerce --> Pricelists`, but must first be activated. For that, head to :menuselection:`Website --> Configuration --> Settings` and scroll down to the :guilabel:`Shop - Products` section. There, you can find two options:" msgstr "" -#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:99 +#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:101 msgid ":guilabel:`Multiple prices per product`;" msgstr "" -#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:100 +#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:102 msgid ":guilabel:`Advanced price rules (discounts, formulas)`." msgstr "" -#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:102 +#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:104 msgid "The **first** option allows you to set different prices per customer *segment*, i.e., registered customers, gold customers, regular customers, etc. The **second** option allows you to set *price change* rules such as **discounts**, **margins**, **roundings**, etc." msgstr "" -#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:107 +#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:109 msgid "Foreign currency" msgstr "" -#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:109 +#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:111 msgid "If you are selling in **multiple currencies** and have pricelists in foreign currencies, customers can select their corresponding pricelist anywhere on the :guilabel:`Shop` page from the drop-down menu next to the **search bar**." msgstr "" @@ -1334,15 +1334,15 @@ msgstr "" msgid "Pricelists selection" msgstr "" -#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:119 +#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:121 msgid ":doc:`/applications/sales/sales/products_prices/prices/currencies`" msgstr "" -#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:122 +#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:124 msgid "Permanent discount" msgstr "" -#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:124 +#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:126 msgid "If you have permanently reduced the price of a product, a popular means to attract customers is the **strikethrough** strategy. The strategy consists in displaying the previous price crossed out and the **new discounted price** next to it." msgstr "" @@ -1350,7 +1350,7 @@ msgstr "" msgid "Price strikethrough" msgstr "" -#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:132 +#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:134 msgid "To display a 'striked' price, enable the :guilabel:`Comparison Price` option under :menuselection:`Website --> Configuration --> Settings --> Shop - Products category`. Then, head to the product's template (:menuselection:`Website --> eCommerce --> Products`), and in the :guilabel:`Compare to Price` field, enter the **new** price." msgstr "" @@ -2119,316 +2119,206 @@ msgstr "" msgid "Multiple websites" msgstr "" -#: ../../content/applications/websites/website/configuration/multi_website.rst:8 -msgid "Odooā€™s Multi-Websites opens up broad possibilities of diversification and customer segmentation for your business. A multiplied audience and boosted revenue are now just a few clicks away!" +#: ../../content/applications/websites/website/configuration/multi_website.rst:5 +msgid "Odoo allows you to create multiple websites from the same database. This can be useful, for example, if you have multiple brands operating under your organization, or to create separate websites for different products/services, or different audiences. In these cases, having different websites can help avoid confusion and make it easier to tailor your digital outreach strategies and reach your target audience." msgstr "" -#: ../../content/applications/websites/website/configuration/multi_website.rst:12 -msgid "Each website can work in a fully independent way, with its theme, branding, domain name, header & footer, pages, languages, products, blog posts, forum, slides, events, live chat channels, etc. Letā€™s go for a tour!" +#: ../../content/applications/websites/website/configuration/multi_website.rst:11 +msgid "Each website can be designed and configured independently with its own :doc:`domain name `, theme, pages, menus, :doc:`languages `, :doc:`products <../../ecommerce/managing_products/products>`, assigned sales team, etc. They can also :ref:`share content and pages `." msgstr "" #: ../../content/applications/websites/website/configuration/multi_website.rst:18 -msgid "Setup" +msgid "Duplicate content (i.e., pages and content shared between multiple websites) can have a negative impact on :doc:`../pages/seo`." msgstr "" -#: ../../content/applications/websites/website/configuration/multi_website.rst:20 -msgid "To create a new website, go to :menuselection:`Website --> Configuration --> Settings`. The button, *Create a new website*, lays in the first section." +#: ../../content/applications/websites/website/configuration/multi_website.rst:22 +msgid "Website creation" msgstr "" -#: ../../content/applications/websites/website/configuration/multi_website.rst:28 -msgid "In the upcoming prompt, set a name for your new website and a specific domain name. Leave empty to publish the new website under the default domain of your Odoo database. You can later set some country groups to redirect visitors to it using Geo IP." +#: ../../content/applications/websites/website/configuration/multi_website.rst:24 +msgid "To create a new website, proceed as follows:" +msgstr "" + +#: ../../content/applications/websites/website/configuration/multi_website.rst:26 +#: ../../content/applications/websites/website/configuration/multi_website.rst:142 +msgid "Go to :menuselection:`Website --> Configuration --> Settings`." +msgstr "" + +#: ../../content/applications/websites/website/configuration/multi_website.rst:27 +msgid "Click :guilabel:`+ New Website`." +msgstr "" + +#: ../../content/applications/websites/website/configuration/multi_website.rst:0 +msgid "New website button" +msgstr "" + +#: ../../content/applications/websites/website/configuration/multi_website.rst:32 +msgid "Specify the :guilabel:`Website Name` and :guilabel:`Website domain`. Each website must be published under its own :doc:`domain `." +msgstr "" + +#: ../../content/applications/websites/website/configuration/multi_website.rst:34 +msgid "Adapt the :guilabel:`Company name`, :guilabel:`Languages` and :guilabel:`Default language` if needed." msgstr "" #: ../../content/applications/websites/website/configuration/multi_website.rst:36 -msgid "Then, select a theme. This new website might have an entirely different purpose or audience than the first one. So feel free to go for a different theme!" +msgid "Click the :guilabel:`Create` button." msgstr "" -#: ../../content/applications/websites/website/configuration/multi_website.rst:40 -msgid "Once the theme is selected, you can start to build the homepage of your website. Follow the purple drops; they will help you in the first steps." +#: ../../content/applications/websites/website/configuration/multi_website.rst:38 +msgid "You can then start building your new website." +msgstr "" + +#: ../../content/applications/websites/website/configuration/multi_website.rst:41 +msgid "By default, all website-related apps that you have installed (e.g. **eCommerce**, **Forum**, **Blog**, etc.) and their related website pages are also available on the new website. You can remove them by amending the website's menu." +msgstr "" + +#: ../../content/applications/websites/website/configuration/multi_website.rst:46 +msgid "Switching websites" msgstr "" #: ../../content/applications/websites/website/configuration/multi_website.rst:48 -msgid "If you run Odoo Online, donā€™t forget to redirect any new domain name to your Odoo database (``CNAME``) and to authorize it Odoo-side. See :ref:`domain-name/existing`." +msgid "To switch from one website to another, click the menu next to the :guilabel:`+New` button in the top right corner and select the website you want to switch to." msgstr "" -#: ../../content/applications/websites/website/configuration/multi_website.rst:52 -msgid "Create the menu" +#: ../../content/applications/websites/website/configuration/multi_website.rst:-1 +msgid "Website selector" msgstr "" -#: ../../content/applications/websites/website/configuration/multi_website.rst:54 -msgid "The new website has a default menu with all the installed applications. To edit it, click :menuselection:`Pages --> Edit Menu`. Moving forward you only edit the menu of the current website." +#: ../../content/applications/websites/website/configuration/multi_website.rst:55 +msgid "When you switch websites, you are redirected to the other website, to the same page (URL) as the current one. If the page you are currently viewing does not exist on the other website, you are redirected to a 404 error page. Once redirected, click :guilabel:`Create page` to create the page." msgstr "" -#: ../../content/applications/websites/website/configuration/multi_website.rst:59 -msgid "Switch from one website to another" +#: ../../content/applications/websites/website/configuration/multi_website.rst:0 +msgid "Create a page from a 404 error page" msgstr "" -#: ../../content/applications/websites/website/configuration/multi_website.rst:62 -msgid "As easy as ABC! There is a website switcher in the right corner of the edit bar. Switching to another website will connect to the domain of this website. If you use another domain for the website, the user is requested to sign in." +#: ../../content/applications/websites/website/configuration/multi_website.rst:64 +msgid "Website-specific configuration" msgstr "" -#: ../../content/applications/websites/website/configuration/multi_website.rst:71 -msgid "When switching, you are redirected to the same domain path on the other website (e.g., ``/shop/myproduct``). If this URL is not used, you will be redirected to a 404 page but prompted to create a new page from there." +#: ../../content/applications/websites/website/configuration/multi_website.rst:66 +msgid "Most website settings are website-specific, which means they can be enabled/disabled per website. To adapt the settings for a website, go to :menuselection:`Website --> Configuration --> Settings`. Select the desired website in the field :guilabel:`Settings of Website` at the top of the :guilabel:`Settings` page, in the **yellow** banner. Then, adapt the options for that specific website." msgstr "" -#: ../../content/applications/websites/website/configuration/multi_website.rst:76 -msgid "Add features" +#: ../../content/applications/websites/website/configuration/multi_website.rst:73 +msgid "Websites are created with the default settings; the settings are not copied from one website to the other." msgstr "" -#: ../../content/applications/websites/website/configuration/multi_website.rst:78 -msgid "The website apps you install (e.g., Slides, Blogs) are made available on all your websites. You can, of course, keep them hidden in one website by removing the menu item." +#: ../../content/applications/websites/website/configuration/multi_website.rst:75 +msgid "In a :doc:`multi-company environment <../../../general/users/companies>`, each website can be linked to a specific company in your database so that only company-related data (e.g., products, jobs, events, etc.) is displayed on the website. To display company-specific data, set the desired company in the :guilabel:`Company` field." msgstr "" -#: ../../content/applications/websites/website/configuration/multi_website.rst:82 -msgid "Each website comes with a high range of specific options in the settings. First, select the website to configure." +#: ../../content/applications/websites/website/configuration/multi_website.rst:83 +msgid "Content availability" msgstr "" -#: ../../content/applications/websites/website/configuration/multi_website.rst:88 -msgid "Then, take a look at the options flagged with the earth icon. It means they only impact the very website you are working on." +#: ../../content/applications/websites/website/configuration/multi_website.rst:85 +msgid "By default, pages, products, events, etc. created from the frontend (using the :guilabel:`+New` button) are only available on the website from which it was created. Records created from the backend, however, are made available on all websites by default. The content's availability can be changed in the backend, in the :guilabel:`Website` field. For example, for products, go to :menuselection:`eCommerce --> Products`, then select the product and go to the :guilabel:`Sales` tab. For forums, go to :menuselection:`Configuration --> Forums`, then select the forum." msgstr "" -#: ../../content/applications/websites/website/configuration/multi_website.rst:94 -msgid "You can, for instance, set specific :" -msgstr "" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:96 -msgid "languages," +#: ../../content/applications/websites/website/configuration/multi_website.rst:-1 +msgid "Website field in Forum form" msgstr "" #: ../../content/applications/websites/website/configuration/multi_website.rst:98 -msgid "domain names," +msgid "Records and features can be made available:" msgstr "" #: ../../content/applications/websites/website/configuration/multi_website.rst:100 -msgid "social media links," +msgid "On all websites: leave the :guilabel:`Website` field empty;" +msgstr "" + +#: ../../content/applications/websites/website/configuration/multi_website.rst:101 +msgid "Only on one website: set the :guilabel:`Website` field accordingly;" msgstr "" #: ../../content/applications/websites/website/configuration/multi_website.rst:102 -msgid "customer portal mode (B2C vs. B2B)," -msgstr "" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:104 -msgid "dedicated live chat channels," +msgid "On some websites: in this case, you should duplicate the item and set the :guilabel:`Website` field." msgstr "" #: ../../content/applications/websites/website/configuration/multi_website.rst:106 -msgid "etc." +msgid "Website pages" msgstr "" #: ../../content/applications/websites/website/configuration/multi_website.rst:108 -msgid "The other options are global and apply to all your websites." +msgid "To modify the website on which a page is to be published, proceed as follows:" +msgstr "" + +#: ../../content/applications/websites/website/configuration/multi_website.rst:110 +msgid "Go to :menuselection:`Website --> Site --> Pages`." msgstr "" #: ../../content/applications/websites/website/configuration/multi_website.rst:111 -msgid "Manage domain names" +msgid "Select the website on which the page is currently published." msgstr "" -#: ../../content/applications/websites/website/configuration/multi_website.rst:113 -msgid "As said earlier, your websites can either share the same domain name or use a specific one. If you share it and want to adapt the content per region, set country groups in the setting of each website. Visitors will be redirected to the right website using GeoIP." +#: ../../content/applications/websites/website/configuration/multi_website.rst:0 +msgid "Display pages per website" msgstr "" -#: ../../content/applications/websites/website/configuration/multi_website.rst:122 -msgid "Geo IP is installed by default in Odoo Online. If you run Odoo on-premise, donā€™t forget to install *GeoIP* library. See :doc:`on-premise_geo-ip-installation`" +#: ../../content/applications/websites/website/configuration/multi_website.rst:116 +msgid "Tick the check box next to the page(s) you want to change." msgstr "" -#: ../../content/applications/websites/website/configuration/multi_website.rst:127 -msgid ":doc:`/administration/maintain/domain_names`" +#: ../../content/applications/websites/website/configuration/multi_website.rst:117 +msgid "Click the :guilabel:`Website` field and select the website, or empty it to publish the page on all websites." msgstr "" -#: ../../content/applications/websites/website/configuration/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:" +#: ../../content/applications/websites/website/configuration/multi_website.rst:121 +msgid "Each website must have its own homepage; you may not use the same homepage for several websites." +msgstr "" + +#: ../../content/applications/websites/website/configuration/multi_website.rst:124 +msgid "eCommerce features" +msgstr "" + +#: ../../content/applications/websites/website/configuration/multi_website.rst:126 +msgid "eCommerce features such as products, eCommerce categories, pricelists, discounts, payment providers, etc. can be restricted to :ref:`a specific website `." msgstr "" #: ../../content/applications/websites/website/configuration/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." +msgid "You can :doc:`allow your customers to use the same account <../../ecommerce/ecommerce_management/customer_accounts>` on all of your websites by enabling the :guilabel:`Shared Customer Accounts` check box in the website settings." msgstr "" -#: ../../content/applications/websites/website/configuration/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/configuration/multi_website.rst:136 -msgid "Reload and restart your Nginx instance to use the new ``server`` block." +#: ../../content/applications/websites/website/configuration/multi_website.rst:137 +msgid "Pricing" msgstr "" #: ../../content/applications/websites/website/configuration/multi_website.rst:139 -msgid "Customize the visitor experience" +msgid "Products can be priced differently based on the website using :ref:`pricelists `. The following configuration is required:" msgstr "" -#: ../../content/applications/websites/website/configuration/multi_website.rst:142 -msgid "The customer experience can be customized very profoundly thanks to the menu \\*Customize\\*. All the visual options available there are specific to each website. Go through the different pages to adapt them to this new audience. Focus on workflows, and automatic pages (eCommerce checkout, blogs, events, etc.) as the number of available options is higher there." +#: ../../content/applications/websites/website/configuration/multi_website.rst:143 +msgid "Scroll down to the :guilabel:`Shop - Products` section and select the :guilabel:`Pricelists` option :guilabel:`Multiple prices per product`." msgstr "" -#: ../../content/applications/websites/website/configuration/multi_website.rst:152 -msgid "Publish specific content per website" +#: ../../content/applications/websites/website/configuration/multi_website.rst:145 +msgid "Click :guilabel:`Pricelists` to define new pricelists or edit existing ones." +msgstr "" + +#: ../../content/applications/websites/website/configuration/multi_website.rst:146 +msgid "Select the pricelist or click :guilabel:`New` to create a new one, then select the :guilabel:`Configuration` tab and set the :guilabel:`Website` field." +msgstr "" + +#: ../../content/applications/websites/website/configuration/multi_website.rst:150 +#: ../../content/applications/websites/website/reporting.rst:5 +msgid "Reporting" msgstr "" #: ../../content/applications/websites/website/configuration/multi_website.rst:155 -msgid "Like static pages, any content created from the front-end (product, blog post, etc.) is always only published in the current website. You can change that from the edit form view in the backend and leave the *Website* field blank. This will publish it in all the websites." +msgid "Each website has its own :doc:`analytics <../reporting/plausible>`. To switch between websites, click the buttons in the upper right corner." msgstr "" -#: ../../content/applications/websites/website/configuration/multi_website.rst:163 -msgid "Here are all the objects that you can link to *either one or all the websites*:" +#: ../../content/applications/websites/website/configuration/multi_website.rst:-1 +msgid "Switch websites in analytics" msgstr "" -#: ../../content/applications/websites/website/configuration/multi_website.rst:168 -msgid "Product Categories for eCommerce" +#: ../../content/applications/websites/website/configuration/multi_website.rst:162 +msgid "Other reporting data" msgstr "" -#: ../../content/applications/websites/website/configuration/multi_website.rst:170 -msgid "Blogs" -msgstr "" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:172 -msgid "Slide Channels" -msgstr "" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:174 -msgid "Forums" -msgstr "" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:176 -msgid "Events" -msgstr "" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:178 -msgid "Job Positions" -msgstr "" - -#: ../../content/applications/websites/website/configuration/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/configuration/multi_website.rst:185 -msgid "Publish a page in all websites" -msgstr "" - -#: ../../content/applications/websites/website/configuration/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/configuration/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/configuration/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/configuration/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/configuration/multi_website.rst:209 -msgid "Multi-companies" -msgstr "" - -#: ../../content/applications/websites/website/configuration/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/configuration/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/configuration/multi_website.rst:220 -msgid "Website editors can only view and edit the pages of the records they have access to, typically the ones belonging to their current company (and to their subsidiaries, or child companies in Odoo language). And so is it for visitors." -msgstr "" - -#: ../../content/applications/websites/website/configuration/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/configuration/multi_website.rst:232 -msgid "Configure your eCommerce website" -msgstr "" - -#: ../../content/applications/websites/website/configuration/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/configuration/multi_website.rst:239 -msgid "Products only available on one website" -msgstr "" - -#: ../../content/applications/websites/website/configuration/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/configuration/multi_website.rst:249 -msgid "Products available on *some* websites" -msgstr "" - -#: ../../content/applications/websites/website/configuration/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/configuration/multi_website.rst:254 -msgid "If you need a unique reference to manage in your inventory, you should install *Manufacturing\\ and create *Kits* BoMs (bills of materials). Each kit will link each published ā€œvirtualā€ product to the main reference managed in your inventory. That way, any item sold from your website will be converted into the storable item in the delivery order." -msgstr "" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:261 -msgid "Pricelists" -msgstr "" - -#: ../../content/applications/websites/website/configuration/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/configuration/multi_website.rst:266 -msgid "Then, go to :menuselection:`Website --> Products --> Pricelists` to create additional pricelists. You can also choose to have a pricelist available *only* on a specific website." -msgstr "" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:270 -msgid ":doc:`../../ecommerce/managing_products/price_management`." -msgstr "" - -#: ../../content/applications/websites/website/configuration/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/configuration/multi_website.rst:280 -msgid "Payment Providers and Delivery Methods" -msgstr "" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:282 -msgid "By default, published payment providers and delivery methods are deployed in all websites. You could already use specific payment providers per country using Geo IP by defining countries in their configuration. Now you can also do it per website by filling in the *Website* field." -msgstr "" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:290 -msgid "There is a setting to choose how to manage customer accounts in Website settings. You can either allow customers to use one account through all the websites or compel them to create one account for each website. This last option is convenient if your websites shouldnā€™t be related to each other in the visitor mind." -msgstr "" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:300 -msgid "Technical hints for customization" -msgstr "" - -#: ../../content/applications/websites/website/configuration/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/configuration/multi_website.rst:306 -msgid "Sitemap: donā€™t forget the domain in the route to only publish" -msgstr "" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:306 -msgid "available records in each websiteā€™s sitemap." -msgstr "" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:310 -msgid "Access: you should call the method" -msgstr "" - -#: ../../content/applications/websites/website/configuration/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/configuration/multi_website.rst:314 -msgid "Search: when a list of records is displayed, donā€™t forget to specify" -msgstr "" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:313 -msgid "the domain to only display records available for the current website." +#: ../../content/applications/websites/website/configuration/multi_website.rst:164 +msgid "Other reporting data such as eCommerce dashboard data, online sales analyses and visitors can be grouped by website if necessary. Click :guilabel:`Group by --> Website`." msgstr "" #: ../../content/applications/websites/website/configuration/on-premise_geo-ip-installation.rst:3 @@ -3419,10 +3309,6 @@ msgstr "" msgid "You can customize the file *robots* in :ref:`developer mode ` from *Settings --> Technical --> User Interface --> Views* (exclude robots, exclude some pages, redirect to a custom Sitemap). Make the Model Data of the view *Non Updatable* to not reset the file after system upgrades." msgstr "" -#: ../../content/applications/websites/website/reporting.rst:5 -msgid "Reporting" -msgstr "" - #: ../../content/applications/websites/website/reporting/google_analytics.rst:3 msgid "How to track your website's traffic in Google Analytics" msgstr ""