From 812d290c0729ac4b9f57e11308c3abbbaa343a15 Mon Sep 17 00:00:00 2001 From: Martin Trigaux Date: Mon, 16 Sep 2019 15:50:50 +0200 Subject: [PATCH] [I18N] *: export 12.0 source terms --- locale/sources/accounting.pot | 1179 ++++++++++++++------ locale/sources/crm.pot | 16 +- locale/sources/db_management.pot | 252 +++-- locale/sources/discuss.pot | 60 +- locale/sources/ecommerce.pot | 190 ++-- locale/sources/general.pot | 105 +- locale/sources/getting_started.pot | 70 +- locale/sources/inventory.pot | 179 +-- locale/sources/iot.pot | 56 +- locale/sources/livechat.pot | 10 +- locale/sources/mobile.pot | 74 +- locale/sources/point_of_sale.pot | 386 +++---- locale/sources/project.pot | 8 +- locale/sources/purchase.pot | 206 +--- locale/sources/sales.pot | 8 +- locale/sources/website.pot | 1634 +++++++++++++++++----------- 16 files changed, 2659 insertions(+), 1774 deletions(-) diff --git a/locale/sources/accounting.pot b/locale/sources/accounting.pot index 6e7effa67..1146f83bf 100644 --- a/locale/sources/accounting.pot +++ b/locale/sources/accounting.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: Odoo 12.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-11-07 15:38+0100\n" +"POT-Creation-Date: 2019-09-16 15:50+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -17,7 +17,7 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" #: ../../accounting.rst:5 -#: ../../accounting/localizations/mexico.rst:283 +#: ../../accounting/localizations/mexico.rst:312 msgid "Accounting" msgstr "" @@ -54,13 +54,13 @@ msgstr "" #: ../../accounting/bank/feeds/synchronize.rst:26 #: ../../accounting/bank/misc/batch.rst:21 #: ../../accounting/bank/misc/interbank.rst:14 -#: ../../accounting/bank/reconciliation/use_cases.rst:20 +#: ../../accounting/bank/reconciliation/use_cases.rst:16 #: ../../accounting/bank/setup/foreign_currency.rst:22 #: ../../accounting/bank/setup/manage_cash_register.rst:9 #: ../../accounting/localizations/colombia.rst:25 #: ../../accounting/localizations/mexico.rst:33 #: ../../accounting/others/adviser/assets.rst:24 -#: ../../accounting/others/adviser/budget.rst:18 +#: ../../accounting/others/adviser/budget.rst:21 #: ../../accounting/others/analytic/purchases_expenses.rst:18 #: ../../accounting/others/analytic/timesheets.rst:16 #: ../../accounting/others/configuration.rst:3 @@ -250,7 +250,7 @@ msgid ":doc:`../reconciliation/use_cases`" msgstr "" #: ../../accounting/bank/feeds/manual.rst:100 -#: ../../accounting/bank/reconciliation/use_cases.rst:115 +#: ../../accounting/bank/reconciliation/use_cases.rst:111 msgid ":doc:`../feeds/synchronize`" msgstr "" @@ -466,7 +466,7 @@ msgid "Once you filled in your credentials, your bank feeds will be synchronized msgstr "" #: ../../accounting/bank/feeds/synchronize.rst:73 -#: ../../accounting/localizations/mexico.rst:533 +#: ../../accounting/localizations/mexico.rst:562 msgid "FAQ" msgstr "" @@ -483,11 +483,11 @@ msgid "You can however force this synchronization by clicking on the button \"Sy 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 that the status changes." +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 statement in the database." +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 @@ -511,7 +511,7 @@ 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 except being patient." +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 @@ -519,7 +519,7 @@ msgid "All my past transactions are not in Odoo, why?" msgstr "" #: ../../accounting/bank/feeds/synchronize.rst:112 -msgid "Yodlee only allows to fetch up transactions to 3 months in the past." +msgid "Yodlee only allows to fetch transactions up to 3 months in the past." msgstr "" #: ../../accounting/bank/misc.rst:3 @@ -593,7 +593,7 @@ msgid "Receive customer checks" msgstr "" #: ../../accounting/bank/misc/batch.rst:69 -msgid "Once your record checks received, record them on the bank account on which you plan to deposit them. Once you select the bank account (or check journal is you configured Odoo that way), Odoo proposes you to use a batch deposit. Select this option if you plan to deposit the check to your bank." +msgid "Once your checks are received, record them on the bank account on which you plan to deposit them. Once you select the bank account (or check journal if you configured Odoo that way), Odoo proposes you to use a batch deposit. Select this option if you plan to deposit the check to your bank." msgstr "" #: ../../accounting/bank/misc/batch.rst:78 @@ -613,7 +613,7 @@ msgid "From the Accounting application, go to the menu :menuselection:`Sales --> msgstr "" #: ../../accounting/bank/misc/batch.rst:94 -msgid "Select the bank, then select the payments (checks) you want to add in this deposit. By default, Odoo proposes you all the checks that have not been deposit yet. That way, you can verify that you do not forget or lost a check." +msgid "Select the bank, then select the payments (checks) you want to add in this deposit. By default, Odoo proposes you all the checks that have not been deposited yet. That way you can verify that you do not forget or lost a check." msgstr "" #: ../../accounting/bank/misc/batch.rst:102 @@ -629,7 +629,7 @@ msgid "When you process the bank statement reconciliation you will see the depos msgstr "" #: ../../accounting/bank/misc/batch.rst:116 -msgid "If you select a batch deposit, Odoo will automatically fills all the checks contained in this deposit for the matching. (2 checks were in this batch deposit the example below)" +msgid "If you select a batch deposit, Odoo will automatically fill all the checks contained in this deposit for the matching. (2 checks were in the batch deposit in the example below)" msgstr "" #: ../../accounting/bank/misc/batch.rst:124 @@ -646,7 +646,7 @@ msgid "If you don't have a batch deposit link in your bank statement, there coul msgstr "" #: ../../accounting/bank/misc/batch.rst:132 -msgid "After having installed the batch deposit features, you need to reload the page so that the browser is aware of this new feature. Just click the reload button of your browser." +msgid "After having installed the batch deposit features you need to reload the page so that the browser is aware of this new feature. Just click the reload button of your browser." msgstr "" #: ../../accounting/bank/misc/batch.rst:136 @@ -662,7 +662,7 @@ msgid "If you have a smaller amount in your bank statement than the actual amoun msgstr "" #: ../../accounting/bank/misc/batch.rst:145 -msgid "In this case, click on the line related to this check to remove it from the bank statement matching." +msgid "In this case click on the line related to this check to remove it from the bank statement matching." msgstr "" #: ../../accounting/bank/misc/interbank.rst:3 @@ -682,7 +682,7 @@ msgid "Check your Chart of Accounts and default transfer account" msgstr "" #: ../../accounting/bank/misc/interbank.rst:19 -msgid "To handle internal transfers you need a transfer account in your charts of account. Odoo will generate an account automatically based on the country of your chart of account. To parameter your chart of account and check the default transfer account go into your the accounting module, select :menuselection:`Configuration --> Settings`." +msgid "To handle internal transfers you need a transfer account in your charts of account. Odoo will generate an account automatically based on the country of your chart of account. To configure your chart of accounts and check the default transfer account go into the accounting module settings, select :menuselection:`Configuration --> Settings`." msgstr "" #: ../../accounting/bank/misc/interbank.rst:25 @@ -718,7 +718,7 @@ msgid "Log an internal transfer" msgstr "" #: ../../accounting/bank/misc/interbank.rst:64 -msgid "The first step is to register the internal paiement. To do so, go into your accounting dashboard. click on the **more** button of one of your banks and select :menuselection:`New --> Internal transfer`." +msgid "The first step is to register the internal payment. To do so go into your accounting dashboard, click on the **more** button of one of your banks and select :menuselection:`New --> Internal transfer`." msgstr "" #: ../../accounting/bank/misc/interbank.rst:71 @@ -746,7 +746,7 @@ msgid "Note that the bank balance computed by Odoo is different that the last st msgstr "" #: ../../accounting/bank/misc/interbank.rst:98 -msgid "That is because we did not import the bank statement confirming the departure and arrival of the money. It's thus necessary to import your bank statement and reconcile the payment with the correct bank statement line. Once you receive your bank statements click the **new statement** button of the corresponding bank to import them." +msgid "That is because we did not import the bank statement confirming the receiving and sending of the money. It's thus necessary to import your bank statement and reconcile the payment with the correct bank statement line. Once you receive your bank statements click the **new statement** button of the corresponding bank to import them." msgstr "" #: ../../accounting/bank/misc/interbank.rst:107 @@ -758,11 +758,11 @@ msgid "The following window will open:" msgstr "" #: ../../accounting/bank/misc/interbank.rst:120 -msgid "You need to choose counterparts for the paiement. Select the correct bank statement line corresponding to the paiement and click on the **reconcile** button. Close the statement to finish the transaction" +msgid "You need to choose counterparts for the payment. Select the correct bank statement line corresponding to the payment and click on the **reconcile** button. Close the statement to finish the transaction" msgstr "" #: ../../accounting/bank/misc/interbank.rst:127 -msgid "The same steps will need to be repeated once you receive your second bank statement. Note that if you specify the correct amount, and the same memo in both bank statement and payment transaction then the reconciliation will happen automatically." +msgid "The same steps will need to be repeated once you receive your second bank statement. Note that if you specify the same amount and the same memo in both bank statements and payment transactions then the reconciliation will happen automatically." msgstr "" #: ../../accounting/bank/reconciliation.rst:3 @@ -828,12 +828,12 @@ msgid "Finally, click on **Reconcile** to finish the process." msgstr "" #: ../../accounting/bank/reconciliation/configure.rst:65 -#: ../../accounting/bank/reconciliation/use_cases.rst:116 +#: ../../accounting/bank/reconciliation/use_cases.rst:112 msgid ":doc:`../feeds/manual`" msgstr "" #: ../../accounting/bank/reconciliation/configure.rst:66 -#: ../../accounting/bank/reconciliation/use_cases.rst:114 +#: ../../accounting/bank/reconciliation/use_cases.rst:110 msgid ":doc:`../feeds/ofx`" msgstr "" @@ -846,94 +846,94 @@ msgid "Use cases in the bank reconciliation process?" msgstr "" #: ../../accounting/bank/reconciliation/use_cases.rst:8 -msgid "Linking your bank statements with your accounting can be a lot of work. You need to find invoices back, relate payments and that amount of administration can cast a lot of time. Luckily, with Odoo you can very easily link your invoices or any other payment with your bank statements." +msgid "Matching your bank statements with your accounting records can be a tedious task. You need to find the corresponding invoices, compare the amounts and partners' details with those in the bank statement. These steps can take a lot of time. Luckily, with Odoo you can very easily match your invoices or any other payment document with your bank statements." msgstr "" -#: ../../accounting/bank/reconciliation/use_cases.rst:14 -msgid "Two reconciliation processes exist in Odoo." +#: ../../accounting/bank/reconciliation/use_cases.rst:10 +msgid "Two options of the reconciliation process exist in Odoo." msgstr "" -#: ../../accounting/bank/reconciliation/use_cases.rst:16 -msgid "We can directly register a payment on the invoices" +#: ../../accounting/bank/reconciliation/use_cases.rst:12 +msgid "We can directly specify the payment on the invoice" msgstr "" -#: ../../accounting/bank/reconciliation/use_cases.rst:17 +#: ../../accounting/bank/reconciliation/use_cases.rst:13 msgid "We can reconcile open invoices with bank statements" msgstr "" -#: ../../accounting/bank/reconciliation/use_cases.rst:22 -msgid "No special configuration is necessary to register invoices. All we need to do is install the accounting app." +#: ../../accounting/bank/reconciliation/use_cases.rst:18 +msgid "No special configuration is necessary to record invoices. All we need to do is to install the accounting app." msgstr "" -#: ../../accounting/bank/reconciliation/use_cases.rst:29 +#: ../../accounting/bank/reconciliation/use_cases.rst:25 msgid "Use cases" msgstr "" -#: ../../accounting/bank/reconciliation/use_cases.rst:32 +#: ../../accounting/bank/reconciliation/use_cases.rst:28 msgid "Case 1: Payments registration" msgstr "" -#: ../../accounting/bank/reconciliation/use_cases.rst:34 -msgid "We received the payment proof for our invoice of 2100 euros issued to Smith & Co." +#: ../../accounting/bank/reconciliation/use_cases.rst:30 +msgid "We received the proof of payment of our invoice in the amount of 2100 euros issued to Smith & Co." msgstr "" -#: ../../accounting/bank/reconciliation/use_cases.rst:37 -msgid "We start at our issued Invoice of 2100 euros for Smith & Co. Because the sold product is a service we demand an immediate payment. Our accountant only handles the bank statements at the end of week, so we have to mark the invoice as paid so we can remember we can start the service with our customer." +#: ../../accounting/bank/reconciliation/use_cases.rst:33 +msgid "We start at our issued Invoice of 2100 euros for Smith & Co. Because the sold product is a service we demand an immediate payment. Our accountant only handles bank statements at the end of week, so we have to mark this invoice as paid immediately in order to indicate that we can start rendering services to our customer." msgstr "" -#: ../../accounting/bank/reconciliation/use_cases.rst:43 +#: ../../accounting/bank/reconciliation/use_cases.rst:39 msgid "Our customer send us a payment confirmation. We can thus register a payment and mark the invoice as paid." msgstr "" -#: ../../accounting/bank/reconciliation/use_cases.rst:49 -msgid "By clicking on **register payment,** we are telling Odoo that our customer paid the Invoice. We thus have to specify the amount and the payment method" +#: ../../accounting/bank/reconciliation/use_cases.rst:45 +msgid "By clicking on **register payment,** we are telling Odoo that our customer has paid the Invoice. We thus have to specify the amount and the payment method." msgstr "" -#: ../../accounting/bank/reconciliation/use_cases.rst:56 -msgid "We can always find the payment back from the Invoice by clicking on the :menuselection:`Info --> Open Payment`." +#: ../../accounting/bank/reconciliation/use_cases.rst:52 +msgid "Now we can always find the payment details in the Invoice by clicking on the :menuselection:`Info --> Open Payment`." msgstr "" -#: ../../accounting/bank/reconciliation/use_cases.rst:62 +#: ../../accounting/bank/reconciliation/use_cases.rst:58 msgid "The invoice has been paid and **the reconciliation has been done automatically.**" msgstr "" -#: ../../accounting/bank/reconciliation/use_cases.rst:66 +#: ../../accounting/bank/reconciliation/use_cases.rst:62 msgid "Case 2: Bank statements reconciliations" msgstr "" -#: ../../accounting/bank/reconciliation/use_cases.rst:68 +#: ../../accounting/bank/reconciliation/use_cases.rst:64 msgid "We start at our issued Invoice of 3000 euros for Smith & Co. Let's also assume that other Invoices are open for different customers." msgstr "" -#: ../../accounting/bank/reconciliation/use_cases.rst:74 -msgid "We receive our bank statement and not only the invoice of Smith & Co has been paid, the one of Buzz of 92 euros as well." +#: ../../accounting/bank/reconciliation/use_cases.rst:70 +msgid "We receive our bank statement and find that not only the invoice issued to Smith & Co has been paid, but the one to Buzz of 92 euros as well." msgstr "" -#: ../../accounting/bank/reconciliation/use_cases.rst:77 +#: ../../accounting/bank/reconciliation/use_cases.rst:73 msgid "**Import** or **Create** the bank statements. Please refer to the documents from the Bank Feeds section." msgstr "" -#: ../../accounting/bank/reconciliation/use_cases.rst:83 +#: ../../accounting/bank/reconciliation/use_cases.rst:79 msgid "On the dashboard, click on **Reconcile # Items**" msgstr "" -#: ../../accounting/bank/reconciliation/use_cases.rst:88 +#: ../../accounting/bank/reconciliation/use_cases.rst:84 msgid "If everything was right (correct partner name, right amount) odoo will do the reconciliations **automatically**." msgstr "" -#: ../../accounting/bank/reconciliation/use_cases.rst:94 +#: ../../accounting/bank/reconciliation/use_cases.rst:90 msgid "If some issues are found, you will need to take **manual actions**." msgstr "" -#: ../../accounting/bank/reconciliation/use_cases.rst:96 +#: ../../accounting/bank/reconciliation/use_cases.rst:92 msgid "For example, if the partner is missing from your bank statement, just fill it in :" msgstr "" -#: ../../accounting/bank/reconciliation/use_cases.rst:102 +#: ../../accounting/bank/reconciliation/use_cases.rst:98 msgid "If the payment is done with a down payment, just check if it is all right and validate all related payments :" msgstr "" -#: ../../accounting/bank/reconciliation/use_cases.rst:110 +#: ../../accounting/bank/reconciliation/use_cases.rst:106 msgid "Hit CTRL-Enter to reconcile all the balanced items in the sheet." msgstr "" @@ -979,6 +979,7 @@ 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 "" @@ -1006,6 +1007,32 @@ msgstr "" msgid "View *Bank Account* in our Online Demonstration" msgstr "" +#: ../../accounting/bank/setup/create_bank_account.rst:51 +#: ../../accounting/others/adviser/assets.rst:146 +#: ../../accounting/others/analytic/timesheets.rst:78 +#: ../../accounting/payables/misc/employee_expense.rst:169 +#: ../../accounting/payables/pay/sepa.rst:134 +#: ../../accounting/payables/pay/sepa.rst:135 +#: ../../accounting/receivables/customer_invoices/overview.rst:44 +#: ../../accounting/receivables/customer_invoices/overview.rst:59 +#: ../../accounting/receivables/customer_invoices/overview.rst:94 +#: ../../accounting/receivables/customer_invoices/overview.rst:105 +#: ../../accounting/receivables/customer_invoices/payment_terms.rst:31 +msgid "Todo" +msgstr "" + +#: ../../accounting/bank/setup/create_bank_account.rst:51 +msgid "add inherited field tooltip" +msgstr "" + +#: ../../accounting/bank/setup/create_bank_account.rst:53 +msgid "**Display on reports :** Display this bank account on the documents that will be printed or send to the customers" +msgstr "" + +#: ../../accounting/bank/setup/create_bank_account.rst:56 +msgid "**Bank Identifier Code** = BIC : SWIFT Address assigned to a bank in order to send automated payments quickly and accurately to the banks concerned" +msgstr "" + #: ../../accounting/bank/setup/create_bank_account.rst:60 msgid "The initial balance of a bank statement will be set to the closing balance of the previous one within the same journal automatically." msgstr "" @@ -1666,6 +1693,298 @@ msgstr "" msgid "The process for credit and debit notes is exactly the same as the invoice, the functional workflow remains the same as well." msgstr "" +#: ../../accounting/localizations/colombia_ES.rst:3 +msgid "Colombia (ES)" +msgstr "" + +#: ../../accounting/localizations/colombia_ES.rst:5 +msgid "**Facturación Electrónica para Colombia**" +msgstr "" + +#: ../../accounting/localizations/colombia_ES.rst:8 +msgid "Introducción" +msgstr "" + +#: ../../accounting/localizations/colombia_ES.rst:10 +msgid "La Facturación Electrónica para Colombia está disponible en Odoo V12 y requiere los siguientes Módulos:" +msgstr "" + +#: ../../accounting/localizations/colombia_ES.rst:20 +msgid "**l11n_co**:** Contiene los datos básicos para manejar el" +msgstr "" + +#: ../../accounting/localizations/colombia_ES.rst:14 +msgid "módulo de contabilidad, incluyendo la configuración por defecto de los siguientes puntos:" +msgstr "" + +#: ../../accounting/localizations/colombia_ES.rst:0 +msgid "a. Plan Contable" +msgstr "" + +#: ../../accounting/localizations/colombia_ES.rst:0 +msgid "b. Impuestos" +msgstr "" + +#: ../../accounting/localizations/colombia_ES.rst:0 +msgid "c. Retenciones" +msgstr "" + +#: ../../accounting/localizations/colombia_ES.rst:0 +msgid "d. Tipos de Documentos de Identificación" +msgstr "" + +#: ../../accounting/localizations/colombia_ES.rst:25 +msgid "**l10n_co_edi**: Este módulo incluye todos los campos" +msgstr "" + +#: ../../accounting/localizations/colombia_ES.rst:23 +msgid "adicionales que son requeridos para la Integración entre Carvajal T&S y la generación de la Factura Electrónica, basado en los requisitos legales de la DIAN." +msgstr "" + +#: ../../accounting/localizations/colombia_ES.rst:28 +msgid "Flujo General" +msgstr "" + +#: ../../accounting/localizations/colombia_ES.rst:31 +msgid "Configuración" +msgstr "" + +#: ../../accounting/localizations/colombia_ES.rst:34 +msgid "1. Instalación de los módulos de Localización Colombiana" +msgstr "" + +#: ../../accounting/localizations/colombia_ES.rst:36 +msgid "Para esto ve a las aplicaciones y busca “Colombia”, luego da click en Instalar a los primeros dos módulos:" +msgstr "" + +#: ../../accounting/localizations/colombia_ES.rst:39 +msgid "cz" +msgstr "" + +#: ../../accounting/localizations/colombia_ES.rst:42 +msgid "2. Configuración de las credenciales del Servicio Web de Carvajal T&S" +msgstr "" + +#: ../../accounting/localizations/colombia_ES.rst:46 +msgid "Una vez que los módulos están instalados, para poderte conectar con el Servicio Web de Carvajal T&S, es necesario configurar el Usuario y las Credenciales. Esta información será provista por Carvajal T&S." +msgstr "" + +#: ../../accounting/localizations/colombia_ES.rst:48 +msgid "Ve a Facturación –> Configuración –> Configuración y busca la sección **Facturación Electrónica Colombiana**" +msgstr "" + +#: ../../accounting/localizations/colombia_ES.rst:56 +msgid "La funcionalidad de pruebas le permite conectarse e interactuar con el ambiente piloto de Carvajal T&S, esto permite a los usuarios probar el flujo completo y la integración con el Portal Financiero CEN, al cual se accede a través de la siguiente liga: `Cenfinanciero `__," +msgstr "" + +#: ../../accounting/localizations/colombia_ES.rst:58 +msgid "Una vez que el ambiente de producción está listo en Odoo y en Carvajal T&S el ambiente de pruebas debe ser deshabilitado para poder enviar la información al ambiente de producción de Carvajal, para el cual es utilizada la siguiente URL: `Cenfinanciero `__," +msgstr "" + +#: ../../accounting/localizations/colombia_ES.rst:64 +msgid "3. Configuración de Información para PDF" +msgstr "" + +#: ../../accounting/localizations/colombia_ES.rst:68 +msgid "Como parte de la información configurable que es enviada en el XML, puedes definir los datos de la sección fiscal del PDF, así como de la información Bancaria." +msgstr "" + +#: ../../accounting/localizations/colombia_ES.rst:70 +msgid "Ve a Contabilidad – Configuración – Ajustes y busca la sección **Facturación Electrónica Colombiana**." +msgstr "" + +#: ../../accounting/localizations/colombia_ES.rst:76 +msgid "4. Configuración de los Datos Principales Requeridos en el XML" +msgstr "" + +#: ../../accounting/localizations/colombia_ES.rst:79 +msgid "4.1 Contacto (Tercero)" +msgstr "" + +#: ../../accounting/localizations/colombia_ES.rst:82 +msgid "4.1.1 Identificación" +msgstr "" + +#: ../../accounting/localizations/colombia_ES.rst:85 +msgid "Como parte de la Localización Colombiana, los tipos de documentos definidos por la DIAN ahora están disponibles en el formulario de Contactos, por lo cual ya es posible asignarles su número de identificación asociado al tipo de documento correspondiente." +msgstr "" + +#: ../../accounting/localizations/colombia_ES.rst:93 +msgid "Nota: Cuando el tipo de documento es RUT la identificación necesita ser ingresada en Odoo incluyendo el Dígito de Verificación. Odoo separará este número cuando la información sea enviada a los proveedores terceros." +msgstr "" + +#: ../../accounting/localizations/colombia_ES.rst:99 +msgid "4.1.2 Estructura Fiscal (RUT)" +msgstr "" + +#: ../../accounting/localizations/colombia_ES.rst:101 +msgid "Los Códigos de tipo de Obligación aplicables a los terceros (sección 53 en el documento de RUT), son incluidos como parte del módulo de Facturación Electrónica, dado que es información requerida por la DIAN." +msgstr "" + +#: ../../accounting/localizations/colombia_ES.rst:105 +msgid "Estos campos se encuentran en Contactos –> Pestaña de Ventas y Compras –> Información Fiscal" +msgstr "" + +#: ../../accounting/localizations/colombia_ES.rst:111 +msgid "Adicionalmente dos últimos campos fueron agregados para especificar el régimen fiscal del contacto. Cabe aclarar que para envío de Factura electrónica de Carvajal, únicamente se hace distinción de entre Grandes Contribuyentes y Régimen simplificado, por lo se muestran solo estas dos opciones." +msgstr "" + +#: ../../accounting/localizations/colombia_ES.rst:118 +msgid "4.2 Impuestos" +msgstr "" + +#: ../../accounting/localizations/colombia_ES.rst:122 +msgid "Si tus transacciones de ventas incluyen productos con impuestos, es importante considerar que un campo adicional llamado *Tipo de Valor* necesita ser configurado en la siguiente ruta:" +msgstr "" + +#: ../../accounting/localizations/colombia_ES.rst:124 +msgid "Contabilidad – > Configuración –> Impuestos: –> Opciones Avanzadas –>Tipo de Valor" +msgstr "" + +#: ../../accounting/localizations/colombia_ES.rst:129 +msgid "Los impuestos para Retenciones (ICA, IVA y Fuente) también están incluidos en las opciones para configurar tus impuestos, esta configuración es considerada para desplegar correctamente los impuestos en la representación gráfica de la Factura. (PDF)" +msgstr "" + +#: ../../accounting/localizations/colombia_ES.rst:138 +msgid "4.3 Diarios" +msgstr "" + +#: ../../accounting/localizations/colombia_ES.rst:140 +msgid "Una vez que la DIAN ha asignado la secuencia y prefijo oficiales para la resolución de la Facturación Electrónica, los Diarios de Ventas relacionados con tus documentos de facturación necesitan ser actualizados en Odoo." +msgstr "" + +#: ../../accounting/localizations/colombia_ES.rst:145 +msgid "La secuencia es configurada usando el modo de desarrollador en la siguiente ruta:" +msgstr "" + +#: ../../accounting/localizations/colombia_ES.rst:148 +msgid "Contabilidad –> Configuración –> Diarios –> Liga de Secuencia" +msgstr "" + +#: ../../accounting/localizations/colombia_ES.rst:153 +msgid "Una vez que la secuencia es abierta, los campos de Prefijo y Siguiente Número deben ser configurados y sincronizados con el CEN Financiero." +msgstr "" + +#: ../../accounting/localizations/colombia_ES.rst:160 +msgid "4.4 Usuarios" +msgstr "" + +#: ../../accounting/localizations/colombia_ES.rst:162 +msgid "La plantilla por defecto que es usada por Odoo en la representación gráfica incluye el nombre del Vendedor, así que estos campos deben ser considerados:" +msgstr "" + +#: ../../accounting/localizations/colombia_ES.rst:170 +msgid "Uso y Pruebas" +msgstr "" + +#: ../../accounting/localizations/colombia_ES.rst:173 +msgid "Facturas" +msgstr "" + +#: ../../accounting/localizations/colombia_ES.rst:175 +msgid "Una vez que toda la información principal y las credenciales han sido configuradas, es posible empezar a probar el flujo de la Facturación Electrónica siguiendo las instrucciones que se detallan a continuación:" +msgstr "" + +#: ../../accounting/localizations/colombia_ES.rst:180 +msgid "1. Invoice Creation" +msgstr "" + +#: ../../accounting/localizations/colombia_ES.rst:182 +msgid "El flujo de trabajo funcional que lleva lugar antes de la validación de una factura continua siendo igual con Facturación Electrónica, independientemente de si es creada desde una Orden de Venta o si es creado manualmente." +msgstr "" + +#: ../../accounting/localizations/colombia_ES.rst:187 +msgid "Los cambios principales que son introducidos con la Facturación Electrónica son los siguientes:" +msgstr "" + +#: ../../accounting/localizations/colombia_ES.rst:190 +msgid "Hay tres tipos de documentos" +msgstr "" + +#: ../../accounting/localizations/colombia_ES.rst:193 +msgid "**Factura electrónica**. Este es el documento normal y aplica" +msgstr "" + +#: ../../accounting/localizations/colombia_ES.rst:193 +msgid "para Facturas, Notas de Crédito y Notas de Débito." +msgstr "" + +#: ../../accounting/localizations/colombia_ES.rst:196 +msgid "**Factura de Importación**. Debe ser seleccionada para" +msgstr "" + +#: ../../accounting/localizations/colombia_ES.rst:196 +msgid "transacciones de importación." +msgstr "" + +#: ../../accounting/localizations/colombia_ES.rst:202 +msgid "**Factura de Contingencia**. Esta es un caso excepcional y es" +msgstr "" + +#: ../../accounting/localizations/colombia_ES.rst:199 +msgid "utilizada como un respaldo manual en caso que la compañía no pueda usar el ERP y hay necesidad de crear la factura manualmente. Al ingresar esta factura en el ERP, se debe seleccionar este tipo." +msgstr "" + +#: ../../accounting/localizations/colombia_ES.rst:208 +msgid "1. Invoice Validation" +msgstr "" + +#: ../../accounting/localizations/colombia_ES.rst:210 +msgid "Después que la factura fue validada, un archivo XML es creado y enviado automáticamente al proveedor de la factura electrónica. Este archivo es desplegado en el historial." +msgstr "" + +#: ../../accounting/localizations/colombia_ES.rst:217 +msgid "Un campo adicional es ahora desplegado en la pestaña de “Otra Información” con el nombre del archivo XML. Adicionalmente hay un segundo campo adicional que es desplegado con el estatus de la Factura Electrónica, con el valor inicial **En Proceso**." +msgstr "" + +#: ../../accounting/localizations/colombia_ES.rst:226 +msgid "1. Recepción del XML y PDF Legal" +msgstr "" + +#: ../../accounting/localizations/colombia_ES.rst:233 +msgid "El proveedor de la Factura Electrónica recibe el archivo XML y procede a validar la información y la estructura contenida. Si todo es correcto, el estatus de la Factura cambia a “Validado”. Como parte de este proceso se generar el XML Legal, el cual incluye una firma digital y un código único (CUFE) y generan el PDF de la Factura (el cual incluye un código QR) y el CUFE." +msgstr "" + +#: ../../accounting/localizations/colombia_ES.rst:237 +msgid "Odoo envía una petición de actualización automáticamente para verificar que el XML fue creado. Si este es el caso, las siguientes acciones son hechas automáticamente." +msgstr "" + +#: ../../accounting/localizations/colombia_ES.rst:240 +msgid "El XML Legal y el PDF son incluidos en un archivo ZIP y desplegados" +msgstr "" + +#: ../../accounting/localizations/colombia_ES.rst:240 +msgid "en el historial de la Factura." +msgstr "" + +#: ../../accounting/localizations/colombia_ES.rst:245 +msgid "El estatus de la Factura Electrónica es cambiado a “Aceptado”." +msgstr "" + +#: ../../accounting/localizations/colombia_ES.rst:250 +msgid "Nota: En caso que el PDF y el XML sean requeridos inmediatamente, es posible mandar manualmente la petición del estatus usando el siguiente botón:" +msgstr "" + +#: ../../accounting/localizations/colombia_ES.rst:258 +msgid "1. Errores Frecuentes" +msgstr "" + +#: ../../accounting/localizations/colombia_ES.rst:260 +msgid "Durante la validación del XML los errores más comunes usualmente están relacionados con información principal faltante. En estos casos, los detalles del error son recuperados en la petición de actualización y desplegados en el historial." +msgstr "" + +#: ../../accounting/localizations/colombia_ES.rst:268 +msgid "Si la información principal es corregida, es posible re procesar el XML con la nueva información y mandar la versión actualizada usando el siguiente botón:" +msgstr "" + +#: ../../accounting/localizations/colombia_ES.rst:279 +msgid "Casos de Uso adicionales" +msgstr "" + +#: ../../accounting/localizations/colombia_ES.rst:281 +msgid "El proceso para las Notas de Crédito y Débito (Proveedores) es exactamente el mismo que en las Facturas. Su flujo de trabajo funcional se mantiene igual." +msgstr "" + #: ../../accounting/localizations/france.rst:3 msgid "France" msgstr "" @@ -1954,6 +2273,118 @@ msgstr "" msgid "It is possible to export your accounting entries from Odoo to Datev. To be able to use this feature, the german accounting localization needs to be installed on your Odoo Enterprise database. Then you can go in :menuselection:`Accounting --> Reporting --> General Ledger` then click on the **Export Datev (csv)** button." msgstr "" +#: ../../accounting/localizations/italy_IT.rst:3 +msgid "Italy (IT)" +msgstr "" + +#: ../../accounting/localizations/italy_IT.rst:5 +msgid "Questa guida spiegherà come utilizzare la fattura elettronica in Odoo e come configurare correttamente i dati aziendali, i contatti e la contabilità. Per testare la fattura elettronica i dati devono essere reali e non inventati, altrimenti il sistema dell’agenzia delle entrate non riconoscerà l’interscambio di informazioni." +msgstr "" + +#: ../../accounting/localizations/italy_IT.rst:12 +msgid "Configurare le informazioni sulla tua Azienda" +msgstr "" + +#: ../../accounting/localizations/italy_IT.rst:14 +msgid "Il passo successivo è la configurazione delle informazioni necessarie al funzionamento della fatturazione elettronica. Si può accedere alla schermata dall’applicazione Impostazioni: selezionare “Utenti e aziende” e scegliere Aziende. Accedere quindi alle informazioni sulla Azienda per cui si desidera configurare la fatturazione elettronica." +msgstr "" + +#: ../../accounting/localizations/italy_IT.rst:20 +msgid "I dati necessari al funzionamento dello strumento di fatturazione elettronica sono i seguenti:" +msgstr "" + +#: ../../accounting/localizations/italy_IT.rst:23 +msgid "Server PEC. Le informazioni sul server utilizzato dal tuo indirizzo di posta elettronica certificata sono fornite dal tuo fornitore o dal Ministero. Lo stesso server deve essere configurato come server che gestisce tutta la corrispondenza mail in Odoo, per saperne di più si puo’ consultare la relativa `guida `__." +msgstr "" + +#: ../../accounting/localizations/italy_IT.rst:30 +msgid "Indirizzo PEC dell’ Azienda, tale indirizzo deve essere lo stesso registrato presso l’Agenzia delle Entrate per l’utilizzo dei servizi di fatturazione elettronica." +msgstr "" + +#: ../../accounting/localizations/italy_IT.rst:34 +msgid "Indirizzo PEC dell’Agenzia delle Entrate. La mail sarà fornito al momento della registrazione della tua PEC presso l’Agenzia delle Entrate, ricorda che l’Agenzia delle Entrate potrebbe cambiare questo indirizzo in seguito, previa comunicazione." +msgstr "" + +#: ../../accounting/localizations/italy_IT.rst:39 +msgid "Partita IVA e Codice Fiscale. Per far si che la Fatturazione Elettronica funzioni correttamente, questi cambi devono essere compilati correttamente." +msgstr "" + +#: ../../accounting/localizations/italy_IT.rst:43 +msgid "Regime Fiscale. Il regime fiscale a cui è sottoposta l’Azienda deve essere selezionato scegliendo dalla lista precompilata fornita da Odoo. Chiedi al commercialista qual’è il corretto regime fiscale!" +msgstr "" + +#: ../../accounting/localizations/italy_IT.rst:47 +msgid "Numero di Iscrizione nel registro delle Imprese." +msgstr "" + +#: ../../accounting/localizations/italy_IT.rst:54 +msgid "1. Configurare le impostazioni per la Fatturazione Elettronica" +msgstr "" + +#: ../../accounting/localizations/italy_IT.rst:56 +msgid "Numero di iscrizione nel registro Imprese tenuto presso la Camera di Commercio." +msgstr "" + +#: ../../accounting/localizations/italy_IT.rst:59 +msgid "Rappresentate Fiscale. Questa opzione è dedicata ad aziende con sede al di fuori del territorio nazionale ma conducenti attività commerciali in Italia rilevanti ai fini dell’IVA. È possibile indicare in questo campo se l’Azienda si avvale di un Rappresentate Fiscale in Italia." +msgstr "" + +#: ../../accounting/localizations/italy_IT.rst:70 +msgid "1. Configurare il profilo dei clienti" +msgstr "" + +#: ../../accounting/localizations/italy_IT.rst:72 +msgid "Per un corretto utilizzo dell’applicazione, il profilo di clienti e fornitori, nell’applicazione contatti, deve essere configurato con le necessarie informazioni legali." +msgstr "" + +#: ../../accounting/localizations/italy_IT.rst:76 +msgid "Selezionando il nome del cliente e accedendo quindi ai suoi dati, si trovano i seguenti campi che devono essere compilati: Indirizzo PEC, Codice Fiscale e Indice PA *che deve contere i 6-7 caratteri contenuti nell’indice PA e necessari per la comunicazione tramite fattura elettronica*." +msgstr "" + +#: ../../accounting/localizations/italy_IT.rst:87 +msgid "Il processo di fatturazione" +msgstr "" + +#: ../../accounting/localizations/italy_IT.rst:89 +msgid "Si può procedere ad emettere una fattura seguendo le indicazioni dell’applicazione. Il momento che determina il formale invio della fattura è il momento in cui viene selezionata l’opzione “Valida”. La fattura viene quindi inviata: lo stato della sua consegna verrà notificato all’utente tramite pop-up sulla parte iniziale della schermata della fattura." +msgstr "" + +#: ../../accounting/localizations/italy_IT.rst:102 +msgid "I messaggi che possono apparire sono i seguenti:" +msgstr "" + +#: ../../accounting/localizations/italy_IT.rst:104 +msgid "Fattura invitata. In attesa di accettazione" +msgstr "" + +#: ../../accounting/localizations/italy_IT.rst:106 +msgid "Invio fallito. Puoi modificare la fattura ed inviarla di nuovo" +msgstr "" + +#: ../../accounting/localizations/italy_IT.rst:108 +msgid "La fattura è stata correttamente inviata ed accettata dal destinatario." +msgstr "" + +#: ../../accounting/localizations/italy_IT.rst:111 +msgid "I vari stadi di spedizione e recezione della fattura sono visibili anche dall’elenco delle Fatture nella forma di icone, accanto alla colonna “Stato” dall’applicazione contabilità." +msgstr "" + +#: ../../accounting/localizations/italy_IT.rst:115 +msgid "*Icona Rossa:* Invio fallito" +msgstr "" + +#: ../../accounting/localizations/italy_IT.rst:117 +msgid "*Icona Gialla:* Fattura invitata. In attesa di accettazione" +msgstr "" + +#: ../../accounting/localizations/italy_IT.rst:119 +msgid "*Icona Verde:* Fattura inviata e accettata dal destinatario" +msgstr "" + +#: ../../accounting/localizations/italy_IT.rst:121 +msgid "Per inviare la fattura tramite PEC e generare il file XML, basterà cliccare su invia. Il documento verrà poi mostrato tra gli allegati." +msgstr "" + #: ../../accounting/localizations/mexico.rst:3 msgid "Mexico" msgstr "" @@ -1967,7 +2398,7 @@ msgid "The mexican localization is a group of 3 modules:" msgstr "" #: ../../accounting/localizations/mexico.rst:18 -msgid "**l10n_mx:** All the basic data to manage the accounting, taxes and the chart of account, this proposed chart of account installed is a intended copy of the list of group codes offered by the `SAT`_." +msgid "**l10n_mx:** All basic data to manage the accounting, taxes and the chart of account, this proposed chart of account installed is a intended copy of the list of group codes offered by the `SAT`_." msgstr "" #: ../../accounting/localizations/mexico.rst:21 @@ -2051,7 +2482,7 @@ msgid "Important considerations when yo enable the CFDI 3.3" msgstr "" #: ../../accounting/localizations/mexico.rst:124 -#: ../../accounting/localizations/mexico.rst:613 +#: ../../accounting/localizations/mexico.rst:642 msgid "Your tax which represent the VAT 16% and 0% must have the \"Factor Type\" field set to \"Tasa\"." msgstr "" @@ -2096,7 +2527,7 @@ msgid "`Certificate Key`_" msgstr "" #: ../../accounting/localizations/mexico.rst:180 -msgid "**Password :** 12345678a" +msgid "**Password:** 12345678a" msgstr "" #: ../../accounting/localizations/mexico.rst:183 @@ -2180,371 +2611,403 @@ msgid "Payments (Just available for CFDI 3.3)" msgstr "" #: ../../accounting/localizations/mexico.rst:265 -msgid "To generate the payment complement you just must to follow the normal payment process in Odoo, this considerations to understand the behavior are important." +msgid "To generate the payment complement you only need to follow the normal payment process in Odoo, this considerations to understand the behavior are important." msgstr "" #: ../../accounting/localizations/mexico.rst:268 -msgid "All payment done in the same day of the invoice will be considered as It will not be signed, because It is the expected behavior legally required for \"Cash payment\"." +msgid "To generate payment complement the payment term in the invoice must be PPD, because It is the expected behavior legally required for \"Cash payment\"." msgstr "" -#: ../../accounting/localizations/mexico.rst:271 -msgid "To test a regular signed payment just create an invoice for the day before today and then pay it today." -msgstr "" - -#: ../../accounting/localizations/mexico.rst:273 -msgid "You must print the payment in order to retrieve the PDF properly." +#: ../../accounting/localizations/mexico.rst:272 +msgid "**1.1. How can I generate an invoice with payment term `PUE`?**" msgstr "" #: ../../accounting/localizations/mexico.rst:274 -msgid "Regarding the \"Payments in Advance\" you must create a proper invoice with the payment in advance itself as a product line setting the proper SAT code following the procedure on the official documentation `given by the SAT`_ in the section **Apéndice 2 Procedimiento para la emisión de los CFDI en el caso de anticipos recibidos**." +msgid "`According to the SAT documentation`_ a payment is classified as ``PUE`` if the invoice was agreed to be fully payed before the 17th of the next calendar month (the next month of the CFDI date), any other condition will generate a ``PPD`` invoice." msgstr "" #: ../../accounting/localizations/mexico.rst:279 -msgid "Related to topic 4 it is blocked the possibility to create a Customer Payment without a proper invoice." +msgid "**1.2. How can I get this with Odoo?**" +msgstr "" + +#: ../../accounting/localizations/mexico.rst:281 +msgid "In order to set the appropriate CFDI payment term (PPD or PUE), you can easily set it by using the ``Payment Terms`` defined in the invoice." msgstr "" #: ../../accounting/localizations/mexico.rst:284 -msgid "The accounting for Mexico in odoo is composed by 3 reports:" -msgstr "" - -#: ../../accounting/localizations/mexico.rst:286 -msgid "Chart of Account (Called and shown as COA)." +msgid "If an invoice is generated without ``Payment Term`` the attribute ``MetodoPago`` will be ``PUE``." msgstr "" #: ../../accounting/localizations/mexico.rst:287 -msgid "Electronic Trial Balance." +msgid "Today, if is the first day of the month and is generated an invoice with ``Payment Term`` ``30 Net Days`` the ``Due Date`` calculated is going to be the first day of the following month, this means its before the 17th of the next month, then the attribute ``MetodoPago`` will be ``PUE``." msgstr "" -#: ../../accounting/localizations/mexico.rst:288 -msgid "DIOT report." +#: ../../accounting/localizations/mexico.rst:292 +msgid "Today, if an invoice is generated with ``Payment Term`` ``30 Net Days`` and the ``Due Date`` is higher than the day 17 of the next month the ``MetodoPago`` will be ``PPD``." msgstr "" -#: ../../accounting/localizations/mexico.rst:290 -msgid "1 and 2 are considered as the electronic accounting, and the DIOT is a report only available on the context of the accounting." +#: ../../accounting/localizations/mexico.rst:296 +msgid "If having a ``Payment Term`` with 2 lines or more, for example ``30% Advance End of Following Month``, this is an installments term, then the attribute ``MetodoPago`` will be ``PPD``." msgstr "" -#: ../../accounting/localizations/mexico.rst:293 -msgid "You can find all those reports in the original report menu on Accounting app." -msgstr "" - -#: ../../accounting/localizations/mexico.rst:299 -msgid "Electronic Accounting (Requires Accounting App)" +#: ../../accounting/localizations/mexico.rst:300 +msgid "To test a normal signed payment just create an invoice with payment term ``30% Advance End of Following Month`` and then register a payment to it." msgstr "" #: ../../accounting/localizations/mexico.rst:302 -msgid "Electronic Chart of account CoA" +msgid "You must print the payment in order to retrieve the PDF properly." msgstr "" -#: ../../accounting/localizations/mexico.rst:304 -msgid "The electronic accounting never has been easier, just go to :menuselection:`Accounting --> Reporting --> Mexico --> COA` and click on the button **Export for SAT (XML)**" +#: ../../accounting/localizations/mexico.rst:303 +msgid "Regarding the \"Payments in Advance\" you must create a proper invoice with the payment in advance itself as a product line setting the proper SAT code following the procedure on the official documentation `given by the SAT`_ in the section **Apéndice 2 Procedimiento para la emisión de los CFDI en el caso de anticipos recibidos**." msgstr "" -#: ../../accounting/localizations/mexico.rst:311 -msgid "**How to add new accounts?**" +#: ../../accounting/localizations/mexico.rst:308 +msgid "Related to topic 4 it is blocked the possibility to create a Customer Payment without a proper invoice." msgstr "" #: ../../accounting/localizations/mexico.rst:313 -msgid "If you add an account with the coding convention NNN.YY.ZZ where NNN.YY is a SAT coding group then your account will be automatically configured." +msgid "The accounting for Mexico in odoo is composed by 3 reports:" +msgstr "" + +#: ../../accounting/localizations/mexico.rst:315 +msgid "Chart of Account (Called and shown as COA)." msgstr "" #: ../../accounting/localizations/mexico.rst:316 -msgid "Example to add an Account for a new Bank account go to :menuselection:`Accounting --> Settings --> Chart of Account` and then create a new account on the button \"Create\" and try to create an account with the number 102.01.99 once you change to set the name you will see a tag automatically set, the tags set are the one picked to be used in the COA on xml." +msgid "Electronic Trial Balance." msgstr "" -#: ../../accounting/localizations/mexico.rst:326 -msgid "**What is the meaning of the tag?**" +#: ../../accounting/localizations/mexico.rst:317 +msgid "DIOT report." +msgstr "" + +#: ../../accounting/localizations/mexico.rst:319 +msgid "1 and 2 are considered as the electronic accounting, and the DIOT is a report only available on the context of the accounting." +msgstr "" + +#: ../../accounting/localizations/mexico.rst:322 +msgid "You can find all those reports in the original report menu on Accounting app." msgstr "" #: ../../accounting/localizations/mexico.rst:328 -msgid "To know all possible tags you can read the `Anexo 24`_ in the SAT website on the section called **Código agrupador de cuentas del SAT**." +msgid "Electronic Accounting (Requires Accounting App)" msgstr "" -#: ../../accounting/localizations/mexico.rst:332 -msgid "When you install the module l10n_mx and yous Chart of Account rely on it (this happen automatically when you install setting Mexico as country on your database) then you will have the more common tags if the tag you need is not created you can create one on the fly." +#: ../../accounting/localizations/mexico.rst:331 +msgid "Electronic Chart of account CoA" msgstr "" -#: ../../accounting/localizations/mexico.rst:338 -msgid "Electronic Trial Balance" +#: ../../accounting/localizations/mexico.rst:333 +msgid "The electronic accounting never has been easier, just go to :menuselection:`Accounting --> Reporting --> Mexico --> COA` and click on the button **Export for SAT (XML)**" msgstr "" #: ../../accounting/localizations/mexico.rst:340 -msgid "Exactly as the COA but with Initial balance debit and credit, once you have your coa properly set you can go to :menuselection:`Accounting --> Reports --> Mexico --> Trial Balance` this is automatically generated, and can be exported to XML using the button in the top **Export for SAT (XML)** with the previous selection of the period you want to export." +msgid "**How to add new accounts?**" msgstr "" -#: ../../accounting/localizations/mexico.rst:349 -msgid "All the normal auditory and analysis features are available here also as any regular Odoo Report." +#: ../../accounting/localizations/mexico.rst:342 +msgid "If you add an account with the coding convention NNN.YY.ZZ where NNN.YY is a SAT coding group then your account will be automatically configured." msgstr "" -#: ../../accounting/localizations/mexico.rst:353 -msgid "DIOT Report (Requires Accounting App)" +#: ../../accounting/localizations/mexico.rst:345 +msgid "Example to add an Account for a new Bank account go to :menuselection:`Accounting --> Settings --> Chart of Account` and then create a new account on the button \"Create\" and try to create an account with the number 102.01.99 once you change to set the name you will see a tag automatically set, the tags set are the one picked to be used in the COA on xml." msgstr "" #: ../../accounting/localizations/mexico.rst:355 -msgid "**What is the DIOT and the importance of presenting it SAT**" +msgid "**What is the meaning of the tag?**" msgstr "" #: ../../accounting/localizations/mexico.rst:357 -msgid "When it comes to procedures with the SAT Administration Service we know that we should not neglect what we present. So that things should not happen in Odoo." +msgid "To know all possible tags you can read the `Anexo 24`_ in the SAT website on the section called **Código agrupador de cuentas del SAT**." msgstr "" -#: ../../accounting/localizations/mexico.rst:360 -msgid "The DIOT is the Informational Statement of Operations with Third Parties (DIOT), which is an an additional obligation with the VAT, where we must give the status of our operations to third parties, or what is considered the same, with our providers." +#: ../../accounting/localizations/mexico.rst:361 +msgid "When you install the module l10n_mx and yous Chart of Account rely on it (this happen automatically when you install setting Mexico as country on your database) then you will have the more common tags if the tag you need is not created you can create one on the fly." msgstr "" -#: ../../accounting/localizations/mexico.rst:365 -msgid "This applies both to individuals and to the moral as well, so if we have VAT for submitting to the SAT and also dealing with suppliers it is necessary to. submit the DIOT:" +#: ../../accounting/localizations/mexico.rst:367 +msgid "Electronic Trial Balance" msgstr "" #: ../../accounting/localizations/mexico.rst:369 -msgid "**When to file the DIOT and in what format?**" +msgid "Exactly as the COA but with Initial balance debit and credit, once you have your coa properly set you can go to :menuselection:`Accounting --> Reports --> Mexico --> Trial Balance` this is automatically generated, and can be exported to XML using the button in the top **Export for SAT (XML)** with the previous selection of the period you want to export." msgstr "" -#: ../../accounting/localizations/mexico.rst:371 -msgid "It is simple to present the DIOT, since like all format this you can obtain it in the page of the SAT, it is the electronic format A-29 that you can find in the SAT website." -msgstr "" - -#: ../../accounting/localizations/mexico.rst:375 -msgid "Every month if you have operations with third parties it is necessary to present the DIOT, just as we do with VAT, so that if in January we have deals with suppliers, by February we must present the information pertinent to said data." -msgstr "" - -#: ../../accounting/localizations/mexico.rst:380 -msgid "**Where the DIOT is presented?**" +#: ../../accounting/localizations/mexico.rst:378 +msgid "All the normal auditory and analysis features are available here also as any regular Odoo Report." msgstr "" #: ../../accounting/localizations/mexico.rst:382 -msgid "You can present DIOT in different ways, it is up to you which one you will choose and which will be more comfortable for you than you will present every month or every time you have dealings with suppliers." +msgid "DIOT Report (Requires Accounting App)" +msgstr "" + +#: ../../accounting/localizations/mexico.rst:384 +msgid "**What is the DIOT and the importance of presenting it SAT**" msgstr "" #: ../../accounting/localizations/mexico.rst:386 -msgid "The A-29 format is electronic so you can present it on the SAT page, but this after having made up to 500 records." +msgid "When it comes to procedures with the SAT Administration Service we know that we should not neglect what we present. So that things should not happen in Odoo." msgstr "" #: ../../accounting/localizations/mexico.rst:389 -msgid "Once these 500 records are entered in the SAT, you must present them to the Local Taxpayer Services Administration (ALSC) with correspondence to your tax address, these records can be presented in a digital storage medium such as a CD or USB, which once validated you will be returned, so do not doubt that you will still have these records and of course, your CD or USB." +msgid "The DIOT is the Informational Statement of Operations with Third Parties (DIOT), which is an an additional obligation with the VAT, where we must give the status of our operations to third parties, or what is considered the same, with our providers." msgstr "" -#: ../../accounting/localizations/mexico.rst:395 -msgid "**One more fact to know: the Batch load?**" +#: ../../accounting/localizations/mexico.rst:394 +msgid "This applies both to individuals and to the moral as well, so if we have VAT for submitting to the SAT and also dealing with suppliers it is necessary to. submit the DIOT:" msgstr "" -#: ../../accounting/localizations/mexico.rst:397 -msgid "When reviewing the official SAT documents on DIOT, you will find the Batch load, and of course the first thing we think is what is that ?, and according to the SAT site is:" +#: ../../accounting/localizations/mexico.rst:398 +msgid "**When to file the DIOT and in what format?**" msgstr "" -#: ../../accounting/localizations/mexico.rst:401 -msgid "The \"batch upload\" is the conversion of records databases of transactions with suppliers made by taxpayers in text files (.txt). These files have the necessary structure for their application and importation into the system of the Informative Declaration of Operations with third parties, avoiding the direct capture and consequently, optimizing the time invested in its integration for the presentation in time and form to the SAT." +#: ../../accounting/localizations/mexico.rst:400 +msgid "It is simple to present the DIOT, since like all format this you can obtain it in the page of the SAT, it is the electronic format A-29 that you can find in the SAT website." msgstr "" -#: ../../accounting/localizations/mexico.rst:408 -msgid "You can use it to present the DIOT, since it is allowed, which will make this operation easier for you, so that it does not exist to avoid being in line with the SAT in regard to the Information Statement of Operations with Third Parties." +#: ../../accounting/localizations/mexico.rst:404 +msgid "Every month if you have operations with third parties it is necessary to present the DIOT, just as we do with VAT, so that if in January we have deals with suppliers, by February we must present the information pertinent to said data." msgstr "" -#: ../../accounting/localizations/mexico.rst:413 -msgid "You can find the `official information here`_." +#: ../../accounting/localizations/mexico.rst:409 +msgid "**Where the DIOT is presented?**" +msgstr "" + +#: ../../accounting/localizations/mexico.rst:411 +msgid "You can present DIOT in different ways, it is up to you which one you will choose and which will be more comfortable for you than you will present every month or every time you have dealings with suppliers." msgstr "" #: ../../accounting/localizations/mexico.rst:415 -msgid "**How Generate this report in odoo?**" +msgid "The A-29 format is electronic so you can present it on the SAT page, but this after having made up to 500 records." msgstr "" -#: ../../accounting/localizations/mexico.rst:417 -msgid "Go to :menuselection:`Accounting --> Reports --> Mexico --> Transactions with third partied (DIOT)`." +#: ../../accounting/localizations/mexico.rst:418 +msgid "Once these 500 records are entered in the SAT, you must present them to the Local Taxpayer Services Administration (ALSC) with correspondence to your tax address, these records can be presented in a digital storage medium such as a CD or USB, which once validated you will be returned, so do not doubt that you will still have these records and of course, your CD or USB." msgstr "" -#: ../../accounting/localizations/mexico.rst:422 -msgid "A report view is shown, select last month to report the immediate before month you are or left the current month if it suits to you." +#: ../../accounting/localizations/mexico.rst:424 +msgid "**One more fact to know: the Batch load?**" msgstr "" -#: ../../accounting/localizations/mexico.rst:428 -msgid "Click on \"Export (TXT)." +#: ../../accounting/localizations/mexico.rst:426 +msgid "When reviewing the official SAT documents on DIOT, you will find the Batch load, and of course the first thing we think is what is that ?, and according to the SAT site is:" msgstr "" -#: ../../accounting/localizations/mexico.rst:433 -msgid "Save in a secure place the downloaded file and go to SAT website and follow the necessary steps to declare it." +#: ../../accounting/localizations/mexico.rst:430 +msgid "The \"batch upload\" is the conversion of records databases of transactions with suppliers made by taxpayers in text files (.txt). These files have the necessary structure for their application and importation into the system of the Informative Declaration of Operations with third parties, avoiding the direct capture and consequently, optimizing the time invested in its integration for the presentation in time and form to the SAT." msgstr "" #: ../../accounting/localizations/mexico.rst:437 +msgid "You can use it to present the DIOT, since it is allowed, which will make this operation easier for you, so that it does not exist to avoid being in line with the SAT in regard to the Information Statement of Operations with Third Parties." +msgstr "" + +#: ../../accounting/localizations/mexico.rst:442 +msgid "You can find the `official information here`_." +msgstr "" + +#: ../../accounting/localizations/mexico.rst:444 +msgid "**How Generate this report in odoo?**" +msgstr "" + +#: ../../accounting/localizations/mexico.rst:446 +msgid "Go to :menuselection:`Accounting --> Reports --> Mexico --> Transactions with third partied (DIOT)`." +msgstr "" + +#: ../../accounting/localizations/mexico.rst:451 +msgid "A report view is shown, select last month to report the immediate before month you are or left the current month if it suits to you." +msgstr "" + +#: ../../accounting/localizations/mexico.rst:457 +msgid "Click on \"Export (TXT)." +msgstr "" + +#: ../../accounting/localizations/mexico.rst:462 +msgid "Save in a secure place the downloaded file and go to SAT website and follow the necessary steps to declare it." +msgstr "" + +#: ../../accounting/localizations/mexico.rst:466 msgid "Important considerations on your Supplier and Invice data for the DIOT" msgstr "" -#: ../../accounting/localizations/mexico.rst:439 +#: ../../accounting/localizations/mexico.rst:468 msgid "All suppliers must have set the fields on the accounting tab called \"DIOT Information\", the *L10N Mx Nationality* field is filled with just select the proper country in the address, you do not need to do anything else there, but the *L10N Mx Type Of Operation* must be filled by you in all your suppliers." msgstr "" -#: ../../accounting/localizations/mexico.rst:447 +#: ../../accounting/localizations/mexico.rst:476 msgid "There are 3 options of VAT for this report, 16%, 0% and exempt, an invoice line in odoo is considered exempt if no tax on it, the other 2 taxes are properly configured already." msgstr "" -#: ../../accounting/localizations/mexico.rst:450 +#: ../../accounting/localizations/mexico.rst:479 msgid "Remember to pay an invoice which represent a payment in advance you must ask for the invoice first and then pay it and reconcile properly the payment following standard odoo procedure." msgstr "" -#: ../../accounting/localizations/mexico.rst:453 +#: ../../accounting/localizations/mexico.rst:482 msgid "You do not need all you data on partners filled to try to generate the supplier invoice, you can fix this information when you generate the report itself." msgstr "" -#: ../../accounting/localizations/mexico.rst:456 +#: ../../accounting/localizations/mexico.rst:485 msgid "Remember this report only shows the Supplier Invoices that were actually paid." msgstr "" -#: ../../accounting/localizations/mexico.rst:458 +#: ../../accounting/localizations/mexico.rst:487 msgid "If some of this considerations are not taken into account a message like this will appear when generate the DIOT on TXT with all the partners you need to check on this particular report, this is the reason we recommend use this report not just to export your legal obligation but to generate it before the end of the month and use it as your auditory process to see all your partners are correctly set." msgstr "" -#: ../../accounting/localizations/mexico.rst:469 +#: ../../accounting/localizations/mexico.rst:498 msgid "Extra Recommended features" msgstr "" -#: ../../accounting/localizations/mexico.rst:472 +#: ../../accounting/localizations/mexico.rst:501 msgid "Contact Module (Free)" msgstr "" -#: ../../accounting/localizations/mexico.rst:474 +#: ../../accounting/localizations/mexico.rst:503 msgid "If you want to administer properly your customers, suppliers and addresses this module even if it is not a technical need, it is highly recommended to install." msgstr "" -#: ../../accounting/localizations/mexico.rst:479 +#: ../../accounting/localizations/mexico.rst:508 msgid "Multi currency (Requires Accounting App)" msgstr "" -#: ../../accounting/localizations/mexico.rst:481 +#: ../../accounting/localizations/mexico.rst:510 msgid "In Mexico almost all companies send and receive payments in different currencies if you want to manage such capability you should enable the multi currency feature and you should enable the synchronization with **Banxico**, such feature allow you retrieve the proper exchange rate automatically retrieved from SAT and not being worried of put such information daily in the system manually." msgstr "" -#: ../../accounting/localizations/mexico.rst:488 +#: ../../accounting/localizations/mexico.rst:517 msgid "Go to settings and enable the multi currency feature." msgstr "" -#: ../../accounting/localizations/mexico.rst:494 +#: ../../accounting/localizations/mexico.rst:523 msgid "Enabling Explicit errors on the CFDI using the XSD local validator (CFDI 3.3)" msgstr "" -#: ../../accounting/localizations/mexico.rst:496 +#: ../../accounting/localizations/mexico.rst:525 msgid "Frequently you want receive explicit errors from the fields incorrectly set on the xml, those errors are better informed to the user if the check is enable, to enable the Check with xsd feature follow the next steps (with debug mode enabled)." msgstr "" -#: ../../accounting/localizations/mexico.rst:501 +#: ../../accounting/localizations/mexico.rst:530 msgid "Go to :menuselection:`Settings --> Technical --> Actions --> Server Actions`" msgstr "" -#: ../../accounting/localizations/mexico.rst:502 +#: ../../accounting/localizations/mexico.rst:531 msgid "Look for the Action called \"Download XSD files to CFDI\"" msgstr "" -#: ../../accounting/localizations/mexico.rst:503 +#: ../../accounting/localizations/mexico.rst:532 msgid "Click on button \"Create Contextual Action\"" msgstr "" -#: ../../accounting/localizations/mexico.rst:504 +#: ../../accounting/localizations/mexico.rst:533 msgid "Go to the company form :menuselection:`Settings --> Users&Companies --> Companies`" msgstr "" -#: ../../accounting/localizations/mexico.rst:505 +#: ../../accounting/localizations/mexico.rst:534 msgid "Open any company you have." msgstr "" -#: ../../accounting/localizations/mexico.rst:506 -#: ../../accounting/localizations/mexico.rst:529 +#: ../../accounting/localizations/mexico.rst:535 +#: ../../accounting/localizations/mexico.rst:558 msgid "Click on \"Action\" and then on \"Download XSD file to CFDI\"." msgstr "" -#: ../../accounting/localizations/mexico.rst:511 +#: ../../accounting/localizations/mexico.rst:540 msgid "Now you can make an invoice with any error (for example a product without code which is pretty common) and an explicit error will be shown instead a generic one with no explanation." msgstr "" -#: ../../accounting/localizations/mexico.rst:516 +#: ../../accounting/localizations/mexico.rst:545 msgid "If you see an error like this:" msgstr "" -#: ../../accounting/localizations/mexico.rst:518 +#: ../../accounting/localizations/mexico.rst:547 msgid "The cfdi generated is not valid" msgstr "" -#: ../../accounting/localizations/mexico.rst:520 +#: ../../accounting/localizations/mexico.rst:549 msgid "attribute decl. 'TipoRelacion', attribute 'type': The QName value '{http://www.sat.gob.mx/sitio_internet/cfd/catalogos}c_TipoRelacion' does not resolve to a(n) simple type definition., line 36" msgstr "" -#: ../../accounting/localizations/mexico.rst:524 +#: ../../accounting/localizations/mexico.rst:553 msgid "This can be caused because of a database backup restored in anothe server, or when the XSD files are not correctly downloaded. Follow the same steps as above but:" msgstr "" -#: ../../accounting/localizations/mexico.rst:528 +#: ../../accounting/localizations/mexico.rst:557 msgid "Go to the company in which the error occurs." msgstr "" -#: ../../accounting/localizations/mexico.rst:535 +#: ../../accounting/localizations/mexico.rst:564 msgid "**Error message** (Only applicable on CFDI 3.3):" msgstr "" -#: ../../accounting/localizations/mexico.rst:537 +#: ../../accounting/localizations/mexico.rst:566 msgid ":9:0:ERROR:SCHEMASV:SCHEMAV_CVC_MINLENGTH_VALID: Element '{http://www.sat.gob.mx/cfd/3}Concepto', attribute 'NoIdentificacion': [facet 'minLength'] The value '' has a length of '0'; this underruns the allowed minimum length of '1'." msgstr "" -#: ../../accounting/localizations/mexico.rst:539 +#: ../../accounting/localizations/mexico.rst:568 msgid ":9:0:ERROR:SCHEMASV:SCHEMAV_CVC_PATTERN_VALID: Element '{http://www.sat.gob.mx/cfd/3}Concepto', attribute 'NoIdentificacion': [facet 'pattern'] The value '' is not accepted by the pattern '[^|]{1,100}'." msgstr "" -#: ../../accounting/localizations/mexico.rst:542 +#: ../../accounting/localizations/mexico.rst:571 msgid "**Solution:** You forget to set the proper \"Reference\" field in the product, please go to the product form and set your internal reference properly." msgstr "" -#: ../../accounting/localizations/mexico.rst:545 -#: ../../accounting/localizations/mexico.rst:570 -#: ../../accounting/localizations/mexico.rst:580 -#: ../../accounting/localizations/mexico.rst:593 -#: ../../accounting/localizations/mexico.rst:604 +#: ../../accounting/localizations/mexico.rst:574 +#: ../../accounting/localizations/mexico.rst:599 +#: ../../accounting/localizations/mexico.rst:609 +#: ../../accounting/localizations/mexico.rst:622 +#: ../../accounting/localizations/mexico.rst:633 msgid "**Error message**:" msgstr "" -#: ../../accounting/localizations/mexico.rst:547 +#: ../../accounting/localizations/mexico.rst:576 msgid ":6:0:ERROR:SCHEMASV:SCHEMAV_CVC_COMPLEX_TYPE_4: Element '{http://www.sat.gob.mx/cfd/3}RegimenFiscal': The attribute 'Regimen' is required but missing." msgstr "" -#: ../../accounting/localizations/mexico.rst:549 +#: ../../accounting/localizations/mexico.rst:578 msgid ":5:0:ERROR:SCHEMASV:SCHEMAV_CVC_COMPLEX_TYPE_4: Element '{http://www.sat.gob.mx/cfd/3}Emisor': The attribute 'RegimenFiscal' is required but missing." msgstr "" -#: ../../accounting/localizations/mexico.rst:552 +#: ../../accounting/localizations/mexico.rst:581 msgid "**Solution:** You forget to set the proper \"Fiscal Position\" on the partner of the company, go to customers, remove the customer filter and look for the partner called as your company and set the proper fiscal position which is the kind of business you company does related to SAT list of possible values, antoher option can be that you forgot follow the considerations about fiscal positions." msgstr "" -#: ../../accounting/localizations/mexico.rst:559 +#: ../../accounting/localizations/mexico.rst:588 msgid "Yo must go to the Fiscal Position configuration and set the proper code (it is the first 3 numbers in the name) for example for the test one you should set 601, it will look like the image." msgstr "" -#: ../../accounting/localizations/mexico.rst:567 +#: ../../accounting/localizations/mexico.rst:596 msgid "For testing purposes this value must be *601 - General de Ley Personas Morales* which is the one required for the demo VAT." msgstr "" -#: ../../accounting/localizations/mexico.rst:572 +#: ../../accounting/localizations/mexico.rst:601 msgid ":2:0:ERROR:SCHEMASV:SCHEMAV_CVC_ENUMERATION_VALID: Element '{http://www.sat.gob.mx/cfd/3}Comprobante', attribute 'FormaPago': [facet 'enumeration'] The value '' is not an element of the set {'01', '02', '03', '04', '05', '06', '08', '12', '13', '14', '15', '17', '23', '24', '25', '26', '27', '28', '29', '30', '99'}" msgstr "" -#: ../../accounting/localizations/mexico.rst:575 +#: ../../accounting/localizations/mexico.rst:604 msgid "**Solution:** The payment method is required on your invoice." msgstr "" -#: ../../accounting/localizations/mexico.rst:582 +#: ../../accounting/localizations/mexico.rst:611 msgid ":2:0:ERROR:SCHEMASV:SCHEMAV_CVC_ENUMERATION_VALID: Element '{http://www.sat.gob.mx/cfd/3}Comprobante', attribute 'LugarExpedicion': [facet 'enumeration'] The value '' is not an element of the set {'00 :2:0:ERROR:SCHEMASV:SCHEMAV_CVC_DATATYPE_VALID_1_2_1: Element '{http://www.sat.gob.mx/cfd/3}Comprobante', attribute 'LugarExpedicion': '' is not a valid value of the atomic type '{http://www.sat.gob.mx/sitio_internet/cfd/catalogos}c_CodigoPostal'. :5:0:ERROR:SCHEMASV:SCHEMAV_CVC_COMPLEX_TYPE_4: Element '{http://www.sat.gob.mx/cfd/3}Emisor': The attribute 'Rfc' is required but missing." msgstr "" -#: ../../accounting/localizations/mexico.rst:587 +#: ../../accounting/localizations/mexico.rst:616 msgid "**Solution:** You must set the address on your company properly, this is a mandatory group of fields, you can go to your company configuration on :menuselection:`Settings --> Users & Companies --> Companies` and fill all the required fields for your address following the step :ref:`mx-legal-info`." msgstr "" -#: ../../accounting/localizations/mexico.rst:595 +#: ../../accounting/localizations/mexico.rst:624 msgid ":2:0:ERROR:SCHEMASV:SCHEMAV_CVC_DATATYPE_VALID_1_2_1: Element '{http://www.sat.gob.mx/cfd/3}Comprobante', attribute 'LugarExpedicion': '' is not a valid value of the atomic type '{http://www.sat.gob.mx/sitio_internet/cfd/catalogos}c_CodigoPostal'." msgstr "" -#: ../../accounting/localizations/mexico.rst:598 +#: ../../accounting/localizations/mexico.rst:627 msgid "**Solution:** The postal code on your company address is not a valid one for Mexico, fix it." msgstr "" -#: ../../accounting/localizations/mexico.rst:606 +#: ../../accounting/localizations/mexico.rst:635 msgid ":18:0:ERROR:SCHEMASV:SCHEMAV_CVC_COMPLEX_TYPE_4: Element '{http://www.sat.gob.mx/cfd/3}Traslado': The attribute 'TipoFactor' is required but missing. :34:0:ERROR:SCHEMASV:SCHEMAV_CVC_COMPLEX_TYPE_4: Element '{http://www.sat.gob.mx/cfd/3}Traslado': The attribute 'TipoFactor' is required but missing.\", '')" msgstr "" -#: ../../accounting/localizations/mexico.rst:610 +#: ../../accounting/localizations/mexico.rst:639 msgid "**Solution:** Set the mexican name for the tax 0% and 16% in your system and used on the invoice." msgstr "" @@ -3195,123 +3658,151 @@ msgstr "" 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/assets.rst:146 +msgid "→ This has to be changed in Odoo: selling an asset should:" +msgstr "" + +#: ../../accounting/others/adviser/assets.rst:148 +msgid "remove all \"Red\" lines" +msgstr "" + +#: ../../accounting/others/adviser/assets.rst:149 +msgid "create a new line that deprecate the whole residual value" +msgstr "" + #: ../../accounting/others/adviser/budget.rst:3 msgid "How to manage a financial budget?" msgstr "" #: ../../accounting/others/adviser/budget.rst:8 -msgid "Managing budgets is an essential part of running a business. It allows you to measure your actual financial performance against the planned one. Odoo manages its budgets using both General and Analytic Accounts." +msgid "Managing budgets is an essential part of running a business. Budgets help people become more intentional with the way money is spent and direct people to organize and prioritize their work to meet financial goals. They allows you to plan your desired financial outcome and then measure your actual performance against the plan. Odoo manages budgets using both General and Analytic Accounts." msgstr "" -#: ../../accounting/others/adviser/budget.rst:12 +#: ../../accounting/others/adviser/budget.rst:15 msgid "We will use the following example to illustrate. We just started a project with Smith&Co and we would like to budget the incomes and expenses of that project. We plan to have a revenue of 1000 and we don't want to spend more than 700." msgstr "" -#: ../../accounting/others/adviser/budget.rst:20 +#: ../../accounting/others/adviser/budget.rst:23 msgid "First we need to install the relevant apps to use budgeting. The main module is the accounting app. Go in the app module and install the **Accounting and Finance** app." msgstr "" -#: ../../accounting/others/adviser/budget.rst:27 +#: ../../accounting/others/adviser/budget.rst:30 msgid "Further configuration is as well necessary. Go to :menuselection:`Accounting module --> Configuration --> Settings` and enable the **Budget management** feature" msgstr "" -#: ../../accounting/others/adviser/budget.rst:35 +#: ../../accounting/others/adviser/budget.rst:38 msgid "Budgetary Positions" msgstr "" -#: ../../accounting/others/adviser/budget.rst:37 -msgid "Budgetary positions are the general accounts for which you want to keep budgets (typically expense or income accounts). They need to be defined so Odoo can know it which accounts he needs to go get the budget information. Some might be already installed with your chart of accounts." +#: ../../accounting/others/adviser/budget.rst:40 +msgid "Budgetary positions are lists of accounts for which you want to keep budgets (typically expense or income accounts). They need to be defined so Odoo can know it which accounts he needs to go get the budget information." msgstr "" -#: ../../accounting/others/adviser/budget.rst:43 +#: ../../accounting/others/adviser/budget.rst:45 +msgid "The budgetary positions act as a type of restriction on what can be recorded in the 'practical amount' column in a budget." +msgstr "" + +#: ../../accounting/others/adviser/budget.rst:48 +msgid "Each budgetary position can have any number of accounts from the general ledger (the main chart of accounts) assigned to it, though it must have at least one." +msgstr "" + +#: ../../accounting/others/adviser/budget.rst:51 +msgid "If you record a transaction that has an analytic account assigned to it that *is* included in a budget line but one of the general ledger accounts *is not* included in the budgetary position for that same budget line, it will not appear within the 'practical amount' column of that budget line." +msgstr "" + +#: ../../accounting/others/adviser/budget.rst:56 +msgid "Some budgetary positions might be already installed with your chart of accounts." +msgstr "" + +#: ../../accounting/others/adviser/budget.rst:59 msgid "To define the positions enter the :menuselection:`Accounting module --> Configuration --> Budgetary Positions`." msgstr "" -#: ../../accounting/others/adviser/budget.rst:46 +#: ../../accounting/others/adviser/budget.rst:62 msgid "For our example we need to define what accounts relates to our project's expenses. Create a position and add items to select the accounts." msgstr "" -#: ../../accounting/others/adviser/budget.rst:52 +#: ../../accounting/others/adviser/budget.rst:68 msgid "In this case we select the three relevant accounts used wherein we will book our expenses." msgstr "" -#: ../../accounting/others/adviser/budget.rst:58 +#: ../../accounting/others/adviser/budget.rst:74 msgid "Click on *Select*." msgstr "" -#: ../../accounting/others/adviser/budget.rst:63 +#: ../../accounting/others/adviser/budget.rst:79 msgid "Save the changes to confirm your Budgetary position." msgstr "" -#: ../../accounting/others/adviser/budget.rst:65 +#: ../../accounting/others/adviser/budget.rst:81 msgid "Repeat this steps to create a revenue budgetary position. Only in this case select the relevant income accounts." msgstr "" -#: ../../accounting/others/adviser/budget.rst:69 +#: ../../accounting/others/adviser/budget.rst:85 msgid "Analytical account" msgstr "" -#: ../../accounting/others/adviser/budget.rst:71 +#: ../../accounting/others/adviser/budget.rst:87 msgid "Odoo needs to know which costs or expenses are relevant to a specified budget. To do so we need to link our invoices and expenses to a defined analytical account. Create an analytical account by entering the Accounting module and clicking :menuselection:`Advisers --> Analytic Accounts --> Open Charts`. Create a new Account called Smith&Co project and select the related partner." msgstr "" -#: ../../accounting/others/adviser/budget.rst:82 +#: ../../accounting/others/adviser/budget.rst:98 msgid "Set a budget" msgstr "" -#: ../../accounting/others/adviser/budget.rst:84 +#: ../../accounting/others/adviser/budget.rst:100 msgid "Let's now set our targets for our budget. We specified that we expect to gain 1000 with this project and we would like not to spend more than 700." msgstr "" -#: ../../accounting/others/adviser/budget.rst:88 +#: ../../accounting/others/adviser/budget.rst:104 msgid "To set those targets, enter the accounting app, select :menuselection:`Advisers --> Budgets` and create a new Budget." msgstr "" -#: ../../accounting/others/adviser/budget.rst:91 +#: ../../accounting/others/adviser/budget.rst:107 msgid "We have to give a name to the budget. In this case we'll call it \"Smith Project\". Select the period wherein the budget will be applicable. Next add an item to specify your targets in the Budget Line." msgstr "" -#: ../../accounting/others/adviser/budget.rst:98 +#: ../../accounting/others/adviser/budget.rst:114 msgid "Select the Budgetary Position related to the Budget Line. In other words, select the position that points to the accounts you want to budget. In this case we will start with our 700 maximum charge target. Select the \"Cost\" Budgetary Position and specify the Planned Amount. As we are recording a cost, we need to specify a **negative amount**. Finally, select the corresponding analytic account." msgstr "" -#: ../../accounting/others/adviser/budget.rst:108 +#: ../../accounting/others/adviser/budget.rst:124 msgid "Click on **Save & new** to input the revenue budget. The Budgetary Position is Revenue and the Planned Amount is 1000. Save and close" msgstr "" -#: ../../accounting/others/adviser/budget.rst:111 +#: ../../accounting/others/adviser/budget.rst:127 msgid "You'll need to **Confirm** and **Approve** the budget." msgstr "" -#: ../../accounting/others/adviser/budget.rst:114 +#: ../../accounting/others/adviser/budget.rst:130 msgid "Check your budget" msgstr "" -#: ../../accounting/others/adviser/budget.rst:116 +#: ../../accounting/others/adviser/budget.rst:132 msgid "You can check your budget at any time. To see the evolution, let's book some Invoices and Vendors Bills." msgstr "" -#: ../../accounting/others/adviser/budget.rst:121 +#: ../../accounting/others/adviser/budget.rst:137 msgid "if you use analytical accounts remember that you need to specify the account in the invoice and / or purchase line." msgstr "" -#: ../../accounting/others/adviser/budget.rst:125 +#: ../../accounting/others/adviser/budget.rst:141 msgid "for more information about booking invoices and purchase orders see:" msgstr "" -#: ../../accounting/others/adviser/budget.rst:127 +#: ../../accounting/others/adviser/budget.rst:143 msgid ":doc:`../../receivables/customer_invoices/overview`" msgstr "" -#: ../../accounting/others/adviser/budget.rst:129 +#: ../../accounting/others/adviser/budget.rst:145 msgid "Go back in the budget list and find the Smith Project." msgstr "" -#: ../../accounting/others/adviser/budget.rst:131 +#: ../../accounting/others/adviser/budget.rst:147 msgid "Via the analytical account, Odoo can account the invoice lines and purchase lines booked in the accounts and will display them in the **Practical Amount** column." msgstr "" -#: ../../accounting/others/adviser/budget.rst:140 +#: ../../accounting/others/adviser/budget.rst:156 msgid "The theoretical amount represents the amount of money you theoretically could have spend / should have received in function of the date. When your budget is 1200 for 12 months (january to december), and today is 31 of january, the theoretical amount will be 1000, since this is the actual amount that could have been realised." msgstr "" @@ -3623,6 +4114,10 @@ msgstr "" msgid "For more information on how to create a sales order based on time and material please see: *How to invoice based on time and material* (Work in Progress)." msgstr "" +#: ../../accounting/others/analytic/timesheets.rst:79 +msgid "Add a link, and the document is under Sales --> Invoicing Methods --> Services --> How to invoices blabla" +msgstr "" + #: ../../accounting/others/analytic/timesheets.rst:82 msgid "We save a Sales Order with the service product **External Consulting**. An analytical account will automatically be generated once the **Sales Order** is confirmed. Our employees will have to point to that account (in this case **SO002-Smith&Co**) in order to be able to invoice their hours (see picture below)." msgstr "" @@ -3818,9 +4313,9 @@ msgstr "" #: ../../accounting/others/analytic/usage.rst:64 #: ../../accounting/others/analytic/usage.rst:157 -#: ../../accounting/others/taxes/cash_basis_taxes.rst:48 -#: ../../accounting/others/taxes/cash_basis_taxes.rst:62 -#: ../../accounting/others/taxes/cash_basis_taxes.rst:74 +#: ../../accounting/others/taxes/cash_basis_taxes.rst:54 +#: ../../accounting/others/taxes/cash_basis_taxes.rst:68 +#: ../../accounting/others/taxes/cash_basis_taxes.rst:80 #: ../../accounting/overview/process_overview/customer_invoice.rst:107 #: ../../accounting/overview/process_overview/customer_invoice.rst:128 msgid "**Debit**" @@ -3828,9 +4323,9 @@ msgstr "" #: ../../accounting/others/analytic/usage.rst:64 #: ../../accounting/others/analytic/usage.rst:157 -#: ../../accounting/others/taxes/cash_basis_taxes.rst:48 -#: ../../accounting/others/taxes/cash_basis_taxes.rst:62 -#: ../../accounting/others/taxes/cash_basis_taxes.rst:74 +#: ../../accounting/others/taxes/cash_basis_taxes.rst:54 +#: ../../accounting/others/taxes/cash_basis_taxes.rst:68 +#: ../../accounting/others/taxes/cash_basis_taxes.rst:80 #: ../../accounting/overview/process_overview/customer_invoice.rst:107 #: ../../accounting/overview/process_overview/customer_invoice.rst:128 msgid "**Credit**" @@ -4272,6 +4767,42 @@ 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 "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 "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:86 msgid "View *Create Account* in our Online Demonstration" msgstr "" @@ -5553,63 +6084,67 @@ msgid "You first have to activate the setting in :menuselection:`Accounting --> msgstr "" #: ../../accounting/others/taxes/cash_basis_taxes.rst:27 -msgid "Once this is done, you can configure your taxes in :menuselection:`Accounting --> Configuration --> Taxes`. You can open a tax and in the *Advanced Options* tab you will see the checkbox *Use Cash Basis*. You will then have to define the *Tax Received Account*." +msgid "Once this is done, you can configure your taxes in :menuselection:`Accounting --> Configuration --> Taxes`. At first set the proper transitional accounts to post taxes until you register the payment." msgstr "" -#: ../../accounting/others/taxes/cash_basis_taxes.rst:39 +#: ../../accounting/others/taxes/cash_basis_taxes.rst:35 +msgid "In the *Advanced Options* tab you will turn *Tax Due* to *Based on Payment*. You will then have to define the *Tax Received* account in which to post the tax amount when the payment is received and the *Base Tax Received Account* to post the base tax amount for an accurate tax report." +msgstr "" + +#: ../../accounting/others/taxes/cash_basis_taxes.rst:45 msgid "What is the impact of cash basis taxes in my accounting ?" msgstr "" -#: ../../accounting/others/taxes/cash_basis_taxes.rst:41 +#: ../../accounting/others/taxes/cash_basis_taxes.rst:47 msgid "Let’s take an example. You make a sale of $100 with a 15% cash basis tax. When you validate the customer invoice, the following entry is created in your accounting:" msgstr "" -#: ../../accounting/others/taxes/cash_basis_taxes.rst:46 +#: ../../accounting/others/taxes/cash_basis_taxes.rst:52 msgid "Customer Invoices Journal" msgstr "" -#: ../../accounting/others/taxes/cash_basis_taxes.rst:50 -#: ../../accounting/others/taxes/cash_basis_taxes.rst:66 +#: ../../accounting/others/taxes/cash_basis_taxes.rst:56 +#: ../../accounting/others/taxes/cash_basis_taxes.rst:72 msgid "Receivables $115" msgstr "" -#: ../../accounting/others/taxes/cash_basis_taxes.rst:52 -#: ../../accounting/others/taxes/cash_basis_taxes.rst:76 -msgid "Tax Account $15" -msgstr "" - -#: ../../accounting/others/taxes/cash_basis_taxes.rst:54 -#: ../../accounting/others/taxes/cash_basis_taxes.rst:80 +#: ../../accounting/others/taxes/cash_basis_taxes.rst:58 #: ../../accounting/others/taxes/cash_basis_taxes.rst:82 -msgid "Income Account $100" -msgstr "" - -#: ../../accounting/others/taxes/cash_basis_taxes.rst:57 -msgid "A few days later, you receive the payment:" +msgid "Temporary Tax Account $15" msgstr "" #: ../../accounting/others/taxes/cash_basis_taxes.rst:60 +#: ../../accounting/others/taxes/cash_basis_taxes.rst:86 +#: ../../accounting/others/taxes/cash_basis_taxes.rst:88 +msgid "Income Account $100" +msgstr "" + +#: ../../accounting/others/taxes/cash_basis_taxes.rst:63 +msgid "A few days later, you receive the payment:" +msgstr "" + +#: ../../accounting/others/taxes/cash_basis_taxes.rst:66 msgid "Bank Journal" msgstr "" -#: ../../accounting/others/taxes/cash_basis_taxes.rst:64 +#: ../../accounting/others/taxes/cash_basis_taxes.rst:70 msgid "Bank $115" msgstr "" -#: ../../accounting/others/taxes/cash_basis_taxes.rst:69 +#: ../../accounting/others/taxes/cash_basis_taxes.rst:75 msgid "When you reconcile the invoice and the payment, this entry is generated:" msgstr "" -#: ../../accounting/others/taxes/cash_basis_taxes.rst:72 +#: ../../accounting/others/taxes/cash_basis_taxes.rst:78 msgid "Tax Cash Basis Journal" msgstr "" -#: ../../accounting/others/taxes/cash_basis_taxes.rst:78 +#: ../../accounting/others/taxes/cash_basis_taxes.rst:84 msgid "Tax Received Account $15" msgstr "" -#: ../../accounting/others/taxes/cash_basis_taxes.rst:86 -msgid "The two journal items created in the Income Account are neutral but they are needed to insure correct tax reports in Odoo." +#: ../../accounting/others/taxes/cash_basis_taxes.rst:92 +msgid "The last two journal items are neutral but they are needed to insure correct tax reports in Odoo with accurate base tax amounts. We advise to use a default revenue account. The balance of this account will then always be at zero." msgstr "" #: ../../accounting/others/taxes/create.rst:3 @@ -5686,7 +6221,7 @@ msgstr "" #: ../../accounting/others/taxes/create.rst:69 #: ../../accounting/others/taxes/default_taxes.rst:28 -#: ../../accounting/others/taxes/taxcloud.rst:87 +#: ../../accounting/others/taxes/taxcloud.rst:72 msgid ":doc:`application`" msgstr "" @@ -5819,79 +6354,83 @@ msgid "By default prices displayed in your eCommerce catalog are tax-excluded. T msgstr "" #: ../../accounting/others/taxes/taxcloud.rst:3 -msgid "How to get correct tax rates in the US thanks to TaxCloud" +msgid "How to get correct tax rates in the United States using TaxCloud" msgstr "" #: ../../accounting/others/taxes/taxcloud.rst:5 -msgid "The **TaxCloud** integration allows you to calculate the sales tax for every address in the United States and keeps track of which product types are exempt from sales tax and in which states each exemption applies. TaxCloud calculates sales tax in real-time for every state, city, and special jurisdiction in the United States." +msgid "The **TaxCloud** integration allows you to correctly calculate the sales tax for every address in the United States and keeps track of which products are exempt from sales tax and in which states each exemption applies. TaxCloud calculates sales tax in real-time for every state, city, and special jurisdiction in the United States." msgstr "" #: ../../accounting/others/taxes/taxcloud.rst:15 -msgid "In Tax Cloud" +msgid "In TaxCloud" msgstr "" #: ../../accounting/others/taxes/taxcloud.rst:16 -msgid "Create a free account on `*TaxCloud* `__ website." +msgid "Create a free account on `TaxCloud `__ website." msgstr "" #: ../../accounting/others/taxes/taxcloud.rst:18 -msgid "Register your website on TaxCloud to get an *API ID* and an *API Key*." +msgid "Register your Odoo website on TaxCloud to get an *API ID* and an *API Key*." +msgstr "" + +#: ../../accounting/others/taxes/taxcloud.rst:23 +msgid "In Settings on TaxCloud, click *Locations* to enter the location of your Office(s) & Warehouse(s)." msgstr "" #: ../../accounting/others/taxes/taxcloud.rst:24 +msgid "In Settings on TaxCloud, click *Manage Tax States* to verify the states where you collect sales tax." +msgstr "" + +#: ../../accounting/others/taxes/taxcloud.rst:27 msgid "In Odoo" msgstr "" -#: ../../accounting/others/taxes/taxcloud.rst:25 -msgid "Go to :menuselection:`Invoicing/Accounting --> Configuration --> Settings` and check *Compute sales tax automatically using TaxCloud*. Click *Apply*." +#: ../../accounting/others/taxes/taxcloud.rst:28 +msgid "Go to :menuselection:`Invoicing / Accounting --> Configuration --> Settings` and check *TaxCloud - Compute tax rates based on U.S. ZIP codes*." +msgstr "" + +#: ../../accounting/others/taxes/taxcloud.rst:30 +msgid "Enter your TaxCloud credentials." msgstr "" #: ../../accounting/others/taxes/taxcloud.rst:31 -msgid "Still in those settings, enter your TaxCloud credentials." +msgid "Click SAVE to store your credentials." msgstr "" -#: ../../accounting/others/taxes/taxcloud.rst:32 -msgid "Hit *Sync TaxCloud Categories (TIC)* to import TIC product categories from TaxCloud (Taxability Information Codes). Some categories may imply specific rates." +#: ../../accounting/others/taxes/taxcloud.rst:36 +msgid "Click the Refresh Icon next to *Default Category* to import the TIC product categories from TaxCloud (Taxability Information Codes). Some categories may imply specific rates." msgstr "" -#: ../../accounting/others/taxes/taxcloud.rst:39 -msgid "Set default *TIC Code* and taxe rates. This will apply to any new product created. A default sales tax is needed to trigger the tax computation." +#: ../../accounting/others/taxes/taxcloud.rst:38 +msgid "Select your default *TIC Code*. This will apply to any new product created." msgstr "" -#: ../../accounting/others/taxes/taxcloud.rst:43 -msgid "For products under a specific category, select it in its detail form (in *Sales* tab)." +#: ../../accounting/others/taxes/taxcloud.rst:40 +msgid "Set a specific TaxCloud Category on the *General Information* tab of the Product, or on the Product Category." msgstr "" -#: ../../accounting/others/taxes/taxcloud.rst:46 -msgid "Make sure your company address is well defined (especially the state and the zip code). Go to :menuselection:`Settings --> General Settings` and click *Configure your company data*." +#: ../../accounting/others/taxes/taxcloud.rst:42 +msgid "Make sure your company address is complete (including the state and the zip code). Go to :menuselection:`Settings --> Users & Companies --> Companies` to open and edit your Company record." msgstr "" -#: ../../accounting/others/taxes/taxcloud.rst:51 +#: ../../accounting/others/taxes/taxcloud.rst:47 msgid "How it works" msgstr "" -#: ../../accounting/others/taxes/taxcloud.rst:53 -msgid "Automatic tax assignation works thanks to fiscal positions (see :doc:`application`). A specific fiscal position is created when installing *TaxCloud*. Everything works out-of-the-box." +#: ../../accounting/others/taxes/taxcloud.rst:49 +msgid "Salestax is calculated in Odoo based on fiscal positions (see :doc:`application`). A Fiscal Position for the United States is created when installing *TaxCloud*. Everything works out-of-the-box." msgstr "" -#: ../../accounting/others/taxes/taxcloud.rst:58 -msgid "This fiscal position is set on any sales order, web order, or invoice when the customer country is *United States*. This is triggering the automated tax computation." +#: ../../accounting/others/taxes/taxcloud.rst:54 +msgid "You can configure Odoo to automtically detect which Customers should use this fiscal position. Go to :menuselection:`Accounting --> Configuration --> Fiscal Positions` to open and edit the record." msgstr "" -#: ../../accounting/others/taxes/taxcloud.rst:65 -msgid "Add a product with a default sales tax. Odoo will automatically send a request to TaxCloud, get the correct tax percentage based on the customer location (state and zip code) and product TIC category, create a new tax rate if that tax percentage does not already exist in your system and return it in the order item line (e.g. 7.0%)." +#: ../../accounting/others/taxes/taxcloud.rst:61 +msgid "Now, this fiscal position is automatically set on any sales order, web order, or invoice when the customer country is *United States*. This triggers the automated tax computation." msgstr "" -#: ../../accounting/others/taxes/taxcloud.rst:75 -msgid "How to create specific tax mappings using TaxCloud" -msgstr "" - -#: ../../accounting/others/taxes/taxcloud.rst:77 -msgid "You can create several fiscal positions using TaxCloud. Check *Use TaxCloud API* to do so. Such fiscal postions can be assigned to customers in their detail form in order to get them by default whenever they buy you something." -msgstr "" - -#: ../../accounting/others/taxes/taxcloud.rst:86 -msgid ":doc:`default_taxes`" +#: ../../accounting/others/taxes/taxcloud.rst:68 +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/overview/getting_started.rst:3 @@ -6187,7 +6726,7 @@ msgid "Of course, Odoo is mobile too. You can use it to check your accounts on t msgstr "" #: ../../accounting/overview/main_concepts/intro.rst:41 -msgid "Try Odoo now, and join 2 millions of happy users." +msgid "Try Odoo now, and join 2 million happy users." msgstr "" #: ../../accounting/overview/main_concepts/memento.rst:5 @@ -6676,7 +7215,7 @@ msgid "Open or Pro-forma invoices" msgstr "" #: ../../accounting/overview/process_overview/customer_invoice.rst:73 -msgid "An invoice will usually include the quantity and price the of goods and/or services, the date, any parties involved, the unique invoice number, and any tax information." +msgid "An invoice will usually include the quantity and the price of goods and/or services, the date, any parties involved, the unique invoice number, and any tax information." msgstr "" #: ../../accounting/overview/process_overview/customer_invoice.rst:77 @@ -6819,7 +7358,7 @@ msgid "Balance sheet" msgstr "" #: ../../accounting/overview/process_overview/customer_invoice.rst:225 -msgid "The balance sheet summarizes the your company's liabilities, assets and equity at a specific moment in time." +msgid "The balance sheet summarizes your company's liabilities, assets and equity at a specific moment in time." msgstr "" #: ../../accounting/overview/process_overview/customer_invoice.rst:234 @@ -7159,6 +7698,10 @@ msgstr "" msgid "To invoice the customer, just click on the invoice button on his sale order. (or it will be done automatically at the end of the week/month if you invoice all your orders in batch)" msgstr "" +#: ../../accounting/payables/misc/employee_expense.rst:171 +msgid "tip If you want to learn more; check the documentation page :doc: ../../../sale/invoicing/service/expense `*How to re-invoice expenses to your customers* `__" +msgstr "" + #: ../../accounting/payables/misc/employee_expense.rst:176 msgid "Reimburse the employee" msgstr "" @@ -7704,6 +8247,14 @@ msgstr "" msgid ":doc:`check`" msgstr "" +#: ../../accounting/payables/pay/sepa.rst:134 +msgid "How to define a new bank?" +msgstr "" + +#: ../../accounting/payables/pay/sepa.rst:135 +msgid "How to reconcile bank statements?" +msgstr "" + #: ../../accounting/payables/supplier_bills/bills_or_receipts.rst:3 msgid "When should I use supplier bills or purchase receipts?" msgstr "" @@ -7801,7 +8352,7 @@ msgid "Installing the Purchase and Inventory applications" msgstr "" #: ../../accounting/payables/supplier_bills/manage.rst:36 -msgid "From the **Apps** application, search for the **Purchase** module and install it. Due to certain dependencies, Installing Purchase will automatically install the **Inventory** and **Accounting** applications." +msgid "From the **Apps** application, search for the **Purchase** module and install it. Due to certain dependencies, installing Purchase will automatically install the **Inventory** and **Accounting** applications." msgstr "" #: ../../accounting/payables/supplier_bills/manage.rst:41 @@ -7809,11 +8360,11 @@ msgid "Creating products" msgstr "" #: ../../accounting/payables/supplier_bills/manage.rst:43 -msgid "Creating products in Odoo is essential for quick and efficient purchasing within Odoo. Simply navigate to the Products submenu under Purchase, and click create." +msgid "Creating products in Odoo is essential for quick and efficient purchasing within Odoo. Simply navigate to the Products submenu under Purchase and click create." msgstr "" #: ../../accounting/payables/supplier_bills/manage.rst:50 -msgid "When creating the product, Pay attention to the **Product Type** field, as it is important:" +msgid "When creating the product, pay attention to the **Product Type** field, since it is important:" msgstr "" #: ../../accounting/payables/supplier_bills/manage.rst:53 @@ -7825,7 +8376,7 @@ msgid "Conversely, products that are set as a **Service or Digital Product** wil msgstr "" #: ../../accounting/payables/supplier_bills/manage.rst:65 -msgid "It is recommended that you create a **Miscellaneous** product for all purchases that occur infrequently and do not require inventory valuation or management. If you create such a product, it is recommend to set the product type to **Service**." +msgid "It is recommended that you create a **Miscellaneous** product for all purchases that occur infrequently and do not require inventory valuation or management. If you create such a product, it is recommended to set the product type to **Service**." msgstr "" #: ../../accounting/payables/supplier_bills/manage.rst:70 @@ -7849,15 +8400,15 @@ msgid "Receiving Products" msgstr "" #: ../../accounting/payables/supplier_bills/manage.rst:91 -msgid "If you purchased any stockable products that you manage the inventory of, you will need to receive the products from the Inventory application after you confirm a Purchase Order. From the **Inventory dashboard**, you should see a button linking you directly to the transfer of products. This button is outlined in red below:" +msgid "If you purchased any stockable products that you manage the inventory of, you will need to receive the products from the Inventory application after you confirm a purchase order. From the **Inventory dashboard**, you should see a button linking you directly to the transfer of products. This button is outlined in red below:" msgstr "" #: ../../accounting/payables/supplier_bills/manage.rst:100 -msgid "Navigating this route will take you to a list of all orders awaiting to be received." +msgid "Navigating this route will take you to a list of all orders waiting to be received." msgstr "" #: ../../accounting/payables/supplier_bills/manage.rst:106 -msgid "If you have a lot of awaiting orders, apply a filter using the search bar in the upper right. With this search bar, you may filter based on the Vendor (Partner), the product, or the source document, also known as the reference of your purchase order. You also have the capability to group the orders by different criteria under **Group By**. Selecting an item from this list will open the following screen where you then will receive the products." +msgid "If you have a lot of awaiting orders, apply a filter using the search bar in the upper right. With this search bar, you may filter based on the vendor (partner), the product, or the source document (also known as the reference of your purchase order). You can also group the orders by different criteria under **Group By**. Selecting an item from this list will open the following screen where you then will receive the products." msgstr "" #: ../../accounting/payables/supplier_bills/manage.rst:117 @@ -7869,15 +8420,15 @@ msgid "Managing Vendor Bills" msgstr "" #: ../../accounting/payables/supplier_bills/manage.rst:122 -msgid "When you receive a Vendor Bill for a previous purchase, be sure to record it in the Purchases application under the **Control Menu**. You need to create a new vendor bill even if you already registered a purchase order." +msgid "When you receive a vendor bill for a previous purchase, be sure to record it in the Purchases application under the **Control Menu**. You need to create a new vendor bill even if you already registered a purchase order." msgstr "" #: ../../accounting/payables/supplier_bills/manage.rst:130 -msgid "The first thing you will need to do upon creating a Vendor Bill is to select the appropriate Vendor as this will also pull up any associated accounting or pricelist information. From there, you can choose to specify any one or multiple Purchase Orders to populate the Vendor Bill with. When you select a Purchase Order from the list, Odoo will pull any uninvoiced products associated to that Purchase Order and automatically populate that information below. If you are having a hard time finding the appropriate Vendor bill, you may search through the list by inputting the vendor reference number or your internal purchase order number." +msgid "The first thing you will need to do upon creating a vendor bill is to select the appropriate vendor, since doing so will also pull up any associated accounting or pricelist information. From there, you can choose to specify one or multiple Purchase Orders to populate the Vendor Bill with. When you select a Purchase Order from the list, Odoo will pull any uninvoiced products associated to that Purchase Order and automatically populate that information below. If you are having a hard time finding the appropriate vendor bill, you may search through the list by inputting the vendor reference number or your internal purchase order number." msgstr "" #: ../../accounting/payables/supplier_bills/manage.rst:144 -msgid "While the invoice is in draft state, you can make any modifications you need (i.e. remove or add product lines, modify quantities, and change prices)." +msgid "While the invoice is in a draft state, you can make any modifications you need (i.e. remove or add product lines, modify quantities, and change prices)." msgstr "" #: ../../accounting/payables/supplier_bills/manage.rst:150 @@ -7905,19 +8456,19 @@ msgid "What to do if your vendor bill does not match what you received" msgstr "" #: ../../accounting/payables/supplier_bills/manage.rst:169 -msgid "If the bill you receive from the vendor has different quantities than what Odoo automatically populates as quantities, this could be due to several reasons:" +msgid "If the bill you receive from the vendor has quantities that do not match the quantities automatically populated by Odoo, this could be due to several reasons:" msgstr "" #: ../../accounting/payables/supplier_bills/manage.rst:173 -msgid "the vendor is incorrectly charging you for products and/or services that you have not ordered," +msgid "The vendor is incorrectly charging you for products and/or services that you have not ordered." msgstr "" #: ../../accounting/payables/supplier_bills/manage.rst:176 -msgid "the vendor is billing you for products that you might not have received yet, as the invoicing control may be based on ordered or received quantities," +msgid "The vendor is billing you for products that you might not have received yet, as the invoicing control may be based on ordered or received quantities." msgstr "" #: ../../accounting/payables/supplier_bills/manage.rst:180 -msgid "or the vendor did not bill you for previously purchased products." +msgid "The vendor did not bill you for previously purchased products." msgstr "" #: ../../accounting/payables/supplier_bills/manage.rst:182 @@ -7929,15 +8480,15 @@ msgid "If you are unable to find a purchase order related to a vendor bill, this msgstr "" #: ../../accounting/payables/supplier_bills/manage.rst:189 -msgid "the vendor has already invoiced you for this purchase order, therefore it is not going to appear anywhere in the selection," +msgid "The vendor has already invoiced you for this purchase order; therefore it is not going to appear anywhere in the selection." msgstr "" #: ../../accounting/payables/supplier_bills/manage.rst:192 -msgid "someone in the company forgot to record a purchase order for this vendor," +msgid "Someone in the company forgot to record a purchase order for this vendor." msgstr "" #: ../../accounting/payables/supplier_bills/manage.rst:195 -msgid "or the vendor is charging you for something you did not order." +msgid "The vendor is charging you for something you did not order." msgstr "" #: ../../accounting/payables/supplier_bills/manage.rst:200 @@ -7969,7 +8520,7 @@ msgid "Batch Billing" msgstr "" #: ../../accounting/payables/supplier_bills/manage.rst:225 -msgid "When creating a vendor bill and selecting the appropriate purchase order, you may continue to select additional purchase orders and Odoo will add the additional line items from that purchase order.. If you have not deleted the previous line items from the first purchase order the bill will be linked to all the appropriate purchase orders." +msgid "When creating a vendor bill and selecting the appropriate purchase order, you may continue to select additional purchase orders. Odoo will add the additional line items from the purchase orders you select. If you have not deleted the previous line items from the first purchase order, the bill will be linked to all the appropriate purchase orders." msgstr "" #: ../../accounting/receivables.rst:3 @@ -8373,6 +8924,10 @@ msgstr "" msgid "This process is good for both services and physical products." msgstr "" +#: ../../accounting/receivables/customer_invoices/overview.rst:44 +msgid "Read more: *Invoice based on sales orders.*" +msgstr "" + #: ../../accounting/receivables/customer_invoices/overview.rst:47 msgid "Sales Order ‣ Delivery Order ‣ Invoice" msgstr "" @@ -8385,6 +8940,10 @@ msgstr "" msgid "This way, if you deliver a partial order, you only invoice for what you really delivered. If you do back orders (deliver partially and the rest later), the customer will receive two invoices, one for each delivery order." msgstr "" +#: ../../accounting/receivables/customer_invoices/overview.rst:59 +msgid "Read more: *Invoice based on delivery orders.*" +msgstr "" + #: ../../accounting/receivables/customer_invoices/overview.rst:62 msgid "eCommerce Order ‣ Invoice" msgstr "" @@ -8429,6 +8988,10 @@ msgstr "" msgid "You can invoice at the end of the contract or trigger intermediate invoices. This approach is used by services companies that invoice mostly based on time and material. For services companies that invoice on fix price, they use a regular sales order." msgstr "" +#: ../../accounting/receivables/customer_invoices/overview.rst:94 +msgid "Read more: - *How to invoice based on time and material?* - *How to manage contracts and invoicing plans?*" +msgstr "" + #: ../../accounting/receivables/customer_invoices/overview.rst:99 msgid "Recurring Contracts ‣ Invoices" msgstr "" @@ -8437,6 +9000,10 @@ msgstr "" msgid "For subscriptions, an invoice is triggered periodically, automatically. The frequency of the invoicing and the services/products invoiced are defined on the contract." msgstr "" +#: ../../accounting/receivables/customer_invoices/overview.rst:105 +msgid "Read more: *Subscription based invoicing.*" +msgstr "" + #: ../../accounting/receivables/customer_invoices/overview.rst:111 msgid "Creating an invoice manually" msgstr "" @@ -8501,6 +9068,10 @@ msgstr "" msgid "A payment term may have one line (ex: 21 days) or several lines (10% within 3 days and the balance within 21 days). If you create a payment term with several lines, be sure the latest one is the balance. (avoid doing 50% in 10 days and 50% in 21 days because, with the rounding, it may not do exactly 100%)" msgstr "" +#: ../../accounting/receivables/customer_invoices/payment_terms.rst:31 +msgid "screenshot payment term forms, after QDP have commited the change planned on this object" +msgstr "" + #: ../../accounting/receivables/customer_invoices/payment_terms.rst:35 msgid "Using Payment Terms" msgstr "" diff --git a/locale/sources/crm.pot b/locale/sources/crm.pot index 479b3e068..3cbf53391 100644 --- a/locale/sources/crm.pot +++ b/locale/sources/crm.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: Odoo 12.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-07-03 08:44+0200\n" +"POT-Creation-Date: 2019-09-16 15:50+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -97,7 +97,7 @@ msgid "|image0|\\ |image1|" msgstr "" #: ../../crm/acquire_leads/generate_from_website.rst:16 -msgid "With the CRM app installed, you benefit from ready-to-use contact form on your Odoo website that will generate leads/opportunities automatically." +msgid "With the CRM app installed, you benefit from a ready-to-use contact form on your Odoo website that will generate leads/opportunities automatically." msgstr "" #: ../../crm/acquire_leads/generate_from_website.rst:23 @@ -110,23 +110,23 @@ msgid "Create a custom contact form" msgstr "" #: ../../crm/acquire_leads/generate_from_website.rst:34 -msgid "You may want to know more from your visitor when they use the contact form to contact you. You will then need to build a custom contact form on your website. Those contact forms can generate multiple types of records in the system (emails, leads/opportunities, project tasks, helpdesk tickets, etc...)" +msgid "You may want to know more from your visitor when they use the contact form to you will need to build a custom contact form on your website. These contact forms can generate multiple types of records in the system (emails, leads/opportunities, project tasks, helpdesk tickets, etc.)" msgstr "" #: ../../crm/acquire_leads/generate_from_website.rst:43 -msgid "You will need to install the free *Form Builder* module. Only available in Odoo Enterprise." +msgid "You will need to install the free *Form Builder* module, only available in Odoo Enterprise." msgstr "" #: ../../crm/acquire_leads/generate_from_website.rst:52 -msgid "From any page you want your contact form to be in, in edit mode, drag the form builder in the page and you will be able to add all the fields you wish." +msgid "First, go to the page where you want to put your contact form. In edit mode, drag the form builder onto the page, and you will be able to add all the fields you wish." msgstr "" #: ../../crm/acquire_leads/generate_from_website.rst:59 -msgid "By default any new contact form will send an email, you can switch to lead/opportunity generation in *Change Form Parameters*." +msgid "By default, any new contact form will send an email. You can switch to lead/opportunity generation in *Change Form Parameters*." msgstr "" #: ../../crm/acquire_leads/generate_from_website.rst:63 -msgid "If the same visitor uses the contact form twice, the second information will be added to the first lead/opportunity in the chatter." +msgid "If the same visitor uses the contact form twice, the second entry will be added to the first lead/opportunity in the chatter." msgstr "" #: ../../crm/acquire_leads/generate_from_website.rst:67 @@ -134,7 +134,7 @@ msgid "Generate leads instead of opportunities" msgstr "" #: ../../crm/acquire_leads/generate_from_website.rst:69 -msgid "When using a contact form, it is advised to use a qualification step before assigning to the right sales people. To do so, activate *Leads* in CRM settings and refer to :doc:`convert`." +msgid "When using a contact form, you should use a qualification step before assigning the form to the right sales people. To do so, activate *Leads* in CRM settings and refer to :doc:`convert`." msgstr "" #: ../../crm/acquire_leads/send_quotes.rst:3 diff --git a/locale/sources/db_management.pot b/locale/sources/db_management.pot index 575d4ee0e..a15b4e629 100644 --- a/locale/sources/db_management.pot +++ b/locale/sources/db_management.pot @@ -6,9 +6,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: Odoo 11.0\n" +"Project-Id-Version: Odoo 12.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-07-27 11:08+0200\n" +"POT-Creation-Date: 2019-09-16 15:50+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -93,123 +93,167 @@ msgid "Upgrade" msgstr "" #: ../../db_management/db_online.rst:53 -msgid "Make sure to be connected to the database you want to upgrade and access the database management page. On the line of the database you want to upgrade, click on the \"Upgrade\" button." +msgid "Upgrading your database to a newer version of Odoo is a complex operation that require time and caution. It is extremely important that you fully test the process before upgrading your production database." +msgstr "" + +#: ../../db_management/db_online.rst:57 +msgid "Odoo releases new versions regularly (at least once a year), and upgrading your database to enjoy new Odoo features is part of the Odoo Online experience." msgstr "" #: ../../db_management/db_online.rst:60 -msgid "You have the possibility to choose the target version of the upgrade. By default, we select the highest available version available for your database; if you were already in the process of testing a migration, we will automatically select the version you were already testing (even if we released a more recent version during your tests)." +msgid "The upgrade process can take some time, especially if you use multiple apps or apps that manage sensitive data (e.g. Accounting, Inventory, etc.). In general, the 'smaller' the database, the quickest the upgrade. A single-user database that uses only CRM will be processed faster than a multi-company, multi-user database that uses Accounting, Sales, Purchase and Manufacturing." msgstr "" #: ../../db_management/db_online.rst:66 -msgid "By clicking on the \"Test upgrade\" button an upgrade request will be generated. If our automated system does not encounter any problem, you will receive a \"Test\" version of your upgraded database." +msgid "Unfortunately, it is impossible to give time estimates for every upgrade request, since Odoo.com will test manually every database upgrade at least once and will need to correct/adapt changes made to the standard Odoo Apps (e.g. through Studio or through a Success Pack) on a case-by-case basis. This can make the process slower, since requests are treated in the order they arrive. This is especially true in the months following the release of a new major version, which can lengthen the upgrade delay significantly." msgstr "" -#: ../../db_management/db_online.rst:73 -msgid "If our automatic system detect an issue during the creation of your test database, our dedicated team will have to work on it. You will be notified by email and the process will take up to 4 weeks." +#: ../../db_management/db_online.rst:74 +msgid "The upgrade process is quite simple from your point of view:" +msgstr "" + +#: ../../db_management/db_online.rst:76 +msgid "You request a test upgrade" msgstr "" #: ../../db_management/db_online.rst:77 -msgid "You will have the possibility to test it for 1 month. Inspect your data (e.g. accounting reports, stock valuation, etc.), check that all your usual flows work correctly (CRM flow, Sales flow, etc.)." +msgid "Once all tests have been validated **by you**, you upgrade your actual database" +msgstr "" + +#: ../../db_management/db_online.rst:79 +msgid "The process to request a test or a production (*actual*) upgrade is the same." msgstr "" #: ../../db_management/db_online.rst:81 -msgid "Once you are ready and that everything is correct in your test migration, you can click again on the Upgrade button, and confirm by clicking on Upgrade (the button with the little rocket!) to switch your production database to the new version." +msgid "First, make sure to be connected to the database you want to upgrade and access the `database management page `__." msgstr "" -#: ../../db_management/db_online.rst:89 -msgid "Your database will be taken offline during the upgrade (usually between 30min up to several hours for big databases), so make sure to plan your migration during non-business hours." +#: ../../db_management/db_online.rst:84 +msgid "You have to have an active session with access to the Settings app in the database you want to upgrade for the button to be visible." msgstr "" -#: ../../db_management/db_online.rst:96 -msgid "Duplicating a database" +#: ../../db_management/db_online.rst:87 +msgid "On the line of the database you want to upgrade, click on the \"Cog\" menu. If an newer version of Odoo is available, you will see an 'Upgrade' button." msgstr "" -#: ../../db_management/db_online.rst:98 -msgid "Database duplication, renaming, custom DNS, etc. is not available for trial databases on our Online platform. Paid Databases and \"One App Free\" database can duplicate without problem." +#: ../../db_management/db_online.rst:94 +msgid "You have the possibility to choose the target version of the upgrade. By default, we select the highest available version available for your database; if you were already in the process of testing an upgrade, we will automatically select the version you were already testing (even if we released a more recent version during your tests)." msgstr "" #: ../../db_management/db_online.rst:103 -msgid "In the line of the database you want to duplicate, you will have a few buttons. To duplicate your database, just click **Duplicate**. You will have to give a name to your duplicate, then click **Duplicate Database**." +msgid "By clicking on the \"Test upgrade\" button, an upgrade request will be generated. Only one request can be made at time for each database; if a request has already been made, you will see an 'Upgrade Queued' note instead and asking another request will not be possible." msgstr "" -#: ../../db_management/db_online.rst:110 -msgid "If you do not check the \"For testing purposes\" checkbox when duplicating a database, all external communication will remain active:" +#: ../../db_management/db_online.rst:108 +msgid "A test upgrade will create a copy of your database, upgrade it and make it available to you automatically once successful. If this is the first test you request for this particular database, a manual testing phase will be done by Odoo.com - this could take time (up to several weeks). Subsequent requests will not go through that manual testing step and will usually be made available in a few hours. Once the test database is available, you should receive an e-mail with the URL of the test database." msgstr "" -#: ../../db_management/db_online.rst:113 -msgid "Emails are sent" +#: ../../db_management/db_online.rst:116 +msgid "**Testing your database is the most important step of the upgrade process!** Even though we test all upgrades manually, we do not know your work processes. A change in standard worfklows of Odoo in new versions might require you to change internal processes, or some of the customizations you made through Odoo Studio might now work properly. *It is up to you to make sure that everything works as it should!* You can report issues with your test database through our `Support page `__." msgstr "" -#: ../../db_management/db_online.rst:115 -msgid "Payments are processed (in the e-commerce or Subscriptions apps, for example)" -msgstr "" - -#: ../../db_management/db_online.rst:118 -msgid "Delivery orders (shipping providers) are sent" -msgstr "" - -#: ../../db_management/db_online.rst:120 -msgid "Etc." -msgstr "" - -#: ../../db_management/db_online.rst:122 -msgid "Make sure to check the checkbox \"For testing purposes\" if you want these behaviours to be disabled." -msgstr "" - -#: ../../db_management/db_online.rst:125 -msgid "After a few seconds, you will be logged in your duplicated database. Notice that the url uses the name you chose for your duplicated database." +#: ../../db_management/db_online.rst:124 +msgid "Make sure to do one last test of your upgrade right before the final upgrade (e.g. the day before) to ensure everything will run smoothly. Downgrading is not possible and post-poning an upgrade is always easier than being prevented to work by an upgrade issue after the fact!" msgstr "" #: ../../db_management/db_online.rst:129 -msgid "Duplicate databases expire automatically after 15 days." -msgstr "" - -#: ../../db_management/db_online.rst:137 -msgid "Rename a Database" +msgid "Once you are ready and you have validated all your tests, you can click again on the Upgrade button and confirm by clicking on Upgrade (the button with the little rocket!) to switch your production database to the new version. Your database will then be taken offline within the next 10 minutes and will be upgraded automatically; you receive a confirmation e-mail once the process is completed." msgstr "" #: ../../db_management/db_online.rst:139 -msgid "To rename your database, make sure you are connected to the database you want to rename, access the `database management page `__ and click **Rename**. You will have to give a new name to your database, then click **Rename Database**." +msgid "Your database will be taken offline during the upgrade (usually between 30min up to several hours for big databases), so make sure to plan your migration during non-business hours." msgstr "" -#: ../../db_management/db_online.rst:150 -msgid "Deleting a Database" +#: ../../db_management/db_online.rst:146 +msgid "Duplicating a database" msgstr "" -#: ../../db_management/db_online.rst:152 -msgid "You can only delete databases of which you are the administrator." +#: ../../db_management/db_online.rst:148 +msgid "Database duplication, renaming, custom DNS, etc. is not available for trial databases on our Online platform. Paid Databases and \"One App Free\" database can duplicate without problem." msgstr "" -#: ../../db_management/db_online.rst:154 -msgid "When you delete your database all the data will be permanently lost. The deletion is instant and for all the Users. We advise you to do an instant backup of your database before deleting it, since the last automated daily backup may be several hours old at that point." +#: ../../db_management/db_online.rst:153 +msgid "In the line of the database you want to duplicate, you will have a few buttons. To duplicate your database, just click **Duplicate**. You will have to give a name to your duplicate, then click **Duplicate Database**." msgstr "" #: ../../db_management/db_online.rst:160 -msgid "From the `database management page `__, on the line of the database you want to delete, click on the \"Delete\" button." +msgid "If you do not check the \"For testing purposes\" checkbox when duplicating a database, all external communication will remain active:" msgstr "" -#: ../../db_management/db_online.rst:167 -msgid "Read carefully the warning message that will appear and proceed only if you fully understand the implications of deleting a database:" +#: ../../db_management/db_online.rst:163 +msgid "Emails are sent" msgstr "" -#: ../../db_management/db_online.rst:173 -msgid "After a few seconds, the database will be deleted and the page will reload automatically." +#: ../../db_management/db_online.rst:165 +msgid "Payments are processed (in the e-commerce or Subscriptions apps, for example)" msgstr "" -#: ../../db_management/db_online.rst:177 -msgid "If you need to re-use this database name, it will be immediately available." +#: ../../db_management/db_online.rst:168 +msgid "Delivery orders (shipping providers) are sent" +msgstr "" + +#: ../../db_management/db_online.rst:170 +msgid "Etc." +msgstr "" + +#: ../../db_management/db_online.rst:172 +msgid "Make sure to check the checkbox \"For testing purposes\" if you want these behaviours to be disabled." +msgstr "" + +#: ../../db_management/db_online.rst:175 +msgid "After a few seconds, you will be logged in your duplicated database. Notice that the url uses the name you chose for your duplicated database." msgstr "" #: ../../db_management/db_online.rst:179 +msgid "Duplicate databases expire automatically after 15 days." +msgstr "" + +#: ../../db_management/db_online.rst:187 +msgid "Rename a Database" +msgstr "" + +#: ../../db_management/db_online.rst:189 +msgid "To rename your database, make sure you are connected to the database you want to rename, access the `database management page `__ and click **Rename**. You will have to give a new name to your database, then click **Rename Database**." +msgstr "" + +#: ../../db_management/db_online.rst:200 +msgid "Deleting a Database" +msgstr "" + +#: ../../db_management/db_online.rst:202 +msgid "You can only delete databases of which you are the administrator." +msgstr "" + +#: ../../db_management/db_online.rst:204 +msgid "When you delete your database all the data will be permanently lost. The deletion is instant and for all the Users. We advise you to do an instant backup of your database before deleting it, since the last automated daily backup may be several hours old at that point." +msgstr "" + +#: ../../db_management/db_online.rst:210 +msgid "From the `database management page `__, on the line of the database you want to delete, click on the \"Delete\" button." +msgstr "" + +#: ../../db_management/db_online.rst:217 +msgid "Read carefully the warning message that will appear and proceed only if you fully understand the implications of deleting a database:" +msgstr "" + +#: ../../db_management/db_online.rst:223 +msgid "After a few seconds, the database will be deleted and the page will reload automatically." +msgstr "" + +#: ../../db_management/db_online.rst:227 +msgid "If you need to re-use this database name, it will be immediately available." +msgstr "" + +#: ../../db_management/db_online.rst:229 msgid "It is not possible to delete a database if it is expired or linked to a Subscription. In these cases contact `Odoo Support `__" msgstr "" -#: ../../db_management/db_online.rst:183 +#: ../../db_management/db_online.rst:233 msgid "If you want to delete your Account, please contact `Odoo Support `__" msgstr "" #: ../../db_management/db_premise.rst:7 -msgid "On-premise Database management" +msgid "On-premises Database management" msgstr "" #: ../../db_management/db_premise.rst:10 @@ -229,8 +273,8 @@ msgid "If you are unable to register your database, you will likely encounter th msgstr "" #: ../../db_management/db_premise.rst:31 -#: ../../db_management/db_premise.rst:97 -#: ../../db_management/db_premise.rst:130 +#: ../../db_management/db_premise.rst:110 +#: ../../db_management/db_premise.rst:143 msgid "Solutions" msgstr "" @@ -263,7 +307,7 @@ msgid "Do you have the updated version of Odoo 9?" msgstr "" #: ../../db_management/db_premise.rst:61 -#: ../../db_management/db_premise.rst:190 +#: ../../db_management/db_premise.rst:176 msgid "From July 2016 onward, Odoo 9 now automatically change the uuid of a duplicated database; a manual operation is no longer required." msgstr "" @@ -279,107 +323,95 @@ msgstr "" msgid "For your information, we identify database with UUID. Therefore, each database should have a distinct UUID to ensure that registration and invoicing proceed effortlessly for your and for us." msgstr "" +#: ../../db_management/db_premise.rst:80 +msgid "Check your network and firewall settings" +msgstr "" + #: ../../db_management/db_premise.rst:82 +msgid "The Update notification must be able to reach Odoo's subscription validation servers. In other words, make sure that the Odoo server is able to open outgoing connections towards:" +msgstr "" + +#: ../../db_management/db_premise.rst:86 +msgid "services.odoo.com on port 443 (or 80)" +msgstr "" + +#: ../../db_management/db_premise.rst:87 +msgid "services.openerp.com on port 443 (or 80) for older deployments" +msgstr "" + +#: ../../db_management/db_premise.rst:89 +msgid "Once you activated your database, you must keep these ports open, as the Update notification runs once a week." +msgstr "" + +#: ../../db_management/db_premise.rst:95 msgid "Error message due to too many users" msgstr "" -#: ../../db_management/db_premise.rst:84 +#: ../../db_management/db_premise.rst:97 msgid "If you have more users in your local database than provisionned in your Odoo Enterprise subscription, you may encounter this message:" msgstr "" -#: ../../db_management/db_premise.rst:93 +#: ../../db_management/db_premise.rst:106 msgid "When the message appears you have 30 days before the expiration. The countdown is updated everyday." msgstr "" -#: ../../db_management/db_premise.rst:99 +#: ../../db_management/db_premise.rst:112 msgid "**Add more users** on your subscription: follow the link and Validate the upsell quotation and pay for the extra users." msgstr "" -#: ../../db_management/db_premise.rst:102 +#: ../../db_management/db_premise.rst:115 msgid "or" msgstr "" -#: ../../db_management/db_premise.rst:104 +#: ../../db_management/db_premise.rst:117 msgid "**Deactivate users** as explained in this `Documentation `__ and **Reject** the upsell quotation." msgstr "" -#: ../../db_management/db_premise.rst:109 +#: ../../db_management/db_premise.rst:122 msgid "Once your database has the correct number of users, the expiration message will disappear automatically after a few days, when the next verification occurs. We understand that it can be a bit frightening to see the countdown, so you can :ref:`force an Update Notification ` to make the message disappear right away." msgstr "" -#: ../../db_management/db_premise.rst:116 +#: ../../db_management/db_premise.rst:129 msgid "Database expired error message" msgstr "" -#: ../../db_management/db_premise.rst:118 +#: ../../db_management/db_premise.rst:131 msgid "If your database reaches its expiration date before your renew your subscription, you will encounter this message:" msgstr "" -#: ../../db_management/db_premise.rst:126 +#: ../../db_management/db_premise.rst:139 msgid "This **blocking** message appears after a non-blocking message that lasts 30 days. If you fail to take action before the end of the countdown, the database is expired." msgstr "" -#: ../../db_management/db_premise.rst:134 +#: ../../db_management/db_premise.rst:147 msgid "Renew your subscription: follow the link and renew your subscription - note that" msgstr "" -#: ../../db_management/db_premise.rst:133 +#: ../../db_management/db_premise.rst:146 msgid "if you wish to pay by Wire Transfer, your subscription will effectively be renewed only when the payment arrives, which can take a few days. Credit card payments are processed immediately." msgstr "" -#: ../../db_management/db_premise.rst:136 +#: ../../db_management/db_premise.rst:149 msgid "Contact our `Support `__" msgstr "" -#: ../../db_management/db_premise.rst:138 +#: ../../db_management/db_premise.rst:151 msgid "None of those solutions worked for you? Please contact our `Support `__" msgstr "" -#: ../../db_management/db_premise.rst:145 -msgid "Force an Update Notification" -msgstr "" - -#: ../../db_management/db_premise.rst:147 -msgid "Update Notifications happen once every 7 days and keep your database up-to-date with your Odoo Enterprise subscription. If you modify your subscription (i.e. add more users, renew it for a year, etc.), your local database will only be made aware of the change once every 7 days - this can cause discrepancies between the state of your subscription and some notifications in your App Switcher. When doing such an operation on your subscription, you can force an Update using the following procedure:" -msgstr "" - -#: ../../db_management/db_premise.rst:154 -msgid "Connect to the database with the **Administrator** account" -msgstr "" - -#: ../../db_management/db_premise.rst:155 -msgid "Switch to the Developer mode by using the **About** option in the top-right menu (in V9) / in **Settings** (in V10): click on **Activate the developer mode**" -msgstr "" - -#: ../../db_management/db_premise.rst:158 -msgid "Navigate to the \"Settings\" menu, then \"Technical\" > \"Automation\" > \"Scheduled Actions\"" -msgstr "" - #: ../../db_management/db_premise.rst:160 -msgid "Find \"Update Notification\" in the list, click on it, and finally click on the button \"**RUN MANUALLY**\"" -msgstr "" - -#: ../../db_management/db_premise.rst:162 -msgid "Refresh the page, the \"Expiration\" notification should be gone" -msgstr "" - -#: ../../db_management/db_premise.rst:165 -msgid "You may have kept the same UUID on different databases and we receive information from those databases too. So please read :ref:`this documentation ` to know how to change the UUID. After the change you can force a ping to speed up the verification, your production database will then be correctly identified." -msgstr "" - -#: ../../db_management/db_premise.rst:174 msgid "Duplicate a database" msgstr "" -#: ../../db_management/db_premise.rst:176 +#: ../../db_management/db_premise.rst:162 msgid "You can duplicate your database by accessing the database manager on your server (/web/database/manager). In this page, you can easily duplicate your database (among other things)." msgstr "" -#: ../../db_management/db_premise.rst:184 +#: ../../db_management/db_premise.rst:170 msgid "When you duplicate a local database, it is **strongly** advised to change the duplicated database's uuid (Unniversally Unique Identifier), since this uuid is how your database identifies itself with our servers. Having two databases with the same uuid could result in invoicing problems or registration problems down the line." msgstr "" -#: ../../db_management/db_premise.rst:193 +#: ../../db_management/db_premise.rst:179 msgid "The database uuid is currently accessible from the menu **Settings > Technical > System Parameters**, we advise you to use a `uuid generator `__ or to use the unix command ``uuidgen`` to generate a new uuid. You can then simply replace it like any other record by clicking on it and using the edit button." msgstr "" diff --git a/locale/sources/discuss.pot b/locale/sources/discuss.pot index 060e36072..c614d0983 100644 --- a/locale/sources/discuss.pot +++ b/locale/sources/discuss.pot @@ -6,9 +6,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: Odoo 11.0\n" +"Project-Id-Version: Odoo 12.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-10-19 10:03+0200\n" +"POT-Creation-Date: 2019-09-16 15:50+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -73,114 +73,114 @@ msgid "How to use 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 enable a SMTP relay and to allow *Any addresses* in the *Allowed senders* section. The configuration steps are explained in `Google documentation `__." +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:56 +#: ../../discuss/email_servers.rst:55 msgid "Be SPF-compliant" msgstr "" -#: ../../discuss/email_servers.rst:57 +#: ../../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:61 +#: ../../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" msgstr "" -#: ../../discuss/email_servers.rst:63 +#: ../../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" msgstr "" -#: ../../discuss/email_servers.rst:67 +#: ../../discuss/email_servers.rst:66 msgid "Find `here `__ the exact procedure to create or modify TXT records in your own domain registrar." msgstr "" -#: ../../discuss/email_servers.rst:70 +#: ../../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." msgstr "" -#: ../../discuss/email_servers.rst:73 +#: ../../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:78 +#: ../../discuss/email_servers.rst:77 msgid "Allow DKIM" msgstr "" -#: ../../discuss/email_servers.rst:79 +#: ../../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\"." msgstr "" -#: ../../discuss/email_servers.rst:87 +#: ../../discuss/email_servers.rst:86 msgid "How to manage inbound messages" msgstr "" -#: ../../discuss/email_servers.rst:89 +#: ../../discuss/email_servers.rst:88 msgid "Odoo relies on generic email aliases to fetch incoming messages." msgstr "" -#: ../../discuss/email_servers.rst:91 +#: ../../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@**)." msgstr "" -#: ../../discuss/email_servers.rst:95 +#: ../../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." msgstr "" -#: ../../discuss/email_servers.rst:99 +#: ../../discuss/email_servers.rst:98 msgid "**Original messages**: Several business objects have their own alias to create new records in Odoo from incoming emails:" msgstr "" -#: ../../discuss/email_servers.rst:102 +#: ../../discuss/email_servers.rst:101 msgid "Sales Channel (to create Leads or Opportunities in `Odoo CRM `__)," msgstr "" -#: ../../discuss/email_servers.rst:104 +#: ../../discuss/email_servers.rst:103 msgid "Support Channel (to create Tickets in `Odoo Helpdesk `__)," msgstr "" -#: ../../discuss/email_servers.rst:106 +#: ../../discuss/email_servers.rst:105 msgid "Projects (to create new Tasks in `Odoo Project `__)," msgstr "" -#: ../../discuss/email_servers.rst:108 +#: ../../discuss/email_servers.rst:107 msgid "Job Positions (to create Applicants in `Odoo Recruitment `__)," msgstr "" -#: ../../discuss/email_servers.rst:110 +#: ../../discuss/email_servers.rst:109 msgid "etc." msgstr "" -#: ../../discuss/email_servers.rst:112 +#: ../../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." msgstr "" -#: ../../discuss/email_servers.rst:116 +#: ../../discuss/email_servers.rst:115 msgid "Create the corresponding email addresses in your mail server (catchall@, bounce@, sales@, etc.)." msgstr "" -#: ../../discuss/email_servers.rst:118 +#: ../../discuss/email_servers.rst:117 msgid "Set your domain name in the General Settings." msgstr "" -#: ../../discuss/email_servers.rst:123 +#: ../../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*." msgstr "" -#: ../../discuss/email_servers.rst:132 +#: ../../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*)." msgstr "" -#: ../../discuss/email_servers.rst:139 +#: ../../discuss/email_servers.rst:138 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:147 +#: ../../discuss/email_servers.rst:146 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:154 +#: ../../discuss/email_servers.rst:153 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 840cbcf20..aedf5f5f0 100644 --- a/locale/sources/ecommerce.pot +++ b/locale/sources/ecommerce.pot @@ -6,9 +6,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: Odoo 11.0\n" +"Project-Id-Version: Odoo 12.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-10-19 10:03+0200\n" +"POT-Creation-Date: 2019-09-16 15:50+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -462,7 +462,7 @@ msgid "You can access the web page from the detail form by clicking the *Publish msgstr "" #: ../../ecommerce/maximizing_revenue/upselling.rst:3 -msgid "How to sell pricier product alternatives (upselling)" +msgid "How to sell pricier alternative products (upselling)" msgstr "" #: ../../ecommerce/maximizing_revenue/upselling.rst:5 @@ -570,7 +570,6 @@ msgid "Once ready, switch to **Production** mode." msgstr "" #: ../../ecommerce/shopper_experience/authorize.rst:30 -#: ../../ecommerce/shopper_experience/paypal.rst:74 msgid "Set up Odoo" msgstr "" @@ -587,7 +586,6 @@ msgid "To get those credentials in Authorize.Net, you can rely on *API Login ID msgstr "" #: ../../ecommerce/shopper_experience/authorize.rst:47 -#: ../../ecommerce/shopper_experience/paypal.rst:102 msgid "Go live" msgstr "" @@ -620,13 +618,11 @@ msgid "To perform ficticious transactions you can use fake card numbers provided msgstr "" #: ../../ecommerce/shopper_experience/authorize.rst:76 -#: ../../ecommerce/shopper_experience/paypal.rst:154 msgid ":doc:`payment`" msgstr "" #: ../../ecommerce/shopper_experience/authorize.rst:77 #: ../../ecommerce/shopper_experience/payment.rst:111 -#: ../../ecommerce/shopper_experience/paypal.rst:155 msgid ":doc:`payment_acquirer`" msgstr "" @@ -844,137 +840,201 @@ msgid "With other payment acquirers, you can manage the capture in their own int msgstr "" #: ../../ecommerce/shopper_experience/paypal.rst:3 -msgid "How to get paid with Paypal" +msgid "Configure your Paypal account" msgstr "" #: ../../ecommerce/shopper_experience/paypal.rst:5 -msgid "Paypal is the easiest online payment acquirer to configure. It is also the only one without any subscription fee. We definitely advise it to any starter." +msgid "Paypal is available and popular worldwide. It doesn’t charge any subscription fee and creating an account is very easy. That’s why we definitely recommend it for starters in Odoo. It works as a seamless flow where the customer is routed to Paypal website to register the payment." msgstr "" -#: ../../ecommerce/shopper_experience/paypal.rst:11 -msgid "Set up your Paypal account" +#: ../../ecommerce/shopper_experience/paypal.rst:12 +msgid "Paypal account" msgstr "" -#: ../../ecommerce/shopper_experience/paypal.rst:13 -msgid "Create a `Paypal Business Account `__ or upgrade your account to *Business account* if you have a basic account." +#: ../../ecommerce/shopper_experience/paypal.rst:14 +msgid "A business account is needed to get paid with Paypal. Create a `Paypayl Business Account `__ or upgrade your Personal account to a Business account. Go to the Paypal settings and click on *Upgrade to a Business account*. Then follow the few configuration steps." msgstr "" -#: ../../ecommerce/shopper_experience/paypal.rst:16 -msgid "Log in to `Paypal `__ and open the settings of your **Profile**." +#: ../../ecommerce/shopper_experience/paypal.rst:18 +msgid "Settings in Paypal" msgstr "" -#: ../../ecommerce/shopper_experience/paypal.rst:22 -msgid "Now enter the menu **My selling tools**." +#: ../../ecommerce/shopper_experience/paypal.rst:21 +msgid "First, let’s see how to set up your Paypal account in order to build a seamless customer experience with Odoo." msgstr "" -#: ../../ecommerce/shopper_experience/paypal.rst:27 -msgid "Let's start with the **Website Preferences**." +#: ../../ecommerce/shopper_experience/paypal.rst:23 +msgid "Log in and open the settings. Go to *Products & Services > Website payments* and click *Update* on *Website preferences*." msgstr "" #: ../../ecommerce/shopper_experience/paypal.rst:29 -msgid "Turn on **Auto Return** and enter the **Return URL**: /shop/confirmation. Verify that this address uses the correct protocol (HTTP/HTTPS)." +msgid "Auto Return" +msgstr "" + +#: ../../ecommerce/shopper_experience/paypal.rst:31 +msgid "*Auto Return* automatically redirects your customers to Odoo once the payment is processed. Check *Auto Return* and enter your domain name \"/shop/confirmation\" as *Return URL* (e.g. https://yourcompany.odoo.com/shop/confirmation)." msgstr "" #: ../../ecommerce/shopper_experience/paypal.rst:36 -msgid "Turn on **Payment Data Transfer**. When saving, an **Identity Token** is generated. You will be later requested to enter it in Odoo." +msgid "This URL is requested in Paypal but not used in practice as Odoo transmits it at each transaction. Don’t worry if you manage several sales channels or Odoo databases." msgstr "" -#: ../../ecommerce/shopper_experience/paypal.rst:43 -msgid "Then, get back to your profile to activate the **Instant Payment Notification (IPN)** in *My selling tools*." +#: ../../ecommerce/shopper_experience/paypal.rst:44 +msgid "Payment Data Transfer (PDT)" msgstr "" #: ../../ecommerce/shopper_experience/paypal.rst:46 -msgid "Enter the **Notification URL**: /payment/paypal/ipn" +msgid "*Payment Data Transfer* delivers the payment confirmation to Odoo as soon as it is processed. Without it, Odoo cannot end the sales flow. This setting must be activated as well. When saving, an *Identity Token* is generated. You will be later requested to enter it in Odoo." msgstr "" -#: ../../ecommerce/shopper_experience/paypal.rst:51 -msgid "Now you must change the encoding format of the payment request sent by Odoo to Paypal. To do so, get back to *My selling tools* and click **PayPal button language encoding** in *More Selling Tools* section." +#: ../../ecommerce/shopper_experience/paypal.rst:54 +msgid "Paypal Account Optional" msgstr "" -#: ../../ecommerce/shopper_experience/paypal.rst:58 -msgid "Then, click *More Options* and set the two default encoding formats as **UTF-8**." +#: ../../ecommerce/shopper_experience/paypal.rst:56 +msgid "We advise you to not prompt customers to log in with a Paypal account when they get to pay. Let them pay with debit/credit cards as well, or you might lose some deals. Make sure this setting is turned on." msgstr "" -#: ../../ecommerce/shopper_experience/paypal.rst:66 -msgid "If you want your customers to pay without creating a Paypal account, **Paypal Account Optional** needs to be turned on." +#: ../../ecommerce/shopper_experience/paypal.rst:63 +msgid "Instant Payment Notification (IPN)" +msgstr "" + +#: ../../ecommerce/shopper_experience/paypal.rst:65 +msgid "PDT sends order confirmations once and only once. As a result, your site must be running when it happens; otherwise, it will never receive the message. That’s why we advise to activate the *Instant Payment Notification* (IPN) on top. With IPN, delivery of order confirmations is virtually guaranteed since IPN resends a confirmation until your site acknowledges receipt." +msgstr "" + +#: ../../ecommerce/shopper_experience/paypal.rst:72 +msgid "To activate IPN, get back to *Website payments* menu and click *Update* in *Instant Payment Notification*." msgstr "" #: ../../ecommerce/shopper_experience/paypal.rst:75 -msgid "Open Paypal setup form in :menuselection:`Website or Sales or Accounting --> Settings --> Payment Acquirers+`. Enter both your **Email ID** and your **Merchant ID** and check **Use IPN**." +msgid "The *Notification URL* to set is your domain name + “payment/paypal/ipn” (e.g. https://yourcompany.odoo.com/payment/paypal/ipn)." msgstr "" -#: ../../ecommerce/shopper_experience/paypal.rst:82 -msgid "They are both provided in your Paypal profile, under :menuselection:`My business info`." +#: ../../ecommerce/shopper_experience/paypal.rst:81 +msgid "Payment Messages Format" msgstr "" -#: ../../ecommerce/shopper_experience/paypal.rst:85 -msgid "Enter your **Identity Token** in Odoo (from *Auto Return* option). To do so, open the *Settings* and activate the **Developer Mode**." +#: ../../ecommerce/shopper_experience/paypal.rst:83 +msgid "Finally make sure the encoding format of payment messages is correctly set. Go to *PayPal button language encoding*." msgstr "" -#: ../../ecommerce/shopper_experience/paypal.rst:91 -msgid "Then, go to :menuselection:`Settings --> Technical --> Parameters --> System Parameters` and create a parameter with following values:" +#: ../../ecommerce/shopper_experience/paypal.rst:89 +msgid "Click *More Options* and set the two default encoding formats as *UTF-8*." msgstr "" -#: ../../ecommerce/shopper_experience/paypal.rst:94 -msgid "Key: payment_paypal.pdt_token" +#: ../../ecommerce/shopper_experience/paypal.rst:98 +msgid "Your Paypal account is ready!" msgstr "" -#: ../../ecommerce/shopper_experience/paypal.rst:95 -msgid "Value: your Paypal *Identity Token*" +#: ../../ecommerce/shopper_experience/paypal.rst:101 +msgid "Settings in Odoo" msgstr "" -#: ../../ecommerce/shopper_experience/paypal.rst:103 -msgid "Your configuration is now ready! You can make Paypal visible on your merchant interface and activate the **Production mode**." +#: ../../ecommerce/shopper_experience/paypal.rst:104 +msgid "Activation" +msgstr "" + +#: ../../ecommerce/shopper_experience/paypal.rst:106 +msgid "Activate *Paypal* from the config bar of Sales, Invoicing and eCommerce apps, or from the configuration menu of *Payment Acquirers*." +msgstr "" + +#: ../../ecommerce/shopper_experience/paypal.rst:110 +msgid "Credentials" msgstr "" #: ../../ecommerce/shopper_experience/paypal.rst:112 -msgid "Transaction fees" +msgid "Odoo requires three Paypal credentials:" msgstr "" #: ../../ecommerce/shopper_experience/paypal.rst:114 -msgid "You can charge an extra to the customer to cover the transaction fees Paypal charges you. Once redirected to Paypal, your customer sees an extra applied to the order amount." +msgid "*Email ID* is your login email address in Paypal." msgstr "" -#: ../../ecommerce/shopper_experience/paypal.rst:117 -msgid "To activate this, go to the *Configuration* tab of Paypal config form in Odoo and check *Add Extra Fees*. Default fees for US can be seen here below." +#: ../../ecommerce/shopper_experience/paypal.rst:116 +msgid "*Merchant ID* can be found in the settings of your Paypal account, in *Profile > About the business*." msgstr "" -#: ../../ecommerce/shopper_experience/paypal.rst:123 -msgid "To apply the right fees for your country, please refer to `Paypal Fees `__." +#: ../../ecommerce/shopper_experience/paypal.rst:118 +msgid "*Paypal PDT Token* is given in *Website payments* configuration as explained here above." msgstr "" -#: ../../ecommerce/shopper_experience/paypal.rst:128 -msgid "Test the payment flow" +#: ../../ecommerce/shopper_experience/paypal.rst:124 +msgid "Transaction fees" msgstr "" -#: ../../ecommerce/shopper_experience/paypal.rst:130 -msgid "You can test the entire payment flow thanks to Paypal Sandbox accounts." +#: ../../ecommerce/shopper_experience/paypal.rst:126 +msgid "You can charge extra fees to your customers for paying with Paypal; This to cover the transaction fees Paypal charges you. Once redirected to Paypal, your customer sees an extra applied to the order amount." msgstr "" -#: ../../ecommerce/shopper_experience/paypal.rst:132 -msgid "Log in to `Paypal Developer Site `__ with your Paypal credentials. This will create two sandbox accounts:" +#: ../../ecommerce/shopper_experience/paypal.rst:129 +msgid "To activate this, go to the Configuration tab of Paypal configuration in Odoo and check *Add Extra Fees*." msgstr "" -#: ../../ecommerce/shopper_experience/paypal.rst:136 -msgid "A business account (to use as merchant, e.g. pp.merch01-facilitator@example.com)." +#: ../../ecommerce/shopper_experience/paypal.rst:135 +msgid "You can refer to `Paypal Fees `__ to set up fees." msgstr "" -#: ../../ecommerce/shopper_experience/paypal.rst:137 -msgid "A default personal account (to use as shopper, e.g. pp.merch01-buyer@example.com)." -msgstr "" - -#: ../../ecommerce/shopper_experience/paypal.rst:139 -msgid "Log in to `Paypal Sandbox `__ with the merchant account and follow the same configuration instructions." +#: ../../ecommerce/shopper_experience/paypal.rst:138 +msgid "..note:: `Traders in the EU `__ are not allowed to charge extra fees for paying with credit cards." msgstr "" #: ../../ecommerce/shopper_experience/paypal.rst:142 -msgid "Enter your sandbox credentials in Odoo and make sure Paypal is still set on *Test* mode. Also, make sure the confirmation mode of Paypal is not *Authorize & capture the amount, confirm the SO and auto-validate the invoice on acquirer confirmation*. Otherwise a confirmed invoice will be automatically generated when the transaction is completed." +msgid "Go live!" msgstr "" -#: ../../ecommerce/shopper_experience/paypal.rst:150 +#: ../../ecommerce/shopper_experience/paypal.rst:144 +msgid "Your configuration is ready to roll. Make sure *Production* mode is on. Then publish the payment method by clicking the *Published* button right next to it." +msgstr "" + +#: ../../ecommerce/shopper_experience/paypal.rst:153 +msgid "Paypal is now available in your payment form available in eCommerce, Sales and Invoicing apps. Customers are redirected to Paypal website when hitting *Pay Now*. They get back to a confirmation page in Odoo once the payment is processed." +msgstr "" + +#: ../../ecommerce/shopper_experience/paypal.rst:162 +msgid "Test environment" +msgstr "" + +#: ../../ecommerce/shopper_experience/paypal.rst:164 +msgid "You can test the entire payment flow in Odoo thanks to Paypal Sandbox accounts." +msgstr "" + +#: ../../ecommerce/shopper_experience/paypal.rst:166 +msgid "Log in to `Paypal Developer Site `__ with your Paypal credentials." +msgstr "" + +#: ../../ecommerce/shopper_experience/paypal.rst:168 +msgid "This will create two sandbox accounts:" +msgstr "" + +#: ../../ecommerce/shopper_experience/paypal.rst:170 +msgid "A business account (to use as merchant, e.g. `pp.merch01-facilitator@example.com `__)." +msgstr "" + +#: ../../ecommerce/shopper_experience/paypal.rst:172 +msgid "A default personal account (to use as shopper, e.g. `pp.merch01-buyer@example.com `__)." +msgstr "" + +#: ../../ecommerce/shopper_experience/paypal.rst:174 +msgid "Log in to Paypal Sandbox with the merchant account and follow the same configuration instructions. Enter your sandbox credentials in Odoo and make sure Paypal is still set on *Test Environment*. Also, make sure the automatic invoicing is not activated in your eCommerce settings, to not generate invoices when a fictitious transaction is completed." +msgstr "" + +#: ../../ecommerce/shopper_experience/paypal.rst:180 msgid "Run a test transaction from Odoo using the sandbox personal account." msgstr "" +#: ../../ecommerce/shopper_experience/paypal.rst:182 +msgid "See also" +msgstr "" + +#: ../../ecommerce/shopper_experience/paypal.rst:184 +msgid "`How to manage orders paid with payment acquirers `__" +msgstr "" + +#: ../../ecommerce/shopper_experience/paypal.rst:186 +msgid "`How to manage orders paid with payment acquirers `__" +msgstr "" + #: ../../ecommerce/shopper_experience/portal.rst:3 msgid "How customers can access their customer account" msgstr "" diff --git a/locale/sources/general.pot b/locale/sources/general.pot index 31f9725ed..e8a9e70f6 100644 --- a/locale/sources/general.pot +++ b/locale/sources/general.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: Odoo 12.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-11-07 15:38+0100\n" +"POT-Creation-Date: 2019-09-16 15:50+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -24,6 +24,14 @@ msgstr "" msgid "Authentication" msgstr "" +#: ../../general/auth/azure.rst:3 +msgid "OAuth" +msgstr "" + +#: ../../general/auth/azure.rst:5 +msgid "Due to specific requirements in Azure's OAuth implementation, Microsoft Azure OAuth identification is NOT compatible with Odoo at the moment." +msgstr "" + #: ../../general/auth/google.rst:3 msgid "How to allow users to sign in with their Google account" msgstr "" @@ -64,6 +72,50 @@ msgstr "" msgid "Once done, you receive two information (your Client ID and Client Secret). You have to insert your Client ID in the **General Settings**." msgstr "" +#: ../../general/auth/ldap.rst:3 +msgid "How to allow users to sign in with LDAP" +msgstr "" + +#: ../../general/auth/ldap.rst:5 +msgid "Install the LDAP module in General Settings." +msgstr "" + +#: ../../general/auth/ldap.rst:7 +msgid "Click on **Create** in Setup your LDAP Server." +msgstr "" + +#: ../../general/auth/ldap.rst:15 +msgid "Choose the company about to use the LDAP." +msgstr "" + +#: ../../general/auth/ldap.rst:20 +msgid "In **Server Information**, enter the IP address of your server and the port it listens to." +msgstr "" + +#: ../../general/auth/ldap.rst:22 +msgid "Tick **User TLS** if your server is compatible." +msgstr "" + +#: ../../general/auth/ldap.rst:27 +msgid "In **Login Information**, enter ID and password of the account used to query the server. If left empty, the server will be queried anonymously." +msgstr "" + +#: ../../general/auth/ldap.rst:32 +msgid "In **Process Parameter**, enter the domain name of your LDAP server in LDAP nomenclature (e.g. ``dc=example,dc=com``)." +msgstr "" + +#: ../../general/auth/ldap.rst:34 +msgid "In **LDAP filter**, enter ``uid=%s``" +msgstr "" + +#: ../../general/auth/ldap.rst:39 +msgid "In **User Information**, tick *Create User* if you want Odoo to create a User profile the first time someone log in with LDAP." +msgstr "" + +#: ../../general/auth/ldap.rst:41 +msgid "In **Template User**, indicate a template for the new profiles created. If left blanked, the admin profile will be used as template." +msgstr "" + #: ../../general/base_import.rst:3 msgid "Data Import" msgstr "" @@ -505,6 +557,14 @@ msgstr "" msgid "`Deactivating Users <../../db_management/documentation.html#deactivating-users>`_" msgstr "" +#: ../../general/odoo_basics/add_user.rst:47 +msgid "Todo" +msgstr "" + +#: ../../general/odoo_basics/add_user.rst:47 +msgid "Add link to How to add companies" +msgstr "" + #: ../../general/odoo_basics/choose_language.rst:3 msgid "Manage Odoo in your own language" msgstr "" @@ -569,43 +629,56 @@ msgstr "" msgid "How to generate an Unsplash access key" msgstr "" -#: ../../general/unsplash/unsplash_access_key.rst:5 +#: ../../general/unsplash/unsplash_access_key.rst:6 +msgid "**As a SaaS user**, Unsplash is ready to use. You won't need to follow this guide to set up Unsplash informations as you will use our own Odoo Unsplash key in a transparent way." +msgstr "" + +#: ../../general/unsplash/unsplash_access_key.rst:9 +msgid "Generate an Unsplash access key for **non-Saas** users" +msgstr "" + +#: ../../general/unsplash/unsplash_access_key.rst:11 msgid "Create an account on `Unsplash.com `_." msgstr "" -#: ../../general/unsplash/unsplash_access_key.rst:7 +#: ../../general/unsplash/unsplash_access_key.rst:13 msgid "Go to your `applications dashboard `_ and click on **New Application**." msgstr "" -#: ../../general/unsplash/unsplash_access_key.rst:12 +#: ../../general/unsplash/unsplash_access_key.rst:18 msgid "Accept the conditions and click on **Accept terms**." msgstr "" -#: ../../general/unsplash/unsplash_access_key.rst:17 -msgid "You will be prompted to insert an **Application name** and a **Description**. Once done, click on **Create application**." +#: ../../general/unsplash/unsplash_access_key.rst:23 +msgid "You will be prompted to insert an **Application name** and a **Description**. Please prefix your application name by \"**Odoo:** \" so it can be recognized as an Odoo instance by Unsplash. Once done, click on **Create application**." msgstr "" -#: ../../general/unsplash/unsplash_access_key.rst:22 +#: ../../general/unsplash/unsplash_access_key.rst:28 msgid "You should be redirected to your application details page. Scroll down a bit to find your **access key**." msgstr "" +#: ../../general/unsplash/unsplash_access_key.rst:34 +#: ../../general/unsplash/unsplash_application_id.rst:19 +msgid "**As a non-SaaS user**, you won't be able to register for a production Unsplash key and will be limited to your test key that has a 50 Unsplash requests per hour restriction." +msgstr "" + +#: ../../general/unsplash/unsplash_access_key.rst:37 +msgid ":doc:`unsplash_application_id`" +msgstr "" + #: ../../general/unsplash/unsplash_application_id.rst:3 msgid "How to generate an Unsplash application ID" msgstr "" -#: ../../general/unsplash/unsplash_application_id.rst:5 -msgid "You should first create and set up your Unsplash application with this tutorial: `How to generate an Unsplash access key `_." +#: ../../general/unsplash/unsplash_application_id.rst:6 +msgid "You should first create and set up your Unsplash application with this tutorial: :doc:`unsplash_access_key`." msgstr "" -#: ../../general/unsplash/unsplash_application_id.rst:7 +#: ../../general/unsplash/unsplash_application_id.rst:8 msgid "Go to your `applications dashboard `_ and click on your newly created Unsplash application under **Your applications**." msgstr "" -#: ../../general/unsplash/unsplash_application_id.rst:12 -msgid "You will be redirected to your application details page. The **application ID** will be visible in your browser's URL. The URL should be something like ``https://unsplash.com/oauth/applications/application_id``" -msgstr "" - -#: ../../general/unsplash/unsplash_application_id.rst:17 -msgid "Note that if you `apply for a production account `_ and it got approved, your will also find your application ID in the UI. It will be listed next to your **Access Key** on your application details page." +#: ../../general/unsplash/unsplash_application_id.rst:13 +msgid "You will be redirected to your application details page. The **application ID** will be visible in your browser's URL. The URL should be something like ``https://unsplash.com/oauth/applications/``" msgstr "" diff --git a/locale/sources/getting_started.pot b/locale/sources/getting_started.pot index d97449309..ffa6857ed 100644 --- a/locale/sources/getting_started.pot +++ b/locale/sources/getting_started.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: Odoo 12.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-11-07 15:38+0100\n" +"POT-Creation-Date: 2019-09-16 15:50+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -93,7 +93,7 @@ msgid "**The GAP Analysis**: The comparison of the request with the standard fea msgstr "" #: ../../getting_started/documentation.rst:118 -msgid "`The User Story `__: This technique clearly separates the responsibilities between the SPoC, responsible for explaining the WHAT, the WHY and the WHO, and the Consultant who will provide a response to the HOW." +msgid "**The User Story**: This technique clearly separates the responsibilities between the SPoC, responsible for explaining the WHAT, the WHY and the WHO, and the Consultant who will provide a response to the HOW." msgstr "" #: ../../getting_started/documentation.rst:126 @@ -213,70 +213,10 @@ msgid "8. Support" msgstr "" #: ../../getting_started/documentation.rst:255 -msgid "Your Odoo Online subscription includes **unlimited 24hr support at no extra cost, Monday to Friday**. Our teams are located around the world to ensure you have support, no matter your location. Your support representative could be communicating to you from San Francisco, Belgium, or India!" +msgid "When your project is put in production, our support teams take care of your questions or technical issues." msgstr "" -#: ../../getting_started/documentation.rst:260 -msgid "What kind of support is included?" -msgstr "" - -#: ../../getting_started/documentation.rst:262 -msgid "Providing you with relevant material (guidelines, product documentation, etc...)" -msgstr "" - -#: ../../getting_started/documentation.rst:264 -msgid "Answers to issues that you may encounter in your standard Odoo database (eg. “I cannot close my Point of Sale” or “I cannot find my sales KPIs?”)" -msgstr "" - -#: ../../getting_started/documentation.rst:266 -msgid "Questions related to your account, subscription, or billing" -msgstr "" - -#: ../../getting_started/documentation.rst:267 -msgid "Bug resolution (blocking issues or unexpected behaviour not due to misconfiguration or customization)" -msgstr "" - -#: ../../getting_started/documentation.rst:269 -msgid "Issues that might occur in a test database after upgrading to a newer version" -msgstr "" - -#: ../../getting_started/documentation.rst:271 -msgid "*Odoo Support does not make changes to your production database, but gives you the material and knowledge to do it yourself!*" -msgstr "" - -#: ../../getting_started/documentation.rst:274 -msgid "What kind of support is not included?" -msgstr "" - -#: ../../getting_started/documentation.rst:276 -msgid "Questions that require us to understand your business processes in order to help you implement your database" -msgstr "" - -#: ../../getting_started/documentation.rst:278 -msgid "Training on how to use our software (we will direct you to our many resources)" -msgstr "" - -#: ../../getting_started/documentation.rst:279 -msgid "Importation of documents into your database" -msgstr "" - -#: ../../getting_started/documentation.rst:280 -msgid "Guidance on which configurations to apply inside of an application or the database" -msgstr "" - -#: ../../getting_started/documentation.rst:281 -msgid "How to set up configuration models (Examples include: Inventory Routes, Payment Terms, Warehouses, etc)" -msgstr "" - -#: ../../getting_started/documentation.rst:283 -msgid "Questions or issues related to specific developments or customizations done either by Odoo or a third party (this is specific only to your database or involving code)" -msgstr "" - -#: ../../getting_started/documentation.rst:287 -msgid "You can get this type of support with a `Success Pack `__. With a pack, one of our consultants will analyze the way your business runs and tell you how you can get the most out of your Odoo Database. We will handle all configurations and coach you on how to use Odoo." -msgstr "" - -#: ../../getting_started/documentation.rst:292 -msgid "Our support team can be contacted through our `online support form `__." +#: ../../getting_started/documentation.rst:258 +msgid "See :ref:`support-expectations`." msgstr "" diff --git a/locale/sources/inventory.pot b/locale/sources/inventory.pot index 2d9864429..459e23363 100644 --- a/locale/sources/inventory.pot +++ b/locale/sources/inventory.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: Odoo 12.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-11-07 15:38+0100\n" +"POT-Creation-Date: 2019-09-16 15:50+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -304,47 +304,39 @@ msgstr "" msgid "The barcode scanning features can save you a lot of the time usually lost switching between the keyboard, the mouse and the scanner. Properly attributing barcodes to products, pickings locations, etc. allows you to work more efficiently by controlling the software almost exclusively with the barcode scanner." msgstr "" -#: ../../inventory/barcode/setup/software.rst:17 -msgid "Print this document to be able to use your barcode scanner to perform more actions." -msgstr "" - -#: ../../inventory/barcode/setup/software.rst:19 -msgid "Document: |download_barcode|" -msgstr "" - -#: ../../inventory/barcode/setup/software.rst:23 +#: ../../inventory/barcode/setup/software.rst:12 msgid "Set products barcodes" msgstr "" -#: ../../inventory/barcode/setup/software.rst:28 +#: ../../inventory/barcode/setup/software.rst:17 msgid "In order to fill a picking or to perform an inventory, you need to make sure that your products are encoded in Odoo along with their barcodes. If this is not already done, you can fill in the products barcodes through a handy interface. Go to :menuselection:`Inventory --> Configuration --> Settings` and click :menuselection:`Operations --> Barcode Scanner`. Click Save, and go back into the previous screen to click Configure Product Barcodes. This interface can also be accessed via the planner." msgstr "" -#: ../../inventory/barcode/setup/software.rst:39 +#: ../../inventory/barcode/setup/software.rst:28 msgid "Product variants: be careful to add barcodes directly on the variant, and not the template product (otherwise you won't be able to differentiate them)." msgstr "" -#: ../../inventory/barcode/setup/software.rst:44 +#: ../../inventory/barcode/setup/software.rst:33 msgid "Set locations barcodes" msgstr "" -#: ../../inventory/barcode/setup/software.rst:49 +#: ../../inventory/barcode/setup/software.rst:38 msgid "If you manage multiple locations, you will find useful to attribute a barcode to each location and stick it on the location. You can configure the locations barcodes in :menuselection:`Inventory --> Configuration --> Warehouse Management --> Locations`. There is button in the **Print** menu that you can use to print the locations names and barcodes. There are 4 barcodes per page, arranged in a way that is convenient to print on sticker paper." msgstr "" -#: ../../inventory/barcode/setup/software.rst:58 +#: ../../inventory/barcode/setup/software.rst:47 msgid "Example of location naming: **warehouse short name** - **location short name** - (**Corridor X** - **Shelf Y** - **Height Z**) Example: A032-025-133" msgstr "" -#: ../../inventory/barcode/setup/software.rst:65 +#: ../../inventory/barcode/setup/software.rst:54 msgid "Barcode formats" msgstr "" -#: ../../inventory/barcode/setup/software.rst:67 +#: ../../inventory/barcode/setup/software.rst:56 msgid "Most retail products use EAN-13 barcodes. They cannot be made up without proper authorization: you must pay the International Article Numbering Association a fee in exchange for an EAN code sequence (that's why no two products in a store will ever have the same EAN code)." msgstr "" -#: ../../inventory/barcode/setup/software.rst:72 +#: ../../inventory/barcode/setup/software.rst:61 msgid "Still, as Odoo supports any string as a barcode, so you can always define your own barcode format for internal use." msgstr "" @@ -503,7 +495,7 @@ msgstr "" #: ../../inventory/routes/concepts/procurement_rule.rst:25 #: ../../inventory/routes/concepts/push_rule.rst:29 #: ../../inventory/routes/concepts/use_routes.rst:22 -#: ../../inventory/routes/costing/landed_costs.rst:18 +#: ../../inventory/routes/costing/landed_costs.rst:17 #: ../../inventory/routes/strategies/putaway.rst:23 #: ../../inventory/routes/strategies/removal.rst:18 #: ../../inventory/settings/products/strategies.rst:30 @@ -610,6 +602,42 @@ msgstr "" msgid "The choice between the two options is thus dependent of your inventory strategy. If you prefer to have a buffer and always have at least a minimum amount, the minimum stock rule should be used. If you want to reorder your stocks only if your sale is confirmed it is better to use the Make to Order." msgstr "" +#: ../../inventory/management/adjustment/virtual_warehouses.rst:3 +msgid "TaKing stock from different warehouses" +msgstr "" + +#: ../../inventory/management/adjustment/virtual_warehouses.rst:5 +msgid "When you plan to deliver a customer, you don’t know in advance if the products will come from Warehouse A or Warehouse B. You may, in some cases, need to take stock from different warehouses. With *Odoo*, you can configure this by using the concept of virtual warehouses. Let us show you how to set those virtual warehouses." +msgstr "" + +#: ../../inventory/management/adjustment/virtual_warehouses.rst:12 +msgid "Set up virtual warehouses" +msgstr "" + +#: ../../inventory/management/adjustment/virtual_warehouses.rst:14 +msgid "Let’s say you have two warehouses: Warehouse A and Warehouse B. Create a new warehouse, that will be a virtual one. It will allow you to take the stock from A or B. To do so, go to your inventory app settings and enable the multi-warehouses feature. Then, go to the warehouses menu and click on create." +msgstr "" + +#: ../../inventory/management/adjustment/virtual_warehouses.rst:24 +msgid "The *Storage Location* feature will be automatically enabled. Good news, because you will need it later in the process." +msgstr "" + +#: ../../inventory/management/adjustment/virtual_warehouses.rst:27 +msgid "Now, you have to make sure that the main stock locations of warehouse A and warehouse B are children locations of the main stock location of warehouse A + B. Go to the locations menu, and edit the main location of your two warehouses. Then, change their parent location to main location of warehouse A+B." +msgstr "" + +#: ../../inventory/management/adjustment/virtual_warehouses.rst:37 +msgid "Sell a product from the virtual warehouse" +msgstr "" + +#: ../../inventory/management/adjustment/virtual_warehouses.rst:39 +msgid "Let’s say you have two products, one stored in warehouse A and one stored in warehouse B. Now, you can create a new quotation for one of each product. Go to other information and choose Warehouse A+B in the shipping information." +msgstr "" + +#: ../../inventory/management/adjustment/virtual_warehouses.rst:47 +msgid "Once you have done it, you can convert it to a sales order. Then, a delivery order will be automatically generated, with a product reserved in warehouse A and one in warehouse B." +msgstr "" + #: ../../inventory/management/delivery.rst:3 msgid "Delivery Orders" msgstr "" @@ -767,7 +795,7 @@ msgid "Now, open the menu :menuselection:`Sales --> Sales --> Products`. Add a s msgstr "" #: ../../inventory/management/delivery/dropshipping.rst:74 -msgid "How to send products from the customers directly to the suppliers" +msgid "How to send products from the suppliers directly to the customers" msgstr "" #: ../../inventory/management/delivery/dropshipping.rst:76 @@ -790,6 +818,21 @@ msgstr "" msgid ":doc:`inventory_flow`" msgstr "" +#: ../../inventory/management/delivery/dropshipping.rst:105 +#: ../../inventory/management/delivery/one_step.rst:63 +#: ../../inventory/management/delivery/three_steps.rst:159 +#: ../../inventory/management/delivery/two_steps.rst:129 +#: ../../inventory/management/incoming/handle_receipts.rst:70 +#: ../../inventory/overview/concepts/double-entry.rst:179 +#: ../../inventory/settings/products/uom.rst:124 +#: ../../inventory/settings/products/variants.rst:222 +msgid "Todo" +msgstr "" + +#: ../../inventory/management/delivery/dropshipping.rst:106 +msgid "Add link to this section when available * How to analyse the performance of my vendors?" +msgstr "" + #: ../../inventory/management/delivery/inventory_flow.rst:3 msgid "How to choose the right inventory flow to handle delivery orders?" msgstr "" @@ -954,6 +997,16 @@ msgstr "" msgid "This has completed the **Shipping Step** and the WH/OUT should now show **Done** in the status column at the top of the page, which means the product has been shipped to the customer." msgstr "" +#: ../../inventory/management/delivery/one_step.rst:64 +msgid "Ajouter un lien vers ces pages quand elles existeront - Process Overview: From sales orders to delivery orders" +msgstr "" + +#: ../../inventory/management/delivery/one_step.rst:67 +#: ../../inventory/management/delivery/three_steps.rst:163 +#: ../../inventory/management/delivery/two_steps.rst:133 +msgid "Process Overview: From purchase orders to receptions" +msgstr "" + #: ../../inventory/management/delivery/packaging_type.rst:3 msgid "How can you change the packaging type for your sale order?" msgstr "" @@ -1298,6 +1351,10 @@ msgstr "" msgid "This has completed the shipping step and the **WH/OUT** should now show **Done** in the status column at the top of the page. The product has been shipped to the customer." msgstr "" +#: ../../inventory/management/delivery/three_steps.rst:160 +msgid "Link to these sections when available - Process Overview: From sales orders to delivery orders" +msgstr "" + #: ../../inventory/management/delivery/two_steps.rst:3 msgid "How to process delivery orders in two steps (pick + ship)?" msgstr "" @@ -1378,6 +1435,10 @@ msgstr "" msgid "This has completed the shipping step and the **WH/OUT** move should now show **Done** in the status column at the top of the page. The product has been shipped to the customer." msgstr "" +#: ../../inventory/management/delivery/two_steps.rst:130 +msgid "link to these sections when they will be available - Process Overview: From sales orders to delivery orders" +msgstr "" + #: ../../inventory/management/incoming.rst:3 msgid "Incoming Shipments" msgstr "" @@ -1440,6 +1501,10 @@ msgstr "" msgid ":doc:`../delivery/inventory_flow`" msgstr "" +#: ../../inventory/management/incoming/handle_receipts.rst:71 +msgid "Add section when available - How to analyse the performance of my vendors?" +msgstr "" + #: ../../inventory/management/incoming/three_steps.rst:3 msgid "How to add a quality control step in goods receipt? (3 steps)" msgstr "" @@ -3245,6 +3310,10 @@ msgstr "" msgid "whether the procurement is :abbr:`MTO (Made To Order)` or :abbr:`MTS (Made To Stock)`" msgstr "" +#: ../../inventory/overview/concepts/double-entry.rst:179 +msgid "needs schema thing from FP" +msgstr "" + #: ../../inventory/overview/concepts/double-entry.rst:182 msgid "Routes" msgstr "" @@ -4249,67 +4318,31 @@ msgid "Product Costing" msgstr "" #: ../../inventory/routes/costing/landed_costs.rst:3 -msgid "How to integrate landed costs in the cost of the product?" +msgid "How to integrate additional costs in the cost of the product? (landed costs)" msgstr "" #: ../../inventory/routes/costing/landed_costs.rst:8 -msgid "Landed costs include all charges associated to a good transfer." -msgstr "" - -#: ../../inventory/routes/costing/landed_costs.rst:10 -msgid "Landed cost includes = Cost of product + Shipping + Customs + Risk" +msgid "The landed cost feature in Odoo allows to include additional costs (shipment, insurance, customs duties, etc.) into the cost of the product." msgstr "" #: ../../inventory/routes/costing/landed_costs.rst:12 -msgid "All of these components might not be applicable in every shipment, but relevant components must be considered as a part of the landed cost. We have to identify landed cost to decide sale price of product because it will impact on company profits." +msgid "Landed costs can only be applied to products with a FIFO costing method and an automated inventory valuation (which requires the accounting application to be installed)." msgstr "" -#: ../../inventory/routes/costing/landed_costs.rst:21 -msgid "Applications configuration" +#: ../../inventory/routes/costing/landed_costs.rst:20 +msgid "First, you need to activate the landed costs feature in :menuselection:`Inventory --> Configuration --> Settings`." msgstr "" -#: ../../inventory/routes/costing/landed_costs.rst:23 -msgid "First, you need to activate the use of the landed costs. Go to :menuselection:`Inventory application --> Configuration --> Setting`. Check accounting option **Include landed costs in product costing computation** & **Perpetual inventory valuation**, then click on **Apply** to save changes." +#: ../../inventory/routes/costing/landed_costs.rst:27 +msgid "Add costs to products" msgstr "" -#: ../../inventory/routes/costing/landed_costs.rst:32 -msgid "Then go to the :menuselection:`Purchase application --> Configuration --> Setting`. Choose costing method **Use a 'Fixed', 'Real' or 'Average' price costing method**, then click on **Apply** to save changes." +#: ../../inventory/routes/costing/landed_costs.rst:29 +msgid "Go in :menuselection:`Inventory --> Operations --> Landed Costs` and click on the **Create** button. You then have to select the transfers on which you want to attribute additional costs and the costs lines you want to add up. Once it's done, click on the **Compute** button to see how the costs lines will be split accross your transfers lines." msgstr "" -#: ../../inventory/routes/costing/landed_costs.rst:40 -msgid "Landed Cost Types" -msgstr "" - -#: ../../inventory/routes/costing/landed_costs.rst:42 -msgid "Start by creating specific products to indicate your various **Landed Costs**, such as freight, insurance or custom duties. Go to :menuselection:`Inventory --> Configuration --> Landed Cost types`." -msgstr "" - -#: ../../inventory/routes/costing/landed_costs.rst:50 -msgid "Landed costs are only possible for products configured in real time valuation with real price costing method. The costing method is configured on the product category." -msgstr "" - -#: ../../inventory/routes/costing/landed_costs.rst:55 -msgid "Link landed costs to a transfer" -msgstr "" - -#: ../../inventory/routes/costing/landed_costs.rst:57 -msgid "To calculate landed costs, go to :menuselection:`Inventory --> Inventory Control --> Landed Costs`." -msgstr "" - -#: ../../inventory/routes/costing/landed_costs.rst:60 -msgid "Click on the **Create** button and select the picking(s) you want to attribute landed costs." -msgstr "" - -#: ../../inventory/routes/costing/landed_costs.rst:66 -msgid "Select the account journal in which to post the landed costs. We recommend you to create a specific journal for landed costs. Therefore it will be easier to keep track of your postings." -msgstr "" - -#: ../../inventory/routes/costing/landed_costs.rst:73 -msgid "Click the **Compute** button to see how the landed costs will be split across the picking lines." -msgstr "" - -#: ../../inventory/routes/costing/landed_costs.rst:79 -msgid "To confirm the landed costs attribution, click on the **Validate** button." +#: ../../inventory/routes/costing/landed_costs.rst:38 +msgid "To confirm, click on the **Validate** button." msgstr "" #: ../../inventory/routes/strategies.rst:3 @@ -4755,6 +4788,10 @@ msgstr "" msgid "But the transfer is done in the product unit of measure. Everything is converted automatically :" msgstr "" +#: ../../inventory/settings/products/uom.rst:125 +msgid "Create a link when the document is available - When should you use packages, units of measure or kits?" +msgstr "" + #: ../../inventory/settings/products/usage.rst:3 msgid "When should you use packages, units of measure or kits?" msgstr "" @@ -5063,6 +5100,14 @@ msgstr "" msgid "When you have entered all the extra values, click on **Save**." msgstr "" +#: ../../inventory/settings/products/variants.rst:226 +msgid "Accounting Memento: Details of Journal Entries" +msgstr "" + +#: ../../inventory/settings/products/variants.rst:227 +msgid "Process Overview: From Billing to Payment Orders" +msgstr "" + #: ../../inventory/settings/warehouses/difference_warehouse_location.rst:3 msgid "What is the difference between warehouses and locations?" msgstr "" diff --git a/locale/sources/iot.pot b/locale/sources/iot.pot index b0940b0e2..ee0bd5151 100644 --- a/locale/sources/iot.pot +++ b/locale/sources/iot.pot @@ -6,9 +6,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: Odoo 11.0\n" +"Project-Id-Version: Odoo 12.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-10-19 10:03+0200\n" +"POT-Creation-Date: 2019-09-16 15:50+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -88,6 +88,58 @@ msgstr "" msgid "IoT Box Schema" msgstr "" +#: ../../iot/flash_sdcard.rst:3 +msgid "Flashing your SD Card" +msgstr "" + +#: ../../iot/flash_sdcard.rst:5 +msgid "In some case, you may need to reflash your IoT Box’s SD Card to benefit from our latest updates." +msgstr "" + +#: ../../iot/flash_sdcard.rst:9 +msgid "Updating your SD Card with Etcher" +msgstr "" + +#: ../../iot/flash_sdcard.rst:11 +msgid "Go to Balena’s website and download `Etcher `__, It’s a free and open-source utility used for burning image files. Install and launch it." +msgstr "" + +#: ../../iot/flash_sdcard.rst:15 +msgid "Now, download the latest image `here `__, and extract it from the zip file. Then, open *Etcher* and select the image. Select the drive to flash (where your SD Card is) and click on *Flash*!." +msgstr "" + +#: ../../iot/flash_sdcard.rst:19 +msgid "Now, your image will be automatically updated. You just have to wait 5 minutes for it to finish." +msgstr "" + +#: ../../iot/iot_notfound.rst:3 +msgid "IoT Box not found" +msgstr "" + +#: ../../iot/iot_notfound.rst:5 +msgid "When using your IoT Box, a common issue you might encounter is that your box is not found on your database. Fortunately, there are a few easy steps you can follow to find your IoT box." +msgstr "" + +#: ../../iot/iot_notfound.rst:10 +msgid "HTTPS Issues" +msgstr "" + +#: ../../iot/iot_notfound.rst:12 +msgid "Your IoT Box is not found? You probably have https issues!" +msgstr "" + +#: ../../iot/iot_notfound.rst:14 +msgid "To check it, go to your database and verify if your database address starts with an https (like https://www.odoo.com). If this is the case, then you may have problems with your IoT Box image. It should be version 18.12 or later." +msgstr "" + +#: ../../iot/iot_notfound.rst:19 +msgid "If your IoT Box image is from an earlier version, then you will have to reflash the SD card of your IoT Box to update the image (the latest image can be found `here `__)." +msgstr "" + +#: ../../iot/iot_notfound.rst:23 +msgid "You can find the documentation about SD card flashing here (`here `__)." +msgstr "" + #: ../../iot/pos.rst:3 msgid "Use the IoT Box for the PoS" msgstr "" diff --git a/locale/sources/livechat.pot b/locale/sources/livechat.pot index de24014b7..db2d5e3be 100644 --- a/locale/sources/livechat.pot +++ b/locale/sources/livechat.pot @@ -6,9 +6,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: Odoo 11.0\n" +"Project-Id-Version: Odoo 12.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-07-23 12:10+0200\n" +"POT-Creation-Date: 2019-09-16 15:50+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -21,7 +21,7 @@ msgid "Live Chat" msgstr "" #: ../../livechat/livechat.rst:8 -msgid "Chat in live with website visitors" +msgid "Chat in real time with website visitors" msgstr "" #: ../../livechat/livechat.rst:10 @@ -85,11 +85,11 @@ msgid "If no operator is available and/or if the channel is unpublished on the w msgstr "" #: ../../livechat/livechat.rst:92 -msgid "In practice, the conversations initiated by the visitors will appear in the Discuss module and will also pop up as a direct message. Therefore, inquiries can be answered wherever you are in Odoo." +msgid "Conversations initiated by visitors also appear in the Discuss module in addition to popping up as a direct message. Therefore, inquiries can be answered wherever you are in Odoo." msgstr "" #: ../../livechat/livechat.rst:96 -msgid "If there several operators in charge of a channel, the system will dispatch sessions randomly between them." +msgid "If there are several operators who have all joined a channel, the system will dispatch visitor sessions randomly between them." msgstr "" #: ../../livechat/livechat.rst:100 diff --git a/locale/sources/mobile.pot b/locale/sources/mobile.pot index 113ffbf99..662381e2a 100644 --- a/locale/sources/mobile.pot +++ b/locale/sources/mobile.pot @@ -6,9 +6,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: Odoo 11.0\n" +"Project-Id-Version: Odoo 12.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-10-19 10:03+0200\n" +"POT-Creation-Date: 2019-09-16 15:50+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -21,78 +21,14 @@ msgid "Mobile" msgstr "" #: ../../mobile/firebase.rst:8 -msgid "Setup your Firebase Cloud Messaging" +msgid "Push Notifications" msgstr "" #: ../../mobile/firebase.rst:10 -msgid "In order to have mobile notifications in our Android app, you need an API key." +msgid "As of Odoo 12.0, there is no more complex configuration to enable push notifications in the mobile app." msgstr "" #: ../../mobile/firebase.rst:13 -msgid "If it is not automatically configured (for instance for On-premise or Odoo.sh) please follow these steps below to get an API key for the android app." -msgstr "" - -#: ../../mobile/firebase.rst:18 -msgid "The iOS app doesn't support mobile notifications for Odoo versions < 12." -msgstr "" - -#: ../../mobile/firebase.rst:22 -msgid "Firebase Settings" -msgstr "" - -#: ../../mobile/firebase.rst:25 -msgid "Create a new project" -msgstr "" - -#: ../../mobile/firebase.rst:27 -msgid "First, make sure you to sign in to your Google Account. Then, go to `https://console.firebase.google.com `__ and create a new project." -msgstr "" - -#: ../../mobile/firebase.rst:34 -msgid "Choose a project name, click on **Continue**, then click on **Create project**." -msgstr "" - -#: ../../mobile/firebase.rst:37 -msgid "When you project is ready, click on **Continue**." -msgstr "" - -#: ../../mobile/firebase.rst:39 -msgid "You will be redirected to the overview project page (see next screenshot)." -msgstr "" - -#: ../../mobile/firebase.rst:43 -msgid "Add an app" -msgstr "" - -#: ../../mobile/firebase.rst:45 -msgid "In the overview page, click on the Android icon." -msgstr "" - -#: ../../mobile/firebase.rst:50 -msgid "You must use \"com.odoo.com\" as Android package name. Otherwise, it will not work." -msgstr "" - -#: ../../mobile/firebase.rst:56 -msgid "No need to download the config file, you can click on **Next** twice and skip the fourth step." -msgstr "" - -#: ../../mobile/firebase.rst:60 -msgid "Get generated API key" -msgstr "" - -#: ../../mobile/firebase.rst:62 -msgid "On the overview page, go to Project settings:" -msgstr "" - -#: ../../mobile/firebase.rst:67 -msgid "In **Cloud Messaging**, you will see the **API key** and the **Sender ID** that you need to set in Odoo General Settings." -msgstr "" - -#: ../../mobile/firebase.rst:74 -msgid "Settings in Odoo" -msgstr "" - -#: ../../mobile/firebase.rst:76 -msgid "Simply paste the API key and the Sender ID from Cloud Messaging." +msgid "Simply go to *Settings* > *General Settings* > *Odoo Cloud Notification (OCN)* and make sure that **Push Notifications** is checked." msgstr "" diff --git a/locale/sources/point_of_sale.pot b/locale/sources/point_of_sale.pot index f11f3cb19..a1313ba42 100644 --- a/locale/sources/point_of_sale.pot +++ b/locale/sources/point_of_sale.pot @@ -6,9 +6,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: Odoo 11.0\n" +"Project-Id-Version: Odoo 12.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-10-19 10:03+0200\n" +"POT-Creation-Date: 2019-09-16 15:50+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -33,13 +33,13 @@ msgid "Using a barcode scanner to process point of sale orders improves your eff msgstr "" #: ../../point_of_sale/advanced/barcode.rst:9 -#: ../../point_of_sale/advanced/loyalty.rst:9 #: ../../point_of_sale/advanced/mercury.rst:25 #: ../../point_of_sale/advanced/reprint.rst:8 +#: ../../point_of_sale/advanced_pricing_features/loyalty.rst:9 +#: ../../point_of_sale/advanced_pricing_features/seasonal_discount.rst:10 #: ../../point_of_sale/overview/start.rst:22 #: ../../point_of_sale/restaurant/setup.rst:9 #: ../../point_of_sale/restaurant/split.rst:10 -#: ../../point_of_sale/shop/seasonal_discount.rst:10 msgid "Configuration" msgstr "" @@ -52,159 +52,25 @@ msgid "Under the IoT Box / Hardware category, you will find *Barcode Scanner* se msgstr "" #: ../../point_of_sale/advanced/barcode.rst:21 -msgid "You can find more about Barcode Nomenclature here (ADD HYPERLINK)" -msgstr "" - -#: ../../point_of_sale/advanced/barcode.rst:25 msgid "Add barcodes to product" msgstr "" -#: ../../point_of_sale/advanced/barcode.rst:27 +#: ../../point_of_sale/advanced/barcode.rst:23 msgid "Go to :menuselection:`Point of Sale --> Catalog --> Products` and select a product." msgstr "" -#: ../../point_of_sale/advanced/barcode.rst:30 +#: ../../point_of_sale/advanced/barcode.rst:26 msgid "Under the general information tab, you can find a barcode field where you can input any barcode." msgstr "" -#: ../../point_of_sale/advanced/barcode.rst:37 +#: ../../point_of_sale/advanced/barcode.rst:33 msgid "Scanning products" msgstr "" -#: ../../point_of_sale/advanced/barcode.rst:39 +#: ../../point_of_sale/advanced/barcode.rst:35 msgid "From your PoS interface, scan any barcode with your barcode scanner. The product will be added, you can scan the same product to add it multiple times or change the quantity manually on the screen." msgstr "" -#: ../../point_of_sale/advanced/discount_tags.rst:3 -msgid "Using discount tags with a barcode scanner" -msgstr "" - -#: ../../point_of_sale/advanced/discount_tags.rst:5 -msgid "If you want to sell your products with a discount, for a product getting close to its expiration date for example, you can use discount tags. They allow you to scan discount barcodes." -msgstr "" - -#: ../../point_of_sale/advanced/discount_tags.rst:10 -msgid "To use discount tags you will need to use a barcode scanner, you can see the documentation about it `here `__" -msgstr "" - -#: ../../point_of_sale/advanced/discount_tags.rst:15 -msgid "Barcode Nomenclature" -msgstr "" - -#: ../../point_of_sale/advanced/discount_tags.rst:17 -msgid "To use discounts tags, we need to learn about barcode nomenclature." -msgstr "" - -#: ../../point_of_sale/advanced/discount_tags.rst:19 -msgid "Let's say you want to have a discount for the product with the following barcode:" -msgstr "" - -#: ../../point_of_sale/advanced/discount_tags.rst:25 -msgid "You can find the *Default Nomenclature* under the settings of your PoS interface." -msgstr "" - -#: ../../point_of_sale/advanced/discount_tags.rst:34 -msgid "Let's say you want 50% discount on a product you have to start your barcode with 22 (for the discount barcode nomenclature) and then 50 (for the %) before adding the product barcode. In our example, the barcode would be:" -msgstr "" - -#: ../../point_of_sale/advanced/discount_tags.rst:43 -msgid "Scan the products & tags" -msgstr "" - -#: ../../point_of_sale/advanced/discount_tags.rst:45 -msgid "You first have to scan the desired product (in our case, a lemon)." -msgstr "" - -#: ../../point_of_sale/advanced/discount_tags.rst:50 -msgid "And then scan the discount tag. The discount will be applied and you can finish the transaction." -msgstr "" - -#: ../../point_of_sale/advanced/loyalty.rst:3 -msgid "Manage a loyalty program" -msgstr "" - -#: ../../point_of_sale/advanced/loyalty.rst:5 -msgid "Encourage your customers to continue to shop at your point of sale with a *Loyalty Program*." -msgstr "" - -#: ../../point_of_sale/advanced/loyalty.rst:11 -msgid "To activate the *Loyalty Program* feature, go to :menuselection:`Point of Sale --> Configuration --> Point of sale` and select your PoS interface. Under the Pricing features, select *Loyalty Program*" -msgstr "" - -#: ../../point_of_sale/advanced/loyalty.rst:19 -msgid "From there you can create and edit your loyalty programs." -msgstr "" - -#: ../../point_of_sale/advanced/loyalty.rst:24 -msgid "You can decide what type of program you wish to use, if the reward is a discount or a gift, make it specific to some products or cover your whole range. Apply rules so that it is only valid in specific situation and everything in between." -msgstr "" - -#: ../../point_of_sale/advanced/loyalty.rst:30 -msgid "Use the loyalty program in your PoS interface" -msgstr "" - -#: ../../point_of_sale/advanced/loyalty.rst:32 -msgid "When a customer is set, you will now see the points they will get for the transaction and they will accumulate until they are spent. They are spent using the button *Rewards* when they have enough points according to the rules defined in the loyalty program." -msgstr "" - -#: ../../point_of_sale/advanced/loyalty.rst:40 -#: ../../point_of_sale/shop/seasonal_discount.rst:45 -msgid "You can see the price is instantly updated to reflect the pricelist. You can finalize the order in your usual way." -msgstr "" - -#: ../../point_of_sale/advanced/loyalty.rst:44 -#: ../../point_of_sale/shop/seasonal_discount.rst:49 -msgid "If you select a customer with a default pricelist, it will be applied. You can of course change it." -msgstr "" - -#: ../../point_of_sale/advanced/manual_discount.rst:3 -msgid "Apply manual discounts" -msgstr "" - -#: ../../point_of_sale/advanced/manual_discount.rst:5 -msgid "If you seldom use discounts, applying manual discounts might be the easiest solution for your Point of Sale." -msgstr "" - -#: ../../point_of_sale/advanced/manual_discount.rst:8 -msgid "You can either apply a discount on the whole order or on specific products." -msgstr "" - -#: ../../point_of_sale/advanced/manual_discount.rst:12 -msgid "Apply a discount on a product" -msgstr "" - -#: ../../point_of_sale/advanced/manual_discount.rst:14 -msgid "From your session interface, use *Disc* button." -msgstr "" - -#: ../../point_of_sale/advanced/manual_discount.rst:19 -msgid "You can then input a discount (in percentage) over the product that is currently selected and the discount will be applied." -msgstr "" - -#: ../../point_of_sale/advanced/manual_discount.rst:23 -msgid "Apply a global discount" -msgstr "" - -#: ../../point_of_sale/advanced/manual_discount.rst:25 -msgid "To apply a discount on the whole order, go to :menuselection:`Point of Sales --> Configuration --> Point of sale` and select your PoS interface." -msgstr "" - -#: ../../point_of_sale/advanced/manual_discount.rst:28 -msgid "Under the *Pricing* category, you will find *Global Discounts* select it." -msgstr "" - -#: ../../point_of_sale/advanced/manual_discount.rst:34 -msgid "You now have a new *Discount* button in your PoS interface." -msgstr "" - -#: ../../point_of_sale/advanced/manual_discount.rst:39 -msgid "Once clicked you can then enter your desired discount (in percentages)." -msgstr "" - -#: ../../point_of_sale/advanced/manual_discount.rst:44 -msgid "On this example, you can see a global discount of 50% as well as a specific product discount also at 50%." -msgstr "" - #: ../../point_of_sale/advanced/mercury.rst:3 msgid "Accept credit card payment using Mercury" msgstr "" @@ -326,25 +192,199 @@ msgid "Use the *Reprint receipt* feature if you have the need to reprint a ticke msgstr "" #: ../../point_of_sale/advanced/reprint.rst:10 -msgid "To activate *Reprint Receipt*, go to :menuselection:`Point of Sale --> Configuration --> Point of sale` and select your PoS interface." +msgid "To activate *Reprint Receipt*, go to :menuselection:`Point of Sale --> Configuration --> Point of sale`. and select your PoS interface." msgstr "" #: ../../point_of_sale/advanced/reprint.rst:13 msgid "Under the Bills & Receipts category, you will find *Reprint Receipt* option." msgstr "" -#: ../../point_of_sale/advanced/reprint.rst:20 +#: ../../point_of_sale/advanced/reprint.rst:17 +msgid "In order to allow the option reprint receipt, you need to activate the receipt printer." +msgstr "" + +#: ../../point_of_sale/advanced/reprint.rst:23 msgid "Reprint a receipt" msgstr "" -#: ../../point_of_sale/advanced/reprint.rst:22 +#: ../../point_of_sale/advanced/reprint.rst:25 msgid "On your PoS interface, you now have a *Reprint receipt* button." msgstr "" -#: ../../point_of_sale/advanced/reprint.rst:27 +#: ../../point_of_sale/advanced/reprint.rst:30 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" +msgstr "" + +#: ../../point_of_sale/advanced_pricing_features/discount_tags.rst:3 +msgid "Using discount tags with a barcode scanner" +msgstr "" + +#: ../../point_of_sale/advanced_pricing_features/discount_tags.rst:5 +msgid "If you want to sell your products with a discount, for a product getting close to its expiration date for example, you can use discount tags. They allow you to scan discount barcodes." +msgstr "" + +#: ../../point_of_sale/advanced_pricing_features/discount_tags.rst:10 +msgid "To use discount tags you will need to use a barcode scanner." +msgstr "" + +#: ../../point_of_sale/advanced_pricing_features/discount_tags.rst:13 +msgid "Barcode Nomenclature" +msgstr "" + +#: ../../point_of_sale/advanced_pricing_features/discount_tags.rst:15 +msgid "To use discounts tags, we need to learn about barcode nomenclature." +msgstr "" + +#: ../../point_of_sale/advanced_pricing_features/discount_tags.rst:17 +msgid "Let's say you want to have a discount for the product with the following barcode:" +msgstr "" + +#: ../../point_of_sale/advanced_pricing_features/discount_tags.rst:23 +msgid "You can find the *Default Nomenclature* under the settings of your PoS interface." +msgstr "" + +#: ../../point_of_sale/advanced_pricing_features/discount_tags.rst:32 +msgid "Let's say you want 50% discount on a product you have to start your barcode with 22 (for the discount barcode nomenclature) and then 50 (for the %) before adding the product barcode. In our example, the barcode would be:" +msgstr "" + +#: ../../point_of_sale/advanced_pricing_features/discount_tags.rst:41 +msgid "Scan the products & tags" +msgstr "" + +#: ../../point_of_sale/advanced_pricing_features/discount_tags.rst:43 +msgid "You first have to scan the desired product (in our case, a lemon)." +msgstr "" + +#: ../../point_of_sale/advanced_pricing_features/discount_tags.rst:48 +msgid "And then scan the discount tag. The discount will be applied and you can finish the transaction." +msgstr "" + +#: ../../point_of_sale/advanced_pricing_features/loyalty.rst:3 +msgid "Manage a loyalty program" +msgstr "" + +#: ../../point_of_sale/advanced_pricing_features/loyalty.rst:5 +msgid "Encourage your customers to continue to shop at your point of sale with a *Loyalty Program*." +msgstr "" + +#: ../../point_of_sale/advanced_pricing_features/loyalty.rst:11 +msgid "To activate the *Loyalty Program* feature, go to :menuselection:`Point of Sale --> Configuration --> Point of sale` and select your PoS interface. Under the Pricing features, select *Loyalty Program*" +msgstr "" + +#: ../../point_of_sale/advanced_pricing_features/loyalty.rst:19 +msgid "From there you can create and edit your loyalty programs." +msgstr "" + +#: ../../point_of_sale/advanced_pricing_features/loyalty.rst:24 +msgid "You can decide what type of program you wish to use, if the reward is a discount or a gift, make it specific to some products or cover your whole range. Apply rules so that it is only valid in specific situation and everything in between." +msgstr "" + +#: ../../point_of_sale/advanced_pricing_features/loyalty.rst:30 +msgid "Use the loyalty program in your PoS interface" +msgstr "" + +#: ../../point_of_sale/advanced_pricing_features/loyalty.rst:32 +msgid "When a customer is set, you will now see the points they will get for the transaction and they will accumulate until they are spent. They are spent using the button *Rewards* when they have enough points according to the rules defined in the loyalty program." +msgstr "" + +#: ../../point_of_sale/advanced_pricing_features/loyalty.rst:40 +#: ../../point_of_sale/advanced_pricing_features/seasonal_discount.rst:45 +msgid "You can see the price is instantly updated to reflect the pricelist. You can finalize the order in your usual way." +msgstr "" + +#: ../../point_of_sale/advanced_pricing_features/loyalty.rst:44 +#: ../../point_of_sale/advanced_pricing_features/seasonal_discount.rst:49 +msgid "If you select a customer with a default pricelist, it will be applied. You can of course change it." +msgstr "" + +#: ../../point_of_sale/advanced_pricing_features/manual_discount.rst:3 +msgid "Apply manual discounts" +msgstr "" + +#: ../../point_of_sale/advanced_pricing_features/manual_discount.rst:5 +msgid "If you seldom use discounts, applying manual discounts might be the easiest solution for your Point of Sale." +msgstr "" + +#: ../../point_of_sale/advanced_pricing_features/manual_discount.rst:8 +msgid "You can either apply a discount on the whole order or on specific products." +msgstr "" + +#: ../../point_of_sale/advanced_pricing_features/manual_discount.rst:12 +msgid "Apply a discount on a product" +msgstr "" + +#: ../../point_of_sale/advanced_pricing_features/manual_discount.rst:14 +msgid "From your session interface, use *Disc* button." +msgstr "" + +#: ../../point_of_sale/advanced_pricing_features/manual_discount.rst:19 +msgid "You can then input a discount (in percentage) over the product that is currently selected and the discount will be applied." +msgstr "" + +#: ../../point_of_sale/advanced_pricing_features/manual_discount.rst:23 +msgid "Apply a global discount" +msgstr "" + +#: ../../point_of_sale/advanced_pricing_features/manual_discount.rst:25 +msgid "To apply a discount on the whole order, go to :menuselection:`Point of Sales --> Configuration --> Point of sale` and select your PoS interface." +msgstr "" + +#: ../../point_of_sale/advanced_pricing_features/manual_discount.rst:28 +msgid "Under the *Pricing* category, you will find *Global Discounts* select it." +msgstr "" + +#: ../../point_of_sale/advanced_pricing_features/manual_discount.rst:34 +msgid "You now have a new *Discount* button in your PoS interface." +msgstr "" + +#: ../../point_of_sale/advanced_pricing_features/manual_discount.rst:39 +msgid "Once clicked you can then enter your desired discount (in percentages)." +msgstr "" + +#: ../../point_of_sale/advanced_pricing_features/manual_discount.rst:44 +msgid "On this example, you can see a global discount of 50% as well as a specific product discount also at 50%." +msgstr "" + +#: ../../point_of_sale/advanced_pricing_features/seasonal_discount.rst:3 +msgid "Apply time-limited discounts" +msgstr "" + +#: ../../point_of_sale/advanced_pricing_features/seasonal_discount.rst:5 +msgid "Entice your customers and increase your revenue by offering time-limited or seasonal discounts. Odoo has a powerful pricelist feature to support a pricing strategy tailored to your business." +msgstr "" + +#: ../../point_of_sale/advanced_pricing_features/seasonal_discount.rst:12 +msgid "To activate the *Pricelists* feature, go to :menuselection:`Point of Sales --> Configuration --> Point of sale` and select your PoS interface." +msgstr "" + +#: ../../point_of_sale/advanced_pricing_features/seasonal_discount.rst:18 +msgid "Choose the pricelists you want to make available in this Point of Sale and define the default pricelist. You can access all your pricelists by clicking on *Pricelists*." +msgstr "" + +#: ../../point_of_sale/advanced_pricing_features/seasonal_discount.rst:23 +msgid "Create a pricelist" +msgstr "" + +#: ../../point_of_sale/advanced_pricing_features/seasonal_discount.rst:25 +msgid "By default, you have a *Public Pricelist* to create more, go to :menuselection:`Point of Sale --> Catalog --> Pricelists`" +msgstr "" + +#: ../../point_of_sale/advanced_pricing_features/seasonal_discount.rst:31 +msgid "You can set several criterias to use a specific price: periods, min. quantity (meet a minimum ordered quantity and get a price break), etc. You can also chose to only apply that pricelist on specific products or on the whole range." +msgstr "" + +#: ../../point_of_sale/advanced_pricing_features/seasonal_discount.rst:37 +msgid "Using a pricelist in the PoS interface" +msgstr "" + +#: ../../point_of_sale/advanced_pricing_features/seasonal_discount.rst:39 +msgid "You now have a new button above the *Customer* one, use it to instantly select the right pricelist." +msgstr "" + #: ../../point_of_sale/analyze.rst:3 msgid "Analyze sales" msgstr "" @@ -679,34 +719,34 @@ msgid "To activate the *Order printing* feature, go to :menuselection:`Point of msgstr "" #: ../../point_of_sale/restaurant/kitchen_printing.rst:16 -msgid "Under the IoT Box / Hardware Proxy category, you will find *Order Printers*." +msgid "Under the IoT Box / Hardware Proxy category, you will find *Order Printers*. Note that you need an IoT Box to connect your Printer to the PoS." msgstr "" -#: ../../point_of_sale/restaurant/kitchen_printing.rst:19 +#: ../../point_of_sale/restaurant/kitchen_printing.rst:20 msgid "Add a printer" msgstr "" -#: ../../point_of_sale/restaurant/kitchen_printing.rst:21 +#: ../../point_of_sale/restaurant/kitchen_printing.rst:22 msgid "In your configuration menu you will now have a *Order Printers* option where you can add the printer." msgstr "" -#: ../../point_of_sale/restaurant/kitchen_printing.rst:28 +#: ../../point_of_sale/restaurant/kitchen_printing.rst:29 msgid "Print a kitchen/bar order" msgstr "" -#: ../../point_of_sale/restaurant/kitchen_printing.rst:33 +#: ../../point_of_sale/restaurant/kitchen_printing.rst:34 msgid "Select or create a printer." msgstr "" -#: ../../point_of_sale/restaurant/kitchen_printing.rst:36 +#: ../../point_of_sale/restaurant/kitchen_printing.rst:37 msgid "Print the order in the kitchen/bar" msgstr "" -#: ../../point_of_sale/restaurant/kitchen_printing.rst:38 +#: ../../point_of_sale/restaurant/kitchen_printing.rst:39 msgid "On your PoS interface, you now have a *Order* button." msgstr "" -#: ../../point_of_sale/restaurant/kitchen_printing.rst:43 +#: ../../point_of_sale/restaurant/kitchen_printing.rst:44 msgid "When you press it, it will print the order on your kitchen/bar printer." msgstr "" @@ -858,7 +898,7 @@ msgstr "" msgid "Once on the payment interface, you now have a new *Tip* button" msgstr "" -#: ../../point_of_sale/restaurant/tips.rst:31 +#: ../../point_of_sale/restaurant/tips.rst:28 msgid "Add the tip your customer wants to leave and process to the payment." msgstr "" @@ -1014,39 +1054,3 @@ msgstr "" msgid "As you can see, the total is in negative, to end the refund you simply have to process the payment." msgstr "" -#: ../../point_of_sale/shop/seasonal_discount.rst:3 -msgid "Apply time-limited discounts" -msgstr "" - -#: ../../point_of_sale/shop/seasonal_discount.rst:5 -msgid "Entice your customers and increase your revenue by offering time-limited or seasonal discounts. Odoo has a powerful pricelist feature to support a pricing strategy tailored to your business." -msgstr "" - -#: ../../point_of_sale/shop/seasonal_discount.rst:12 -msgid "To activate the *Pricelists* feature, go to :menuselection:`Point of Sales --> Configuration --> Point of sale` and select your PoS interface." -msgstr "" - -#: ../../point_of_sale/shop/seasonal_discount.rst:18 -msgid "Choose the pricelists you want to make available in this Point of Sale and define the default pricelist. You can access all your pricelists by clicking on *Pricelists*." -msgstr "" - -#: ../../point_of_sale/shop/seasonal_discount.rst:23 -msgid "Create a pricelist" -msgstr "" - -#: ../../point_of_sale/shop/seasonal_discount.rst:25 -msgid "By default, you have a *Public Pricelist* to create more, go to :menuselection:`Point of Sale --> Catalog --> Pricelists`" -msgstr "" - -#: ../../point_of_sale/shop/seasonal_discount.rst:31 -msgid "You can set several criterias to use a specific price: periods, min. quantity (meet a minimum ordered quantity and get a price break), etc. You can also chose to only apply that pricelist on specific products or on the whole range." -msgstr "" - -#: ../../point_of_sale/shop/seasonal_discount.rst:37 -msgid "Using a pricelist in the PoS interface" -msgstr "" - -#: ../../point_of_sale/shop/seasonal_discount.rst:39 -msgid "You now have a new button above the *Customer* one, use it to instantly select the right pricelist." -msgstr "" - diff --git a/locale/sources/project.pot b/locale/sources/project.pot index 191fd113f..0861ed60d 100644 --- a/locale/sources/project.pot +++ b/locale/sources/project.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: Odoo 12.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-11-07 15:38+0100\n" +"POT-Creation-Date: 2019-09-16 15:50+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -151,7 +151,11 @@ msgid "In order to be able to generate a task from a sale order you will need to msgstr "" #: ../../project/advanced/so_to_task.rst:39 -msgid "Moreover if you wish to be able to invoice your customers based on time spent on the task, it is also necessary to install the **Timesheet** module. Simply go into the application module and install the following:" +msgid "And finally, the **Timesheet** app, Timesheet will not only let you create a task from a Sales order, but also invoice your customer based on the time spent on that task." +msgstr "" + +#: ../../project/advanced/so_to_task.rst:41 +msgid "Simply go into the application module and install the following:" msgstr "" #: ../../project/advanced/so_to_task.rst:47 diff --git a/locale/sources/purchase.pot b/locale/sources/purchase.pot index cf3b5b553..4b5a81c9a 100644 --- a/locale/sources/purchase.pot +++ b/locale/sources/purchase.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: Odoo 12.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-11-07 15:38+0100\n" +"POT-Creation-Date: 2019-09-16 15:50+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -41,7 +41,7 @@ msgstr "" #: ../../purchase/purchases/rfq/3_way_matching.rst:18 #: ../../purchase/purchases/rfq/analyze.rst:24 #: ../../purchase/purchases/rfq/approvals.rst:9 -#: ../../purchase/purchases/rfq/bills.rst:31 +#: ../../purchase/purchases/rfq/bills.rst:10 #: ../../purchase/purchases/rfq/create.rst:13 #: ../../purchase/purchases/rfq/lock_orders.rst:9 #: ../../purchase/purchases/rfq/reception.rst:14 @@ -385,215 +385,39 @@ msgid "Once approved, the purchase order follows the normal process." msgstr "" #: ../../purchase/purchases/rfq/bills.rst:3 -msgid "Control supplier bills" +msgid "Bill Control" msgstr "" #: ../../purchase/purchases/rfq/bills.rst:5 -msgid "The **Purchase** application allows you to manage your purchase orders, incoming products, and vendor bills all seamlessly in one place." +msgid "With Odoo, you can define a setting to help the control of your bills. *Bill Control* lets you choose if the supplier sends you the bill before or after you receive the goods." msgstr "" -#: ../../purchase/purchases/rfq/bills.rst:8 -msgid "If you want to set up a vendor bill control process, the first thing you need to do is to have purchase data in Odoo. Knowing what has been purchased and received is the first step towards understanding your purchase management processes." +#: ../../purchase/purchases/rfq/bills.rst:12 +msgid "For this feature to work, go to :menuselection:`Purchases --> Configuration --> Settings` and select which way you want to control your bills." msgstr "" -#: ../../purchase/purchases/rfq/bills.rst:13 -msgid "Here is the standard work flow in Odoo:" +#: ../../purchase/purchases/rfq/bills.rst:20 +msgid "Change the control policy" msgstr "" -#: ../../purchase/purchases/rfq/bills.rst:15 -msgid "You begin with a **Request for Quotation (RFQ)** to send out to your vendor(s)." +#: ../../purchase/purchases/rfq/bills.rst:22 +msgid "While the setting above will be your default method of bill control, you can always select which way you want to invoice your product on each product page under the *Purchase* tab." msgstr "" -#: ../../purchase/purchases/rfq/bills.rst:18 -msgid "Once the vendor has accepted the RFQ, confirm the RFQ into a **Purchase Order (PO)**." -msgstr "" - -#: ../../purchase/purchases/rfq/bills.rst:21 -msgid "Confirming the PO generates an **Incoming Shipment** if you purchased any stockable products." -msgstr "" - -#: ../../purchase/purchases/rfq/bills.rst:24 -msgid "Upon receiving a **Vendor Bill** from your Vendor, validate the bill with products received in the previous step to ensure accuracy." -msgstr "" - -#: ../../purchase/purchases/rfq/bills.rst:27 -msgid "This process may be done by three different people within the company, or only one." +#: ../../purchase/purchases/rfq/bills.rst:26 +msgid "You might want to use different settings for different types of products." msgstr "" #: ../../purchase/purchases/rfq/bills.rst:34 -msgid "Installing the Purchase and Inventory applications" +msgid "Verify your Vendor Bill" msgstr "" #: ../../purchase/purchases/rfq/bills.rst:36 -msgid "From the **Apps** application, search for the **Purchase** module and install it. Due to certain dependencies, installing purchase will automatically install the **Inventory** and **Accounting** applications." -msgstr "" - -#: ../../purchase/purchases/rfq/bills.rst:41 -msgid "Creating products" +msgid "If you didn’t receive any of your product yet on *Purchase Order* under the *Shipment* tab," msgstr "" #: ../../purchase/purchases/rfq/bills.rst:43 -msgid "Creating products in Odoo is essential for quick and efficient purchasing within Odoo. Simply navigate to the **Products** submenu under **Purchase**, and click **Create**." -msgstr "" - -#: ../../purchase/purchases/rfq/bills.rst:50 -msgid "When creating the product, Pay attention to the **Product Type** field, as it is important:" -msgstr "" - -#: ../../purchase/purchases/rfq/bills.rst:53 -msgid "Products that are set as **Stockable** or **Consumable** will allow you to keep track of their inventory levels. These options imply stock management and will allow for receiving these kinds of products." -msgstr "" - -#: ../../purchase/purchases/rfq/bills.rst:58 -msgid "Conversely, products that are set as a **Service** or **Digital Product** will not imply stock management, simply due to the fact that there is no inventory to manage. You will not be able to receive products under either of these designations." -msgstr "" - -#: ../../purchase/purchases/rfq/bills.rst:64 -msgid "It is recommended that you create a **Miscellaneous** product for all purchases that occur infrequently and do not require inventory valuation or management. If you create such a product, it is recommend to set the product type to **Service**." -msgstr "" - -#: ../../purchase/purchases/rfq/bills.rst:70 -msgid "Managing your Vendor Bills" -msgstr "" - -#: ../../purchase/purchases/rfq/bills.rst:73 -msgid "Purchasing products or services" -msgstr "" - -#: ../../purchase/purchases/rfq/bills.rst:75 -msgid "From the purchase application, you can create a purchase order with as many products as you need. If the vendor sends you a confirmation or quotation for an order, you may record the order reference number in the **Vendor Reference** field. This will enable you to easily match the PO with the the vendor bill later (as the vendor bill will probably include the Vendor Reference)" -msgstr "" - -#: ../../purchase/purchases/rfq/bills.rst:85 -msgid "Validate the purchase order and receive the products from the **Inventory** application." -msgstr "" - -#: ../../purchase/purchases/rfq/bills.rst:89 -msgid "Receiving Products" -msgstr "" - -#: ../../purchase/purchases/rfq/bills.rst:91 -msgid "If you purchased any stockable products that you manage the inventory of, you will need to receive the products from the **Inventory** application after you confirm a purchase order. From the **Inventory** dashboard, you should see a button linking you directly to the transfer of products. This button is outlined in red below:" -msgstr "" - -#: ../../purchase/purchases/rfq/bills.rst:100 -msgid "Navigating this route will take you to a list of all orders awaiting to be received." -msgstr "" - -#: ../../purchase/purchases/rfq/bills.rst:106 -msgid "If you have a lot of awaiting orders, apply a filter using the search bar in the upper right. With this search bar, you may filter based on the **Vendor** (or **Partner**), the product, or the source document, also known as the reference of your purchase order. You also have the capability to group the orders by different criteria under **Group By**. Selecting an item from this list will open the following screen where you then will receive the products." -msgstr "" - -#: ../../purchase/purchases/rfq/bills.rst:117 -msgid "Purchasing **Service** products does not trigger a delivery order." -msgstr "" - -#: ../../purchase/purchases/rfq/bills.rst:120 -msgid "Managing Vendor Bills" -msgstr "" - -#: ../../purchase/purchases/rfq/bills.rst:122 -msgid "When you receive a **Vendor Bill** for a previous purchase, be sure to record it in the **Purchases** application under the **Control Menu**. You need to create a new vendor bill even if you already registered a purchase order." -msgstr "" - -#: ../../purchase/purchases/rfq/bills.rst:130 -msgid "The first thing you will need to do upon creating a **Vendor Bill** is to select the appropriate **Vendor** as this will also pull up any associated accounting or pricelist information. From there, you can choose to specify any one or multiple purchase orders to populate the vendor bill with. When you select a purchase order from the list, Odoo will pull any uninvoiced products associated to that purchase order and automatically populate that information below. If you are having a hard time finding the appropriate vendor bill, you may search through the list by inputting the vendor reference number or your internal purchase order number." -msgstr "" - -#: ../../purchase/purchases/rfq/bills.rst:144 -msgid "While the invoice is in draft state, you can make any modifications you need (i.e. remove or add product lines, modify quantities, and change prices)." -msgstr "" - -#: ../../purchase/purchases/rfq/bills.rst:149 -msgid "Your vendor may send you several bills for the same purchase order if:" -msgstr "" - -#: ../../purchase/purchases/rfq/bills.rst:151 -msgid "Your vendor is in back-order and is sending you invoices as they ship the products." -msgstr "" - -#: ../../purchase/purchases/rfq/bills.rst:154 -msgid "Your vendor is sending you a partial bill or asking for a deposit." -msgstr "" - -#: ../../purchase/purchases/rfq/bills.rst:156 -msgid "Every time you record a new vendor bill, Odoo will automatically populate the product quantities based on what has been received from the vendor. If this value is showing a zero, this means that you have not yet received this product and simply serves as a reminder that the product is not in hand and you may need to inquire further into this. At any point in time, before you validate the vendor bill, you may override this zero quantity." -msgstr "" - -#: ../../purchase/purchases/rfq/bills.rst:165 -msgid "Vendor Bill Matching" -msgstr "" - -#: ../../purchase/purchases/rfq/bills.rst:168 -msgid "What to do if your vendor bill does not match what you received" -msgstr "" - -#: ../../purchase/purchases/rfq/bills.rst:170 -msgid "If the bill you receive from the vendor has different quantities than what Odoo automatically populates as quantities, this could be due to several reasons:" -msgstr "" - -#: ../../purchase/purchases/rfq/bills.rst:174 -msgid "The vendor is incorrectly charging you for products and/or services that you have not ordered." -msgstr "" - -#: ../../purchase/purchases/rfq/bills.rst:177 -msgid "The vendor is billing you for products that you might not have received yet, as the invoicing control may be based on ordered or received quantities." -msgstr "" - -#: ../../purchase/purchases/rfq/bills.rst:181 -msgid "Or the vendor did not bill you for previously purchased products." -msgstr "" - -#: ../../purchase/purchases/rfq/bills.rst:183 -msgid "In these instances it is recommended that you verify that the bill, and any associated purchase order to the vendor, are accurate and that you understand what you have ordered and what you have already received." -msgstr "" - -#: ../../purchase/purchases/rfq/bills.rst:187 -msgid "If you are unable to find a purchase order related to a vendor bill, this could be due to one of a few reasons:" -msgstr "" - -#: ../../purchase/purchases/rfq/bills.rst:190 -msgid "The vendor has already invoiced you for this purchase order, therefore it is not going to appear anywhere in the selection." -msgstr "" - -#: ../../purchase/purchases/rfq/bills.rst:193 -msgid "Someone in the company forgot to record a purchase order for this vendor." -msgstr "" - -#: ../../purchase/purchases/rfq/bills.rst:196 -msgid "Or the vendor is charging you for something you did not order." -msgstr "" - -#: ../../purchase/purchases/rfq/bills.rst:199 -msgid "How product quantities are managed" -msgstr "" - -#: ../../purchase/purchases/rfq/bills.rst:201 -msgid "By default, services are managed based on ordered quantities, while stockables and consumables are managed based on received quantities." -msgstr "" - -#: ../../purchase/purchases/rfq/bills.rst:204 -msgid "If you need to manage products based on ordered quantities over received quantities, you will need to enable **Debug Mode** from the **About Odoo** information. Once debug mode is activated, select the product(s) you wish to modify, and you should see a new field appear, labeled **Control Purchase Bills**." -msgstr "" - -#: ../../purchase/purchases/rfq/bills.rst:213 -msgid "You can then change the default management method for the selected product to be based on either:" -msgstr "" - -#: ../../purchase/purchases/rfq/bills.rst:216 -msgid "Ordered quantities" -msgstr "" - -#: ../../purchase/purchases/rfq/bills.rst:218 -msgid "Received quantities" -msgstr "" - -#: ../../purchase/purchases/rfq/bills.rst:221 -msgid "Batch Billing" -msgstr "" - -#: ../../purchase/purchases/rfq/bills.rst:223 -msgid "When creating a vendor bill and selecting the appropriate purchase order, you may continue to select additional purchase orders and Odoo will add the additional line items from that purchase order. If you have not deleted the previous line items from the first purchase order the bill will be linked to all the appropriate purchase orders." +msgid "Depending on the billing policy defined above. If you're supposed to be billed based on ordered quantity, Odoo will suggest a bill for the number of units ordered. If you're supposed to be billed based on the received quantities, Odoo will suggest a bill for 0 as shown above." msgstr "" #: ../../purchase/purchases/rfq/cancel.rst:3 diff --git a/locale/sources/sales.pot b/locale/sources/sales.pot index 06605851c..da049987b 100644 --- a/locale/sources/sales.pot +++ b/locale/sources/sales.pot @@ -6,9 +6,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: Odoo 11.0\n" +"Project-Id-Version: Odoo 12.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-10-19 10:03+0200\n" +"POT-Creation-Date: 2019-09-16 15:50+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -750,7 +750,7 @@ msgid "Stimulate customers with quotations deadline" 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 "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." msgstr "" #: ../../sales/send_quotations/deadline.rst:11 @@ -770,7 +770,7 @@ msgid "You can also set a default deadline in a *Quotation Template*. Each time msgstr "" #: ../../sales/send_quotations/deadline.rst:29 -msgid "On your customer side, they will see this." +msgid "On your customer side, they will see this:" msgstr "" #: ../../sales/send_quotations/different_addresses.rst:3 diff --git a/locale/sources/website.pot b/locale/sources/website.pot index 56133c3bd..c71132736 100644 --- a/locale/sources/website.pot +++ b/locale/sources/website.pot @@ -6,9 +6,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: Odoo 11.0\n" +"Project-Id-Version: Odoo 12.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-07-23 12:10+0200\n" +"POT-Creation-Date: 2019-09-16 15:50+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -113,697 +113,717 @@ msgid "As a last step, authorize Odoo to access Google API." msgstr "" #: ../../website/optimize/seo.rst:3 -msgid "How to do Search Engine Optimisation in Odoo" +msgid "How to do Search Engine Optimisation in Odoo (SEO)" msgstr "" -#: ../../website/optimize/seo.rst:6 -msgid "How is SEO handled in Odoo?" -msgstr "" - -#: ../../website/optimize/seo.rst:8 +#: ../../website/optimize/seo.rst:5 msgid "Search Engine Optimization (SEO) is a set of good practices to optimize your website so that you get a better ranking in search engines like Google. In short, a good SEO allows you to get more visitors." msgstr "" -#: ../../website/optimize/seo.rst:12 -msgid "Some examples of SEO rules: your web pages should load faster, your page should have one and only one title ``

``, your website should have a ``/sitemap.xml`` file, etc." +#: ../../website/optimize/seo.rst:9 +msgid "Some examples of SEO rules: your web pages should load fast, your page should have one and only one title ``

``, meta tags (alt-tag, title-tag) should be consistent with the content, your website should have a ``/sitemap.xml`` file, etc." msgstr "" -#: ../../website/optimize/seo.rst:16 -msgid "The Odoo Website Builder is probably the most SEO-ready CMS out there. We consider SEO a top priority. To guarantee Odoo Website and Odoo eCommerce users have a great SEO, Odoo abstracts all the technical complexities of SEO and handles everything for you, in the best possible way." +#: ../../website/optimize/seo.rst:15 +msgid "To guarantee Odoo Website and Odoo eCommerce users have a great SEO, Odoo abstracts all the technical complexities of SEO and handles everything for you, in the best possible way. This will be explained here below." msgstr "" -#: ../../website/optimize/seo.rst:23 -msgid "Page speed" +#: ../../website/optimize/seo.rst:20 +msgid "But first, let see how you can easily boost your ranking by finetuning the content and the meta tags of your website." msgstr "" -#: ../../website/optimize/seo.rst:26 -msgid "Introduction" -msgstr "" - -#: ../../website/optimize/seo.rst:28 -msgid "The time to load a page is an important criteria for Google. A faster website not only improves your visitor's experience, but Google gives you a better page ranking if your page loads faster than your competitors. Some studies have shown that, if you divide the time to load your pages by two (e.g. 2 seconds instead of 4 seconds), the visitor abandonment rate is also divided by two. (25% to 12.5%). One extra second to load a page could `cost $1.6b to Amazon in sales `__." -msgstr "" - -#: ../../website/optimize/seo.rst:40 -msgid "Fortunately, Odoo does all the magic for you. Below, you will find the tricks Odoo uses to speed up your page loading time. You can compare how your website ranks using these two tools:" -msgstr "" - -#: ../../website/optimize/seo.rst:44 -msgid "`Google Page Speed `__" -msgstr "" - -#: ../../website/optimize/seo.rst:46 -msgid "`Pingdom Website Speed Test `__" -msgstr "" - -#: ../../website/optimize/seo.rst:49 -msgid "Static resources: CSS" -msgstr "" - -#: ../../website/optimize/seo.rst:51 -msgid "All CSS files are pre-processed, concatenated, minified, compressed and cached (server side and browser side). The result:" -msgstr "" - -#: ../../website/optimize/seo.rst:54 -msgid "only one CSS file request is needed to load a page" -msgstr "" - -#: ../../website/optimize/seo.rst:56 -msgid "this CSS file is shared and cached amongst pages, so that when the visitor clicks on another page, the browser doesn't have to even load a single CSS resource." -msgstr "" - -#: ../../website/optimize/seo.rst:60 -msgid "this CSS file is optimized to be small" -msgstr "" - -#: ../../website/optimize/seo.rst:62 -msgid "**Pre-processed:** The CSS framework used by Odoo 9 is bootstrap 3. Although a theme might use another framework, most of `Odoo themes `__ extend and customize bootstrap directly. Since Odoo supports Less and Sass, so you can modify CSS rules, instead of overwriting them through extra CSS lines, resulting in a smaller file." -msgstr "" - -#: ../../website/optimize/seo.rst:70 -msgid "**Both files in the **" -msgstr "" - -#: ../../website/optimize/seo.rst:70 -msgid "**What the visitor gets (only one file)**" -msgstr "" - -#: ../../website/optimize/seo.rst:72 -msgid "/\\* From bootstrap.css \\*/" -msgstr "" - -#: ../../website/optimize/seo.rst:72 -#: ../../website/optimize/seo.rst:73 -#: ../../website/optimize/seo.rst:79 -#: ../../website/optimize/seo.rst:121 -msgid ".text-muted {" -msgstr "" - -#: ../../website/optimize/seo.rst:73 -#: ../../website/optimize/seo.rst:80 -#: ../../website/optimize/seo.rst:122 -msgid "color: #666;" -msgstr "" - -#: ../../website/optimize/seo.rst:74 -msgid "color: #777;" -msgstr "" - -#: ../../website/optimize/seo.rst:74 -msgid "background: yellow" -msgstr "" - -#: ../../website/optimize/seo.rst:75 -msgid "background: yellow;" -msgstr "" - -#: ../../website/optimize/seo.rst:75 -#: ../../website/optimize/seo.rst:76 -#: ../../website/optimize/seo.rst:81 -#: ../../website/optimize/seo.rst:123 -msgid "}" -msgstr "" - -#: ../../website/optimize/seo.rst:78 -msgid "/\\* From my-theme.css \\*/" -msgstr "" - -#: ../../website/optimize/seo.rst:84 -msgid "**Concatenated:** every module or library you might use in Odoo has its own set of CSS, Less or Sass files (eCommerce, blog, theme, etc.) Having several CSS files is great for the modularity, but not good for the performance because most browsers can only perform 6 requests in parallel resulting in lots of files that are loaded in series. The latency time to transfer a file is usually much longer than the actual data transfer time, for small files like .JS and .CSS. Thus, the time to load CSS resources depends more on the number of requests to be done than the actual file size." -msgstr "" - -#: ../../website/optimize/seo.rst:94 -msgid "To address this issue, all CSS / Less / Sass files are concatenated into a single .CSS file to send to the browser. So a visitor has **only one .CSS file to load** per page, which is particularly efficient. As the CSS is shared amongst all pages, when the visitor clicks on another page, the browser does not even have to load a new CSS file!" -msgstr "" - -#: ../../website/optimize/seo.rst:100 -msgid "The CSS sent by Odoo includes all CSS / Less / Sass of all pages / modules. By doing this, additional page views from the same visitor will not have to load CSS files at all. But some modules might include huge CSS/Javascript resources that you do not want to prefetch at the first page because they are too big. In this case, Odoo splits this resource into a second bundle that is loaded only when the page using it is requested. An example of this is the backend that is only loaded when the visitor logs in and accesses the backend (/web)." -msgstr "" - -#: ../../website/optimize/seo.rst:110 -msgid "If the CSS file is very big, Odoo will split it into two smaller files to avoid the 4095 selectors limit per sheet of Internet Explorer 8. But most themes fit below this limit." -msgstr "" - -#: ../../website/optimize/seo.rst:114 -msgid "**Minified:** After being pre-processed and concatenated, the resulting CSS is minified to reduce its size." -msgstr "" - -#: ../../website/optimize/seo.rst:118 -msgid "**Before minification**" -msgstr "" - -#: ../../website/optimize/seo.rst:118 -msgid "**After minification**" -msgstr "" - -#: ../../website/optimize/seo.rst:120 -msgid "/\\* some comments \\*/" -msgstr "" - -#: ../../website/optimize/seo.rst:120 -msgid ".text-muted {color: #666}" -msgstr "" - -#: ../../website/optimize/seo.rst:126 -msgid "The final result is then compressed, before being delivered to the browser." -msgstr "" - -#: ../../website/optimize/seo.rst:129 -msgid "Then, a cached version is stored on the server side (so we do not have to pre-process, concatenate, minify at every request) and the browser side (so the same visitor will load the CSS only once for all pages he will visit)." -msgstr "" - -#: ../../website/optimize/seo.rst:135 -msgid "If you are in debug mode, the CSS resources are neither concatenated nor minified. That way, it's easier to debug (but it's much slower)" -msgstr "" - -#: ../../website/optimize/seo.rst:140 -msgid "Static resources: Javascript" -msgstr "" - -#: ../../website/optimize/seo.rst:142 -msgid "As with CSS resources, Javascript resources are also concatenated, minified, compressed and cached (server side and browser side)." -msgstr "" - -#: ../../website/optimize/seo.rst:145 -msgid "Odoo creates three Javascript bundles:" -msgstr "" - -#: ../../website/optimize/seo.rst:147 -msgid "One for all pages of the website (including code for parallax effects, form validation, …)" -msgstr "" - -#: ../../website/optimize/seo.rst:150 -msgid "One for common Javascript code shared among frontend and backend (bootstrap)" -msgstr "" - -#: ../../website/optimize/seo.rst:153 -msgid "One for backend specific Javascript code (Odoo Web Client interface for your employees using Odoo)" -msgstr "" - -#: ../../website/optimize/seo.rst:156 -msgid "Most visitors to your website will only need the first two bundles, resulting in a maximum of two Javascript files to load to render one page. As these files are shared across all pages, further clicks by the same visitor will not load any other Javascript resource." -msgstr "" - -#: ../../website/optimize/seo.rst:162 -msgid "If you work in debug mode, the CSS and javascript are neither concatenated, nor minified. Thus, it's much slower. But it allows you to easily debug with the Chrome debugger as CSS and Javascript resources are not transformed from their original versions." -msgstr "" - -#: ../../website/optimize/seo.rst:168 -msgid "Images" -msgstr "" - -#: ../../website/optimize/seo.rst:170 -msgid "When you upload new images using the website builder, Odoo automatically compresses them to reduce their sizes. (lossless compression for .PNG and .GIF and lossy compression for .JPG)" -msgstr "" - -#: ../../website/optimize/seo.rst:174 -msgid "From the upload button, you have the option to keep the original image unmodified if you prefer to optimize the quality of the image rather than performance." -msgstr "" - -#: ../../website/optimize/seo.rst:182 -msgid "Odoo compresses images when they are uploaded to your website, not when requested by the visitor. Thus, it's possible that, if you use a third-party theme, it will provide images that are not compressed efficiently. But all images used in Odoo official themes have been compressed by default." -msgstr "" - -#: ../../website/optimize/seo.rst:188 -msgid "When you click on an image, Odoo shows you the Alt and title attributes of the ```` tag. You can click on it to set your own title and Alt attributes for the image." -msgstr "" - -#: ../../website/optimize/seo.rst:195 -msgid "When you click on this link, the following window will appear:" -msgstr "" - -#: ../../website/optimize/seo.rst:200 -msgid "Odoo's pictograms are implemented using a font (`Font Awesome `__ in most Odoo themes). Thus, you can use as many pictograms as you want in your page, they will not result in extra requests to load the page." -msgstr "" - -#: ../../website/optimize/seo.rst:209 -msgid "CDN" -msgstr "" - -#: ../../website/optimize/seo.rst:211 -msgid "If you activate the CDN feature in Odoo, static resources (Javascript, CSS, images) are loaded from a Content Delivery Network. Using a Content Delivery Network has three advantages:" -msgstr "" - -#: ../../website/optimize/seo.rst:215 -msgid "Load resources from a nearby server (most CDN have servers in main countries around the globe)" -msgstr "" - -#: ../../website/optimize/seo.rst:218 -msgid "Cache resources efficiently (no computation resources usage on your own server)" -msgstr "" - -#: ../../website/optimize/seo.rst:221 -msgid "Split the resource loading on different services allowing to load more resources in parallel (since the Chrome limit of 6 parallel requests is by domain)" -msgstr "" - -#: ../../website/optimize/seo.rst:225 -msgid "You can configure your CDN options from the **Website Admin** app, using the Configuration menu. Here is an example of configuration you can use:" -msgstr "" - -#: ../../website/optimize/seo.rst:232 -msgid "HTML Pages" -msgstr "" - -#: ../../website/optimize/seo.rst:234 -msgid "The HTML pages can be compressed, but this is usually handled by your web server (NGINX or Apache)." -msgstr "" - -#: ../../website/optimize/seo.rst:237 -msgid "The Odoo Website builder has been optimized to guarantee clean and short HTML code. Building blocks have been developed to produce clean HTML code, usually using bootstrap and the HTML editor." -msgstr "" - -#: ../../website/optimize/seo.rst:241 -msgid "As an example, if you use the color picker to change the color of a paragraph to the primary color of your website, Odoo will produce the following code:" -msgstr "" - -#: ../../website/optimize/seo.rst:245 -msgid "``

My Text

``" -msgstr "" - -#: ../../website/optimize/seo.rst:247 -msgid "Whereas most HTML editors (such as CKEditor) will produce the following code:" -msgstr "" - -#: ../../website/optimize/seo.rst:250 -msgid "``

My Text

``" -msgstr "" - -#: ../../website/optimize/seo.rst:253 -msgid "Responsive Design" -msgstr "" - -#: ../../website/optimize/seo.rst:255 -msgid "As of 2015, websites that are not mobile-friendly are negatively impacted in Google Page ranking. All Odoo themes rely on Bootstrap 3 to render efficiently according to the device: desktop, tablet or mobile phone." -msgstr "" - -#: ../../website/optimize/seo.rst:263 -msgid "As all Odoo modules share the same technology, absolutely all pages in your website are mobile friendly. (as opposed to traditional CMS which have mobile friendly themes, but some specific modules or pages are not designed to be mobile friendly as they all have their own CSS frameworks)" -msgstr "" - -#: ../../website/optimize/seo.rst:270 -msgid "Browser caching" -msgstr "" - -#: ../../website/optimize/seo.rst:272 -msgid "Javascript, images and CSS resources have an URL that changes dynamically when their content change. As an example, all CSS files are loaded through this URL: `http://localhost:8069/web/content/457-0da1d9d/web.assets\\_common.0.css `__. The ``457-0da1d9d`` part of this URL will change if you modify the CSS of your website." -msgstr "" - -#: ../../website/optimize/seo.rst:279 -msgid "This allows Odoo to set a very long cache delay (XXX) on these resources: XXX secs, while being updated instantly if you update the resource." -msgstr "" - -#: ../../website/optimize/seo.rst:287 -msgid "Scalability" -msgstr "" - -#: ../../website/optimize/seo.rst:289 -msgid "In addition to being fast, Odoo is also more scalable than traditional CMS' and eCommerce (Drupal, Wordpress, Magento, Prestashop). The following link provides an analysis of the major open source CMS and eCommerce compared to Odoo when it comes to high query volumes." -msgstr "" - -#: ../../website/optimize/seo.rst:294 -msgid "`*https://www.odoo.com/slides/slide/197* `__" -msgstr "" - -#: ../../website/optimize/seo.rst:296 -msgid "Here is the slide that summarizes the scalability of Odoo eCommerce and Odoo CMS. (based on Odoo version 8, Odoo 9 is even faster)" -msgstr "" - -#: ../../website/optimize/seo.rst:303 -msgid "URLs handling" -msgstr "" - -#: ../../website/optimize/seo.rst:306 -msgid "URLs Structure" -msgstr "" - -#: ../../website/optimize/seo.rst:308 -msgid "A typical Odoo URL will look like this:" -msgstr "" - -#: ../../website/optimize/seo.rst:310 -msgid "https://www.mysite.com/fr\\_FR/shop/product/my-great-product-31" -msgstr "" - -#: ../../website/optimize/seo.rst:312 -msgid "With the following components:" -msgstr "" - -#: ../../website/optimize/seo.rst:314 -msgid "**https://** = Protocol" -msgstr "" - -#: ../../website/optimize/seo.rst:316 -msgid "**www.mysite.com** = your domain name" -msgstr "" - -#: ../../website/optimize/seo.rst:318 -msgid "**/fr\\_FR** = the language of the page. This part of the URL is removed if the visitor browses the main language of the website (english by default, but you can set another language as the main one). Thus, the English version of this page is: https://www.mysite.com/shop/product/my-great-product-31" -msgstr "" - -#: ../../website/optimize/seo.rst:324 -msgid "**/shop/product** = every module defines its own namespace (/shop is for the catalog of the eCommerce module, /shop/product is for a product page). This name can not be customized to avoid conflicts in different URLs." -msgstr "" - -#: ../../website/optimize/seo.rst:329 -msgid "**my-great-product** = by default, this is the slugified title of the product this page refers to. But you can customize it for SEO purposes. A product named \"Pain carré\" will be slugified to \"pain-carre\". Depending on the namespace, this could be different objects (blog post, page title, forum post, forum comment, product category, etc)" -msgstr "" - -#: ../../website/optimize/seo.rst:336 -msgid "**-31** = the unique ID of the product" -msgstr "" - -#: ../../website/optimize/seo.rst:338 -msgid "Note that any dynamic component of an URL can be reduced to its ID. As an example, the following URLs all do a 301 redirect to the above URL:" -msgstr "" - -#: ../../website/optimize/seo.rst:341 -msgid "https://www.mysite.com/fr\\_FR/shop/product/31 (short version)" -msgstr "" - -#: ../../website/optimize/seo.rst:343 -msgid "http://mysite.com/fr\\_FR/shop/product/31 (even shorter version)" -msgstr "" - -#: ../../website/optimize/seo.rst:345 -msgid "http://mysite.com/fr\\_FR/shop/product/other-product-name-31 (old product name)" -msgstr "" - -#: ../../website/optimize/seo.rst:348 -msgid "This could be useful to easily get shorter version of an URL and handle efficiently 301 redirects when the name of your product changes over time." -msgstr "" - -#: ../../website/optimize/seo.rst:352 -msgid "Some URLs have several dynamic parts, like this one (a blog category and a post):" -msgstr "" - -#: ../../website/optimize/seo.rst:355 -msgid "https://www.odoo.com/blog/company-news-5/post/the-odoo-story-56" -msgstr "" - -#: ../../website/optimize/seo.rst:357 -msgid "In the above example:" -msgstr "" - -#: ../../website/optimize/seo.rst:359 -msgid "Company News: is the title of the blog" -msgstr "" - -#: ../../website/optimize/seo.rst:361 -msgid "The Odoo Story: is the title of a specific blog post" -msgstr "" - -#: ../../website/optimize/seo.rst:363 -msgid "When an Odoo page has a pager, the page number is set directly in the URL (does not have a GET argument). This allows every page to be indexed by search engines. Example:" -msgstr "" - -#: ../../website/optimize/seo.rst:367 -msgid "https://www.odoo.com/blog/page/3" -msgstr "" - -#: ../../website/optimize/seo.rst:370 -msgid "Having the language code as fr\\_FR is not perfect in terms of SEO. Although most search engines treat now \"\\_\" as a word separator, it has not always been the case. We plan to improve that for Odoo 10." -msgstr "" - -#: ../../website/optimize/seo.rst:375 -msgid "Changes in URLs & Titles" -msgstr "" - -#: ../../website/optimize/seo.rst:377 -msgid "When the URL of a page changes (e.g. a more SEO friendly version of your product name), you don't have to worry about updating all links:" -msgstr "" - -#: ../../website/optimize/seo.rst:380 -msgid "Odoo will automatically update all its links to the new URL" -msgstr "" - -#: ../../website/optimize/seo.rst:382 -msgid "If external websites still points to the old URL, a 301 redirect will be done to route visitors to the new website" -msgstr "" - -#: ../../website/optimize/seo.rst:385 -msgid "As an example, this URL:" -msgstr "" - -#: ../../website/optimize/seo.rst:387 -msgid "http://mysite.com/shop/product/old-product-name-31" -msgstr "" - -#: ../../website/optimize/seo.rst:389 -msgid "Will automatically redirect to :" -msgstr "" - -#: ../../website/optimize/seo.rst:391 -msgid "http://mysite.com/shop/product/new-and-better-product-name-31" -msgstr "" - -#: ../../website/optimize/seo.rst:393 -msgid "In short, just change the title of a blog post or the name of a product, and the changes will apply automatically everywhere in your website. The old link still works for links coming from external website. (with a 301 redirect to not lose the SEO link juice)" -msgstr "" - -#: ../../website/optimize/seo.rst:399 -msgid "HTTPS" -msgstr "" - -#: ../../website/optimize/seo.rst:401 -msgid "As of August 2014, Google started to add a ranking boost to secure HTTPS/SSL websites. So, by default all Odoo Online instances are fully based on HTTPS. If the visitor accesses your website through a non HTTPS url, it gets a 301 redirect to its HTTPS equivalent." -msgstr "" - -#: ../../website/optimize/seo.rst:407 -msgid "Links: nofollow strategy" -msgstr "" - -#: ../../website/optimize/seo.rst:409 -msgid "Having website that links to your own page plays an important role on how your page ranks in the different search engines. The more your page is linked from external and quality websites, the better is it for your SEO." -msgstr "" - -#: ../../website/optimize/seo.rst:414 -msgid "Odoo follows the following strategies to manage links:" -msgstr "" - -#: ../../website/optimize/seo.rst:416 -msgid "Every link you create manually when creating page in Odoo is \"dofollow\", which means that this link will contribute to the SEO Juice for the linked page." -msgstr "" - -#: ../../website/optimize/seo.rst:420 -msgid "Every link created by a contributor (forum post, blog comment, ...) that links to your own website is \"dofollow\" too." -msgstr "" - -#: ../../website/optimize/seo.rst:423 -msgid "But every link posted by a contributor that links to an external website is \"nofollow\". In that way, you do not run the risk of people posting links on your website to third-party websites which have a bad reputation." -msgstr "" - -#: ../../website/optimize/seo.rst:428 -msgid "Note that, when using the forum, contributors having a lot of Karma can be trusted. In such case, their links will not have a ``rel=\"nofollow\"`` attribute." -msgstr "" - -#: ../../website/optimize/seo.rst:433 -msgid "Multi-language support" -msgstr "" - -#: ../../website/optimize/seo.rst:436 -msgid "Multi-language URLs" -msgstr "" - -#: ../../website/optimize/seo.rst:438 -msgid "If you run a website in multiple languages, the same content will be available in different URLs, depending on the language used:" -msgstr "" - -#: ../../website/optimize/seo.rst:441 -msgid "https://www.mywebsite.com/shop/product/my-product-1 (English version = default)" -msgstr "" - -#: ../../website/optimize/seo.rst:443 -msgid "https://www.mywebsite.com\\/fr\\_FR/shop/product/mon-produit-1 (French version)" -msgstr "" - -#: ../../website/optimize/seo.rst:445 -msgid "In this example, fr\\_FR is the language of the page. You can even have several variations of the same language: pt\\_BR (Portuguese from Brazil) , pt\\_PT (Portuguese from Portugal)." -msgstr "" - -#: ../../website/optimize/seo.rst:450 -msgid "Language annotation" -msgstr "" - -#: ../../website/optimize/seo.rst:452 -msgid "To tell Google that the second URL is the French translation of the first URL, Odoo will add an HTML link element in the header. In the HTML section of the English version, Odoo automatically adds a link element pointing to the other versions of that webpage;" -msgstr "" - -#: ../../website/optimize/seo.rst:457 -msgid "" -msgstr "" - -#: ../../website/optimize/seo.rst:460 -msgid "With this approach:" -msgstr "" - -#: ../../website/optimize/seo.rst:462 -msgid "Google knows the different translated versions of your page and will propose the right one according to the language of the visitor searching on Google" -msgstr "" - -#: ../../website/optimize/seo.rst:466 -msgid "You do not get penalized by Google if your page is not translated yet, since it is not a duplicated content, but a different version of the same content." -msgstr "" - -#: ../../website/optimize/seo.rst:471 -msgid "Language detection" -msgstr "" - -#: ../../website/optimize/seo.rst:473 -msgid "When a visitor lands for the first time at your website (e.g. yourwebsite.com/shop), his may automatically be redirected to a translated version according to his browser language preference: (e.g. yourwebsite.com/fr\\_FR/shop)." -msgstr "" - -#: ../../website/optimize/seo.rst:478 -msgid "Odoo redirects visitors to their prefered language only the first time visitors land at your website. After that, it keeps a cookie of the current language to avoid any redirection." -msgstr "" - -#: ../../website/optimize/seo.rst:482 -msgid "To force a visitor to stick to the default language, you can use the code of the default language in your link, example: yourwebsite.com/en\\_US/shop. This will always land visitors to the English version of the page, without using the browser language preferences." -msgstr "" - -#: ../../website/optimize/seo.rst:489 +#: ../../website/optimize/seo.rst:24 msgid "Meta Tags" msgstr "" -#: ../../website/optimize/seo.rst:492 -msgid "Titles, Keywords and Description" +#: ../../website/optimize/seo.rst:27 +msgid "Title, Description" msgstr "" -#: ../../website/optimize/seo.rst:494 -msgid "Every web page should define the ````, ``<description>`` and ``<keywords>`` meta data. These information elements are used by search engines to rank and categorize your website according to a specific search query. So, it is important to have titles and keywords in line with what people search in Google." +#: ../../website/optimize/seo.rst:29 +msgid "Every web page should define the ``<title>`` and ``<description>`` meta data. These information elements are used by search engines to promote your website. They are automatically generated based on page title & content, but you can finetune them. Make sure they fit the content of the page, otherwise you will be downgraded by search engines." msgstr "" -#: ../../website/optimize/seo.rst:500 -msgid "In order to write quality meta tags, that will boost traffic to your website, Odoo provides a **Promote** tool, in the top bar of the website builder. This tool will contact Google to give you information about your keywords and do the matching with titles and contents in your page." +#: ../../website/optimize/seo.rst:39 +msgid "Keywords" msgstr "" -#: ../../website/optimize/seo.rst:509 -msgid "If your website is in multiple languages, you can use the Promote tool for every language of a single page;" +#: ../../website/optimize/seo.rst:40 +msgid "In order to write quality content and boost your traffic, Odoo provides a ``<keyword>`` finder. Those keywords are the searches you want to head towards your website. For each keyword, you see how it is used in the content (H1, H2, page title, page description, page content) and what are the related searches in Google. The more keywords are used the better." msgstr "" -#: ../../website/optimize/seo.rst:512 -msgid "In terms of SEO, content is king. Thus, blogs play an important role in your content strategy. In order to help you optimize all your blog post, Odoo provides a page that allows you to quickly scan the meta tags of all your blog posts." +#: ../../website/optimize/seo.rst:50 +msgid "If your website is in multiple languages, you can use the Promote tool for every language of a single page and set specific title, description and search tags." msgstr "" -#: ../../website/optimize/seo.rst:521 -msgid "This /blog page renders differently for public visitors that are not logged in as website administrator. They do not get the warnings and keyword information." +#: ../../website/optimize/seo.rst:55 +msgid "Content is King" msgstr "" -#: ../../website/optimize/seo.rst:526 -msgid "Sitemap" +#: ../../website/optimize/seo.rst:57 +msgid "When it comes to SEO, content is usually king. Odoo provides several modules to help you build your website content:" msgstr "" -#: ../../website/optimize/seo.rst:528 -msgid "Odoo will generate a ``/sitemap.xml`` file automatically for you. For performance reasons, this file is cached and updated every 12 hours." -msgstr "" - -#: ../../website/optimize/seo.rst:531 -msgid "By default, all URLs will be in a single ``/sitemap.xml`` file, but if you have a lot of pages, Odoo will automatically create a Sitemap Index file, respecting the `sitemaps.org protocol <http://www.sitemaps.org/protocol.html>`__ grouping sitemap URL's in 45000 chunks per file." -msgstr "" - -#: ../../website/optimize/seo.rst:537 -msgid "Every sitemap entry has 4 attributes that are computed automatically:" -msgstr "" - -#: ../../website/optimize/seo.rst:539 -msgid "``<loc>`` : the URL of a page" -msgstr "" - -#: ../../website/optimize/seo.rst:541 -msgid "``<lastmod>`` : last modification date of the resource, computed automatically based on related object. For a page related to a product, this could be the last modification date of the product or the page" -msgstr "" - -#: ../../website/optimize/seo.rst:546 -msgid "``<priority>`` : modules may implement their own priority algorithm based on their content (example: a forum might assign a priority based on the number of votes on a specific post). The priority of a static page is defined by it's priority field, which is normalized. (16 is the default)" -msgstr "" - -#: ../../website/optimize/seo.rst:553 -msgid "Structured Data Markup" -msgstr "" - -#: ../../website/optimize/seo.rst:555 -msgid "Structured Data Markup is used to generate Rich Snippets in search engine results. It is a way for website owners to send structured data to search engine robots; helping them to understand your content and create well-presented search results." -msgstr "" - -#: ../../website/optimize/seo.rst:560 -msgid "Google supports a number of rich snippets for content types, including: Reviews, People, Products, Businesses, Events and Organizations." -msgstr "" - -#: ../../website/optimize/seo.rst:563 -msgid "Odoo implements micro data as defined in the `schema.org <http://schema.org>`__ specification for events, eCommerce products, forum posts and contact addresses. This allows your product pages to be displayed in Google using extra information like the price and rating of a product:" -msgstr "" - -#: ../../website/optimize/seo.rst:573 -msgid "robots.txt" -msgstr "" - -#: ../../website/optimize/seo.rst:575 -msgid "Odoo automatically creates a ``/robots.txt`` file for your website. Its content is:" -msgstr "" - -#: ../../website/optimize/seo.rst:578 -msgid "User-agent: \\*" -msgstr "" - -#: ../../website/optimize/seo.rst:580 -msgid "Sitemap: https://www.odoo.com/sitemap.xml" -msgstr "" - -#: ../../website/optimize/seo.rst:583 -msgid "Content is king" -msgstr "" - -#: ../../website/optimize/seo.rst:585 -msgid "When it comes to SEO, content is usually king. Odoo provides several modules to help you build your contents on your website:" -msgstr "" - -#: ../../website/optimize/seo.rst:588 -msgid "**Odoo Slides**: publish all your Powerpoint or PDF presentations. Their content is automatically indexed on the web page. Example: `https://www.odoo.com/slides/public-channel-1 <https://www.odoo.com/slides/public-channel-1>`__" -msgstr "" - -#: ../../website/optimize/seo.rst:592 -msgid "**Odoo Forum**: let your community create contents for you. Example: `https://odoo.com/forum/1 <https://odoo.com/forum/1>`__ (accounts for 30% of Odoo.com landing pages)" -msgstr "" - -#: ../../website/optimize/seo.rst:596 -msgid "**Odoo Mailing List Archive**: publish mailing list archives on your website. Example: `https://www.odoo.com/groups/community-59 <https://www.odoo.com/groups/community-59>`__ (1000 pages created per month)" -msgstr "" - -#: ../../website/optimize/seo.rst:601 +#: ../../website/optimize/seo.rst:60 msgid "**Odoo Blogs**: write great contents." msgstr "" -#: ../../website/optimize/seo.rst:604 -msgid "The 404 page is a regular page, that you can edit like any other page in Odoo. That way, you can build a great 404 page to redirect to the top content of your website." +#: ../../website/optimize/seo.rst:62 +msgid "**Odoo Slides**: publish all your Powerpoint or PDF presentations. Their content is automatically indexed on the web page. Example: `https://www.odoo.com/slides/public-channel-1 <https://www.odoo.com/slides/public-channel-1>`__" msgstr "" -#: ../../website/optimize/seo.rst:609 -msgid "Social Features" +#: ../../website/optimize/seo.rst:66 +msgid "**Odoo Forum**: let your community create contents for you. Example: `https://odoo.com/forum/1 <https://odoo.com/forum/1>`__ (accounts for 30% of Odoo.com landing pages)" msgstr "" -#: ../../website/optimize/seo.rst:612 -msgid "Twitter Cards" +#: ../../website/optimize/seo.rst:70 +msgid "**Odoo Mailing List Archive**: publish mailing list archives on your website. Example: `https://www.odoo.com/groups/community-59 <https://www.odoo.com/groups/community-59>`__ (1000 pages created per month)" msgstr "" -#: ../../website/optimize/seo.rst:614 -msgid "Odoo does not implement twitter cards yet. It will be done for the next version." +#: ../../website/optimize/seo.rst:76 +msgid "The 404 page is a regular page, that you can edit like any other page in Odoo. That way, you can build a great 404 page to redirect to the top content of your website when visitors get lost in invalid URLs." msgstr "" -#: ../../website/optimize/seo.rst:618 +#: ../../website/optimize/seo.rst:81 +msgid "Use Social Networks" +msgstr "" + +#: ../../website/optimize/seo.rst:83 +msgid "Social media is built for mass sharing. If lots of people share your content on social media, then it's likely more people will link to it, and links are a huge factor for SEO ranking." +msgstr "" + +#: ../../website/optimize/seo.rst:87 +msgid "Odoo embeds several tools to share content through social media:" +msgstr "" + +#: ../../website/optimize/seo.rst:90 msgid "Social Network" msgstr "" -#: ../../website/optimize/seo.rst:620 -msgid "Odoo allows to link all your social network accounts in your website. All you have to do is to refer all your accounts in the **Settings** menu of the **Website Admin** application." +#: ../../website/optimize/seo.rst:92 +msgid "Odoo allows to link all your social network accounts in your website footer. All you have to do is to refer all your accounts in your company settings." msgstr "" -#: ../../website/optimize/seo.rst:625 +#: ../../website/optimize/seo.rst:99 +msgid "Social Share" +msgstr "" + +#: ../../website/optimize/seo.rst:101 +msgid "Drop the building block *Share* on any page you want your visitors to share. By clicking the icon, they are prompted to share the page in their social media wall." +msgstr "" + +#: ../../website/optimize/seo.rst:108 +msgid "Most social media use a picture of the picture to decorate the share post. Odoo uses the website logo by default but you can choose any other image of your page in the Promote tool." +msgstr "" + +#: ../../website/optimize/seo.rst:116 +msgid "Facebook Page" +msgstr "" + +#: ../../website/optimize/seo.rst:118 +msgid "Drop the building block *Facebook Page* to display a widget of your Facebook business page and encourage visitors to follow it. You can display the timeline, the next events and the messages." +msgstr "" + +#: ../../website/optimize/seo.rst:123 +msgid "Twitter Scroller" +msgstr "" + +#: ../../website/optimize/seo.rst:125 +msgid "Display the Twitter feeds with customer satifaction on your website. THis will increase the number of tweets and shares." +msgstr "" + +#: ../../website/optimize/seo.rst:129 msgid "Test Your Website" msgstr "" -#: ../../website/optimize/seo.rst:627 +#: ../../website/optimize/seo.rst:131 msgid "You can compare how your website rank, in terms of SEO, against Odoo using WooRank free services: `https://www.woorank.com <https://www.woorank.com>`__" msgstr "" +#: ../../website/optimize/seo.rst:136 +msgid "URLs Handling" +msgstr "" + +#: ../../website/optimize/seo.rst:138 +msgid "This section sheds some light on how Odoo makes URLs SEO-friendly." +msgstr "" + +#: ../../website/optimize/seo.rst:141 +msgid "URLs Structure" +msgstr "" + +#: ../../website/optimize/seo.rst:143 +msgid "A typical Odoo URL will look like this:" +msgstr "" + +#: ../../website/optimize/seo.rst:145 +msgid "https://www.mysite.com/fr\\_FR/shop/product/my-great-product-31" +msgstr "" + +#: ../../website/optimize/seo.rst:147 +msgid "With the following components:" +msgstr "" + +#: ../../website/optimize/seo.rst:149 +msgid "**https://** = Protocol" +msgstr "" + +#: ../../website/optimize/seo.rst:151 +msgid "**www.mysite.com** = your domain name" +msgstr "" + +#: ../../website/optimize/seo.rst:153 +msgid "**/fr\\_FR** = page language. This part of the URL is removed if the visitor browses the main language of the website Thus, the main version of this page is: https://www.mysite.com/shop/product/my-great-product-31" +msgstr "" + +#: ../../website/optimize/seo.rst:158 +msgid "**/shop/product** = every module defines its own namespace (/shop is for the catalog of the eCommerce module, /shop/product is for a product page)." +msgstr "" + +#: ../../website/optimize/seo.rst:162 +msgid "**my-great-product** = by default, this is the slugified title of the product this page refers to. But you can customize it for SEO purposes. A product named \"Pain carré\" will be slugified to \"pain-carre\". Depending on the namespace, this could be different objects (blog post, page title, forum post, forum comment, product category, etc.)." +msgstr "" + +#: ../../website/optimize/seo.rst:169 +msgid "**-31** = the unique ID of the product" +msgstr "" + +#: ../../website/optimize/seo.rst:171 +msgid "Note that any dynamic component of an URL can be reduced to its ID. As an example, the following URLs all do a 301 redirect to the above URL:" +msgstr "" + +#: ../../website/optimize/seo.rst:174 +msgid "https://www.mysite.com/fr\\_FR/shop/product/31 (short version)" +msgstr "" + +#: ../../website/optimize/seo.rst:176 +msgid "http://mysite.com/fr\\_FR/shop/product/31 (even shorter version)" +msgstr "" + +#: ../../website/optimize/seo.rst:178 +msgid "http://mysite.com/fr\\_FR/shop/product/other-product-name-31 (old product name)" +msgstr "" + +#: ../../website/optimize/seo.rst:181 +msgid "Some URLs have several dynamic parts, like this one (a blog category and a post):" +msgstr "" + +#: ../../website/optimize/seo.rst:184 +msgid "https://www.odoo.com/blog/company-news-5/post/the-odoo-story-56" +msgstr "" + +#: ../../website/optimize/seo.rst:186 +msgid "In the above example:" +msgstr "" + +#: ../../website/optimize/seo.rst:188 +msgid "*Company News* is the title of the blog" +msgstr "" + +#: ../../website/optimize/seo.rst:190 +msgid "*The Odoo Story* is the title of a specific blog post" +msgstr "" + +#: ../../website/optimize/seo.rst:192 +msgid "When an Odoo page has a pager, the page number is set directly in the URL (does not have a GET argument). This allows every page to be indexed by search engines. Example:" +msgstr "" + +#: ../../website/optimize/seo.rst:196 +msgid "https://www.odoo.com/blog/page/3" +msgstr "" + +#: ../../website/optimize/seo.rst:199 +msgid "Changes in URLs & Titles" +msgstr "" + +#: ../../website/optimize/seo.rst:201 +msgid "When the URL of a page changes (e.g. a more SEO friendly version of your product name), you don't have to worry about updating all links:" +msgstr "" + +#: ../../website/optimize/seo.rst:204 +msgid "Odoo will automatically update all its links to the new URL." +msgstr "" + +#: ../../website/optimize/seo.rst:206 +msgid "If external websites still points to the old URL, a 301 redirect will be done to route visitors to the new website." +msgstr "" + +#: ../../website/optimize/seo.rst:209 +msgid "As an example, this URL:" +msgstr "" + +#: ../../website/optimize/seo.rst:211 +msgid "http://mysite.com/shop/product/old-product-name-31" +msgstr "" + +#: ../../website/optimize/seo.rst:213 +msgid "Will automatically redirect to:" +msgstr "" + +#: ../../website/optimize/seo.rst:215 +msgid "http://mysite.com/shop/product/new-and-better-product-name-31" +msgstr "" + +#: ../../website/optimize/seo.rst:217 +msgid "In short, just change the title of a blog post or the name of a product, and the changes will apply automatically everywhere in your website. The old link still works for links coming from external websites, with a 301 redirect to not lose the SEO link juice." +msgstr "" + +#: ../../website/optimize/seo.rst:223 +msgid "HTTPS" +msgstr "" + +#: ../../website/optimize/seo.rst:225 +msgid "Search engines boost ranking of secure HTTPS/SSL websites. So, by default all Odoo Online instances are fully based on HTTPS. If the visitor accesses your website through a non HTTPS url, it gets a 301 redirect to its HTTPS equivalent." +msgstr "" + +#: ../../website/optimize/seo.rst:231 +msgid "Links: Nofollow Strategy" +msgstr "" + +#: ../../website/optimize/seo.rst:233 +msgid "The more a page is linked from external and quality websites, the better it is for your SEO." +msgstr "" + +#: ../../website/optimize/seo.rst:236 +msgid "Here are Odoo strategies to manage links:" +msgstr "" + +#: ../../website/optimize/seo.rst:238 +msgid "Every link you add to your website is \"dofollow\", which means that this link will contribute to the SEO Juice for the linked page." +msgstr "" + +#: ../../website/optimize/seo.rst:242 +msgid "Every link posted by a contributor (forum post, blog comment, etc.) that links to your own website is \"dofollow\" too." +msgstr "" + +#: ../../website/optimize/seo.rst:245 +msgid "But every link posted by a contributor that links to an external website is \"nofollow\". In that way, you do not run the risk of people posting links on your website to third-party websites which have a bad reputation." +msgstr "" + +#: ../../website/optimize/seo.rst:250 +msgid "Note that, when using the forum, contributors having a lot of Karma can be trusted. In such case, their links will not have any ``rel=\"nofollow\"`` attribute." +msgstr "" + +#: ../../website/optimize/seo.rst:255 +msgid "Multi-Language Support" +msgstr "" + +#: ../../website/optimize/seo.rst:258 +msgid "Multi-Language URLs" +msgstr "" + +#: ../../website/optimize/seo.rst:260 +msgid "If you run a website in multiple languages, the same content will be available in different URLs, depending on the language used:" +msgstr "" + +#: ../../website/optimize/seo.rst:263 +msgid "https://www.mywebsite.com/shop/product/my-product-1 (main language, English here)" +msgstr "" + +#: ../../website/optimize/seo.rst:265 +msgid "https://www.mywebsite.com\\/fr\\_FR/shop/product/mon-produit-1 (French version)" +msgstr "" + +#: ../../website/optimize/seo.rst:267 +msgid "In this example, fr\\_FR is the language of the page. You can even have several variations of the same language: pt\\_BR (Portuguese from Brazil) , pt\\_PT (Portuguese from Portugal)." +msgstr "" + +#: ../../website/optimize/seo.rst:272 +msgid "Language Annotation" +msgstr "" + +#: ../../website/optimize/seo.rst:274 +msgid "To let search engines know that the second URL is the French translation of the first URL, Odoo will add an HTML link element in the header. In the HTML <head> section of the main version, Odoo automatically adds a link element pointing to the translated versions of that webpage;" +msgstr "" + +#: ../../website/optimize/seo.rst:279 +msgid "<link rel=\"alternate\" hreflang=\"fr\" href=\"https://www.mywebsite.com\\/fr\\_FR/shop/product/mon-produit-1\"/>" +msgstr "" + +#: ../../website/optimize/seo.rst:282 +msgid "With this approach:" +msgstr "" + +#: ../../website/optimize/seo.rst:284 +msgid "Search engines will redirect to th right language according to the visitor language." +msgstr "" + +#: ../../website/optimize/seo.rst:287 +msgid "You do not get penalized by search engines if your page is not translated yet. Indeed, it's not a duplicated content, but a different version of the same content." +msgstr "" + +#: ../../website/optimize/seo.rst:292 +msgid "Language Detection" +msgstr "" + +#: ../../website/optimize/seo.rst:294 +msgid "When a visitor lands for the first time on your website (e.g. yourwebsite.com/shop), they may automatically be redirected to a translated version according to their browser language preference: (e.g. yourwebsite.com/fr\\_FR/shop)." +msgstr "" + +#: ../../website/optimize/seo.rst:299 +msgid "Next time, it keeps a cookie of the current language to avoid any redirection." +msgstr "" + +#: ../../website/optimize/seo.rst:302 +msgid "To force a visitor to stick to the default language, you can use the code of the default language in your link, example: yourwebsite.com/en\\_US/shop. This will always land visitors to the English version of the page, without using the browser language preferences." +msgstr "" + +#: ../../website/optimize/seo.rst:309 +msgid "Page Speed" +msgstr "" + +#: ../../website/optimize/seo.rst:312 +msgid "Introduction" +msgstr "" + +#: ../../website/optimize/seo.rst:314 +msgid "The time to load a page is an important criteria for search engines. A faster website not only improves your visitor's experience, but gives you a better page ranking. Some studies have shown that, if you divide the time to load your pages by two (e.g. 2 seconds instead of 4 seconds), the visitor abandonment rate is also divided by two. (25% to 12.5%). One extra second to load a page could `cost $1.6b to Amazon in sales <http://www.fastcompany.com/1825005/how-one-second-could-cost-amazon-16-billion-sales>`__." +msgstr "" + +#: ../../website/optimize/seo.rst:325 +msgid "Fortunately, Odoo does all the magic for you. Below, you will find the tricks Odoo uses to speed up your page loading time. You can compare how your website ranks using these two tools:" +msgstr "" + +#: ../../website/optimize/seo.rst:329 +msgid "`Google Page Speed <https://developers.google.com/speed/pagespeed/insights/>`__" +msgstr "" + +#: ../../website/optimize/seo.rst:331 +msgid "`Pingdom Website Speed Test <http://tools.pingdom.com/fpt/>`__" +msgstr "" + +#: ../../website/optimize/seo.rst:334 +msgid "Images" +msgstr "" + +#: ../../website/optimize/seo.rst:336 +msgid "When you upload new images, Odoo automatically compresses them to reduce their sizes (lossless compression for .PNG and .GIF and lossy compression for .JPG)." +msgstr "" + +#: ../../website/optimize/seo.rst:340 +msgid "From the upload button, you have the option to keep the original image unmodified if you prefer to optimize the quality of the image rather than performance." +msgstr "" + +#: ../../website/optimize/seo.rst:348 +msgid "Odoo compresses images when they are uploaded to your website, not when requested by the visitor. Thus, it's possible that, if you use a third-party theme, it will provide images that are not compressed efficiently. But all images used in Odoo official themes have been compressed by default." +msgstr "" + +#: ../../website/optimize/seo.rst:354 +msgid "When you click on an image, Odoo shows you the Alt and title attributes of the ``<img>`` tag. You can click on it to set your own title and Alt attributes for the image." +msgstr "" + +#: ../../website/optimize/seo.rst:361 +msgid "When you click on this link, the following window will appear:" +msgstr "" + +#: ../../website/optimize/seo.rst:366 +msgid "Odoo's pictograms are implemented using a font (`Font Awesome <https://fortawesome.github.io/Font-Awesome/icons/>`__ in most Odoo themes). Thus, you can use as many pictograms as you want in your page, they will not result in extra requests to load the page." +msgstr "" + +#: ../../website/optimize/seo.rst:375 +msgid "Static Resources: CSS" +msgstr "" + +#: ../../website/optimize/seo.rst:377 +msgid "All CSS files are pre-processed, concatenated, minified, compressed and cached (server-side and browser-side). The result:" +msgstr "" + +#: ../../website/optimize/seo.rst:380 +msgid "only one CSS file request is needed to load a page" +msgstr "" + +#: ../../website/optimize/seo.rst:382 +msgid "this CSS file is shared and cached amongst pages, so that when the visitor clicks on another page, the browser doesn't have to even load a single CSS resource." +msgstr "" + +#: ../../website/optimize/seo.rst:386 +msgid "this CSS file is optimized to be small" +msgstr "" + +#: ../../website/optimize/seo.rst:388 +msgid "**Pre-processed:** The CSS framework used by Odoo is Bootstrap. Although a theme might use another framework, most of `Odoo themes <https://www.odoo.com/apps/themes>`__ extend and customize Bootstrap directly. Since Odoo supports Less and Sass, you can modify CSS rules instead of overwriting them through extra CSS lines, resulting in a smaller file." +msgstr "" + +#: ../../website/optimize/seo.rst:395 +msgid "**Concatenated:** every module or library you might use in Odoo has its own set of CSS, Less or Sass files (eCommerce, blogs, themes, etc.). Having several CSS files is great for the modularity, but not good for the performance because most browsers can only perform 6 requests in parallel resulting in lots of files loaded in series. The latency time to transfer a file is usually much longer than the actual data transfer time, for small files like .JS and .CSS. Thus, the time to load CSS resources depends more on the number of requests to be done than the actual file size." +msgstr "" + +#: ../../website/optimize/seo.rst:405 +msgid "To address this issue, all CSS / Less / Sass files are concatenated into a single .CSS file to send to the browser. So a visitor has **only one .CSS file to load** per page, which is particularly efficient. As the CSS is shared amongst all pages, when the visitor clicks on another page, the browser does not even have to load a new CSS file!" +msgstr "" + +#: ../../website/optimize/seo.rst:412 +msgid "**Both files in the <head>**" +msgstr "" + +#: ../../website/optimize/seo.rst:412 +msgid "**What the visitor gets (only one file)**" +msgstr "" + +#: ../../website/optimize/seo.rst:414 +msgid "/\\* From bootstrap.css \\*/" +msgstr "" + +#: ../../website/optimize/seo.rst:414 +#: ../../website/optimize/seo.rst:415 +#: ../../website/optimize/seo.rst:421 +#: ../../website/optimize/seo.rst:447 +msgid ".text-muted {" +msgstr "" + +#: ../../website/optimize/seo.rst:415 +#: ../../website/optimize/seo.rst:422 +#: ../../website/optimize/seo.rst:448 +msgid "color: #666;" +msgstr "" + +#: ../../website/optimize/seo.rst:416 +msgid "color: #777;" +msgstr "" + +#: ../../website/optimize/seo.rst:416 +msgid "background: yellow" +msgstr "" + +#: ../../website/optimize/seo.rst:417 +msgid "background: yellow;" +msgstr "" + +#: ../../website/optimize/seo.rst:417 +#: ../../website/optimize/seo.rst:418 +#: ../../website/optimize/seo.rst:423 +#: ../../website/optimize/seo.rst:449 +msgid "}" +msgstr "" + +#: ../../website/optimize/seo.rst:420 +msgid "/\\* From my-theme.css \\*/" +msgstr "" + +#: ../../website/optimize/seo.rst:426 +msgid "The CSS sent by Odoo includes all CSS / Less / Sass of all pages / modules. By doing this, additional page views from the same visitor will not have to load CSS files at all. But some modules might include huge CSS/Javascript resources that you do not want to prefetch at the first page because they are too big. In this case, Odoo splits this resource into a second bundle that is loaded only when the page using it is requested. An example of this is the backend that is only loaded when the visitor logs in and accesses the backend (/web)." +msgstr "" + +#: ../../website/optimize/seo.rst:436 +msgid "If the CSS file is very big, Odoo will split it into two smaller files to avoid the 4095 selectors limit per sheet of Internet Explorer. But most themes fit below this limit." +msgstr "" + +#: ../../website/optimize/seo.rst:440 +msgid "**Minified:** After being pre-processed and concatenated, the resulting CSS is minified to reduce its size." +msgstr "" + +#: ../../website/optimize/seo.rst:444 +msgid "**Before minification**" +msgstr "" + +#: ../../website/optimize/seo.rst:444 +msgid "**After minification**" +msgstr "" + +#: ../../website/optimize/seo.rst:446 +msgid "/\\* some comments \\*/" +msgstr "" + +#: ../../website/optimize/seo.rst:446 +msgid ".text-muted {color: #666}" +msgstr "" + +#: ../../website/optimize/seo.rst:452 +msgid "The final result is then compressed, before being delivered to the browser." +msgstr "" + +#: ../../website/optimize/seo.rst:455 +msgid "Then, a cached version is stored server-side (so we do not have to pre-process, concatenate, minify at every request) and browser-side (so the same visitor will load the CSS only once for all pages they visit)." +msgstr "" + +#: ../../website/optimize/seo.rst:461 +msgid "Static Resources: Javascript" +msgstr "" + +#: ../../website/optimize/seo.rst:463 +msgid "As with CSS resources, Javascript resources are also concatenated, minified, compressed and cached (server-side and browser-side)." +msgstr "" + +#: ../../website/optimize/seo.rst:466 +msgid "Odoo creates three Javascript bundles:" +msgstr "" + +#: ../../website/optimize/seo.rst:468 +msgid "One for all pages of the website (including code for parallax effects, form validation, etc.)" +msgstr "" + +#: ../../website/optimize/seo.rst:471 +msgid "One for common Javascript code shared among frontend and backend (Bootstrap)" +msgstr "" + +#: ../../website/optimize/seo.rst:474 +msgid "One for backend specific Javascript code (Odoo Web Client interface for your employees using Odoo)" +msgstr "" + +#: ../../website/optimize/seo.rst:477 +msgid "Most visitors of your website will only need the first two bundles, resulting in a maximum of two Javascript files to load to render one page. As these files are shared across all pages, further clicks by the same visitor will not load any other Javascript resource." +msgstr "" + +#: ../../website/optimize/seo.rst:483 +msgid "If you work in debug mode, the CSS and Javascript are neither concatenated, nor minified. Thus, it's much slower. But it allows you to easily debug with the Chrome debugger as CSS and Javascript resources are not transformed from their original versions." +msgstr "" + +#: ../../website/optimize/seo.rst:489 +msgid "CDN" +msgstr "" + +#: ../../website/optimize/seo.rst:491 +msgid "If you activate the CDN feature in Odoo, static resources (Javascript, CSS, images) are loaded from a Content Delivery Network. Using a Content Delivery Network has three advantages:" +msgstr "" + +#: ../../website/optimize/seo.rst:495 +msgid "Load resources from a nearby server (most CDN have servers in main countries around the globe)" +msgstr "" + +#: ../../website/optimize/seo.rst:498 +msgid "Cache resources efficiently (no computation resources usage on your own server)" +msgstr "" + +#: ../../website/optimize/seo.rst:501 +msgid "Split the resource loading on different services allowing to load more resources in parallel (since the Chrome limit of 6 parallel requests is by domain)" +msgstr "" + +#: ../../website/optimize/seo.rst:505 +msgid "You can configure your CDN options from the **Website Admin** app, using the Configuration menu. Here is an example of configuration you can use:" +msgstr "" + +#: ../../website/optimize/seo.rst:512 +msgid "HTML Pages" +msgstr "" + +#: ../../website/optimize/seo.rst:514 +msgid "The HTML pages can be compressed, but this is usually handled by your web server (NGINX or Apache)." +msgstr "" + +#: ../../website/optimize/seo.rst:517 +msgid "The Odoo Website builder has been optimized to guarantee clean and short HTML code. Building blocks have been developed to produce clean HTML code, usually using Bootstrap and the HTML editor." +msgstr "" + +#: ../../website/optimize/seo.rst:521 +msgid "As an example, if you use the color picker to change the color of a paragraph to the primary color of your website, Odoo will produce the following code:" +msgstr "" + +#: ../../website/optimize/seo.rst:525 +msgid "``<p class=\"text-primary\">My Text</p>``" +msgstr "" + +#: ../../website/optimize/seo.rst:527 +msgid "Whereas most HTML editors (such as CKEditor) will produce the following code:" +msgstr "" + +#: ../../website/optimize/seo.rst:530 +msgid "``<p style=\"color: #AB0201\">My Text</p>``" +msgstr "" + +#: ../../website/optimize/seo.rst:533 +msgid "Responsive Design" +msgstr "" + +#: ../../website/optimize/seo.rst:535 +msgid "Websites that are not mobile-friendly are negatively impacted in search engine rankings. All Odoo themes rely on Bootstrap to render efficiently according to the device: desktop, tablet or mobile." +msgstr "" + +#: ../../website/optimize/seo.rst:542 +msgid "As all Odoo modules share the same technology, absolutely all pages in your website are mobile friendly." +msgstr "" + +#: ../../website/optimize/seo.rst:546 +msgid "Browser Caching" +msgstr "" + +#: ../../website/optimize/seo.rst:548 +msgid "Javascript, images and CSS resources have an URL that changes dynamically when their content change. As an example, all CSS files are loaded through this URL: `http://localhost:8069/web/content/457-0da1d9d/web.assets\\_common.0.css <http://localhost:8069/web/content/457-0da1d9d/web.assets_common.0.css>`__. The ``457-0da1d9d`` part of this URL will change if you modify the CSS of your website." +msgstr "" + +#: ../../website/optimize/seo.rst:555 +msgid "This allows Odoo to set a very long cache delay (XXX) on these resources: XXX secs, while being updated instantly if you update the resource." +msgstr "" + +#: ../../website/optimize/seo.rst:560 +msgid "Scalability" +msgstr "" + +#: ../../website/optimize/seo.rst:562 +msgid "In addition to being fast, Odoo is also more scalable than traditional CMS and eCommerce (Drupal, Wordpress, Magento, Prestashop). The following link provides an analysis of the major open source CMS and eCommerce compared to Odoo when it comes to high query volumes: `*https://www.odoo.com/slides/slide/197* <https://www.odoo.com/slides/slide/odoo-cms-performance-comparison-and-optimisation-197>`__" +msgstr "" + +#: ../../website/optimize/seo.rst:568 +msgid "Here is the slide that summarizes the scalability of Odoo Website & eCommerce." +msgstr "" + +#: ../../website/optimize/seo.rst:574 +msgid "Search Engines Files" +msgstr "" + +#: ../../website/optimize/seo.rst:577 +msgid "Sitemap" +msgstr "" + +#: ../../website/optimize/seo.rst:579 +msgid "The sitemap points out pages to index to search engine robots. Odoo generates a ``/sitemap.xml`` file automatically for you. For performance reasons, this file is cached and updated every 12 hours." +msgstr "" + +#: ../../website/optimize/seo.rst:583 +msgid "By default, all URLs will be in a single ``/sitemap.xml`` file, but if you have a lot of pages, Odoo will automatically create a Sitemap Index file, respecting the `sitemaps.org protocol <http://www.sitemaps.org/protocol.html>`__ grouping sitemap URL's in 45000 chunks per file." +msgstr "" + +#: ../../website/optimize/seo.rst:589 +msgid "Every sitemap entry has 4 attributes that are computed automatically:" +msgstr "" + +#: ../../website/optimize/seo.rst:591 +msgid "``<loc>`` : the URL of a page" +msgstr "" + +#: ../../website/optimize/seo.rst:593 +msgid "``<lastmod>`` : last modification date of the resource, computed automatically based on related object. For a page related to a product, this could be the last modification date of the product or the page." +msgstr "" + +#: ../../website/optimize/seo.rst:598 +msgid "``<priority>`` : modules may implement their own priority algorithm based on their content (example: a forum might assign a priority based on the number of votes on a specific post). The priority of a static page is defined by it's priority field, which is normalized (16 is the default)." +msgstr "" + +#: ../../website/optimize/seo.rst:605 +msgid "Structured Data Markup" +msgstr "" + +#: ../../website/optimize/seo.rst:607 +msgid "Structured Data Markup is used to generate Rich Snippets in search engine results. It is a way for website owners to send structured data to search engine robots; helping them understand your content and create well-presented search results." +msgstr "" + +#: ../../website/optimize/seo.rst:612 +msgid "Google supports a number of rich snippets for content types, including: Reviews, People, Products, Businesses, Events and Organizations." +msgstr "" + +#: ../../website/optimize/seo.rst:615 +msgid "Odoo implements micro data as defined in the `schema.org <http://schema.org>`__ specification for events, eCommerce products, forum posts and contact addresses. This allows your product pages to be displayed in Google using extra information like the price and rating of a product:" +msgstr "" + +#: ../../website/optimize/seo.rst:625 +msgid "robots.txt" +msgstr "" + +#: ../../website/optimize/seo.rst:627 +msgid "When indexing your website, search engines take a first look at the general indexing rules of the a``/robots.txt`` file (allowed robots, sitemap path, etc.). Odoo automatically creates it. Its content is:" +msgstr "" + +#: ../../website/optimize/seo.rst:631 +msgid "User-agent: \\* Sitemap: https://www.odoo.com/sitemap.xml" +msgstr "" + +#: ../../website/optimize/seo.rst:634 +msgid "It means that all robots are allowed to index your website and there is no other indexing rule than specified in the sitemap to be found at following address." +msgstr "" + +#: ../../website/optimize/seo.rst:638 +msgid "You can customize the file *robots* in developer mode from *Settings --> Technical --> User Interface --> Views* (exclude robots, exclude some pages, redirect to a custom Sitemap). Make the Model Data of the view *Non Updatable* to not reset the file after system upgrades." +msgstr "" + #: ../../website/publish.rst:3 msgid "Publish" msgstr "" @@ -941,13 +961,337 @@ msgid "How to enable SSL (HTTPS) for my Odoo instance" msgstr "" #: ../../website/publish/domain_name.rst:87 -msgid "To enable SSL, please use a third-party CDN service provider such as CloudFlare.com." +msgid "Until recently, Odoo users needed to use a third-party CDN service provider such as CloudFlare to enable SSL." msgstr "" -#: ../../website/publish/domain_name.rst:93 +#: ../../website/publish/domain_name.rst:89 +msgid "It is not required anymore: Odoo generates the certificate for you automatically, using integration with `Let's Encrypt Certificate Authority and ACME protocol <https://letsencrypt.org/how-it-works/>`__. In order to get this, simply add your domain name in your customer portal (a separate certificate is generated for each domain name specified)." +msgstr "" + +#: ../../website/publish/domain_name.rst:92 +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:95 +msgid "My website is indexed twice by Google" +msgstr "" + +#: ../../website/publish/domain_name.rst:97 +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:102 msgid ":doc:`../../discuss/email_servers`" msgstr "" +#: ../../website/publish/multi_website.rst:3 +msgid "Manage Multi Websites" +msgstr "" + +#: ../../website/publish/multi_website.rst:8 +msgid "Odoo’s Multi-Websites opens up broad possibilities of diversification and customer segmentation for your business. A multiplied audience and boosted revenue are now just a few clicks away!" +msgstr "" + +#: ../../website/publish/multi_website.rst:12 +msgid "Each website can work in a fully independent way, with its theme, branding, domain name, header & footer, pages, languages, products, blog posts, forum, slides, events, live chat channels, etc. Let’s go for a tour!" +msgstr "" + +#: ../../website/publish/multi_website.rst:18 +msgid "Setup" +msgstr "" + +#: ../../website/publish/multi_website.rst:20 +msgid "To create a new website, go to :menuselection:`Website --> Configuration → Settings`. The button, *Create a new website*, lays in the first section." +msgstr "" + +#: ../../website/publish/multi_website.rst:28 +msgid "In the upcoming prompt, set a name for your new website and a specific domain name. Leave empty to publish the new website under the default domain of your Odoo database. You can later set some country groups to redirect visitors to it using Geo IP." +msgstr "" + +#: ../../website/publish/multi_website.rst:36 +msgid "Then, select a theme. This new website might have an entirely different purpose or audience than the first one. So feel free to go for a different theme!" +msgstr "" + +#: ../../website/publish/multi_website.rst:40 +msgid "Once the theme is selected, you can start to build the homepage of your website. Follow the purple drops; they will help you in the first steps." +msgstr "" + +#: ../../website/publish/multi_website.rst:48 +msgid "If you run Odoo Online, don’t forget to redirect any new domain name to your Odoo database (CNAME) and to authorize it Odoo-side. `Read <https://www.odoo.com/documentation/user/online/website/publish/domain_name.html>`__" +msgstr "" + +#: ../../website/publish/multi_website.rst:52 +msgid "Create the menu" +msgstr "" + +#: ../../website/publish/multi_website.rst:54 +msgid "The new website has a default menu with all the installed applications. To edit it, click *Pages > Edit Menu*. Moving forward you only edit the menu of the current website." +msgstr "" + +#: ../../website/publish/multi_website.rst:59 +msgid "Switch from one website to another" +msgstr "" + +#: ../../website/publish/multi_website.rst:62 +msgid "As easy as ABC! There is a website switcher in the right corner of the edit bar. Switching to another website will connect to the domain of this website. If you use another domain for the website, the user is requested to sign in." +msgstr "" + +#: ../../website/publish/multi_website.rst:71 +msgid "When switching, you are redirected to the same domain path on the other website (e.g.,/shop/myproduct). If this URL is not used, you will be redirected to a 404 page but suggested to create a new page from there." +msgstr "" + +#: ../../website/publish/multi_website.rst:74 +msgid "Add features" +msgstr "" + +#: ../../website/publish/multi_website.rst:76 +msgid "The website apps you install (e.g., Slides, Blogs) are made available on all your websites. You can, of course, keep them hidden in one website by removing the menu item." +msgstr "" + +#: ../../website/publish/multi_website.rst:80 +msgid "Each website comes with a high range of specific options in the settings. First, select the website to configure." +msgstr "" + +#: ../../website/publish/multi_website.rst:86 +msgid "Then, take a look at the options flagged with the earth icon. It means they only impact the very website you are working on." +msgstr "" + +#: ../../website/publish/multi_website.rst:92 +msgid "You can, for instance, set specific :" +msgstr "" + +#: ../../website/publish/multi_website.rst:94 +msgid "languages," +msgstr "" + +#: ../../website/publish/multi_website.rst:96 +msgid "domain names," +msgstr "" + +#: ../../website/publish/multi_website.rst:98 +msgid "social media links," +msgstr "" + +#: ../../website/publish/multi_website.rst:100 +msgid "customer portal mode (B2C vs. B2B)," +msgstr "" + +#: ../../website/publish/multi_website.rst:102 +msgid "dedicated live chat channels," +msgstr "" + +#: ../../website/publish/multi_website.rst:104 +msgid "etc." +msgstr "" + +#: ../../website/publish/multi_website.rst:106 +msgid "The other options are global and apply to all your websites." +msgstr "" + +#: ../../website/publish/multi_website.rst:109 +msgid "Manage domain names" +msgstr "" + +#: ../../website/publish/multi_website.rst:111 +msgid "As said earlier, your websites can either share the same domain name or use a specific one. If you share it and want to adapt the content per region, set country groups in the setting of each website. Visitors will be redirected to the right website using Geo IP." +msgstr "" + +#: ../../website/publish/multi_website.rst:120 +msgid "Geo IP is installed by default in Odoo Online. If you run Odoo on-premise, don’t forget to install *Geoip* library." +msgstr "" + +#: ../../website/publish/multi_website.rst:123 +msgid "`Read the full documenation about domain names here <https://www.odoo.com/documentation/user/online/website/publish/domain_name.html>`__," +msgstr "" + +#: ../../website/publish/multi_website.rst:126 +msgid "Customize the visitor experience" +msgstr "" + +#: ../../website/publish/multi_website.rst:129 +msgid "The customer experience can be customized very profoundly thanks to the menu \\*Customize\\*. All the visual options available there are specific to each website. Go through the different pages to adapt them to this new audience. Focus on workflows, and automatic pages (eCommerce checkout, blogs, events, etc.) as the number of available options is higher there." +msgstr "" + +#: ../../website/publish/multi_website.rst:139 +msgid "Publish specific content per website" +msgstr "" + +#: ../../website/publish/multi_website.rst:142 +msgid "Like static pages, any content created from the front-end (product, blog post, etc.) is always only published in the current website. You can change that from the edit form view in the backend and leave the *Website* field blank. This will publish it in all the websites." +msgstr "" + +#: ../../website/publish/multi_website.rst:150 +msgid "Here are all the objects that you can link to *either one or all the websites*:" +msgstr "" + +#: ../../website/publish/multi_website.rst:153 +msgid "Products" +msgstr "" + +#: ../../website/publish/multi_website.rst:155 +msgid "Product Categories for eCommerce" +msgstr "" + +#: ../../website/publish/multi_website.rst:157 +msgid "Blogs" +msgstr "" + +#: ../../website/publish/multi_website.rst:159 +msgid "Slide Channels" +msgstr "" + +#: ../../website/publish/multi_website.rst:161 +msgid "Forums" +msgstr "" + +#: ../../website/publish/multi_website.rst:163 +msgid "Events" +msgstr "" + +#: ../../website/publish/multi_website.rst:165 +msgid "Job Positions" +msgstr "" + +#: ../../website/publish/multi_website.rst:168 +msgid "When you create the record from the backend and publish it, typically a product or an event, it is made available in all websites." +msgstr "" + +#: ../../website/publish/multi_website.rst:172 +msgid "Publish a page in all websites" +msgstr "" + +#: ../../website/publish/multi_website.rst:174 +msgid "A new static page is created and only made available in the current website. You can duplicate it to other websites from :menuselection:`Website --> Configuration → Pages`. To do so, leave the *Website* field empty." +msgstr "" + +#: ../../website/publish/multi_website.rst:178 +msgid "If you want to duplicate it in just one other website, duplicate the page and set the new website." +msgstr "" + +#: ../../website/publish/multi_website.rst:184 +msgid "When you edit the page again, the change only affects the current website. A new page is duplicated and tied up to the website. The original page still being linked to all websites." +msgstr "" + +#: ../../website/publish/multi_website.rst:189 +msgid "By grouping pages by URL in the page manager, you quickly find the original page behind each edited page." +msgstr "" + +#: ../../website/publish/multi_website.rst:196 +msgid "Multi-companies" +msgstr "" + +#: ../../website/publish/multi_website.rst:198 +msgid "Each website can be linked to a specific company of your system, in a multi-companies environment." +msgstr "" + +#: ../../website/publish/multi_website.rst:204 +msgid "With such a configuration, only company-related data appear on the website (products, jobs, events, etc.)." +msgstr "" + +#: ../../website/publish/multi_website.rst:207 +msgid "Website editors can only view and edit the pages of the records they have access to, typically the ones belonging to their current company (and to their subsidiaries, or child companies in Odoo language). And so is it for visitors." +msgstr "" + +#: ../../website/publish/multi_website.rst:213 +msgid "If websites are multi-companies, you don’t change company when switching websites. To change the company and see the related content, use the company selector in the menu." +msgstr "" + +#: ../../website/publish/multi_website.rst:219 +msgid "Configure your eCommerce website" +msgstr "" + +#: ../../website/publish/multi_website.rst:221 +msgid "eCommerce is a crucial feature in the multi-websites environment. We made it so that the entire flow can be customized to fit the very audience of each website." +msgstr "" + +#: ../../website/publish/multi_website.rst:226 +msgid "Products only available on one website" +msgstr "" + +#: ../../website/publish/multi_website.rst:228 +msgid "We already saw earlier how to publish a specific record in only one website. You will find the \\*Website\\* field in the eCommerce tab of the product edit form. Empty means available in all websites." +msgstr "" + +#: ../../website/publish/multi_website.rst:236 +msgid "Products available on *some* websites" +msgstr "" + +#: ../../website/publish/multi_website.rst:238 +msgid "To make a product available on some websites, but not all of them, you should duplicate the product for each website." +msgstr "" + +#: ../../website/publish/multi_website.rst:241 +msgid "If you need a unique reference to manage in your inventory, you should install *Manufacturing\\ and create *Kits* BoMs (bills of materials). Each kit will link each published “virtual” product to the main reference managed in your inventory. That way, any item sold from your website will be converted into the storable item in the delivery order." +msgstr "" + +#: ../../website/publish/multi_website.rst:248 +msgid "Pricelists" +msgstr "" + +#: ../../website/publish/multi_website.rst:250 +msgid "To manage specific prices by websites, you can activate *Multiple Sales Prices per Product* in Website settings." +msgstr "" + +#: ../../website/publish/multi_website.rst:253 +msgid "Then, go to :menuselection:`Website --> Products → Pricelists` to create additional pricelists. Read `Pricelists Documentation <https://www.odoo.com/documentation/user/online/ecommerce/maximizing_revenue/pricing.html>`__," +msgstr "" + +#: ../../website/publish/multi_website.rst:256 +msgid "If you need help. Select a website to make a pricelist only available on this website." +msgstr "" + +#: ../../website/publish/multi_website.rst:262 +msgid "Leaving the field empty means that you make it work in all websites if *Selectable* is selected. Otherwise, it makes it only available for backend operations of Sales and Point of Sale applications." +msgstr "" + +#: ../../website/publish/multi_website.rst:267 +msgid "Payment Acquirers and Delivery Methods" +msgstr "" + +#: ../../website/publish/multi_website.rst:269 +msgid "By default, published payment acquirers and delivery methods are deployed in all websites. You could already use specific payment acquirers per country using Geo IP by defining countries in their configuration. Now you can also do it per website by filling in the *Website* field." +msgstr "" + +#: ../../website/publish/multi_website.rst:275 +msgid "Customer accounts" +msgstr "" + +#: ../../website/publish/multi_website.rst:277 +msgid "There is a setting to choose how to manage customer accounts in Website settings. You can either allow customers to use one account through all the websites or compel them to create one account for each website. This last option is convenient if your websites shouldn’t be related to each other in the visitor mind." +msgstr "" + +#: ../../website/publish/multi_website.rst:287 +msgid "Technical hints for customization" +msgstr "" + +#: ../../website/publish/multi_website.rst:289 +msgid "If you want to publish custom objects on the website, here are a few tips to make it work with multi websites:" +msgstr "" + +#: ../../website/publish/multi_website.rst:293 +msgid "Sitemap: don’t forget the domain in the route to only publish" +msgstr "" + +#: ../../website/publish/multi_website.rst:293 +msgid "available records in each website’s sitemap." +msgstr "" + +#: ../../website/publish/multi_website.rst:297 +msgid "Access: you should call the method" +msgstr "" + +#: ../../website/publish/multi_website.rst:296 +msgid "*can_access_from_current_website* in the controller to make sure the visitor can see a record in the current website." +msgstr "" + +#: ../../website/publish/multi_website.rst:301 +msgid "Search: when a list of records is displayed, don’t forget to specify" +msgstr "" + +#: ../../website/publish/multi_website.rst:300 +msgid "the domain to only display records available for the current website." +msgstr "" + #: ../../website/publish/translate.rst:3 msgid "How to translate my website" msgstr ""