diff --git a/locale/sources/finance.pot b/locale/sources/finance.pot index 69224d81e..cbb6126a1 100644 --- a/locale/sources/finance.pot +++ b/locale/sources/finance.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: Odoo 13.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-04-08 13:15+0000\n" +"POT-Creation-Date: 2022-09-01 12:24+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -33,28 +33,23 @@ msgid "**Odoo Accounting** is a full featured accounting app. Accountant product msgstr "" #: ../../content/applications/finance/accounting.rst:18 -msgid "`Odoo Tutorials: Invoicing `_" -msgstr "" - -#: ../../content/applications/finance/accounting.rst:19 msgid "`Odoo Tutorials: Accounting `_" msgstr "" -#: ../../content/applications/finance/accounting.rst:20 +#: ../../content/applications/finance/accounting.rst:19 msgid ":doc:`Accounting Cheat Sheet `" msgstr "" #: ../../content/applications/finance/accounting/bank.rst:5 -msgid "Bank & Cash" +msgid "Bank and cash" msgstr "" #: ../../content/applications/finance/accounting/bank/feeds.rst:5 -msgid "Bank Feeds" +msgid "Bank feeds" msgstr "" #: ../../content/applications/finance/accounting/bank/feeds/bank_statements.rst:3 -#: ../../content/applications/finance/accounting/others/multicurrencies/how_it_works.rst:145 -msgid "Bank Statements" +msgid "Bank statements" msgstr "" #: ../../content/applications/finance/accounting/bank/feeds/bank_statements.rst:5 @@ -164,7 +159,7 @@ msgid "add doc link to new documentation about reconciliation" msgstr "" #: ../../content/applications/finance/accounting/bank/feeds/bank_synchronization.rst:3 -msgid "Bank Synchronization: Automatic Import" +msgid "Bank synchronization: Automatic import" msgstr "" #: ../../content/applications/finance/accounting/bank/feeds/bank_synchronization.rst:5 @@ -200,6 +195,10 @@ msgid "**Ponto**: Europe (:doc:`more information `)" msgstr "" #: ../../content/applications/finance/accounting/bank/feeds/bank_synchronization.rst:25 +msgid "Bank synchronization is not available for trial databases." +msgstr "" + +#: ../../content/applications/finance/accounting/bank/feeds/bank_synchronization.rst:28 #: ../../content/applications/finance/accounting/bank/feeds/ponto.rst:24 #: ../../content/applications/finance/accounting/bank/feeds/saltedge.rst:19 #: ../../content/applications/finance/accounting/bank/misc/interbank.rst:14 @@ -227,11 +226,12 @@ msgstr "" #: ../../content/applications/finance/accounting/payables/supplier_bills/manage.rst:31 #: ../../content/applications/finance/accounting/receivables/customer_invoices/cash_rounding.rst:14 #: ../../content/applications/finance/accounting/receivables/customer_invoices/epc_qr_code.rst:20 -#: ../../content/applications/finance/accounting/receivables/customer_invoices/payment_terms.rst:42 +#: ../../content/applications/finance/accounting/receivables/customer_invoices/payment_terms.rst:46 #: ../../content/applications/finance/accounting/receivables/customer_payments/batch.rst:15 #: ../../content/applications/finance/accounting/receivables/customer_payments/batch_sdd.rst:20 #: ../../content/applications/finance/accounting/receivables/customer_payments/check.rst:39 #: ../../content/applications/finance/accounting/receivables/customer_payments/check.rst:103 +#: ../../content/applications/finance/accounting/receivables/customer_payments/followup.rst:14 #: ../../content/applications/finance/accounting/receivables/customer_payments/online_payment.rst:15 #: ../../content/applications/finance/accounting/reporting/declarations/intrastat.rst:19 #: ../../content/applications/finance/accounting/taxation/taxes/B2B_B2C.rst:60 @@ -242,216 +242,217 @@ msgstr "" #: ../../content/applications/finance/accounting/taxation/taxes/taxcloud.rst:12 #: ../../content/applications/finance/accounting/taxation/taxes/taxes.rst:29 #: ../../content/applications/finance/accounting/taxation/taxes/vat_validation.rst:13 -#: ../../content/applications/finance/payment_acquirers.rst:97 +#: ../../content/applications/finance/payment_acquirers.rst:99 +#: ../../content/applications/finance/payment_acquirers/adyen.rst:21 msgid "Configuration" msgstr "" -#: ../../content/applications/finance/accounting/bank/feeds/bank_synchronization.rst:28 +#: ../../content/applications/finance/accounting/bank/feeds/bank_synchronization.rst:31 msgid "On-Premise users" msgstr "" -#: ../../content/applications/finance/accounting/bank/feeds/bank_synchronization.rst:30 +#: ../../content/applications/finance/accounting/bank/feeds/bank_synchronization.rst:33 msgid "To be able to use this service, you need to have a valid Odoo Enterprise subscription. So make sure that your database is registered with your Odoo Enterprise contract. We also use a proxy between your database and the third party provider so, in case of a connection error, please check that you don't have a firewall or a proxy blocking the following address:" msgstr "" -#: ../../content/applications/finance/accounting/bank/feeds/bank_synchronization.rst:36 +#: ../../content/applications/finance/accounting/bank/feeds/bank_synchronization.rst:39 msgid "https://production.odoofin.com/" msgstr "" -#: ../../content/applications/finance/accounting/bank/feeds/bank_synchronization.rst:39 +#: ../../content/applications/finance/accounting/bank/feeds/bank_synchronization.rst:42 msgid "First Synchronization" msgstr "" -#: ../../content/applications/finance/accounting/bank/feeds/bank_synchronization.rst:41 +#: ../../content/applications/finance/accounting/bank/feeds/bank_synchronization.rst:44 msgid "You can start synchronization either by going to :menuselection:`Accounting --> Configuration --> Add a Bank Account` or via the configuration bar on the accounting dashboard." msgstr "" -#: ../../content/applications/finance/accounting/bank/feeds/bank_synchronization.rst:44 +#: ../../content/applications/finance/accounting/bank/feeds/bank_synchronization.rst:47 msgid "Now you can search for your bank institution. Select it and follow the steps to synchronize with it." msgstr "" -#: ../../content/applications/finance/accounting/bank/feeds/bank_synchronization.rst:47 +#: ../../content/applications/finance/accounting/bank/feeds/bank_synchronization.rst:50 msgid "If you have any issues during your first synchronization, please verify that your web browser doesn't block pop-ups and that your adblocker is disabled." msgstr "" -#: ../../content/applications/finance/accounting/bank/feeds/bank_synchronization.rst:50 +#: ../../content/applications/finance/accounting/bank/feeds/bank_synchronization.rst:53 msgid "During your first synchronization, you will be asked for a phone number to secure your account. The reason we ask for such information is that we don't want your data falling into the wrong hands. Therefore, if we detect suspicious activity on your account, we block all requests coming from your account, and you need to reactivate it using that phone number. The third-party provider may request more information in order to connect with your bank institution. This information is not stored on Odoo's servers." msgstr "" -#: ../../content/applications/finance/accounting/bank/feeds/bank_synchronization.rst:57 +#: ../../content/applications/finance/accounting/bank/feeds/bank_synchronization.rst:60 msgid "By default, transactions fetched from an online source are grouped inside the same statement, and one bank statement is created per month. You can change the bank statement creation periodicity in your journal settings." msgstr "" -#: ../../content/applications/finance/accounting/bank/feeds/bank_synchronization.rst:61 +#: ../../content/applications/finance/accounting/bank/feeds/bank_synchronization.rst:64 msgid "You can find all your synchronizations by going to :menuselection:`Accounting --> Configuration --> Online Synchronization`." msgstr "" -#: ../../content/applications/finance/accounting/bank/feeds/bank_synchronization.rst:65 +#: ../../content/applications/finance/accounting/bank/feeds/bank_synchronization.rst:68 msgid "Synchronize manually" msgstr "" -#: ../../content/applications/finance/accounting/bank/feeds/bank_synchronization.rst:67 +#: ../../content/applications/finance/accounting/bank/feeds/bank_synchronization.rst:70 msgid "After your first synchronization, the created journals are synchronized by default every 12 hours. If you wish, you can synchronize manually by clicking on the *Synchronize Now* button on the dashboard." msgstr "" -#: ../../content/applications/finance/accounting/bank/feeds/bank_synchronization.rst:75 +#: ../../content/applications/finance/accounting/bank/feeds/bank_synchronization.rst:78 msgid "Or you can go to :menuselection:`Accounting --> Configuration --> Online Synchronization`, select your institution and then click on the *Fetch Transactions* button." msgstr "" -#: ../../content/applications/finance/accounting/bank/feeds/bank_synchronization.rst:83 +#: ../../content/applications/finance/accounting/bank/feeds/bank_synchronization.rst:86 msgid "Some institutions do not allow transactions to be fetched automatically. For such institutions, during the automatic synchronization of the account, you receive an error message asking you to disable the automatic synchronization. This message can be found in the chatter of your online synchronizations. In this case, make sure to perform manual synchronizations." msgstr "" -#: ../../content/applications/finance/accounting/bank/feeds/bank_synchronization.rst:89 +#: ../../content/applications/finance/accounting/bank/feeds/bank_synchronization.rst:92 msgid "Issues" msgstr "" -#: ../../content/applications/finance/accounting/bank/feeds/bank_synchronization.rst:92 +#: ../../content/applications/finance/accounting/bank/feeds/bank_synchronization.rst:95 msgid "Synchronization in error" msgstr "" -#: ../../content/applications/finance/accounting/bank/feeds/bank_synchronization.rst:94 +#: ../../content/applications/finance/accounting/bank/feeds/bank_synchronization.rst:97 msgid "To report a connection error to the `Odoo support `_, go to :menuselection:`Accounting --> Configuration --> Online Synchronization`, select the connection that failed, and copy the error description and the reference." msgstr "" -#: ../../content/applications/finance/accounting/bank/feeds/bank_synchronization.rst:99 +#: ../../content/applications/finance/accounting/bank/feeds/bank_synchronization.rst:102 msgid "Synchronization disconnected" msgstr "" -#: ../../content/applications/finance/accounting/bank/feeds/bank_synchronization.rst:101 +#: ../../content/applications/finance/accounting/bank/feeds/bank_synchronization.rst:104 msgid "If your connection with the proxy is disconnected, you can reconnect with the proxy using the *Reconnect* button." msgstr "" -#: ../../content/applications/finance/accounting/bank/feeds/bank_synchronization.rst:105 +#: ../../content/applications/finance/accounting/bank/feeds/bank_synchronization.rst:108 msgid "This disconnection can be caused by the Odoo support. In this case, please contact the `support `_ directly with your client id or the reference of the error listed in the chatter." msgstr "" -#: ../../content/applications/finance/accounting/bank/feeds/bank_synchronization.rst:112 +#: ../../content/applications/finance/accounting/bank/feeds/bank_synchronization.rst:115 msgid "Migration process for users having installed Odoo before December 2020" msgstr "" -#: ../../content/applications/finance/accounting/bank/feeds/bank_synchronization.rst:114 +#: ../../content/applications/finance/accounting/bank/feeds/bank_synchronization.rst:117 msgid "If you are on-premise, please first make sure that your source is up-to-date with the latest version of Odoo." msgstr "" -#: ../../content/applications/finance/accounting/bank/feeds/bank_synchronization.rst:117 +#: ../../content/applications/finance/accounting/bank/feeds/bank_synchronization.rst:120 msgid "Users who have created a database before December 2020 need to install the new module manually to use the new functionalities." msgstr "" -#: ../../content/applications/finance/accounting/bank/feeds/bank_synchronization.rst:120 +#: ../../content/applications/finance/accounting/bank/feeds/bank_synchronization.rst:123 msgid "To do so, go to :menuselection:`Apps --> Update Apps List`, remove the default filter in the search bar and type: **account_online_synchronization**. You can then click on the *Install* button to install the new module." msgstr "" -#: ../../content/applications/finance/accounting/bank/feeds/bank_synchronization.rst:128 +#: ../../content/applications/finance/accounting/bank/feeds/bank_synchronization.rst:131 msgid "Finally, make sure all your users refresh their Odoo page by pressing CTRL+F5." msgstr "" -#: ../../content/applications/finance/accounting/bank/feeds/bank_synchronization.rst:132 +#: ../../content/applications/finance/accounting/bank/feeds/bank_synchronization.rst:135 msgid "All previous synchronizations are disconnected during the installation and won't work anymore. You can find them directly in the synchronization menu (:menuselection:`Accounting --> Configuration --> Online Synchronization`). It is not possible to resynchronize these connections; you have to make new ones." msgstr "" -#: ../../content/applications/finance/accounting/bank/feeds/bank_synchronization.rst:136 +#: ../../content/applications/finance/accounting/bank/feeds/bank_synchronization.rst:139 msgid "Please do not uninstall *account_online_sync* which is the previous module for online synchronization. The new one overrides it." msgstr "" -#: ../../content/applications/finance/accounting/bank/feeds/bank_synchronization.rst:138 +#: ../../content/applications/finance/accounting/bank/feeds/bank_synchronization.rst:141 msgid "By default *account_online_synchronization* is installed automatically with Accounting." msgstr "" -#: ../../content/applications/finance/accounting/bank/feeds/bank_synchronization.rst:141 +#: ../../content/applications/finance/accounting/bank/feeds/bank_synchronization.rst:144 #: ../../content/applications/finance/accounting/bank/feeds/ponto.rst:95 #: ../../content/applications/finance/accounting/bank/feeds/saltedge.rst:78 msgid "FAQ" msgstr "" -#: ../../content/applications/finance/accounting/bank/feeds/bank_synchronization.rst:144 +#: ../../content/applications/finance/accounting/bank/feeds/bank_synchronization.rst:147 msgid "The synchronization is not working in real-time. Is that normal?" msgstr "" -#: ../../content/applications/finance/accounting/bank/feeds/bank_synchronization.rst:146 +#: ../../content/applications/finance/accounting/bank/feeds/bank_synchronization.rst:149 msgid "The process is not intended to work in real-time as third party providers synchronize your accounts at different intervals. To force the synchronization and fetch the statements, go to your *Accounting dashboard*, and click on the *Synchronize Now* button. You can also synchronize and fetch transactions through :menuselection:`Accounting --> Configuration --> Online Synchronization`. Some providers only allow one refresh per day, so it is possible that clicking on *Synchronize Now* does not get your latest transactions if you already performed such action earlier in the day." msgstr "" -#: ../../content/applications/finance/accounting/bank/feeds/bank_synchronization.rst:153 +#: ../../content/applications/finance/accounting/bank/feeds/bank_synchronization.rst:156 msgid "A transaction can be visible on your bank account, but not be fetched if it has the status *Pending*. Only transactions with the *Posted* status will be retrieved. If it is not *Posted* yet, you will have to wait until the status changes." msgstr "" -#: ../../content/applications/finance/accounting/bank/feeds/bank_synchronization.rst:158 +#: ../../content/applications/finance/accounting/bank/feeds/bank_synchronization.rst:161 msgid "Is the Online Bank Synchronization feature included in my contract?" msgstr "" -#: ../../content/applications/finance/accounting/bank/feeds/bank_synchronization.rst:160 +#: ../../content/applications/finance/accounting/bank/feeds/bank_synchronization.rst:163 msgid "**Community Version**: No, this feature is not included in the Community Version." msgstr "" -#: ../../content/applications/finance/accounting/bank/feeds/bank_synchronization.rst:161 +#: ../../content/applications/finance/accounting/bank/feeds/bank_synchronization.rst:164 msgid "**Online Version**: Yes, even if you benefit from the One App Free contract." msgstr "" -#: ../../content/applications/finance/accounting/bank/feeds/bank_synchronization.rst:162 +#: ../../content/applications/finance/accounting/bank/feeds/bank_synchronization.rst:165 msgid "**Enterprise Version**: Yes, if you have a valid enterprise contract linked to your database." msgstr "" -#: ../../content/applications/finance/accounting/bank/feeds/bank_synchronization.rst:165 +#: ../../content/applications/finance/accounting/bank/feeds/bank_synchronization.rst:168 msgid "Some banks have a status \"Beta.\" What does this mean?" msgstr "" -#: ../../content/applications/finance/accounting/bank/feeds/bank_synchronization.rst:167 +#: ../../content/applications/finance/accounting/bank/feeds/bank_synchronization.rst:170 msgid "This means that banking institutions are not yet fully supported by our Third Party Provider. Bugs or other problems may arise. Odoo does not support technical problems that occur with banks in the Beta phase, but the user may still choose to connect. Connecting with these banks contributes to the development process since the Provider will have real data and feedback from the connection." msgstr "" -#: ../../content/applications/finance/accounting/bank/feeds/bank_synchronization.rst:173 +#: ../../content/applications/finance/accounting/bank/feeds/bank_synchronization.rst:176 msgid "Why do my transactions only synchronize when I refresh manually?" msgstr "" -#: ../../content/applications/finance/accounting/bank/feeds/bank_synchronization.rst:175 +#: ../../content/applications/finance/accounting/bank/feeds/bank_synchronization.rst:178 msgid "Some banks have additional security measures and require extra steps, such as an SMS/email authentication code or another type of MFA. Because of this, the integrator cannot pull transactions until the security code is provided." msgstr "" -#: ../../content/applications/finance/accounting/bank/feeds/bank_synchronization.rst:180 +#: ../../content/applications/finance/accounting/bank/feeds/bank_synchronization.rst:183 msgid "Not all of my past transactions are in Odoo, why?" msgstr "" -#: ../../content/applications/finance/accounting/bank/feeds/bank_synchronization.rst:182 +#: ../../content/applications/finance/accounting/bank/feeds/bank_synchronization.rst:185 msgid "For some institutions, transactions can only be fetched up to 3 months in the past." msgstr "" -#: ../../content/applications/finance/accounting/bank/feeds/bank_synchronization.rst:185 +#: ../../content/applications/finance/accounting/bank/feeds/bank_synchronization.rst:188 msgid "Why don't I see any transactions?" msgstr "" -#: ../../content/applications/finance/accounting/bank/feeds/bank_synchronization.rst:187 +#: ../../content/applications/finance/accounting/bank/feeds/bank_synchronization.rst:190 msgid "During your first synchronization, you selected the bank accounts you decided to synchronize with Odoo. If you didn't synchronize any of your accounts, you can go to :menuselection:`Accounting --> Configuration --> Online Synchronization` to click on the *Fetch Accounts* button on the connection." msgstr "" -#: ../../content/applications/finance/accounting/bank/feeds/bank_synchronization.rst:191 +#: ../../content/applications/finance/accounting/bank/feeds/bank_synchronization.rst:194 msgid "There may also be no new transactions." msgstr "" -#: ../../content/applications/finance/accounting/bank/feeds/bank_synchronization.rst:193 +#: ../../content/applications/finance/accounting/bank/feeds/bank_synchronization.rst:196 msgid "If your bank account is properly linked to a journal and posted transactions are not visible in your database, please `submit a support ticket `_." msgstr "" -#: ../../content/applications/finance/accounting/bank/feeds/bank_synchronization.rst:197 +#: ../../content/applications/finance/accounting/bank/feeds/bank_synchronization.rst:200 msgid "How can I update my bank credentials?" msgstr "" -#: ../../content/applications/finance/accounting/bank/feeds/bank_synchronization.rst:199 +#: ../../content/applications/finance/accounting/bank/feeds/bank_synchronization.rst:202 msgid "You can update your credentials by going to :menuselection:`Accounting --> Configuration --> Online Synchronization`, open the connection you want to update your credentials and click on the *Update Credentials* button." msgstr "" -#: ../../content/applications/finance/accounting/bank/feeds/bank_synchronization.rst:204 +#: ../../content/applications/finance/accounting/bank/feeds/bank_synchronization.rst:207 #: ../../content/applications/finance/accounting/bank/feeds/ponto.rst:124 #: ../../content/applications/finance/accounting/bank/feeds/saltedge.rst:111 msgid ":doc:`bank_statements`" msgstr "" -#: ../../content/applications/finance/accounting/bank/feeds/bank_synchronization.rst:205 +#: ../../content/applications/finance/accounting/bank/feeds/bank_synchronization.rst:208 #: ../../content/applications/finance/accounting/bank/feeds/saltedge.rst:110 msgid ":doc:`ponto`" msgstr "" -#: ../../content/applications/finance/accounting/bank/feeds/bank_synchronization.rst:206 +#: ../../content/applications/finance/accounting/bank/feeds/bank_synchronization.rst:209 #: ../../content/applications/finance/accounting/bank/feeds/ponto.rst:123 msgid ":doc:`saltedge`" msgstr "" @@ -790,10 +791,7 @@ msgid "The same steps will need to be repeated once you receive your second bank msgstr "" #: ../../content/applications/finance/accounting/bank/reconciliation.rst:5 -#: ../../content/applications/finance/accounting/getting_started/memento.rst:179 -#: ../../content/applications/finance/accounting/receivables/customer_payments/batch.rst:80 -#: ../../content/applications/finance/accounting/reporting/overview/main_reports.rst:144 -msgid "Bank Reconciliation" +msgid "Bank reconciliation" msgstr "" #: ../../content/applications/finance/accounting/bank/reconciliation/reconciliation_models.rst:3 @@ -1321,7 +1319,7 @@ msgid "The transactions will be added to the current cash payment registration." msgstr "" #: ../../content/applications/finance/accounting/fiscal_localizations.rst:5 -msgid "Fiscal Localizations" +msgid "Fiscal localizations" msgstr "" #: ../../content/applications/finance/accounting/fiscal_localizations/localizations.rst:5 @@ -1984,7 +1982,6 @@ msgstr "" #: ../../content/applications/finance/accounting/fiscal_localizations/localizations/argentina.rst:514 #: ../../content/applications/finance/accounting/fiscal_localizations/localizations/chile.rst:642 #: ../../content/applications/finance/accounting/others/multicurrencies/invoices_payments.rst:64 -#: ../../content/applications/finance/accounting/payables/supplier_bills.rst:5 msgid "Vendor Bills" msgstr "" @@ -3957,7 +3954,7 @@ msgid "`Item 88 of Finance Law 2016 `" +msgid ":download:`Certificate `" msgstr "" #: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:191 -msgid ":download:`Certificate Key `" +msgid ":download:`Certificate Key `" msgstr "" #: ../../content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst:192 @@ -5492,7 +5489,7 @@ msgid "LCO: List of Obliged Taxpayers (LCO) is a list issued by the SAT that acc msgstr "" #: ../../content/applications/finance/accounting/fiscal_localizations/localizations/netherlands.rst:2 -#: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:100 +#: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:103 msgid "Netherlands" msgstr "" @@ -5573,6 +5570,7 @@ msgid "Tax Report (Modelo 303)" msgstr "" #: ../../content/applications/finance/accounting/fiscal_localizations/localizations/switzerland.rst:3 +#: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:127 msgid "Switzerland" msgstr "" @@ -5851,7 +5849,7 @@ msgid "Don't forget to update your fiscal positions. If you have a version 11.1 msgstr "" #: ../../content/applications/finance/accounting/fiscal_localizations/overview/fiscal_localization_packages.rst:3 -msgid "Fiscal Localization Packages" +msgid "Fiscal localization packages" msgstr "" #: ../../content/applications/finance/accounting/fiscal_localizations/overview/fiscal_localization_packages.rst:5 @@ -5919,7 +5917,7 @@ msgid "Odoo Accounting can be used in many countries out of the box by installin msgstr "" #: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:14 -msgid "Fiscal Localization Packages available" +msgid "Fiscal localization packages available" msgstr "" #: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:16 @@ -6019,275 +6017,295 @@ msgid "Dominican Republic - Accounting" msgstr "" #: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:50 -msgid "Ecuador - Accounting" +msgid "EU One Stop Shop (OSS)" msgstr "" #: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:51 -msgid "Ethiopia - Accounting" +msgid "Ecuador - Accounting" msgstr "" #: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:52 -msgid "EU Mini One Stop Shop (MOSS)" +msgid "Ethiopia - Accounting" msgstr "" #: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:53 -msgid "Finnish Localization" +msgid "Finland - Sale" msgstr "" #: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:54 -msgid "France - Accounting" +msgid "Finnish Localization" msgstr "" #: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:55 +msgid "France - Accounting" +msgstr "" + +#: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:56 msgid "Generic - Accounting" msgstr "" -#: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:58 +#: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:59 msgid "Germany - Accounting" msgstr "" -#: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:59 -msgid "Germany SKR03 - Accounting" +#: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:60 +msgid "Germany - Certification for Point of Sale" msgstr "" -#: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:60 -msgid "Germany SKR04 - Accounting" +#: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:61 +msgid "Germany - Certification for Point of Sale of type restaurant" msgstr "" #: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:62 -msgid "Greece - Accounting" +msgid "Germany SKR03 - Accounting" msgstr "" #: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:63 -msgid "Guatemala - Accounting" -msgstr "" - -#: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:64 -msgid "Honduras - Accounting" +msgid "Germany SKR04 - Accounting" msgstr "" #: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:65 -msgid "Hong Kong - Accounting" +msgid "Greece - Accounting" msgstr "" #: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:66 -msgid "Hungarian - Accounting" +msgid "Guatemala - Accounting" msgstr "" #: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:67 -msgid "India" +msgid "Honduras - Accounting" +msgstr "" + +#: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:68 +msgid "Hong Kong - Accounting" msgstr "" #: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:69 -msgid "Indian - Accounting" +msgid "Hungarian - Accounting" msgstr "" #: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:70 -msgid "Indian - Point of Sale" +msgid "India" msgstr "" #: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:72 -msgid "Indonesian - Accounting" +msgid "Indian - Accounting" msgstr "" #: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:73 -msgid "Ireland - Accounting" -msgstr "" - -#: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:74 -msgid "Israel - Accounting" +msgid "Indian - Point of Sale" msgstr "" #: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:75 -msgid "Italy" +msgid "Indonesian - Accounting" +msgstr "" + +#: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:76 +msgid "Ireland - Accounting" msgstr "" #: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:77 -msgid "Italy - Accounting" +msgid "Israel - Accounting" msgstr "" #: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:78 -msgid "Italy - E-invoicing" +msgid "Italy" msgstr "" #: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:80 -msgid "Japan - Accounting" +msgid "Italy - Accounting" msgstr "" #: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:81 -msgid "LATAM" +msgid "Italy - E-invoicing" msgstr "" #: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:83 -msgid "LATAM Localization Base" +msgid "Japan - Accounting" msgstr "" #: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:84 -msgid "LATAM Document" +msgid "LATAM" msgstr "" #: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:86 -msgid "Lithuania" +msgid "LATAM Localization Base" msgstr "" -#: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:88 -msgid "Lithuania - Accounting" +#: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:87 +msgid "LATAM Document" msgstr "" #: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:89 -msgid "LT - Accounting Reports" +msgid "Lithuania" msgstr "" #: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:91 -msgid "Luxembourg - Accounting" +msgid "Lithuania - Accounting" msgstr "" #: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:92 -msgid "Maroc - Accounting" -msgstr "" - -#: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:93 -msgid "Mexico - Accounting" +msgid "LT - Accounting Reports" msgstr "" #: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:94 -msgid "Mongolia" +msgid "Luxembourg - Accounting" +msgstr "" + +#: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:95 +msgid "Maroc - Accounting" msgstr "" #: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:96 -msgid "Mongolia - Accounting" +msgid "Mexico - Accounting" msgstr "" #: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:97 -msgid "Mongolia - Accounting Reports" +msgid "Mongolia" msgstr "" #: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:99 -msgid "Multi Language Chart of Accounts" +msgid "Mongolia - Accounting" +msgstr "" + +#: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:100 +msgid "Mongolia - Accounting Reports" msgstr "" #: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:102 -msgid "Netherlands - Accounting" -msgstr "" - -#: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:103 -msgid "Netherlands - Intrastat Declaration" +msgid "Multi Language Chart of Accounts" msgstr "" #: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:105 -msgid "New Zealand - Accounting" +msgid "Netherlands - Accounting" msgstr "" #: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:106 -msgid "Norway - Accounting" +msgid "Netherlands - Intrastat Declaration" msgstr "" #: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:107 -msgid "OHADA - Accounting" -msgstr "" - -#: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:108 -msgid "Panama - Accounting" +msgid "Netherlands - Intrastat Declaration Reports" msgstr "" #: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:109 -msgid "Peru - Accounting" +msgid "New Zealand - Accounting" msgstr "" #: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:110 -msgid "Poland - Accounting" +msgid "Norway - Accounting" msgstr "" #: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:111 -msgid "Portugal - Accounting" +msgid "OHADA - Accounting" msgstr "" #: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:112 -msgid "Romania - Accounting" +msgid "Panama - Accounting" msgstr "" #: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:113 -msgid "Saudi Arabia - Accounting" +msgid "Peru - Accounting" msgstr "" #: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:114 -msgid "Singapore - Accounting" +msgid "Poland - Accounting" msgstr "" #: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:115 -msgid "Slovenian - Accounting" +msgid "Portugal - Accounting" msgstr "" #: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:116 -msgid "South Africa - Accounting" +msgid "Romania - Accounting" msgstr "" #: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:117 -msgid "Spain - Accounting (PGCE 2008)" +msgid "Saudi Arabia - Accounting" msgstr "" #: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:118 -msgid "Sweden" +msgid "Singapore - Accounting" +msgstr "" + +#: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:119 +msgid "Slovenian - Accounting" msgstr "" #: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:120 -msgid "Sweden - Structured Communication OCR" +msgid "South Africa - Accounting" msgstr "" #: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:121 -msgid "Swedish - Accounting" +msgid "Spain - Accounting (PGCE 2008)" msgstr "" -#: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:123 -msgid "Switzerland - Accounting" +#: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:122 +msgid "Sweden" msgstr "" #: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:124 -msgid "Thailand - Accounting" +msgid "Sweden - Structured Communication OCR" msgstr "" #: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:125 -msgid "Turkey - Accounting" -msgstr "" - -#: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:126 -msgid "U.A.E. - Accounting" -msgstr "" - -#: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:127 -msgid "UK - Accounting" -msgstr "" - -#: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:128 -msgid "Ukraine - Accounting" +msgid "Swedish - Accounting" msgstr "" #: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:129 -msgid "United States - Accounting" +msgid "Switzerland - Accounting" msgstr "" #: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:130 -msgid "Uruguay - Chart of Accounts" -msgstr "" - -#: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:131 -msgid "Venezuela - Accounting" +msgid "Switzerland - QR-IBAN" msgstr "" #: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:132 -msgid "Vietnam - Accounting" +msgid "Thailand - Accounting" +msgstr "" + +#: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:133 +msgid "Turkey - Accounting" +msgstr "" + +#: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:134 +msgid "U.A.E. - Accounting" msgstr "" #: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:135 +msgid "UK - Accounting" +msgstr "" + +#: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:136 +msgid "Ukraine - Accounting" +msgstr "" + +#: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:137 +msgid "United States - Accounting" +msgstr "" + +#: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:138 +msgid "Uruguay - Chart of Accounts" +msgstr "" + +#: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:139 +msgid "Venezuela - Accounting" +msgstr "" + +#: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:140 +msgid "Vietnam - Accounting" +msgstr "" + +#: ../../content/applications/finance/accounting/fiscal_localizations/overview/localizations_list.rst:143 msgid ":doc:`fiscal_localization_packages`" msgstr "" #: ../../content/applications/finance/accounting/getting_started.rst:5 -msgid "Getting Started" +msgid "Getting started" msgstr "" #: ../../content/applications/finance/accounting/getting_started/initial_configuration.rst:5 -msgid "Initial Configuration" +msgid "Initial configuration" msgstr "" #: ../../content/applications/finance/accounting/getting_started/initial_configuration/chart_of_accounts.rst:3 @@ -6497,7 +6515,6 @@ msgid "Please refer to the related documentation for more information." msgstr "" #: ../../content/applications/finance/accounting/getting_started/initial_configuration/chart_of_accounts.rst:121 -#: ../../content/applications/finance/accounting/taxation/taxes/default_taxes.rst:3 msgid "Default Taxes" msgstr "" @@ -6986,7 +7003,7 @@ msgstr "" #: ../../content/applications/finance/accounting/getting_started/memento.rst:86 #: ../../content/applications/finance/accounting/receivables/customer_invoices/credit_notes.rst:83 -#: ../../content/applications/finance/accounting/receivables/customer_invoices/payment_terms.rst:87 +#: ../../content/applications/finance/accounting/receivables/customer_invoices/payment_terms.rst:91 msgid "Journal Entries" msgstr "" @@ -7106,7 +7123,7 @@ msgstr "" #: ../../content/applications/finance/accounting/getting_started/memento.rst:218 #: ../../content/applications/finance/accounting/getting_started/memento.rst:228 #: ../../content/applications/finance/accounting/getting_started/memento.rst:244 -#: ../../content/applications/finance/accounting/receivables/customer_invoices/payment_terms.rst:104 +#: ../../content/applications/finance/accounting/receivables/customer_invoices/payment_terms.rst:108 #: ../../content/applications/finance/accounting/receivables/customer_payments/check.rst:68 #: ../../content/applications/finance/accounting/receivables/customer_payments/check.rst:81 #: ../../content/applications/finance/accounting/receivables/customer_payments/check.rst:131 @@ -7117,7 +7134,7 @@ msgstr "" #: ../../content/applications/finance/accounting/getting_started/memento.rst:218 #: ../../content/applications/finance/accounting/getting_started/memento.rst:228 #: ../../content/applications/finance/accounting/getting_started/memento.rst:244 -#: ../../content/applications/finance/accounting/receivables/customer_invoices/payment_terms.rst:104 +#: ../../content/applications/finance/accounting/receivables/customer_invoices/payment_terms.rst:108 #: ../../content/applications/finance/accounting/receivables/customer_payments/check.rst:68 #: ../../content/applications/finance/accounting/receivables/customer_payments/check.rst:81 #: ../../content/applications/finance/accounting/receivables/customer_payments/check.rst:131 @@ -7182,6 +7199,12 @@ msgstr "" msgid "Total To Pay" msgstr "" +#: ../../content/applications/finance/accounting/getting_started/memento.rst:179 +#: ../../content/applications/finance/accounting/receivables/customer_payments/batch.rst:80 +#: ../../content/applications/finance/accounting/reporting/overview/main_reports.rst:144 +msgid "Bank Reconciliation" +msgstr "" + #: ../../content/applications/finance/accounting/getting_started/memento.rst:181 msgid "Bank reconciliation is the matching of bank statement lines (provided by your bank) with transactions recorded internally (payments to suppliers or from customers). For each line in a bank statement, it can be:" msgstr "" @@ -7237,7 +7260,7 @@ msgstr "" #: ../../content/applications/finance/accounting/getting_started/memento.rst:218 #: ../../content/applications/finance/accounting/getting_started/memento.rst:228 #: ../../content/applications/finance/accounting/getting_started/memento.rst:244 -#: ../../content/applications/finance/accounting/receivables/customer_invoices/payment_terms.rst:104 +#: ../../content/applications/finance/accounting/receivables/customer_invoices/payment_terms.rst:108 #: ../../content/applications/finance/accounting/receivables/customer_payments/check.rst:68 #: ../../content/applications/finance/accounting/receivables/customer_payments/check.rst:81 #: ../../content/applications/finance/accounting/receivables/customer_payments/check.rst:131 @@ -7246,8 +7269,8 @@ msgstr "" #: ../../content/applications/finance/accounting/getting_started/memento.rst:220 #: ../../content/applications/finance/accounting/getting_started/memento.rst:246 -#: ../../content/applications/finance/accounting/receivables/customer_invoices/payment_terms.rst:106 -#: ../../content/applications/finance/accounting/receivables/customer_invoices/payment_terms.rst:108 +#: ../../content/applications/finance/accounting/receivables/customer_invoices/payment_terms.rst:110 +#: ../../content/applications/finance/accounting/receivables/customer_invoices/payment_terms.rst:112 #: ../../content/applications/finance/accounting/receivables/customer_payments/check.rst:70 #: ../../content/applications/finance/accounting/receivables/customer_payments/check.rst:133 msgid "Account Receivable" @@ -8945,10 +8968,10 @@ msgstr "" msgid "The Exchange difference journal can be changed in your accounting settings." msgstr "" -#: ../../content/applications/finance/accounting/others/multicurrencies/full_reconcile_warning.rst:2 -#: ../../content/applications/finance/accounting/others/multicurrencies/full_reconcile_warning.rst:2 -#: ../../content/applications/finance/accounting/others/multicurrencies/full_reconcile_warning.rst:2 -#: ../../content/applications/finance/accounting/others/multicurrencies/full_reconcile_warning.rst:2 +#: ../../content/applications/finance/accounting/others/multicurrencies/exchange/full_reconcile_warning.rst:2 +#: ../../content/applications/finance/accounting/others/multicurrencies/exchange/full_reconcile_warning.rst:2 +#: ../../content/applications/finance/accounting/others/multicurrencies/exchange/full_reconcile_warning.rst:2 +#: ../../content/applications/finance/accounting/others/multicurrencies/exchange/full_reconcile_warning.rst:2 msgid "In order for an exchange difference entry to be created automatically, the corresponding invoices and payments need to be fully reconciled. This means the invoices are fully paid and the payments are fully spent on invoices. If you partially pay 3 invoices from 2 payments, and the last invoice still has an amount due, there will be no exchange difference entry for any of them until that final amount is paid." msgstr "" @@ -9086,6 +9109,10 @@ msgstr "" msgid "In the accounting application, go to :menuselection:`Sales --> Payments`. Register the payment and set the currency." msgstr "" +#: ../../content/applications/finance/accounting/others/multicurrencies/how_it_works.rst:145 +msgid "Bank Statements" +msgstr "" + #: ../../content/applications/finance/accounting/others/multicurrencies/how_it_works.rst:147 #: ../../content/applications/finance/accounting/others/multicurrencies/invoices_payments.rst:94 msgid "When creating or importing bank statements, the amount is in the company currency. But there are now two complementary fields, the amount that was actually paid and the currency in which it was paid." @@ -9169,7 +9196,7 @@ msgid ":doc:`how_it_works`" msgstr "" #: ../../content/applications/finance/accounting/payables.rst:5 -msgid "Account Payables" +msgid "Account payables" msgstr "" #: ../../content/applications/finance/accounting/payables/misc/forecast.rst:3 @@ -9237,11 +9264,11 @@ msgid "From this screen, you can also switch to the pivot table or the graph vie msgstr "" #: ../../content/applications/finance/accounting/payables/pay.rst:5 -msgid "Vendor Payments" +msgid "Vendor payments" msgstr "" #: ../../content/applications/finance/accounting/payables/pay/check.rst:3 -msgid "Pay by Checks" +msgid "Pay by checks" msgstr "" #: ../../content/applications/finance/accounting/payables/pay/check.rst:5 @@ -9615,8 +9642,12 @@ msgstr "" msgid ":doc:`check`" msgstr "" +#: ../../content/applications/finance/accounting/payables/supplier_bills.rst:5 +msgid "Vendor bills" +msgstr "" + #: ../../content/applications/finance/accounting/payables/supplier_bills/assets.rst:3 -msgid "Non-current Assets and Fixed Assets" +msgid "Non-current assets and fixed assets" msgstr "" #: ../../content/applications/finance/accounting/payables/supplier_bills/assets.rst:5 @@ -9892,7 +9923,7 @@ msgid "You can, for example, select this account as the default **Expense Accoun msgstr "" #: ../../content/applications/finance/accounting/payables/supplier_bills/deferred_expenses.rst:3 -msgid "Deferred Expenses and Prepayments" +msgid "Deferred expenses and prepayments" msgstr "" #: ../../content/applications/finance/accounting/payables/supplier_bills/deferred_expenses.rst:5 @@ -10033,7 +10064,7 @@ msgid "You can, for example, select this account as the default **Expense Accoun msgstr "" #: ../../content/applications/finance/accounting/payables/supplier_bills/manage.rst:3 -msgid "Manage vendor Bills" +msgid "Manage vendor bills" msgstr "" #: ../../content/applications/finance/accounting/payables/supplier_bills/manage.rst:5 @@ -10245,7 +10276,7 @@ msgid "When creating a vendor bill and selecting the appropriate purchase order, msgstr "" #: ../../content/applications/finance/accounting/payables/supplier_bills/ocr.rst:3 -msgid "Digitize Vendor Bills with Optical Character Recognition (OCR)" +msgid "Digitize vendor bills with optical character recognition (OCR)" msgstr "" #: ../../content/applications/finance/accounting/payables/supplier_bills/ocr.rst:5 @@ -10285,7 +10316,7 @@ msgid "The more bills you scan, the better the system gets at identifying the co msgstr "" #: ../../content/applications/finance/accounting/payables/supplier_bills/ocr.rst:44 -#: ../../content/applications/finance/accounting/receivables/customer_invoices/snailmail.rst:34 +#: ../../content/applications/finance/accounting/receivables/customer_invoices/snailmail.rst:36 msgid "Pricing" msgstr "" @@ -10298,7 +10329,7 @@ msgid "To buy credits, go to :menuselection:`Accounting --> Configuration --> Se msgstr "" #: ../../content/applications/finance/accounting/payables/supplier_bills/ocr.rst:53 -#: ../../content/applications/finance/accounting/receivables/customer_invoices/snailmail.rst:43 +#: ../../content/applications/finance/accounting/receivables/customer_invoices/snailmail.rst:45 msgid "If you are on Odoo Online (SAAS) and have the Enterprise version, you benefit from free trial credits to test the feature." msgstr "" @@ -10307,7 +10338,7 @@ msgid "Our `Privacy Policy `_." msgstr "" #: ../../content/applications/finance/accounting/payables/supplier_bills/purchase_receipts.rst:3 -msgid "Purchase Receipts" +msgid "Purchase receipts" msgstr "" #: ../../content/applications/finance/accounting/payables/supplier_bills/purchase_receipts.rst:5 @@ -10355,12 +10386,11 @@ msgid ":doc:`/applications/finance/expenses`" msgstr "" #: ../../content/applications/finance/accounting/receivables.rst:5 -msgid "Account Receivables" +msgid "Account receivables" msgstr "" #: ../../content/applications/finance/accounting/receivables/customer_invoices.rst:5 -#: ../../content/applications/finance/accounting/receivables/customer_payments/batch_sdd.rst:99 -msgid "Customer Invoices" +msgid "Customer invoices" msgstr "" #: ../../content/applications/finance/accounting/receivables/customer_invoices/cash_discounts.rst:3 @@ -10412,7 +10442,7 @@ msgid ":doc:`../../receivables/customer_invoices/payment_terms`" msgstr "" #: ../../content/applications/finance/accounting/receivables/customer_invoices/cash_rounding.rst:3 -msgid "Cash Rounding" +msgid "Cash rounding" msgstr "" #: ../../content/applications/finance/accounting/receivables/customer_invoices/cash_rounding.rst:5 @@ -10456,7 +10486,7 @@ msgid "When editing a draft invoice, open the *Other Info* tab, go to the *Accou msgstr "" #: ../../content/applications/finance/accounting/receivables/customer_invoices/credit_notes.rst:3 -msgid "Credit Notes and Refunds" +msgid "Credit notes and refunds" msgstr "" #: ../../content/applications/finance/accounting/receivables/customer_invoices/credit_notes.rst:4 @@ -10575,7 +10605,7 @@ msgid "And here is the credit note’s journal entry generated to reverse the or msgstr "" #: ../../content/applications/finance/accounting/receivables/customer_invoices/deferred_revenues.rst:3 -msgid "Deferred Revenues" +msgid "Deferred revenues" msgstr "" #: ../../content/applications/finance/accounting/receivables/customer_invoices/deferred_revenues.rst:5 @@ -10971,7 +11001,7 @@ msgid "**repairs**: invoice your after-sale services" msgstr "" #: ../../content/applications/finance/accounting/receivables/customer_invoices/payment_terms.rst:3 -msgid "Payment Terms and Installment Plans" +msgid "Payment terms and installment plans" msgstr "" #: ../../content/applications/finance/accounting/receivables/customer_invoices/payment_terms.rst:5 @@ -11046,39 +11076,47 @@ msgstr "" msgid "This document is about the *Payment Terms* feature, not *Terms & Conditions*." msgstr "" -#: ../../content/applications/finance/accounting/receivables/customer_invoices/payment_terms.rst:44 +#: ../../content/applications/finance/accounting/receivables/customer_invoices/payment_terms.rst:42 +msgid ":doc:`cash_discounts`" +msgstr "" + +#: ../../content/applications/finance/accounting/receivables/customer_invoices/payment_terms.rst:43 +msgid "`Odoo Tutorials: Payment Terms `_" +msgstr "" + +#: ../../content/applications/finance/accounting/receivables/customer_invoices/payment_terms.rst:48 msgid "Go to :menuselection:`Accounting --> Configuration --> Payment Terms` and click on *Create*." msgstr "" -#: ../../content/applications/finance/accounting/receivables/customer_invoices/payment_terms.rst:46 +#: ../../content/applications/finance/accounting/receivables/customer_invoices/payment_terms.rst:50 msgid "The **Description on the Invoice** is the text displayed on the document (sale order, invoice, etc.)." msgstr "" -#: ../../content/applications/finance/accounting/receivables/customer_invoices/payment_terms.rst:49 +#: ../../content/applications/finance/accounting/receivables/customer_invoices/payment_terms.rst:53 msgid "In the **Terms** section, you can add a set of rules, called *terms*, to define what needs to be paid and by which due date." msgstr "" -#: ../../content/applications/finance/accounting/receivables/customer_invoices/payment_terms.rst:52 +#: ../../content/applications/finance/accounting/receivables/customer_invoices/payment_terms.rst:56 msgid "To add a term, click on *Add a line*, and define its *Type*, *Value*, and *Due Date Computation*." msgstr "" -#: ../../content/applications/finance/accounting/receivables/customer_invoices/payment_terms.rst:55 +#: ../../content/applications/finance/accounting/receivables/customer_invoices/payment_terms.rst:59 msgid "Terms are computed in the order they are set up." msgstr "" -#: ../../content/applications/finance/accounting/receivables/customer_invoices/payment_terms.rst:56 +#: ../../content/applications/finance/accounting/receivables/customer_invoices/payment_terms.rst:60 msgid "The **balance** should always be used for the last line." msgstr "" -#: ../../content/applications/finance/accounting/receivables/customer_invoices/payment_terms.rst:58 +#: ../../content/applications/finance/accounting/receivables/customer_invoices/payment_terms.rst:62 msgid "In the following example, 30% is due on the day of issuance, and the balance is due at the end of the following month." msgstr "" -#: ../../content/applications/finance/accounting/receivables/customer_invoices/payment_terms.rst:67 +#: ../../content/applications/finance/accounting/receivables/customer_invoices/payment_terms.rst:71 msgid "Using Payment Terms" msgstr "" -#: ../../content/applications/finance/accounting/receivables/customer_invoices/payment_terms.rst:69 +#: ../../content/applications/finance/accounting/receivables/customer_invoices/payment_terms.rst:73 msgid "Payment Terms can be defined with the **Payment Terms** field on:" msgstr "" @@ -11114,112 +11152,104 @@ msgstr "" msgid "To set specific payment terms on a bill. This is mostly useful when you need to manage vendor terms with several installments. Otherwise, setting the *Due Date* is enough." msgstr "" -#: ../../content/applications/finance/accounting/receivables/customer_invoices/payment_terms.rst:83 +#: ../../content/applications/finance/accounting/receivables/customer_invoices/payment_terms.rst:87 msgid "You can also define a **Due Date** manually. If Payment Terms are already defined, empty the field so you can select a date." msgstr "" -#: ../../content/applications/finance/accounting/receivables/customer_invoices/payment_terms.rst:89 +#: ../../content/applications/finance/accounting/receivables/customer_invoices/payment_terms.rst:93 msgid "Invoices with specific Payment Terms generate different *Journal Entries*, with one *Journal Item* for every computed *Due Date*." msgstr "" -#: ../../content/applications/finance/accounting/receivables/customer_invoices/payment_terms.rst:92 +#: ../../content/applications/finance/accounting/receivables/customer_invoices/payment_terms.rst:96 msgid "This makes for easier *Follow-ups* and *Reconciliation* since Odoo takes each due date into account, rather than just the balance due date. It also helps to get an accurate *Aged Receivable report*." msgstr "" -#: ../../content/applications/finance/accounting/receivables/customer_invoices/payment_terms.rst:100 +#: ../../content/applications/finance/accounting/receivables/customer_invoices/payment_terms.rst:104 msgid "In this example, an invoice of $1000 has been issued with the following payment terms: *30% is due on the day of issuance, and the balance is due at the end of the following month.*" msgstr "" -#: ../../content/applications/finance/accounting/receivables/customer_invoices/payment_terms.rst:104 +#: ../../content/applications/finance/accounting/receivables/customer_invoices/payment_terms.rst:108 msgid "Due date" msgstr "" -#: ../../content/applications/finance/accounting/receivables/customer_invoices/payment_terms.rst:106 +#: ../../content/applications/finance/accounting/receivables/customer_invoices/payment_terms.rst:110 msgid "February 21" msgstr "" -#: ../../content/applications/finance/accounting/receivables/customer_invoices/payment_terms.rst:106 +#: ../../content/applications/finance/accounting/receivables/customer_invoices/payment_terms.rst:110 msgid "300" msgstr "" -#: ../../content/applications/finance/accounting/receivables/customer_invoices/payment_terms.rst:108 +#: ../../content/applications/finance/accounting/receivables/customer_invoices/payment_terms.rst:112 msgid "March 31" msgstr "" -#: ../../content/applications/finance/accounting/receivables/customer_invoices/payment_terms.rst:108 +#: ../../content/applications/finance/accounting/receivables/customer_invoices/payment_terms.rst:112 msgid "700" msgstr "" -#: ../../content/applications/finance/accounting/receivables/customer_invoices/payment_terms.rst:110 +#: ../../content/applications/finance/accounting/receivables/customer_invoices/payment_terms.rst:114 msgid "Product Sales" msgstr "" -#: ../../content/applications/finance/accounting/receivables/customer_invoices/payment_terms.rst:110 +#: ../../content/applications/finance/accounting/receivables/customer_invoices/payment_terms.rst:114 msgid "1000" msgstr "" -#: ../../content/applications/finance/accounting/receivables/customer_invoices/payment_terms.rst:113 +#: ../../content/applications/finance/accounting/receivables/customer_invoices/payment_terms.rst:117 msgid "The $1000 debited on the Account Receivable is split into two distinct *Journal Items*. Both of them have their own **Due Date**." msgstr "" -#: ../../content/applications/finance/accounting/receivables/customer_invoices/payment_terms.rst:117 -msgid ":doc:`cash_discounts`" -msgstr "" - -#: ../../content/applications/finance/accounting/receivables/customer_invoices/payment_terms.rst:118 -msgid "`Odoo Learn: Terms and Conditions (T&C) and Payment Terms `_" -msgstr "" - -#: ../../content/applications/finance/accounting/receivables/customer_invoices/snailmail.rst:3 -msgid "Send your Invoices by Post (Snailmail)" -msgstr "" - #: ../../content/applications/finance/accounting/receivables/customer_invoices/snailmail.rst:5 +msgid "Send your invoices by post (Snailmail)" +msgstr "" + +#: ../../content/applications/finance/accounting/receivables/customer_invoices/snailmail.rst:7 msgid "Direct mail is a great way to capture individuals’ attention at a time where inboxes are always full. Odoo allows you to send invoices and follow-up reports by post, worldwide, directly from your database." msgstr "" -#: ../../content/applications/finance/accounting/receivables/customer_invoices/snailmail.rst:10 +#: ../../content/applications/finance/accounting/receivables/customer_invoices/snailmail.rst:12 msgid "Set up Snailmail" msgstr "" -#: ../../content/applications/finance/accounting/receivables/customer_invoices/snailmail.rst:12 +#: ../../content/applications/finance/accounting/receivables/customer_invoices/snailmail.rst:14 msgid "Go to :menuselection:`Accounting --> Settings --> Snailmail` and activate the feature." msgstr "" -#: ../../content/applications/finance/accounting/receivables/customer_invoices/snailmail.rst:14 +#: ../../content/applications/finance/accounting/receivables/customer_invoices/snailmail.rst:16 msgid "If you would like this option to be a default feature, enable *Send by Post* under *Default Sending Options*." msgstr "" -#: ../../content/applications/finance/accounting/receivables/customer_invoices/snailmail.rst:21 +#: ../../content/applications/finance/accounting/receivables/customer_invoices/snailmail.rst:23 msgid "Send your invoices by post" msgstr "" -#: ../../content/applications/finance/accounting/receivables/customer_invoices/snailmail.rst:23 +#: ../../content/applications/finance/accounting/receivables/customer_invoices/snailmail.rst:25 msgid "Open your Invoice, click on the *Send & Print* button and select *Send by Post*." msgstr "" -#: ../../content/applications/finance/accounting/receivables/customer_invoices/snailmail.rst:30 +#: ../../content/applications/finance/accounting/receivables/customer_invoices/snailmail.rst:32 msgid "Make sure to have your customer’s address set correctly, and that it includes a country, before sending the letter." msgstr "" -#: ../../content/applications/finance/accounting/receivables/customer_invoices/snailmail.rst:37 +#: ../../content/applications/finance/accounting/receivables/customer_invoices/snailmail.rst:39 msgid "*Snailmail* is an *In-App Purchase (IAP)* service which requires prepaid stamps (=credits) to work. Sending one document consumes one stamp." msgstr "" -#: ../../content/applications/finance/accounting/receivables/customer_invoices/snailmail.rst:40 +#: ../../content/applications/finance/accounting/receivables/customer_invoices/snailmail.rst:42 msgid "To buy stamps, go to :menuselection:`Accounting --> Configuration --> Settings --> Snailmail` and click on *Buy credits*, or go to :menuselection:`Settings --> Odoo IAP` and click on *View my Services*." msgstr "" -#: ../../content/applications/finance/accounting/receivables/customer_invoices/snailmail.rst:45 +#: ../../content/applications/finance/accounting/receivables/customer_invoices/snailmail.rst:47 msgid "Click `here `_ to know about our *Privacy Policy*." msgstr "" #: ../../content/applications/finance/accounting/receivables/customer_payments.rst:5 -msgid "Customer Payments" +msgid "Customer payments" msgstr "" #: ../../content/applications/finance/accounting/receivables/customer_payments/batch.rst:3 -msgid "Batch Payments: Batch Deposits (checks, cash etc.)" +msgid "Batch payments: Batch deposits (checks, cash etc.)" msgstr "" #: ../../content/applications/finance/accounting/receivables/customer_payments/batch.rst:5 @@ -11307,7 +11337,7 @@ msgid ":doc:`batch_sdd`" msgstr "" #: ../../content/applications/finance/accounting/receivables/customer_payments/batch_sdd.rst:3 -msgid "Batch Payments: SEPA Direct Debit (SDD)" +msgid "Batch payments: SEPA Direct Debit (SDD)" msgstr "" #: ../../content/applications/finance/accounting/receivables/customer_payments/batch_sdd.rst:5 @@ -11402,6 +11432,10 @@ msgstr "" msgid "Get paid with SDD Batch Payments" msgstr "" +#: ../../content/applications/finance/accounting/receivables/customer_payments/batch_sdd.rst:99 +msgid "Customer Invoices" +msgstr "" + #: ../../content/applications/finance/accounting/receivables/customer_payments/batch_sdd.rst:101 msgid "You can register SDD payments for invoices issued to customers who have an active SDD mandate." msgstr "" @@ -11599,63 +11633,99 @@ msgid "If you use this approach to manage received checks, you can use the repor msgstr "" #: ../../content/applications/finance/accounting/receivables/customer_payments/followup.rst:3 -msgid "Follow-up on invoices and get paid faster" +msgid "Follow-up on invoices" msgstr "" #: ../../content/applications/finance/accounting/receivables/customer_payments/followup.rst:5 -msgid "It is essential for your business to collect payments when they are overdue. Odoo will help you identify payments that are late and will allow you to send the appropriate reminders." +msgid "A follow-up message can be sent to customers when a payment is overdue. Odoo helps you identify late payments and allows you to schedule and send the appropriate reminders, using **follow-up actions** that trigger automatically one or more actions according to the number of overdue days. You can send your follow-ups via different means such as email, post, or SMS." msgstr "" -#: ../../content/applications/finance/accounting/receivables/customer_payments/followup.rst:10 -msgid "Manage your follow-ups" +#: ../../content/applications/finance/accounting/receivables/customer_payments/followup.rst:11 +msgid "`Odoo Tutorials: Payment Follow-up `_" msgstr "" -#: ../../content/applications/finance/accounting/receivables/customer_payments/followup.rst:13 -msgid "We recommend that you reconcile your bank statements before launching your follow-up process. It will avoid you the trouble of sending a statement to a customer that has already paid you." +#: ../../content/applications/finance/accounting/receivables/customer_payments/followup.rst:16 +msgid "To configure a :guilabel:`Follow-Up Action`, go to :menuselection:`Accounting --> Configuration --> Follow-up Levels`. Several follow-up actions are available by default, and you can customize them any way you want or create new ones to trigger the following actions:" msgstr "" -#: ../../content/applications/finance/accounting/receivables/customer_payments/followup.rst:17 -msgid "The overdue invoices you need to follow-up on are available by default in :menuselection:`Accounting --> Sales --> Follow-up Reports`. There, you can easily send a reminder by email or print it as a letter. Then, you can click on the *Done* button to view the next follow-up that needs your attention." +#: ../../content/applications/finance/accounting/receivables/customer_payments/followup.rst:20 +msgid "Send an Email" +msgstr "" + +#: ../../content/applications/finance/accounting/receivables/customer_payments/followup.rst:21 +msgid ":ref:`Send an SMS Message `" +msgstr "" + +#: ../../content/applications/finance/accounting/receivables/customer_payments/followup.rst:22 +msgid "Print a Letter" msgstr "" #: ../../content/applications/finance/accounting/receivables/customer_payments/followup.rst:23 -msgid "Otherwise, if now is not the time for a reminder, click on *Remind me later*. You will get the next report according to the *Next Reminder Date* set on the statement." +msgid ":ref:`Send a Letter `" msgstr "" -#: ../../content/applications/finance/accounting/receivables/customer_payments/followup.rst:28 -msgid "To avoid sending too many reminders in a short period of time, change the number of days calculated between each report by going to :menuselection:`Accounting --> Configuration --> Settings --> Payment Follow-up`." +#: ../../content/applications/finance/accounting/receivables/customer_payments/followup.rst:24 +msgid "Manual Action (creates a task)" +msgstr "" + +#: ../../content/applications/finance/accounting/receivables/customer_payments/followup.rst:26 +msgid "It is also possible to automatically send a reminder by enabling the :guilabel:`Auto Execute` option, within a specific :guilabel:`Follow-Up Action`." +msgstr "" + +#: ../../content/applications/finance/accounting/receivables/customer_payments/followup.rst:30 +msgid "To send a reminder before the actual due date is reached, set a negative number of due days." msgstr "" #: ../../content/applications/finance/accounting/receivables/customer_payments/followup.rst:33 -msgid "You can also set a trust level for your customers by marking them as bad, normal or good debtors on the follow-up reports." +msgid "Follow-up reports" msgstr "" -#: ../../content/applications/finance/accounting/receivables/customer_payments/followup.rst:40 -msgid "Send reminders in batch" +#: ../../content/applications/finance/accounting/receivables/customer_payments/followup.rst:35 +msgid "The overdue invoices you need to follow up on are available in :menuselection:`Accounting --> Customers --> Follow-up Reports`. From there, you can identify all the customers that have late unpaid invoices." msgstr "" -#: ../../content/applications/finance/accounting/receivables/customer_payments/followup.rst:42 -msgid "To get your follow-up process easier, you can send reminder emails in batch from your follow-up reports page. Select all the reports you would like to process, click on *Action* and then on *Process Follow-ups*. A pdf document containing all of the follow-up letters for you to print will also be automatically generated." +#: ../../content/applications/finance/accounting/receivables/customer_payments/followup.rst:39 +msgid "When you open a customer, you see all their unpaid invoices (overdue or not). The due dates of the late invoices appear in red. Select the invoices that are not late yet in the :guilabel:`Excluded` column to exclude them from the reminder you send." msgstr "" -#: ../../content/applications/finance/accounting/receivables/customer_payments/followup.rst:52 -msgid "Plan a follow-up process" +#: ../../content/applications/finance/accounting/receivables/customer_payments/followup.rst:43 +msgid "It is up to you to decide how to remind your customer. You can select :guilabel:`Print Letter`, :guilabel:`Send By Email`, :guilabel:`Send By Post`, :guilabel:`Send By SMS`. Then, click on :guilabel:`Done` to view the next follow-up that needs your attention." msgstr "" -#: ../../content/applications/finance/accounting/receivables/customer_payments/followup.rst:54 -msgid "To plan a follow-up process, go to :menuselection:`Accounting --> Configuration --> Settings` and activate the *Follow-up Levels* feature under the *Customer Payments* section. Then, click on the new *Follow-up Levels* button that has appeared on your settings page." +#: ../../content/applications/finance/accounting/receivables/customer_payments/followup.rst:48 +msgid "The contact information available on the invoice or on the contact form is used to send the reminder." msgstr "" -#: ../../content/applications/finance/accounting/receivables/customer_payments/followup.rst:59 -msgid "A follow-up plan with several actions is available by default in Odoo, but you can customize it any way you want. Depending on a specific number of overdue days, plan to send an email, a letter or to undertake a manual action. You can also edit the template used for the statement according to the stage of the process." +#: ../../content/applications/finance/accounting/receivables/customer_payments/followup.rst:50 +msgid "When the reminder is sent, it is documented in the chatter of the invoice." msgstr "" -#: ../../content/applications/finance/accounting/receivables/customer_payments/followup.rst:69 -msgid "If you would like to get a reminder before the actual due date, set a negative number of due days." +#: ../../content/applications/finance/accounting/receivables/customer_payments/followup.rst:51 +msgid "If it is not the right time for a reminder, you can specify the :guilabel:`Next Reminder Date` and click on :guilabel:`Remind me later`. You will get the next report according to the next reminder date set on the statement." +msgstr "" + +#: ../../content/applications/finance/accounting/receivables/customer_payments/followup.rst:56 +msgid "Reconcile your bank statements right before launching your follow-up process to avoid sending a reminder to a customer that has already paid you." +msgstr "" + +#: ../../content/applications/finance/accounting/receivables/customer_payments/followup.rst:60 +msgid "Debtor's trust level" +msgstr "" + +#: ../../content/applications/finance/accounting/receivables/customer_payments/followup.rst:62 +msgid "To know whether a customer usually pays late or not, you can set a trust level by marking them as :guilabel:`Good Debtor`, :guilabel:`Normal Debtor`, or :guilabel:`Bad Debtor` on their follow-up report. To do so, click on the bullet next to the customer's name and select a trust level." +msgstr "" + +#: ../../content/applications/finance/accounting/receivables/customer_payments/followup.rst:71 +msgid "Send reminders in batches" +msgstr "" + +#: ../../content/applications/finance/accounting/receivables/customer_payments/followup.rst:73 +msgid "You can send reminder emails in batches from the :guilabel:`Follow-up Reports` page. To do so, select all the reports you would like to process, click on the :guilabel:`Action` gear icon, and select :guilabel:`Process follow-ups`." msgstr "" #: ../../content/applications/finance/accounting/receivables/customer_payments/online_payment.rst:3 -msgid "Invoice Online Payment" +msgid "Invoice online payment" msgstr "" #: ../../content/applications/finance/accounting/receivables/customer_payments/online_payment.rst:5 @@ -11827,7 +11897,7 @@ msgid "If you created your Odoo database prior to **January 13, 2022**, please : msgstr "" #: ../../content/applications/finance/accounting/reporting/declarations/tax_returns.rst:3 -msgid "Tax Return (VAT Declaration)" +msgid "Tax return (VAT declaration)" msgstr "" #: ../../content/applications/finance/accounting/reporting/declarations/tax_returns.rst:5 @@ -12220,7 +12290,7 @@ msgid "Taxation" msgstr "" #: ../../content/applications/finance/accounting/taxation/fiscal_year.rst:5 -msgid "Fiscal Year" +msgid "Fiscal year" msgstr "" #: ../../content/applications/finance/accounting/taxation/fiscal_year/close_fiscal_year.rst:3 @@ -12408,11 +12478,11 @@ msgid "If you can not do that and if you really negotiate some prices with tax e msgstr "" #: ../../content/applications/finance/accounting/taxation/taxes/B2B_B2C.rst:77 -msgid "always store the default price TAX EXCLUDED on the product form, and apply a tax (price included on the product form)" +msgid "always store the default price **tax excluded** on the product form, and apply a tax (price excluded on the product form)" msgstr "" #: ../../content/applications/finance/accounting/taxation/taxes/B2B_B2C.rst:80 -msgid "create a pricelist with prices in TAX INCLUDED, for specific customers" +msgid "create a pricelist with prices in **tax included**, for specific customers" msgstr "" #: ../../content/applications/finance/accounting/taxation/taxes/B2B_B2C.rst:83 @@ -12556,7 +12626,7 @@ msgid "A few days later, you receive the payment:" msgstr "" #: ../../content/applications/finance/accounting/taxation/taxes/cash_basis_taxes.rst:66 -#: ../../content/applications/finance/payment_acquirers.rst:216 +#: ../../content/applications/finance/payment_acquirers.rst:224 msgid "Bank Journal" msgstr "" @@ -12580,6 +12650,10 @@ msgstr "" msgid "The last two journal items are neutral but they are needed to insure correct tax reports in Odoo with accurate base tax amounts. We advise to use a default revenue account. The balance of this account will then always be at zero." msgstr "" +#: ../../content/applications/finance/accounting/taxation/taxes/default_taxes.rst:3 +msgid "Default taxes" +msgstr "" + #: ../../content/applications/finance/accounting/taxation/taxes/default_taxes.rst:5 msgid "**Default Taxes** define which :doc:`taxes ` are automatically selected when there is no other indication about which tax to use. For example, Odoo prefills the **Taxes** field with the Default Taxes when you create a new product or add a new line on an invoice." msgstr "" @@ -12615,7 +12689,7 @@ msgid ":doc:`fiscal_positions`" msgstr "" #: ../../content/applications/finance/accounting/taxation/taxes/eu_distance_selling.rst:3 -msgid "EU intra-community Distance Selling" +msgid "EU intra-community distance selling" msgstr "" #: ../../content/applications/finance/accounting/taxation/taxes/eu_distance_selling.rst:5 @@ -12675,7 +12749,7 @@ msgid "To do so, go to :menuselection:`Accounting/Invoicing --> Settings --> Tax msgstr "" #: ../../content/applications/finance/accounting/taxation/taxes/fiscal_positions.rst:3 -msgid "Fiscal Positions (tax and account mapping)" +msgid "Fiscal positions (tax and account mapping)" msgstr "" #: ../../content/applications/finance/accounting/taxation/taxes/fiscal_positions.rst:5 @@ -13599,31 +13673,31 @@ msgstr "" msgid "Payment Acquirers (Credit Cards, Online Payment)" msgstr "" -#: ../../content/applications/finance/payment_acquirers.rst:15 +#: ../../content/applications/finance/payment_acquirers.rst:16 msgid "Odoo embeds several **payment acquirers** that allow your customers to pay on their *Customer Portals* or your *eCommerce website*. They can pay Sales Orders, invoices, or subscriptions with recurring payments with their favorite payment methods such as **Credit Cards**." msgstr "" -#: ../../content/applications/finance/payment_acquirers.rst:19 +#: ../../content/applications/finance/payment_acquirers.rst:20 msgid "Offering several payment methods increases the chances of getting paid in time, or even immediately, as you make it more convenient for your customers to pay with the payment method they prefer and trust." msgstr "" -#: ../../content/applications/finance/payment_acquirers.rst:28 +#: ../../content/applications/finance/payment_acquirers.rst:29 msgid "Odoo apps delegate the handling of sensitive information to the certified payment acquirer so that you don't ever have to worry about PCI compliance." msgstr "" -#: ../../content/applications/finance/payment_acquirers.rst:31 +#: ../../content/applications/finance/payment_acquirers.rst:32 msgid "This means that no sensitive information (such as credit card numbers or credentials) is stored on Odoo servers or Odoo databases hosted elsewhere. Instead, Odoo apps use a unique reference number to the data stored safely in the payment acquirers' systems." msgstr "" -#: ../../content/applications/finance/payment_acquirers.rst:38 +#: ../../content/applications/finance/payment_acquirers.rst:39 msgid "Payment Acquirers" msgstr "" -#: ../../content/applications/finance/payment_acquirers.rst:40 +#: ../../content/applications/finance/payment_acquirers.rst:41 msgid "From an accounting perspective, we can distinguish two types of payment acquirers: the payments that go directly on the bank account and follow the usual reconciliation workflow, and the payment acquirers that are third-party services and require you to follow another accounting workflow." msgstr "" -#: ../../content/applications/finance/payment_acquirers.rst:47 +#: ../../content/applications/finance/payment_acquirers.rst:48 msgid "Bank Payments" msgstr "" @@ -13643,200 +13717,205 @@ msgstr "" msgid "Your customers can sign a SEPA Direct Debit mandate online and get their bank account charged directly. :doc:`Click here <../finance/accounting/receivables/customer_payments/batch_sdd>` for more information about this payment method." msgstr "" -#: ../../content/applications/finance/payment_acquirers.rst:60 +#: ../../content/applications/finance/payment_acquirers.rst:61 msgid "Online Payment Providers" msgstr "" -#: ../../content/applications/finance/payment_acquirers.rst:63 +#: ../../content/applications/finance/payment_acquirers.rst:64 msgid "Redirection to the acquirer website" msgstr "" -#: ../../content/applications/finance/payment_acquirers.rst:63 +#: ../../content/applications/finance/payment_acquirers.rst:64 msgid "Payment from Odoo" msgstr "" -#: ../../content/applications/finance/payment_acquirers.rst:63 +#: ../../content/applications/finance/payment_acquirers.rst:64 msgid "Save Cards" msgstr "" -#: ../../content/applications/finance/payment_acquirers.rst:63 +#: ../../content/applications/finance/payment_acquirers.rst:64 msgid "Capture Amount Manually" msgstr "" -#: ../../content/applications/finance/payment_acquirers.rst:66 -msgid "Adyen" +#: ../../content/applications/finance/payment_acquirers.rst:67 +msgid ":doc:`Adyen `" msgstr "" -#: ../../content/applications/finance/payment_acquirers.rst:66 -#: ../../content/applications/finance/payment_acquirers.rst:68 +#: ../../content/applications/finance/payment_acquirers.rst:67 #: ../../content/applications/finance/payment_acquirers.rst:70 -#: ../../content/applications/finance/payment_acquirers.rst:70 -#: ../../content/applications/finance/payment_acquirers.rst:70 -#: ../../content/applications/finance/payment_acquirers.rst:70 -#: ../../content/applications/finance/payment_acquirers.rst:73 -#: ../../content/applications/finance/payment_acquirers.rst:75 -#: ../../content/applications/finance/payment_acquirers.rst:75 +#: ../../content/applications/finance/payment_acquirers.rst:72 +#: ../../content/applications/finance/payment_acquirers.rst:72 +#: ../../content/applications/finance/payment_acquirers.rst:72 +#: ../../content/applications/finance/payment_acquirers.rst:72 #: ../../content/applications/finance/payment_acquirers.rst:75 #: ../../content/applications/finance/payment_acquirers.rst:77 -#: ../../content/applications/finance/payment_acquirers.rst:80 +#: ../../content/applications/finance/payment_acquirers.rst:77 +#: ../../content/applications/finance/payment_acquirers.rst:77 +#: ../../content/applications/finance/payment_acquirers.rst:79 #: ../../content/applications/finance/payment_acquirers.rst:82 #: ../../content/applications/finance/payment_acquirers.rst:84 -#: ../../content/applications/finance/payment_acquirers.rst:84 -#: ../../content/applications/finance/payment_acquirers.rst:84 +#: ../../content/applications/finance/payment_acquirers.rst:86 +#: ../../content/applications/finance/payment_acquirers.rst:86 +#: ../../content/applications/finance/payment_acquirers.rst:86 msgid "✔" msgstr "" -#: ../../content/applications/finance/payment_acquirers.rst:68 +#: ../../content/applications/finance/payment_acquirers.rst:70 msgid "Alipay" msgstr "" -#: ../../content/applications/finance/payment_acquirers.rst:70 +#: ../../content/applications/finance/payment_acquirers.rst:72 msgid ":doc:`Authorize.Net `" msgstr "" -#: ../../content/applications/finance/payment_acquirers.rst:73 +#: ../../content/applications/finance/payment_acquirers.rst:75 msgid "Buckaroo" msgstr "" -#: ../../content/applications/finance/payment_acquirers.rst:75 +#: ../../content/applications/finance/payment_acquirers.rst:77 msgid "Ingenico" msgstr "" -#: ../../content/applications/finance/payment_acquirers.rst:77 +#: ../../content/applications/finance/payment_acquirers.rst:79 msgid ":doc:`PayPal `" msgstr "" -#: ../../content/applications/finance/payment_acquirers.rst:80 +#: ../../content/applications/finance/payment_acquirers.rst:82 msgid "PayUMoney" msgstr "" -#: ../../content/applications/finance/payment_acquirers.rst:82 +#: ../../content/applications/finance/payment_acquirers.rst:84 msgid "SIPS" msgstr "" -#: ../../content/applications/finance/payment_acquirers.rst:84 +#: ../../content/applications/finance/payment_acquirers.rst:86 #: ../../content/applications/finance/payment_acquirers/stripe.rst:3 msgid "Stripe" msgstr "" -#: ../../content/applications/finance/payment_acquirers.rst:88 +#: ../../content/applications/finance/payment_acquirers.rst:90 msgid "Some of these Online Payment Providers can also be added as :doc:`Bank Accounts <../finance/accounting/bank/setup/bank_accounts>`, but this is **not** the same process as adding them as Payment Acquirers. Payment Acquirers allow customers to pay online, and Bank Accounts are added and configured on your Accounting app to do a bank reconciliation, which is an accounting control process." msgstr "" -#: ../../content/applications/finance/payment_acquirers.rst:99 +#: ../../content/applications/finance/payment_acquirers.rst:101 msgid "Some of the features described in this section are available only with some Payment Acquirers. Refer to :ref:`the table above ` for more details." msgstr "" -#: ../../content/applications/finance/payment_acquirers.rst:105 +#: ../../content/applications/finance/payment_acquirers.rst:107 msgid "Add a new Payment Acquirer" msgstr "" -#: ../../content/applications/finance/payment_acquirers.rst:107 +#: ../../content/applications/finance/payment_acquirers.rst:109 msgid "To add a new Payment acquirer and make it available to your customers, go to :menuselection:`Accounting --> Configuration --> Payment Acquirers`, look for your payment acquirer, install the related module, and activate it. To do so, open the payment acquirer and change its state from *Disabled* to *Enabled*." msgstr "" -#: ../../content/applications/finance/payment_acquirers.rst:117 +#: ../../content/applications/finance/payment_acquirers.rst:119 msgid "We recommend using the *Test Mode* on a duplicated database or a test database. The Test Mode is meant to be used with your test/sandbox credentials, but Odoo generates Sales Orders and Invoices as usual. It isn't always possible to cancel an invoice, and this could create some issues with your invoices numbering if you were to test your payment acquirers on your main database." msgstr "" -#: ../../content/applications/finance/payment_acquirers.rst:125 +#: ../../content/applications/finance/payment_acquirers.rst:127 +#: ../../content/applications/finance/payment_acquirers/adyen.rst:24 msgid "Credentials tab" msgstr "" -#: ../../content/applications/finance/payment_acquirers.rst:127 +#: ../../content/applications/finance/payment_acquirers.rst:129 msgid "If not done yet, go to the **Online Payment Provider**'s website, create an account, and make sure to have the credentials required for third-party use. Odoo requires these credentials to communicate with the Payment Acquirer and get the confirmation of the *payment authentication*." msgstr "" -#: ../../content/applications/finance/payment_acquirers.rst:131 +#: ../../content/applications/finance/payment_acquirers.rst:133 msgid "The form in this section is specific to the Payment Acquirer you are configuring. Please refer to the related documentation for more information." msgstr "" -#: ../../content/applications/finance/payment_acquirers.rst:137 +#: ../../content/applications/finance/payment_acquirers.rst:139 msgid "Configuration tab" msgstr "" -#: ../../content/applications/finance/payment_acquirers.rst:139 +#: ../../content/applications/finance/payment_acquirers.rst:141 msgid "You can change the Payment Acquirer front-end appearance by modifying its name under the **Displayed as** field and which credit card icons to display under the **Supported Payment Icons** field." msgstr "" -#: ../../content/applications/finance/payment_acquirers.rst:145 +#: ../../content/applications/finance/payment_acquirers.rst:147 msgid "Save and reuse Credit Cards" msgstr "" -#: ../../content/applications/finance/payment_acquirers.rst:147 +#: ../../content/applications/finance/payment_acquirers.rst:149 msgid "With the **Save Cards** feature, Odoo can store **Payment Tokens** in your database, which can be used for subsequent payments, without having to reenter the payment details. This is particularly useful for subscriptions' recurring payments." msgstr "" -#: ../../content/applications/finance/payment_acquirers.rst:154 +#: ../../content/applications/finance/payment_acquirers.rst:156 msgid "Place a hold on a card" msgstr "" -#: ../../content/applications/finance/payment_acquirers.rst:156 +#: ../../content/applications/finance/payment_acquirers.rst:158 msgid "If the **Capture Amount Manually** field is enabled, the funds are reserved for a few days on the customer's card, but not charged yet. You must then go to the related Sales Order and manually *capture* the funds before its automatic cancellation, or *void the transaction* to unlock the funds from the customer's card." msgstr "" -#: ../../content/applications/finance/payment_acquirers.rst:164 -#: ../../content/applications/finance/payment_acquirers/authorize.rst:69 +#: ../../content/applications/finance/payment_acquirers.rst:166 +#: ../../content/applications/finance/payment_acquirers/authorize.rst:74 msgid "Payment Flow" msgstr "" -#: ../../content/applications/finance/payment_acquirers.rst:166 +#: ../../content/applications/finance/payment_acquirers.rst:168 msgid "Choose in the **Payment Flow** field if to redirect the user to the payment acquirer's portal to authenticate the payment, or if to stay on the current page and authenticate the payment from Odoo." msgstr "" -#: ../../content/applications/finance/payment_acquirers.rst:170 +#: ../../content/applications/finance/payment_acquirers.rst:172 msgid "Some features are available only if you select *Redirection to the acquirer website*." msgstr "" #: ../../content/applications/finance/payment_acquirers.rst:175 -msgid "Countries" -msgstr "" - -#: ../../content/applications/finance/payment_acquirers.rst:177 -msgid "Restrict the use of the Payment Acquirer to a selection of countries. Leave this field blank to make the Payment Acquirer available to all countries." +msgid "When configuring a payment acquirer with the payment flow :guilabel:`Payment from Odoo`, the payment acquirer is visible only to people who have an account and are logged in on the related database. To add a payment acquirer visible to everyone, the payment flow has to be set to :guilabel:`Redirection to the acquirer website`." msgstr "" #: ../../content/applications/finance/payment_acquirers.rst:183 -msgid "Payment Journal" +msgid "Countries" msgstr "" #: ../../content/applications/finance/payment_acquirers.rst:185 +msgid "Restrict the use of the Payment Acquirer to a selection of countries. Leave this field blank to make the Payment Acquirer available to all countries." +msgstr "" + +#: ../../content/applications/finance/payment_acquirers.rst:191 +msgid "Payment Journal" +msgstr "" + +#: ../../content/applications/finance/payment_acquirers.rst:193 msgid "The **Payment Journal** selected for your Payment Acquirer must be a *Bank* journal." msgstr "" -#: ../../content/applications/finance/payment_acquirers.rst:188 +#: ../../content/applications/finance/payment_acquirers.rst:196 msgid "In many cases, Odoo automatically creates a new **Journal** and a new **Account** when you activate a new Payment Acquirer. Both of them are preset to work out-of-the-box, but we strongly recommend you to make sure these fields are correctly set according to your accounting needs, and adapt them if necessary." msgstr "" -#: ../../content/applications/finance/payment_acquirers.rst:196 +#: ../../content/applications/finance/payment_acquirers.rst:204 msgid "Messages tab" msgstr "" -#: ../../content/applications/finance/payment_acquirers.rst:198 +#: ../../content/applications/finance/payment_acquirers.rst:206 msgid "Change here the messages displayed by Odoo after a payment's confirmation or failure." msgstr "" -#: ../../content/applications/finance/payment_acquirers.rst:203 +#: ../../content/applications/finance/payment_acquirers.rst:211 msgid "Accounting perspective" msgstr "" -#: ../../content/applications/finance/payment_acquirers.rst:205 +#: ../../content/applications/finance/payment_acquirers.rst:213 msgid "The **Bank Payments** that go directly to one of your bank accounts follow their usual reconciliation workflows. However, payments recorded with **Online Payment Providers** require you to consider how you want to record your payments' journal entries. We recommend you to ask your accountant for advice." msgstr "" -#: ../../content/applications/finance/payment_acquirers.rst:210 +#: ../../content/applications/finance/payment_acquirers.rst:218 msgid "Odoo default method is to record the payments on a *Current Assets Account*, on a dedicated *Bank Journal*, once the *Payment Authentication* is confirmed. At some point, you transfer the funds from the *Payment Acquirer* to your *Bank Account*." msgstr "" -#: ../../content/applications/finance/payment_acquirers.rst:214 +#: ../../content/applications/finance/payment_acquirers.rst:222 msgid "Here are the requirements for this to work:" msgstr "" -#: ../../content/applications/finance/payment_acquirers.rst:218 +#: ../../content/applications/finance/payment_acquirers.rst:226 msgid "The Journal's **type** must be *Bank Journal*." msgstr "" -#: ../../content/applications/finance/payment_acquirers.rst:219 +#: ../../content/applications/finance/payment_acquirers.rst:227 msgid "Select the right **Default Debit Account** and **Default Credit Account**." msgstr "" @@ -13848,38 +13927,180 @@ msgstr "" msgid "This implies that the Journal Entry is recorded directly when your Odoo database receives the confirmation of the *Payment Authentication* from the Online Payment Provider." msgstr "" -#: ../../content/applications/finance/payment_acquirers.rst:225 +#: ../../content/applications/finance/payment_acquirers.rst:233 msgid "Current Asset Account" msgstr "" -#: ../../content/applications/finance/payment_acquirers.rst:227 +#: ../../content/applications/finance/payment_acquirers.rst:235 msgid "The Account's **type** is *Current Assets*" msgstr "" -#: ../../content/applications/finance/payment_acquirers.rst:228 +#: ../../content/applications/finance/payment_acquirers.rst:236 msgid "The Account must **Allow Reconciliation**" msgstr "" -#: ../../content/applications/finance/payment_acquirers.rst:231 +#: ../../content/applications/finance/payment_acquirers.rst:239 msgid "In many cases, Odoo automatically creates a new **Journal** and a new **Current Asset Account** when you activate a new Payment Acquirer. You can modify them if necessary." msgstr "" -#: ../../content/applications/finance/payment_acquirers.rst:236 +#: ../../content/applications/finance/payment_acquirers.rst:244 msgid ":doc:`../finance/accounting/receivables/customer_payments/recording`" msgstr "" -#: ../../content/applications/finance/payment_acquirers.rst:237 +#: ../../content/applications/finance/payment_acquirers.rst:245 msgid ":doc:`payment_acquirers/wire_transfer`" msgstr "" -#: ../../content/applications/finance/payment_acquirers.rst:238 +#: ../../content/applications/finance/payment_acquirers.rst:246 msgid ":doc:`payment_acquirers/authorize`" msgstr "" -#: ../../content/applications/finance/payment_acquirers.rst:239 +#: ../../content/applications/finance/payment_acquirers.rst:247 msgid ":doc:`payment_acquirers/paypal`" msgstr "" +#: ../../content/applications/finance/payment_acquirers/adyen.rst:5 +msgid "Adyen" +msgstr "" + +#: ../../content/applications/finance/payment_acquirers/adyen.rst:12 +msgid "`Adyen `_ is a Dutch company that offers several online payment possibilities." +msgstr "" + +#: ../../content/applications/finance/payment_acquirers/adyen.rst:16 +msgid ":doc:`adyen/install_pay_by_link_patch`" +msgstr "" + +#: ../../content/applications/finance/payment_acquirers/adyen.rst:17 +msgid ":ref:`payment_acquirers/add_new`" +msgstr "" + +#: ../../content/applications/finance/payment_acquirers/adyen.rst:18 +#: ../../content/applications/finance/payment_acquirers/authorize.rst:121 +#: ../../content/applications/finance/payment_acquirers/paypal.rst:206 +msgid ":doc:`../payment_acquirers`" +msgstr "" + +#: ../../content/applications/finance/payment_acquirers/adyen.rst:26 +msgid "Odoo needs your **API Credentials** to connect with your Adyen account, which comprise:" +msgstr "" + +#: ../../content/applications/finance/payment_acquirers/adyen.rst:28 +msgid "**Merchant Account**: The code of the merchant account to use with Adyen." +msgstr "" + +#: ../../content/applications/finance/payment_acquirers/adyen.rst:29 +msgid ":ref:`API Key `: The API key of the webservice user." +msgstr "" + +#: ../../content/applications/finance/payment_acquirers/adyen.rst:30 +msgid ":ref:`HMAC Key `: The HMAC key of the webhook." +msgstr "" + +#: ../../content/applications/finance/payment_acquirers/adyen.rst:31 +msgid ":ref:`Checkout API URL `: The base URL for the Checkout API endpoints." +msgstr "" + +#: ../../content/applications/finance/payment_acquirers/adyen.rst:33 +msgid "You can copy your credentials from your Adyen account, and paste them in the related fields under the **Credentials** tab." +msgstr "" + +#: ../../content/applications/finance/payment_acquirers/adyen.rst:37 +msgid "If you are trying Adyen as a test, with a *test account*, change the **State** to *Test Mode*. We recommend doing this on a test Odoo database, rather than on your main database." +msgstr "" + +#: ../../content/applications/finance/payment_acquirers/adyen.rst:43 +msgid "API Key" +msgstr "" + +#: ../../content/applications/finance/payment_acquirers/adyen.rst:45 +msgid "In order to retrieve the API Key, log into your Adyen account, go to :menuselection:`Developers --> API Credentials`. - If you already have an API user, open it. - If you don't have an API user yet, click on **Create new credential**. Go to :menuselection:`Authentication` and get or generate your **API Key**. Be careful to copy your API key as you'll not be allowed to get it later without generating a new one." +msgstr "" + +#: ../../content/applications/finance/payment_acquirers/adyen.rst:55 +msgid "HMAC key" +msgstr "" + +#: ../../content/applications/finance/payment_acquirers/adyen.rst:57 +msgid "In order to retrieve the HMAC Key, you'll need to configure a `Standard Notification` webhook. For this, log into your Adyen account then go to :menuselection:`Developers --> Webhooks --> Add webhook --> Add Standard notification`." +msgstr "" + +#: ../../content/applications/finance/payment_acquirers/adyen.rst:65 +msgid "There, in :menuselection:`General --> Server Configuration --> URL`, enter your server address followed by `/payment/adyen/notification` and in :menuselection:`General --> Server Configuration --> Method`, select `HTTP Post`." +msgstr "" + +#: ../../content/applications/finance/payment_acquirers/adyen.rst:73 +msgid "Then continue in :menuselection:`Security --> HMAC Key --> Generate new HMAC key`. Be careful to copy it as you'll not be allowed to get it later without generating a new one." +msgstr "" + +#: ../../content/applications/finance/payment_acquirers/adyen.rst:76 +msgid "You have to save the webhook to finalize its creation." +msgstr "" + +#: ../../content/applications/finance/payment_acquirers/adyen.rst:81 +msgid "URLs" +msgstr "" + +#: ../../content/applications/finance/payment_acquirers/adyen.rst:83 +msgid "To retrieve the URLs, log into your Adyen account, go to :menuselection:`Developers --> API URLs`. Pick one of the URLs listed next to **Checkout API** as your **Checkout API URL**." +msgstr "" + +#: ../../content/applications/finance/payment_acquirers/adyen/install_pay_by_link_patch.rst:3 +msgid "Install the Adyen Pay by Link Patch" +msgstr "" + +#: ../../content/applications/finance/payment_acquirers/adyen/install_pay_by_link_patch.rst:5 +msgid "Starting October 2022, due to `Adyen deprecating their Hosted Payment Page solution `_, :doc:`Adyen <../adyen>` needs to be updated to continue accepting payments." +msgstr "" + +#: ../../content/applications/finance/payment_acquirers/adyen/install_pay_by_link_patch.rst:10 +msgid "If your Odoo database is created after the update was released, the update module is installed automatically. To check if this module is already installed, go to :guilabel:`Apps`, remove the ``Apps`` filter and search for ``Adyen``. If the module :guilabel:`Adyen Payment Acquirer/Pay by Link Patch` is present and marked as installed, your Odoo database is already up-to-date and you can proceed with the configuration step of :doc:`Adyen <../adyen>`." +msgstr "" + +#: ../../content/applications/finance/payment_acquirers/adyen/install_pay_by_link_patch.rst:17 +msgid "Update Odoo to the latest release" +msgstr "" + +#: ../../content/applications/finance/payment_acquirers/adyen/install_pay_by_link_patch.rst:19 +msgid "The new integration is made available through a new Odoo module; to be able to install it, you must make sure that your Odoo source code is up-to-date." +msgstr "" + +#: ../../content/applications/finance/payment_acquirers/adyen/install_pay_by_link_patch.rst:22 +msgid "If you use Odoo on Odoo.com or Odoo.sh platform, your code is already up-to-date and you can proceed to the next step." +msgstr "" + +#: ../../content/applications/finance/payment_acquirers/adyen/install_pay_by_link_patch.rst:25 +msgid "If you use Odoo with an on-premise setup or through a partner, then you must update your installation as detailed in :doc:`this documentation page ` or by contacting your integrating partner." +msgstr "" + +#: ../../content/applications/finance/payment_acquirers/adyen/install_pay_by_link_patch.rst:31 +msgid "Update the list of available modules" +msgstr "" + +#: ../../content/applications/finance/payment_acquirers/adyen/install_pay_by_link_patch.rst:33 +msgid "New modules must be *discovered* by your Odoo instance to be available in the **Apps** menu." +msgstr "" + +#: ../../content/applications/finance/payment_acquirers/adyen/install_pay_by_link_patch.rst:36 +msgid "To do so, activate the :ref:`developer mode `, and go to :menuselection:`Apps --> Update Apps List`. A wizard will ask for confirmation." +msgstr "" + +#: ../../content/applications/finance/payment_acquirers/adyen/install_pay_by_link_patch.rst:40 +msgid "Install the Adyen Payment Acquirer/Pay by Link Patch" +msgstr "" + +#: ../../content/applications/finance/payment_acquirers/adyen/install_pay_by_link_patch.rst:43 +msgid "You should never install new modules in your production database without first testing them in a duplicate or staging environment. For Odoo.com customers, a duplicate database can be created from the database management page. For Odoo.sh users, you should use a staging or duplicate database. For on-premise users, you should use a staging environment---contact your integrating partner for more information regarding how to test a new module in your particular setup." +msgstr "" + +#: ../../content/applications/finance/payment_acquirers/adyen/install_pay_by_link_patch.rst:49 +msgid "The module should now be available in your :guilabel:`Apps` menu. Remove the ``Apps`` filter and search for ``Adyen``; the module :guilabel:`Adyen Payment Acquirer/Pay by Link Patch` should be available for installation. If you cannot find the module after having updated the list of available modules, it means your Odoo source code is not up-to-date; refer to step one of this page." +msgstr "" + +#: ../../content/applications/finance/payment_acquirers/adyen/install_pay_by_link_patch.rst:54 +msgid "Once the module is installed, configure your acquirer following the instructions on the :doc:`Adyen <../adyen>` page." +msgstr "" + #: ../../content/applications/finance/payment_acquirers/authorize.rst:3 msgid "Authorize.Net" msgstr "" @@ -13921,7 +14142,7 @@ msgid "To retrieve them, log into your Authorize.Net account, go to :menuselecti msgstr "" #: ../../content/applications/finance/payment_acquirers/authorize.rst:39 -#: ../../content/applications/finance/payment_acquirers/authorize.rst:114 +#: ../../content/applications/finance/payment_acquirers/authorize.rst:119 msgid "`Authorize.Net: Getting Started Guide `__" msgstr "" @@ -13951,18 +14172,22 @@ msgid "The **API Client Key** is necessary only if you select *Payment from Odoo msgstr "" #: ../../content/applications/finance/payment_acquirers/authorize.rst:65 -msgid "If you are trying Authorize.Net as a test, with a *sandbox account*, change the **State** to *Test Mode*. We recommend doing this on a test Odoo database, rather than on your main database." +msgid "If you are trying Authorize.Net as a test, with a *sandbox account*, change the :guilabel:`State` to :guilabel:`Test Mode`. We recommend doing this on a test Odoo database, rather than on your main database." msgstr "" -#: ../../content/applications/finance/payment_acquirers/authorize.rst:71 +#: ../../content/applications/finance/payment_acquirers/authorize.rst:69 +msgid "If you set :guilabel:`Test Mode` on Odoo and use an authorize.net account instead of a sandbox.authorize.net account, it results in the following error: *The merchant login ID or password is invalid or the account is inactive*." +msgstr "" + +#: ../../content/applications/finance/payment_acquirers/authorize.rst:76 msgid "The **Payment Flow** lets you decide if to redirect the user to the payment acquirer's portal to authenticate the payment, or if to stay on the current page and authenticate the payment from Odoo. This field is under the **Configuration** tab." msgstr "" -#: ../../content/applications/finance/payment_acquirers/authorize.rst:75 +#: ../../content/applications/finance/payment_acquirers/authorize.rst:80 msgid "If you select *Redirection to the acquirer website*, make sure you add a **Default Receipt URL** and a **Default Relay Response URL** to your Authorize.net account." msgstr "" -#: ../../content/applications/finance/payment_acquirers/authorize.rst:78 +#: ../../content/applications/finance/payment_acquirers/authorize.rst:83 msgid "To do so, log into your Authorize.Net account, go to :menuselection:`Account --> Transaction Format Settings --> Transaction Response Settings --> Response/Receipt URLs`, and set the default links:" msgstr "" @@ -13990,32 +14215,27 @@ msgstr "" msgid "*The referrer, relay response or receipt link URL is invalid.*" msgstr "" -#: ../../content/applications/finance/payment_acquirers/authorize.rst:91 +#: ../../content/applications/finance/payment_acquirers/authorize.rst:96 msgid "Capture the payment after the delivery" msgstr "" -#: ../../content/applications/finance/payment_acquirers/authorize.rst:93 +#: ../../content/applications/finance/payment_acquirers/authorize.rst:98 msgid "The **Capture Amount Manually** field is under the **Configuration** tab. If enabled, the funds are reserved for 30 days on the customer's card, but not charged yet." msgstr "" -#: ../../content/applications/finance/payment_acquirers/authorize.rst:100 +#: ../../content/applications/finance/payment_acquirers/authorize.rst:105 msgid "To capture the payment, go to the related Sales Order and click on *Capture Transaction*. If the order is canceled, you can click on *Void Transaction* to unlock the funds from the customer's card." msgstr "" -#: ../../content/applications/finance/payment_acquirers/authorize.rst:108 +#: ../../content/applications/finance/payment_acquirers/authorize.rst:113 msgid "After **30 days**, the transaction is **voided automatically** by Authorize.net." msgstr "" -#: ../../content/applications/finance/payment_acquirers/authorize.rst:111 +#: ../../content/applications/finance/payment_acquirers/authorize.rst:116 msgid "With other payment acquirers, you can manage the capture in their own interfaces, not from Odoo." msgstr "" -#: ../../content/applications/finance/payment_acquirers/authorize.rst:116 -#: ../../content/applications/finance/payment_acquirers/paypal.rst:206 -msgid ":doc:`../payment_acquirers`" -msgstr "" - -#: ../../content/applications/finance/payment_acquirers/authorize.rst:117 +#: ../../content/applications/finance/payment_acquirers/authorize.rst:122 #: ../../content/applications/finance/payment_acquirers/paypal.rst:207 msgid ":doc:`../../websites/ecommerce/shopper_experience/payment_acquirer`" msgstr "" @@ -14261,11 +14481,15 @@ msgid "Przelewy24 (P24)" msgstr "" #: ../../content/applications/finance/payment_acquirers/stripe.rst:22 -msgid "To enable specific Local Payment Methods with Stripe, list them as supported payment icons. To do so, go to :menuselection:`Payment Acquirers --> Stripe --> Configuration` and add the desired payment methods in the **Supported Payment Icons** field. If the desired payment method is already listed, you don't have anything to do." +msgid "To enable some of these local payment methods with Stripe, list them as supported payment icons. To do so, go to :menuselection:`Payment Acquirers --> Stripe --> Configuration` and add the desired payment methods in the **Supported Payment Icons** field. If the desired payment method is already listed, you don't have anything to do." msgstr "" -#: ../../content/applications/finance/payment_acquirers/stripe.rst:31 -msgid "If a payment method icon doesn't exist at all in the database, the corresponding local payment method is always offered to customers." +#: ../../content/applications/finance/payment_acquirers/stripe.rst:32 +msgid "If your local payment method is not listed above but is supported by Stripe, we cannot guarantee that your local payment method works with Odoo." +msgstr "" + +#: ../../content/applications/finance/payment_acquirers/stripe.rst:36 +msgid "When configuring a payment acquirer with the payment flow :guilabel:`Payment from Odoo`, the payment acquirer is visible only to people who have an account and are logged-in on the related database. To add a payment acquirer visible to everyone, the payment flow has to be set to :guilabel:`Redirection to the acquirer website`." msgstr "" #: ../../content/applications/finance/payment_acquirers/wire_transfer.rst:3 diff --git a/locale/sources/general.pot b/locale/sources/general.pot index cbe55082f..9aaca920c 100644 --- a/locale/sources/general.pot +++ b/locale/sources/general.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: Odoo 13.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-04-08 13:15+0000\n" +"POT-Creation-Date: 2022-09-01 12:24+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -1758,7 +1758,7 @@ msgid "Offering my own services" msgstr "" #: ../../content/applications/general/in_app_purchase.rst:68 -msgid "I am more than welcome to offer my own IAP services through Odoo Apps! It is the perfect opportunity to get recurring revenue for an ongoing service use rather than — and possibly instead of — a sole initial purchase. Please, find more information at: :doc:`In-App Purchase `." +msgid "I am more than welcome to offer my own IAP services through Odoo Apps! It is the perfect opportunity to get recurring revenue for an ongoing service use rather than — and possibly instead of — a sole initial purchase. Please, find more information at: :doc:`In-App Purchase `." msgstr "" #: ../../content/applications/general/users.rst:7 diff --git a/locale/sources/inventory_and_mrp.pot b/locale/sources/inventory_and_mrp.pot index c650725c0..2d579aa4d 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 13.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-04-08 13:15+0000\n" +"POT-Creation-Date: 2022-09-01 12:24+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -17,7 +17,7 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" #: ../../content/applications/inventory_and_mrp.rst:5 -msgid "Inventory & Mrp" +msgid "Inventory & MRP" msgstr "" #: ../../content/applications/inventory_and_mrp/inventory.rst:8 @@ -3723,7 +3723,7 @@ msgid "In some cases, like for a retail shop storing vegetables and fruits, we h msgstr "" #: ../../content/applications/inventory_and_mrp/inventory/routes/strategies/putaway.rst:23 -msgid "Let’s suppose there are one warehouse location *WH/Stock* and two sub-locations *WH/Stock/Vegatable* and *WH/Stock/Fruits*." +msgid "Let’s suppose there are one warehouse location *WH/Stock* and two sub-locations *WH/Stock/Vegetables* and *WH/Stock/Fruits*." msgstr "" #: ../../content/applications/inventory_and_mrp/inventory/routes/strategies/putaway.rst:25 @@ -5542,7 +5542,7 @@ msgid "See below a template of the columns used." msgstr "" #: ../../content/applications/inventory_and_mrp/purchase/purchases/master/import.rst:33 -msgid ":download:`Click here to download the template `" +msgid ":download:`Click here to download the template `" msgstr "" #: ../../content/applications/inventory_and_mrp/purchase/purchases/master/suppliers.rst:3 diff --git a/locale/sources/marketing.pot b/locale/sources/marketing.pot index 84ba84184..c586c0ced 100644 --- a/locale/sources/marketing.pot +++ b/locale/sources/marketing.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: Odoo 13.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-04-08 13:15+0000\n" +"POT-Creation-Date: 2022-09-01 12:24+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -1018,167 +1018,167 @@ msgstr "" msgid "Pricing and FAQ" msgstr "" -#: ../../content/applications/marketing/sms_marketing/pricing/pricing_and_faq.rst:3 +#: ../../content/applications/marketing/sms_marketing/pricing/pricing_and_faq.rst:5 msgid "SMS Pricing and FAQ" msgstr "" -#: ../../content/applications/marketing/sms_marketing/pricing/pricing_and_faq.rst:6 +#: ../../content/applications/marketing/sms_marketing/pricing/pricing_and_faq.rst:8 msgid "What do I need to send SMSs?" msgstr "" -#: ../../content/applications/marketing/sms_marketing/pricing/pricing_and_faq.rst:7 +#: ../../content/applications/marketing/sms_marketing/pricing/pricing_and_faq.rst:9 msgid "SMS Text Messaging is an In-App Purchase (IAP) service that *requires prepaid credits* to work." msgstr "" -#: ../../content/applications/marketing/sms_marketing/pricing/pricing_and_faq.rst:11 +#: ../../content/applications/marketing/sms_marketing/pricing/pricing_and_faq.rst:13 msgid "How many types of SMSs are there?" msgstr "" -#: ../../content/applications/marketing/sms_marketing/pricing/pricing_and_faq.rst:12 +#: ../../content/applications/marketing/sms_marketing/pricing/pricing_and_faq.rst:14 msgid "There are 2 types: GSM7 and UNICODE." msgstr "" -#: ../../content/applications/marketing/sms_marketing/pricing/pricing_and_faq.rst:14 +#: ../../content/applications/marketing/sms_marketing/pricing/pricing_and_faq.rst:16 msgid "**GSM7** is the standard format, with a limit of 160 characters per message, that includes the following characters:" msgstr "" -#: ../../content/applications/marketing/sms_marketing/pricing/pricing_and_faq.rst:23 +#: ../../content/applications/marketing/sms_marketing/pricing/pricing_and_faq.rst:25 msgid "**UNICODE** is the format applied if a special character, that *is not* in the GSM7 list, is used. Limit per SMS: 70 characters." msgstr "" -#: ../../content/applications/marketing/sms_marketing/pricing/pricing_and_faq.rst:27 +#: ../../content/applications/marketing/sms_marketing/pricing/pricing_and_faq.rst:29 msgid "For GSM7 SMS the size limit is 160 characters, and for Unicode is 70. *Above these limits, the content is divided into a multi-part message* and the limit of characters is lowered to 153 for GSM7 and to 67 for Unicode. The system will inform you in real-time about the number of SMS your message represents." msgstr "" -#: ../../content/applications/marketing/sms_marketing/pricing/pricing_and_faq.rst:34 +#: ../../content/applications/marketing/sms_marketing/pricing/pricing_and_faq.rst:36 msgid "How much does it cost to send an SMS?" msgstr "" -#: ../../content/applications/marketing/sms_marketing/pricing/pricing_and_faq.rst:35 +#: ../../content/applications/marketing/sms_marketing/pricing/pricing_and_faq.rst:37 msgid "The price of an SMS depends on the destination and the length (number of characters) of the message." msgstr "" -#: ../../content/applications/marketing/sms_marketing/pricing/pricing_and_faq.rst:37 +#: ../../content/applications/marketing/sms_marketing/pricing/pricing_and_faq.rst:39 msgid "To see the **price per country, please consult**: `Odoo SMS - FAQ `_." msgstr "" -#: ../../content/applications/marketing/sms_marketing/pricing/pricing_and_faq.rst:39 +#: ../../content/applications/marketing/sms_marketing/pricing/pricing_and_faq.rst:41 msgid "The number of SMSs a message represents will be always available to you in your database." msgstr "" -#: ../../content/applications/marketing/sms_marketing/pricing/pricing_and_faq.rst:49 +#: ../../content/applications/marketing/sms_marketing/pricing/pricing_and_faq.rst:51 msgid "How do I buy credits?" msgstr "" -#: ../../content/applications/marketing/sms_marketing/pricing/pricing_and_faq.rst:50 +#: ../../content/applications/marketing/sms_marketing/pricing/pricing_and_faq.rst:52 msgid "Go to :menuselection:`Settings --> Buy Credits`." msgstr "" -#: ../../content/applications/marketing/sms_marketing/pricing/pricing_and_faq.rst:57 +#: ../../content/applications/marketing/sms_marketing/pricing/pricing_and_faq.rst:59 msgid "Or go to :menuselection:`Settings --> View my Services`." msgstr "" -#: ../../content/applications/marketing/sms_marketing/pricing/pricing_and_faq.rst:65 +#: ../../content/applications/marketing/sms_marketing/pricing/pricing_and_faq.rst:67 msgid "If you are on Odoo Online (SAAS) and have the Enterprise version, you benefit from free trial credits to test the feature." msgstr "" -#: ../../content/applications/marketing/sms_marketing/pricing/pricing_and_faq.rst:70 +#: ../../content/applications/marketing/sms_marketing/pricing/pricing_and_faq.rst:72 msgid "More common questions" msgstr "" -#: ../../content/applications/marketing/sms_marketing/pricing/pricing_and_faq.rst:72 +#: ../../content/applications/marketing/sms_marketing/pricing/pricing_and_faq.rst:74 msgid "**Is there an expiration time for my credits?**" msgstr "" -#: ../../content/applications/marketing/sms_marketing/pricing/pricing_and_faq.rst:74 +#: ../../content/applications/marketing/sms_marketing/pricing/pricing_and_faq.rst:76 msgid "No, credits do not expire." msgstr "" -#: ../../content/applications/marketing/sms_marketing/pricing/pricing_and_faq.rst:77 +#: ../../content/applications/marketing/sms_marketing/pricing/pricing_and_faq.rst:79 msgid "**Can I send an SMS to a phone number (which is not a mobile phone) because I see the icon in front of the field “phone”?**" msgstr "" -#: ../../content/applications/marketing/sms_marketing/pricing/pricing_and_faq.rst:80 +#: ../../content/applications/marketing/sms_marketing/pricing/pricing_and_faq.rst:82 msgid "Only if that phone number supports SMS (e.g. SIP phones)." msgstr "" -#: ../../content/applications/marketing/sms_marketing/pricing/pricing_and_faq.rst:83 +#: ../../content/applications/marketing/sms_marketing/pricing/pricing_and_faq.rst:85 msgid "**Do I receive an invoice to buy my credits?**" msgstr "" -#: ../../content/applications/marketing/sms_marketing/pricing/pricing_and_faq.rst:85 +#: ../../content/applications/marketing/sms_marketing/pricing/pricing_and_faq.rst:87 msgid "Yes." msgstr "" -#: ../../content/applications/marketing/sms_marketing/pricing/pricing_and_faq.rst:88 +#: ../../content/applications/marketing/sms_marketing/pricing/pricing_and_faq.rst:90 msgid "**Can the recipient answer to me?**" msgstr "" -#: ../../content/applications/marketing/sms_marketing/pricing/pricing_and_faq.rst:90 +#: ../../content/applications/marketing/sms_marketing/pricing/pricing_and_faq.rst:92 msgid "No, it is not possible to reply to the SMS." msgstr "" -#: ../../content/applications/marketing/sms_marketing/pricing/pricing_and_faq.rst:93 +#: ../../content/applications/marketing/sms_marketing/pricing/pricing_and_faq.rst:95 msgid "**What happens if I send multiple SMS but I do not have enough credits to send them all?**" msgstr "" -#: ../../content/applications/marketing/sms_marketing/pricing/pricing_and_faq.rst:95 +#: ../../content/applications/marketing/sms_marketing/pricing/pricing_and_faq.rst:97 msgid "The whole transaction is counted as a single one, so no SMS will be sent until you have enough credits to send them all." msgstr "" -#: ../../content/applications/marketing/sms_marketing/pricing/pricing_and_faq.rst:99 +#: ../../content/applications/marketing/sms_marketing/pricing/pricing_and_faq.rst:101 msgid "**Do I have a history of the sent SMSs?**" msgstr "" -#: ../../content/applications/marketing/sms_marketing/pricing/pricing_and_faq.rst:101 +#: ../../content/applications/marketing/sms_marketing/pricing/pricing_and_faq.rst:103 msgid "Yes, the SMS is logged as a note under the chatter of the corresponding record, and a complete history of the SMSs sent is available on :ref:`developer mode ` under :menuselection:`Technical --> SMS`." msgstr "" -#: ../../content/applications/marketing/sms_marketing/pricing/pricing_and_faq.rst:106 +#: ../../content/applications/marketing/sms_marketing/pricing/pricing_and_faq.rst:108 msgid "**Can I send as many SMSs I want at once?**" msgstr "" -#: ../../content/applications/marketing/sms_marketing/pricing/pricing_and_faq.rst:108 +#: ../../content/applications/marketing/sms_marketing/pricing/pricing_and_faq.rst:110 msgid "Yes, if you have enough credits." msgstr "" -#: ../../content/applications/marketing/sms_marketing/pricing/pricing_and_faq.rst:111 +#: ../../content/applications/marketing/sms_marketing/pricing/pricing_and_faq.rst:113 msgid "**If I have a number that does not exist in the list of recipients, will I lose credits?**" msgstr "" -#: ../../content/applications/marketing/sms_marketing/pricing/pricing_and_faq.rst:113 +#: ../../content/applications/marketing/sms_marketing/pricing/pricing_and_faq.rst:115 msgid "Not if the phone number is in the wrong format (e.g. too many digits). Otherwise, if the SMS is sent to the wrong person or to a fake number, the credit will be lost." msgstr "" -#: ../../content/applications/marketing/sms_marketing/pricing/pricing_and_faq.rst:117 +#: ../../content/applications/marketing/sms_marketing/pricing/pricing_and_faq.rst:119 msgid "**What happens if I send my SMS to a paying number (e.g.: a contest to win a ticket for a festival)?**" msgstr "" -#: ../../content/applications/marketing/sms_marketing/pricing/pricing_and_faq.rst:119 +#: ../../content/applications/marketing/sms_marketing/pricing/pricing_and_faq.rst:121 msgid "The SMS will not be delivered to that kind of number, so you won’t be charged." msgstr "" -#: ../../content/applications/marketing/sms_marketing/pricing/pricing_and_faq.rst:122 +#: ../../content/applications/marketing/sms_marketing/pricing/pricing_and_faq.rst:124 msgid "**Can I identify the numbers that do not exist when I send several SMSs?**" msgstr "" -#: ../../content/applications/marketing/sms_marketing/pricing/pricing_and_faq.rst:124 +#: ../../content/applications/marketing/sms_marketing/pricing/pricing_and_faq.rst:126 msgid "Only the ones that have an invalid format." msgstr "" -#: ../../content/applications/marketing/sms_marketing/pricing/pricing_and_faq.rst:127 +#: ../../content/applications/marketing/sms_marketing/pricing/pricing_and_faq.rst:129 msgid "**How does the GDPR regulation affect this service?**" msgstr "" -#: ../../content/applications/marketing/sms_marketing/pricing/pricing_and_faq.rst:129 +#: ../../content/applications/marketing/sms_marketing/pricing/pricing_and_faq.rst:131 msgid "Please find our `Privacy Policy here `__." msgstr "" -#: ../../content/applications/marketing/sms_marketing/pricing/pricing_and_faq.rst:131 +#: ../../content/applications/marketing/sms_marketing/pricing/pricing_and_faq.rst:133 msgid "**Can I use my own SMS provider?**" msgstr "" -#: ../../content/applications/marketing/sms_marketing/pricing/pricing_and_faq.rst:133 +#: ../../content/applications/marketing/sms_marketing/pricing/pricing_and_faq.rst:135 msgid "Yes, but it is not possible out of the box. Our experts can help you customize your database to make it happen. Please, check our success packs `here `_." msgstr "" diff --git a/locale/sources/productivity.pot b/locale/sources/productivity.pot index 62fffbc4a..6101169ec 100644 --- a/locale/sources/productivity.pot +++ b/locale/sources/productivity.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: Odoo 13.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-04-08 13:15+0000\n" +"POT-Creation-Date: 2022-09-01 12:24+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -863,7 +863,7 @@ msgid "In some cases, a serial to USB adapter may be needed." msgstr "" #: ../../content/applications/productivity/iot/devices/scale.rst:17 -msgid "If your scale is `compatibale with Odoo IoT Box `_, there is no need to set up anything because it will be automatically detected as soon as it is connected." +msgid "If your scale is `compatible with Odoo IoT Box `_, there is no need to set up anything because it will be automatically detected as soon as it is connected." msgstr "" #: ../../content/applications/productivity/iot/devices/scale.rst:24 diff --git a/locale/sources/sales.pot b/locale/sources/sales.pot index 0777530ec..702c4de6e 100644 --- a/locale/sources/sales.pot +++ b/locale/sources/sales.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: Odoo 13.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-04-08 13:15+0000\n" +"POT-Creation-Date: 2022-09-01 12:24+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -59,8 +59,9 @@ msgstr "" #: ../../content/applications/sales/crm/track_leads/prospect_visits.rst:12 #: ../../content/applications/sales/point_of_sale/advanced_pricing_features/loyalty.rst:9 #: ../../content/applications/sales/point_of_sale/overview/getting_started.rst:14 +#: ../../content/applications/sales/point_of_sale/payment/adyen.rst:9 #: ../../content/applications/sales/point_of_sale/payment/ingenico.rst:12 -#: ../../content/applications/sales/point_of_sale/payment/six.rst:15 +#: ../../content/applications/sales/point_of_sale/payment/six.rst:16 #: ../../content/applications/sales/point_of_sale/payment/vantiv.rst:13 #: ../../content/applications/sales/point_of_sale/restaurant/restaurant.rst:14 #: ../../content/applications/sales/point_of_sale/restaurant/split.rst:10 @@ -1354,8 +1355,102 @@ msgstr "" msgid "Payment Terminals" msgstr "" +#: ../../content/applications/sales/point_of_sale/payment/adyen.rst:3 +msgid "Adyen" +msgstr "" + +#: ../../content/applications/sales/point_of_sale/payment/adyen.rst:5 +msgid "Connecting an **Adyen payment terminal** allows you to offer a fluid payment flow to your customers and ease the work of your cashiers." +msgstr "" + +#: ../../content/applications/sales/point_of_sale/payment/adyen.rst:11 +msgid "Start by creating your Adyen account on `Adyen's website `_. Then, board your terminal following the steps described on your terminal's screen." +msgstr "" + +#: ../../content/applications/sales/point_of_sale/payment/adyen.rst:15 +msgid "`Adyen Docs - Payment terminal quickstart guides `_." +msgstr "" + +#: ../../content/applications/sales/point_of_sale/payment/adyen.rst:19 +#: ../../content/applications/sales/point_of_sale/payment/ingenico.rst:36 +msgid "Configure the payment method" +msgstr "" + +#: ../../content/applications/sales/point_of_sale/payment/adyen.rst:21 +msgid "First, go to :menuselection:`Point of Sale --> Configuration --> Settings --> Payment Terminals`, and enable :guilabel:`Adyen`. Then, go to :menuselection:`Configuration --> Payment Methods` and create a new payment method. Select :guilabel:`Adyen` in the :guilabel:`Use a Payment Terminal` field." +msgstr "" + +#: ../../content/applications/sales/point_of_sale/payment/adyen.rst:27 +msgid "The selected journal **must** be a bank journal for the :guilabel:`Use a payment terminal` field to appear." +msgstr "" + +#: ../../content/applications/sales/point_of_sale/payment/adyen.rst:30 +msgid "Finally, fill the mandatory fields with an :guilabel:`Adyen API key`, and an :guilabel:`Adyen Terminal Identifier`." +msgstr "" + +#: ../../content/applications/sales/point_of_sale/payment/adyen.rst:34 +msgid "Generate an Adyen API key" +msgstr "" + +#: ../../content/applications/sales/point_of_sale/payment/adyen.rst:36 +msgid "The **Adyen API key** is a key used to authenticate your requests. To generate an API key, go to your **Adyen account**." +msgstr "" + +#: ../../content/applications/sales/point_of_sale/payment/adyen.rst:39 +msgid "Then, go to :menuselection:`Developers --> API credentials`. Create a new credential or click on an existing one." +msgstr "" + +#: ../../content/applications/sales/point_of_sale/payment/adyen.rst:42 +msgid "Click on :guilabel:`Generate an API key` and copy-paste that key onto the Odoo mandatory field." +msgstr "" + +#: ../../content/applications/sales/point_of_sale/payment/adyen.rst:45 +msgid "`Adyen Docs - API credentials `_." +msgstr "" + +#: ../../content/applications/sales/point_of_sale/payment/adyen.rst:49 +msgid "Locate the Adyen terminal identifier" +msgstr "" + +#: ../../content/applications/sales/point_of_sale/payment/adyen.rst:51 +msgid "The **Adyen Terminal Identifier** is your terminal's serial number, which is used to identify the hardware." +msgstr "" + +#: ../../content/applications/sales/point_of_sale/payment/adyen.rst:54 +msgid "To find this number, go to your **Adyen account**. Then, go to :menuselection:`Point of Sale --> Terminals`, select the terminal to link, and copy-paste its serial number onto the Odoo mandatory field." +msgstr "" + +#: ../../content/applications/sales/point_of_sale/payment/adyen.rst:59 +msgid "Add a new payment method" +msgstr "" + +#: ../../content/applications/sales/point_of_sale/payment/adyen.rst:61 +msgid "To add a new **payment method** to a point of sale, go to :menuselection:`Point of Sale --> Configuration --> Point of Sale`. Then, select the POS and go to :menuselection:`Payments --> Payment Methods`, and add your new method for Adyen." +msgstr "" + +#: ../../content/applications/sales/point_of_sale/payment/adyen.rst:66 +#: ../../content/applications/sales/point_of_sale/payment/ingenico.rst:53 +msgid "Pay with a payment terminal" +msgstr "" + +#: ../../content/applications/sales/point_of_sale/payment/adyen.rst:68 +msgid "When processing a payment, select :guilabel:`Adyen` as the payment method. Check the amount and click on :guilabel:`Send`. Once the payment is successful, the status changes to :guilabel:`Payment Successful`." +msgstr "" + +#: ../../content/applications/sales/point_of_sale/payment/adyen.rst:0 +msgid "In case of connexion issues between Odoo and the payment terminal, force the payment by clicking on :guilabel:`Force Done`, which allows you to validate the order." +msgstr "" + +#: ../../content/applications/sales/point_of_sale/payment/adyen.rst:0 +msgid "This option is only available after receiving an error message informing you that the connection failed." +msgstr "" + +#: ../../content/applications/sales/point_of_sale/payment/adyen.rst:77 +msgid "To cancel the payment request, click on :guilabel:`cancel`." +msgstr "" + #: ../../content/applications/sales/point_of_sale/payment/ingenico.rst:3 -msgid "Connect an Ingenico Payment Terminal to your PoS" +msgid "Ingenico" msgstr "" #: ../../content/applications/sales/point_of_sale/payment/ingenico.rst:5 @@ -1386,10 +1481,6 @@ msgstr "" msgid "Now, click on connection change and TCP/IP. Type the IP of your *IoT Box* (you can find it on the form view of your IoT Box). Then, enter 9000 as port. The terminal will restart. Once it is done, go on your *IoT Box* form in Odoo and verify that the terminal has been found." msgstr "" -#: ../../content/applications/sales/point_of_sale/payment/ingenico.rst:36 -msgid "Configure the payment method" -msgstr "" - #: ../../content/applications/sales/point_of_sale/payment/ingenico.rst:38 msgid "First, go in the general settings of the POS app, and activate the Ingenico setting." msgstr "" @@ -1398,10 +1489,6 @@ msgstr "" msgid "Go back in :menuselection:`Point of Sale --> Configuration --> Point of Sale`, go in the payments section and access your payment methods. Create a new payment method for Ingenico, select the payment terminal option Ingenico, and select your payment terminal device." msgstr "" -#: ../../content/applications/sales/point_of_sale/payment/ingenico.rst:53 -msgid "Pay with a payment terminal" -msgstr "" - #: ../../content/applications/sales/point_of_sale/payment/ingenico.rst:55 msgid "In your *PoS interface*, when processing a payment, select a *Payment Method* using a payment terminal. Check that the amount in the tendered column is the one that has to be sent to the payment terminal and click on *Send*. When the payment is successful, the status will change to *Payment Successful*." msgstr "" @@ -1423,7 +1510,7 @@ msgid "Once your payment is processed, on the payment record, you’ll find the msgstr "" #: ../../content/applications/sales/point_of_sale/payment/six.rst:3 -msgid "Connect a SIX Payment Terminal to your PoS" +msgid "SIX" msgstr "" #: ../../content/applications/sales/point_of_sale/payment/six.rst:5 @@ -1431,41 +1518,45 @@ msgid "Connecting a SIX payment terminal allows you to offer a fluid payment flo msgstr "" #: ../../content/applications/sales/point_of_sale/payment/six.rst:9 +msgid "Starting in July 2022, it will **not** be possible anymore to connect and use a Six payment terminal in PoS." +msgstr "" + +#: ../../content/applications/sales/point_of_sale/payment/six.rst:11 msgid "Even though Worldline has recently acquired SIX Payment Services and both companies use Yomani payment terminals, the firmware they run is different. Terminals received from Worldline are therefore not compatible with this integration." msgstr "" -#: ../../content/applications/sales/point_of_sale/payment/six.rst:18 +#: ../../content/applications/sales/point_of_sale/payment/six.rst:19 #: ../../content/applications/sales/point_of_sale/payment/vantiv.rst:16 msgid "Configure the Payment Method" msgstr "" -#: ../../content/applications/sales/point_of_sale/payment/six.rst:20 +#: ../../content/applications/sales/point_of_sale/payment/six.rst:21 msgid "First, make sure that the POS Six module is installed. For this, go to *Apps*, remove the \"Apps\" filter and search for \"POS Six\"." msgstr "" -#: ../../content/applications/sales/point_of_sale/payment/six.rst:26 +#: ../../content/applications/sales/point_of_sale/payment/six.rst:27 msgid "Back in :menuselection:`Point of Sale --> Configuration --> Payment Methods`, Create a new payment method for SIX, select the payment terminal option \"SIX without IoT Box\", and enter your payment terminal IP address." msgstr "" -#: ../../content/applications/sales/point_of_sale/payment/six.rst:34 +#: ../../content/applications/sales/point_of_sale/payment/six.rst:35 #: ../../content/applications/sales/point_of_sale/payment/vantiv.rst:40 msgid "Pay with a Payment Terminal" msgstr "" -#: ../../content/applications/sales/point_of_sale/payment/six.rst:36 +#: ../../content/applications/sales/point_of_sale/payment/six.rst:37 msgid "In your PoS interface, at the moment of the payment, select a payment method using a payment terminal. Verify that the amount in the tendered column is the one that has to be sent to the payment terminal and click on *Send*. If you want to cancel the payment request, click on cancel." msgstr "" -#: ../../content/applications/sales/point_of_sale/payment/six.rst:44 +#: ../../content/applications/sales/point_of_sale/payment/six.rst:45 msgid "When the payment is done, the status will change to *Payment Successful*. You can always reverse the last transaction by clicking on *Reverse*." msgstr "" -#: ../../content/applications/sales/point_of_sale/payment/six.rst:51 +#: ../../content/applications/sales/point_of_sale/payment/six.rst:52 msgid "If there is any issue with the payment terminal, you can still force the payment using the *Force Done*. This will allow you to validate the order in Odoo even if the connection between the terminal and Odoo encounters issues." msgstr "" #: ../../content/applications/sales/point_of_sale/payment/vantiv.rst:3 -msgid "Connect a Vantiv Payment Terminal to your PoS" +msgid "Vantiv" msgstr "" #: ../../content/applications/sales/point_of_sale/payment/vantiv.rst:5 @@ -2464,14 +2555,14 @@ msgid "Amazon.nl" msgstr "" #: ../../content/applications/sales/sales/amazon_connector/features.rst:94 -#: ../../content/applications/sales/sales/amazon_connector/manage.rst:111 -#: ../../content/applications/sales/sales/amazon_connector/update.rst:73 +#: ../../content/applications/sales/sales/amazon_connector/manage.rst:120 +#: ../../content/applications/sales/sales/amazon_connector/update.rst:59 msgid ":doc:`setup`" msgstr "" #: ../../content/applications/sales/sales/amazon_connector/features.rst:95 -#: ../../content/applications/sales/sales/amazon_connector/setup.rst:160 -#: ../../content/applications/sales/sales/amazon_connector/update.rst:74 +#: ../../content/applications/sales/sales/amazon_connector/setup.rst:119 +#: ../../content/applications/sales/sales/amazon_connector/update.rst:60 msgid ":doc:`manage`" msgstr "" @@ -2520,60 +2611,72 @@ msgid "If this is not already done, you need to :ref:`install ` msgstr "" #: ../../content/applications/sales/sales/amazon_connector/manage.rst:51 -msgid ":doc:`../../../inventory_and_mrp/inventory/shipping/setup/third_party_shipper`" +msgid "If your chosen carrier isn't one supported by Odoo, you can still create a carrier bearing its name (e.g. create a carrier named `Colissimo`). This name is case insensitive, but be careful about typos, as Amazon won't recognize them." msgstr "" #: ../../content/applications/sales/sales/amazon_connector/manage.rst:54 -msgid "Follow deliveries in FBA" +msgid "Create a delivery carrier named `Self Delivery` to inform Amazon that you make your own deliveries. You still have to enter a tracking reference." msgstr "" #: ../../content/applications/sales/sales/amazon_connector/manage.rst:56 -msgid "When a **FBA** (Fulfilled by Amazon) order is synchronized in Odoo, a stock move is recorded for each sales order item so that it is saved in your system. Inventory managers can find such moves in :menuselection:`Inventory --> Reporting --> Product Moves`. They pick up products in a specific inventory location called **Amazon**. This location represents your stock in Amazon's warehouses and allows you to manage the stock of your products under the FBA program." +msgid "Keep in mind that the customer is notified by email about the delivery, and the carrier and tracking reference are displayed in the email to the customer." +msgstr "" + +#: ../../content/applications/sales/sales/amazon_connector/manage.rst:60 +msgid ":doc:`../../../inventory_and_mrp/inventory/shipping/setup/third_party_shipper`" msgstr "" #: ../../content/applications/sales/sales/amazon_connector/manage.rst:63 +msgid "Follow deliveries in FBA" +msgstr "" + +#: ../../content/applications/sales/sales/amazon_connector/manage.rst:65 +msgid "When a **FBA** (Fulfilled by Amazon) order is synchronized in Odoo, a stock move is recorded for each sales order item so that it is saved in your system. Inventory managers can find such moves in :menuselection:`Inventory --> Reporting --> Product Moves`. They pick up products in a specific inventory location called **Amazon**. This location represents your stock in Amazon's warehouses and allows you to manage the stock of your products under the FBA program." +msgstr "" + +#: ../../content/applications/sales/sales/amazon_connector/manage.rst:72 msgid "To follow your Amazon (FBA) stock in Odoo, you can make an inventory adjustment after replenishing it. You can also trigger an automated replenishment from reordering rules on the Amazon location." msgstr "" -#: ../../content/applications/sales/sales/amazon_connector/manage.rst:68 +#: ../../content/applications/sales/sales/amazon_connector/manage.rst:77 msgid "The Amazon location is configurable by Amazon account managed in Odoo. All accounts of the same company use the same location by default. It is however possible to follow the stock by marketplace. First, remove the marketplace for which you want to follow the stock separately from the list of synchronized marketplaces. Then, create another registration for this account and remove all marketplaces, except the one to isolate from the others. Finally, assign another stock location to the second registration of your account." msgstr "" -#: ../../content/applications/sales/sales/amazon_connector/manage.rst:76 +#: ../../content/applications/sales/sales/amazon_connector/manage.rst:85 msgid "Issue invoices and register payments" msgstr "" -#: ../../content/applications/sales/sales/amazon_connector/manage.rst:78 +#: ../../content/applications/sales/sales/amazon_connector/manage.rst:87 msgid "You can issue invoices for Amazon orders in Odoo. Click **Create Invoice** in the sales order to do so. You can also do it in batch from the list view of orders. Then, confirm and send the invoices to your customers." msgstr "" -#: ../../content/applications/sales/sales/amazon_connector/manage.rst:83 +#: ../../content/applications/sales/sales/amazon_connector/manage.rst:92 msgid "To display only Amazon-related orders on the list view, you can filter orders based on the sales team." msgstr "" -#: ../../content/applications/sales/sales/amazon_connector/manage.rst:86 +#: ../../content/applications/sales/sales/amazon_connector/manage.rst:95 msgid "As the customer has paid Amazon as an intermediary, you should register invoice payments in a payment journal dedicated to Amazon (e.g. Amazon Payments, with a dedicated intermediary account). You can do the same with the vendor bill received from Amazon and dedicated to commissions. When you receive the balance on your bank account at the end of the month and record your bank statements in Odoo, you simply credit the Amazon intermediary account by the amount received." msgstr "" -#: ../../content/applications/sales/sales/amazon_connector/manage.rst:93 +#: ../../content/applications/sales/sales/amazon_connector/manage.rst:102 msgid "Follow your Amazon sales in sales reporting" msgstr "" -#: ../../content/applications/sales/sales/amazon_connector/manage.rst:95 +#: ../../content/applications/sales/sales/amazon_connector/manage.rst:104 msgid "As a sales team is set on your account under the tab **Order Follow-up**, this helps you give quick glances at the figures in just a few clicks in Sales reporting. By default, your account's sales team is shared between all of your company's accounts." msgstr "" -#: ../../content/applications/sales/sales/amazon_connector/manage.rst:99 +#: ../../content/applications/sales/sales/amazon_connector/manage.rst:108 msgid "If you wish, you can change the sales team on your account for another to perform a separate reporting for the sales of this account." msgstr "" -#: ../../content/applications/sales/sales/amazon_connector/manage.rst:103 +#: ../../content/applications/sales/sales/amazon_connector/manage.rst:112 msgid "It is also possible to perform reporting on a per-marketplace basis in a similar fashion. First, remove the marketplace you wish to track separately from the list of synchronized marketplaces. Then, create another registration for this account and remove all marketplaces, except the one to isolate from the others. Finally, assign another sales team to one of the two registrations of your account." msgstr "" -#: ../../content/applications/sales/sales/amazon_connector/manage.rst:110 -#: ../../content/applications/sales/sales/amazon_connector/setup.rst:159 -#: ../../content/applications/sales/sales/amazon_connector/update.rst:72 +#: ../../content/applications/sales/sales/amazon_connector/manage.rst:119 +#: ../../content/applications/sales/sales/amazon_connector/setup.rst:118 +#: ../../content/applications/sales/sales/amazon_connector/update.rst:58 msgid ":doc:`features`" msgstr "" @@ -2582,221 +2685,163 @@ msgid "Configure Amazon Connector in Odoo" msgstr "" #: ../../content/applications/sales/sales/amazon_connector/setup.rst:6 -msgid "Generate an Authorization Token in Seller Central" -msgstr "" - -#: ../../content/applications/sales/sales/amazon_connector/setup.rst:10 -msgid "The Amazon Connector uses an Authorization Token that allows Odoo to fetch data from your Amazon Seller Central account. This token can be obtained directly through Seller Central in a few clicks and needs to be set up in your Odoo database configuration." -msgstr "" - -#: ../../content/applications/sales/sales/amazon_connector/setup.rst:14 -msgid "Connect to your Seller Central account for the marketplace you initially signed up (e.g. if you created your account on Amazon Germany, go to `Amazon Seller Central for Germany `_) with an administrator account." -msgstr "" - -#: ../../content/applications/sales/sales/amazon_connector/setup.rst:19 -msgid "You might need to use the *main* (or first) administrator account and not one added subsequently." -msgstr "" - -#: ../../content/applications/sales/sales/amazon_connector/setup.rst:22 -msgid "In the main menu, select :menuselection:`Apps & Services --> Manage Your Apps`; in the page that displays, click on the ``Authorize new developper`` button:" -msgstr "" - -#: ../../content/applications/sales/sales/amazon_connector/setup.rst:28 -msgid "Fill in the form depending on your Marketplace:" -msgstr "" - -#: ../../content/applications/sales/sales/amazon_connector/setup.rst:33 -msgid "If your seller account is registered in the **North America** region, use these values:" -msgstr "" - -#: ../../content/applications/sales/sales/amazon_connector/setup.rst:35 -#: ../../content/applications/sales/sales/amazon_connector/setup.rst:40 -msgid "Developer's Name: ``Odoo S.A.``" -msgstr "" - -#: ../../content/applications/sales/sales/amazon_connector/setup.rst:36 -msgid "Developer ID: ``586127723692``" -msgstr "" - -#: ../../content/applications/sales/sales/amazon_connector/setup.rst:38 -msgid "For the **Europe** region, use these values:" -msgstr "" - -#: ../../content/applications/sales/sales/amazon_connector/setup.rst:41 -msgid "Developer ID: ``579095187166``" -msgstr "" - -#: ../../content/applications/sales/sales/amazon_connector/setup.rst:43 -msgid "Amazon will then inform you that by submitting the form, you are giving access to your Seller Central Information to Odoo S.A." -msgstr "" - -#: ../../content/applications/sales/sales/amazon_connector/setup.rst:47 -msgid "Odoo S.A. is unable to access your Amazon account's information without the Authorization Token which is stored in your Odoo database - we do not store these tokens on our platform directly and are therefore unable to access your account's information outside of the Amazon Connector normal flows." -msgstr "" - -#: ../../content/applications/sales/sales/amazon_connector/setup.rst:53 msgid "Register your Amazon account in Odoo" msgstr "" -#: ../../content/applications/sales/sales/amazon_connector/setup.rst:57 -msgid "To register your seller account in Odoo, navigate to :menuselection:`Sales --> Configuration --> Settings --> Connectors --> Amazon Sync --> Amazon Accounts` and click on **CREATE**." +#: ../../content/applications/sales/sales/amazon_connector/setup.rst:10 +msgid "To register your seller account in Odoo, navigate to :menuselection:`Sales --> Configuration --> Settings --> Connectors --> Amazon Sync --> Amazon Accounts` and click on :guilabel:`CREATE`." msgstr "" -#: ../../content/applications/sales/sales/amazon_connector/setup.rst:60 -msgid "The **Seller ID** can be found in Seller Central under the link **Your Merchant Token** on the **Seller Account Information** page. The **Authorization Token** is the one you generated in the :ref:`previous step `." +#: ../../content/applications/sales/sales/amazon_connector/setup.rst:13 +msgid "Choose a meaningful name for your account (e.g. `Europe`), and select your :guilabel:`Sign-up Marketplace`. This is the original sign-up marketplace of your seller account (e.g. if you created your account on Amazon Germany, your sign-up marketplace will be `amazon.de`)" msgstr "" -#: ../../content/applications/sales/sales/amazon_connector/setup.rst:64 -msgid "Upon saving, your credentials are checked. In case of issues, an error will be displayed - the information cannot be saved until your credentials are recognized by Amazon." +#: ../../content/applications/sales/sales/amazon_connector/setup.rst:17 +msgid "Upon saving, a button to :guilabel:`link with Amazon` appears. Click on it to be redirected to the Amazon login page, or directly to the consent page if you are already logged in. There, confirm that you want Amazon to give Odoo access to your account and related data." msgstr "" -#: ../../content/applications/sales/sales/amazon_connector/setup.rst:67 -msgid "Once the account is registered, the marketplaces available to this account are synchronized and listed under the **Marketplaces** tab. If you wish, you can remove some items from the list of synchronized marketplaces to disable their synchronization." +#: ../../content/applications/sales/sales/amazon_connector/setup.rst:21 +msgid "Amazon redirects you to Odoo, with your account registered." msgstr "" -#: ../../content/applications/sales/sales/amazon_connector/setup.rst:72 +#: ../../content/applications/sales/sales/amazon_connector/setup.rst:23 +msgid "Once the account is registered, the marketplaces available to this account are synchronized and listed under the :guilabel:`Marketplaces` tab. If you wish, you can remove some items from the list of synchronized marketplaces to disable their synchronization." +msgstr "" + +#: ../../content/applications/sales/sales/amazon_connector/setup.rst:28 msgid "Match database products in Amazon" msgstr "" -#: ../../content/applications/sales/sales/amazon_connector/setup.rst:74 +#: ../../content/applications/sales/sales/amazon_connector/setup.rst:30 msgid "When an Amazon order is synchronized, up to three sales order items are created in Odoo for each product sold on Amazon: one for the marketplace product, one for the shipping charges (if any) and one for the gift wrapping charges (if any)." msgstr "" -#: ../../content/applications/sales/sales/amazon_connector/setup.rst:80 +#: ../../content/applications/sales/sales/amazon_connector/setup.rst:36 msgid "The selection of a database product for a sales order item is done by matching its **internal reference** with the **SKU** for marketplace items, the **shipping code** for delivery charges, and the **gift wrapping** code for gift wrapping charges." msgstr "" -#: ../../content/applications/sales/sales/amazon_connector/setup.rst:84 +#: ../../content/applications/sales/sales/amazon_connector/setup.rst:40 msgid "For marketplace products, pairings are saved as **Amazon Offers** which are listed under the **Offers** stat button on the account form. Offers are automatically created when the pairing is established and are used for subsequent orders to lookup SKUs. If no offer with a matching SKU is found, :ref:`the internal reference is used instead `." msgstr "" -#: ../../content/applications/sales/sales/amazon_connector/setup.rst:90 +#: ../../content/applications/sales/sales/amazon_connector/setup.rst:46 msgid "It is possible to force the pairing of a marketplace item with a specific product by changing either the product or the SKU of an offer. The offer can be manually created if it was not automatically done yet. This is useful if you do not use the internal reference as the SKU or if you sell the product under different conditions." msgstr "" -#: ../../content/applications/sales/sales/amazon_connector/setup.rst:95 +#: ../../content/applications/sales/sales/amazon_connector/setup.rst:51 msgid "If no database product with a matching internal reference is found for a given SKU or gift wrapping code, a default database product **Amazon Sale** is used. The same is done with the default product **Amazon Shipping** and the shipping code." msgstr "" -#: ../../content/applications/sales/sales/amazon_connector/setup.rst:100 +#: ../../content/applications/sales/sales/amazon_connector/setup.rst:56 msgid "To modify the default products, activate the :ref:`developer mode ` and navigate to :menuselection:`Sales --> Configuration --> Settings --> Connectors --> Amazon Sync --> Default Products`." msgstr "" -#: ../../content/applications/sales/sales/amazon_connector/setup.rst:105 +#: ../../content/applications/sales/sales/amazon_connector/setup.rst:61 msgid "Configure taxes of products" msgstr "" -#: ../../content/applications/sales/sales/amazon_connector/setup.rst:107 +#: ../../content/applications/sales/sales/amazon_connector/setup.rst:63 msgid "To allow for tax reporting of Amazon sales with Odoo, the taxes applied to the sales order items are those set on the product or determined by the fiscal position. Make sure to have set the correct taxes on your products in Odoo or to have it done by a fiscal position, to avoid discrepancies in the subtotals between Seller Central and Odoo." msgstr "" -#: ../../content/applications/sales/sales/amazon_connector/setup.rst:113 +#: ../../content/applications/sales/sales/amazon_connector/setup.rst:69 msgid "As Amazon does not necessarily apply the same taxes as those configured in Odoo, it may happen that order totals differ by a few cents from that on Seller Central. Those differences can be resolved with a write-off when reconciling the payments in Odoo." msgstr "" -#: ../../content/applications/sales/sales/amazon_connector/setup.rst:120 +#: ../../content/applications/sales/sales/amazon_connector/setup.rst:76 msgid "Add an unsupported marketplace" msgstr "" -#: ../../content/applications/sales/sales/amazon_connector/setup.rst:122 -msgid "Some Amazon Marketplaces, such as Amazon Brazil, are not officially supported by Odoo but might be compatible with your seller account. These marketplaces can be added manually should you wish to use them. See :ref:`here ` for the exhaustive list of natively supported marketplaces." +#: ../../content/applications/sales/sales/amazon_connector/setup.rst:78 +msgid "Some Amazon Marketplaces, such as Amazon Brazil, are not created by default as they are not officially supported by Odoo but might be compatible with your seller account. These marketplaces can be added manually should you wish to use them. See :ref:`here ` for the exhaustive list of natively supported marketplaces." msgstr "" -#: ../../content/applications/sales/sales/amazon_connector/setup.rst:128 -msgid "To find out if a marketplace is eventually compatible, check the `Amazon Documentation `_. The marketplace must belong to the same region as that of your seller account." +#: ../../content/applications/sales/sales/amazon_connector/setup.rst:84 +msgid "To find out if a marketplace is eventually compatible, check the `Amazon Documentation `_. The marketplace must belong to the same region as that of your seller account." msgstr "" -#: ../../content/applications/sales/sales/amazon_connector/setup.rst:132 -msgid "To add a new marketplace, you must first activate the :ref:`developer mode `." +#: ../../content/applications/sales/sales/amazon_connector/setup.rst:88 +msgid "To add a new marketplace, activate the :ref:`developer mode `." msgstr "" -#: ../../content/applications/sales/sales/amazon_connector/setup.rst:134 +#: ../../content/applications/sales/sales/amazon_connector/setup.rst:90 msgid "Once that is done, go to :menuselection:`Sales --> Configuration --> Settings --> Connectors --> Amazon Sync --> Amazon Marketplaces`." msgstr "" -#: ../../content/applications/sales/sales/amazon_connector/setup.rst:137 -msgid "From there, you can create a new marketplace record. You will need the Marketplace ID and Endpoint for your marketplace as described in the `Amazon Documentation `_." +#: ../../content/applications/sales/sales/amazon_connector/setup.rst:93 +msgid "From there, create a new marketplace record. Enter the Marketplace ID and select the Amazon Region for your marketplace as described in the `Amazon Documentation for marketplace IDs `_, and the Seller Central URL as described in the `Amazon Documentation for seller central URLs `_." msgstr "" -#: ../../content/applications/sales/sales/amazon_connector/setup.rst:141 -msgid "Set the name of the record to ``Amazon.`` to easily retrieve it (for instance: ``Amazon.se``). The **Code**, **Domain** and **API Identifier** fields should respectively hold the *Country Code*, *Amazon MWS Endpoint* and *MarketplaceId* values from the Amazon Documentation." +#: ../../content/applications/sales/sales/amazon_connector/setup.rst:99 +msgid "Set the name of the record to ``Amazon.`` to easily retrieve it (e.g.: ``Amazon.se``). The :guilabel:`API Identifier`, the :guilabel:`Region` and the :guilabel:`Seller Central URL` fields should respectively hold the *MarketplaceId*, the selected Amazon region and the *Seller Central URL* values from the Amazon Documentation." msgstr "" -#: ../../content/applications/sales/sales/amazon_connector/setup.rst:145 -msgid "Once the marketplace is saved, you should then update the Amazon Account configuration by going to :menuselection:`Sales --> Configuration --> Settings --> Connectors --> Amazon Sync --> Amazon Accounts`, open the account on which you wish to use the new marketplace, go to the **Marketplaces** tab and click on **Update available marketplaces** (an animation should confirm the success of the operation). Newly added marketplaces are automatically added to the list of synchronized marketplaces. If the new marketplace is not added to the list, it means that it is either incompatible or unavailable for your seller account." +#: ../../content/applications/sales/sales/amazon_connector/setup.rst:104 +msgid "Once the marketplace is saved, update the Amazon Account configuration by going to :menuselection:`Sales --> Configuration --> Settings --> Connectors --> Amazon Sync --> Amazon Accounts`. Open the account on which you wish to use the new marketplace, go to the :guilabel:`Marketplaces` tab and click on :guilabel:`Update available marketplaces` (an animation should confirm the success of the operation). Newly added marketplaces are automatically added to the list of synchronized marketplaces. If the new marketplace is not added to the list, it means that it is either incompatible or unavailable for your seller account." msgstr "" -#: ../../content/applications/sales/sales/amazon_connector/setup.rst:154 +#: ../../content/applications/sales/sales/amazon_connector/setup.rst:113 msgid "As manually added marketplaces are not officially supported by Odoo, there is no guarantee that adding one as described above will work, nor can this be considered as a bug when contacting Odoo Support." msgstr "" #: ../../content/applications/sales/sales/amazon_connector/update.rst:3 -msgid "Install the Amazon Connector Authentication Update" +msgid "Install the Amazon Selling Partner API Update" msgstr "" #: ../../content/applications/sales/sales/amazon_connector/update.rst:5 -msgid "Starting July 2020, the Amazon Connector requires the use of a new authentication method that makes it easier for you to set up the Connector." +msgid "Starting July 2022, due to a change in Amazon's API, the Amazon Connector needs to be updated to continue to exchange information with Amazon. This also makes it easier for you to set up the Connector." msgstr "" -#: ../../content/applications/sales/sales/amazon_connector/update.rst:8 -msgid "Prior to the update, Odoo customers who wished to use the Amazon Connector had to apply to get developer credentials through Amazon, which was a painful and long process that could take weeks. This method of authentication is still technically possible, but Amazon will refuse to provide developer credentials for Odoo customers from July 2020 onwards and will deactivate such credentials for existing customers." -msgstr "" - -#: ../../content/applications/sales/sales/amazon_connector/update.rst:14 -msgid "This documentation will help you install the update and use the new authentication flow." +#: ../../content/applications/sales/sales/amazon_connector/update.rst:10 +msgid "If your Odoo database is created after the update was released, the update module is installed automatically. To check if this module is already installed, go to :guilabel:`Apps`, remove the ``Apps`` filter and search for ``Amazon``. If the module :guilabel:`Amazon/Selling Partner API Patch` is present and marked as installed, your Odoo database is already up-to-date and you can proceed with the :doc:`setup ` step of the Amazon Connector." msgstr "" #: ../../content/applications/sales/sales/amazon_connector/update.rst:17 -msgid "Note that if your Odoo database was first created after the update was released, the update module is installed automatically. You can check if this module is already installed by going to the **Apps** menu, removing the ``Apps`` search facet and search for ``amazon``. If the module **Amazon/Authentication Patch** is present and marked as installed, your Odoo database is already up-to-date and you can proceed with the :doc:`setup ` step of the Amazon Connector." -msgstr "" - -#: ../../content/applications/sales/sales/amazon_connector/update.rst:25 #: ../../content/applications/sales/sales/ebay_connector/setup.rst:63 msgid "Update Odoo to the latest release" msgstr "" -#: ../../content/applications/sales/sales/amazon_connector/update.rst:27 +#: ../../content/applications/sales/sales/amazon_connector/update.rst:19 msgid "The new authentication mechanism is made available through a new Odoo module; to be able to install it, you must make sure that your Odoo source code is up-to-date." msgstr "" -#: ../../content/applications/sales/sales/amazon_connector/update.rst:30 +#: ../../content/applications/sales/sales/amazon_connector/update.rst:22 #: ../../content/applications/sales/sales/ebay_connector/setup.rst:68 msgid "If you use Odoo on Odoo.com or Odoo.sh platform, your code is already up-to-date and you can proceed to the next step." msgstr "" -#: ../../content/applications/sales/sales/amazon_connector/update.rst:33 +#: ../../content/applications/sales/sales/amazon_connector/update.rst:25 #: ../../content/applications/sales/sales/ebay_connector/setup.rst:70 msgid "If you use Odoo with an on-premise setup or through a partner, then you must update your installation as detailed in :doc:`this documentation page ` or by contacting your integrating partner." msgstr "" -#: ../../content/applications/sales/sales/amazon_connector/update.rst:39 +#: ../../content/applications/sales/sales/amazon_connector/update.rst:31 #: ../../content/applications/sales/sales/ebay_connector/setup.rst:75 msgid "Update the list of available modules" msgstr "" -#: ../../content/applications/sales/sales/amazon_connector/update.rst:41 +#: ../../content/applications/sales/sales/amazon_connector/update.rst:33 msgid "New modules must be *discovered* by your Odoo instance to be available in the **Apps** menu." msgstr "" -#: ../../content/applications/sales/sales/amazon_connector/update.rst:44 +#: ../../content/applications/sales/sales/amazon_connector/update.rst:36 msgid "To do so, activate the :ref:`developer mode `, and go to :menuselection:`Apps --> Update Apps List`. A wizard will ask for confirmation." msgstr "" -#: ../../content/applications/sales/sales/amazon_connector/update.rst:48 -msgid "Install the Amazon/Authentication Patch" +#: ../../content/applications/sales/sales/amazon_connector/update.rst:40 +msgid "Install the Amazon/Selling Partner API Patch" msgstr "" -#: ../../content/applications/sales/sales/amazon_connector/update.rst:51 -#: ../../content/applications/sales/sales/ebay_connector/setup.rst:87 -msgid "You should never install new modules in your production database without testing them in a duplicate or staging environment. For Odoo.com customers, a duplicate database can be created from the database management page. For Odoo.sh users, you should use a staging or duplicate database. For on-premise users, you should use a staging environment - you should contact your integrating partner for more information regarding how to test a new module in your particular setup." +#: ../../content/applications/sales/sales/amazon_connector/update.rst:43 +msgid "You should never install new modules in your production database without first testing them in a duplicate or staging environment. For Odoo.com customers, a duplicate database can be created from the database management page. For Odoo.sh users, you should use a staging or duplicate database. For on-premise users, you should use a staging environment---contact your integrating partner for more information regarding how to test a new module in your particular setup." msgstr "" -#: ../../content/applications/sales/sales/amazon_connector/update.rst:58 -msgid "The module should now be available in your **Apps** menu. Remove the ``Apps`` search facet and search for ``amazon``; the module **Amazon/Authentication Patch** should be available for installation. If you cannot find the module after having updated the list of available modules, it means your Odoo source code is not up-to-date; refer to step one of this page." +#: ../../content/applications/sales/sales/amazon_connector/update.rst:49 +msgid "The module should now be available in your :guilabel:`Apps` menu. Remove the ``Apps`` filter and search for ``Amazon``; the module :guilabel:`Amazon/Selling Partner API Patch` should be available for installation. If you cannot find the module after having updated the list of available modules, it means your Odoo source code is not up-to-date; refer to step one of this page." msgstr "" -#: ../../content/applications/sales/sales/amazon_connector/update.rst:67 -msgid "Once the module is installed, you will need to generate an Authorization Token in Amazon Seller Central and set it up on your Amazon Account in Odoo; this process is detailed in the :doc:`setup ` page." +#: ../../content/applications/sales/sales/amazon_connector/update.rst:54 +msgid "Once the module is installed, link your Amazon account by following the instructions on the :doc:`setup ` page." msgstr "" #: ../../content/applications/sales/sales/ebay_connector.rst:5 @@ -2927,6 +2972,10 @@ msgstr "" msgid "Install the eBay Connector - Account Deletion update" msgstr "" +#: ../../content/applications/sales/sales/ebay_connector/setup.rst:87 +msgid "You should never install new modules in your production database without testing them in a duplicate or staging environment. For Odoo.com customers, a duplicate database can be created from the database management page. For Odoo.sh users, you should use a staging or duplicate database. For on-premise users, you should use a staging environment - you should contact your integrating partner for more information regarding how to test a new module in your particular setup." +msgstr "" + #: ../../content/applications/sales/sales/ebay_connector/setup.rst:94 msgid "To install the module, go to the :menuselection:`Apps` menu, remove the `Apps` search facet and search for `ebay`. If the module **eBay Connector - Account Deletion** is present and marked as installed, your Odoo database is already up-to-date and you can proceed with the next step. If it is not yet installed, install it now." msgstr "" diff --git a/locale/sources/sphinx.pot b/locale/sources/sphinx.pot index fff2d2d3b..8cef61bad 100644 --- a/locale/sources/sphinx.pot +++ b/locale/sources/sphinx.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: Odoo 13.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-04-08 13:15+0000\n" +"POT-Creation-Date: 2022-09-01 12:24+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -28,7 +28,7 @@ msgstr "" msgid "Ask the Odoo Community" msgstr "" -#: ../../extensions/odoo_theme/layout_templates/header.html:11 +#: ../../extensions/odoo_theme/layout_templates/header.html:10 msgid "Try Odoo for FREE" msgstr "" @@ -131,10 +131,14 @@ msgid "You want to contribute to Odoo but don't know where to start? The tutoria msgstr "" #: ../../extensions/odoo_theme/layout_templates/homepage.html:102 -msgid "Write documentation" +msgid "Coding guidelines" msgstr "" #: ../../extensions/odoo_theme/layout_templates/homepage.html:107 +msgid "Documentation" +msgstr "" + +#: ../../extensions/odoo_theme/layout_templates/homepage.html:112 msgid "Content guidelines" msgstr "" diff --git a/locale/sources/websites.pot b/locale/sources/websites.pot index 6cce14d02..1d5bc4691 100644 --- a/locale/sources/websites.pot +++ b/locale/sources/websites.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: Odoo 13.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-04-08 13:15+0000\n" +"POT-Creation-Date: 2022-09-01 12:24+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -34,11 +34,15 @@ msgid "Odoo offers a :ref:`free custom domain name ` msgstr "" #: ../../content/applications/websites/ecommerce.rst:19 +msgid ":doc:`Website Documentation `" +msgstr "" + +#: ../../content/applications/websites/ecommerce.rst:20 #: ../../content/applications/websites/website.rst:20 msgid "`Odoo Tutorials: Website `_" msgstr "" -#: ../../content/applications/websites/ecommerce.rst:20 +#: ../../content/applications/websites/ecommerce.rst:21 #: ../../content/applications/websites/website.rst:21 msgid "`Odoo Tutorials: eCommerce `_" msgstr "" @@ -545,10 +549,6 @@ msgstr "" msgid "Turn on *Alternative Products* from the *Customize* menu of the product web page." msgstr "" -#: ../../content/applications/websites/ecommerce/publish.rst:5 -msgid "Launch my website" -msgstr "" - #: ../../content/applications/websites/ecommerce/shopper_experience.rst:5 msgid "Get paid" msgstr "" @@ -880,31 +880,43 @@ msgstr "" msgid "How to track your website's traffic in Google Analytics" msgstr "" -#: ../../content/applications/websites/website/optimize/google_analytics.rst:5 -msgid "To follow your website's traffic with Google Analytics:" -msgstr "" - -#: ../../content/applications/websites/website/optimize/google_analytics.rst:7 -msgid "`Create a Google Analytics account `__ if you don't have any." +#: ../../content/applications/websites/website/optimize/google_analytics.rst:6 +msgid "Google deprecated **Universal Analytics** which won't be supported anymore in `July 2023 `_. They are replacing it with **Analytics 4**." msgstr "" #: ../../content/applications/websites/website/optimize/google_analytics.rst:10 +msgid "New accounts are already using it, but accounts created before `October 2020 `_ are most likely still using **Universal Analytics**." +msgstr "" + +#: ../../content/applications/websites/website/optimize/google_analytics.rst:14 +msgid "Odoo 15.0 is already adapted and ready for **Analytics 4**. After July 2023, if you want to use Google Analytics tracking in versions before 15.0, you will need to insert the GA tracker code manually, instead of entering your GA key in the Odoo settings." +msgstr "" + +#: ../../content/applications/websites/website/optimize/google_analytics.rst:19 +msgid "To follow your website's traffic with Google Analytics:" +msgstr "" + +#: ../../content/applications/websites/website/optimize/google_analytics.rst:21 +msgid "`Create a Google Analytics account `__ if you don't have any." +msgstr "" + +#: ../../content/applications/websites/website/optimize/google_analytics.rst:24 msgid "Go through the creation form and accept the conditions to get the tracking ID." msgstr "" -#: ../../content/applications/websites/website/optimize/google_analytics.rst:15 +#: ../../content/applications/websites/website/optimize/google_analytics.rst:29 msgid "Copy the tracking ID to insert it in Odoo." msgstr "" -#: ../../content/applications/websites/website/optimize/google_analytics.rst:20 +#: ../../content/applications/websites/website/optimize/google_analytics.rst:34 msgid "Go to the *Configuration* menu of your Odoo's Website app. In the settings, turn on Google Analytics and paste the tracking ID. Then save the page." msgstr "" -#: ../../content/applications/websites/website/optimize/google_analytics.rst:27 +#: ../../content/applications/websites/website/optimize/google_analytics.rst:41 msgid "To make your first steps in Google Analytics, refer to `Google Documentation `_." msgstr "" -#: ../../content/applications/websites/website/optimize/google_analytics.rst:32 +#: ../../content/applications/websites/website/optimize/google_analytics.rst:46 msgid ":doc:`google_analytics_dashboard`" msgstr "" @@ -912,55 +924,71 @@ msgstr "" msgid "How to track your website traffic from your Odoo Dashboard" msgstr "" -#: ../../content/applications/websites/website/optimize/google_analytics_dashboard.rst:5 +#: ../../content/applications/websites/website/optimize/google_analytics_dashboard.rst:6 +msgid "It is not possible anymore for new Google Analytics accounts to integrate their **Google Analytics Dashboard** inside their **Odoo Dashboard**. Google deprecated **Universal Analytics** which won't be supported anymore in `July 2023 `_. They are replacing it with **Analytics 4**. New accounts are already using it." +msgstr "" + +#: ../../content/applications/websites/website/optimize/google_analytics_dashboard.rst:12 +msgid "**Analytics 4** `doesn't allow `_ its dashboard to be integrated in external websites." +msgstr "" + +#: ../../content/applications/websites/website/optimize/google_analytics_dashboard.rst:15 +msgid "You now have to check your Analytics data directly in the Google Platform as it won't be possible in Odoo anymore." +msgstr "" + +#: ../../content/applications/websites/website/optimize/google_analytics_dashboard.rst:18 +msgid "Accounts created before `October 2020 `_ should still be using **Universal Analytics** and be able to integrate their dashboard on external website until the official end of support `around mid 2023 `_." +msgstr "" + +#: ../../content/applications/websites/website/optimize/google_analytics_dashboard.rst:23 msgid "You can follow your traffic statistics straight from your Odoo Website Dashboard thanks to Google Analytics." msgstr "" -#: ../../content/applications/websites/website/optimize/google_analytics_dashboard.rst:8 +#: ../../content/applications/websites/website/optimize/google_analytics_dashboard.rst:26 msgid "A preliminary step is creating a Google Analytics account and entering the tracking ID in your Website's settings (see :doc:`google_analytics`)." msgstr "" -#: ../../content/applications/websites/website/optimize/google_analytics_dashboard.rst:11 +#: ../../content/applications/websites/website/optimize/google_analytics_dashboard.rst:29 msgid "Go to `Google APIs platform `__ to generate Analytics API credentials. Log in with your Google account." msgstr "" -#: ../../content/applications/websites/website/optimize/google_analytics_dashboard.rst:14 +#: ../../content/applications/websites/website/optimize/google_analytics_dashboard.rst:32 msgid "Select Analytics API." msgstr "" -#: ../../content/applications/websites/website/optimize/google_analytics_dashboard.rst:19 +#: ../../content/applications/websites/website/optimize/google_analytics_dashboard.rst:37 msgid "Create a new project and give it a name (e.g. Odoo). This project is needed to store your API credentials." msgstr "" -#: ../../content/applications/websites/website/optimize/google_analytics_dashboard.rst:25 +#: ../../content/applications/websites/website/optimize/google_analytics_dashboard.rst:43 msgid "Enable the API." msgstr "" -#: ../../content/applications/websites/website/optimize/google_analytics_dashboard.rst:30 +#: ../../content/applications/websites/website/optimize/google_analytics_dashboard.rst:48 msgid "Create credentials to use in Odoo." msgstr "" -#: ../../content/applications/websites/website/optimize/google_analytics_dashboard.rst:35 +#: ../../content/applications/websites/website/optimize/google_analytics_dashboard.rst:53 msgid "Select *Web browser (Javascript)* as calling source and *User data* as kind of data." msgstr "" -#: ../../content/applications/websites/website/optimize/google_analytics_dashboard.rst:41 +#: ../../content/applications/websites/website/optimize/google_analytics_dashboard.rst:59 msgid "Then you can create a Client ID. Enter the name of the application (e.g. Odoo) and the allowed pages on which you will be redirected. The *Authorized JavaScript origin* is your Odoo's instance URL. The *Authorized redirect URI* is your Odoo's instance URL followed by '/google_account/authentication'." msgstr "" -#: ../../content/applications/websites/website/optimize/google_analytics_dashboard.rst:51 +#: ../../content/applications/websites/website/optimize/google_analytics_dashboard.rst:69 msgid "Go through the Consent Screen step by entering a product name (e.g. Google Analytics in Odoo). Feel free to check the customizations options but this is not mandatory. The Consent Screen will only show up when you enter the Client ID in Odoo for the first time." msgstr "" -#: ../../content/applications/websites/website/optimize/google_analytics_dashboard.rst:56 +#: ../../content/applications/websites/website/optimize/google_analytics_dashboard.rst:74 msgid "Finally you are provided with your Client ID. Copy and paste it in Odoo." msgstr "" -#: ../../content/applications/websites/website/optimize/google_analytics_dashboard.rst:61 +#: ../../content/applications/websites/website/optimize/google_analytics_dashboard.rst:79 msgid "Open your Website Dashboard in Odoo and link your Analytics account. to past your Client ID." msgstr "" -#: ../../content/applications/websites/website/optimize/google_analytics_dashboard.rst:67 +#: ../../content/applications/websites/website/optimize/google_analytics_dashboard.rst:85 msgid "As a last step, authorize Odoo to access Google API." msgstr "" @@ -1669,86 +1697,78 @@ msgid "Scalability" msgstr "" #: ../../content/applications/websites/website/optimize/seo.rst:561 -msgid "In addition to being fast, Odoo is also more scalable than traditional CMS and eCommerce (Drupal, Wordpress, Magento, Prestashop). The following link provides an analysis of the major open source CMS and eCommerce compared to Odoo when it comes to high query volumes: `https://www.odoo.com/slides/slide/197 `_" +msgid "In addition to being fast, Odoo is also more scalable than traditional CMS and eCommerce (Drupal, Wordpress, Magento, Prestashop)." msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:568 -msgid "Todo" -msgstr "" - -#: ../../content/applications/websites/website/optimize/seo.rst:568 -msgid "fix above link" -msgstr "" - -#: ../../content/applications/websites/website/optimize/seo.rst:570 +#: ../../content/applications/websites/website/optimize/seo.rst:564 msgid "Here is the slide that summarizes the scalability of Odoo Website & eCommerce." msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:576 +#: ../../content/applications/websites/website/optimize/seo.rst:570 msgid "Search Engines Files" msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:579 +#: ../../content/applications/websites/website/optimize/seo.rst:573 msgid "Sitemap" msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:581 +#: ../../content/applications/websites/website/optimize/seo.rst:575 msgid "The sitemap points out pages to index to search engine robots. Odoo generates a ``/sitemap.xml`` file automatically for you. For performance reasons, this file is cached and updated every 12 hours." msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:585 +#: ../../content/applications/websites/website/optimize/seo.rst:579 msgid "By default, all URLs will be in a single ``/sitemap.xml`` file, but if you have a lot of pages, Odoo will automatically create a Sitemap Index file, respecting the `sitemaps.org protocol `__ grouping sitemap URL's in 45000 chunks per file." msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:591 +#: ../../content/applications/websites/website/optimize/seo.rst:585 msgid "Every sitemap entry has 4 attributes that are computed automatically:" msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:593 +#: ../../content/applications/websites/website/optimize/seo.rst:587 msgid "```` : the URL of a page" msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:595 +#: ../../content/applications/websites/website/optimize/seo.rst:589 msgid "```` : last modification date of the resource, computed automatically based on related object. For a page related to a product, this could be the last modification date of the product or the page." msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:600 +#: ../../content/applications/websites/website/optimize/seo.rst:594 msgid "```` : modules may implement their own priority algorithm based on their content (example: a forum might assign a priority based on the number of votes on a specific post). The priority of a static page is defined by it's priority field, which is normalized (16 is the default)." msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:607 +#: ../../content/applications/websites/website/optimize/seo.rst:601 msgid "Structured Data Markup" msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:609 +#: ../../content/applications/websites/website/optimize/seo.rst:603 msgid "Structured Data Markup is used to generate Rich Snippets in search engine results. It is a way for website owners to send structured data to search engine robots; helping them understand your content and create well-presented search results." msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:614 +#: ../../content/applications/websites/website/optimize/seo.rst:608 msgid "Google supports a number of rich snippets for content types, including: Reviews, People, Products, Businesses, Events and Organizations." msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:617 +#: ../../content/applications/websites/website/optimize/seo.rst:611 msgid "Odoo implements micro data as defined in the `schema.org `__ specification for events, eCommerce products, forum posts and contact addresses. This allows your product pages to be displayed in Google using extra information like the price and rating of a product:" msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:627 +#: ../../content/applications/websites/website/optimize/seo.rst:621 msgid "robots.txt" msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:629 +#: ../../content/applications/websites/website/optimize/seo.rst:623 msgid "When indexing your website, search engines take a first look at the general indexing rules of the a``/robots.txt`` file (allowed robots, sitemap path, etc.). Odoo automatically creates it. Its content is:" msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:633 +#: ../../content/applications/websites/website/optimize/seo.rst:627 msgid "User-agent: \\* Sitemap: https://www.odoo.com/sitemap.xml" msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:636 +#: ../../content/applications/websites/website/optimize/seo.rst:630 msgid "It means that all robots are allowed to index your website and there is no other indexing rule than specified in the sitemap to be found at following address." msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:640 +#: ../../content/applications/websites/website/optimize/seo.rst:634 msgid "You can customize the file *robots* in :ref:`developer mode ` from *Settings --> Technical --> User Interface --> Views* (exclude robots, exclude some pages, redirect to a custom Sitemap). Make the Model Data of the view *Non Updatable* to not reset the file after system upgrades." msgstr "" @@ -1932,191 +1952,207 @@ msgstr "" msgid ":doc:`/administration/maintain/domain_names`" msgstr "" -#: ../../content/applications/websites/website/publish/multi_website.rst:130 +#: ../../content/applications/websites/website/publish/multi_website.rst:129 +msgid "If you setup an extra website and specify the domain name you will have to do three things to get this feature to work:" +msgstr "" + +#: ../../content/applications/websites/website/publish/multi_website.rst:132 +msgid "Setup an A-record in the DNS configuration of your hosting provider so that \"www.mywebsite2.ext\" is redirected to the IP of your Odoo instance." +msgstr "" + +#: ../../content/applications/websites/website/publish/multi_website.rst:134 +msgid "Create an extra Nginx ``server`` block in which you set the ``server_name`` that you've set in the :guilabel:`Website domain` field." +msgstr "" + +#: ../../content/applications/websites/website/publish/multi_website.rst:136 +msgid "Reload and restart your Nginx instance to use the new ``server`` block." +msgstr "" + +#: ../../content/applications/websites/website/publish/multi_website.rst:139 msgid "Customize the visitor experience" msgstr "" -#: ../../content/applications/websites/website/publish/multi_website.rst:133 +#: ../../content/applications/websites/website/publish/multi_website.rst:142 msgid "The customer experience can be customized very profoundly thanks to the menu \\*Customize\\*. All the visual options available there are specific to each website. Go through the different pages to adapt them to this new audience. Focus on workflows, and automatic pages (eCommerce checkout, blogs, events, etc.) as the number of available options is higher there." msgstr "" -#: ../../content/applications/websites/website/publish/multi_website.rst:143 +#: ../../content/applications/websites/website/publish/multi_website.rst:152 msgid "Publish specific content per website" msgstr "" -#: ../../content/applications/websites/website/publish/multi_website.rst:146 +#: ../../content/applications/websites/website/publish/multi_website.rst:155 msgid "Like static pages, any content created from the front-end (product, blog post, etc.) is always only published in the current website. You can change that from the edit form view in the backend and leave the *Website* field blank. This will publish it in all the websites." msgstr "" -#: ../../content/applications/websites/website/publish/multi_website.rst:154 +#: ../../content/applications/websites/website/publish/multi_website.rst:163 msgid "Here are all the objects that you can link to *either one or all the websites*:" msgstr "" -#: ../../content/applications/websites/website/publish/multi_website.rst:157 +#: ../../content/applications/websites/website/publish/multi_website.rst:166 msgid "Products" msgstr "" -#: ../../content/applications/websites/website/publish/multi_website.rst:159 +#: ../../content/applications/websites/website/publish/multi_website.rst:168 msgid "Product Categories for eCommerce" msgstr "" -#: ../../content/applications/websites/website/publish/multi_website.rst:161 +#: ../../content/applications/websites/website/publish/multi_website.rst:170 msgid "Blogs" msgstr "" -#: ../../content/applications/websites/website/publish/multi_website.rst:163 +#: ../../content/applications/websites/website/publish/multi_website.rst:172 msgid "Slide Channels" msgstr "" -#: ../../content/applications/websites/website/publish/multi_website.rst:165 +#: ../../content/applications/websites/website/publish/multi_website.rst:174 msgid "Forums" msgstr "" -#: ../../content/applications/websites/website/publish/multi_website.rst:167 +#: ../../content/applications/websites/website/publish/multi_website.rst:176 msgid "Events" msgstr "" -#: ../../content/applications/websites/website/publish/multi_website.rst:169 +#: ../../content/applications/websites/website/publish/multi_website.rst:178 msgid "Job Positions" msgstr "" -#: ../../content/applications/websites/website/publish/multi_website.rst:172 +#: ../../content/applications/websites/website/publish/multi_website.rst:181 msgid "When you create the record from the backend and publish it, typically a product or an event, it is made available in all websites." msgstr "" -#: ../../content/applications/websites/website/publish/multi_website.rst:176 +#: ../../content/applications/websites/website/publish/multi_website.rst:185 msgid "Publish a page in all websites" msgstr "" -#: ../../content/applications/websites/website/publish/multi_website.rst:178 +#: ../../content/applications/websites/website/publish/multi_website.rst:187 msgid "A new static page is created and only made available in the current website. You can duplicate it to other websites from :menuselection:`Website --> Configuration --> Pages`. To do so, leave the *Website* field empty." msgstr "" -#: ../../content/applications/websites/website/publish/multi_website.rst:182 +#: ../../content/applications/websites/website/publish/multi_website.rst:191 msgid "If you want to duplicate it in just one other website, duplicate the page and set the new website." msgstr "" -#: ../../content/applications/websites/website/publish/multi_website.rst:188 +#: ../../content/applications/websites/website/publish/multi_website.rst:197 msgid "When you edit the page again, the change only affects the current website. A new page is duplicated and tied up to the website. The original page still being linked to all websites." msgstr "" -#: ../../content/applications/websites/website/publish/multi_website.rst:193 +#: ../../content/applications/websites/website/publish/multi_website.rst:202 msgid "By grouping pages by URL in the page manager, you quickly find the original page behind each edited page." msgstr "" -#: ../../content/applications/websites/website/publish/multi_website.rst:200 +#: ../../content/applications/websites/website/publish/multi_website.rst:209 msgid "Multi-companies" msgstr "" -#: ../../content/applications/websites/website/publish/multi_website.rst:202 +#: ../../content/applications/websites/website/publish/multi_website.rst:211 msgid "Each website can be linked to a specific company of your system, in a multi-companies environment." msgstr "" -#: ../../content/applications/websites/website/publish/multi_website.rst:208 +#: ../../content/applications/websites/website/publish/multi_website.rst:217 msgid "With such a configuration, only company-related data appear on the website (products, jobs, events, etc.)." msgstr "" -#: ../../content/applications/websites/website/publish/multi_website.rst:211 +#: ../../content/applications/websites/website/publish/multi_website.rst:220 msgid "Website editors can only view and edit the pages of the records they have access to, typically the ones belonging to their current company (and to their subsidiaries, or child companies in Odoo language). And so is it for visitors." msgstr "" -#: ../../content/applications/websites/website/publish/multi_website.rst:217 +#: ../../content/applications/websites/website/publish/multi_website.rst:226 msgid "If websites are multi-companies, you don’t change company when switching websites. To change the company and see the related content, use the company selector in the menu." msgstr "" -#: ../../content/applications/websites/website/publish/multi_website.rst:223 +#: ../../content/applications/websites/website/publish/multi_website.rst:232 msgid "Configure your eCommerce website" msgstr "" -#: ../../content/applications/websites/website/publish/multi_website.rst:225 +#: ../../content/applications/websites/website/publish/multi_website.rst:234 msgid "eCommerce is a crucial feature in the multi-websites environment. We made it so that the entire flow can be customized to fit the very audience of each website." msgstr "" -#: ../../content/applications/websites/website/publish/multi_website.rst:230 +#: ../../content/applications/websites/website/publish/multi_website.rst:239 msgid "Products only available on one website" msgstr "" -#: ../../content/applications/websites/website/publish/multi_website.rst:232 +#: ../../content/applications/websites/website/publish/multi_website.rst:241 msgid "We already saw earlier how to publish a specific record in only one website. You will find the \\*Website\\* field in the eCommerce tab of the product edit form. Empty means available in all websites." msgstr "" -#: ../../content/applications/websites/website/publish/multi_website.rst:240 +#: ../../content/applications/websites/website/publish/multi_website.rst:249 msgid "Products available on *some* websites" msgstr "" -#: ../../content/applications/websites/website/publish/multi_website.rst:242 +#: ../../content/applications/websites/website/publish/multi_website.rst:251 msgid "To make a product available on some websites, but not all of them, you should duplicate the product for each website." msgstr "" -#: ../../content/applications/websites/website/publish/multi_website.rst:245 +#: ../../content/applications/websites/website/publish/multi_website.rst:254 msgid "If you need a unique reference to manage in your inventory, you should install *Manufacturing\\ and create *Kits* BoMs (bills of materials). Each kit will link each published “virtual” product to the main reference managed in your inventory. That way, any item sold from your website will be converted into the storable item in the delivery order." msgstr "" -#: ../../content/applications/websites/website/publish/multi_website.rst:252 +#: ../../content/applications/websites/website/publish/multi_website.rst:261 msgid "Pricelists" msgstr "" -#: ../../content/applications/websites/website/publish/multi_website.rst:254 +#: ../../content/applications/websites/website/publish/multi_website.rst:263 msgid "To manage specific prices by websites, you can activate *Multiple Sales Prices per Product* in Website settings." msgstr "" -#: ../../content/applications/websites/website/publish/multi_website.rst:257 +#: ../../content/applications/websites/website/publish/multi_website.rst:266 msgid "Then, go to :menuselection:`Website --> Products --> Pricelists` to create additional pricelists. See :doc:`../../ecommerce/maximizing_revenue/pricing`." msgstr "" -#: ../../content/applications/websites/website/publish/multi_website.rst:260 +#: ../../content/applications/websites/website/publish/multi_website.rst:269 msgid "If you need help. Select a website to make a pricelist only available on this website." msgstr "" -#: ../../content/applications/websites/website/publish/multi_website.rst:266 +#: ../../content/applications/websites/website/publish/multi_website.rst:275 msgid "Leaving the field empty means that you make it work in all websites if *Selectable* is selected. Otherwise, it makes it only available for backend operations of Sales and Point of Sale applications." msgstr "" -#: ../../content/applications/websites/website/publish/multi_website.rst:271 +#: ../../content/applications/websites/website/publish/multi_website.rst:280 msgid "Payment Acquirers and Delivery Methods" msgstr "" -#: ../../content/applications/websites/website/publish/multi_website.rst:273 +#: ../../content/applications/websites/website/publish/multi_website.rst:282 msgid "By default, published payment acquirers and delivery methods are deployed in all websites. You could already use specific payment acquirers per country using Geo IP by defining countries in their configuration. Now you can also do it per website by filling in the *Website* field." msgstr "" -#: ../../content/applications/websites/website/publish/multi_website.rst:279 +#: ../../content/applications/websites/website/publish/multi_website.rst:288 msgid "Customer accounts" msgstr "" -#: ../../content/applications/websites/website/publish/multi_website.rst:281 +#: ../../content/applications/websites/website/publish/multi_website.rst:290 msgid "There is a setting to choose how to manage customer accounts in Website settings. You can either allow customers to use one account through all the websites or compel them to create one account for each website. This last option is convenient if your websites shouldn’t be related to each other in the visitor mind." msgstr "" -#: ../../content/applications/websites/website/publish/multi_website.rst:291 +#: ../../content/applications/websites/website/publish/multi_website.rst:300 msgid "Technical hints for customization" msgstr "" -#: ../../content/applications/websites/website/publish/multi_website.rst:293 +#: ../../content/applications/websites/website/publish/multi_website.rst:302 msgid "If you want to publish custom objects on the website, here are a few tips to make it work with multi websites:" msgstr "" -#: ../../content/applications/websites/website/publish/multi_website.rst:297 +#: ../../content/applications/websites/website/publish/multi_website.rst:306 msgid "Sitemap: don’t forget the domain in the route to only publish" msgstr "" -#: ../../content/applications/websites/website/publish/multi_website.rst:297 +#: ../../content/applications/websites/website/publish/multi_website.rst:306 msgid "available records in each website’s sitemap." msgstr "" -#: ../../content/applications/websites/website/publish/multi_website.rst:301 +#: ../../content/applications/websites/website/publish/multi_website.rst:310 msgid "Access: you should call the method" msgstr "" -#: ../../content/applications/websites/website/publish/multi_website.rst:300 +#: ../../content/applications/websites/website/publish/multi_website.rst:309 msgid "*can_access_from_current_website* in the controller to make sure the visitor can see a record in the current website." msgstr "" -#: ../../content/applications/websites/website/publish/multi_website.rst:305 +#: ../../content/applications/websites/website/publish/multi_website.rst:314 msgid "Search: when a list of records is displayed, don’t forget to specify" msgstr "" -#: ../../content/applications/websites/website/publish/multi_website.rst:304 +#: ../../content/applications/websites/website/publish/multi_website.rst:313 msgid "the domain to only display records available for the current website." msgstr "" @@ -2153,7 +2189,7 @@ msgid "If you can't/don't want to locate the geoip database in ``/usr/share/GeoI msgstr "" #: ../../content/applications/websites/website/publish/on-premise_geo-ip-installation.rst:36 -msgid ":doc:`CLI documentation `." +msgid ":doc:`CLI documentation `." msgstr "" #: ../../content/applications/websites/website/publish/on-premise_geo-ip-installation.rst:39