diff --git a/locale/sources/accounting.pot b/locale/sources/accounting.pot index b0d239533..49125c575 100644 --- a/locale/sources/accounting.pot +++ b/locale/sources/accounting.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: Odoo 13.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-01-16 09:46+0100\n" +"POT-Creation-Date: 2020-02-11 14:56+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -26,32 +26,51 @@ msgid "Bank & Cash" msgstr "" #: ../../accounting/bank/feeds.rst:3 -#: ../../accounting/bank/setup/manage_cash_register.rst:0 msgid "Bank Feeds" msgstr "" -#: ../../accounting/bank/feeds/coda.rst:3 -msgid "Import Coda statement files (Belgium only)" +#: ../../accounting/bank/feeds/bank_synchronization.rst:3 +msgid "Bank Synchronization: Automatic Import" msgstr "" -#: ../../accounting/bank/feeds/coda.rst:5 -msgid "CODA is a file format for bank statements in Belgium. Most Belgian banks, as well as the Isabel software, allows to download a CODA file with all your bank statements." +#: ../../accounting/bank/feeds/bank_synchronization.rst:5 +msgid "Odoo can synchronize directly with your bank to get all bank statements imported automatically into your database." msgstr "" -#: ../../accounting/bank/feeds/coda.rst:9 -msgid "With Odoo, you can download an CODA file from your bank or accounting software and import it directly in Odoo. This will create all bank statements." +#: ../../accounting/bank/feeds/bank_synchronization.rst:8 +msgid "To check if your bank is compatible with Odoo, go to `Odoo Accounting Features `_, and search for your bank in the *Supported Banks* section." msgstr "" -#: ../../accounting/bank/feeds/coda.rst:14 -msgid "Test now the feature :download:`with this sample CODA file <../../../_static/example_files/Ontvangen_CODA.2013-01-11-18.59.15.txt>`" +#: ../../accounting/bank/feeds/bank_synchronization.rst:16 +msgid "The countries which are fully supported include the United States, Canada, New Zealand, Austria, and Belgium." msgstr "" +#: ../../accounting/bank/feeds/bank_synchronization.rst:19 +msgid "More than 30 countries are partially supported, including Colombia, India, France, and Spain." +msgstr "" + +#: ../../accounting/bank/feeds/bank_synchronization.rst:21 +msgid "To connect to the banks, Odoo uses multiple web-services:" +msgstr "" + +#: ../../accounting/bank/feeds/bank_synchronization.rst:23 +msgid "**Plaid**: Mainly for the U.S" +msgstr "" + +#: ../../accounting/bank/feeds/bank_synchronization.rst:24 +msgid "**Yodlee**: Worldwide" +msgstr "" + +#: ../../accounting/bank/feeds/bank_synchronization.rst:25 +msgid "**Ponto**: For a growing number of European Banks" +msgstr "" + +#: ../../accounting/bank/feeds/bank_synchronization.rst:28 #: ../../accounting/bank/feeds/coda.rst:18 #: ../../accounting/bank/feeds/manual.rst:12 #: ../../accounting/bank/feeds/ofx.rst:18 #: ../../accounting/bank/feeds/paypal.rst:11 #: ../../accounting/bank/feeds/qif.rst:19 -#: ../../accounting/bank/feeds/synchronize.rst:26 #: ../../accounting/bank/misc/batch.rst:21 #: ../../accounting/bank/misc/interbank.rst:14 #: ../../accounting/bank/reconciliation/use_cases.rst:16 @@ -60,7 +79,6 @@ msgstr "" #: ../../accounting/localizations/argentina.rst:20 #: ../../accounting/localizations/colombia.rst:27 #: ../../accounting/localizations/mexico.rst:35 -#: ../../accounting/others/adviser/assets.rst:24 #: ../../accounting/others/adviser/budget.rst:21 #: ../../accounting/others/analytic/purchases_expenses.rst:18 #: ../../accounting/others/analytic/timesheets.rst:16 @@ -88,6 +106,155 @@ msgstr "" msgid "Configuration" msgstr "" +#: ../../accounting/bank/feeds/bank_synchronization.rst:31 +msgid "Odoo Online Users" +msgstr "" + +#: ../../accounting/bank/feeds/bank_synchronization.rst:33 +msgid "Make sure the **Automatic Import** feature is activated by going to :menuselection:`Accounting --> Configuration --> Settings` in the *Bank & Cash* section." +msgstr "" + +#: ../../accounting/bank/feeds/bank_synchronization.rst:37 +msgid "Odoo Enterprise Users" +msgstr "" + +#: ../../accounting/bank/feeds/bank_synchronization.rst:39 +msgid "If you plan to use a bank interface with your Odoo Enterprise subscription, you don’t have to do anything special. Just make sure that your database is registered with your Odoo Enterprise contract." +msgstr "" + +#: ../../accounting/bank/feeds/bank_synchronization.rst:43 +msgid "you might want to check that you don't have a firewall/proxy blocking the following address:" +msgstr "" + +#: ../../accounting/bank/feeds/bank_synchronization.rst:45 +msgid "https://onlinesync.odoo.com/" +msgstr "" + +#: ../../accounting/bank/feeds/bank_synchronization.rst:48 +msgid "Sync your bank feeds" +msgstr "" + +#: ../../accounting/bank/feeds/bank_synchronization.rst:50 +msgid "First, make sure that the **Automated Bank Synchronization** is activated in your journal." +msgstr "" + +#: ../../accounting/bank/feeds/bank_synchronization.rst:52 +msgid "To do so, go to :menuselection:`Accounting --> Configuration --> Journals`, then open your *Bank Journal*, click on *Edit*, and select **Automated Bank Synchronization** in the *Bank Feed* field." +msgstr "" + +#: ../../accounting/bank/feeds/bank_synchronization.rst:59 +msgid "You can then connect Odoo to your bank." +msgstr "" + +#: ../../accounting/bank/feeds/bank_synchronization.rst:61 +msgid "To do so, go to :menuselection:`Accounting --> Configuration --> Add a Bank Account`, and follow the steps." +msgstr "" + +#: ../../accounting/bank/feeds/bank_synchronization.rst:64 +msgid "Once done, go back to your *Accounting dashboard*. You should now see a **Synchronize Now** button on your *Bank* card. Click on this button and enter your bank credentials." +msgstr "" + +#: ../../accounting/bank/feeds/bank_synchronization.rst:71 +msgid "After this, your bank feeds will be regularly synchronized." +msgstr "" + +#: ../../accounting/bank/feeds/bank_synchronization.rst:74 +#: ../../accounting/localizations/mexico.rst:582 +msgid "FAQ" +msgstr "" + +#: ../../accounting/bank/feeds/bank_synchronization.rst:77 +msgid "The synchronization is not working in real-time, is that normal?" +msgstr "" + +#: ../../accounting/bank/feeds/bank_synchronization.rst:79 +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." +msgstr "" + +#: ../../accounting/bank/feeds/bank_synchronization.rst:83 +msgid "A transaction can be visible in 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 "" + +#: ../../accounting/bank/feeds/bank_synchronization.rst:88 +msgid "Is the Automatic Import feature included in my contract?" +msgstr "" + +#: ../../accounting/bank/feeds/bank_synchronization.rst:90 +msgid "**Enterprise Version**: Yes, if you have a valid enterprise contract linked to your database." +msgstr "" + +#: ../../accounting/bank/feeds/bank_synchronization.rst:91 +msgid "**Community Version**: No, this feature is not included in the Community Version." +msgstr "" + +#: ../../accounting/bank/feeds/bank_synchronization.rst:92 +msgid "**Online Version**: Yes, even if you benefit from the One App Free contract." +msgstr "" + +#: ../../accounting/bank/feeds/bank_synchronization.rst:95 +msgid "Some banks have a status \"Beta,\" what does this mean?" +msgstr "" + +#: ../../accounting/bank/feeds/bank_synchronization.rst:97 +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 can aid in the development process since the Provider will have real data & feedback from the connection." +msgstr "" + +#: ../../accounting/bank/feeds/bank_synchronization.rst:103 +msgid "Why do my transactions only synchronize when I refresh manually?" +msgstr "" + +#: ../../accounting/bank/feeds/bank_synchronization.rst:105 +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 "" + +#: ../../accounting/bank/feeds/bank_synchronization.rst:110 +msgid "Not all of my past transactions are in Odoo, why?" +msgstr "" + +#: ../../accounting/bank/feeds/bank_synchronization.rst:112 +msgid "Transactions can only be fetched up to 3 months in the past." +msgstr "" + +#: ../../accounting/bank/feeds/bank_synchronization.rst:115 +msgid "Why don’t I see any transactions?" +msgstr "" + +#: ../../accounting/bank/feeds/bank_synchronization.rst:116 +msgid "When you first connect with your bank, you will be prompted to add each account to its own journal. If you skip this step, you will not be able to see your transactions in Odoo." +msgstr "" + +#: ../../accounting/bank/feeds/bank_synchronization.rst:119 +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 "" + +#: ../../accounting/bank/feeds/bank_synchronization.rst:123 +msgid "How can I update my bank credentials?" +msgstr "" + +#: ../../accounting/bank/feeds/bank_synchronization.rst:124 +msgid "You can update your credentials in the *Developer Mode*." +msgstr "" + +#: ../../accounting/bank/feeds/bank_synchronization.rst:126 +msgid "To do so, go to :menuselection:`General Settings`, click on *Activate developer mode*, then go to :menuselection:`Accounting --> Configuration --> Online Synchronization`, then open the Institution you want to edit, and click on *Update Credentials*." +msgstr "" + +#: ../../accounting/bank/feeds/coda.rst:3 +msgid "Import Coda statement files (Belgium only)" +msgstr "" + +#: ../../accounting/bank/feeds/coda.rst:5 +msgid "CODA is a file format for bank statements in Belgium. Most Belgian banks, as well as the Isabel software, allows to download a CODA file with all your bank statements." +msgstr "" + +#: ../../accounting/bank/feeds/coda.rst:9 +msgid "With Odoo, you can download an CODA file from your bank or accounting software and import it directly in Odoo. This will create all bank statements." +msgstr "" + +#: ../../accounting/bank/feeds/coda.rst:14 +msgid "Test now the feature :download:`with this sample CODA file <../../../_static/example_files/Ontvangen_CODA.2013-01-11-18.59.15.txt>`" +msgstr "" + #: ../../accounting/bank/feeds/coda.rst:21 msgid "Install the CODA feature" msgstr "" @@ -147,7 +314,7 @@ msgstr "" #: ../../accounting/bank/feeds/coda.rst:81 #: ../../accounting/bank/feeds/ofx.rst:65 #: ../../accounting/bank/feeds/qif.rst:66 -msgid ":doc:`synchronize`" +msgid ":doc:`bank_synchronization`" msgstr "" #: ../../accounting/bank/feeds/coda.rst:82 @@ -252,7 +419,7 @@ msgstr "" #: ../../accounting/bank/feeds/manual.rst:99 #: ../../accounting/bank/reconciliation/use_cases.rst:109 -msgid ":doc:`../feeds/synchronize`" +msgid ":doc:`../feeds/bank_synchronization`" msgstr "" #: ../../accounting/bank/feeds/ofx.rst:3 @@ -394,135 +561,6 @@ msgstr "" msgid "Importing QIF files" msgstr "" -#: ../../accounting/bank/feeds/synchronize.rst:3 -msgid "How to synchronize Odoo with your bank?" -msgstr "" - -#: ../../accounting/bank/feeds/synchronize.rst:5 -msgid "Odoo is able to synchronize directly with your bank in order to get all bank statements imported automatically in Odoo every 4 hours. Before moving forward in this tutorial, you should check if your bank is supported. You can find it out from the `Odoo Accounting Features `__" -msgstr "" - -#: ../../accounting/bank/feeds/synchronize.rst:13 -msgid "Search for your bank name in the above page. If your bank appears in the proposition, it means it is supported by Odoo. The countries which are fully supported (meaning more than 95% of the banks) include: United States, Canada, New Zealand, Austria. More than 30 countries are partially supported, including: Colombia, India, France, Spain, etc." -msgstr "" - -#: ../../accounting/bank/feeds/synchronize.rst:19 -msgid "In order to connect with the banks, Odoo uses two web-services:" -msgstr "" - -#: ../../accounting/bank/feeds/synchronize.rst:21 -msgid "Plaid: for the main banks in the U.S." -msgstr "" - -#: ../../accounting/bank/feeds/synchronize.rst:23 -msgid "Yodlee: for all other banks" -msgstr "" - -#: ../../accounting/bank/feeds/synchronize.rst:29 -msgid "Odoo Online Users" -msgstr "" - -#: ../../accounting/bank/feeds/synchronize.rst:31 -msgid "If you we support banks of your country, the bank integration feature should already been installed. If it's not installed, you can manually install the module **account_yodlee**." -msgstr "" - -#: ../../accounting/bank/feeds/synchronize.rst:36 -msgid "Odoo Enterprise Users" -msgstr "" - -#: ../../accounting/bank/feeds/synchronize.rst:38 -msgid "If you plan to use a bank interface with your Odoo Enterprise subscription, you don't have to do anything special, just make sure that your database is registered with your Odoo Enterprise contract." -msgstr "" - -#: ../../accounting/bank/feeds/synchronize.rst:42 -msgid "you might want to check that you don't have a firewall/proxy blocking the following addresses" -msgstr "" - -#: ../../accounting/bank/feeds/synchronize.rst:44 -msgid "https://onlinesync.odoo.com/" -msgstr "" - -#: ../../accounting/bank/feeds/synchronize.rst:45 -msgid "https://api.plaid.com/" -msgstr "" - -#: ../../accounting/bank/feeds/synchronize.rst:49 -msgid "Sync your bank feeds" -msgstr "" - -#: ../../accounting/bank/feeds/synchronize.rst:51 -msgid "Once the Plaid or Yodlee interface is installed, you can connect Odoo to your bank. To do that, click on **More** on the bank of your choice from the accounting dashboard. In the menu, click on Settings to configure this bank account." -msgstr "" - -#: ../../accounting/bank/feeds/synchronize.rst:59 -msgid "In the bank form, from the Bank Account tab, set the bank feeds option to **Bank Synchronization**." -msgstr "" - -#: ../../accounting/bank/feeds/synchronize.rst:65 -msgid "Once it's done, go back to your accounting dashboard. You should see a **Online Synchronization** button on your bank card. Click on this button and fill in your bank credentials." -msgstr "" - -#: ../../accounting/bank/feeds/synchronize.rst:69 -msgid "Once you filled in your credentials, your bank feeds will be synchronized every 4 hours." -msgstr "" - -#: ../../accounting/bank/feeds/synchronize.rst:73 -#: ../../accounting/localizations/mexico.rst:582 -msgid "FAQ" -msgstr "" - -#: ../../accounting/bank/feeds/synchronize.rst:76 -msgid "The synchronization is not working in real time, is it normal?" -msgstr "" - -#: ../../accounting/bank/feeds/synchronize.rst:78 -msgid "Yodlee tries to get the data from a bank account once a day. However, this doesn't always happen at the same time. And sometimes the process can fail. In that case, Yodlee retries one hour or two later. This is why in Odoo there is a cron that is running every 4 hours to fetch the information from Yodlee." -msgstr "" - -#: ../../accounting/bank/feeds/synchronize.rst:83 -msgid "You can however force this synchronization by clicking on the button \"Synchronize now\" from the accounting dashboard." -msgstr "" - -#: ../../accounting/bank/feeds/synchronize.rst:86 -msgid "Moreover, a transaction can be visible in your bank account but not being fetched by Yodlee. Indeed, the transaction in your bank account can have the status \"pending\" and not the status \"posted\". In that case, Yodlee won't import it, you will have to wait till the status changes." -msgstr "" - -#: ../../accounting/bank/feeds/synchronize.rst:91 -msgid "What is important to remember is that Yodlee is not a service fetching transactions in real time. This is a service to facilitate the import of the bank statements to the database." -msgstr "" - -#: ../../accounting/bank/feeds/synchronize.rst:95 -msgid "Is the Yodlee feature included in my contract?" -msgstr "" - -#: ../../accounting/bank/feeds/synchronize.rst:97 -msgid "Enterprise Version: Yes, if you have a valid enterprise contract linked to your database." -msgstr "" - -#: ../../accounting/bank/feeds/synchronize.rst:98 -msgid "Community Version: No, this feature is not included in the Community Version." -msgstr "" - -#: ../../accounting/bank/feeds/synchronize.rst:99 -msgid "Online Version: Yes, even if you benefit from the One App Free contract." -msgstr "" - -#: ../../accounting/bank/feeds/synchronize.rst:102 -msgid "Some banks have a status \"Beta\", what does it mean?" -msgstr "" - -#: ../../accounting/bank/feeds/synchronize.rst:104 -msgid "This means that Yodlee is only currently working on developing the synchronization with this bank. The synchronization could already work or it may need a bit more time to have a 100% working synchronization. Unfortunately, there is not much to do about it except for being patient." -msgstr "" - -#: ../../accounting/bank/feeds/synchronize.rst:110 -msgid "All my past transactions are not in Odoo, why?" -msgstr "" - -#: ../../accounting/bank/feeds/synchronize.rst:112 -msgid "Yodlee only allows to fetch transactions up to 3 months in the past." -msgstr "" - #: ../../accounting/bank/misc.rst:3 #: ../../accounting/payables/misc.rst:3 #: ../../accounting/payables/misc/employee_expense.rst:184 @@ -978,32 +1016,6 @@ msgstr "" msgid "If you are working in a multi-company environnement, you'll have to switch the company on your user preferences in order to add, edit or delete bank accounts from another company." msgstr "" -#: ../../accounting/bank/setup/create_bank_account.rst:0 -#: ../../accounting/bank/setup/manage_cash_register.rst:0 -#: ../../accounting/others/configuration/account_type.rst:0 -msgid "Type" -msgstr "" - -#: ../../accounting/bank/setup/create_bank_account.rst:0 -msgid "Bank account type: Normal or IBAN. Inferred from the bank account number." -msgstr "" - -#: ../../accounting/bank/setup/create_bank_account.rst:0 -msgid "ABA/Routing" -msgstr "" - -#: ../../accounting/bank/setup/create_bank_account.rst:0 -msgid "American Bankers Association Routing Number" -msgstr "" - -#: ../../accounting/bank/setup/create_bank_account.rst:0 -msgid "Account Holder Name" -msgstr "" - -#: ../../accounting/bank/setup/create_bank_account.rst:0 -msgid "Account holder name, in case it is different than the name of the Account Holder" -msgstr "" - #: ../../accounting/bank/setup/create_bank_account.rst:49 msgid "View *Bank Account* in our Online Demonstration" msgstr "" @@ -1152,248 +1164,6 @@ msgstr "" msgid "In the tab Journal Entries, the Default Debit and Credit Account can be configured as well as the currency of the journal" msgstr "" -#: ../../accounting/bank/setup/manage_cash_register.rst:0 -msgid "Active" -msgstr "" - -#: ../../accounting/bank/setup/manage_cash_register.rst:0 -msgid "Set active to false to hide the Journal without removing it." -msgstr "" - -#: ../../accounting/bank/setup/manage_cash_register.rst:0 -msgid "Select 'Sale' for customer invoices journals." -msgstr "" - -#: ../../accounting/bank/setup/manage_cash_register.rst:0 -msgid "Select 'Purchase' for vendor bills journals." -msgstr "" - -#: ../../accounting/bank/setup/manage_cash_register.rst:0 -msgid "Select 'Cash' or 'Bank' for journals that are used in customer or vendor payments." -msgstr "" - -#: ../../accounting/bank/setup/manage_cash_register.rst:0 -msgid "Select 'General' for miscellaneous operations journals." -msgstr "" - -#: ../../accounting/bank/setup/manage_cash_register.rst:0 -#: ../../accounting/payables/pay/check.rst:0 -msgid "Company" -msgstr "" - -#: ../../accounting/bank/setup/manage_cash_register.rst:0 -#: ../../accounting/payables/pay/check.rst:0 -msgid "Company related to this journal" -msgstr "" - -#: ../../accounting/bank/setup/manage_cash_register.rst:0 -msgid "Defines how the bank statements will be registered" -msgstr "" - -#: ../../accounting/bank/setup/manage_cash_register.rst:0 -msgid "Synchronization Frequency" -msgstr "" - -#: ../../accounting/bank/setup/manage_cash_register.rst:0 -msgid "Defines when a new bank statement" -msgstr "" - -#: ../../accounting/bank/setup/manage_cash_register.rst:0 -msgid "will be created when fetching new transactions" -msgstr "" - -#: ../../accounting/bank/setup/manage_cash_register.rst:0 -msgid "from your bank account." -msgstr "" - -#: ../../accounting/bank/setup/manage_cash_register.rst:0 -msgid "Short Code" -msgstr "" - -#: ../../accounting/bank/setup/manage_cash_register.rst:0 -msgid "The journal entries of this journal will be named using this prefix." -msgstr "" - -#: ../../accounting/bank/setup/manage_cash_register.rst:0 -msgid "Next Number" -msgstr "" - -#: ../../accounting/bank/setup/manage_cash_register.rst:0 -msgid "The next sequence number will be used for the next invoice." -msgstr "" - -#: ../../accounting/bank/setup/manage_cash_register.rst:0 -msgid "Entry Sequence" -msgstr "" - -#: ../../accounting/bank/setup/manage_cash_register.rst:0 -msgid "This field contains the information related to the numbering of the journal entries of this journal." -msgstr "" - -#: ../../accounting/bank/setup/manage_cash_register.rst:0 -msgid "Dedicated Credit Note Sequence" -msgstr "" - -#: ../../accounting/bank/setup/manage_cash_register.rst:0 -msgid "Check this box if you don't want to share the same sequence for invoices and credit notes made from this journal" -msgstr "" - -#: ../../accounting/bank/setup/manage_cash_register.rst:0 -msgid "Credit Notes Next Number" -msgstr "" - -#: ../../accounting/bank/setup/manage_cash_register.rst:0 -msgid "The next sequence number will be used for the next credit note." -msgstr "" - -#: ../../accounting/bank/setup/manage_cash_register.rst:0 -msgid "Credit Note Entry Sequence" -msgstr "" - -#: ../../accounting/bank/setup/manage_cash_register.rst:0 -msgid "This field contains the information related to the numbering of the credit note entries of this journal." -msgstr "" - -#: ../../accounting/bank/setup/manage_cash_register.rst:0 -msgid "Default Debit Account" -msgstr "" - -#: ../../accounting/bank/setup/manage_cash_register.rst:0 -msgid "It acts as a default account for debit amount" -msgstr "" - -#: ../../accounting/bank/setup/manage_cash_register.rst:0 -msgid "Default Credit Account" -msgstr "" - -#: ../../accounting/bank/setup/manage_cash_register.rst:0 -msgid "It acts as a default account for credit amount" -msgstr "" - -#: ../../accounting/bank/setup/manage_cash_register.rst:0 -msgid "Currency" -msgstr "" - -#: ../../accounting/bank/setup/manage_cash_register.rst:0 -msgid "The currency used to enter statement" -msgstr "" - -#: ../../accounting/bank/setup/manage_cash_register.rst:0 -msgid "Communication Type" -msgstr "" - -#: ../../accounting/bank/setup/manage_cash_register.rst:0 -msgid "You can set here the default communication that will appear on customer invoices, once validated, to help the customer to refer to that particular invoice when making the payment." -msgstr "" - -#: ../../accounting/bank/setup/manage_cash_register.rst:0 -msgid "Communication Standard" -msgstr "" - -#: ../../accounting/bank/setup/manage_cash_register.rst:0 -msgid "You can choose different models for each type of reference. The default one is the Odoo reference." -msgstr "" - -#: ../../accounting/bank/setup/manage_cash_register.rst:0 -msgid "Alias Name" -msgstr "" - -#: ../../accounting/bank/setup/manage_cash_register.rst:0 -msgid "It creates draft invoices and bills by sending an email." -msgstr "" - -#: ../../accounting/bank/setup/manage_cash_register.rst:0 -msgid "Profit Account" -msgstr "" - -#: ../../accounting/bank/setup/manage_cash_register.rst:0 -msgid "Used to register a profit when the ending balance of a cash register differs from what the system computes" -msgstr "" - -#: ../../accounting/bank/setup/manage_cash_register.rst:0 -msgid "Loss Account" -msgstr "" - -#: ../../accounting/bank/setup/manage_cash_register.rst:0 -msgid "Used to register a loss when the ending balance of a cash register differs from what the system computes" -msgstr "" - -#: ../../accounting/bank/setup/manage_cash_register.rst:0 -msgid "Lock Posted Entries with Hash" -msgstr "" - -#: ../../accounting/bank/setup/manage_cash_register.rst:0 -msgid "If ticked, the accounting entry or invoice receives a hash as soon as it is posted and cannot be modified anymore." -msgstr "" - -#: ../../accounting/bank/setup/manage_cash_register.rst:0 -msgid "For Incoming Payments" -msgstr "" - -#: ../../accounting/bank/setup/manage_cash_register.rst:0 -#: ../../accounting/payables/pay/check.rst:0 -msgid "Manual: Get paid by cash, check or any other method outside of Odoo." -msgstr "" - -#: ../../accounting/bank/setup/manage_cash_register.rst:0 -#: ../../accounting/payables/pay/check.rst:0 -msgid "Electronic: Get paid automatically through a payment acquirer by requesting a transaction on a card saved by the customer when buying or subscribing online (payment token)." -msgstr "" - -#: ../../accounting/bank/setup/manage_cash_register.rst:0 -msgid "Batch Deposit: Encase several customer checks at once by generating a batch deposit to submit to your bank. When encoding the bank statement in Odoo,you are suggested to reconcile the transaction with the batch deposit. Enable this option from the settings." -msgstr "" - -#: ../../accounting/bank/setup/manage_cash_register.rst:0 -msgid "For Outgoing Payments" -msgstr "" - -#: ../../accounting/bank/setup/manage_cash_register.rst:0 -msgid "Manual:Pay bill by cash or any other method outside of Odoo." -msgstr "" - -#: ../../accounting/bank/setup/manage_cash_register.rst:0 -msgid "Check:Pay bill by check and print it from Odoo." -msgstr "" - -#: ../../accounting/bank/setup/manage_cash_register.rst:0 -msgid "SEPA Credit Transfer: Pay bill from a SEPA Credit Transfer file you submit to your bank. Enable this option from the settings." -msgstr "" - -#: ../../accounting/bank/setup/manage_cash_register.rst:0 -msgid "Check Printing Payment Method Selected" -msgstr "" - -#: ../../accounting/bank/setup/manage_cash_register.rst:0 -msgid "Technical feature used to know whether check printing was enabled as payment method." -msgstr "" - -#: ../../accounting/bank/setup/manage_cash_register.rst:0 -msgid "Check Sequence" -msgstr "" - -#: ../../accounting/bank/setup/manage_cash_register.rst:0 -msgid "Checks numbering sequence." -msgstr "" - -#: ../../accounting/bank/setup/manage_cash_register.rst:0 -#: ../../accounting/payables/pay/check.rst:0 -msgid "Manual Numbering" -msgstr "" - -#: ../../accounting/bank/setup/manage_cash_register.rst:0 -#: ../../accounting/payables/pay/check.rst:0 -msgid "Check this option if your pre-printed checks are not numbered." -msgstr "" - -#: ../../accounting/bank/setup/manage_cash_register.rst:0 -msgid "Next Check Number" -msgstr "" - -#: ../../accounting/bank/setup/manage_cash_register.rst:0 -msgid "Sequence number of the next printed check." -msgstr "" - #: ../../accounting/bank/setup/manage_cash_register.rst:25 msgid "Usage" msgstr "" @@ -3679,142 +3449,6 @@ msgstr "" msgid "Adviser" msgstr "" -#: ../../accounting/others/adviser/assets.rst:3 -msgid "Manage your fixed assets" -msgstr "" - -#: ../../accounting/others/adviser/assets.rst:5 -msgid "The \"Assets\" module allows you to keep track of your fixed assets like machinery, land and building. The module allows you to generate monthly depreciation entries automatically, get depreciation board, sell or dispose assets and perform reports on your company assets." -msgstr "" - -#: ../../accounting/others/adviser/assets.rst:10 -msgid "As an example, you may buy a car for $36,000 (gross value) and you plan to amortize it over 36 months (3 years). Every months (periodicity), Odoo will create a depreciation entry automatically reducing your assets value by $1,000 and passing $1,000 as an expense. After 3 years, this assets accounts for $0 (salvage value) in your balance sheet." -msgstr "" - -#: ../../accounting/others/adviser/assets.rst:16 -msgid "The different types of assets are grouped into \"Assets Types\" that describe how to deprecate an asset. Here are two examples of assets types:" -msgstr "" - -#: ../../accounting/others/adviser/assets.rst:20 -msgid "Building: 10 years, yearly linear depreciation" -msgstr "" - -#: ../../accounting/others/adviser/assets.rst:21 -msgid "Car: 5 years, monthly linear depreciation" -msgstr "" - -#: ../../accounting/others/adviser/assets.rst:27 -msgid "Install the Asset module" -msgstr "" - -#: ../../accounting/others/adviser/assets.rst:29 -msgid "Start by *installing the Asset module.*" -msgstr "" - -#: ../../accounting/others/adviser/assets.rst:31 -msgid "Once the module is installed, you should see two new menus in the accounting application:" -msgstr "" - -#: ../../accounting/others/adviser/assets.rst:34 -msgid ":menuselection:`Adviser --> Assets`" -msgstr "" - -#: ../../accounting/others/adviser/assets.rst:35 -msgid ":menuselection:`Configuration --> Asset Types`" -msgstr "" - -#: ../../accounting/others/adviser/assets.rst:37 -msgid "Before registering your first asset, you must :ref:`define your Asset Types `." -msgstr "" - -#: ../../accounting/others/adviser/assets.rst:43 -msgid "Defining Asset Types" -msgstr "" - -#: ../../accounting/others/adviser/assets.rst:45 -msgid "Asset type are used to configure all information about an assets: asset and deprecation accounts, amortization method, etc. That way, advisers can configure asset types and users can further record assets without having to provide any complex accounting information. They just need to provide an asset type on the supplier bill." -msgstr "" - -#: ../../accounting/others/adviser/assets.rst:51 -msgid "You should create asset types for every group of assets you frequently buy like \"Cars: 5 years\", \"Computer Hardware: 3 years\". For all other assets, you can create generic asset types. Name them according to the duration of the asset like \"36 Months\", \"10 Years\", ..." -msgstr "" - -#: ../../accounting/others/adviser/assets.rst:56 -msgid "To define asset types, go to :menuselection:`Configuration --> Asset Types`" -msgstr "" - -#: ../../accounting/others/adviser/assets.rst:63 -msgid "Create assets manually" -msgstr "" - -#: ../../accounting/others/adviser/assets.rst:65 -msgid "To register an asset manually, go to the menu :menuselection:`Adviser --> Assets`." -msgstr "" - -#: ../../accounting/others/adviser/assets.rst:71 -msgid "Once your asset is created, don't forget to Confirm it. You can also click on the Compute Depreciation button to check the depreciation board before confirming the asset." -msgstr "" - -#: ../../accounting/others/adviser/assets.rst:77 -msgid "if you create asset manually, you still need to create the supplier bill for this asset. The asset document will only produce the depreciation journal entries, not those related to the supplier bill." -msgstr "" - -#: ../../accounting/others/adviser/assets.rst:84 -msgid "Create assets automatically from a supplier bill" -msgstr "" - -#: ../../accounting/others/adviser/assets.rst:86 -msgid "Assets can be automatically created from supplier bills. All you need to do is to set an asset category on your bill line. When the user will validate the bill, an asset will be automatically created, using the information of the supplier bill." -msgstr "" - -#: ../../accounting/others/adviser/assets.rst:93 -msgid "Depending on the information on the asset category, the asset will be created in draft or directly validated\\ *.* It's easier to confirm assets directly so that you won't forget to confirm it afterwards. (check the field *Skip Draft State* on *Asset Category)* Generate assets in draft only when you want your adviser to control all the assets before posting them to your accounts." -msgstr "" - -#: ../../accounting/others/adviser/assets.rst:100 -msgid "if you put the asset on the product, the asset category will automatically be filled in the supplier bill." -msgstr "" - -#: ../../accounting/others/adviser/assets.rst:104 -msgid "How to depreciate an asset?" -msgstr "" - -#: ../../accounting/others/adviser/assets.rst:106 -msgid "Odoo will create depreciation journal entries automatically at the right date for every confirmed asset. (not the draft ones). You can control in the depreciation board: a green bullet point means that the journal entry has been created for this line." -msgstr "" - -#: ../../accounting/others/adviser/assets.rst:111 -msgid "But you can also post journal entries before the expected date by clicking on the green bullet and forcing the creation of related depreciation entry." -msgstr "" - -#: ../../accounting/others/adviser/assets.rst:118 -msgid "In the Depreciation board, click on the red bullet to post the journal entry. Click on the :guilabel:`Items` button on the top to see the journal entries which are already posted." -msgstr "" - -#: ../../accounting/others/adviser/assets.rst:123 -msgid "How to modify an existing asset?" -msgstr "" - -#: ../../accounting/others/adviser/assets.rst:125 -msgid "Click on :guilabel:`Modify Depreciation`" -msgstr "" - -#: ../../accounting/others/adviser/assets.rst:126 -msgid "Change the number of depreciation" -msgstr "" - -#: ../../accounting/others/adviser/assets.rst:128 -msgid "Odoo will automatically recompute a new depreciation board." -msgstr "" - -#: ../../accounting/others/adviser/assets.rst:131 -msgid "How to record the sale or disposal of an asset?" -msgstr "" - -#: ../../accounting/others/adviser/assets.rst:133 -msgid "If you sell or dispose an asset, you need to deprecate completly this asset. Click on the button :guilabel:`Sell or Dispose`. This action will post the full costs of this assets but it will not record the sales transaction that should be registered through a customer invoice." -msgstr "" - #: ../../accounting/others/adviser/budget.rst:3 msgid "How to manage a financial budget?" msgstr "" @@ -4902,66 +4536,6 @@ msgstr "" msgid "To create a new accounts, go to the Accounting application. Open the menu :menuselection:`Adviser --> Chart of Accounts`, the click on the **Create** button." msgstr "" -#: ../../accounting/others/configuration/account_type.rst:0 -msgid "Account Type is used for information purpose, to generate country-specific legal reports, and set the rules to close a fiscal year and generate opening entries." -msgstr "" - -#: ../../accounting/others/configuration/account_type.rst:0 -msgid "Can Create Asset" -msgstr "" - -#: ../../accounting/others/configuration/account_type.rst:0 -msgid "Technical field specifying if the account can generate asset depending on it's type. It is used in the account form view." -msgstr "" - -#: ../../accounting/others/configuration/account_type.rst:0 -msgid "Asset Model" -msgstr "" - -#: ../../accounting/others/configuration/account_type.rst:0 -msgid "If this is selected, an asset will be created automatically when Journal Items on this account are posted." -msgstr "" - -#: ../../accounting/others/configuration/account_type.rst:0 -msgid "Tags" -msgstr "" - -#: ../../accounting/others/configuration/account_type.rst:0 -msgid "Optional tags you may want to assign for custom reporting" -msgstr "" - -#: ../../accounting/others/configuration/account_type.rst:0 -msgid "Account Currency" -msgstr "" - -#: ../../accounting/others/configuration/account_type.rst:0 -msgid "Forces all moves for this account to have this account currency." -msgstr "" - -#: ../../accounting/others/configuration/account_type.rst:0 -msgid "Internal Type" -msgstr "" - -#: ../../accounting/others/configuration/account_type.rst:0 -msgid "The 'Internal Type' is used for features available on different types of accounts: liquidity type is for cash or bank accounts, payable/receivable is for vendor/customer accounts." -msgstr "" - -#: ../../accounting/others/configuration/account_type.rst:0 -msgid "Internal Group" -msgstr "" - -#: ../../accounting/others/configuration/account_type.rst:0 -msgid "The 'Internal Group' is used to filter accounts based on the internal group set on the account type." -msgstr "" - -#: ../../accounting/others/configuration/account_type.rst:0 -msgid "Allow Reconciliation" -msgstr "" - -#: ../../accounting/others/configuration/account_type.rst:0 -msgid "Check this box if this account allows invoices & payments matching of journal items." -msgstr "" - #: ../../accounting/others/configuration/account_type.rst:84 msgid "View *Create Account* in our Online Demonstration" msgstr "" @@ -5622,7 +5196,6 @@ msgid "Multi-currency invoices & Vendor Bills" msgstr "" #: ../../accounting/others/multicurrencies/invoices_payments.rst:54 -#: ../../accounting/payables/pay/check.rst:0 msgid "Invoices" msgstr "" @@ -6371,7 +5944,7 @@ msgstr "" #: ../../accounting/others/taxes/create.rst:69 #: ../../accounting/others/taxes/default_taxes.rst:28 -#: ../../accounting/others/taxes/taxcloud.rst:72 +#: ../../accounting/others/taxes/taxcloud.rst:93 msgid ":doc:`application`" msgstr "" @@ -6583,6 +6156,22 @@ msgstr "" msgid "Add your product(s). You have two options to get Sales Tax on the Order. You can confirm it, or you can save it and from the *Action* Menu choose **Update Taxes with TaxCloud**." msgstr "" +#: ../../accounting/others/taxes/taxcloud.rst:73 +msgid "Coupons & Promotions" +msgstr "" + +#: ../../accounting/others/taxes/taxcloud.rst:75 +msgid "If you use the Coupon or Promotion Programs, the integration with Taxcloud might seem a bit odd." +msgstr "" + +#: ../../accounting/others/taxes/taxcloud.rst:77 +msgid "The problem lies with the fact that Taxcloud does not accept lines with negative amounts as part of the tax computation. This means that the amount of the lines added by the promotion program must be deduced from the total of the lines it impacts. This means, amongst other complications, that orders that use coupons or promotions with a Taxcloud fiscal position **must** be invoiced completely - you cannot create invoices for partial deliveries, etc." +msgstr "" + +#: ../../accounting/others/taxes/taxcloud.rst:83 +msgid "Another specific oddity is possible in the UI: imagine that you sell a product from the Taxcloud category *[20110] Computers* and that you have a promotion program in place that provides a 50% discount on this product. If the tax rate for this particular product is 7%, the tax rate that will be computed from the Taxcloud integration will display 3.5%. This happens because the discount is included in the price that is sent to Taxcloud, but in Odoo this discount is in another line entirely. At the end of the day, your tax computation will be correct (since a 3.5% tax on the full price is the equivalent of a 7% tax on half the price), but this might be surprising from a user point of view." +msgstr "" + #: ../../accounting/overview/getting_started.rst:3 msgid "Getting Started" msgstr "" @@ -7987,98 +7576,6 @@ msgstr "" msgid "Explanation of the fields of the payment screen:" msgstr "" -#: ../../accounting/payables/pay/check.rst:0 -msgid "Has Invoices" -msgstr "" - -#: ../../accounting/payables/pay/check.rst:0 -msgid "Technical field used for usability purposes" -msgstr "" - -#: ../../accounting/payables/pay/check.rst:0 -msgid "Technical field containing the invoice for which the payment has been generated." -msgstr "" - -#: ../../accounting/payables/pay/check.rst:0 -msgid "This does not especially correspond to the invoices reconciled with the payment," -msgstr "" - -#: ../../accounting/payables/pay/check.rst:0 -msgid "as it can have been generated first, and reconciled later" -msgstr "" - -#: ../../accounting/payables/pay/check.rst:0 -msgid "Hide Payment Method" -msgstr "" - -#: ../../accounting/payables/pay/check.rst:0 -msgid "Technical field used to hide the payment method if the selected journal has only one available which is 'manual'" -msgstr "" - -#: ../../accounting/payables/pay/check.rst:0 -msgid "Payment Method" -msgstr "" - -#: ../../accounting/payables/pay/check.rst:0 -msgid "Check: Pay bill by check and print it from Odoo." -msgstr "" - -#: ../../accounting/payables/pay/check.rst:0 -msgid "Batch Deposit: Encase several customer checks at once by generating a batch deposit to submit to your bank. When encoding the bank statement in Odoo, you are suggested to reconcile the transaction with the batch deposit.To enable batch deposit, module account_batch_payment must be installed." -msgstr "" - -#: ../../accounting/payables/pay/check.rst:0 -msgid "SEPA Credit Transfer: Pay bill from a SEPA Credit Transfer file you submit to your bank. To enable sepa credit transfer, module account_sepa must be installed" -msgstr "" - -#: ../../accounting/payables/pay/check.rst:0 -msgid "Code" -msgstr "" - -#: ../../accounting/payables/pay/check.rst:0 -msgid "Technical field used to adapt the interface to the payment type selected." -msgstr "" - -#: ../../accounting/payables/pay/check.rst:0 -msgid "Saved payment token" -msgstr "" - -#: ../../accounting/payables/pay/check.rst:0 -msgid "Note that tokens from acquirers set to only authorize transactions (instead of capturing the amount) are not available." -msgstr "" - -#: ../../accounting/payables/pay/check.rst:0 -msgid "Show Partner Bank Account" -msgstr "" - -#: ../../accounting/payables/pay/check.rst:0 -msgid "Technical field used to know whether the field `partner_bank_account_id` needs to be displayed or not in the payments form views" -msgstr "" - -#: ../../accounting/payables/pay/check.rst:0 -msgid "Require Partner Bank Account" -msgstr "" - -#: ../../accounting/payables/pay/check.rst:0 -msgid "Technical field used to know whether the field `partner_bank_account_id` needs to be required or not in the payments form views" -msgstr "" - -#: ../../accounting/payables/pay/check.rst:0 -msgid "Check Number" -msgstr "" - -#: ../../accounting/payables/pay/check.rst:0 -msgid "The selected journal is configured to print check numbers. If your pre-printed check paper already has numbers or if the current numbering is wrong, you can change it in the journal configuration page." -msgstr "" - -#: ../../accounting/payables/pay/check.rst:0 -msgid "Journal Item Label" -msgstr "" - -#: ../../accounting/payables/pay/check.rst:0 -msgid "Change label of the counterpart that will hold the payment difference" -msgstr "" - #: ../../accounting/payables/pay/check.rst:79 msgid "Try paying a supplier bill with a check" msgstr "" @@ -8372,6 +7869,293 @@ msgstr "" msgid ":doc:`../../bank/setup/create_bank_account`" msgstr "" +#: ../../accounting/payables/supplier_bills/assets.rst:3 +msgid "Non-current Assets and Fixed Assets" +msgstr "" + +#: ../../accounting/payables/supplier_bills/assets.rst:5 +msgid "**Non-current Assets**, also known as **long-term assets**, are investments that are expected to be realized after one year. They are capitalized rather than being expensed and appear on the company's balance sheet. Depending on their nature, they may undergo **depreciation**." +msgstr "" + +#: ../../accounting/payables/supplier_bills/assets.rst:9 +msgid "**Fixed Assets** are a type of Non-current Assets and include the properties bought for their productive aspects, such as buildings, vehicles, equipment, land, and software." +msgstr "" + +#: ../../accounting/payables/supplier_bills/assets.rst:12 +msgid "For example, let's say we buy a car for $ 27,000. We plan to amortize it over five years, and we will sell it for $ 7,000 afterward. Using the linear, or straight-line, depreciation method, $ 4,000 are expensed each year as **depreciation expenses**. After five years, the **Accumulated Depreciation** amount reported on the balance sheet equals $ 20,000, leaving us with $ 7,000 of **Not Depreciable Value**, or Salvage value." +msgstr "" + +#: ../../accounting/payables/supplier_bills/assets.rst:18 +msgid "Odoo Accounting handles depreciation by creating all depreciation entries automatically in *draft mode*. They are then posted periodically." +msgstr "" + +#: ../../accounting/payables/supplier_bills/assets.rst:21 +msgid "Odoo supports the following **Depreciation Methods**:" +msgstr "" + +#: ../../accounting/payables/supplier_bills/assets.rst:23 +msgid "Linear" +msgstr "" + +#: ../../accounting/payables/supplier_bills/assets.rst:24 +msgid "Degressive" +msgstr "" + +#: ../../accounting/payables/supplier_bills/assets.rst:25 +msgid "Accelerated Degressive" +msgstr "" + +#: ../../accounting/payables/supplier_bills/assets.rst:28 +#: ../../accounting/payables/supplier_bills/deferred_expenses.rst:25 +#: ../../accounting/receivables/customer_invoices/deferred_revenues.rst:24 +msgid "The server checks once a day if an entry must be posted. It might then take up to 24 hours before you see a change from *draft* to *posted*." +msgstr "" + +#: ../../accounting/payables/supplier_bills/assets.rst:32 +#: ../../accounting/payables/supplier_bills/deferred_expenses.rst:29 +#: ../../accounting/receivables/customer_invoices/deferred_revenues.rst:28 +msgid "Prerequisites" +msgstr "" + +#: ../../accounting/payables/supplier_bills/assets.rst:34 +msgid "Such transactions must be posted on an **Assets Account** rather than on the default expense account." +msgstr "" + +#: ../../accounting/payables/supplier_bills/assets.rst:38 +msgid "Configure an Assets Account" +msgstr "" + +#: ../../accounting/payables/supplier_bills/assets.rst:40 +#: ../../accounting/payables/supplier_bills/deferred_expenses.rst:37 +#: ../../accounting/receivables/customer_invoices/deferred_revenues.rst:36 +msgid "To configure your account in the **Chart of Accounts**, go to :menuselection:`Accounting --> Configuration --> Chart of Accounts`, click on *Create*, and fill out the form." +msgstr "" + +#: ../../accounting/payables/supplier_bills/assets.rst:48 +msgid "This account's type must be either *Fixed Assets* or *Non-current Assets*." +msgstr "" + +#: ../../accounting/payables/supplier_bills/assets.rst:51 +#: ../../accounting/payables/supplier_bills/deferred_expenses.rst:48 +msgid "Post an expense to the right account" +msgstr "" + +#: ../../accounting/payables/supplier_bills/assets.rst:54 +#: ../../accounting/payables/supplier_bills/deferred_expenses.rst:51 +msgid "Select the account on a draft bill" +msgstr "" + +#: ../../accounting/payables/supplier_bills/assets.rst:56 +msgid "On a draft bill, select the right account for all the assets you are buying." +msgstr "" + +#: ../../accounting/payables/supplier_bills/assets.rst:65 +#: ../../accounting/payables/supplier_bills/deferred_expenses.rst:61 +msgid "Choose a different Expense Account for specific products" +msgstr "" + +#: ../../accounting/payables/supplier_bills/assets.rst:67 +#: ../../accounting/payables/supplier_bills/deferred_expenses.rst:63 +msgid "Start editing the product, go to the *Accounting* tab, select the right **Expense Account**, and save." +msgstr "" + +#: ../../accounting/payables/supplier_bills/assets.rst:75 +msgid "It is possible to :ref:`automate the creation of assets entries ` for these products." +msgstr "" + +#: ../../accounting/payables/supplier_bills/assets.rst:81 +#: ../../accounting/payables/supplier_bills/deferred_expenses.rst:75 +#: ../../accounting/receivables/customer_invoices/deferred_revenues.rst:74 +msgid "Change the account of a posted journal item" +msgstr "" + +#: ../../accounting/payables/supplier_bills/assets.rst:83 +#: ../../accounting/payables/supplier_bills/deferred_expenses.rst:77 +msgid "To do so, open your Purchases Journal by going to :menuselection:`Accounting --> Accounting --> Purchases`, select the journal item you want to modify, click on the account, and select the right one." +msgstr "" + +#: ../../accounting/payables/supplier_bills/assets.rst:92 +msgid "Assets entries" +msgstr "" + +#: ../../accounting/payables/supplier_bills/assets.rst:97 +#: ../../accounting/payables/supplier_bills/deferred_expenses.rst:89 +#: ../../accounting/receivables/customer_invoices/deferred_revenues.rst:88 +msgid "Create a new entry" +msgstr "" + +#: ../../accounting/payables/supplier_bills/assets.rst:99 +msgid "An **Asset entry** automatically generates all journal entries in *draft mode*. They are then posted one by one at the right time." +msgstr "" + +#: ../../accounting/payables/supplier_bills/assets.rst:102 +msgid "To create a new entry, go to :menuselection:`Accounting --> Accounting --> Assets`, click on *Create*, and fill out the form." +msgstr "" + +#: ../../accounting/payables/supplier_bills/assets.rst:105 +msgid "Click on **select related purchases** to link an existing journal item to this new entry. Some fields are then automatically filled out, and the journal item is now listed under the **Related Purchase** tab." +msgstr "" + +#: ../../accounting/payables/supplier_bills/assets.rst:113 +msgid "Once done, you can click on *Compute Depreciation* (next to the *Confirm* button) to generate all the values of the **Depreciation Board**. This board shows you all the entries that Odoo will post to depreciate your asset, and at which date." +msgstr "" + +#: ../../accounting/payables/supplier_bills/assets.rst:122 +#: ../../accounting/payables/supplier_bills/deferred_expenses.rst:114 +#: ../../accounting/receivables/customer_invoices/deferred_revenues.rst:113 +msgid "What does \"Prorata Temporis\" mean?" +msgstr "" + +#: ../../accounting/payables/supplier_bills/assets.rst:124 +msgid "The **Prorata Temporis** feature is useful to depreciate your assets the most accurately possible." +msgstr "" + +#: ../../accounting/payables/supplier_bills/assets.rst:126 +msgid "With this feature, the first entry on the Depreciation Board is computed based on the time left between the *Prorata Date* and the *First Depreciation Date* rather than the default amount of time between depreciations." +msgstr "" + +#: ../../accounting/payables/supplier_bills/assets.rst:130 +msgid "For example, the Depreciation Board above has its first depreciation with an amount of $ 241.10 rather than $ 4,000.00. Consequently, the last entry is also lower and has an amount of $ 3758.90." +msgstr "" + +#: ../../accounting/payables/supplier_bills/assets.rst:134 +msgid "What are the different Depreciation Methods" +msgstr "" + +#: ../../accounting/payables/supplier_bills/assets.rst:136 +msgid "The **Linear Depreciation Method** divides the initial Depreciable Value by the number of depreciations planned. All depreciation entries have the same amount." +msgstr "" + +#: ../../accounting/payables/supplier_bills/assets.rst:139 +msgid "The **Degressive Depreciation Method** multiplies the Depreciable Value by the **Degressive Factor** for each entry. Each depreciation entry has a lower amount than the previous entry." +msgstr "" + +#: ../../accounting/payables/supplier_bills/assets.rst:142 +msgid "The **Accelerated Degressive Depreciation Method** uses the Degressive Method, but with a minimum Depreciation equal to the Linear Method. This method ensures a fast depreciation at the beginning, followed by a constant one afterward." +msgstr "" + +#: ../../accounting/payables/supplier_bills/assets.rst:147 +msgid "Assets from the Purchases Journal" +msgstr "" + +#: ../../accounting/payables/supplier_bills/assets.rst:149 +msgid "You can create an asset entry from a specific journal item in your **Purchases Journal**." +msgstr "" + +#: ../../accounting/payables/supplier_bills/assets.rst:151 +msgid "To do so, open your Purchases Journal by going to :menuselection:`Accounting --> Accounting --> Purchases`, and select the journal item you want to record as an asset. Make sure that it is posted in the right account (see: :ref:`journal-assets-account`)." +msgstr "" + +#: ../../accounting/payables/supplier_bills/assets.rst:155 +msgid "Then, click on *Action*, select **Create Asset**, and fill out the form the same way you would do to :ref:`create a new entry `." +msgstr "" + +#: ../../accounting/payables/supplier_bills/assets.rst:163 +msgid "Modification of an Asset" +msgstr "" + +#: ../../accounting/payables/supplier_bills/assets.rst:165 +msgid "You can modify the values of an asset to increase or decrease its value." +msgstr "" + +#: ../../accounting/payables/supplier_bills/assets.rst:167 +msgid "To do so, open the asset you want to modify, and click on *Modify Depreciation*. Then, fill out the form with the new depreciation values and click on *Modify*." +msgstr "" + +#: ../../accounting/payables/supplier_bills/assets.rst:170 +msgid "A **decrease in value** posts a new Journal Entry for the **Value Decrease** and modifies all the future *unposted* Journal Entries listed in the Depreciation Board." +msgstr "" + +#: ../../accounting/payables/supplier_bills/assets.rst:173 +msgid "An **increase in value** requires you to fill out additional fields related to the account movements and creates a new Asset entry with the **Value Increase**. The Gross Increase Asset Entry can be accessed with a Smart Button." +msgstr "" + +#: ../../accounting/payables/supplier_bills/assets.rst:182 +msgid "Disposal of Fixed Assets" +msgstr "" + +#: ../../accounting/payables/supplier_bills/assets.rst:184 +msgid "To **sell** an asset or **dispose** of it implies that it must be removed from the Balance Sheet." +msgstr "" + +#: ../../accounting/payables/supplier_bills/assets.rst:186 +msgid "To do so, open the asset you want to dispose of, click on *Sell or Dispose*, and fill out the form." +msgstr "" + +#: ../../accounting/payables/supplier_bills/assets.rst:192 +msgid "Odoo Accounting then generates all the journal entries necessary to dispose of the asset, including the gain or loss on sale, which is based on the difference between the asset's book value at the time of the sale and the amount it is sold for." +msgstr "" + +#: ../../accounting/payables/supplier_bills/assets.rst:197 +msgid "To record the sale of an asset, you must first post the related Customer Invoice so you can link the sale of the asset with it." +msgstr "" + +#: ../../accounting/payables/supplier_bills/assets.rst:201 +msgid "Assets Models" +msgstr "" + +#: ../../accounting/payables/supplier_bills/assets.rst:203 +msgid "You can create **Assets Models** to create your Asset entries faster. It is particularly useful if you recurrently buy the same kind of assets." +msgstr "" + +#: ../../accounting/payables/supplier_bills/assets.rst:206 +msgid "To create a model, go to :menuselection:`Accounting → Configuration --> Assets Models`, click on *Create*, and fill out the form the same way you would do to create a new entry." +msgstr "" + +#: ../../accounting/payables/supplier_bills/assets.rst:210 +msgid "You can also convert a *confirmed Asset entry* into a model by opening it from :menuselection:`Accounting --> Accounting --> Assets` and then, by clicking on the button *Save Model*." +msgstr "" + +#: ../../accounting/payables/supplier_bills/assets.rst:215 +msgid "Apply an Asset Model to a new entry" +msgstr "" + +#: ../../accounting/payables/supplier_bills/assets.rst:217 +msgid "When you create a new Asset entry, fill out the **Fixed Asset Account** with the right asset account." +msgstr "" + +#: ../../accounting/payables/supplier_bills/assets.rst:220 +#: ../../accounting/payables/supplier_bills/deferred_expenses.rst:160 +#: ../../accounting/receivables/customer_invoices/deferred_revenues.rst:160 +msgid "New buttons with all the models linked to that account appear at the top of the form. Clicking on a model button fills out the form according to that model." +msgstr "" + +#: ../../accounting/payables/supplier_bills/assets.rst:230 +msgid "Automate the Assets" +msgstr "" + +#: ../../accounting/payables/supplier_bills/assets.rst:232 +msgid "When you create or edit an account of which the type is either *Non-current Assets* or *Fixed Assets*, you can configure it to create assets for the expenses that are credited on it automatically." +msgstr "" + +#: ../../accounting/payables/supplier_bills/assets.rst:236 +msgid "You have three choices for the **Automate Assets** field:" +msgstr "" + +#: ../../accounting/payables/supplier_bills/assets.rst:238 +#: ../../accounting/payables/supplier_bills/deferred_expenses.rst:175 +#: ../../accounting/receivables/customer_invoices/deferred_revenues.rst:175 +msgid "**No:** this is the default value. Nothing happens." +msgstr "" + +#: ../../accounting/payables/supplier_bills/assets.rst:239 +msgid "**Create in draft:** whenever a transaction is posted on the account, a draft *Assets entry* is created, but not validated. You must first fill out the form in :menuselection:`Accounting --> Accounting --> Assets`." +msgstr "" + +#: ../../accounting/payables/supplier_bills/assets.rst:242 +msgid "**Create and validate:** you must also select an Asset Model (see: `Assets Models`_). Whenever a transaction is posted on the account, an *Assets entry* is created and immediately validated." +msgstr "" + +#: ../../accounting/payables/supplier_bills/assets.rst:250 +msgid "You can, for example, select this account as the default **Expense Account** of a product to fully automate its purchase. (see: :ref:`product-assets-account`)." +msgstr "" + +#: ../../accounting/payables/supplier_bills/assets.rst:254 +#: ../../accounting/payables/supplier_bills/deferred_expenses.rst:193 +#: ../../accounting/receivables/customer_invoices/deferred_revenues.rst:192 +msgid ":doc:`../../others/configuration/account_type`" +msgstr "" + #: ../../accounting/payables/supplier_bills/bills_or_receipts.rst:3 msgid "When should I use supplier bills or purchase receipts?" msgstr "" @@ -8452,16 +8236,6 @@ msgstr "" msgid "Odoo Accounting handles deferred expenses and prepayments by spreading them in multiple entries that are automatically created in *draft mode* and then posted periodically." msgstr "" -#: ../../accounting/payables/supplier_bills/deferred_expenses.rst:25 -#: ../../accounting/receivables/customer_invoices/deferred_revenues.rst:24 -msgid "The server checks once a day if an entry must be posted. It might then take up to 24 hours before you see a change from *draft* to *posted*." -msgstr "" - -#: ../../accounting/payables/supplier_bills/deferred_expenses.rst:29 -#: ../../accounting/receivables/customer_invoices/deferred_revenues.rst:28 -msgid "Prerequisites" -msgstr "" - #: ../../accounting/payables/supplier_bills/deferred_expenses.rst:31 msgid "Such transactions must be posted on a **Deferred Expense Account** rather than on the default expense account." msgstr "" @@ -8470,57 +8244,22 @@ msgstr "" msgid "Configure a Deferred Expense Account" msgstr "" -#: ../../accounting/payables/supplier_bills/deferred_expenses.rst:37 -#: ../../accounting/receivables/customer_invoices/deferred_revenues.rst:36 -msgid "To configure your account in the **Chart of Accounts**, go to :menuselection:`Accounting --> Configuration --> Chart of Accounts`, click on *Create*, and fill out the form." -msgstr "" - #: ../../accounting/payables/supplier_bills/deferred_expenses.rst:45 msgid "This account's type must be either *Current Assets* or *Prepayments*" msgstr "" -#: ../../accounting/payables/supplier_bills/deferred_expenses.rst:48 -msgid "Post an expense to the right account" -msgstr "" - -#: ../../accounting/payables/supplier_bills/deferred_expenses.rst:51 -msgid "Select the account on a draft bill" -msgstr "" - #: ../../accounting/payables/supplier_bills/deferred_expenses.rst:53 msgid "On a draft bill, select the right account for all the products of which the expenses must be deferred." msgstr "" -#: ../../accounting/payables/supplier_bills/deferred_expenses.rst:61 -msgid "Choose a different Expense Account for specific products" -msgstr "" - -#: ../../accounting/payables/supplier_bills/deferred_expenses.rst:63 -msgid "Start editing the product, go to the *Accounting* tab, select the right **Expense Account**, and save." -msgstr "" - #: ../../accounting/payables/supplier_bills/deferred_expenses.rst:71 msgid "It is possible to automate the creation of expense entries for these products (see: `Automate the Deferred Expenses`_)." msgstr "" -#: ../../accounting/payables/supplier_bills/deferred_expenses.rst:75 -#: ../../accounting/receivables/customer_invoices/deferred_revenues.rst:74 -msgid "Change the account of a posted journal item" -msgstr "" - -#: ../../accounting/payables/supplier_bills/deferred_expenses.rst:77 -msgid "To do so, open your Purchases Journal by going to :menuselection:`Accounting --> Accounting --> Purchases`, select the journal item you want to modify, click on the account, and select the right one." -msgstr "" - #: ../../accounting/payables/supplier_bills/deferred_expenses.rst:86 msgid "Deferred Expenses entries" msgstr "" -#: ../../accounting/payables/supplier_bills/deferred_expenses.rst:89 -#: ../../accounting/receivables/customer_invoices/deferred_revenues.rst:88 -msgid "Create a new entry" -msgstr "" - #: ../../accounting/payables/supplier_bills/deferred_expenses.rst:91 msgid "A **Deferred Expense entry** automatically generates all journal entries in *draft mode*. They are then posted one by one at the right time until the full amount of the expense is recognized." msgstr "" @@ -8537,11 +8276,6 @@ msgstr "" msgid "Once done, you can click on *Compute Deferral* (next to the *Confirm* button) to generate all the values of the **Expense Board**. This board shows you all the entries that Odoo will post to recognize your expense, and at which date." msgstr "" -#: ../../accounting/payables/supplier_bills/deferred_expenses.rst:114 -#: ../../accounting/receivables/customer_invoices/deferred_revenues.rst:113 -msgid "What does \"Prorata Temporis\" mean?" -msgstr "" - #: ../../accounting/payables/supplier_bills/deferred_expenses.rst:116 msgid "The **Prorata Temporis** feature is useful to recognize your expense the most accurately possible." msgstr "" @@ -8595,11 +8329,6 @@ msgstr "" msgid "When you create a new Deferred Expense entry, fill out the **Deferred Expense Account** with the right recognition account." msgstr "" -#: ../../accounting/payables/supplier_bills/deferred_expenses.rst:160 -#: ../../accounting/receivables/customer_invoices/deferred_revenues.rst:160 -msgid "New buttons with all the models linked to that account appear at the top of the form. Clicking on a model button fills out the form according to that model." -msgstr "" - #: ../../accounting/payables/supplier_bills/deferred_expenses.rst:168 msgid "Automate the Deferred Expenses" msgstr "" @@ -8612,11 +8341,6 @@ msgstr "" msgid "You have three choices for the **Automate Deferred Expense** field:" msgstr "" -#: ../../accounting/payables/supplier_bills/deferred_expenses.rst:175 -#: ../../accounting/receivables/customer_invoices/deferred_revenues.rst:175 -msgid "**No:** this is the default value. Nothing happens." -msgstr "" - #: ../../accounting/payables/supplier_bills/deferred_expenses.rst:176 msgid "**Create in draft:** whenever a transaction is posted on the account, a draft *Deferred Expenses entry* is created, but not validated. You must first fill out the form in :menuselection:`Accounting --> Accounting --> Deferred Expenses`." msgstr "" @@ -8626,12 +8350,7 @@ msgid "**Create and validate:** you must also select a Deferred Expense Model (s msgstr "" #: ../../accounting/payables/supplier_bills/deferred_expenses.rst:188 -msgid "You can, for example, select this account as the default **Expense Account** of a product to fully automate its sale completely. (see: `Choose a different Expense Account for specific products`_)." -msgstr "" - -#: ../../accounting/payables/supplier_bills/deferred_expenses.rst:193 -#: ../../accounting/receivables/customer_invoices/deferred_revenues.rst:192 -msgid ":doc:`../../others/configuration/account_type`" +msgid "You can, for example, select this account as the default **Expense Account** of a product to fully automate its purchase. (see: `Choose a different Expense Account for specific products`_)." msgstr "" #: ../../accounting/payables/supplier_bills/manage.rst:3 @@ -9219,7 +8938,7 @@ msgid "**Create and validate:** you must also select a Deferred Revenue Model (s msgstr "" #: ../../accounting/receivables/customer_invoices/deferred_revenues.rst:188 -msgid "You can, for example, select this account as the default **Income Account** of a product to fully automate its sale completely. (see: `Choose a different Income Account for specific products`_)." +msgid "You can, for example, select this account as the default **Income Account** of a product to fully automate its sale. (see: `Choose a different Income Account for specific products`_)." msgstr "" #: ../../accounting/receivables/customer_invoices/deferred_revenues.rst:193 diff --git a/locale/sources/crm.pot b/locale/sources/crm.pot index e8932edc4..a9f069f0a 100644 --- a/locale/sources/crm.pot +++ b/locale/sources/crm.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: Odoo 13.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-01-16 09:46+0100\n" +"POT-Creation-Date: 2020-02-11 14:56+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -102,7 +102,7 @@ msgid "Configure email aliases" msgstr "" #: ../../crm/acquire_leads/generate_from_email.rst:13 -msgid "Each sales channel can have its own email alias, to generate leads/opportunities automatically assigned to it. It is useful if you manage several sales teams with specific business processes. You will find the configuration of sales channels under :menuselection:`Configuration --> Sales Channels`." +msgid "Each sales teams can have its own email alias, to generate leads/opportunities automatically assigned to it. It is useful if you manage several sales teams with specific business processes. You will find the configuration of sales teams under :menuselection:`Configuration --> Sales Teams`." msgstr "" #: ../../crm/acquire_leads/generate_from_website.rst:3 @@ -646,58 +646,6 @@ msgstr "" msgid "Analyze performance" msgstr "" -#: ../../crm/performance/turnover.rst:3 -msgid "Get an accurate probable turnover" -msgstr "" - -#: ../../crm/performance/turnover.rst:5 -msgid "As you progress in your sales cycle, and move from one stage to another, you can expect to have more precise information about a given opportunity giving you an better idea of the probability of closing it, this is important to see your expected turnover in your various reports." -msgstr "" - -#: ../../crm/performance/turnover.rst:11 -msgid "Configure your kanban stages" -msgstr "" - -#: ../../crm/performance/turnover.rst:13 -msgid "By default, Odoo Kanban view has four stages: New, Qualified, Proposition, Won. Respectively with a 10, 30, 70 and 100% probability of success. You can add stages as well as edit them. By refining default probability of success for your business on stages, you can make your probable turnover more and more accurate." -msgstr "" - -#: ../../crm/performance/turnover.rst:25 -msgid "Every one of your opportunities will have the probability set by default but you can modify them manually of course." -msgstr "" - -#: ../../crm/performance/turnover.rst:29 -msgid "Set your opportunity expected revenue & closing date" -msgstr "" - -#: ../../crm/performance/turnover.rst:31 -msgid "When you get information on a prospect, it is important to set an expected revenue and expected closing date. This will let you see your total expected revenue by stage as well as give a more accurate probable turnover." -msgstr "" - -#: ../../crm/performance/turnover.rst:40 -msgid "See the overdue or closing soon opportunities" -msgstr "" - -#: ../../crm/performance/turnover.rst:42 -msgid "In your pipeline, you can filter opportunities by how soon they will be closing, letting you prioritize." -msgstr "" - -#: ../../crm/performance/turnover.rst:48 -msgid "As a sales manager, this tool can also help you see potential ways to improve your sale process, for example a lot of opportunities in early stages but with near closing date might indicate an issue." -msgstr "" - -#: ../../crm/performance/turnover.rst:53 -msgid "View your total expected revenue and probable turnover" -msgstr "" - -#: ../../crm/performance/turnover.rst:55 -msgid "While in your Kanban view you can see the expected revenue for each of your stages. This is based on each opportunity expected revenue that you set." -msgstr "" - -#: ../../crm/performance/turnover.rst:62 -msgid "As a manager you can go to :menuselection:`CRM --> Reporting --> Pipeline Analysis` by default *Probable Turnover* is set as a measure. This report will take into account the revenue you set on each opportunity but also the probability they will close. This gives you a much better idea of your expected revenue allowing you to make plans and set targets." -msgstr "" - #: ../../crm/performance/win_loss.rst:3 msgid "Check your Win/Loss Ratio" msgstr "" diff --git a/locale/sources/discuss.pot b/locale/sources/discuss.pot index c45e39b3e..0fe8f8e96 100644 --- a/locale/sources/discuss.pot +++ b/locale/sources/discuss.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: Odoo 13.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-10-03 11:39+0200\n" +"POT-Creation-Date: 2020-02-11 14:56+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -24,163 +24,187 @@ msgstr "" msgid "How to use my mail server to send and receive emails in Odoo" msgstr "" -#: ../../discuss/email_servers.rst:5 -msgid "This document is mainly dedicated to Odoo on-premise users who don't benefit from an out-of-the-box solution to send and receive emails in Odoo, unlike `Odoo Online `__ & `Odoo.sh `__." +#: ../../discuss/email_servers.rst:6 +msgid "If you are a user of Odoo Online or Odoo.sh..." msgstr "" -#: ../../discuss/email_servers.rst:9 -msgid "If no one in your company is used to manage email servers, we strongly recommend that you opt for those Odoo hosting solutions. Their email system works instantly and is monitored by professionals. Nevertheless you can still use your own email servers if you want to manage your email server's reputation yourself." +#: ../../discuss/email_servers.rst:8 +msgid "You have nothing to do! **Odoo sets up its own mail servers for your database.** Outgoing and incoming emails work out-of-the-box!" msgstr "" -#: ../../discuss/email_servers.rst:15 -msgid "You will find here below some useful information on how to integrate your own email solution with Odoo." +#: ../../discuss/email_servers.rst:11 +msgid "Unless you plan to send large batches of mass mailing that could require the use of an external mail server, simply enjoy your new Odoo database." +msgstr "" + +#: ../../discuss/email_servers.rst:16 +msgid "Scope of this documentation" msgstr "" #: ../../discuss/email_servers.rst:18 -msgid "Office 365 email servers don't allow easiliy to send external emails from hosts like Odoo. Refer to the `Microsoft's documentation `__ to make it work." +msgid "This document is **mainly dedicated to Odoo on-premise users** who don't benefit from an out-of-the-box solution to send and receive emails in Odoo, unlike `Odoo Online `__ & `Odoo.sh `__." msgstr "" -#: ../../discuss/email_servers.rst:24 -msgid "How to manage outbound messages" -msgstr "" - -#: ../../discuss/email_servers.rst:26 -msgid "As a system admin, go to :menuselection:`Settings --> General Settings` and check *External Email Servers*. Then, click *Outgoing Mail Servers* to create one and reference the SMTP data of your email server. Once all the information has been filled out, click on *Test Connection*." +#: ../../discuss/email_servers.rst:25 +msgid "If no one in your company is used to manage email servers, we strongly recommend that you opt for those Odoo hosting solutions. Their email system works instantly and is monitored by professionals. Nevertheless you can still use your own email servers if you want to manage your email server's reputation yourself." msgstr "" #: ../../discuss/email_servers.rst:31 -msgid "Here is a typical configuration for a G Suite server." +msgid "You will find here below some useful information on how to integrate your own email solution with Odoo." msgstr "" -#: ../../discuss/email_servers.rst:36 -msgid "Then set your email domain name in the General Settings." -msgstr "" - -#: ../../discuss/email_servers.rst:39 -msgid "Can I use an Office 365 server" +#: ../../discuss/email_servers.rst:34 +msgid "Office 365 email servers don't allow easily to send external emails from hosts like Odoo. Refer to the `Microsoft's documentation `__ to make it work." msgstr "" #: ../../discuss/email_servers.rst:40 -msgid "You can use an Office 365 server if you run Odoo on-premise. Office 365 SMTP relays are not compatible with Odoo Online." +msgid "How to manage outbound messages" msgstr "" -#: ../../discuss/email_servers.rst:43 -msgid "Please refer to `Microsoft's documentation `__ to configure a SMTP relay for your Odoo's IP address." +#: ../../discuss/email_servers.rst:41 +msgid "As a system admin, go to :menuselection:`Settings --> General Settings` and check *External Email Servers*. Then, click *Outgoing Mail Servers* to create one and reference the SMTP data of your email server. Once all the information has been filled out, click on *Test Connection*." msgstr "" -#: ../../discuss/email_servers.rst:47 -msgid "How to use a G Suite server" +#: ../../discuss/email_servers.rst:46 +msgid "Here is a typical configuration for a G Suite server." msgstr "" -#: ../../discuss/email_servers.rst:48 -msgid "You can use an G Suite server for any Odoo hosting type. To do so you need to setup the SMTP relay service. The configuration steps are explained in `Google documentation `__." +#: ../../discuss/email_servers.rst:51 +msgid "Then set your email domain name in the General Settings." msgstr "" -#: ../../discuss/email_servers.rst:55 -msgid "Be SPF-compliant" +#: ../../discuss/email_servers.rst:54 +msgid "If you get a ``[AUTHENTICATIONFAILED] Invalid credentials (Failure)`` warning when you *Test Connection* on a Gmail address, activate the *Less secure app access* option. A direct link can be `accessed here `_." msgstr "" -#: ../../discuss/email_servers.rst:56 -msgid "In case you use SPF (Sender Policy Framework) to increase the deliverability of your outgoing emails, don't forget to authorize Odoo as a sending host in your domain name settings. Here is the configuration for Odoo Online:" -msgstr "" - -#: ../../discuss/email_servers.rst:60 -msgid "If no TXT record is set for SPF, create one with following definition: v=spf1 include:_spf.odoo.com ~all" +#: ../../discuss/email_servers.rst:58 +msgid "In addition to that, enable the IMAP setting on your Gmail account." msgstr "" #: ../../discuss/email_servers.rst:62 -msgid "In case a SPF TXT record is already set, add \"include:_spf.odoo.com\". e.g. for a domain name that sends emails via Odoo Online and via G Suite it could be: v=spf1 include:_spf.odoo.com include:_spf.google.com ~all" +msgid "Can I use an Office 365 server" +msgstr "" + +#: ../../discuss/email_servers.rst:63 +msgid "You can use an Office 365 server if you run Odoo on-premise. Office 365 SMTP relays are not compatible with Odoo Online." msgstr "" #: ../../discuss/email_servers.rst:66 -msgid "Find `here `__ the exact procedure to create or modify TXT records in your own domain registrar." +msgid "Please refer to `Microsoft's documentation `__ to configure a SMTP relay for your Odoo's IP address." msgstr "" -#: ../../discuss/email_servers.rst:69 -msgid "Your new SPF record can take up to 48 hours to go into effect, but this usually happens more quickly." +#: ../../discuss/email_servers.rst:70 +msgid "How to use a G Suite server" msgstr "" -#: ../../discuss/email_servers.rst:72 -msgid "Adding more than one SPF record for a domain can cause problems with mail delivery and spam classification. Instead, we recommend using only one SPF record by modifying it to authorize Odoo." -msgstr "" - -#: ../../discuss/email_servers.rst:77 -msgid "Allow DKIM" +#: ../../discuss/email_servers.rst:71 +msgid "You can use an G Suite server for any Odoo hosting type. To do so you need to setup the SMTP relay service. The configuration steps are explained in `Google documentation `__." msgstr "" #: ../../discuss/email_servers.rst:78 -msgid "You should do the same thing if DKIM (Domain Keys Identified Mail) is enabled on your email server. In the case of Odoo Online & Odoo.sh, you should add a DNS \"odoo._domainkey\" CNAME record to \"odoo._domainkey.odoo.com\". For example, for \"foo.com\" they should have a record \"odoo._domainkey.foo.com\" that is a CNAME with the value \"odoo._domainkey.odoo.com\"." +msgid "Be SPF-compliant" msgstr "" -#: ../../discuss/email_servers.rst:86 -msgid "How to manage inbound messages" +#: ../../discuss/email_servers.rst:79 +msgid "In case you use SPF (Sender Policy Framework) to increase the deliverability of your outgoing emails, don't forget to authorize Odoo as a sending host in your domain name settings. Here is the configuration for Odoo Online:" msgstr "" -#: ../../discuss/email_servers.rst:88 -msgid "Odoo relies on generic email aliases to fetch incoming messages." +#: ../../discuss/email_servers.rst:83 +msgid "If no TXT record is set for SPF, create one with following definition: v=spf1 include:_spf.odoo.com ~all" msgstr "" -#: ../../discuss/email_servers.rst:90 -msgid "**Reply messages** of messages sent from Odoo are routed to their original discussion thread (and to the inbox of all its followers) by the catchall alias (**catchall@**)." +#: ../../discuss/email_servers.rst:85 +msgid "In case a SPF TXT record is already set, add \"include:_spf.odoo.com\". e.g. for a domain name that sends emails via Odoo Online and via G Suite it could be: v=spf1 include:_spf.odoo.com include:_spf.google.com ~all" msgstr "" -#: ../../discuss/email_servers.rst:94 -msgid "**Bounced messages** are routed to **bounce@** in order to track them in Odoo. This is especially used in `Odoo Email Marketing `__ to opt-out invalid recipients." +#: ../../discuss/email_servers.rst:89 +msgid "Find `here `__ the exact procedure to create or modify TXT records in your own domain registrar." msgstr "" -#: ../../discuss/email_servers.rst:98 -msgid "**Original messages**: Several business objects have their own alias to create new records in Odoo from incoming emails:" +#: ../../discuss/email_servers.rst:92 +msgid "Your new SPF record can take up to 48 hours to go into effect, but this usually happens more quickly." +msgstr "" + +#: ../../discuss/email_servers.rst:95 +msgid "Adding more than one SPF record for a domain can cause problems with mail delivery and spam classification. Instead, we recommend using only one SPF record by modifying it to authorize Odoo." +msgstr "" + +#: ../../discuss/email_servers.rst:100 +msgid "Allow DKIM" msgstr "" #: ../../discuss/email_servers.rst:101 -msgid "Sales Channel (to create Leads or Opportunities in `Odoo CRM `__)," -msgstr "" - -#: ../../discuss/email_servers.rst:103 -msgid "Support Channel (to create Tickets in `Odoo Helpdesk `__)," -msgstr "" - -#: ../../discuss/email_servers.rst:105 -msgid "Projects (to create new Tasks in `Odoo Project `__)," -msgstr "" - -#: ../../discuss/email_servers.rst:107 -msgid "Job Positions (to create Applicants in `Odoo Recruitment `__)," +msgid "You should do the same thing if DKIM (Domain Keys Identified Mail) is enabled on your email server. In the case of Odoo Online & Odoo.sh, you should add a DNS \"odoo._domainkey\" CNAME record to \"odoo._domainkey.odoo.com\". For example, for \"foo.com\" they should have a record \"odoo._domainkey.foo.com\" that is a CNAME with the value \"odoo._domainkey.odoo.com\"." msgstr "" #: ../../discuss/email_servers.rst:109 -msgid "etc." +msgid "How to manage inbound messages" msgstr "" #: ../../discuss/email_servers.rst:111 -msgid "Depending on your mail server, there might be several methods to fetch emails. The easiest and most recommended method is to manage one email address per Odoo alias in your mail server." +msgid "Odoo relies on generic email aliases to fetch incoming messages." msgstr "" -#: ../../discuss/email_servers.rst:115 -msgid "Create the corresponding email addresses in your mail server (catchall@, bounce@, sales@, etc.)." +#: ../../discuss/email_servers.rst:113 +msgid "**Reply messages** of messages sent from Odoo are routed to their original discussion thread (and to the inbox of all its followers) by the catchall alias (**catchall@**)." msgstr "" #: ../../discuss/email_servers.rst:117 -msgid "Set your domain name in the General Settings." +msgid "**Bounced messages** are routed to **bounce@** in order to track them in Odoo. This is especially used in `Odoo Email Marketing `__ to opt-out invalid recipients." msgstr "" -#: ../../discuss/email_servers.rst:122 -msgid "If you use Odoo on-premise, create an *Incoming Mail Server* in Odoo for each alias. You can do it from the General Settings as well. Fill out the form according to your email provider’s settings. Leave the *Actions to Perform on Incoming Mails* blank. Once all the information has been filled out, click on *TEST & CONFIRM*." +#: ../../discuss/email_servers.rst:121 +msgid "**Original messages**: Several business objects have their own alias to create new records in Odoo from incoming emails:" msgstr "" -#: ../../discuss/email_servers.rst:131 -msgid "If you use Odoo Online or Odoo.sh, We do recommend to redirect incoming messages to Odoo's domain name rather than exclusively use your own email server. That way you will receive incoming messages without delay. Indeed, Odoo Online is fetching incoming messages of external servers once per hour only. You should set redirections for all the email addresses to Odoo's domain name in your email server (e.g. *catchall@mydomain.ext* to *catchall@mycompany.odoo.com*)." +#: ../../discuss/email_servers.rst:124 +msgid "Sales Channel (to create Leads or Opportunities in `Odoo CRM `__)," +msgstr "" + +#: ../../discuss/email_servers.rst:126 +msgid "Support Channel (to create Tickets in `Odoo Helpdesk `__)," +msgstr "" + +#: ../../discuss/email_servers.rst:128 +msgid "Projects (to create new Tasks in `Odoo Project `__)," +msgstr "" + +#: ../../discuss/email_servers.rst:130 +msgid "Job Positions (to create Applicants in `Odoo Recruitment `__)," +msgstr "" + +#: ../../discuss/email_servers.rst:132 +msgid "etc." +msgstr "" + +#: ../../discuss/email_servers.rst:134 +msgid "Depending on your mail server, there might be several methods to fetch emails. The easiest and most recommended method is to manage one email address per Odoo alias in your mail server." msgstr "" #: ../../discuss/email_servers.rst:138 +msgid "Create the corresponding email addresses in your mail server (catchall@, bounce@, sales@, etc.)." +msgstr "" + +#: ../../discuss/email_servers.rst:140 +msgid "Set your domain name in the General Settings." +msgstr "" + +#: ../../discuss/email_servers.rst:145 +msgid "If you use Odoo on-premise, create an *Incoming Mail Server* in Odoo for each alias. You can do it from the General Settings as well. Fill out the form according to your email provider’s settings. Leave the *Actions to Perform on Incoming Mails* blank. Once all the information has been filled out, click on *TEST & CONFIRM*." +msgstr "" + +#: ../../discuss/email_servers.rst:154 +msgid "If you use Odoo Online or Odoo.sh, We do recommend to redirect incoming messages to Odoo's domain name rather than exclusively use your own email server. That way you will receive incoming messages without delay. Indeed, Odoo Online is fetching incoming messages of external servers once per hour only. You should set redirections for all the email addresses to Odoo's domain name in your email server (e.g. *catchall@mydomain.ext* to *catchall@mycompany.odoo.com*)." +msgstr "" + +#: ../../discuss/email_servers.rst:161 msgid "All the aliases are customizable in Odoo. Object aliases can be edited from their respective configuration view. To edit catchall and bounce aliases, you first need to activate the developer mode from the Settings Dashboard." msgstr "" -#: ../../discuss/email_servers.rst:146 +#: ../../discuss/email_servers.rst:169 msgid "Then refresh your screen and go to :menuselection:`Settings --> Technical --> Parameters --> System Parameters` to customize the aliases (*mail.catchall.alias* & * mail.bounce.alias*)." msgstr "" -#: ../../discuss/email_servers.rst:153 +#: ../../discuss/email_servers.rst:176 msgid "By default inbound messages are fetched every 5 minutes in Odoo on-premise. You can change this value in developer mode. Go to :menuselection:`Settings --> Technical --> Automation --> Scheduled Actions` and look for *Mail: Fetchmail Service*." msgstr "" diff --git a/locale/sources/ecommerce.pot b/locale/sources/ecommerce.pot index 806b18ed9..18df7b9b1 100644 --- a/locale/sources/ecommerce.pot +++ b/locale/sources/ecommerce.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: Odoo 13.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-01-16 09:46+0100\n" +"POT-Creation-Date: 2020-02-11 14:56+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -578,51 +578,55 @@ msgid "Activate Authorize.Net in Odoo from :menuselection:`Website or Sales or A msgstr "" #: ../../ecommerce/shopper_experience/authorize.rst:33 -msgid "Enter both your **Login ID** and your **API Transaction Key**." +msgid "Enter both your **Login ID** your **API Transaction Key** and your **API Signature Key**." msgstr "" #: ../../ecommerce/shopper_experience/authorize.rst:39 -msgid "To get those credentials in Authorize.Net, you can rely on *API Login ID and Transaction Key* video of `Authorize.Net Video Tutorials `__. Such videos give meaningful insights about how to set up your Authorize.Net account according to your needs." +msgid "To get those credentials from Authorize.Net, you can follow the direction in the Authorize.net Help `API Credentials and Keys `__ entry and access the menu :menuselection:`Account --> Settings --> API Credentials & Keys` in the Authorize.net dashboard. Note that you need *both* a Transaction key and and Signature key." msgstr "" -#: ../../ecommerce/shopper_experience/authorize.rst:47 +#: ../../ecommerce/shopper_experience/authorize.rst:45 +msgid "Once both keys are set up, you can then generate a Client Key by clicking the \"Generate Client Key\" button. Note that these 3 keys are necessary for the setup to work correctly." +msgstr "" + +#: ../../ecommerce/shopper_experience/authorize.rst:51 msgid "Go live" msgstr "" -#: ../../ecommerce/shopper_experience/authorize.rst:48 -msgid "Your configuration is now ready! You can make Authorize.Net visible on your merchant interface and activate the **Production** mode." +#: ../../ecommerce/shopper_experience/authorize.rst:52 +msgid "Your configuration is now ready! You can make Authorize.Net visible on your merchant interface and activate the **Enabled** state." msgstr "" -#: ../../ecommerce/shopper_experience/authorize.rst:55 -msgid "Credentials provided by Authorize.net are different for both test and production mode. Don't forget to update them in Odoo when you turn on the production mode." +#: ../../ecommerce/shopper_experience/authorize.rst:59 +msgid "Credentials provided by Authorize.net are different for both test and production mode. Don't forget to update them in Odoo when you switch from testing to production or vice-versa." msgstr "" -#: ../../ecommerce/shopper_experience/authorize.rst:61 +#: ../../ecommerce/shopper_experience/authorize.rst:65 msgid "Assess Authorize.Net as payment solution" msgstr "" -#: ../../ecommerce/shopper_experience/authorize.rst:62 +#: ../../ecommerce/shopper_experience/authorize.rst:66 msgid "You can test and assess Authorize.Net for free by creating a `developer account `__." msgstr "" -#: ../../ecommerce/shopper_experience/authorize.rst:64 +#: ../../ecommerce/shopper_experience/authorize.rst:68 msgid "Once the account created you receive sandbox credentials. Enter them in Odoo as explained here above and make sure you are still in *Test* mode." msgstr "" -#: ../../ecommerce/shopper_experience/authorize.rst:68 +#: ../../ecommerce/shopper_experience/authorize.rst:72 msgid "You can also log in to `Authorize.Net sandbox platform `__ to configure your sandbox account." msgstr "" -#: ../../ecommerce/shopper_experience/authorize.rst:71 +#: ../../ecommerce/shopper_experience/authorize.rst:75 msgid "To perform ficticious transactions you can use fake card numbers provided in the `Authorize.Net Testing Guide `__." msgstr "" -#: ../../ecommerce/shopper_experience/authorize.rst:76 +#: ../../ecommerce/shopper_experience/authorize.rst:80 #: ../../ecommerce/shopper_experience/paypal.rst:206 msgid ":doc:`payment`" msgstr "" -#: ../../ecommerce/shopper_experience/authorize.rst:77 +#: ../../ecommerce/shopper_experience/authorize.rst:81 #: ../../ecommerce/shopper_experience/payment.rst:111 #: ../../ecommerce/shopper_experience/paypal.rst:207 msgid ":doc:`payment_acquirer`" @@ -693,7 +697,7 @@ msgid "How to go live" msgstr "" #: ../../ecommerce/shopper_experience/payment.rst:40 -msgid "Once the payment method ready, make it visible in the payment interface and activate the **Production** mode." +msgid "Once the payment method is ready, make it visible in the payment interface by switching the state to **Enabled**." msgstr "" #: ../../ecommerce/shopper_experience/payment.rst:48 diff --git a/locale/sources/manufacturing.pot b/locale/sources/manufacturing.pot index 2a67ea6c4..46b33d093 100644 --- a/locale/sources/manufacturing.pot +++ b/locale/sources/manufacturing.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: Odoo 13.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-01-16 09:46+0100\n" +"POT-Creation-Date: 2020-02-11 14:56+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -760,35 +760,35 @@ msgstr "" msgid "Repair Management" msgstr "" -#: ../../manufacturing/repair/repair.rst:3 +#: ../../manufacturing/repair/repair.rst:5 msgid "Repair products" msgstr "" -#: ../../manufacturing/repair/repair.rst:5 +#: ../../manufacturing/repair/repair.rst:7 msgid "The Odoo *Repair* app allows you to manage a complete after sales process but also to simply repair products you have manufactured, if they present a defect." msgstr "" -#: ../../manufacturing/repair/repair.rst:10 +#: ../../manufacturing/repair/repair.rst:12 msgid "Create a Repair Order" msgstr "" -#: ../../manufacturing/repair/repair.rst:12 +#: ../../manufacturing/repair/repair.rst:14 msgid "Once in the app, you can access your existing *Repair Orders* and create a new one." msgstr "" -#: ../../manufacturing/repair/repair.rst:19 +#: ../../manufacturing/repair/repair.rst:21 msgid "Manage a repair" msgstr "" -#: ../../manufacturing/repair/repair.rst:21 +#: ../../manufacturing/repair/repair.rst:23 msgid "When a customer sends you a product for repair, create a new *Repair Order*. Fill it in with all the information you may need such as the product, the customer, if it has to be invoiced after or before the repair, the parts you might need, etc." msgstr "" -#: ../../manufacturing/repair/repair.rst:29 +#: ../../manufacturing/repair/repair.rst:31 msgid "Once everything is done, you can then send the repair quotation to your customer. If it is approved, you can confirm the repair. You will then be able to start & end the repair when it is completed." msgstr "" -#: ../../manufacturing/repair/repair.rst:36 +#: ../../manufacturing/repair/repair.rst:38 msgid "You can now invoice the repair." msgstr "" diff --git a/locale/sources/point_of_sale.pot b/locale/sources/point_of_sale.pot index 9de578c62..3df8fc5da 100644 --- a/locale/sources/point_of_sale.pot +++ b/locale/sources/point_of_sale.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: Odoo 13.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-01-16 09:46+0100\n" +"POT-Creation-Date: 2020-02-11 14:56+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -268,7 +268,7 @@ msgid "When you use it, you can then reprint your last receipt." msgstr "" #: ../../point_of_sale/advanced_pricing_features.rst:3 -msgid "Advanced Pricing Features" +msgid "Pricing Features" msgstr "" #: ../../point_of_sale/advanced_pricing_features/discount_tags.rst:3 @@ -466,7 +466,7 @@ msgid "You can also access the stats views by clicking here" msgstr "" #: ../../point_of_sale/belgian_fdm.rst:3 -msgid "Belgian Fiscal Data Module" +msgid "Fiscal Data Modules" msgstr "" #: ../../point_of_sale/belgian_fdm/setup.rst:3 @@ -899,7 +899,7 @@ msgid "In your PoS interface, at the moment of the payment, select your Vantiv p msgstr "" #: ../../point_of_sale/restaurant.rst:3 -msgid "Advanced Restaurant Features" +msgid "Restaurant Features" msgstr "" #: ../../point_of_sale/restaurant/bill_printing.rst:3 @@ -1155,7 +1155,7 @@ msgid "You can now transfer the customers, simply use the transfer button and se msgstr "" #: ../../point_of_sale/shop.rst:3 -msgid "Advanced Shop Features" +msgid "Shop Features" msgstr "" #: ../../point_of_sale/shop/cash_control.rst:3 diff --git a/locale/sources/purchase.pot b/locale/sources/purchase.pot index 0c681bbbf..c77d09191 100644 --- a/locale/sources/purchase.pot +++ b/locale/sources/purchase.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: Odoo 13.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-01-16 09:46+0100\n" +"POT-Creation-Date: 2020-02-11 14:56+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -529,78 +529,6 @@ msgstr "" msgid "Select your supplier in the **Vendor** menu, or create it on-the-fly by clicking on **Create and Edit**. In the **Order Date** field, select the date to which you wish to proceed to the actual order." msgstr "" -#: ../../purchase/purchases/rfq/create.rst:0 -msgid "Receipt" -msgstr "" - -#: ../../purchase/purchases/rfq/create.rst:0 -msgid "Incoming Shipments" -msgstr "" - -#: ../../purchase/purchases/rfq/create.rst:0 -msgid "Vendor" -msgstr "" - -#: ../../purchase/purchases/rfq/create.rst:0 -msgid "You can find a vendor by its Name, TIN, Email or Internal Reference." -msgstr "" - -#: ../../purchase/purchases/rfq/create.rst:0 -msgid "Vendor Reference" -msgstr "" - -#: ../../purchase/purchases/rfq/create.rst:0 -msgid "Reference of the sales order or bid sent by the vendor. It's used to do the matching when you receive the products as this reference is usually written on the delivery order sent by your vendor." -msgstr "" - -#: ../../purchase/purchases/rfq/create.rst:0 -msgid "Order Date" -msgstr "" - -#: ../../purchase/purchases/rfq/create.rst:0 -msgid "Depicts the date where the Quotation should be validated and converted into a purchase order." -msgstr "" - -#: ../../purchase/purchases/rfq/create.rst:0 -msgid "Source Document" -msgstr "" - -#: ../../purchase/purchases/rfq/create.rst:0 -msgid "Reference of the document that generated this purchase order request (e.g. a sales order)" -msgstr "" - -#: ../../purchase/purchases/rfq/create.rst:0 -msgid "Deliver To" -msgstr "" - -#: ../../purchase/purchases/rfq/create.rst:0 -msgid "This will determine operation type of incoming shipment" -msgstr "" - -#: ../../purchase/purchases/rfq/create.rst:0 -msgid "Drop Ship Address" -msgstr "" - -#: ../../purchase/purchases/rfq/create.rst:0 -msgid "Put an address if you want to deliver directly from the vendor to the customer. Otherwise, keep empty to deliver to your own company." -msgstr "" - -#: ../../purchase/purchases/rfq/create.rst:0 -msgid "Destination Location Type" -msgstr "" - -#: ../../purchase/purchases/rfq/create.rst:0 -msgid "Technical field used to display the Drop Ship Address" -msgstr "" - -#: ../../purchase/purchases/rfq/create.rst:0 -msgid "Incoterm" -msgstr "" - -#: ../../purchase/purchases/rfq/create.rst:0 -msgid "International Commercial Terms are a series of predefined commercial terms used in international transactions." -msgstr "" - #: ../../purchase/purchases/rfq/create.rst:32 msgid "View *Request for Quotation* in our Online Demonstration" msgstr "" diff --git a/locale/sources/sales.pot b/locale/sources/sales.pot index 55ecd40ea..62ed14040 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: 2020-01-16 09:46+0100\n" +"POT-Creation-Date: 2020-02-11 14:56+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -121,128 +121,132 @@ msgid "This section lists all questions asked by Amazon in additional forms. The msgstr "" #: ../../sales/amazon_connector/apply.rst:57 -msgid "If you are *not* hosted on Odoo.com (*online*) or on Odoo.sh, you should adapt the answers related to hosting according to your own infrastructure and data protection policy." +msgid "If you are *not* hosted on Odoo, you should adapt the answers related to hosting according to your own infrastructure and data protection policy." msgstr "" #: ../../sales/amazon_connector/apply.rst:60 +msgid "If you *are* hosted on Odoo, take note that Amazon is the final decision maker concerning your application. While Odoo can help you provide additional details to your application, it is not guaranteed that Amazon will find them adequate." +msgstr "" + +#: ../../sales/amazon_connector/apply.rst:64 msgid "**Describe all functionalities in your application where Personally Identifiable Information (e.g. customer name, street address, billing address) is required.**" msgstr "" -#: ../../sales/amazon_connector/apply.rst:64 +#: ../../sales/amazon_connector/apply.rst:68 msgid "► If you did not apply for the *Merchant Fulfilled Shipping* function:" msgstr "" -#: ../../sales/amazon_connector/apply.rst:64 +#: ../../sales/amazon_connector/apply.rst:68 msgid "Generation of customer invoices." msgstr "" -#: ../../sales/amazon_connector/apply.rst:67 +#: ../../sales/amazon_connector/apply.rst:71 msgid "► If you applied for the *Merchant Fulfilled Shipping* function:" msgstr "" -#: ../../sales/amazon_connector/apply.rst:67 +#: ../../sales/amazon_connector/apply.rst:71 msgid "Generation of delivery orders and customer invoices." msgstr "" -#: ../../sales/amazon_connector/apply.rst:69 +#: ../../sales/amazon_connector/apply.rst:73 msgid "**List all outside parties with whom your organization shares Amazon Information (e.g. information exposed by Amazon through Amazon MWS, Seller Central, or Amazon's public-facing websites) and describe how your organization shares this information.**" msgstr "" -#: ../../sales/amazon_connector/apply.rst:73 +#: ../../sales/amazon_connector/apply.rst:77 msgid "We share Amazon Information with Odoo SA, our cloud service provider, for the exclusive purpose of hosting our enterprise management system (including the Amazon MWS integration). See also Odoo SA's Privacy Policy for details at https://www.odoo.com/privacy" msgstr "" -#: ../../sales/amazon_connector/apply.rst:79 +#: ../../sales/amazon_connector/apply.rst:83 msgid "► If you share Amazon Information with outside parties:" msgstr "" -#: ../../sales/amazon_connector/apply.rst:78 +#: ../../sales/amazon_connector/apply.rst:82 msgid "[Answer with the above text and add a description of your organization's policy regarding the sharing of Amazon Information with outside parties]" msgstr "" -#: ../../sales/amazon_connector/apply.rst:81 +#: ../../sales/amazon_connector/apply.rst:85 msgid "**List all non-Amazon MWS sources where you retrieve Amazon Information.**" msgstr "" -#: ../../sales/amazon_connector/apply.rst:83 +#: ../../sales/amazon_connector/apply.rst:87 msgid "Our enterprise software only relies on MWS to retrieve Amazon Information." msgstr "" -#: ../../sales/amazon_connector/apply.rst:85 +#: ../../sales/amazon_connector/apply.rst:89 msgid "**Describe how your organization restricts public access to databases, file servers, and desktop/developer endpoints.**" msgstr "" -#: ../../sales/amazon_connector/apply.rst:88 -#: ../../sales/amazon_connector/apply.rst:122 -#: ../../sales/amazon_connector/apply.rst:134 +#: ../../sales/amazon_connector/apply.rst:92 +#: ../../sales/amazon_connector/apply.rst:126 +#: ../../sales/amazon_connector/apply.rst:138 msgid "We rely on Odoo S.A., our cloud service provider for our database security management. Their Security Policy can be found at https://www.odoo.com/security" msgstr "" -#: ../../sales/amazon_connector/apply.rst:91 +#: ../../sales/amazon_connector/apply.rst:95 msgid "**Describe how your organization uniquely identifies employees and restricts access to Amazon Information on a need-to-know basis.**" msgstr "" -#: ../../sales/amazon_connector/apply.rst:102 +#: ../../sales/amazon_connector/apply.rst:106 msgid "► If all your employees are properly assigned separate users and given only relevant access rights:" msgstr "" -#: ../../sales/amazon_connector/apply.rst:95 +#: ../../sales/amazon_connector/apply.rst:99 msgid "Access rights are provided to employees based on their role within the company and are progressive, based on their responsibility." msgstr "" -#: ../../sales/amazon_connector/apply.rst:98 +#: ../../sales/amazon_connector/apply.rst:102 msgid "For instance, salespersons only have access to their own leads/quotes (and thus no access to quotes generated through the Amazon API). A salesmanager has access to all quotes/leads for reporting purposes (including quotes generated through the Amazon API). A quote will generate a delivery order which will be accessible to a 'normal' user of the Inventory application for him to be able to print the delivery label and pack the products." msgstr "" -#: ../../sales/amazon_connector/apply.rst:106 +#: ../../sales/amazon_connector/apply.rst:110 msgid "► If your employees share users or if they are given more rights than needed:" msgstr "" -#: ../../sales/amazon_connector/apply.rst:105 +#: ../../sales/amazon_connector/apply.rst:109 msgid "[Answer with a description of your organization's policy for the assignation of users and access rights to your employees]" msgstr "" -#: ../../sales/amazon_connector/apply.rst:108 +#: ../../sales/amazon_connector/apply.rst:112 msgid "**Describe how your organization prevents Amazon Information from being accessed from employee personal devices.**" msgstr "" -#: ../../sales/amazon_connector/apply.rst:111 +#: ../../sales/amazon_connector/apply.rst:115 msgid "Our enterprise software does not prevent employees from accessing the organization's data from personal devices. Role-based restrictions and access rights still apply." msgstr "" -#: ../../sales/amazon_connector/apply.rst:114 +#: ../../sales/amazon_connector/apply.rst:118 msgid "**Provide details on your organization's privacy and data handling policies (a link to your policy is also acceptable).**" msgstr "" -#: ../../sales/amazon_connector/apply.rst:117 +#: ../../sales/amazon_connector/apply.rst:121 msgid "[Answer with a description of your organization's privacy and data handling policies]" msgstr "" -#: ../../sales/amazon_connector/apply.rst:119 +#: ../../sales/amazon_connector/apply.rst:123 msgid "**Describe where your organization stores Amazon Information and provide details on how you encrypt this information (e.g., algorithm).**" msgstr "" -#: ../../sales/amazon_connector/apply.rst:125 +#: ../../sales/amazon_connector/apply.rst:129 msgid "**Describe how your organization backups or archives Amazon Information and provide details on how you encrypt this information (e.g., algorithm).**" msgstr "" -#: ../../sales/amazon_connector/apply.rst:128 +#: ../../sales/amazon_connector/apply.rst:132 msgid "We rely on Odoo S.A., our cloud service provider for our database backups management. Their Service Level Agreement can be found at https://www.odoo.com/cloud-sla" msgstr "" -#: ../../sales/amazon_connector/apply.rst:131 +#: ../../sales/amazon_connector/apply.rst:135 msgid "**Describe where your organization monitors and detects malicious activity in your application(s).**" msgstr "" -#: ../../sales/amazon_connector/apply.rst:137 +#: ../../sales/amazon_connector/apply.rst:141 msgid "**Describe how your organization's incident response plan addresses database hacks, unauthorized access, and data leaks (a link to your policy is also acceptable).**" msgstr "" -#: ../../sales/amazon_connector/apply.rst:140 +#: ../../sales/amazon_connector/apply.rst:144 msgid "Our cloud service provider, Odoo S.A., will notify the customer in case of a data breach." msgstr "" -#: ../../sales/amazon_connector/apply.rst:142 +#: ../../sales/amazon_connector/apply.rst:146 msgid "[Add a description of your organization's incident response plan or a link to your incident response policy.]" msgstr "" @@ -347,50 +351,50 @@ msgid "To register your seller account in Odoo, navigate to :menuselection:`Sale msgstr "" #: ../../sales/amazon_connector/setup.rst:11 -msgid "The **Seller ID** can be found in Seller Central under the link **Your Merchant Token** on the **Seller Account Information** page. The **Access Key** and the **Secret Key** can be found in Developer Central (where the Developer Registration and Assessment form was located)." +msgid "The **Seller ID** can be found in Seller Central under the link **Your Merchant Token** on the **Seller Account Information** page. The **Access Key** and the **Secret Key** can be found in Developer Central (where the :ref:`Developer Registration and Assessment form ` was located)." msgstr "" -#: ../../sales/amazon_connector/setup.rst:15 +#: ../../sales/amazon_connector/setup.rst:16 msgid "Once the account is registered, the marketplaces available to this account are synchronized and listed under the **Marketplaces** tab. If you wish, you can remove some items from the list of synchronized marketplaces to disable their synchronization." msgstr "" -#: ../../sales/amazon_connector/setup.rst:20 +#: ../../sales/amazon_connector/setup.rst:21 msgid "Match database products in Amazon" msgstr "" -#: ../../sales/amazon_connector/setup.rst:22 +#: ../../sales/amazon_connector/setup.rst:23 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 "" -#: ../../sales/amazon_connector/setup.rst:28 +#: ../../sales/amazon_connector/setup.rst:29 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 "" -#: ../../sales/amazon_connector/setup.rst:32 +#: ../../sales/amazon_connector/setup.rst:33 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 "" -#: ../../sales/amazon_connector/setup.rst:38 +#: ../../sales/amazon_connector/setup.rst:39 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 "" -#: ../../sales/amazon_connector/setup.rst:43 +#: ../../sales/amazon_connector/setup.rst:44 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 "" -#: ../../sales/amazon_connector/setup.rst:48 +#: ../../sales/amazon_connector/setup.rst:49 msgid "To modify the default products, activate the **Developer mode** and navigate to :menuselection:`Sales --> Configuration --> Settings --> Connectors --> Amazon Sync --> Default Products`." msgstr "" -#: ../../sales/amazon_connector/setup.rst:53 +#: ../../sales/amazon_connector/setup.rst:54 msgid "Configure taxes of products" msgstr "" -#: ../../sales/amazon_connector/setup.rst:55 +#: ../../sales/amazon_connector/setup.rst:56 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 "" -#: ../../sales/amazon_connector/setup.rst:61 +#: ../../sales/amazon_connector/setup.rst:62 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 "" @@ -1240,7 +1244,7 @@ msgid "Product Template: Polos" msgstr "" #: ../../sales/products_prices/products/variants.rst:114 -#: ../../sales/send_quotations/quote_template.rst:10 +#: ../../sales/send_quotations/quote_template.rst:9 msgid "Configuration" msgstr "" @@ -1365,11 +1369,11 @@ msgid "Send Quotations" msgstr "" #: ../../sales/send_quotations/deadline.rst:3 -msgid "Stimulate customers with quotations deadline" +msgid "Use quotations deadline to stimulate your customers" msgstr "" #: ../../sales/send_quotations/deadline.rst:5 -msgid "As you send quotations, it is important to set a quotation deadline, both to entice your customer into action with the fear of missing out on an offer and to protect yourself. You don't want to have to fulfill an order at a price that is no longer cost effective for you." +msgid "When sending quotations, it is important to set a deadline to encourage your customers to act. Indeed, this will stimulate them because they will be afraid of missing a good deal and it will also allow you to protect yourself in case you have to fulfill an order at a price that is no longer profitable for you." msgstr "" #: ../../sales/send_quotations/deadline.rst:11 @@ -1377,19 +1381,26 @@ msgid "Set a deadline" msgstr "" #: ../../sales/send_quotations/deadline.rst:13 -msgid "On every quotation or sales order you can add an *Expiration Date*." +msgid "With Odoo Sales, it is possible to instantly add an **Expiration Date** from the quotation or the sales order." msgstr "" -#: ../../sales/send_quotations/deadline.rst:19 -msgid "Use deadline in templates" +#: ../../sales/send_quotations/deadline.rst:22 +msgid "Use deadline in your quotation templates" msgstr "" -#: ../../sales/send_quotations/deadline.rst:21 -msgid "You can also set a default deadline in a *Quotation Template*. Each time that template is used in a quotation, that deadline is applied. See :doc:`quote_template` for more information about quotation templates." +#: ../../sales/send_quotations/deadline.rst:24 +msgid "It is also possible to add a deadline to every quotation template created. Whenever a specific quotation template is used in a quote, its associated deadline will be automatically applied. Be sure to check out our documentation about :doc:`quote_template` to excel in their use." msgstr "" -#: ../../sales/send_quotations/deadline.rst:28 -msgid "On your customer side, they will see this:" +#: ../../sales/send_quotations/deadline.rst:34 +msgid "By clicking on the **Customer Preview** button, you will be able to see when the offer expires. For your information, the number of days will be the same as those mentioned in the quotation template." +msgstr "" + +#: ../../sales/send_quotations/deadline.rst:44 +#: ../../sales/send_quotations/get_paid_to_validate.rst:50 +#: ../../sales/send_quotations/get_signature_to_validate.rst:51 +#: ../../sales/send_quotations/optional_products.rst:65 +msgid ":doc:`quote_template`" msgstr "" #: ../../sales/send_quotations/different_addresses.rst:3 @@ -1397,39 +1408,47 @@ msgid "Deliver and invoice to different addresses" msgstr "" #: ../../sales/send_quotations/different_addresses.rst:5 -msgid "In Odoo you can configure different addresses for delivery and invoicing. This is key, not everyone will have the same delivery location as their invoice location." +msgid "With Odoo Sales, you can configure different addresses for delivery and invoicing. For some customers, it will be very practical to define specific billing and shipping addresses. Indeed, not everyone will have the same delivery location as the invoicing location." msgstr "" #: ../../sales/send_quotations/different_addresses.rst:12 -msgid "Go to :menuselection:`SALES --> Configuration --> Settings` and activate the *Customer Addresses* feature." -msgstr "" - -#: ../../sales/send_quotations/different_addresses.rst:19 -msgid "Add different addresses to a quotation or sales order" +msgid "Go to :menuselection:`Sales --> Configuration --> Settings` and activate the **Customer Addresses** feature." msgstr "" #: ../../sales/send_quotations/different_addresses.rst:21 -msgid "If you select a customer with an invoice and delivery address set, Odoo will automatically use those. If there's only one, Odoo will use that one for both but you can, of course, change it instantly and create a new one right from the quotation or sales order." +msgid "Add addresses from a quotation" msgstr "" -#: ../../sales/send_quotations/different_addresses.rst:30 -msgid "Add invoice & delivery addresses to a customer" +#: ../../sales/send_quotations/different_addresses.rst:23 +msgid "When you create a quotation, you must add a customer. This customer can be a company or a person with specific billing and shipping addresses already defined and registered in the system, or it can be a new customer. In this case, you have to **Create and edit** the contact form for your new customer and link it, if necessary, to a company. In this contact form, you will be able to add, delete and modify invoice and delivery addresses." msgstr "" -#: ../../sales/send_quotations/different_addresses.rst:32 -msgid "If you want to add them to a customer before a quotation or sales order, they are added to the customer form. Go to any customers form under :menuselection:`SALES --> Orders --> Customers`." +#: ../../sales/send_quotations/different_addresses.rst:35 +msgid "If you select a customer with defined invoice and delivery addresses, Odoo will automatically use them to fill in the fields. Now, if you want to change it instantly, it is possible to do so directly from the quotation or the sales order." msgstr "" -#: ../../sales/send_quotations/different_addresses.rst:36 -msgid "From there you can add new addresses to the customer." +#: ../../sales/send_quotations/different_addresses.rst:40 +msgid "Add addresses from a contact form" msgstr "" #: ../../sales/send_quotations/different_addresses.rst:42 -msgid "Various addresses on the quotation / sales orders" +msgid "Previously, we talked about the contact form that you can fill in directly from a quotation or a sales order to add billing and shipping addresses to customers. But, if you go to :menuselection:`Sales --> Orders --> Customers`, you can create or modify every customer you want and add, delete or modify invoice and delivery addresses instantly there, before creating a quotation." msgstr "" -#: ../../sales/send_quotations/different_addresses.rst:44 -msgid "These two addresses will then be used on the quotation or sales order you send by email or print." +#: ../../sales/send_quotations/different_addresses.rst:54 +msgid "Deal with different addresses" +msgstr "" + +#: ../../sales/send_quotations/different_addresses.rst:56 +msgid "Like for the previous example, go to :menuselection:`Sales --> Orders --> Customers` and create a new customer. There, you can add company information but, more importantly, you can enter billing and shipping addresses under the **Contacts & Addresses** tab." +msgstr "" + +#: ../../sales/send_quotations/different_addresses.rst:65 +msgid "Once done, you can return to your Sales dashboard and create a new quotation. Now, if you enter your new customer, you will see that the other fields will fill in by themself with the information previously saved for billing and shipping addresses." +msgstr "" + +#: ../../sales/send_quotations/different_addresses.rst:74 +msgid "With Odoo Sales, it is now very convenient to play with various addresses in terms of invoice and delivery features." msgstr "" #: ../../sales/send_quotations/get_paid_to_validate.rst:3 @@ -1437,36 +1456,47 @@ msgid "Get paid to confirm an order" msgstr "" #: ../../sales/send_quotations/get_paid_to_validate.rst:5 -msgid "You can use online payments to get orders automatically confirmed. Saving the time of both your customers and yourself." +msgid "In general, online payments are considered as a fast and secure alternative to traditional payment methods. It is generally cheaper, easier and faster than other payment methods. It is particularly useful and efficient for international transactions. With Odoo Sales, you can use online payments to get automatic orders confirmation. Online payments are made instantly, so it's very convenient and saves lots of time in a basic sales process." msgstr "" -#: ../../sales/send_quotations/get_paid_to_validate.rst:9 -msgid "Activate online payment" +#: ../../sales/send_quotations/get_paid_to_validate.rst:12 +msgid "Enable online payment" msgstr "" -#: ../../sales/send_quotations/get_paid_to_validate.rst:11 -#: ../../sales/send_quotations/get_signature_to_validate.rst:12 -msgid "Go to :menuselection:`SALES --> Configuration --> Settings` and activate the *Online Signature & Payment* feature." +#: ../../sales/send_quotations/get_paid_to_validate.rst:14 +msgid "Go to :menuselection:`Sales --> Configuration --> Settings` and activate the **Online Payment** feature." msgstr "" -#: ../../sales/send_quotations/get_paid_to_validate.rst:17 -msgid "Once in the *Payment Acquirers* menu you can select and configure your acquirers of choice." +#: ../../sales/send_quotations/get_paid_to_validate.rst:22 +msgid "There, you will have direct access to the **Payment Acquirers** page. It will allow you to select and configure your acquirers of choice. Before creating or modifying a payment acquirer, be sure to check out our documentation about how to be paid with payment acquirers such as :doc:`../../ecommerce/shopper_experience/paypal`, :doc:`../../ecommerce/shopper_experience/authorize`, and others in the :doc:`../../ecommerce` documentation." msgstr "" -#: ../../sales/send_quotations/get_paid_to_validate.rst:20 -msgid "You can find various documentation about how to be paid with payment acquirers such as `Paypal <../../ecommerce/shopper_experience/paypal>`_, `Authorize.Net (pay by credit card) <../../ecommerce/shopper_experience/authorize>`_, and others under the `eCommerce documentation <../../ecommerce>`_." +#: ../../sales/send_quotations/get_paid_to_validate.rst:30 +msgid "If you are familiar with this documentation: :doc:`quote_template`; you can activate or not the **Online Payment** feature for each template you use, under their confirmation tab." msgstr "" -#: ../../sales/send_quotations/get_paid_to_validate.rst:31 -msgid "If you are using `quotation templates <../quote_template>`_, you can also pick a default setting for each template." -msgstr "" - -#: ../../sales/send_quotations/get_paid_to_validate.rst:36 +#: ../../sales/send_quotations/get_paid_to_validate.rst:35 msgid "Register a payment" msgstr "" -#: ../../sales/send_quotations/get_paid_to_validate.rst:38 -msgid "From the quotation email you sent, your customer will be able to pay online." +#: ../../sales/send_quotations/get_paid_to_validate.rst:37 +msgid "After opening quotations from their received email, your customers will have different possibilities to make their online payments. For example:" +msgstr "" + +#: ../../sales/send_quotations/get_paid_to_validate.rst:46 +msgid "By clicking on the **Customer Preview** button, you will be able to see what your customers will have to choose when it comes to payment." +msgstr "" + +#: ../../sales/send_quotations/get_paid_to_validate.rst:51 +msgid ":doc:`../../ecommerce`" +msgstr "" + +#: ../../sales/send_quotations/get_paid_to_validate.rst:52 +msgid ":doc:`../../ecommerce/shopper_experience/paypal`" +msgstr "" + +#: ../../sales/send_quotations/get_paid_to_validate.rst:53 +msgid ":doc:`../../ecommerce/shopper_experience/authorize`" msgstr "" #: ../../sales/send_quotations/get_signature_to_validate.rst:3 @@ -1474,71 +1504,79 @@ msgid "Get a signature to confirm an order" msgstr "" #: ../../sales/send_quotations/get_signature_to_validate.rst:5 -msgid "You can use online signature to get orders automatically confirmed. Both you and your customer will save time by using this feature compared to a traditional process." +msgid "Online signatures are like electronic \"fingerprints\". By using them on Odoo, you will get automatic orders confirmation. You and your customers will save a lot of time by using this feature compared to a traditional process." msgstr "" #: ../../sales/send_quotations/get_signature_to_validate.rst:10 msgid "Activate online signature" msgstr "" -#: ../../sales/send_quotations/get_signature_to_validate.rst:19 -msgid "If you are using :doc:`quotation templates `, you can also pick a default setting for each template." +#: ../../sales/send_quotations/get_signature_to_validate.rst:12 +msgid "Go to :menuselection:`Sales --> Configuration --> Settings` and activate the **Online Signature** feature." msgstr "" -#: ../../sales/send_quotations/get_signature_to_validate.rst:23 -msgid "Validate an order with a signature" +#: ../../sales/send_quotations/get_signature_to_validate.rst:21 +msgid "If you are familiar with this documentation: :doc:`quote_template`, you can activate or not the **Online Signature** feature for each quotation template you use, under their confirmation tab. Example:" msgstr "" -#: ../../sales/send_quotations/get_signature_to_validate.rst:25 -msgid "When you sent a quotation to your client, they can accept it and sign online instantly." +#: ../../sales/send_quotations/get_signature_to_validate.rst:31 +msgid "Confirm an order with a signature" msgstr "" -#: ../../sales/send_quotations/get_signature_to_validate.rst:30 -msgid "Once signed the quotation will be confirmed and delivery will start." +#: ../../sales/send_quotations/get_signature_to_validate.rst:33 +msgid "When you send quotations to clients, they can instantly accept and sign it online. When they click on **Sign & Pay**, they have the choice to draw their own signature, automatically fill in the field with an automated signature or load a file from their computer. Here below, it is an example of an automated signature:" msgstr "" -#: ../../sales/send_quotations/optional_items.rst:3 -msgid "Increase your sales with suggested products" +#: ../../sales/send_quotations/get_signature_to_validate.rst:43 +msgid "Once signed, you will have the possibility to choose your payment methods. Then, when the quotation will be paid and confirmed, a delivery order will be created automatically by Odoo." msgstr "" -#: ../../sales/send_quotations/optional_items.rst:5 -msgid "The use of suggested products is an attempt to offer related and useful products to your client. For instance, a client purchasing a cellphone could be shown accessories like a protective case, a screen cover, and headset." +#: ../../sales/send_quotations/get_signature_to_validate.rst:47 +msgid "Be careful that delivery orders are only generated for storable products and if the **Inventory app** is already installed." msgstr "" -#: ../../sales/send_quotations/optional_items.rst:11 -msgid "Add suggested products to your quotation templates" +#: ../../sales/send_quotations/optional_products.rst:3 +msgid "Add optional products" msgstr "" -#: ../../sales/send_quotations/optional_items.rst:13 -msgid "Suggested products can be set on *Quotation Templates*. See :doc:`quote_template`." +#: ../../sales/send_quotations/optional_products.rst:5 +msgid "The use of optional products is a marketing strategy for cross-selling products along with a core product. The aim is to offer useful and related products to your customers. For instance, if a customer wants to buy a car, he has the choice to order an automatic opening trunk and massaging seats, or not to order such high-quality products and simply buy his car." msgstr "" -#: ../../sales/send_quotations/optional_items.rst:15 -msgid "Once on a template, you can see a *Suggested Products* tab where you can add related products or services." +#: ../../sales/send_quotations/optional_products.rst:11 +msgid "Add optional products to your quotations" msgstr "" -#: ../../sales/send_quotations/optional_items.rst:21 -msgid "You can also add or modify suggested products on the quotation." +#: ../../sales/send_quotations/optional_products.rst:13 +msgid "With Odoo Sales, it is possible to add or modify optional products directly on quotations (under the **Optional Products** tab, as you can see below)." msgstr "" -#: ../../sales/send_quotations/optional_items.rst:24 -msgid "Add suggested products to the quotation" +#: ../../sales/send_quotations/optional_products.rst:22 +msgid "By clicking on the **Customer Preview** button, you will be able to see what your customers will have as possibilities after opening a quotation from their received email." msgstr "" -#: ../../sales/send_quotations/optional_items.rst:26 -msgid "When opening the quotation from the received email, the customer can add the suggested products to the order." +#: ../../sales/send_quotations/optional_products.rst:30 +msgid "In practice, your customers will be able to add different optional products to their order by using associated carts, with a user-friendly layout. More than that, if a customer selects all the optional products suggested, these additional items will automatically fill in the quotation managed by the salesman." msgstr "" -#: ../../sales/send_quotations/optional_items.rst:35 -msgid "The product(s) will be instantly added to their quotation when clicking on any of the little carts." +#: ../../sales/send_quotations/optional_products.rst:40 +msgid "Like this, salespeople will see each movement made by the customer and tracking the order will be all the better." msgstr "" -#: ../../sales/send_quotations/optional_items.rst:41 -msgid "Depending on your confirmation process, they can either digitally sign or pay to confirm the quotation." +#: ../../sales/send_quotations/optional_products.rst:49 +msgid "Add optional products to your quotation templates" msgstr "" -#: ../../sales/send_quotations/optional_items.rst:44 -msgid "Each move done by the customer to the quotation will be tracked in the sales order, letting the salesperson see it." +#: ../../sales/send_quotations/optional_products.rst:51 +msgid "Be sure to check out our documentation about :doc:`quote_template` to understand how you can enable, create, design and manage your own quotation templates before reading this part." +msgstr "" + +#: ../../sales/send_quotations/optional_products.rst:54 +msgid "For quotation templates, you also have an **Optional Products** tab where you can add related products or services." +msgstr "" + +#: ../../sales/send_quotations/optional_products.rst:62 +msgid "With Odoo Sales, it is now very easy to understand your customer's needs." msgstr "" #: ../../sales/send_quotations/quote_template.rst:3 @@ -1546,86 +1584,74 @@ msgid "Use quotation templates" msgstr "" #: ../../sales/send_quotations/quote_template.rst:5 -msgid "If you often sell the same products or services, you can save a lot of time by creating custom quotation templates. By using a template you can send a complete quotation in no time." +msgid "By creating custom quotation templates, you will save a lot of time. Indeed, with the use of templates, you will be able to send complete quotations at a fast pace." msgstr "" -#: ../../sales/send_quotations/quote_template.rst:12 -msgid "For this feature to work, go to :menuselection:`Sales --> Configuration --> Settings` and activate *Quotations Templates*." +#: ../../sales/send_quotations/quote_template.rst:11 +msgid "To enable this feature, go to :menuselection:`Sales --> Configuration --> Settings` and activate **Quotation Templates**." msgstr "" #: ../../sales/send_quotations/quote_template.rst:19 +msgid "For even more convenience, it is also recommended to add the **Quotation Builder** feature which will help you design your quotation templates very easily. This option will automatically install the Odoo Website App." +msgstr "" + +#: ../../sales/send_quotations/quote_template.rst:29 msgid "Create your first template" msgstr "" -#: ../../sales/send_quotations/quote_template.rst:21 -msgid "You will find the templates menu under :menuselection:`Sales --> Configuration`." -msgstr "" - -#: ../../sales/send_quotations/quote_template.rst:24 -msgid "You can then create or edit an existing one. Once named, you will be able to select the product(s) and their quantity as well as the expiration time for the quotation." -msgstr "" - #: ../../sales/send_quotations/quote_template.rst:31 -msgid "On each template, you can also specify discounts if the option is activated in the *Sales* settings. The base price is set in the product configuration and can be changed by customer pricelists." +msgid "Quotation templates are under :menuselection:`Sales --> Configuration`." msgstr "" -#: ../../sales/send_quotations/quote_template.rst:36 -msgid ":doc:`../products_prices/prices/pricing`" +#: ../../sales/send_quotations/quote_template.rst:33 +msgid "You can create a new template or edit an existing one. Once named, you will be able to select products and quantities as well as the expiration time of the quotation." msgstr "" -#: ../../sales/send_quotations/quote_template.rst:39 -msgid "Edit your template" +#: ../../sales/send_quotations/quote_template.rst:42 +msgid "On each template, you can also specify discounts if the option is activated in the **Sales** settings." msgstr "" -#: ../../sales/send_quotations/quote_template.rst:41 -msgid "You can edit the customer interface of the template that they see to accept or pay the quotation. This lets you describe your company, services and products. When you click on *Edit Template* you will be brought to the quotation editor." +#: ../../sales/send_quotations/quote_template.rst:46 +msgid "Design your template" msgstr "" -#: ../../sales/send_quotations/quote_template.rst:52 -msgid "This lets you edit the description content thanks to drag & drop of building blocks. To describe your products add a content block in the zone dedicated to each product." +#: ../../sales/send_quotations/quote_template.rst:48 +msgid "You will have the possibility to design your template and edit the customer interface in order to manage what clients will see before accepting and paying the quotation. For example, you will be able to describe your company, your services and your products. To do so, you can click on **Edit** and you will be brought to the quotation builder." msgstr "" -#: ../../sales/send_quotations/quote_template.rst:60 -msgid "The description set for the products will be used in all quotations templates containing those products." +#: ../../sales/send_quotations/quote_template.rst:58 +msgid "You can easily edit the content of your template by dragging & dropping different building blocks to organize your quotation. For example, you can add a content block to describe your products." msgstr "" -#: ../../sales/send_quotations/quote_template.rst:64 +#: ../../sales/send_quotations/quote_template.rst:67 msgid "Use a quotation template" msgstr "" -#: ../../sales/send_quotations/quote_template.rst:66 -msgid "When creating a quotation, you can select a template." +#: ../../sales/send_quotations/quote_template.rst:69 +msgid "When creating a quotation, you can choose a specific template." msgstr "" -#: ../../sales/send_quotations/quote_template.rst:71 -msgid "Each product in that template will be added to your quotation." +#: ../../sales/send_quotations/quote_template.rst:77 +msgid "You can select any template of your choice and suggest it as the default template in the **Sales** settings." msgstr "" -#: ../../sales/send_quotations/quote_template.rst:74 -msgid "You can select a template to be suggested by default in the *Sales* settings." -msgstr "" - -#: ../../sales/send_quotations/quote_template.rst:78 +#: ../../sales/send_quotations/quote_template.rst:81 msgid "Confirm the quotation" msgstr "" -#: ../../sales/send_quotations/quote_template.rst:80 -msgid "Templates also ease the confirmation process for customers with a digital signature or online payment. You can select that in the template itself." +#: ../../sales/send_quotations/quote_template.rst:83 +msgid "Templates facilitate the confirmation process by allowing customers to sign electronically or to pay online. You can activate these two options directly in the quotation template itself." msgstr "" -#: ../../sales/send_quotations/quote_template.rst:87 -msgid "Every quotation will now have this setting added to it." +#: ../../sales/send_quotations/quote_template.rst:92 +msgid "Every quotation will now have this setting. Of course you can always change it and make it specific for each quotation." msgstr "" -#: ../../sales/send_quotations/quote_template.rst:89 -msgid "Of course you can still change it and make it specific for each quotation." -msgstr "" - -#: ../../sales/send_quotations/quote_template.rst:93 +#: ../../sales/send_quotations/quote_template.rst:96 msgid ":doc:`get_signature_to_validate`" msgstr "" -#: ../../sales/send_quotations/quote_template.rst:94 +#: ../../sales/send_quotations/quote_template.rst:97 msgid ":doc:`get_paid_to_validate`" msgstr "" diff --git a/locale/sources/website.pot b/locale/sources/website.pot index c4c5f602e..90bb69e60 100644 --- a/locale/sources/website.pot +++ b/locale/sources/website.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: Odoo 13.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-01-16 09:46+0100\n" +"POT-Creation-Date: 2020-02-11 14:56+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -976,15 +976,35 @@ msgstr "" msgid "If you already use CloudFlare or a similar service, you can keep using it or simply change for Odoo. The choice is yours." msgstr "" -#: ../../website/publish/domain_name.rst:98 +#: ../../website/publish/domain_name.rst:99 +msgid "How to make sure that all my URLs use my custom domain?" +msgstr "" + +#: ../../website/publish/domain_name.rst:101 +msgid "To set up the root URL of your website and of all the links sent in emails, you can ask an administrator of your database (any user in the *Settings* group) to perform a login from the login screen. It's as simple as that!" +msgstr "" + +#: ../../website/publish/domain_name.rst:103 +msgid "If you want to do it manually, you can go to :menuselection:`Settings --> Technical --> System Parameters` . Find the entry called ``web.base.url`` (you can create it if it does not exist) and enter the full URL of your website, like ``https://www.myodoowebsite.com``." +msgstr "" + +#: ../../website/publish/domain_name.rst:107 +msgid "The URL must include the protocol (``https://`` or ``http://``) and must not end by a slash (``/``)." +msgstr "" + +#: ../../website/publish/domain_name.rst:109 +msgid "If you want to block the root URL update when an administrator logs in, you can add a System Parameter called ``web.base.url.freeze`` with its value set to ``True``." +msgstr "" + +#: ../../website/publish/domain_name.rst:113 msgid "My website is indexed twice by Google" msgstr "" -#: ../../website/publish/domain_name.rst:100 +#: ../../website/publish/domain_name.rst:115 msgid "If you set up a custom domain *mydomain.com* name for *mydatabase.odoo.com*, Google indexes your website under both names. This is a limitation of the Odoo cloud platforms/" msgstr "" -#: ../../website/publish/domain_name.rst:105 +#: ../../website/publish/domain_name.rst:120 msgid ":doc:`../../discuss/email_servers`" msgstr ""